[sys-auth/nss-mdns-0.10] Use eautoreconf instead of patching Makefile.in

eautoreconf was run anyway due to no-minimal-search-domains patch

Bug: 226823

(Portage version: 2.2.0_alpha23/git/Linux x86_64, signed Manifest commit with key 50ED256E)

4 files changed, 17 insertions, 28 deletions

diff --git a/sys-auth/nss-mdns/Manifest b/sys-auth/nss-mdns/Manifest
index 1100e171baf..c88313b88ef 100644
--- a/sys-auth/nss-mdns/Manifest
+++ b/sys-auth/nss-mdns/Manifest
@@ -3,14 +3,14 @@ Hash: SHA1
 
 AUX mdns.allow 29 RMD160 c65a9a70c14528b7330a51187634b51c43725397 SHA1 2be715163a7d081ec248336aa47ee7cdba1680c8 SHA256 9fde506c70de0983039fc17b705fd40a2e43fbb8d426a74f662a09136458bc40
 AUX nss-mdns-0.10-no-minimal-search-domains-r1.patch 564 RMD160 33a90cf985deb566eccffc193aa5f2b1b4270a2a SHA1 1201667a170ac2edf91b62aa1cafa057eada71f1 SHA256 697a09aa5c8ac54e05f2c4daeb7019aa8091b7463c135195dbbd81d665191e6d
-AUX nss-mdns-0.8-avahi-socket.patch 893 RMD160 c838927dae4da73a63d8d8cc628ccc0c026dd075 SHA1 575481ac15ddc6bbd7111d7b011af947b5a296ca SHA256 3ec68966c04ffec0324fdde06ded47f602aca05672ef69592a7d079bf932f641
+AUX nss-mdns-0.8-avahi-socket-r1.patch 401 RMD160 4ff4cac66fbe1724a6f72c7a6c43ba170eef8467 SHA1 d6e35b94707129ca70e19f684effe91d978e3f1e SHA256 e627d7f6bf811721057beebe2136426700674937d4958a7399ff6e614d9aea98
 DIST nss-mdns-0.10.tar.gz 353130 RMD160 e33f318790bc0a7367297284cad977289f830a84 SHA1 d8610950b8b209e29129a70765449b820bcda1a0 SHA256 1e683c2e7c3921814706d62fbbd3e9cbf493a75fa00255e0e715508d8134fa6d
-EBUILD nss-mdns-0.10-r1.ebuild 1757 RMD160 9da9ea8eededb67644d74e1b5fd2c9e650b8a70a SHA1 f47d5944350a0fe6ea2ca0e410e762a3a7ba4f09 SHA256 5695f491150b7523ba5a6d55310b18953be5758e6ae6e2c382ed721f7964a50c
+EBUILD nss-mdns-0.10-r1.ebuild 1760 RMD160 0c30e9be3b68e4e3647ec223e2e6503ca842f2b2 SHA1 c3f209a524fb21e82fd91fba0160751704646088 SHA256 496b082591f41ae734c41cb1ecbd63a1fb4942f0bfdb0cc769cdc58a76298ad6
 MISC metadata.xml 582 RMD160 a71b926124261130dc2f1415e621958e87269e7e SHA1 5a09b9703b44307d2312fa702580bccb26dd6319 SHA256 cd261bbcf54aa50efc7d9b1181b6a0e0b17d809d41b08b0184cf4e392e0716fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1ToTAACgkQjqfyF1DtJW508QCghpGgrxmfCR3mA2smAr+nQQeR
-ezcAn0TKo8R1iQo9CwdPqVnyyK1lwn27
-=L/Gb
+iEYEARECAAYFAk1X37gACgkQjqfyF1DtJW4TnQCgk0rpywqlFDCOZB82DPnKtMHu
+8AMAoMBMItsF7DWJc2Vg0PdgFRZrmv+8
+=POfr
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/nss-mdns/files/nss-mdns-0.8-avahi-socket-r1.patch b/sys-auth/nss-mdns/files/nss-mdns-0.8-avahi-socket-r1.patch
new file mode 100644
index 00000000000..06c3db93498
--- /dev/null
+++ b/sys-auth/nss-mdns/files/nss-mdns-0.8-avahi-socket-r1.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.am	2006-12-30 01:00:22.000000000 -0600
++++ src/Makefile.am	2006-12-30 01:01:11.000000000 -0600
+@@ -20,7 +20,7 @@
+ AM_CFLAGS = \
+ 	-DMDNS_ALLOW_FILE=\"$(sysconfdir)/mdns.allow\" \
+ 	-DRESOLV_CONF_FILE=\"$(sysconfdir)/resolv.conf\" \
+-	-DAVAHI_SOCKET=\"$(localstatedir)/run/avahi-daemon/socket\"
++	-DAVAHI_SOCKET=\"$(ROOT)var/run/avahi-daemon/socket\"
+ 
+ #AM_CFLAGS += -DNDEBUG=1 -Os
+ 
diff --git a/sys-auth/nss-mdns/files/nss-mdns-0.8-avahi-socket.patch b/sys-auth/nss-mdns/files/nss-mdns-0.8-avahi-socket.patch
deleted file mode 100644
index 2b73165b713..00000000000
--- a/sys-auth/nss-mdns/files/nss-mdns-0.8-avahi-socket.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/Makefile.am	2006-12-30 01:00:22.000000000 -0600
-+++ src/Makefile.am	2006-12-30 01:01:11.000000000 -0600
-@@ -20,7 +20,7 @@
- AM_CFLAGS = \
- 	-DMDNS_ALLOW_FILE=\"$(sysconfdir)/mdns.allow\" \
- 	-DRESOLV_CONF_FILE=\"$(sysconfdir)/resolv.conf\" \
--	-DAVAHI_SOCKET=\"$(localstatedir)/run/avahi-daemon/socket\"
-+	-DAVAHI_SOCKET=\"$(ROOT)var/run/avahi-daemon/socket\"
- 
- #AM_CFLAGS += -DNDEBUG=1 -Os
- 
---- src/Makefile.in	2006-12-30 01:00:19.000000000 -0600
-+++ src/Makefile.in	2006-12-30 01:00:37.000000000 -0600
-@@ -301,7 +301,7 @@
- # This cool debug trap works on i386/gcc only
- AM_CFLAGS = -DMDNS_ALLOW_FILE=\"$(sysconfdir)/mdns.allow\" \
- 	-DRESOLV_CONF_FILE=\"$(sysconfdir)/resolv.conf\" \
--	-DAVAHI_SOCKET=\"$(localstatedir)/run/avahi-daemon/socket\" \
-+	-DAVAHI_SOCKET=\"$(ROOT)var/run/avahi-daemon/socket\" \
- 	'-DDEBUG_TRAP=__asm__("int $$3")'
- lib_LTLIBRARIES = \
- 	libnss_mdns.la \
diff --git a/sys-auth/nss-mdns/nss-mdns-0.10-r1.ebuild b/sys-auth/nss-mdns/nss-mdns-0.10-r1.ebuild
index b0011a8ebcb..bc13b1ce98f 100644
--- a/sys-auth/nss-mdns/nss-mdns-0.10-r1.ebuild
+++ b/sys-auth/nss-mdns/nss-mdns-0.10-r1.ebuild
@@ -19,7 +19,7 @@ DEPEND="net-dns/avahi"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.8-avahi-socket.patch
+	epatch "${FILESDIR}"/${PN}-0.8-avahi-socket-r1.patch
 	epatch "${FILESDIR}"/${P}-no-minimal-search-domains-r1.patch
 	eautoreconf
 }