And another round, bug #176348.

(Portage version: 2.1.2.5)

7 files changed, 14 insertions, 239 deletions

diff --git a/net-misc/mDNSResponder/ChangeLog b/net-misc/mDNSResponder/ChangeLog
index 5a4bdc3844af..73da55c28cda 100644
--- a/net-misc/mDNSResponder/ChangeLog
+++ b/net-misc/mDNSResponder/ChangeLog
@@ -1,6 +1,13 @@
 # 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.30 2007/04/28 10:03:06 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/ChangeLog,v 1.31 2007/04/28 12:43:13 carlo Exp $
+
+*mDNSResponder-107.6-r3 (28 Apr 2007)
+
+  28 Apr 2007; Carsten Lohrke <carlo@gentoo.org>
+  -mDNSResponder-107.6.ebuild, -mDNSResponder-107.6-r1.ebuild,
+  -mDNSResponder-107.6-r2.ebuild, +mDNSResponder-107.6-r3.ebuild:
+  And another round, bug #176348.
 
 *mDNSResponder-107.6-r2 (28 Apr 2007)
 
diff --git a/net-misc/mDNSResponder/files/digest-mDNSResponder-107.6-r1 b/net-misc/mDNSResponder/files/digest-mDNSResponder-107.6-r1
deleted file mode 100644
index dc5573b1daf0..000000000000
--- a/net-misc/mDNSResponder/files/digest-mDNSResponder-107.6-r1
+++ /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-r2 b/net-misc/mDNSResponder/files/digest-mDNSResponder-107.6-r2
deleted file mode 100644
index dc5573b1daf0..000000000000
--- a/net-misc/mDNSResponder/files/digest-mDNSResponder-107.6-r2
+++ /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 b/net-misc/mDNSResponder/files/digest-mDNSResponder-107.6-r3
index dc5573b1daf0..dc5573b1daf0 100644
--- a/net-misc/mDNSResponder/files/digest-mDNSResponder-107.6
+++ b/net-misc/mDNSResponder/files/digest-mDNSResponder-107.6-r3
diff --git a/net-misc/mDNSResponder/mDNSResponder-107.6-r1.ebuild b/net-misc/mDNSResponder/mDNSResponder-107.6-r1.ebuild
deleted file mode 100644
index a73ec6edbc44..000000000000
--- a/net-misc/mDNSResponder/mDNSResponder-107.6-r1.ebuild
+++ /dev/null
@@ -1,112 +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-r1.ebuild,v 1.1 2007/04/28 09:46:37 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
-
-	dobin ${S}/Clients/build/dns-sd
-	dobin ${S}/mDNSPosix/build/${objdir}/mDNSProxyResponderPosix
-	dobin ${S}/mDNSPosix/build/${objdir}/mDNSIdentify
-
-	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
-
-	dodoc ${S}/README.txt
-
-	if use java; then
-		java-pkg_dojar ${S}/mDNSPosix/build/prod/dns_sd.jar
-		java-pkg_doso ${S}/mDNSPosix/build/prod/libjdns_sd.so
-		use doc && java-pkg_dojavadoc ${S}/mDNSPosix/build/prod
-	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-r2.ebuild b/net-misc/mDNSResponder/mDNSResponder-107.6-r3.ebuild
index 9aad2bc488b4..098d4ab68f49 100644
--- a/net-misc/mDNSResponder/mDNSResponder-107.6-r2.ebuild
+++ b/net-misc/mDNSResponder/mDNSResponder-107.6-r3.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-r2.ebuild,v 1.1 2007/04/28 10:03:06 carlo Exp $
+# $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
 
@@ -73,10 +73,12 @@ src_install() {
 	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
@@ -98,9 +100,9 @@ src_install() {
 	dodoc ${S}/README.txt
 
 	if use java; then
-		java-pkg_dojar ${S}/mDNSPosix/build/prod/dns_sd.jar
-		java-pkg_doso ${S}/mDNSPosix/build/prod/libjdns_sd.so
-		use doc && java-pkg_dojavadoc ${S}/mDNSPosix/build/prod
+		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
 
 }
diff --git a/net-misc/mDNSResponder/mDNSResponder-107.6.ebuild b/net-misc/mDNSResponder/mDNSResponder-107.6.ebuild
deleted file mode 100644
index 8425482cdb11..000000000000
--- a/net-misc/mDNSResponder/mDNSResponder-107.6.ebuild
+++ /dev/null
@@ -1,116 +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.ebuild,v 1.1 2007/04/27 19:48:15 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
-
-	#emake -j1 LOCALBASE="/usr" DESTDIR="${D}" os=${os} ${debug} install || die "install failed"
-
-	dosbin ${S}/mDNSPosix/build/${objdir}/dnsextd
-	dosbin ${S}/mDNSPosix/build/${objdir}/mDNSResponderPosix
-	dosbin ${S}/mDNSPosix/build/${objdir}/mDNSNetMonitor
-
-	dobin ${S}/Clients/build/dns-sd
-	dobin ${S}/mDNSPosix/build/${objdir}/mDNSProxyResponderPosix
-	dobin ${S}/mDNSPosix/build/${objdir}/mDNSIdentify
-
-	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
-
-	dodoc ${S}/README.txt
-
-	# Fix multilib-strictness
-	local libdir=$(get_libdir)
-	if [[ $libdir != lib ]] ; then
-		mv ${D}/lib ${D}/$(get_libdir)
-		mv ${D}/usr/lib ${D}/usr/$(get_libdir)
-	fi
-
-	if use java; then
-		java-pkg_dojar ${S}/mDNSPosix/build/prod/dns_sd.jar
-		java-pkg_doso ${S}/mDNSPosix/build/prod/libjdns_sd.so
-		use doc && java-pkg_dojavadoc ${S}/mDNSPosix/build/prod
-	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
-}