Marking x86

4 files changed, 6 insertions, 44 deletions

diff --git a/dev-java/rhino/ChangeLog b/dev-java/rhino/ChangeLog
index 67e7f2ece408..a250d1c6f147 100644
--- a/dev-java/rhino/ChangeLog
+++ b/dev-java/rhino/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/rhino
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.12 2004/06/24 22:41:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/ChangeLog,v 1.13 2004/08/24 03:34:08 zx Exp $
+
+  23 Aug 2004; Chris Aniszczyk <zx@gentoo.org> -rhino-1.5-r5.ebuild:
+  Marking x86 & cleanup
 
 *rhino-1.5_rc5 (20 Jun 2004)
 
diff --git a/dev-java/rhino/files/digest-rhino-1.5-r5 b/dev-java/rhino/files/digest-rhino-1.5-r5
deleted file mode 100644
index 584bee855d3b..000000000000
--- a/dev-java/rhino/files/digest-rhino-1.5-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 af27c07d75bd1697883691318e6da70d rhino1_5R5.zip 1522154
diff --git a/dev-java/rhino/rhino-1.5-r5.ebuild b/dev-java/rhino/rhino-1.5-r5.ebuild
deleted file mode 100644
index f8ad43fb412a..000000000000
--- a/dev-java/rhino/rhino-1.5-r5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.5-r5.ebuild,v 1.6 2004/06/24 22:41:53 agriffis Exp $
-
-inherit java-pkg
-
-MY_P="rhino1_5R5"
-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/mozilla.org/js/${MY_P}.zip"
-HOMEPAGE="http://www.mozilla.org/rhino/"
-LICENSE="NPL-1.1"
-SLOT="0"
-# karltk: This is deprecated, but we can't just remove it, since we don't have a stable
-# to replace it with.
-KEYWORDS="-*"
-IUSE="jikes doc"
-S="${WORKDIR}/${MY_P%%RC1}"
-DEPEND="dev-java/ant
-		>=virtual/jdk-1.3
-		jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jre-1.3"
-RESTRICT="nomirror"
-
-src_compile() {
-	local antflags="jar"
-
-	[ -n $http_proxy ] && proxyhost=`echo $http_proxy | sed -e "s/^\(.*\):\([0-9]*\)/\1/g" ` && \
-	  proxyport=`echo $http_proxy | sed -e "s/^\(.*\):\([0-9]*\)/\2/g" ` && \
-	  sed -e "s:<target name=\"get-swing-ex\" unless=\"swing-ex-available\">:&\n<setproxy proxyhost=\"${proxyhost}\" proxyport=\"${proxyport}\" />:g" \
-	      -i toolsrc/build.xml
-
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "compilation error"
-}
-
-src_install() {
-	dobin ${FILESDIR}/jsscript
-	java-pkg_dojar build/*/js.jar
-	use doc && dohtml -r docs/*
-}
diff --git a/dev-java/rhino/rhino-1.5_rc5.ebuild b/dev-java/rhino/rhino-1.5_rc5.ebuild
index 9e31091db5f9..2034e3908184 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 Foundation
 # 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.5 2004/06/24 22:41:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rhino/rhino-1.5_rc5.ebuild,v 1.6 2004/08/24 03:34:08 zx Exp $
 
 inherit eutils java-pkg
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/js/${MY_P}.zip http://dev.gentoo.
 HOMEPAGE="http://www.mozilla.org/rhino/"
 LICENSE="NPL-1.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="x86 ~ppc ~amd64 ~sparc"
 IUSE="jikes doc"
 S="${WORKDIR}/${MY_P%%RC1}"
 DEPEND="dev-java/ant