Fix building with USE=-java, bug #176561; call java-pkg-opt-2_pkg_setup; lower jdk/jre deps to 1.4 because 1.5 isn't needed.

Package-Manager: portage-2.1.2.5

3 files changed, 20 insertions, 14 deletions

diff --git a/net-misc/mDNSResponder/ChangeLog b/net-misc/mDNSResponder/ChangeLog
index cc1f59e844a2..aab92b97d88a 100644
--- a/net-misc/mDNSResponder/ChangeLog
+++ b/net-misc/mDNSResponder/ChangeLog
@@ -1,6 +1,11 @@
 # 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.32 2007/04/28 15:12:04 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/ChangeLog,v 1.33 2007/04/30 21:07:22 caster Exp $
+
+  30 Apr 2007; Vlastimil Babka <caster@gentoo.org>
+  mDNSResponder-107.6-r4.ebuild:
+  Fix building with USE=-java, bug #176561; call java-pkg-opt-2_pkg_setup;
+  lower jdk/jre deps to 1.4 because 1.5 isn't needed.
 
 *mDNSResponder-107.6-r4 (28 Apr 2007)
 
diff --git a/net-misc/mDNSResponder/Manifest b/net-misc/mDNSResponder/Manifest
index b4a0cee0b311..f8700639d36b 100644
--- a/net-misc/mDNSResponder/Manifest
+++ b/net-misc/mDNSResponder/Manifest
@@ -58,18 +58,18 @@ EBUILD mDNSResponder-107.6-r3.ebuild 3435 RMD160 1deca974432e1b74f86bf28ece7c2b4
 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 3547 RMD160 95af6b1b927aa056513ac6f32aafcfdd6011163a SHA1 a4a5d00cb488b9607ed62f868a642f75d3eaa17b SHA256 540813daba3a8bbd319f27b0b38357213c55faebf85143ea02e6129f7e726a2a
-MD5 6ff7715ae3dfaee9b1cc1b1f358d9094 mDNSResponder-107.6-r4.ebuild 3547
-RMD160 95af6b1b927aa056513ac6f32aafcfdd6011163a mDNSResponder-107.6-r4.ebuild 3547
-SHA256 540813daba3a8bbd319f27b0b38357213c55faebf85143ea02e6129f7e726a2a mDNSResponder-107.6-r4.ebuild 3547
+EBUILD mDNSResponder-107.6-r4.ebuild 3565 RMD160 4515dcb0ce1c9029494433c62724d17c4957dde3 SHA1 64fcb5541f63c2bad689c489cc13186d990b637e SHA256 cdcac8c3489181072744643654fb4addcf3c93855dcc2ad6337da6aee6aaceef
+MD5 a2bdcc515b31cdcace9ba97c3b255a18 mDNSResponder-107.6-r4.ebuild 3565
+RMD160 4515dcb0ce1c9029494433c62724d17c4957dde3 mDNSResponder-107.6-r4.ebuild 3565
+SHA256 cdcac8c3489181072744643654fb4addcf3c93855dcc2ad6337da6aee6aaceef mDNSResponder-107.6-r4.ebuild 3565
 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 5012 RMD160 d7be743e87170d3cdd429bfc0fce1efa732dd890 SHA1 a0ce907ab2a2042011fb1bd927daffb6d91e5a40 SHA256 34d5418a0a251dc9501aea36ad3aa3f6f907e31c28df39da21ad7332e0426e8f
-MD5 047f37a1d1f5cdb25a4a93772ccc9c15 ChangeLog 5012
-RMD160 d7be743e87170d3cdd429bfc0fce1efa732dd890 ChangeLog 5012
-SHA256 34d5418a0a251dc9501aea36ad3aa3f6f907e31c28df39da21ad7332e0426e8f ChangeLog 5012
+MISC ChangeLog 5227 RMD160 c9b3edf840c03822fd226d5ff09449e8ac9718cc SHA1 49ad4d0dcfa60d29200d588c39f7c4134287344d SHA256 0fc47d5bc05802439c83eb83286fb17d5be165b8c6d8bdc629b9e1b25d91ae4a
+MD5 857a0ad29d9e29a25994c0ba82238ad0 ChangeLog 5227
+RMD160 c9b3edf840c03822fd226d5ff09449e8ac9718cc ChangeLog 5227
+SHA256 0fc47d5bc05802439c83eb83286fb17d5be165b8c6d8bdc629b9e1b25d91ae4a ChangeLog 5227
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
diff --git a/net-misc/mDNSResponder/mDNSResponder-107.6-r4.ebuild b/net-misc/mDNSResponder/mDNSResponder-107.6-r4.ebuild
index 42bd1eb3bad2..781a361b7799 100644
--- a/net-misc/mDNSResponder/mDNSResponder-107.6-r4.ebuild
+++ b/net-misc/mDNSResponder/mDNSResponder-107.6-r4.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.1 2007/04/28 15:12:04 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mDNSResponder/mDNSResponder-107.6-r4.ebuild,v 1.2 2007/04/30 21:07:22 caster Exp $
 
 inherit eutils base toolchain-funcs flag-o-matic java-pkg-opt-2
 
@@ -14,9 +14,9 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="debug doc ipv6"
 
 DEPEND="!sys-auth/nss-mdns
-		java? ( >=virtual/jdk-1.5 )"
+		java? ( >=virtual/jdk-1.4 )"
 RDEPEND="!sys-auth/nss-mdns
-		java? ( >=virtual/jre-1.5 )"
+		java? ( >=virtual/jre-1.4 )"
 
 PATCHES="${FILESDIR}/mDNSResponder-107.6-Makefiles.diff ${FILESDIR}/mDNSResponder-107.6-java.patch"
 pkg_setup() {
@@ -25,6 +25,7 @@ pkg_setup() {
 	else
 		os=linux
 	fi
+	java-pkg-opt-2_pkg_setup
 }
 
 mdnsmake() {
@@ -34,10 +35,10 @@ mdnsmake() {
 	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="$(java-pkg_javac-args)" "$@"
+		LOCALBASE="/usr" JAVACFLAGS="${JAVACFLAGS}" ${__ipv6} "$@"
 	emake -j1 os="${os}" CC="$(tc-getCC)" LD="$(tc-getCC) -shared" \
 		${jdk} ${debug} OPT_CFLAGS="${CFLAGS}" LIBFLAGS="${LDFLAGS}" \
-		LOCALBASE="/usr" JAVACFLAGS="$(java-pkg_javac-args)" ${__ipv6} "$@"
+		LOCALBASE="/usr" JAVACFLAGS="${JAVACFLAGS}" ${__ipv6} "$@"
 }
 
 src_compile() {