diff options
| author |   Jan Brinkmann <luckyduck@gentoo.org> | 2005-01-29 21:25:13 +0000 |
|---|---|---|
| committer | Jan Brinkmann <luckyduck@gentoo.org> | 2005-01-29 21:25:13 +0000 |
| commit | d095afe56bcf85465e723453c16d3201a473f80a (patch) | |
| tree | 50206dd31046e0833e08747c1d4dec0d33ade0af /dev-java/bsf | |
| parent | Transition dependancy from net-libs/libpcap to virtual/libpcap (diff) | |
| download | gentoo-2-d095afe56bcf85465e723453c16d3201a473f80a.tar.gz gentoo-2-d095afe56bcf85465e723453c16d3201a473f80a.tar.bz2 gentoo-2-d095afe56bcf85465e723453c16d3201a473f80a.zip | |
updated (R)DEPEND to reflect rhino SLOT changes.
(Portage version: 2.0.51-r15)
Diffstat (limited to 'dev-java/bsf')
| -rw-r--r-- | dev-java/bsf/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/bsf/bsf-2.3.0-r1.ebuild | 8 | ||||
| -rw-r--r-- | dev-java/bsf/bsf-2.3.0-r2.ebuild | 8 |
3 files changed, 13 insertions, 9 deletions
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 |