diff options
| author |   Christoph Junghans <ottxor@gentoo.org> | 2012-08-20 02:32:48 +0000 |
|---|---|---|
| committer | Christoph Junghans <ottxor@gentoo.org> | 2012-08-20 02:32:48 +0000 |
| commit | 933d1a67973a5abf3b57b71ab209e95cc6202149 (patch) | |
| tree | 2ec770796913371cb2658f4245814f3d3aa88a92 /dev-java | |
| parent | added prefix keywords (diff) | |
| download | gentoo-2-933d1a67973a5abf3b57b71ab209e95cc6202149.tar.gz gentoo-2-933d1a67973a5abf3b57b71ab209e95cc6202149.tar.bz2 gentoo-2-933d1a67973a5abf3b57b71ab209e95cc6202149.zip | |
added prefix keywords
(Portage version: 2.2.0_alpha121/cvs/Linux i686)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/jruby/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/jruby/jruby-1.6.7.2.ebuild | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog index d1f549d797b9..61cc0ca2a883 100644 --- a/dev-java/jruby/ChangeLog +++ b/dev-java/jruby/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/jruby # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.86 2012/06/25 07:43:03 nativemad Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.87 2012/08/20 02:32:48 ottxor Exp $ + + 20 Aug 2012; Christoph Junghans <ottxor@gentoo.org> jruby-1.6.7.2.ebuild: + added prefix keywords 25 Jun 2012; Andreas Schuerch <nativemad@gentoo.org> jruby-1.6.5.1.ebuild: Pawel obviously forgot that package for x86 on bug 396305... I need it now diff --git a/dev-java/jruby/jruby-1.6.7.2.ebuild b/dev-java/jruby/jruby-1.6.7.2.ebuild index a8d6e51fefac..beb4b68da2fa 100644 --- a/dev-java/jruby/jruby-1.6.7.2.ebuild +++ b/dev-java/jruby/jruby-1.6.7.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.6.7.2.ebuild,v 1.1 2012/05/09 04:03:28 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.6.7.2.ebuild,v 1.2 2012/08/20 02:32:48 ottxor Exp $ EAPI="4" JAVA_PKG_IUSE="doc source test" @@ -13,7 +13,7 @@ HOMEPAGE="http://jruby.codehaus.org/" SRC_URI="http://jruby.org.s3.amazonaws.com/downloads/${PV}/${PN}-src-${PV}.tar.gz" LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="bsf ssl" # jffi still needed? Or do we call that jnr-ffi? @@ -152,7 +152,7 @@ src_test() { #bsf optionally depends on jruby, which means that the previously #installed jruby will be added to classpath, nasty things will happen. local cpath=`java-pkg_getjars ${EANT_GENTOO_CLASSPATH// /,},junit-4` - cpath="$(echo ${cpath} | sed -e "s_${ROOT}/usr/share/jruby/lib/jruby.jar:__g")" + cpath="$(echo ${cpath} | sed -e "s_${EROOT}/usr/share/jruby/lib/jruby.jar:__g")" cpath="${cpath}:$(java-pkg_getjars --build-only commons-logging,xalan)" EANT_GENTOO_CLASSPATH="" @@ -193,7 +193,7 @@ src_install() { # Remove all the references to RubyGems as we're just going to # install it through dev-ruby/rubygems. - find "${D}${RUBY_HOME}" -type f \ + find "${ED}${RUBY_HOME}" -type f \ '(' '(' -path '*rubygems*' -not -name 'jruby.rb' ')' -or -name 'ubygems.rb' -or -name 'datadir.rb' ')' \ -delete || die } |