Remove 'cacao' and 'jamvm' USE flags. Also remove 'zero' flag and have it used only for ppc/ppc64. This functionality was experimental and brought more problems than benefits. Also remove the bootstrapping with cacao due to failures. Fixes numerous bugs.

Package-Manager: portage-2.2.0_alpha68/cvs/Linux x86_64

4 files changed, 36 insertions, 85 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 0501c3b39100..00531e9a31f1 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/icedtea
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.50 2011/11/18 18:11:15 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.51 2011/11/18 21:02:01 caster Exp $
+
+  18 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
+  icedtea-7.2.0-r1.ebuild:
+  Remove 'cacao' and 'jamvm' USE flags. Also remove 'zero' flag and have it
+  used only for ppc/ppc64. This functionality was experimental and brought more
+  problems than benefits. Also remove the bootstrapping with cacao due to
+  failures. Fixes numerous bugs.
 
   18 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
   icedtea-7.2.0-r1.ebuild:
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 9d579b5a8ff0..e64099a7e54c 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -7,17 +7,14 @@ DIST 948e734135ea.tar.gz 3985662 RMD160 52725423b92b5e6f5a6d80525732c8bb1c4ff2be
 DIST 9b85f1265346.tar.gz 2276207 RMD160 39bad7830bb5848efae424192ba54811f6285dbe SHA1 0ccfa5cc21437854e081aa1c5bf87fd272f3232d SHA256 03a256afc7371b3b0fbbbfd80a318e22984f6cbff26082948e8d5845ba193aee
 DIST a2ebfdc9db7e.tar.gz 2760030 RMD160 b1e678045ed8f8c4047760799bc25f94083a76f3 SHA1 830de9e94c710eb38f2ca029de4166fd5672412c SHA256 6edd17ac49c33a32538262486c0b8147954100cab43a6ee7023789f3840f22a8
 DIST b28ae681bae0.tar.gz 9000397 RMD160 0044bc2978f1eab6fb81b5181049f52a5447522d SHA1 4bbcfed2cec6e34bd6c3880d272be742c058c019 SHA256 dcb5a8d4a0a466e3673f891cea40ce163c02f26b0054dfc41c30e0f87c5c2f64
-DIST c7bf150bfa46.tar.gz 4210056 RMD160 f0afca5b073dba922eebbbbd6a9be1725ccaf86e SHA1 d192a1f7ba73346c86e71a295587381f8a4b2bce SHA256 73629f5ac9514afbcf63b6cdf58556e889a5f6a22d4bd70de1dd2816c6500aee
 DIST f0f676c5a2c6.tar.gz 8506038 RMD160 e00e7b602758eaa6cfdd04b109d99694ce2ae94c SHA1 bdc450f5a1b75b2445c960f43dbc7f605042a3c8 SHA256 aaa322239c181e50a61ec71869843eee7a0a82a9b80f113d32faf2a59d7ba5c4
 DIST icedtea-2.0.tar.gz 4516180 RMD160 91e75405713ead34c7831fd23ce66871bf888427 SHA1 aa2399f951044b82f5ecf7318a8358eb08413afb SHA256 2485d5e7807658bc3488c7e6d4720ef1261a31dd698ce2641f541119e0c2387a
 DIST icedtea6-1.10.4.tar.gz 6821129 RMD160 4de37c2086ddcebd2e48004aaa6035870394265c SHA1 b38818a80f2635e21457c6230031e5f7493e6acd SHA256 15491d7f2f81436aaf87f964d923b95b4bda8f6689198b4999961070b6c68851
-DIST jamvm-310c491ddc14e92a6ffff27030a1a1821e6395a8.tar.gz 293833 RMD160 b34f4684e0c918c36d9fb9316a4ae7737b712296 SHA1 60d5782ccb9707699f9dfbfcf647a5c862ef4691 SHA256 b5174f59371017087139fd43d51074ad837ae29340220206ca06769c8329881a
-DIST jamvm-a95ca049d3bb257d730535a5d5ec3f73a943d0aa.tar.gz 288269 RMD160 9f0dafecf766ae27ad19ed1b6d12fdd59104fbd3 SHA1 b5e304b60f274d0ed59c7888e2340a2f043df4f5 SHA256 18bb5c97c03fb73f70b481440e3e11803448d327c024d4570a338b899693fefd
 DIST jaxp144_01.zip 5964803 RMD160 6844ae747a7e7de289ce263ed06050a512416aec SHA1 4f11f9525a83e7842cbd14cc47d967abde093c27 SHA256 d72c2e27a479e7e78e0141cfcf3a9c5dbc5677495bd21b2d52dce85d21322186
 DIST jdk6-jaf-b20.zip 71243 RMD160 40b49d12c39b7010ee917eb671f3c38cd16f271c SHA1 69a54373e169bd7b04a45de6a310a199260424b9 SHA256 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
 DIST jdk6-jaxws-b20.zip 5513069 RMD160 47b2d4fe528d770391e8926299df45cc6f68e9b5 SHA1 08366a70c9e2baa516afc77bb69f9e108e906aa9 SHA256 0c460583898b968a58bf88eb53f90a0e34369e2562d65fb3a143512dfcaeb3eb
 DIST openjdk-6-src-b22-28_feb_2011.tar.gz 45279689 RMD160 2b8f92cdb4d7dd3eb3cbb800a73e1666ee4bf5b1 SHA1 65a60153adbc8bc47fb95bb2b588a9a0b8701c95 SHA256 14a097d45b8c040e984be164a8cefbf22040a9ad57474fe87dd8cf2d0b08328b
-EBUILD icedtea-6.1.10.4-r1.ebuild 11229 RMD160 b47222aa59439442d92308f115f97d0f8984e5cc SHA1 461e0bddf2c9c4d1d404c297fc0b37e7d8119874 SHA256 cd529228f8dfcd0d804099a57f0e7e4ed3ab7255be08490d244794ed62ea6dac
-EBUILD icedtea-7.2.0-r1.ebuild 12025 RMD160 c45c698d58b7485774921d1245a1c0810b061ea8 SHA1 699486df9cf3ff2187ef47ebaffc64a470a732f0 SHA256 5c35ff761eca321ffedb3338c4c9297d3399bbe207bc2f1813e584427dd25ebe
-MISC ChangeLog 9649 RMD160 a49e53be5aa45fed4a50a3563ac6bd0ac2a676e9 SHA1 6b96497f4cf081b995b68971dd5ce5d1bec9b1d9 SHA256 3bac0ce82ea842e6d0603641500c5da792829eff4ec8250d1eed35b788818bc7
+EBUILD icedtea-6.1.10.4-r1.ebuild 10045 RMD160 94fddd5b87c203a146e7c785f0846ebd19d04cbe SHA1 dca736b39f665c5a5dec6516c65b75af89fdb1ad SHA256 55ff4b30e7b2dcb8eb583549ce0a4ff7457a92f2c0c2fa84f4f234f742de88d8
+EBUILD icedtea-7.2.0-r1.ebuild 10945 RMD160 8f1c5471b1ba9f9fe64966c3ce6bd54fb2a7b19b SHA1 4186a65803aa7ae1975a86c93d0d095f6e908e3d SHA256 63da4b0aae6c0d76fec17ba59d0288863ba4de91a7c8d8eee6fbb118f5b5b927
+MISC ChangeLog 10021 RMD160 f9773d34c62cf2e0d84b23a2dc2a2c105f2c1002 SHA1 65edc128353f7a25676fa76a556a4f824f41e229 SHA256 7cc7f1c334601a295ec70dee70aae3ca2367d6a7737723408202fb2a240e4aa5
 MISC metadata.xml 1567 RMD160 7cb547ff92d8896cdbb0dd53aa682fe31d027b4e SHA1 c42d533a391f98fa303b591a4ba1471e0de94b7c SHA256 596df17fd33825a2abb567685bda63f6ff56cbfa616911199855e3fac8bec5e4
diff --git a/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild b/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
index be7615c3a89b..4fe298e14ff4 100644
--- a/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.7 2011/11/18 18:11:15 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.8 2011/11/18 21:02:03 caster Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -25,22 +25,18 @@ JAXP_TARBALL="jaxp144_01.zip"
 JAXWS_TARBALL="jdk6-jaxws-b20.zip"
 JAF_TARBALL="jdk6-jaf-b20.zip"
 HOTSPOT_TARBALL="f0f676c5a2c6.tar.gz"
-CACAO_TARBALL="c7bf150bfa46.tar.gz"
-JAMVM_TARBALL="jamvm-a95ca049d3bb257d730535a5d5ec3f73a943d0aa.tar.gz"
 SRC_URI="http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
 		 http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL}
 		 http://icedtea.classpath.org/download/drops/${JAXWS_TARBALL}
 		 http://icedtea.classpath.org/download/drops/${JAF_TARBALL}
 		 http://icedtea.classpath.org/download/drops/${JAXP_TARBALL}
-		 hs20? ( http://hg.openjdk.java.net/hsx/hsx20/master/archive/${HOTSPOT_TARBALL} )
-		 cacao? ( http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} )
-		 jamvm? ( http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} )"
+		 hs20? ( http://hg.openjdk.java.net/hsx/hsx20/master/archive/${HOTSPOT_TARBALL} )"
 HOMEPAGE="http://icedtea.classpath.org"
 S=${WORKDIR}/${ICEDTEA_PKG}
 
 # Missing options:
 # shark - needs adding
-IUSE="cacao debug doc examples +hs20 jamvm javascript nio2 +nsplugin +nss pulseaudio systemtap +webstart +xrender zero"
+IUSE="debug doc examples +hs20 javascript nio2 +nsplugin +nss pulseaudio systemtap +webstart +xrender"
 
 # JTReg doesn't pass at present
 RESTRICT="test"
@@ -64,7 +60,8 @@ RDEPEND=">=net-print/cups-1.2.12
 	 x11-proto/xineramaproto
 	 pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
 	 javascript? ( dev-java/rhino:1.6 )
-	 zero? ( virtual/libffi )
+	 ppc? ( virtual/libffi )
+	 ppc64? ( virtual/libffi )
 	 xrender? ( >=x11-libs/libXrender-0.9.4 )
 	 systemtap? ( >=dev-util/systemtap-1 )
 	 !dev-java/icedtea6
@@ -82,7 +79,6 @@ RDEPEND=">=net-print/cups-1.2.12
 DEPEND="${RDEPEND}
 	|| (
 		( >=dev-java/gcj-jdk-4.3 >=app-admin/eselect-ecj-0.5-r1 )
-		( >=dev-java/cacao-0.99.2 >=app-admin/eselect-ecj-0.5-r1 )
 		dev-java/icedtea-bin:6
 		dev-java/icedtea:${SLOT}
 	)
@@ -113,19 +109,6 @@ JAVA_PKG_WANT_SOURCE="1.5"
 JAVA_PKG_WANT_TARGET="1.5"
 
 pkg_setup() {
-# Shark support disabled for now - still experimental and needs sys-devel/llvm
-#	if use shark ; then
-#	  if ( ! use x86 && ! use sparc && ! use ppc ) ; then
-#		eerror "The Shark JIT has known issues on 64-bit platforms.  Please rebuild"
-#		errror "without the shark USE flag turned on."
-#		die "Rebuild without the shark USE flag on."
-#	  fi
-#	  if ( ! use zero ) ; then
-#		eerror "The use of the Shark JIT is only applicable when used with the zero assembler port.";
-#		die "Rebuild without the shark USE flag on or with the zero USE flag turned on."
-#	  fi
-#	fi
-
 	if use nsplugin && ! use webstart ; then
 		elog "Note that the nsplugin flag implies the webstart flag. Enable it to remove this message."
 	fi
@@ -151,8 +134,6 @@ pkg_setup() {
 		JAVA_PKG_FORCE_VM="icedtea-bin-6"
 	elif has_version dev-java/gcj-jdk; then
 		JAVA_PKG_FORCE_VM="gcj-jdk"
-	elif has_version dev-java/cacao; then
-		JAVA_PKG_FORCE_VM="cacao"
 	else
 		die "Unable to find a supported VM for building"
 	fi
@@ -180,13 +161,13 @@ src_configure() {
 	if has "${vm}" icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6; then
 		# If we are upgrading icedtea, then we don't need to bootstrap.
 		config="${config} --with-jdk-home=$(java-config -O) --disable-bootstrap"
-	elif has "${vm}" gcj-jdk cacao; then
-		# For other 1.5 JDKs e.g. GCJ, CACAO.
+	elif has "${vm}" gcj-jdk; then
+		# For other 1.5 JDKs e.g. GCJ
 		config="${config} --with-ecj-jar=/usr/share/eclipse-ecj/ecj.jar" \
 		config="${config} --with-jdk-home=${vmhome}"
 	else
 		eerror "IcedTea${SLOT} must be built with either a JDK based on GNU Classpath or an existing build of IcedTea${SLOT}."
-		die "Install a GNU Classpath JDK (gcj-jdk, cacao)"
+		die "Install a GNU Classpath JDK (gcj-jdk)"
 	fi
 
 	# OpenJDK-specific parallelism support. Bug #389791, #337827
@@ -196,7 +177,7 @@ src_configure() {
 	config="${config} --with-parallel-jobs=${procs}";
 	einfo "Configuring using --with-parallel-jobs=${procs}"
 
-	if use_zero ; then
+	if need_zero ; then
 		config="${config} --enable-zero"
 	else
 		config="${config} --disable-zero"
@@ -210,14 +191,6 @@ src_configure() {
 		config="${config} --with-hotspot-build=hs20 --with-hotspot-src-zip=${DISTDIR}/${HOTSPOT_TARBALL}"
 	fi
 
-	if use cacao ; then
-		config="${config} --with-cacao-src-zip=${DISTDIR}/${CACAO_TARBALL}"
-	fi
-
-	if use jamvm ; then
-		config="${config} --with-jamvm-src-zip=${DISTDIR}/${JAMVM_TARBALL}"
-	fi
-
 	unset_vars
 
 	econf ${config} \
@@ -229,8 +202,8 @@ src_configure() {
 		$(use_enable !debug optimizations) \
 		$(use_enable doc docs) \
 		$(use_with javascript rhino ${rhino_jar}) \
-		$(use_enable cacao) \
-		$(use_enable jamvm) \
+		--disable-cacao \
+		--disable-jamvm \
 		$(use_enable pulseaudio pulse-java) \
 		$(use_enable xrender) \
 		$(use_enable systemtap) \
@@ -303,8 +276,8 @@ src_install() {
 	set_java_env "${T}/icedtea.env"
 }
 
-use_zero() {
-	use zero || ( ! use amd64 && ! use x86 && ! use sparc )
+need_zero() {
+	! use amd64 && ! use x86 && ! use sparc
 }
 
 pkg_preinst() {
diff --git a/dev-java/icedtea/icedtea-7.2.0-r1.ebuild b/dev-java/icedtea/icedtea-7.2.0-r1.ebuild
index eed5832aec86..6d8c48420bbc 100644
--- a/dev-java/icedtea/icedtea-7.2.0-r1.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.14 2011/11/18 18:11:15 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.15 2011/11/18 21:02:01 caster Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -25,8 +25,6 @@ JAXP_TARBALL="948e734135ea.tar.gz"
 JAXWS_TARBALL="a2ebfdc9db7e.tar.gz"
 JDK_TARBALL="2054526dd141.tar.gz"
 LANGTOOLS_TARBALL="9b85f1265346.tar.gz"
-CACAO_TARBALL="4549072ab2de.tar.gz"
-JAMVM_TARBALL="310c491ddc14e92a6ffff27030a1a1821e6395a8.tar.gz"
 SRC_URI="http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
 		 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/archive/${OPENJDK_TARBALL}
 		 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/corba/archive/${CORBA_TARBALL}
@@ -34,14 +32,13 @@ SRC_URI="http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
 		 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jaxws/archive/${JAXWS_TARBALL}
 		 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jdk/archive/${JDK_TARBALL}
 		 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/hotspot/archive/${HOTSPOT_TARBALL}
-		 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/langtools/archive/${LANGTOOLS_TARBALL}
-		 jamvm? ( http://icedtea.classpath.org/download/drops/jamvm/jamvm-${JAMVM_TARBALL} )"
+		 http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/langtools/archive/${LANGTOOLS_TARBALL}"
 HOMEPAGE="http://icedtea.classpath.org"
 S=${WORKDIR}/${ICEDTEA_PKG}
 
 # Missing options:
 # shark - needs adding
-IUSE="debug doc examples jamvm javascript +nsplugin pulseaudio systemtap +webstart zero"
+IUSE="debug doc examples javascript +nsplugin pulseaudio systemtap +webstart"
 
 RDEPEND=">=net-print/cups-1.2.12
 	 >=x11-libs/libX11-1.1.3
@@ -63,7 +60,8 @@ RDEPEND=">=net-print/cups-1.2.12
 	 x11-proto/xineramaproto
 	 pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
 	 javascript? ( dev-java/rhino:1.6 )
-	 zero? ( virtual/libffi )
+	 ppc? ( virtual/libffi )
+	 ppc64? ( virtual/libffi )
 	 >=x11-libs/libXrender-0.9.4
 	 systemtap? ( >=dev-util/systemtap-1 )
 	 !dev-java/icedtea:0
@@ -81,7 +79,6 @@ RDEPEND=">=net-print/cups-1.2.12
 DEPEND="${RDEPEND}
 	|| (
 		>=dev-java/gcj-jdk-4.3
-		>=dev-java/cacao-0.99.2
 		dev-java/icedtea-bin:7
 		dev-java/icedtea-bin:6
 		dev-java/icedtea:7
@@ -107,19 +104,6 @@ JAVA_PKG_WANT_SOURCE="1.5"
 JAVA_PKG_WANT_TARGET="1.5"
 
 pkg_setup() {
-# Shark support disabled for now - still experimental and needs sys-devel/llvm
-#	if use shark ; then
-#	  if ( ! use x86 && ! use sparc && ! use ppc ) ; then
-#		eerror "The Shark JIT has known issues on 64-bit platforms.  Please rebuild"
-#		errror "without the shark USE flag turned on."
-#		die "Rebuild without the shark USE flag on."
-#	  fi
-#	  if ( ! use zero ) ; then
-#		eerror "The use of the Shark JIT is only applicable when used with the zero assembler port.";
-#		die "Rebuild without the shark USE flag on or with the zero USE flag turned on."
-#	  fi
-#	fi
-
 	if use nsplugin && ! use webstart ; then
 		elog "Note that the nsplugin flag implies the webstart flag. Enable it to remove this message."
 	fi
@@ -151,8 +135,6 @@ pkg_setup() {
 		JAVA_PKG_FORCE_VM="icedtea-bin-6"
 	elif has_version dev-java/gcj-jdk; then
 		JAVA_PKG_FORCE_VM="gcj-jdk"
-	elif has_version dev-java/cacao; then
-		JAVA_PKG_FORCE_VM="cacao"
 	else
 		die "Unable to find a supported VM for building"
 	fi
@@ -193,7 +175,7 @@ src_configure() {
 	elif has "${vm}" icedtea7 icedtea-7 icedtea-bin-7; then
 		# We can't currently bootstrap with a PaX enabled kernel :(
 		host-is-pax && config="${config} --disable-bootstrap"
-	elif has "${vm}" gcj-jdk cacao; then
+	elif has "${vm}" gcj-jdk ; then
 		if host-is-pax; then
 			eerror "Can't currently bootstrap IcedTea using gcj-jdk or cacao on a PaX enabled host"
 			eerror "Sorry for the inconvenience"
@@ -201,7 +183,7 @@ src_configure() {
 		fi
 	else
 		eerror "IcedTea must be built with either a JDK based on GNU Classpath or an existing build of IcedTea."
-		die "Install a GNU Classpath JDK (gcj-jdk, cacao)"
+		die "Install a GNU Classpath JDK (gcj-jdk)"
 	fi
 
 	# OpenJDK-specific parallelism support. Bug #389791, #337827
@@ -211,7 +193,7 @@ src_configure() {
 	config="${config} --with-parallel-jobs=${procs}";
 	einfo "Configuring using --with-parallel-jobs=${procs}"
 
-	if use_zero ; then
+	if need_zero ; then
 		config="${config} --enable-zero"
 	else
 		config="${config} --disable-zero"
@@ -221,15 +203,6 @@ src_configure() {
 		rhino_jar=$(java-pkg_getjar rhino:1.6 js.jar);
 	fi
 
-# CACAO disabled until it has OpenJDK7 support
-#	if use cacao ; then
-#		config="${config} --with-cacao-src-zip=${DISTDIR}/${CACAO_TARBALL}";
-#	fi
-
-	if use jamvm ; then
-		config="${config} --with-jamvm-src-zip=${DISTDIR}/${JAMVM_TARBALL}";
-	fi
-
 	unset_vars
 
 	econf ${config} \
@@ -246,7 +219,8 @@ src_configure() {
 		$(use_enable !debug optimizations) \
 		$(use_enable doc docs) \
 		$(use_with javascript rhino ${rhino_jar}) \
-		$(use_enable zero) \
+		--disable-cacao \
+		--disable-jamvm \
 		$(use_enable pulseaudio pulse-java) \
 		$(use_enable systemtap)
 }
@@ -323,8 +297,8 @@ src_install() {
 	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
 }
 
-use_zero() {
-	use zero || ( ! use amd64 && ! use x86 && ! use sparc )
+need_zero() {
+	! use amd64 && ! use x86 && ! use sparc
 }
 
 pkg_preinst() {