diff options
| -rw-r--r-- | dev-java/jruby/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-java/jruby/Manifest | 27 | ||||
| -rw-r--r-- | dev-java/jruby/jruby-1.3.1-r1.ebuild | 178 | ||||
| -rw-r--r-- | dev-java/jruby/jruby-1.5.6-r1.ebuild | 200 | ||||
| -rw-r--r-- | dev-java/jruby/jruby-1.6.7.2.ebuild (renamed from dev-java/jruby/jruby-1.6.7.ebuild) | 2 |
5 files changed, 20 insertions, 395 deletions
diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog index afd333cb6ea6..6abe82924fa1 100644 --- a/dev-java/jruby/ChangeLog +++ b/dev-java/jruby/ChangeLog @@ -1,6 +1,12 @@ # 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.84 2012/04/30 10:52:20 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.85 2012/05/09 04:03:28 flameeyes Exp $ + +*jruby-1.6.7.2 (09 May 2012) + + 09 May 2012; Diego E. Pettenò <flameeyes@gentoo.org> +jruby-1.6.7.2.ebuild, + -jruby-1.3.1-r1.ebuild, -jruby-1.5.6-r1.ebuild, -jruby-1.6.7.ebuild: + Version bump; remove old ebuilds. 30 Apr 2012; Agostino Sarubbo <ago@gentoo.org> jruby-1.6.5.1.ebuild: Stable for amd64, wrt bug #396305 diff --git a/dev-java/jruby/Manifest b/dev-java/jruby/Manifest index 789b4e232630..81e34ff3245e 100644 --- a/dev-java/jruby/Manifest +++ b/dev-java/jruby/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA1 AUX 1.5.1/build.xml.patch 916 RMD160 813663ea2f391ed36df4c185e7b8ad8726f35890 SHA1 72f0bdd4ee48f8abb602bcda6b05a1a34b288f2e SHA256 761a8835a43511f5c62fff5f3afa4ab05abf17d2c25348c91088ff6eb17f5d2e AUX 1.5.1/testfixes.patch 2490 RMD160 5cd23b036543075e718a7fdc3214e36d21cf6e90 SHA1 261879b1f7bdaaba2b8426ebf403883611906864 SHA256 457ad13912dc8131ddbf60c9afc7227e38e77fb2c389f3c3dde3cc7162dd6148 @@ -13,27 +13,24 @@ AUX jruby-1.5.0-system-jars.patch 8113 RMD160 462a0f90f05e11ea28caf960ae647b4726 AUX jruby-1.5.6-rubygems-1.8.x.patch 815 RMD160 cabdd1efaea18a4b3926b3adaacc79e98c13624b SHA1 2a1913fce9ee4ad9377744fc6e64fa57d7262025 SHA256 cb003cceee89149074c422c53cfaf7b49341bff8f2faf7aa70173fc954ccddd2 AUX jruby-bash-launcher.patch 5505 RMD160 b6cf97294339d2b3319434576e01482d7d6d9c4a SHA1 53c60e443bd4b539e8123946785468df8b983b02 SHA256 e0997049a7bb829c06178cbbab4c5281ec9dac2e1ee8f018613cf9ddc35aea3e AUX user-test-fixes.patch 5147 RMD160 6258879413ae81a18d0c6bcaa3b0661d86a0d14a SHA1 32d3f80db383cf664c9ad1f9e52c2688ae3cbe5c SHA256 f21469d41de9f9b5fb1682596f64899a71c92332db24bf27e8c50dbb1896a92e -DIST jruby-src-1.3.1.tar.gz 12076705 RMD160 ef10395dbdf9490820caa65ff6236dd99e7c62c8 SHA1 e4de71e5c01f71f236b3135e07a5841784767fd8 SHA256 9095b0bec0ee8e6cd96b72c7f2aec8a90fa429b840484d57a48d8fb760aae600 DIST jruby-src-1.4.1.tar.gz 12351374 RMD160 079036e7df373d444221083a9487b6ad8a676879 SHA1 282a730d33fe5ba0686297de6ff68eee443e67ab SHA256 685e6ba0a4709e06fab1158ef6e4d2b246ab91a770fe8b5c1b642d55d22c725a DIST jruby-src-1.5.6.tar.gz 11166177 RMD160 ecb3d9f08837c1d0c4342bcf0bcaa0fe0c16a0e1 SHA1 99c084b669a92ce548aa5ed731c2fb102a8fc293 SHA256 c0217d6852a1fbf8edd55c1ec866af623e7aaf5f7b0be7abfaf1baf365655efa DIST jruby-src-1.6.5.1.tar.gz 14284770 RMD160 a96de6c66055cbcebf48109c972d46f7d22a67c2 SHA1 8e1f6fbf609ed98ad848d3636aac1bcdcb63e3ff SHA256 1126f29b888b5427c2d416042a6c010849ab1d29ee9be97e592caf6859921be5 -DIST jruby-src-1.6.7.tar.gz 14579497 RMD160 250e24ee7bfd5e28aac11b1f571fd067a050ef71 SHA1 1b5ef0cdaf68f6d6add385136e74b330a5e1e7b6 SHA256 38a15bc4b9849c9fdfe87077b21be0427ad6432167c9bf55558fc09b57402c37 -EBUILD jruby-1.3.1-r1.ebuild 5350 RMD160 19a52b4bdb5fcc48a6a7d94ad9ede6aea3583327 SHA1 a92b88d5934a1e3e060c595d190782ce34165aaf SHA256 3f85aa08aa29e0f209544109f18b54318d450a28320a3692448213bee8521da4 +DIST jruby-src-1.6.7.2.tar.gz 14701511 RMD160 ccf300fb5793ca40287a654f95cdff28003d4236 SHA1 c45b6fca792209061f57649ce6f950a85272274f SHA256 d3308652136a20883184860ea7b3373e8474f2b6df533518d02590e3f10dbca7 EBUILD jruby-1.4.1.ebuild 5998 RMD160 208b070013917131cc2b1fdf31ee38d038212a68 SHA1 250fea0c35426c0ea50e9fa44ad89c9ed953d7cb SHA256 7d3171a7b8b4faaa4917d692dfedcb5196c3e3c282f72cf5f43c3c9346e13237 -EBUILD jruby-1.5.6-r1.ebuild 6226 RMD160 652ce387de90b5374ac561f6dc6999ef422c4b5f SHA1 4a37c4d0d6438b5471163427b5382155f507834f SHA256 591df79a8e86dc7c2b966cf73e23f3aac943a7bc39de2c339eaff4ea630aa60e EBUILD jruby-1.5.6.ebuild 6175 RMD160 b36494f1a6ac8a8eede19295dd232eab319bd07e SHA1 f470dc94162f1d33fb1d5f1d68c77704d7ac7d01 SHA256 740bccc78a4130e3824678e06c46e8f8c665e41ee1cc077f01e70da3ce354613 EBUILD jruby-1.6.5.1.ebuild 6164 RMD160 5adcd46b76e7695dd369eb680753e7f60ac0321d SHA1 1bcf466d2af7209775355551071ffd21a8dcf68b SHA256 3b14cf424966d8aa8eb95beb75b6ce7cf16a66dc500ae3a0326e4b50c4267949 -EBUILD jruby-1.6.7.ebuild 6234 RMD160 ad8b20d0610c0e2342373d789e17ea141990d721 SHA1 c8010e2d9a804946900c226a05aaac6f10a60aa3 SHA256 fb80292ba8d6d0259aa767def51efbdea558a8b5bb5f4d4c8483db35fdecd850 -MISC ChangeLog 15277 RMD160 9274871fb4ac8b1e67b69fd4d791fd0391710d40 SHA1 81393c2d6aae6c9b2b9445faf56ff607bde48ad8 SHA256 77ba5538d062f078163a35596c7a56afb702a23fc56fcc72d055353de758ed51 +EBUILD jruby-1.6.7.2.ebuild 6236 RMD160 0c3a7760bacbdf574bff87465a7321bf90989945 SHA1 8ec98c80816e68e9471f8cba9d06b4511c4f5795 SHA256 c31f4f5bca4bcb140d714cedf28a43186291e7640e7186cfe4df6611336428d1 +MISC ChangeLog 15500 RMD160 84b8c6e923de4d11a855a329644f8275204f72da SHA1 105b5467c965f2a00848bbf9f617798d4a448407 SHA256 6cd4b910b81c4e16f82b400eda122cfc48ed9b201db9f70581c3a619c5cd5e6b MISC metadata.xml 179 RMD160 3813d8d3651faaf99042cb3c776d0bc59ad7b5b4 SHA1 421371d5338c6b9b8b4950c44d78a9dbe79cf64d SHA256 0df27adc265ef6596f973641d25b64b7291c87f1b114d6895f69d222049bed1b -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCgAGBQJPnm7pAAoJEOTDgjZ80txdbxoH/3YZRFpE2gycotAxHrHBqdv8 -RxVu73/VW7LrwLId5+xEaRhW+GW+8jmjjOzEfFTuoYKnqaexvn4V8vueJkvXT0ZD -oI7/bXefkB8+mF5YQtgQ18OzQZgk8qrJp+RyihvsR+WydRVIYVduTomX5SpejV4a -nuTSPfz5/FeSs8b3Eeh0WmB87yTr/3MzUwqhiOO6QM8mREQanTcYslC0chhp/rgp -AwngL0J3nXL/RYxNpGoWTXWiBmMZMTVj3o1h34PfOPHeOxSJcHMwBpkE1Y7ISapW -PvGgzgNbjkExu86kHPPij3s2S/j04KQTunKdE1ioTKvrg6APU73TP/drk81Psfs= -=iPoN +iQEcBAEBAgAGBQJPqeyaAAoJEBzRPIrUMBNC0bAIAJGnQNMNueErnYuNmoQEurZ/ +7TW8KHN6vw+AsOl0+uHGb3hJmpRwH6pFQmqzYD4Nq34mImznNZac+hqlMoQsjWaq +QRiKlDWzyakuZj+STFQHbKbP5K+D6vYlNJojAwl4lCTNDZk2J0VMaq5mg+hNnZAU +/JlCKYbWS1Dh7e3sUFbic8A48Gf4z3zNQyxD7P5ZXUG828QVVPFW2MDyOHIP+4YA +W/lOZ9ykE3juGZpRvVnoxE57uc0GdgVzEUyilXkq9SDawFmDU1hIbWpTcrAZlKt8 +1CYbHNOIX+Tv/KF/xwef+V9e02VLRxRmwoxeWhgW4VN2zQryXW41CPBDmUrBEC8= +=109L -----END PGP SIGNATURE----- diff --git a/dev-java/jruby/jruby-1.3.1-r1.ebuild b/dev-java/jruby/jruby-1.3.1-r1.ebuild deleted file mode 100644 index 3620f719a6e5..000000000000 --- a/dev-java/jruby/jruby-1.3.1-r1.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.3.1-r1.ebuild,v 1.6 2010/06/30 20:53:35 caster Exp $ - -EAPI="2" -JAVA_PKG_IUSE="doc source test" -inherit eutils java-pkg-2 java-ant-2 - -MY_PV="${PV/_rc1/RC1}" - -DESCRIPTION="Java-based Ruby interpreter implementation" -HOMEPAGE="http://jruby.codehaus.org/" -SRC_URI="http://dist.codehaus.org/${PN}/${MY_PV}/${PN}-src-${MY_PV}.tar.gz" -LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="~ppc" -IUSE="bsf java6 ssl" - -CDEPEND=">=dev-java/bytelist-1.0.2:0 - >=dev-java/constantine-0.6:0 - >=dev-java/jline-0.9.94:0 - >=dev-java/joni-1.1.3:0 - >=dev-java/jna-posix-1.0.1:0 - >=dev-java/jvyamlb-0.2.5:0 - dev-java/asm:3 - dev-java/jcodings:0 - dev-java/jffi:0.4 - dev-java/jna:0 - dev-java/joda-time:0 - dev-util/jay:0[java] - dev-java/nailgun:0" - -RDEPEND="${CDEPEND} - !java6? ( =virtual/jre-1.5* ) - java6? ( >=virtual/jre-1.6 )" - -# using 1.6 produces 1.6 bytecode, not sure why -DEPEND="${CDEPEND} - !java6? ( =virtual/jdk-1.5* ) - java6? ( >=virtual/jdk-1.6 ) - bsf? ( dev-java/bsf:2.3 ) - test? ( - dev-java/ant-junit - dev-java/ant-trax - )" - -PDEPEND="dev-ruby/rubygems - >=dev-ruby/rake-0.7.3 - >=dev-ruby/rspec-1.0.4 - ssl? ( dev-ruby/jruby-openssl )" - -# Tests work for ali_bush. But fail for flameeyes see #282439. -# Tests work for ali_bush inside the ebuild env -# but fail when using vanilla src tarball. -# Restrict tests so we can stablise this package. -RESTRICT="test" - -S="${WORKDIR}/${PN}-${MY_PV}" - -RUBY_HOME=/usr/share/${PN}/lib/ruby -SITE_RUBY=${RUBY_HOME}/site_ruby -GEMS=${RUBY_HOME}/gems - -JAVA_ANT_REWRITE_CLASSPATH="true" -JAVA_ANT_IGNORE_SYSTEM_CLASSES="true" -EANT_GENTOO_CLASSPATH="asm-3 bytelist constantine jay jcodings jffi-0.4 jline \ -joda-time joni jna jna-posix jvyamlb,nailgun" -EANT_NEEDS_TOOLS="true" - -pkg_setup() { - java-pkg-2_pkg_setup - - local fail - - if [[ ! -d "${GEMS}" && -L "${GEMS}" ]]; then - eerror "${GEMS} is a symlink. Please remove this symlink." - fail="true" - fi - - # the symlink creates a collision with rubygems, bug #270953 - # cannot be currently solved by removing in pkg_preinst, bug #233278 - if [[ -L "${SITE_RUBY}" ]]; then - eerror "${SITE_RUBY} is a symlink. Please remove this symlink." - fail="true" - fi - - if [[ -n ${fail} ]]; then - eerror "Unmerging the old jruby version should also fix the problem(s)." - die "Please address the above errors, then run emerge --resume" - fi -} - -java_prepare() { - epatch "${FILESDIR}/ftype-test-fixes.patch" - epatch "${FILESDIR}/user-test-fixes.patch" - - # We don't need to use Retroweaver. There is a jarjar and a regular jar - # target but even with jarjarclean, both are a pain. The latter target - # is slightly easier so go with this one. - sed -r -i \ - -e 's/maxmemory="128m"/maxmemory="192m"/' \ - -e "/RetroWeaverTask/d" \ - -e "/<zipfileset .+\/>/d" \ - build.xml || die - - # Delete the bundled JARs but keep invokedynamic.jar. - # No source is available and it's only a dummy anyway. - find build_lib lib -name "*.jar" ! -name "invokedynamic.jar" -delete || die - - if ! use bsf; then - # Remove BSF test cases. - cd "${S}/test/org/jruby" - rm -f test/TestAdoptedThreading.java || die - rm -f javasupport/test/TestBSF.java || die - sed -i '/TestBSF.class/d' javasupport/test/JavaSupportTestSuite.java || die - sed -i '/TestAdoptedThreading.class/d' test/MainTestSuite.java || die - fi -} - -src_compile() { - eant jar $(use_doc create-apidocs) -Djdk1.5+=true -} - -src_test() { - if [ ${UID} == 0 ] ; then - ewarn 'The tests will fail if run as root so skipping them.' - ewarn 'Enable FEATURES="userpriv" if you want to run them.' - return - fi - - # ali_bush was getting crashes while attempting to run a test. - # No info about why it crashed seemed to be produced. - # remove it as temp fix. - sed -i -e '/MRI/d' build.xml || die "Failed to sed build.xml" - - # BSF is a compile-time only dependency because it's just the adapter - # classes and they won't be used unless invoked from BSF itself. - use bsf && java-pkg_jar-from --into build_lib --with-dependencies bsf-2.3 - - # Our jruby.jar is unbundled so we need to add the classpath to this test. - sed -i "s:java -jar:java -Xbootclasspath/a\:#{ENV['JRUBY_CP']} -jar:g" test/test_load_compiled_ruby_class_from_classpath.rb || die - - ANT_TASKS="ant-junit ant-trax" JRUBY_CP=`java-pkg_getjars ${EANT_GENTOO_CLASSPATH// /,}` JRUBY_OPTS="" eant test -Djdk1.5+=true -} - -src_install() { - local bin - - java-pkg_dojar lib/${PN}.jar - dodoc README docs/{*.txt,README.*} || die - - use doc && java-pkg_dojavadoc docs/api - use source && java-pkg_dosrc src/org - - dobin "${FILESDIR}/jruby" || die - exeinto "/usr/share/${PN}/bin" - doexe "${S}/bin/jruby" || die - - # Install some jruby tools. - dobin "${S}"/bin/j{gem,irb{,_swing},rubyc} || die - - # Symlink some common tools so that jruby can launch them internally. - for bin in {j,}gem jirb jrubyc rake rdoc ri spec{,_translator} ; do - dosym "/usr/bin/${bin}" "/usr/share/${PN}/bin/${bin}" || die - done - - insinto "${RUBY_HOME}" - doins -r "${S}/lib/ruby/1.8" || die - doins -r "${S}/lib/ruby/site_ruby" || die - - # Autoload rubygems and append regular site_ruby to $LOAD_PATH. - # Unfortunately the -I option prepends instead. - insinto "${SITE_RUBY}" - doins "${FILESDIR}/gentoo.rb" || die - doenvd "${FILESDIR}/10jruby" || die - - keepdir "${GEMS}"/1.8/{cache,doc} -} diff --git a/dev-java/jruby/jruby-1.5.6-r1.ebuild b/dev-java/jruby/jruby-1.5.6-r1.ebuild deleted file mode 100644 index 5fc60891f23c..000000000000 --- a/dev-java/jruby/jruby-1.5.6-r1.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.5.6-r1.ebuild,v 1.1 2011/10/22 11:35:07 graaff Exp $ - -EAPI="2" -JAVA_PKG_IUSE="doc source test" -inherit eutils java-pkg-2 java-ant-2 - -MY_PV="${PV/_rc1/RC1}" - -DESCRIPTION="Java-based Ruby interpreter implementation" -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" -IUSE="bsf ssl" - -CDEPEND=">=dev-java/bytelist-1.0.6:0 - >=dev-java/constantine-0.6:0 - >=dev-java/jline-0.9.94:0 - >=dev-java/joni-1.1.3:0 - >=dev-java/jnr-posix-1.1.3:0 - >=dev-java/jnr-netdb-1.0:0 - >=dev-java/jvyamlb-0.2.5:0 - >=dev-java/asm-3.2:3 - dev-java/jcodings:0 - >=dev-java/jffi-0.7_pre:0.4 - dev-java/joda-time:0 - dev-util/jay:0[java] - dev-java/nailgun:0 - dev-java/jaffl:0 - dev-java/jgrapht:0 - dev-java/ant-core:0 - dev-java/bsf:2.3" - -RDEPEND="${CDEPEND} - >=virtual/jre-1.6" - -DEPEND="${CDEPEND} - virtual/jdk:1.6 - test? ( - dev-java/ant-junit4:0 - dev-java/ant-trax:0 - dev-java/junit:4 - java-virtuals/jdk-with-com-sun - dev-java/commons-logging:0 - dev-java/xalan:0 - >=dev-java/jna-posix-1.0.1:0 - ) - !!<dev-ruby/jruby-1.3.1-r1" - -PDEPEND="ssl? ( dev-ruby/jruby-openssl )" - -# Tests fail. -# Need to stop injecting jar's into classpath. -RESTRICT="test" - -S="${WORKDIR}/${PN}-${MY_PV}" - -RUBY_HOME=/usr/share/${PN}/lib/ruby -SITE_RUBY=${RUBY_HOME}/site_ruby -GEMS=${RUBY_HOME}/gems - -JAVA_ANT_REWRITE_CLASSPATH="true" -JAVA_ANT_IGNORE_SYSTEM_CLASSES="true" -EANT_GENTOO_CLASSPATH="ant-core asm-3 bsf-2.3 bytelist constantine jay \ -jcodings jffi-0.4 jline constantine \ -joda-time joni jnr-posix jnr-netdb jvyamlb nailgun jaffl jgrapht" -EANT_NEEDS_TOOLS="true" - -pkg_setup() { - java-pkg-2_pkg_setup - - local fail - - for directory in "${GEMS}" "${SITE_RUBY}"; do - if [[ -L ${directory} ]]; then - eerror "${directory} is a symlink. Please do the following to resolve the situation:" - echo 'emerge -an app-portage/gentoolkit' - echo 'equery -qC b '"${directory}"' | sort | uniq | sed s/^/=/ > ~/jruby.fix' - echo 'emerge -1C $(< ~/jruby.fix)' - echo "rm ${directory}" - echo 'emerge -1 $(< ~/jruby.fix)' - echo 'rm ~/jruby.fix' - - eerror "For more information, please see http://bugs.gentoo.org/show_bug.cgi?id=302187" - fail="true" - fi - done - - if [[ -n ${fail} ]]; then - die "Please address the above errors, then run emerge --resume" - fi -} - -java_prepare() { - epatch "${FILESDIR}"/${PN}-1.5.0-system-jars.patch - epatch "${FILESDIR}/1.5.1/build.xml.patch" - epatch "${FILESDIR}/1.5.1/testfixes.patch" - epatch "${FILESDIR}/${P}-rubygems-1.8.x.patch" - - # We don't need to use Retroweaver. There is a jarjar and a regular jar - # target but even with jarjarclean, both are a pain. The latter target - # is slightly easier so go with this one. - sed -r -i \ - -e 's/maxmemory="128m"/maxmemory="192m"/' \ - -e "/RetroWeaverTask/d" \ - -e "/<zipfileset .+\/>/d" \ - build.xml || die - - sed -i -e '/Arndt/d' src/org/jruby/RubyBigDecimal.java - - # Delete the bundled JARs but keep invokedynamic.jar. - # No source is available and it's only a dummy anyway. - find build_lib -name "*.jar" ! -name "jsr292-mock.jar" -delete || die - - # change some defaults for Gentoo to work properly - cat - >> src/org/jruby/jruby.properties <<EOF -jruby.bindir = /usr/bin -EOF -} - -src_compile() { - local flags="" - use bsf && flags="-Dbsf.present=true" - - eant jar $(use_doc apidocs) -Djdk1.5+=true ${flags} -} - -src_test() { - if [ ${UID} == 0 ] ; then - ewarn 'The tests will fail if run as root so skipping them.' - ewarn 'Enable FEATURES="userpriv" if you want to run them.' - return - fi - # Our jruby.jar is unbundled so we need to add the classpath to this test. - sed -i "s:java -jar:java -Xbootclasspath/a\:#{ENV['JRUBY_CP']} -jar:g" test/test_load_compiled_ruby_class_from_classpath.rb || die - sed -i "s@:refid => 'build.classpath'@:path =>\"#{ENV['JRUBY_CP']}:lib/jruby.jar\"@g" \ - rakelib/commands.rake || die - #sed -i "s@:refid => 'test.class.path'@:path => \"#{ENV['JRUBY_CP']}@g" \ - # rakelib/commands.rake || die - - #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="${cpath}:$(java-pkg_getjars --build-only commons-logging,xalan)" - EANT_GENTOO_CLASSPATH="" - - local flags="" - use bsf && flags="-Dbsf.present=true" - - #Clear RUBYOPT - export RUBYOPT="" - export JRUBY_CP="${cpath}" - ANT_TASKS="ant-junit4 ant-trax" \ - JRUBY_OPTS="" eant test -Djdk1.5+=true -Djruby.bindir=bin \ - -Dgentoo.classpath="${cpath}" ${flags} -} - -src_install() { - local bin - - java-pkg_dojar lib/${PN}.jar - dodoc README docs/{*.txt,README.*} || die - - use doc && java-pkg_dojavadoc docs/api - use source && java-pkg_dosrc src/org - - # We run the sed here in install so that we don't get the wrong - # data during the test phase! - sed \ - -e '/++ebuild-cut-here++/, /--ebuild-cut-here--/ d' \ - -e '/^JRUBY_HOME=/s:=:=/usr/share/jruby:' \ - bin/jruby > "${T}"/jruby - - dobin "${T}"/jruby "${S}"/bin/j{irb{,_swing},rubyc} || die - - insinto "${RUBY_HOME}" - doins -r "${S}"/lib/ruby/{1.8,1.9,site_ruby} || die - - # Remove all the references to RubyGems as we're just going to - # install it through dev-ruby/rubygems. - find "${D}${RUBY_HOME}" -type f \ - '(' '(' -path '*rubygems*' -not -name 'jruby.rb' ')' -or -name 'ubygems.rb' -or -name 'datadir.rb' ')' \ - -delete || die -} - -pkg_postinst() { - ewarn "If you're updating from <=jruby-1.4.0, you're going to get errors related" - ewarn "to gentoo.rb load failure." - ewarn "This is due to a stray definition of JRUBY_OPTS variable from the previous ebuilds." - ewarn "To solve the problem, either login in a new shell, use 'env -i ${SHELL} --login'" - ewarn "or explicitly unset the variable before running jruby." - ewarn "" - ewarn "Currently this package introduces issues/bugs that are not present within upstream" - ewarn "releases. Therefore if you are wanting a stable build of jruby please do not" - ewarn "use this package." -} diff --git a/dev-java/jruby/jruby-1.6.7.ebuild b/dev-java/jruby/jruby-1.6.7.2.ebuild index 52ed34717b8a..a8d6e51fefac 100644 --- a/dev-java/jruby/jruby-1.6.7.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.ebuild,v 1.1 2012/04/29 04:50:00 flameeyes Exp $ +# $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 $ EAPI="4" JAVA_PKG_IUSE="doc source test" |