Fix compilation with debug builds, closes bug 179280.

Package-Manager: portage-2.1.3_rc8

3 files changed, 33 insertions, 14 deletions

diff --git a/net-misc/mDNSResponder/ChangeLog b/net-misc/mDNSResponder/ChangeLog
index 0fb570848bc7..0460003199c6 100644
--- a/net-misc/mDNSResponder/ChangeLog
+++ b/net-misc/mDNSResponder/ChangeLog
@@ -1,6 +1,10 @@
 # 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.34 2007/05/05 12:16:45 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/ChangeLog,v 1.35 2007/07/20 20:23:29 cryos Exp $
+
+  20 Jul 2007; Marcus D. Hanwell <cryos@gentoo.org>
+  mDNSResponder-107.6-r5.ebuild:
+  Fix compilation with debug builds, closes bug 179280.
 
 *mDNSResponder-107.6-r5 (05 May 2007)
 
diff --git a/net-misc/mDNSResponder/Manifest b/net-misc/mDNSResponder/Manifest
index 761399543aed..9662b97b26a1 100644
--- a/net-misc/mDNSResponder/Manifest
+++ b/net-misc/mDNSResponder/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -54,18 +57,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-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-107.6-r5.ebuild 3635 RMD160 cc4b766936e4e88145aa3c3ef9554135dea198be SHA1 d1aa12056bea71899b1e1f4b072802bdb4128355 SHA256 707b2f64f9d6b65b7fee2146e873f30832c5c8f6ee4af18340dc963129f7fadd
+MD5 404eb9c88b996abbef003f94d82a503d mDNSResponder-107.6-r5.ebuild 3635
+RMD160 cc4b766936e4e88145aa3c3ef9554135dea198be mDNSResponder-107.6-r5.ebuild 3635
+SHA256 707b2f64f9d6b65b7fee2146e873f30832c5c8f6ee4af18340dc963129f7fadd mDNSResponder-107.6-r5.ebuild 3635
 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 5503 RMD160 f0d2b821cc2c0aae5eef8fe6a159432fdacb5c18 SHA1 daf199d9098d4066b2fc7722e569f33a626ed7fb SHA256 a5ca3cfec399dfd69386022c3844a14ff7b626557e3fe520eb9756ecc2f3f124
-MD5 3bf32320b428644f731e1441edf7719e ChangeLog 5503
-RMD160 f0d2b821cc2c0aae5eef8fe6a159432fdacb5c18 ChangeLog 5503
-SHA256 a5ca3cfec399dfd69386022c3844a14ff7b626557e3fe520eb9756ecc2f3f124 ChangeLog 5503
+MISC ChangeLog 5645 RMD160 3dd45f6cf608c36f37154e20072bf394bcb654d7 SHA1 6bed404021fcf07e7adf552e7c864638fa6a5b83 SHA256 4ea7db4f2c1b1d69f8e789578eb057053bc3ca077e517983c11b73842efec3a0
+MD5 d7ac1a12a71dd1399b52d8e958eed005 ChangeLog 5645
+RMD160 3dd45f6cf608c36f37154e20072bf394bcb654d7 ChangeLog 5645
+SHA256 4ea7db4f2c1b1d69f8e789578eb057053bc3ca077e517983c11b73842efec3a0 ChangeLog 5645
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -82,3 +85,10 @@ SHA256 99dffdd9ce28636bc59575f11155e139590ad3711968707b50cdd3509fd6d9a0 files/di
 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.5 (GNU/Linux)
+
+iD8DBQFGoRnAntT9W3vfTuoRAjBLAJ41p5SBNc7pRaq6p7FrAqo/MDDOzwCeMad3
+2uvGV3y3PJV1tMidMLQIRPs=
+=XLt+
+-----END PGP SIGNATURE-----
diff --git a/net-misc/mDNSResponder/mDNSResponder-107.6-r5.ebuild b/net-misc/mDNSResponder/mDNSResponder-107.6-r5.ebuild
index e0a9ff82acb8..28c4890a1bfd 100644
--- a/net-misc/mDNSResponder/mDNSResponder-107.6-r5.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-r5.ebuild,v 1.1 2007/05/05 12:16:45 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/mDNSResponder-107.6-r5.ebuild,v 1.2 2007/07/20 20:23:29 cryos Exp $
 
 inherit eutils base toolchain-funcs flag-o-matic java-pkg-opt-2
 
@@ -14,11 +14,13 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="debug doc"
 
 DEPEND="!net-dns/avahi
-		java? ( >=virtual/jdk-1.4 )"
+	java? ( >=virtual/jdk-1.4 )"
 RDEPEND="!net-dns/avahi
-		java? ( >=virtual/jre-1.4 )"
+	java? ( >=virtual/jre-1.4 )"
+
+PATCHES="${FILESDIR}/mDNSResponder-107.6-Makefiles.diff
+	${FILESDIR}/mDNSResponder-107.6-java.patch"
 
-PATCHES="${FILESDIR}/mDNSResponder-107.6-Makefiles.diff ${FILESDIR}/mDNSResponder-107.6-java.patch"
 pkg_setup() {
 	if use elibc_FreeBSD; then
 		os=freebsd
@@ -31,7 +33,10 @@ pkg_setup() {
 mdnsmake() {
 	local debug jdk
 	use java && jdk="JDK=$(java-config -O)"
-	use debug && debug='DEBUG=1'
+	if use debug; then
+		debug='DEBUG=1'
+		sed -e 's|LIBS = -L../mDNSPosix/build/prod/ -ldns_sd|LIBS = -L../mDNSPosix/build/debug/ -ldns_sd|g' ../Clients/Makefile || die "sed failed"
+	fi
 
 	einfo "Running emake " os="${os}" CC="$(tc-getCC)" LD="$(tc-getCC) -shared" \
 		${jdk} ${debug} OPT_CFLAGS="${CFLAGS}" LIBFLAGS="${LDFLAGS}" \