updated (R)DEPEND to reflect rhino SLOT changes.

(Portage version: 2.0.51-r15)

6 files changed, 24 insertions, 14 deletions

diff --git a/dev-java/batik/ChangeLog b/dev-java/batik/ChangeLog
index 0b71206cd44a..2c65c4ec79d0 100644
--- a/dev-java/batik/ChangeLog
+++ b/dev-java/batik/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/batik
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.17 2005/01/01 18:09:41 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.18 2005/01/29 21:25:13 luckyduck Exp $
+
+*batik-1.5.1-r3 (29 Jan 2005)
+
+  29 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> -batik-1.5.1-r2.ebuild,
+  +batik-1.5.1-r3.ebuild:
+  updated (R)DEPEND to reflect rhino SLOT changes.
 
   03 Nov 2004; Thomas Matthijs <axxo@gentoo.org> batik-1.5.1-r2.ebuild,
   batik-1.5.1.ebuild:
diff --git a/dev-java/batik/batik-1.5.1-r2.ebuild b/dev-java/batik/batik-1.5.1-r3.ebuild
index a072cf25f03c..1b1d29fc6e24 100644
--- a/dev-java/batik/batik-1.5.1-r2.ebuild
+++ b/dev-java/batik/batik-1.5.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.5.1-r2.ebuild,v 1.3 2005/01/01 18:09:41 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.5.1-r3.ebuild,v 1.1 2005/01/29 21:25:13 luckyduck Exp $
 
 inherit java-pkg
 
@@ -9,7 +9,7 @@ SRC_URI="mirror://apache/xml/batik/${PN}-src-${PV}.zip"
 HOMEPAGE="http://xml.apache.org/batik/"
 IUSE="doc"
 DEPEND=">=virtual/jdk-1.3
-		dev-java/rhino
+		=dev-java/rhino-1.5*
 		dev-java/fop
 		app-arch/unzip
 		>=dev-java/xerces-2.6.2-r1
@@ -26,7 +26,7 @@ src_unpack() {
 	cd ${S}/lib
 	rm -f *.jar
 	java-pkg_jar-from xerces-2
-	java-pkg_jar-from rhino
+	java-pkg_jar-from rhino-1.5
 	java-pkg_jar-from fop
 }
 
@@ -44,7 +44,7 @@ src_install () {
 	use doc && java-pkg_dohtml -r ${P}/docs/
 
 	echo "#!/bin/sh" > ${PN}
-	echo '${JAVA_HOME}/bin/java -classpath $(java-config -p batik,xerces-2,rhino,fop) org.apache.batik.apps.svgbrowser.Main $*' >> ${PN}
+	echo '${JAVA_HOME}/bin/java -classpath $(java-config -p batik,xerces-2,rhino-1.5,fop) org.apache.batik.apps.svgbrowser.Main $*' >> ${PN}
 	dobin ${PN}
 
 }
diff --git a/dev-java/batik/files/digest-batik-1.5.1-r2 b/dev-java/batik/files/digest-batik-1.5.1-r3
index cab50b8d6f96..cab50b8d6f96 100644
--- a/dev-java/batik/files/digest-batik-1.5.1-r2
+++ b/dev-java/batik/files/digest-batik-1.5.1-r3
diff --git a/dev-java/bsf/ChangeLog b/dev-java/bsf/ChangeLog
index e631821a30fa..767fa49178f3 100644
--- a/dev-java/bsf/ChangeLog
+++ b/dev-java/bsf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/bsf
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/ChangeLog,v 1.19 2005/01/26 21:49:49 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/ChangeLog,v 1.20 2005/01/29 21:23:54 luckyduck Exp $
+
+  29 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> bsf-2.3.0-r1.ebuild,
+  bsf-2.3.0-r2.ebuild:
+  updated (R)DEPEND to reflect rhino SLOT changes.
 
   26 Jan 2005; Markus Rothe <corsair@gentoo.org> bsf-2.3.0-r2.ebuild:
   Stable on ppc64
diff --git a/dev-java/bsf/bsf-2.3.0-r1.ebuild b/dev-java/bsf/bsf-2.3.0-r1.ebuild
index 28aac831adac..14e31242827d 100644
--- a/dev-java/bsf/bsf-2.3.0-r1.ebuild
+++ b/dev-java/bsf/bsf-2.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/bsf-2.3.0-r1.ebuild,v 1.7 2005/01/01 18:12:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/bsf-2.3.0-r1.ebuild,v 1.8 2005/01/29 21:23:54 luckyduck Exp $
 
 inherit java-pkg eutils
 
@@ -15,7 +15,7 @@ IUSE="doc jython rhino"
 RDEPEND="=www-servers/tomcat-5*"
 DEPEND="${REPEND}
 	jython? ( >=dev-java/jython-2.1-r5 )
-	rhino? ( >=dev-java/rhino-1.4 )
+	rhino? ( =dev-java/rhino-1.5* )
 	>=dev-java/ant-1.5.4"
 
 src_unpack() {
@@ -24,7 +24,7 @@ src_unpack() {
 	epatch ${WORKDIR}/bsf-rhino-1.5.patch
 
 	cd ${S}/src/build/lib
-	java-pkg_jar-from rhino || die "Missing rhino"
+	java-pkg_jar-from rhino-1.5 || die "Missing rhino"
 	java-pkg_jar-from jython || die "Missing jython"
 }
 
@@ -39,7 +39,7 @@ src_compile() {
 	cp="${cp}:/opt/tomcat5/common/lib/jsp-api.jar"
 
 
-	cp="${cp}:$(java-config -p rhino)"
+	cp="${cp}:$(java-config -p rhino-1.5)"
 	cp="${cp}:$(java-config -p jython)"
 
 	local antflags=
diff --git a/dev-java/bsf/bsf-2.3.0-r2.ebuild b/dev-java/bsf/bsf-2.3.0-r2.ebuild
index cfa4f3e1ff35..5831a26bea7f 100644
--- a/dev-java/bsf/bsf-2.3.0-r2.ebuild
+++ b/dev-java/bsf/bsf-2.3.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/bsf-2.3.0-r2.ebuild,v 1.10 2005/01/26 21:49:49 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bsf/bsf-2.3.0-r2.ebuild,v 1.11 2005/01/29 21:23:54 luckyduck Exp $
 
 inherit java-pkg eutils
 
@@ -13,7 +13,7 @@ KEYWORDS="~x86 ~ppc ~sparc ~amd64 ppc64"
 IUSE="doc jython rhino jikes"
 RDEPEND=">=virtual/jre-1.4
 	jython? ( >=dev-java/jython-2.1-r5 )
-	rhino? ( >=dev-java/rhino-1.4 )
+	rhino? ( =dev-java/rhino-1.5* )
 	=dev-java/servletapi-2.3*
 	>=dev-java/ant-1.5.4"
 DEPEND=">=virtual/jdk-1.4
@@ -28,7 +28,7 @@ src_unpack() {
 
 	cd ${S}/src/build/lib
 	if use rhino; then
-		java-pkg_jar-from rhino || die "Missing rhino"
+		java-pkg_jar-from rhino-1.5 || die "Missing rhino"
 	fi
 
 	if use jython; then
@@ -39,7 +39,7 @@ src_unpack() {
 
 src_compile() {
 
-	use rhino && cp="${cp}:$(java-config -p rhino)"
+	use rhino && cp="${cp}:$(java-config -p rhino-1.5)"
 	use jython && cp="${cp}:$(java-config -p jython)"
 
 	# karltk: fix this