Make search-domains optional (bug #201948 by Jonathan Barnard, Dennis Schridde, Paweł Hajdan, Jr. and many others), also fix bug #226823 by flameeyes. Drop old.

(Portage version: 2.1.10.45/cvs/Linux x86_64)

5 files changed, 43 insertions, 81 deletions

diff --git a/sys-auth/nss-mdns/ChangeLog b/sys-auth/nss-mdns/ChangeLog
index fc53359ba103..0e2b970d420b 100644
--- a/sys-auth/nss-mdns/ChangeLog
+++ b/sys-auth/nss-mdns/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-auth/nss-mdns
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-mdns/ChangeLog,v 1.31 2009/12/10 19:38:48 vostorga Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-mdns/ChangeLog,v 1.32 2012/02/11 12:29:00 pacho Exp $
+
+*nss-mdns-0.10-r1 (11 Feb 2012)
+
+  11 Feb 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/nss-mdns-0.10-avahi-socket.patch, +nss-mdns-0.10-r1.ebuild,
+  -nss-mdns-0.8.ebuild, -nss-mdns-0.9-r1.ebuild, metadata.xml:
+  Make search-domains optional (bug #201948 by Jonathan Barnard, Dennis
+  Schridde, Paweł Hajdan, Jr. and many others), also fix bug #226823 by
+  flameeyes. Drop old.
 
   10 Dec 2009; Víctor Ostorga <vostorga@gentoo.org> nss-mdns-0.10.ebuild:
   Putting example in pkg_postinst() from einfo to ewarn, bug 249447
diff --git a/sys-auth/nss-mdns/files/nss-mdns-0.10-avahi-socket.patch b/sys-auth/nss-mdns/files/nss-mdns-0.10-avahi-socket.patch
new file mode 100644
index 000000000000..189d108814a6
--- /dev/null
+++ b/sys-auth/nss-mdns/files/nss-mdns-0.10-avahi-socket.patch
@@ -0,0 +1,10 @@
+--- 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/metadata.xml b/sys-auth/nss-mdns/metadata.xml
index 28f8c80c53b4..8a582533183e 100644
--- a/sys-auth/nss-mdns/metadata.xml
+++ b/sys-auth/nss-mdns/metadata.xml
@@ -3,7 +3,11 @@
 <pkgmetadata>
 	<maintainer>
 		<email>maintainer-needed@gentoo.org</email>
-		</maintainer>
+	</maintainer>
+<use>
+	<flag name="search-domains">Honour search domains from
+		/etc/resolv.conf (see bug #201948 for possible side effects)</flag>
+</use>
 	<longdescription lang="en">
 		Name service switch module for multicast dns.
 	</longdescription>
diff --git a/sys-auth/nss-mdns/nss-mdns-0.8.ebuild b/sys-auth/nss-mdns/nss-mdns-0.10-r1.ebuild
index 707329a9cfd7..e08ce59d7d2c 100644
--- a/sys-auth/nss-mdns/nss-mdns-0.8.ebuild
+++ b/sys-auth/nss-mdns/nss-mdns-0.10-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-mdns/nss-mdns-0.8.ebuild,v 1.8 2009/03/20 04:14:55 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-mdns/nss-mdns-0.10-r1.ebuild,v 1.1 2012/02/11 12:29:00 pacho Exp $
 
-inherit eutils
+EAPI="4"
+inherit autotools eutils
 
 DESCRIPTION="Name Service Switch module for Multicast DNS"
 HOMEPAGE="http://0pointer.de/lennart/projects/nss-mdns/"
@@ -10,23 +11,26 @@ SRC_URI="http://0pointer.de/lennart/projects/nss-mdns/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="avahi"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86"
+IUSE="search-domains"
 
-DEPEND="avahi? ( net-dns/avahi )"
+DEPEND="net-dns/avahi"
 RDEPEND="${DEPEND}"
 
-src_compile() {
-	econf $(use_enable avahi) || die "configure failed"
-	emake || die "compile failed"
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.10-avahi-socket.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable search-domains) --enable-avahi
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install
 
 	insinto /etc
-	doins "${FILESDIR}/mdns.allow"
-
+	doins "${FILESDIR}"/mdns.allow
 	dodoc README
 }
 
@@ -42,11 +46,9 @@ pkg_postinst() {
 	ewarn
 	ewarn "Add the appropriate mdns into the hosts line in /etc/nsswitch.conf"
 	ewarn "An example line looks like:"
-	einfo "hosts:	files mdns4_minimal [NOTFOUND=return] dns mdns4"
+	ewarn "hosts:	files mdns4_minimal [NOTFOUND=return] dns mdns4"
 	ewarn
 	ewarn "If you want to perform mDNS lookups for domains other than the ones"
 	ewarn "ending in .local, add them to /etc/mdns.allow"
 	ewarn
-	ebeep 5
-	epause 10
 }
diff --git a/sys-auth/nss-mdns/nss-mdns-0.9-r1.ebuild b/sys-auth/nss-mdns/nss-mdns-0.9-r1.ebuild
deleted file mode 100644
index bf29d67d11ab..000000000000
--- a/sys-auth/nss-mdns/nss-mdns-0.9-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-mdns/nss-mdns-0.9-r1.ebuild,v 1.8 2009/03/20 04:14:55 jmbsvicetto Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="1.9"
-
-inherit autotools eutils
-
-DESCRIPTION="Name Service Switch module for Multicast DNS"
-HOMEPAGE="http://0pointer.de/lennart/projects/nss-mdns/"
-SRC_URI="http://0pointer.de/lennart/projects/nss-mdns/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86"
-IUSE=""
-
-DEPEND="net-dns/avahi"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-0.8-avahi-socket.patch"
-	eautomake
-}
-
-src_compile() {
-	econf --enable-search-domains --enable-avahi || die "configure failed"
-	emake || die "compile failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-
-	insinto /etc
-	doins "${FILESDIR}/mdns.allow"
-
-	dodoc README
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "You must modify your name service switch look up file to enable"
-	ewarn "multicast DNS lookups.  If you wish to resolve only IPv6 addresses"
-	ewarn "use mdns6.  For IPv4 addresses only, use mdns4.  To resolve both"
-	ewarn "use mdns.  Keep in mind that mdns will be slower if there are no"
-	ewarn "IPv6 addresses published via mDNS on the network.  There are also"
-	ewarn "minimal (mdns?_minimal) libraries which only lookup .local hosts"
-	ewarn "and 169.254.x.x addresses."
-	ewarn
-	ewarn "Add the appropriate mdns into the hosts line in /etc/nsswitch.conf"
-	ewarn "An example line looks like:"
-	einfo "hosts:	files mdns4_minimal [NOTFOUND=return] dns mdns4"
-	ewarn
-	ewarn "If you want to perform mDNS lookups for domains other than the ones"
-	ewarn "ending in .local, add them to /etc/mdns.allow"
-	ewarn
-	ebeep 5
-	epause 10
-}