Marking stable on x86. Fixes according to #45398

10 files changed, 17 insertions, 102 deletions

diff --git a/dev-java/lucene/ChangeLog b/dev-java/lucene/ChangeLog
index df84bec9bec1..0aaa66c97926 100644
--- a/dev-java/lucene/ChangeLog
+++ b/dev-java/lucene/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/lucene
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/ChangeLog,v 1.3 2004/03/15 15:28:48 aliz Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/ChangeLog,v 1.4 2004/03/23 02:58:31 zx Exp $
+
+  22 Mar 2004; Chris Aniszczyk <zx@gentoo.org> lucene-1.2.ebuild,
+  lucene-1.3.ebuild:
+  Marking stable on x86. Fixes according to #45398
 
 *lucene-1.3 (07 Mar 2004)
 
diff --git a/dev-java/lucene/files/digest-lucene-1.2 b/dev-java/lucene/files/digest-lucene-1.2
deleted file mode 100644
index 177f6bab0169..000000000000
--- a/dev-java/lucene/files/digest-lucene-1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d1435c3fae2817bfd2d88d5fe868f27 lucene-1.2.tar.gz 611106
diff --git a/dev-java/lucene/lucene-1.2.ebuild b/dev-java/lucene/lucene-1.2.ebuild
deleted file mode 100644
index 2aa92c83c106..000000000000
--- a/dev-java/lucene/lucene-1.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-1.2.ebuild,v 1.4 2004/03/07 02:32:30 zx Exp $
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="http://jakarta.apache.org/lucene"
-SRC_URI="http://jakarta.apache.org/builds/jakarta-${PN}/release/v${PV//_/-}/${P}.tar.gz"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-RDEPEND=">=virtual/jdk-1.1"
-
-S="${WORKDIR}/${P}"
-
-src_install() {
-	mv ${P}.jar lucene.jar
-	dojar lucene.jar
-	dodoc CHANGES.txt LICENSE.txt README.txt TODO.txt
-	dohtml -r docs/*
-}
diff --git a/dev-java/lucene/lucene-1.3.ebuild b/dev-java/lucene/lucene-1.3.ebuild
index 05c19b376ea4..436f325e25ab 100644
--- a/dev-java/lucene/lucene-1.3.ebuild
+++ b/dev-java/lucene/lucene-1.3.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/lucene/lucene-1.3.ebuild,v 1.1 2004/03/07 02:32:30 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-1.3.ebuild,v 1.2 2004/03/23 02:58:31 zx Exp $
 
 inherit java-pkg
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://jakarta.apache.org/lucene"
 SRC_URI="mirror://apache/jakarta/lucene/source/${P}-final-src.tar.gz"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="jikes doc"
 DEPEND=">=virtual/jdk-1.2
 		>=dev-java/ant-1.5
@@ -22,7 +22,7 @@ src_compile() {
 	local antflags="jar-core"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	use doc && antflags="${antflags} javadoc"
-	ant ${antflags}
+	ant ${antflags} || die "compilation failed"
 }
 
 src_install() {
diff --git a/dev-java/rhino/ChangeLog b/dev-java/rhino/ChangeLog
index ef30c6fdb0d9..a6229ee4310b 100644
--- a/dev-java/rhino/ChangeLog
+++ b/dev-java/rhino/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/rhino
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.5 2004/02/26 06:20:51 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.6 2004/03/23 03:02:18 zx Exp $
+
+  22 Mar 2004; Chris Aniszczyk <zx@gentoo.org> rhino-1.5_rc4-r1.ebuild,
+  rhino-1.5_rc4.ebuild, rhino-1.5_rc5.ebuild:
+  Marking stable on x86. Fixes according to #45398
 
 *rhino-1.5_rc5 (28 Feb 2004)
 
diff --git a/dev-java/rhino/files/digest-rhino-1.5_rc4 b/dev-java/rhino/files/digest-rhino-1.5_rc4
deleted file mode 100644
index 34d989cf4b6e..000000000000
--- a/dev-java/rhino/files/digest-rhino-1.5_rc4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f50367530e9860eb4110286bd8ebe175 rhino15R41.zip 1462836
diff --git a/dev-java/rhino/files/digest-rhino-1.5_rc4-r1 b/dev-java/rhino/files/digest-rhino-1.5_rc4-r1
deleted file mode 100644
index 34d989cf4b6e..000000000000
--- a/dev-java/rhino/files/digest-rhino-1.5_rc4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f50367530e9860eb4110286bd8ebe175 rhino15R41.zip 1462836
diff --git a/dev-java/rhino/rhino-1.5_rc4-r1.ebuild b/dev-java/rhino/rhino-1.5_rc4-r1.ebuild
deleted file mode 100644
index 19183a236ac2..000000000000
--- a/dev-java/rhino/rhino-1.5_rc4-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.5_rc4-r1.ebuild,v 1.1 2004/01/23 15:43:58 mkennedy Exp $
-
-# This should be dynamic
-
-inherit java-pkg
-
-IUSE="doc"
-
-MY_P="rhino1_5R4_1"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Rhino is an implementation of JavaScript written entirely in Java."
-SRC_URI="ftp://ftp.mozilla.org/pub/js/${MY_P//_/}.zip"
-HOMEPAGE="http://www.mozilla.org/rhino/"
-LICENSE="NPL-1.1"
-SLOT="0"
-KEYWORDS="x86 ~ppc amd64"
-
-RDEPEND=">=virtual/jdk-1.3
-	dev-java/ant"
-
-src_compile() {
-	ant jar
-}
-
-src_install() {
-	dobin ${FILESDIR}/jsscript
-	java-pkg_dojar build/${MY_P}/js.jar
-	if use doc; then
-		dohtml -r docs/*
-	fi
-}
diff --git a/dev-java/rhino/rhino-1.5_rc4.ebuild b/dev-java/rhino/rhino-1.5_rc4.ebuild
deleted file mode 100644
index 98aaf2aaa110..000000000000
--- a/dev-java/rhino/rhino-1.5_rc4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.5_rc4.ebuild,v 1.6 2004/01/19 04:52:10 strider Exp $
-
-# This should be dynamic
-
-inherit java-pkg
-
-IUSE="doc"
-
-MY_P="rhino1_5R4_1"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Rhino is an open-source implementation of JavaScript written entirely in Java. It is typically embedded into Java applications to provide scripting to end users"
-SRC_URI="ftp://ftp.mozilla.org/pub/js/${MY_P//_/}.zip"
-HOMEPAGE="http://www.mozilla.org/rhino/"
-LICENSE="NPL-1.1"
-SLOT="0"
-KEYWORDS="x86 ~ppc amd64"
-
-RDEPEND=">=virtual/jdk-1.3
-	dev-java/ant"
-
-src_compile() {
-	ant jar
-}
-
-
-src_install() {
-	java-pkg_dojar build/${MY_P}/js.jar
-	if [ "` use doc `" ]; then
-		dohtml -r docs/*
-	fi
-}
diff --git a/dev-java/rhino/rhino-1.5_rc5.ebuild b/dev-java/rhino/rhino-1.5_rc5.ebuild
index 2ef995764a32..e1a132859185 100644
--- a/dev-java/rhino/rhino-1.5_rc5.ebuild
+++ b/dev-java/rhino/rhino-1.5_rc5.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/rhino/rhino-1.5_rc5.ebuild,v 1.1 2004/02/26 06:20:51 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.5_rc5.ebuild,v 1.2 2004/03/23 03:02:18 zx Exp $
 
 inherit java-pkg
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.zip"
 HOMEPAGE="http://www.mozilla.org/rhino/"
 LICENSE="NPL-1.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc ~amd64"
 IUSE="jikes doc"
 S="${WORKDIR}/${MY_P%%RC1}"
 DEPEND="dev-java/ant
@@ -21,7 +21,7 @@ RDEPEND=">=virtual/jre-1.3"
 src_compile() {
 	local antflags="jar"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags}
+	ant ${antflags} || die "compilation error"
 }
 
 src_install() {