From dd7d7637e2f52df56954236b96656719af7e6c43 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Tue, 27 Apr 2010 09:23:59 +0000 Subject: [PATCH] Version bump, depend on new jcondings for security bug #312547. Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- dev-java/jruby/ChangeLog | 9 +- dev-java/jruby/Manifest | 8 +- dev-java/jruby/files/auto_gem.rb | 7 - .../jruby/files/jruby-1.4.0-system-jars.patch | 277 ------------------ dev-java/jruby/jruby-1.4.0-r4.ebuild | 182 ------------ ...uby-1.4.0-r5.ebuild => jruby-1.4.1.ebuild} | 30 +- 6 files changed, 29 insertions(+), 484 deletions(-) delete mode 100644 dev-java/jruby/files/auto_gem.rb delete mode 100644 dev-java/jruby/files/jruby-1.4.0-system-jars.patch delete mode 100644 dev-java/jruby/jruby-1.4.0-r4.ebuild rename dev-java/jruby/{jruby-1.4.0-r5.ebuild => jruby-1.4.1.ebuild} (84%) diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog index f0cb2cc657c9..48bd39a89764 100644 --- a/dev-java/jruby/ChangeLog +++ b/dev-java/jruby/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/jruby # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.57 2010/04/06 08:22:21 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.58 2010/04/27 09:23:58 caster Exp $ + +*jruby-1.4.1 (27 Apr 2010) + + 27 Apr 2010; Vlastimil Babka -jruby-1.4.0-r4.ebuild, + -jruby-1.4.0-r5.ebuild, -files/jruby-1.4.0-system-jars.patch, + +jruby-1.4.1.ebuild, -files/auto_gem.rb: + Version bump, depend on new jcondings for security bug #312547. 06 Apr 2010; Vlastimil Babka jruby-1.4.0-r6.ebuild: Fix symlink upgrade instructions. Thanks to Martin von Gagern diff --git a/dev-java/jruby/Manifest b/dev-java/jruby/Manifest index 86994720590b..55414d470ef5 100644 --- a/dev-java/jruby/Manifest +++ b/dev-java/jruby/Manifest @@ -1,17 +1,15 @@ AUX 10jruby 22 RMD160 ac56025539a2bbb7a1506a2df958c73cc1c3aba9 SHA1 caf6b109c0a7cfa53a1e470ba0ca5f27a6578723 SHA256 fb1240cfedd315ba3772830abbc238eb3061088fcf70eb4df7e9a99d92f124e4 -AUX auto_gem.rb 159 RMD160 fbf261e5cf0a8450c51c33a7ad4dafbab21bd518 SHA1 8dde3d73f65998f4c5552924ad49e1441e1b211d SHA256 fe1efe24cd0ba36c55449e9623cd0be394980f37d12468624dad7ffdef72f4dc AUX ftype-test-fixes.patch 2738 RMD160 9de8f9e14469967b736fbcf48c28a2ee9c366d6e SHA1 4e94c0447dfef6f6f9dd8b78b3f77ffaa4d798bb SHA256 82fd519cc11271e4d475529a308dbcf70526c18f7c1f193a2ef93d6f0b4fdd2b AUX gentoo.rb 257 RMD160 3dd119c675829a9196e374f0c290ceac37ddc7c6 SHA1 de86d6471533efb97bbfe24ecb4847610bc1ea42 SHA256 6868b148829f218ff4c739af05e81b1d9da5d295507d99cb1f074ed88d72a1dc AUX jruby 97 RMD160 500ca93e1a23897fb3d9ebd0b1a6ba7caec9be1d SHA1 ae79a6d60a9e28034fb08b394cba443fd66ceacf SHA256 579b36ea120de4fc04e384937ecc567a090bb64f276b07cc059d072a5a7d2e60 AUX jruby-1.4.0-bindir.patch 743 RMD160 ea3ea934abb45fda138afd336a0dee2bbcb7126a SHA1 918714ad3f86448e689c8c20daaba8383432f742 SHA256 27352afbc6a3898c50e3628911062c01090209d0cfdb7b221aca4aa526031b11 AUX jruby-1.4.0-system-jars-r2.patch 8332 RMD160 d59ae12abcc4184c1d9f39a3dafe769d00a0f732 SHA1 a3fcb2a452d65757c838c6883420d1a3b84b91fa SHA256 92f67d30f0be4ff029d3045e9446b5191da474fe0280269e4b1dc5b026e51556 -AUX jruby-1.4.0-system-jars.patch 8423 RMD160 84fd92c13e953eb44c091b77bbbdd0d0c0af00a6 SHA1 e5cde6f5fa5af086eeda10554624823363112015 SHA256 289cab7c55fa61e27f16624e6e4d183cc7d222cfd87457651ae5343fdacb0677 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.0.tar.gz 12731458 RMD160 70b6a34a9e1b174fe1c8f1df8ba8ea7cbfa4da37 SHA1 3d6f634e16b789a5a086327c0f09710dd29d1ec7 SHA256 b9fd84ed097ac136afce4462a13bb0752bab467db203ed3797e228a435e26d23 +DIST jruby-src-1.4.1.tar.gz 12351374 RMD160 079036e7df373d444221083a9487b6ad8a676879 SHA1 282a730d33fe5ba0686297de6ff68eee443e67ab SHA256 685e6ba0a4709e06fab1158ef6e4d2b246ab91a770fe8b5c1b642d55d22c725a EBUILD jruby-1.3.1-r1.ebuild 5362 RMD160 9cc4b0f1cd310a6a3d833e8bb339e15853ca44fa SHA1 cdf3e7003c9794372c3c949c37c92eedb95310bd SHA256 f955390140221f98f15b837fc2d62b45be4c0289fb3521e71e65c554fd1f4218 -EBUILD jruby-1.4.0-r4.ebuild 5535 RMD160 2d345137b735c9124d29a8d73c14be45154cb8c3 SHA1 1bd28d26583b138162962f6fcb78e55584a3d5b8 SHA256 a2ea17ef76c7bac171063da50ee8701204e5bd60b7a15eaf3e689ed7d6bdabe3 -EBUILD jruby-1.4.0-r5.ebuild 5547 RMD160 4d88b1c6fc9b717a63f123a2161605653da9485f SHA1 61d83f8bc54766bf39c90b91ec966c3fdf98ef2d SHA256 af63d46d1b8e15083f5464c6a64c3c7d712cd5d1b7f72354d72dcda2bcf984f8 EBUILD jruby-1.4.0-r6.ebuild 5777 RMD160 c4e0db8272cc8978f5df2b8ba961aee64b556fb8 SHA1 66403cb4213cc39cab98da522d4dbe61f64e1c6d SHA256 f61a9ca66617fe3278e39b448e55f6c22dce10e8510b4683d3a609a4a47f0a09 -MISC ChangeLog 10853 RMD160 42136194457d9c3d5725e916ba0f7bd77fbbfa4f SHA1 5763b176ef48f4d045c89e7a51a71a21dcfd2d22 SHA256 b65732e7a73212d371e8702f2e1842e482e2adfddad65f56e6bb3440d5de52ff +EBUILD jruby-1.4.1.ebuild 5880 RMD160 3bd8ab3506f07ce508e0ad18a6ffde5857efb50b SHA1 9febbf5d580f27d8d57b27b1bdeecb5fde0d3474 SHA256 d51c99da7f464efac0e01bc68ea983aa2560dbe38d94d1d2aadd6d978ef6f358 +MISC ChangeLog 11130 RMD160 390301052beb0f82ba359bb6e2c14881a4b21086 SHA1 d0c62dd1aa6f7911f9d222a4be5a7b723dc8303b SHA256 60466680adb898a18139a843771ccc8f049f5b9c0e30a3f200fe7a9eff44dc91 MISC metadata.xml 179 RMD160 3813d8d3651faaf99042cb3c776d0bc59ad7b5b4 SHA1 421371d5338c6b9b8b4950c44d78a9dbe79cf64d SHA256 0df27adc265ef6596f973641d25b64b7291c87f1b114d6895f69d222049bed1b diff --git a/dev-java/jruby/files/auto_gem.rb b/dev-java/jruby/files/auto_gem.rb deleted file mode 100644 index 5c4f540a92df..000000000000 --- a/dev-java/jruby/files/auto_gem.rb +++ /dev/null @@ -1,7 +0,0 @@ -# This file is installed by Gentoo's rubygems package. -# It's intended to help automate the loading of rubygems - -begin -require 'rubygems' -rescue LoadError -end diff --git a/dev-java/jruby/files/jruby-1.4.0-system-jars.patch b/dev-java/jruby/files/jruby-1.4.0-system-jars.patch deleted file mode 100644 index 41732b0dd732..000000000000 --- a/dev-java/jruby/files/jruby-1.4.0-system-jars.patch +++ /dev/null @@ -1,277 +0,0 @@ -Index: jruby-1.4.0/bin/jruby -=================================================================== ---- jruby-1.4.0.orig/bin/jruby -+++ jruby-1.4.0/bin/jruby -@@ -11,26 +11,17 @@ - # - # ----------------------------------------------------------------------------- - --cygwin=false -- - # ----- Identify OS we are running under -------------------------------------- - case "`uname`" in -- CYGWIN*) cygwin=true;; - Darwin) darwin=true;; - esac - --# --# Figure out the OS and cpu the same as JNA would, so the library path can be set --# --case "`uname -m`" in -- i[34567]86) JNA_CPU=i386; JNA_ALT_CPU=amd64;; -- i86pc) JNA_CPU="x86"; JNA_ALT_CPU=amd64;; -- amd64|x86_64) JNA_CPU=amd64; JNA_ALT_CPU=i386;; -- sparc*) JNA_CPU=sparc; JNA_ALT_CPU=sparcv9;; --esac -- - # ----- Verify and Set Required Environment Variables ------------------------- - -+# This will be filled in by the ebuild after install -+JRUBY_HOME= -+ -+# ++ebuild-cut-here++ - ## resolve links - $0 may be a link to home - PRG=$0 - progname=`basename "$0"` -@@ -49,13 +40,16 @@ while [ -h "$PRG" ] ; do - fi - done - --JRUBY_HOME_1=`dirname "$PRG"` # the ./bin dir --if [ "$JRUBY_HOME_1" = '.' ] ; then -- cwd=`pwd` -- JRUBY_HOME=`dirname $cwd` # JRUBY-2699 --else -- JRUBY_HOME=`dirname "$JRUBY_HOME_1"` # the . dir -+if [ -z "$JRUBY_HOME" ]; then -+ JRUBY_HOME_1=`dirname "$PRG"` # the ./bin dir -+ if [ "$JRUBY_HOME_1" = '.' ] ; then -+ cwd=`pwd` -+ JRUBY_HOME=`dirname $cwd` # JRUBY-2699 -+ else -+ JRUBY_HOME=`dirname "$JRUBY_HOME_1"` # the . dir -+ fi - fi -+# --ebuild-cut-here-- - - if [ -z "$JRUBY_OPTS" ] ; then - JRUBY_OPTS="" -@@ -84,72 +78,17 @@ for opt in ${JRUBY_OPTS[@]}; do - done - JRUBY_OPTS=${JRUBY_OPTS_TEMP} - --if [ -z "$JAVA_HOME" ] ; then -- JAVA_CMD='java' --else -- if $cygwin; then -- JAVA_HOME=`cygpath -u "$JAVA_HOME"` -- fi -- JAVA_CMD="$JAVA_HOME/bin/java" --fi -- --# If you're seeing odd exceptions, you may have a bad JVM install. --# Uncomment this and report the version to the JRuby team along with error. --#$JAVA_CMD -version -- - JRUBY_SHELL=/bin/sh - - # ----- Set Up The Boot Classpath ------------------------------------------- - --CP_DELIMITER=":" -- --# add jruby jars for command-line execution --for j in "$JRUBY_HOME"/lib/{jruby*,bsf}.jar; do -- if [ "$JRUBY_CP" ]; then -- JRUBY_CP="$JRUBY_CP$CP_DELIMITER$j" -- else -- JRUBY_CP="$j" -- fi --done -- --if $cygwin; then -- JRUBY_CP=`cygpath -p -w "$JRUBY_CP"` --fi -- --# ----- Set Up The System Classpath ------------------------------------------- -- --if [ "$JRUBY_PARENT_CLASSPATH" != "" ]; then -- # Use same classpath propagated from parent jruby -- CP=$JRUBY_PARENT_CLASSPATH --else -- # add other jars in lib to CP for command-line execution -- for j in "$JRUBY_HOME"/lib/*.jar; do -- if [ "$CP" ]; then -- CP="$CP$CP_DELIMITER$j" -- else -- CP="$j" -- fi -- done -- -- if $cygwin; then -- CP=`cygpath -p -w "$CP"` -- fi --fi -- --if $cygwin; then -- # switch delimiter only after building Unix style classpaths -- CP_DELIMITER=";" --fi -+JRUBY_CP=$(java-config -d -p jruby) -+CP=${JRUBY_PARENT_CLASSPATH} - - # ----- Execute The Requested Command ----------------------------------------- - --if [ -z "$JAVA_MEM" ] ; then -- JAVA_MEM=-Xmx500m --fi -- --if [ -z "$JAVA_STACK" ] ; then -- JAVA_STACK=-Xss1024k --fi -+JAVA_MEM=${JAVA_MEM:--Xmx500m} -+JAVA_STACK=${JAVA_STACK:--Xss1024k} - - JAVA_VM=-client - JAVA_ENCODING="" -@@ -172,18 +111,18 @@ do - elif [ "${val:0:4}" = "-Xss" ]; then - JAVA_STACK=$val - elif [ "${val}" = "" ]; then -- $JAVA_CMD -help -+ java -help - echo "(Prepend -J in front of these options when using 'jruby' command)" - exit - elif [ "${val}" = "-X" ]; then -- $JAVA_CMD -X -+ java -X - echo "(Prepend -J in front of these options when using 'jruby' command)" - exit - elif [ "${val}" = "-classpath" ]; then -- CP="$CP$CP_DELIMITER$2" -+ CP="$CP:$2" - shift - elif [ "${val}" = "-cp" ]; then -- CP="$CP$CP_DELIMITER$2" -+ CP="$CP:$2" - shift - else - if [ "${val:0:3}" = "-ea" ]; then -@@ -221,14 +160,7 @@ do - java_args=("${java_args[@]}" "-Djava.awt.headless=true") ;; - # Run under JDB - --jdb) -- if [ -z "$JAVA_HOME" ] ; then -- JAVA_CMD='jdb' -- else -- if $cygwin; then -- JAVA_HOME=`cygpath -u "$JAVA_HOME"` -- fi -- JAVA_CMD="$JAVA_HOME/bin/jdb" -- fi -+ JAVA_CMD='jdb' - java_args=("${java_args[@]}" "-sourcepath" "$JRUBY_HOME/lib/ruby/1.8:.") - JRUBY_OPTS=("${JRUBY_OPTS[@]}" "-X+C") ;; - --client) -@@ -270,57 +202,18 @@ ruby_args=("${ruby_args[@]}" "$@") - set -- "${ruby_args[@]}" - - JAVA_OPTS="$JAVA_OPTS $JAVA_MEM $JAVA_STACK" --JNA_OS="`uname -s | tr '[:upper:]' '[:lower:]'`" --case "$JNA_OS" in --darwin) JNA_PATH="$JRUBY_HOME/lib/native/darwin";; -- *) JNA_PATH="$JRUBY_HOME/lib/native/${JNA_OS}-${JNA_CPU}:$JRUBY_HOME/lib/native/${JNA_OS}-${JNA_ALT_CPU}";; --esac --#JAVA_OPTS="$JAVA_OPTS -Djna.boot.library.path=$JNA_PATH" --JAVA_JNA="-Djna.boot.library.path=$JNA_PATH" - --JFFI_BOOT="" --for d in $JRUBY_HOME/lib/native/*`uname -s`; do -- if [ -z "$JFFI_BOOT" ]; then -- JFFI_BOOT="$d" -- else -- JFFI_BOOT="$JFFI_BOOT:$d" -- fi --done --JFFI_OPTS="-Djffi.boot.library.path=$JFFI_BOOT" -- --if $cygwin; then -- JRUBY_HOME=`cygpath --mixed "$JRUBY_HOME"` -- JRUBY_SHELL=`cygpath --mixed "$JRUBY_SHELL"` -- -- if [[ ( "${1:0:1}" = "/" ) && ( ( -f "$1" ) || ( -d "$1" )) ]]; then -- win_arg=`cygpath -w "$1"` -- shift -- win_args=("$win_arg" "$@") -- set -- "${win_args[@]}" -- fi -- -- # fix JLine to use UnixTerminal -- stty -icanon min 1 -echo > /dev/null 2>&1 -- if [ $? = 0 ]; then -- JAVA_OPTS="$JAVA_OPTS -Djline.terminal=jline.UnixTerminal" -- fi -- --fi -+JAVA_JNA="-Djna.boot.library.path=$(java-config -i jna)" -+JFFI_OPTS="-Djffi.boot.library.path=$(java-config -i jffi-0.4)" - - if [ "$nailgun_client" != "" ]; then -- if [ -f $JRUBY_HOME/tool/nailgun/ng ]; then -- exec $JRUBY_HOME/tool/nailgun/ng org.jruby.util.NailMain $JRUBY_OPTS "$@" -- else -- echo "error: ng executable not found; run 'make' in ${JRUBY_HOME}/tool/nailgun" -- exit 1 -- fi --else --if [ "$VERIFY_JRUBY" != "" ]; then -+ exec /usr/bin/ng org.jruby.util.NailMain $JRUBY_OPTS "$@" -+elif [ "$VERIFY_JRUBY" != "" ]; then - if [ "$PROFILE_ARGS" != "" ]; then - echo "Running with instrumented profiler" - fi - -- "$JAVA_CMD" $PROFILE_ARGS $JAVA_OPTS "$JAVA_JNA" "$JFFI_OPTS" "${java_args[@]}" -classpath "$JRUBY_CP$CP_DELIMITER$CP$CP_DELIMITER$CLASSPATH" \ -+ "${JAVA_CMD:-java}" $PROFILE_ARGS $JAVA_OPTS "$JAVA_JNA" "$JFFI_OPTS" "${java_args[@]}" -classpath "$JRUBY_CP:$CP:$CLASSPATH" \ - "-Djruby.home=$JRUBY_HOME" \ - "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \ - "-Djruby.shell=$JRUBY_SHELL" \ -@@ -335,34 +228,13 @@ if [ "$VERIFY_JRUBY" != "" ]; then - rm profile.txt - fi - -- if $cygwin; then -- stty icanon echo > /dev/null 2>&1 -- fi -- - exit $JRUBY_STATUS - else -- if $cygwin; then -- # exec doed not work correctly with cygwin bash -- "$JAVA_CMD" $JAVA_OPTS "$JAVA_JNA" "$JFFI_OPTS" "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \ -- "-Djruby.home=$JRUBY_HOME" \ -- "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \ -- "-Djruby.shell=$JRUBY_SHELL" \ -- $java_class $JRUBY_OPTS "$@" -- -- # Record the exit status immediately, or it will be overridden. -- JRUBY_STATUS=$? -- -- stty icanon echo > /dev/null 2>&1 -- -- exit $JRUBY_STATUS -- else -- exec "$JAVA_CMD" $JAVA_OPTS "$JAVA_JNA" "$JFFI_OPTS" "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \ -- "-Djruby.home=$JRUBY_HOME" \ -- "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \ -- "-Djruby.shell=$JRUBY_SHELL" \ -- $java_class $JRUBY_OPTS "$@" -- fi --fi -+ exec "${JAVA_CMD:-java}" $JAVA_OPTS "$JAVA_JNA" "$JFFI_OPTS" "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP:$CLASSPATH" \ -+ "-Djruby.home=$JRUBY_HOME" \ -+ "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \ -+ "-Djruby.shell=$JRUBY_SHELL" \ -+ $java_class $JRUBY_OPTS "$@" - fi - - # Be careful adding code down here, you might override the exit diff --git a/dev-java/jruby/jruby-1.4.0-r4.ebuild b/dev-java/jruby/jruby-1.4.0-r4.ebuild deleted file mode 100644 index 2b6d820fc211..000000000000 --- a/dev-java/jruby/jruby-1.4.0-r4.ebuild +++ /dev/null @@ -1,182 +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.4.0-r4.ebuild,v 1.3 2010/02/09 17:10:23 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://jruby.kenai.com/downloads/${PV}/${PN}-src-${MY_PV}.tar.gz" -LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -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.2:3 - dev-java/jcodings:0 - >=dev-java/jffi-0.6.0.2-r1:0.4 - dev-java/jna:0 - dev-java/joda-time:0 - dev-util/jay:0[java] - dev-java/nailgun:0 - dev-java/jaffl:0 - dev-java/jgrapht: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 - ) - !!/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 - rm lib/profile.jar || 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 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 - - # 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{gem,irb{,_swing},rubyc} || die - - insinto "${RUBY_HOME}" - doins -r "${S}"/lib/ruby/{1.8,1.9,site_ruby} || die - - insinto "${SITE_RUBY}/shared" - doins "${FILESDIR}/auto_gem.rb" || die - - keepdir "${GEMS}"/1.8/{cache,doc} -} - -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." -} diff --git a/dev-java/jruby/jruby-1.4.0-r5.ebuild b/dev-java/jruby/jruby-1.4.1.ebuild similarity index 84% rename from dev-java/jruby/jruby-1.4.0-r5.ebuild rename to dev-java/jruby/jruby-1.4.1.ebuild index 31e1aa518491..26711422b71c 100644 --- a/dev-java/jruby/jruby-1.4.0-r5.ebuild +++ b/dev-java/jruby/jruby-1.4.1.ebuild @@ -1,6 +1,6 @@ # 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.4.0-r5.ebuild,v 1.2 2010/02/09 17:10:23 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.4.1.ebuild,v 1.1 2010/04/27 09:23:58 caster Exp $ EAPI="2" JAVA_PKG_IUSE="doc source test" @@ -10,11 +10,12 @@ MY_PV="${PV/_rc1/RC1}" DESCRIPTION="Java-based Ruby interpreter implementation" HOMEPAGE="http://jruby.codehaus.org/" -SRC_URI="http://jruby.kenai.com/downloads/${PV}/${PN}-src-${MY_PV}.tar.gz" +#SRC_URI="http://jruby.kenai.com/downloads/${PV}/${PN}-src-${MY_PV}.tar.gz" +SRC_URI="http://jruby.org.s3.amazonaws.com/downloads/${PV}/${PN}-src-${MY_PV}.tar.gz" LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="bsf java6 ssl" +IUSE="bsf ssl" CDEPEND=">=dev-java/bytelist-1.0.2:0 >=dev-java/constantine-0.6:0 @@ -23,7 +24,7 @@ CDEPEND=">=dev-java/bytelist-1.0.2:0 >=dev-java/jna-posix-1.0.1:0 >=dev-java/jvyamlb-0.2.5:0 >=dev-java/asm-3.2:3 - dev-java/jcodings:0 + >=dev-java/jcodings-1.0.4:0 >=dev-java/jffi-0.7_pre:0.4 dev-java/jna:0 dev-java/joda-time:0 @@ -33,13 +34,10 @@ CDEPEND=">=dev-java/bytelist-1.0.2:0 dev-java/jgrapht:0" RDEPEND="${CDEPEND} - !java6? ( =virtual/jre-1.5* ) - java6? ( >=virtual/jre-1.6 )" + >=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 ) + >=virtual/jdk-1.6 bsf? ( dev-java/bsf:2.3 ) test? ( dev-java/ant-junit @@ -74,7 +72,15 @@ pkg_setup() { for directory in "${GEMS}" "${SITE_RUBY}"; do if [[ -L ${directory} ]]; then - eerror "${directory} is a symlink. Please remove this symlink." + 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 @@ -87,8 +93,8 @@ pkg_setup() { java_prepare() { epatch "${FILESDIR}/ftype-test-fixes.patch" epatch "${FILESDIR}/user-test-fixes.patch" - epatch "${FILESDIR}"/${P}-system-jars-r2.patch - epatch "${FILESDIR}"/${P}-bindir.patch + epatch "${FILESDIR}"/${PN}-1.4.0-system-jars-r2.patch + epatch "${FILESDIR}"/${PN}-1.4.0-bindir.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 -- 2.26.2