Stable on x86. Fixes according to #45398

8 files changed, 28 insertions, 19 deletions

diff --git a/dev-java/commons-el/ChangeLog b/dev-java/commons-el/ChangeLog
index 2fc04913c14e..28af9a63aca9 100644
--- a/dev-java/commons-el/ChangeLog
+++ b/dev-java/commons-el/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/commons-el
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-el/ChangeLog,v 1.2 2004/03/02 08:54:26 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-el/ChangeLog,v 1.3 2004/03/23 03:27:14 zx Exp $
+
+  22 Mar 2004; Chris Aniszczyk <zx@gentoo.org> commons-el-1.0.ebuild:
+  Stable on x86. Fixes according to #45398
 
 *commons-el-1.0 (28 Feb 2004)
 
diff --git a/dev-java/commons-el/commons-el-1.0.ebuild b/dev-java/commons-el/commons-el-1.0.ebuild
index f5deb4eea750..9397ff451ae8 100644
--- a/dev-java/commons-el/commons-el-1.0.ebuild
+++ b/dev-java/commons-el/commons-el-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-el/commons-el-1.0.ebuild,v 1.1 2004/02/25 22:17:07 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-el/commons-el-1.0.ebuild,v 1.2 2004/03/23 03:27:14 zx Exp $
 
 inherit java-pkg
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://jakarta.apache.org/commons/el.html"
 SRC_URI="mirror://apache/jakarta/commons/el/source/${P}-src.tar.gz"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc"
 IUSE="jikes"
 DEPEND=">=virtual/jdk-1.4
 		>=dev-java/servletapi-2.4
@@ -38,7 +38,7 @@ src_unpack() {
 src_compile() {
 	local antflags="jar"
 	use jikes && antflags="{antflags} -Dbuild.compiler=jikes"
-	ant ${antflags}
+	ant ${antflags} || die "compile problem"
 }
 
 src_install () {
diff --git a/dev-java/commons-modeler/ChangeLog b/dev-java/commons-modeler/ChangeLog
index 602a8d1e3c7e..cad0359325fb 100644
--- a/dev-java/commons-modeler/ChangeLog
+++ b/dev-java/commons-modeler/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/commons-modeler
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-modeler/ChangeLog,v 1.1 2004/02/26 03:50:59 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-modeler/ChangeLog,v 1.2 2004/03/23 03:28:35 zx Exp $
+
+  22 Mar 2004; Chris Aniszczyk <zx@gentoo.org> commons-modeler-1.1.ebuild:
+  Stable on x86. Fixes according to #45398
 
 *commons-modeler-1.1 (28 Feb 2004)
 
diff --git a/dev-java/commons-modeler/commons-modeler-1.1.ebuild b/dev-java/commons-modeler/commons-modeler-1.1.ebuild
index 43bc737d17ae..73f7066cfaa1 100644
--- a/dev-java/commons-modeler/commons-modeler-1.1.ebuild
+++ b/dev-java/commons-modeler/commons-modeler-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-modeler/commons-modeler-1.1.ebuild,v 1.1 2004/02/26 03:51:00 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-modeler/commons-modeler-1.1.ebuild,v 1.2 2004/03/23 03:28:35 zx Exp $
 
 inherit java-pkg
 
@@ -14,7 +14,7 @@ DEPEND=">=virtual/jdk-1.4
 		>=dev-java/commons-logging-1.0.3
 		>=dev-java/commons-digester-1.4.1
 		>=dev-java/xalan-2.5.1"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="doc jikes"
 
 S=${WORKDIR}/${P}-src
@@ -31,14 +31,13 @@ src_unpack() {
 	echo "jaxp.xalan.jar=`java-config --classpath=xalan`" >> build.properties
 	echo "junit.jar=`java-config --classpath=junit`" >> build.properties
 	mkdir dist
-	#epatch ${FILESDIR}/gentoo.diff
 }
 
 src_compile() {
 	antflags="prepare jar"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	use doc && antflags="${antflags} javadoc"
-	ant ${antflags}
+	ant ${antflags} || die "compile problem"
 }
 
 src_install () {
diff --git a/dev-java/joda-time/ChangeLog b/dev-java/joda-time/ChangeLog
index e44741d08450..0f7ecc5bfa10 100644
--- a/dev-java/joda-time/ChangeLog
+++ b/dev-java/joda-time/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/joda-time
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/joda-time/ChangeLog,v 1.3 2004/03/15 15:28:48 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/joda-time/ChangeLog,v 1.4 2004/03/23 03:32:56 zx Exp $
+
+  22 Mar 2004; Chris Aniszczyk <zx@gentoo.org> joda-time-0.95.ebuild:
+  Stable on x86. Fixes according to #45398
 
 *joda-time-0.95 (28 Feb 2004)
 
diff --git a/dev-java/joda-time/joda-time-0.95.ebuild b/dev-java/joda-time/joda-time-0.95.ebuild
index 1470e33ea6ac..4adb6667c7e4 100644
--- a/dev-java/joda-time/joda-time-0.95.ebuild
+++ b/dev-java/joda-time/joda-time-0.95.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/joda-time/joda-time-0.95.ebuild,v 1.2 2004/02/26 15:03:39 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/joda-time/joda-time-0.95.ebuild,v 1.3 2004/03/23 03:32:56 zx Exp $
 
 inherit java-pkg
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://joda-time.sourceforge.net/"
 SRC_URI="mirror://sourceforge/joda-time/${PN}-${PV}-src.tar.gz"
 LICENSE="joda"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="doc jikes"
 
 DEPEND=">=virtual/jdk-1.3
@@ -20,7 +20,7 @@ src_compile() {
 	local antflags="jar"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	use doc && antflags="${antflags} javadoc"
-	ant ${antflags}
+	ant ${antflags} || die "compile problem"
 }
 
 src_install() {
diff --git a/dev-java/poi/ChangeLog b/dev-java/poi/ChangeLog
index a662bbf115d5..3e39f6e04095 100644
--- a/dev-java/poi/ChangeLog
+++ b/dev-java/poi/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/poi
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/ChangeLog,v 1.1 2004/02/24 20:29:28 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/ChangeLog,v 1.2 2004/03/23 03:25:27 zx Exp $
+
+  22 Mar 2004; Chris Aniszczyk <zx@gentoo.org> poi-2.0.ebuild:
+  Stable on x86. Fixes according to #45398
 
 *poi-2.0 (27 Feb 2004)
 
diff --git a/dev-java/poi/poi-2.0.ebuild b/dev-java/poi/poi-2.0.ebuild
index d4d815740202..3e6576d262c2 100644
--- a/dev-java/poi/poi-2.0.ebuild
+++ b/dev-java/poi/poi-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/poi-2.0.ebuild,v 1.1 2004/02/24 20:29:28 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/poi/poi-2.0.ebuild,v 1.2 2004/03/23 03:25:27 zx Exp $
 
 inherit java-pkg
 
@@ -8,11 +8,9 @@ DESCRIPTION="Java API To Access Microsoft Format Files"
 HOMEPAGE="http://jakarta.apache.org/poi/"
 SRC_URI="http://apache.towardex.com/jakarta/poi/release/src/${PN}-src-${PV}-final-20040126.tar.gz"
 IUSE="jikes"
-
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
-
+KEYWORDS="x86 ~ppc"
 DEPEND=">=virtual/jdk-1.2
 		>=dev-java/ant-1.4"
 RDEPEND=">=virtual/jdk-1.2
@@ -31,7 +29,7 @@ S=${WORKDIR}
 src_compile() {
 	local antflags="jar"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags}
+	ant ${antflags} || die "compile problem"
 }
 
 src_install() {