diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2007-04-30 21:07:22 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2007-04-30 21:07:22 +0000 |
| commit | def19a52f58537fd7fbfdebadd1ac68c6f98dd23 (patch) | |
| tree | 009aa15cdaa2ba98bf10bc1dae7e07aa164bd5bc /net-misc/mDNSResponder | |
| parent | Replacing einfo with elog (diff) | |
| download | gentoo-2-def19a52f58537fd7fbfdebadd1ac68c6f98dd23.tar.gz gentoo-2-def19a52f58537fd7fbfdebadd1ac68c6f98dd23.tar.bz2 gentoo-2-def19a52f58537fd7fbfdebadd1ac68c6f98dd23.zip | |
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.
(Portage version: 2.1.2.5)
Diffstat (limited to 'net-misc/mDNSResponder')
| -rw-r--r-- | net-misc/mDNSResponder/ChangeLog | 7 | ||||
| -rw-r--r-- | net-misc/mDNSResponder/mDNSResponder-107.6-r4.ebuild | 11 |
2 files changed, 12 insertions, 6 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/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() { |