Revise the blocker to net-dns/avahi and remove the ipv6 support again, bug #176403.

Package-Manager: portage-2.1.2.6

6 files changed, 28 insertions, 158 deletions

diff --git a/net-misc/mDNSResponder/ChangeLog b/net-misc/mDNSResponder/ChangeLog
index aab92b97d88a..0fb570848bc7 100644
--- a/net-misc/mDNSResponder/ChangeLog
+++ b/net-misc/mDNSResponder/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/mDNSResponder
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/ChangeLog,v 1.33 2007/04/30 21:07:22 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/ChangeLog,v 1.34 2007/05/05 12:16:45 carlo Exp $
+
+*mDNSResponder-107.6-r5 (05 May 2007)
+
+  05 May 2007; Carsten Lohrke <carlo@gentoo.org>
+  -mDNSResponder-107.6-r3.ebuild, -mDNSResponder-107.6-r4.ebuild,
+  +mDNSResponder-107.6-r5.ebuild:
+  Revise the blocker to net-dns/avahi and remove the ipv6 support again, bug
+  #176403.
 
   30 Apr 2007; Vlastimil Babka <caster@gentoo.org>
   mDNSResponder-107.6-r4.ebuild:
diff --git a/net-misc/mDNSResponder/Manifest b/net-misc/mDNSResponder/Manifest
index 72f888372106..761399543aed 100644
--- a/net-misc/mDNSResponder/Manifest
+++ b/net-misc/mDNSResponder/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX dnsextd.conf.d 426 RMD160 fb7e2a3eef91c441e140b7d883e681f80479d24d SHA1 e8d4c3655b3fceb692986234d0151000a063294f SHA256 dd1d5210743beb98aa631fcd3611313bbba7d3862b323ac52ccd57d81c337f0d
 MD5 ccbbf27de7cb7a7a00b82ce91dc784ee files/dnsextd.conf.d 426
 RMD160 fb7e2a3eef91c441e140b7d883e681f80479d24d files/dnsextd.conf.d 426
@@ -57,22 +54,18 @@ EBUILD mDNSResponder-107.5.ebuild 2923 RMD160 f7486fc0710ce1ab906f2b14893c0f61cc
 MD5 9ed5a855642c47c0a3a80386c4cf24ef mDNSResponder-107.5.ebuild 2923
 RMD160 f7486fc0710ce1ab906f2b14893c0f61ccc3d729 mDNSResponder-107.5.ebuild 2923
 SHA256 6c11d8f790c87179fb321171728dc7cd3ea1db67f1c1661672315a929253aa1e mDNSResponder-107.5.ebuild 2923
-EBUILD mDNSResponder-107.6-r3.ebuild 3435 RMD160 1deca974432e1b74f86bf28ece7c2b47c5a069ff SHA1 17858eeb8046464c31e98e35a94df6d5a06650ec SHA256 3fde74f734f39298583e84703bc3c0bde801ef678d5791db0c48a8803172e145
-MD5 2e514de0a96348036e405d5695d785c7 mDNSResponder-107.6-r3.ebuild 3435
-RMD160 1deca974432e1b74f86bf28ece7c2b47c5a069ff mDNSResponder-107.6-r3.ebuild 3435
-SHA256 3fde74f734f39298583e84703bc3c0bde801ef678d5791db0c48a8803172e145 mDNSResponder-107.6-r3.ebuild 3435
-EBUILD mDNSResponder-107.6-r4.ebuild 3580 RMD160 1c0019f636fb27804d0996e519d41e087d7ccedb SHA1 84a4f93793e07cc6ef02720ce09ca6c21c74a574 SHA256 bfdb9d90398b7f8786a71af0258600fcfcb0042fa685d31d38015db3ca0771a7
-MD5 d33d0774cb370dea03d4a62116216dff mDNSResponder-107.6-r4.ebuild 3580
-RMD160 1c0019f636fb27804d0996e519d41e087d7ccedb mDNSResponder-107.6-r4.ebuild 3580
-SHA256 bfdb9d90398b7f8786a71af0258600fcfcb0042fa685d31d38015db3ca0771a7 mDNSResponder-107.6-r4.ebuild 3580
+EBUILD mDNSResponder-107.6-r5.ebuild 3481 RMD160 51968074cfa21581d92c996e9e20b1ce89c12e98 SHA1 2101af0ccbf91ad8dcecd015a2954b5f4e1d38da SHA256 53f06b00ccee236601781f1035bc8afe09a84f678cf83e778e533af7a279ccf6
+MD5 ec51268b716097a78f4f4ea35036165b mDNSResponder-107.6-r5.ebuild 3481
+RMD160 51968074cfa21581d92c996e9e20b1ce89c12e98 mDNSResponder-107.6-r5.ebuild 3481
+SHA256 53f06b00ccee236601781f1035bc8afe09a84f678cf83e778e533af7a279ccf6 mDNSResponder-107.6-r5.ebuild 3481
 EBUILD mDNSResponder-98.ebuild 1012 RMD160 bfe529d833974ff31298b8370f93048b0d49e979 SHA1 18b31b6e4ba9713778320cbe39040502491916ad SHA256 10e1886c91d99d739771aaad0d936a3209e07e34b4562586f308a53504858d8e
 MD5 f3ee9315f1c612f51b83cfa9def9df5e mDNSResponder-98.ebuild 1012
 RMD160 bfe529d833974ff31298b8370f93048b0d49e979 mDNSResponder-98.ebuild 1012
 SHA256 10e1886c91d99d739771aaad0d936a3209e07e34b4562586f308a53504858d8e mDNSResponder-98.ebuild 1012
-MISC ChangeLog 5227 RMD160 c9b3edf840c03822fd226d5ff09449e8ac9718cc SHA1 49ad4d0dcfa60d29200d588c39f7c4134287344d SHA256 0fc47d5bc05802439c83eb83286fb17d5be165b8c6d8bdc629b9e1b25d91ae4a
-MD5 857a0ad29d9e29a25994c0ba82238ad0 ChangeLog 5227
-RMD160 c9b3edf840c03822fd226d5ff09449e8ac9718cc ChangeLog 5227
-SHA256 0fc47d5bc05802439c83eb83286fb17d5be165b8c6d8bdc629b9e1b25d91ae4a ChangeLog 5227
+MISC ChangeLog 5503 RMD160 f0d2b821cc2c0aae5eef8fe6a159432fdacb5c18 SHA1 daf199d9098d4066b2fc7722e569f33a626ed7fb SHA256 a5ca3cfec399dfd69386022c3844a14ff7b626557e3fe520eb9756ecc2f3f124
+MD5 3bf32320b428644f731e1441edf7719e ChangeLog 5503
+RMD160 f0d2b821cc2c0aae5eef8fe6a159432fdacb5c18 ChangeLog 5503
+SHA256 a5ca3cfec399dfd69386022c3844a14ff7b626557e3fe520eb9756ecc2f3f124 ChangeLog 5503
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -83,19 +76,9 @@ SHA256 41f4cf29d74c7713a1ce6dc791412c2cfebc5209f9784322a71ad998cc610ddb files/di
 MD5 44a7177053751f549b8ee2422d103fb0 files/digest-mDNSResponder-107.5 262
 RMD160 bfa8d7cbbcbae1df6b1895083bc69a2cc04f6f32 files/digest-mDNSResponder-107.5 262
 SHA256 e8a669ddfb3bd95be4aaaaf176fbcf89b933010cf6ff9e8c11c86250770e1376 files/digest-mDNSResponder-107.5 262
-MD5 e5f35be016ae60995be2e44a68de8ec3 files/digest-mDNSResponder-107.6-r3 262
-RMD160 87a9c5109eda62dcff565fe52c7b44581024502e files/digest-mDNSResponder-107.6-r3 262
-SHA256 99dffdd9ce28636bc59575f11155e139590ad3711968707b50cdd3509fd6d9a0 files/digest-mDNSResponder-107.6-r3 262
-MD5 e5f35be016ae60995be2e44a68de8ec3 files/digest-mDNSResponder-107.6-r4 262
-RMD160 87a9c5109eda62dcff565fe52c7b44581024502e files/digest-mDNSResponder-107.6-r4 262
-SHA256 99dffdd9ce28636bc59575f11155e139590ad3711968707b50cdd3509fd6d9a0 files/digest-mDNSResponder-107.6-r4 262
+MD5 e5f35be016ae60995be2e44a68de8ec3 files/digest-mDNSResponder-107.6-r5 262
+RMD160 87a9c5109eda62dcff565fe52c7b44581024502e files/digest-mDNSResponder-107.6-r5 262
+SHA256 99dffdd9ce28636bc59575f11155e139590ad3711968707b50cdd3509fd6d9a0 files/digest-mDNSResponder-107.6-r5 262
 MD5 a16f554d629c185fe9bded447743110b files/digest-mDNSResponder-98 253
 RMD160 34b39264e2382110fda49cc7fdab8f1e1a3ae545 files/digest-mDNSResponder-98 253
 SHA256 22ba0f9d01e45330fa7992e0f29673c458c6df6f3881764fc07e04bf09d56337 files/digest-mDNSResponder-98 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGPDVu8bi6rjpTunYRAknHAJ99DiU7PmFQhXDtoPLvtJKrq24cNQCgjIi7
-D06ZjdmLEnSc4T9S9VpiZHY=
-=Zk79
------END PGP SIGNATURE-----
diff --git a/net-misc/mDNSResponder/files/digest-mDNSResponder-107.6-r4 b/net-misc/mDNSResponder/files/digest-mDNSResponder-107.6-r4
deleted file mode 100644
index dc5573b1daf0..000000000000
--- a/net-misc/mDNSResponder/files/digest-mDNSResponder-107.6-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 aa4e0e5c57f94489463ea6576591ce9d mDNSResponder-107.6.tar.gz 1441339
-RMD160 68d9ef5949839a950d673c66cc8d0e5bd0348fbb mDNSResponder-107.6.tar.gz 1441339
-SHA256 43d427d3d5c78aef57a49898def469cc4cae28190462205368be1f3a0fcc0165 mDNSResponder-107.6.tar.gz 1441339
diff --git a/net-misc/mDNSResponder/files/digest-mDNSResponder-107.6-r3 b/net-misc/mDNSResponder/files/digest-mDNSResponder-107.6-r5
index dc5573b1daf0..dc5573b1daf0 100644
--- a/net-misc/mDNSResponder/files/digest-mDNSResponder-107.6-r3
+++ b/net-misc/mDNSResponder/files/digest-mDNSResponder-107.6-r5
diff --git a/net-misc/mDNSResponder/mDNSResponder-107.6-r3.ebuild b/net-misc/mDNSResponder/mDNSResponder-107.6-r3.ebuild
deleted file mode 100644
index 098d4ab68f49..000000000000
--- a/net-misc/mDNSResponder/mDNSResponder-107.6-r3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/mDNSResponder-107.6-r3.ebuild,v 1.1 2007/04/28 12:43:13 carlo Exp $
-
-inherit eutils base toolchain-funcs flag-o-matic java-utils-2
-
-DESCRIPTION="The mDNSResponder project is a component of Bonjour, Apple's initiative for zero-configuration networking."
-HOMEPAGE="http://developer.apple.com/networking/bonjour/index.html"
-SRC_URI="http://www.opensource.apple.com/darwinsource/tarballs/other/${P}.tar.gz"
-LICENSE="APSL-2 BSD"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc ipv6 java"
-
-DEPEND="!sys-auth/nss-mdns
-		java? ( >=virtual/jdk-1.5 )"
-RDEPEND="!sys-auth/nss-mdns
-		java? ( >=virtual/jre-1.5 )"
-
-PATCHES="${FILESDIR}/mDNSResponder-107.6-Makefiles.diff"
-pkg_setup() {
-	if use elibc_FreeBSD; then
-		os=freebsd
-	else
-		os=linux
-	fi
-}
-
-mdnsmake() {
-	local debug jdk __ipv6
-	use java && jdk="JDK=$(java-config -O)"
-	use debug && debug='DEBUG=1'
-	use ipv6 && __ipv6='HAVE_IPV6=1' || __ipv6='HAVE_IPV6=0'
-	einfo "Running emake " os="${os}" CC="$(tc-getCC)" LD="$(tc-getCC) -shared" \
-		${jdk} ${debug} OPT_CFLAGS="${CFLAGS}" LIBFLAGS="${LDFLAGS}" \
-		 LOCALBASE="/usr" "$@"
-	emake -j1 os="${os}" CC="$(tc-getCC)" LD="$(tc-getCC) -shared" \
-		${jdk} ${debug} OPT_CFLAGS="${CFLAGS}" LIBFLAGS="${LDFLAGS}" \
-		LOCALBASE="/usr" ${__ipv6} "$@"
-}
-
-src_compile() {
-	cd ${S}/mDNSPosix
-	mdnsmake || die "make failed"
-
-	if use java; then
-		mdnsmake Java || die "make mDNSPosix java failed"
-		if use doc ; then
-			mdnsmake JavaDoc || die "make mDNSPosix java doc failed"
-		fi
-	fi
-}
-
-src_install() {
-	cd "${S}/mDNSPosix"
-
-	dodir /usr/sbin
-	dodir /usr/lib
-	dodir /usr/include
-	dodir /lib
-	dodir /etc
-	dodir /usr/share/man/man5
-	dodir /usr/share/man/man8
-
-	local debug
-	local objdir="prod"
-	if use debug; then
-		debug="DEBUG=1"
-		objdir=debug
-	fi
-
-	dosbin ${S}/mDNSPosix/build/${objdir}/dnsextd
-	dosbin ${S}/mDNSPosix/build/${objdir}/mDNSResponderPosix
-	dosbin ${S}/mDNSPosix/build/${objdir}/mDNSNetMonitor
-	dosbin ${S}/mDNSPosix/build/${objdir}/mdnsd
-
-	dobin ${S}/Clients/build/dns-sd
-	dobin ${S}/mDNSPosix/build/${objdir}/mDNSProxyResponderPosix
-	dobin ${S}/mDNSPosix/build/${objdir}/mDNSIdentify
-	dobin ${S}/mDNSPosix/build/${objdir}/mDNSClientPosix
-
-	dolib ${S}/mDNSPosix/build/${objdir}/libdns_sd.so
-	dolib ${S}/mDNSPosix/build/${objdir}/libnss_mdns-0.2.so
-	dosym libdns_sd.so /usr/$(get_libdir)/libdns_sd.so.1
-	dosym libnss_mdns-0.2.so /usr/$(get_libdir)/libnss_mdns.so.2
-
-	newinitd ${FILESDIR}/mdnsd.init.d mdnsd
-	newinitd ${FILESDIR}/mDNSResponderPosix.init.d mDNSResponderPosix
-	newconfd ${FILESDIR}/mDNSResponderPosix.conf.d mDNSResponderPosix
-	newinitd ${FILESDIR}/dnsextd.init.d dnsextd
-	newconfd ${FILESDIR}/dnsextd.conf.d dnsextd
-
-	insinto /etc
-	doins ${FILESDIR}/mDNSResponderPosix.conf
-
-	insinto /usr/include
-	doins ${S}/mDNSShared/dns_sd.h
-
-	dodoc ${S}/README.txt
-
-	if use java; then
-		java-pkg_dojar ${S}/mDNSPosix/build/${objdir}/dns_sd.jar
-		java-pkg_doso ${S}/mDNSPosix/build/${objdir}/libjdns_sd.so
-		use doc && java-pkg_dojavadoc ${S}/mDNSPosix/build/${objdir}
-	fi
-
-}
-
-pkg_postinst() {
-	echo
-	elog "To enable multicast dns lookups for applications"
-	elog "that are not multicast dns aware, edit the 'hosts:'"
-	elog "line in /etc/nsswitch.conf to include 'mdns', e.g.:"
-	elog "hosts: files mdns dns"
-	echo
-}
diff --git a/net-misc/mDNSResponder/mDNSResponder-107.6-r4.ebuild b/net-misc/mDNSResponder/mDNSResponder-107.6-r5.ebuild
index 2ccd918f4514..e0a9ff82acb8 100644
--- a/net-misc/mDNSResponder/mDNSResponder-107.6-r4.ebuild
+++ b/net-misc/mDNSResponder/mDNSResponder-107.6-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/mDNSResponder-107.6-r4.ebuild,v 1.3 2007/05/05 07:42:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/mDNSResponder-107.6-r5.ebuild,v 1.1 2007/05/05 12:16:45 carlo Exp $
 
 inherit eutils base toolchain-funcs flag-o-matic java-pkg-opt-2
 
@@ -11,11 +11,11 @@ LICENSE="APSL-2 BSD"
 
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc ipv6"
+IUSE="debug doc"
 
-DEPEND="!sys-auth/nss-mdns
+DEPEND="!net-dns/avahi
 		java? ( >=virtual/jdk-1.4 )"
-RDEPEND="!sys-auth/nss-mdns
+RDEPEND="!net-dns/avahi
 		java? ( >=virtual/jre-1.4 )"
 
 PATCHES="${FILESDIR}/mDNSResponder-107.6-Makefiles.diff ${FILESDIR}/mDNSResponder-107.6-java.patch"
@@ -29,16 +29,16 @@ pkg_setup() {
 }
 
 mdnsmake() {
-	local debug jdk __ipv6
+	local debug jdk
 	use java && jdk="JDK=$(java-config -O)"
 	use debug && debug='DEBUG=1'
-	use ipv6 && __ipv6='HAVE_IPV6=1' || __ipv6='HAVE_IPV6=0'
+
 	einfo "Running emake " os="${os}" CC="$(tc-getCC)" LD="$(tc-getCC) -shared" \
 		${jdk} ${debug} OPT_CFLAGS="${CFLAGS}" LIBFLAGS="${LDFLAGS}" \
-		LOCALBASE="/usr" JAVACFLAGS="${JAVACFLAGS}" ${__ipv6} "$@"
+		LOCALBASE="/usr" JAVACFLAGS="${JAVACFLAGS}" "$@"
 	emake -j1 os="${os}" CC="$(tc-getCC)" LD="$(tc-getCC) -shared" \
 		${jdk} ${debug} OPT_CFLAGS="${CFLAGS}" LIBFLAGS="${LDFLAGS}" \
-		LOCALBASE="/usr" JAVACFLAGS="${JAVACFLAGS}" ${__ipv6} "$@"
+		LOCALBASE="/usr" JAVACFLAGS="${JAVACFLAGS}" "$@"
 }
 
 src_compile() {
@@ -105,7 +105,6 @@ src_install() {
 		java-pkg_doso ${S}/mDNSPosix/build/${objdir}/libjdns_sd.so
 		use doc && java-pkg_dojavadoc ${S}/mDNSPosix/build/${objdir}
 	fi
-
 }
 
 pkg_postinst() {