diff options
| -rw-r--r-- | dev-java/jruby/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/jruby/Manifest | 9 | ||||
| -rw-r--r-- | dev-java/jruby/files/jruby-bash-launcher.patch | 180 |
3 files changed, 190 insertions, 5 deletions
diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog index 9ffcf7c9caab..37f937433abe 100644 --- a/dev-java/jruby/ChangeLog +++ b/dev-java/jruby/ChangeLog @@ -1,6 +1,10 @@ # 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.78 2012/04/14 07:05:17 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.79 2012/04/14 07:08:46 graaff Exp $ + + 14 Apr 2012; Hans de Graaff <graaff@gentoo.org> + +files/jruby-bash-launcher.patch: + Add missing file. *jruby-1.6.5.1 (14 Apr 2012) diff --git a/dev-java/jruby/Manifest b/dev-java/jruby/Manifest index 5a4f6fbbf5bc..c116292a3de3 100644 --- a/dev-java/jruby/Manifest +++ b/dev-java/jruby/Manifest @@ -11,6 +11,7 @@ AUX jruby-1.4.0-bindir.patch 743 RMD160 ea3ea934abb45fda138afd336a0dee2bbcb7126a AUX jruby-1.4.0-system-jars-r2.patch 8332 RMD160 d59ae12abcc4184c1d9f39a3dafe769d00a0f732 SHA1 a3fcb2a452d65757c838c6883420d1a3b84b91fa SHA256 92f67d30f0be4ff029d3045e9446b5191da474fe0280269e4b1dc5b026e51556 AUX jruby-1.5.0-system-jars.patch 8113 RMD160 462a0f90f05e11ea28caf960ae647b4726421a49 SHA1 9e4203e877e50f09c5417a92e8d9700736ff8298 SHA256 8c386f1d0e08b75a9f986e317d822c393231316d46eca0030ed67fe40dfbe3b5 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 @@ -26,12 +27,12 @@ EBUILD jruby-1.5.3.ebuild 6206 RMD160 d5dcd3884fcb76c069237a38fb7af7adf7dbaabf S 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 6166 RMD160 9a03ee1f5c5afb071fcb37921fd95d445b23c6e8 SHA1 04c09370eaf6ff53c58b04bd7ad78b6362ba91f4 SHA256 dbb1ce214ac109379bb4efb100e1c1d5fdd9cd1278e10c6c977d295d8c0be724 -MISC ChangeLog 14639 RMD160 4c131a906c1bfe6289b6db4ad4ca2bfd42912f92 SHA1 11d285c29bdd7773da9874ec950bc23a9b071236 SHA256 d1d21f4c1395fb11cc1fe14b549279c7e579293a95175b3cf828c8d5dfa22cdd +MISC ChangeLog 14746 RMD160 6413b253758ac84bdca33150a1845b220e969334 SHA1 e9c202ba80cdc43e9fb566c08f4e61105f7058d6 SHA256 d38f6001983e3dee06c5fb3457ea1b4e606546150540026572ddd0eba1eefb64 MISC metadata.xml 179 RMD160 3813d8d3651faaf99042cb3c776d0bc59ad7b5b4 SHA1 421371d5338c6b9b8b4950c44d78a9dbe79cf64d SHA256 0df27adc265ef6596f973641d25b64b7291c87f1b114d6895f69d222049bed1b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk+JIbMACgkQiIP6VqMIqNc0fAD9Fnh/aNrsVgy5fxD2i0mFb6Bz -/LuvYRD4q18r8U88q/gA/1aVd8bRnwe6LX3U93D5vka9oJuj3puHYDYjaIbdKzR+ -=ccSB +iF4EAREIAAYFAk+JIoMACgkQiIP6VqMIqNczIwD/a4j+zRmniaq0+VOQgJV1JCPH +Z5/gZUMDr87ZyMNlPR0BAJTi8jAHbF7FdUO6aq94qUxiRc+wT9lmqcu8gUGafOPM +=y4cH -----END PGP SIGNATURE----- diff --git a/dev-java/jruby/files/jruby-bash-launcher.patch b/dev-java/jruby/files/jruby-bash-launcher.patch new file mode 100644 index 000000000000..d23f6cf200f3 --- /dev/null +++ b/dev-java/jruby/files/jruby-bash-launcher.patch @@ -0,0 +1,180 @@ +Author: Ralph Sennhauser <sera@gentoo.org> + +Set JRUBY_HOME, JRUBY_CP, CP and JAVACMD as appropriate for Gentoo. +Remove JFFI_OPTS as the system jar knows where to look for the native lib. + +diff --git a/bin/jruby.bash b/bin/jruby.bash +index 731f85e..8299557 100755 +--- a/bin/jruby.bash ++++ b/bin/jruby.bash +@@ -25,31 +25,7 @@ if [ -z "$JAVA_VM" ]; then + JAVA_VM=-client + fi + +-## resolve links - $0 may be a link to home +-PRG=$0 +-progname=`basename "$0"` +- +-while [ -h "$PRG" ] ; do +- ls=`ls -ld "$PRG"` +- link=`expr "$ls" : '.*-> \(.*\)$'` +- if expr "$link" : '.*/.*' > /dev/null; then +- if expr "$link" : '/' > /dev/null; then +- PRG="$link" +- else +- PRG="`dirname ${PRG}`/${link}" +- fi +- else +- PRG="`dirname $PRG`/$link" +- 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 +-fi ++JRUBY_HOME="${JRUBY_HOME:-/usr/share/jruby}" + + if [ -z "$JRUBY_OPTS" ] ; then + JRUBY_OPTS="" +@@ -81,17 +57,7 @@ for opt in ${JRUBY_OPTS[@]}; do + done + JRUBY_OPTS=${JRUBY_OPTS_TEMP} + +-if [ -z "$JAVACMD" ] ; then +- if [ -z "$JAVA_HOME" ] ; then +- JAVACMD='java' +- else +- if $cygwin; then +- JAVACMD="`cygpath -u "$JAVA_HOME"`/bin/java" +- else +- JAVACMD="$JAVA_HOME/bin/java" +- fi +- fi +-fi ++JAVACMD=java + + if [ -z "$JAVA_MEM" ] ; then + JAVA_MEM=-Xmx500m +@@ -132,21 +98,7 @@ JRUBY_SHELL=/bin/sh + + CP_DELIMITER=":" + +-# add main jruby jar to the bootclasspath +-for j in "$JRUBY_HOME"/lib/jruby.jar "$JRUBY_HOME"/lib/jruby-complete.jar; do +- if [ ! -e "$j" ]; then +- continue +- fi +- if [ "$JRUBY_CP" ]; then +- JRUBY_CP="$JRUBY_CP$CP_DELIMITER$j" +- else +- JRUBY_CP="$j" +- fi +- if [ $JRUBY_ALREADY_ADDED ]; then +- echo "WARNING: more than one JRuby JAR found in lib directory" +- fi +- JRUBY_ALREADY_ADDED=true +-done ++JRUBY_CP="$(java-config-2 -d -p jruby)" + + if $cygwin; then + JRUBY_CP=`cygpath -p -w "$JRUBY_CP"` +@@ -154,29 +106,7 @@ 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 [ "$j" == "$JRUBY_HOME"/lib/jruby.jar ]; then +- continue +- fi +- if [ "$j" == "$JRUBY_HOME"/lib/jruby-complete.jar ]; then +- continue +- fi +- if [ "$CP" ]; then +- CP="$CP$CP_DELIMITER$j" +- else +- CP="$j" +- fi +- done +- +- if $cygwin; then +- CP=`cygpath -p -w "$CP"` +- fi +-fi ++CP="${JRUBY_PARENT_CLASSPATH}" + + if $cygwin; then + # switch delimiter only after building Unix style classpaths +@@ -254,15 +184,7 @@ do + java_args=("${java_args[@]}" "-Djava.awt.headless=true") ;; + # Run under JDB + --jdb) +- if [ -z "$JAVA_HOME" ] ; then +- JAVACMD='jdb' +- else +- if $cygwin; then +- JAVACMD="`cygpath -u "$JAVA_HOME"`/bin/jdb" +- else +- JAVACMD="$JAVA_HOME/bin/jdb" +- fi +- fi ++ JAVACMD='jdb' + java_args=("${java_args[@]}" "-sourcepath" "$JRUBY_HOME/lib/ruby/1.8:.") + JRUBY_OPTS=("${JRUBY_OPTS[@]}" "-X+C") ;; + --client) +@@ -310,18 +232,6 @@ set -- "${ruby_args[@]}" + + JAVA_OPTS="$JAVA_OPTS $JAVA_MEM $JAVA_MEM_MIN $JAVA_STACK" + +-JFFI_BOOT="" +-if [ -d "$JRUBY_HOME/lib/native/" ]; then +- 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 +-fi +-JFFI_OPTS="-Djffi.boot.library.path=$JFFI_BOOT" +- + if $cygwin; then + JRUBY_HOME=`cygpath --mixed "$JRUBY_HOME"` + JRUBY_SHELL=`cygpath --mixed "$JRUBY_SHELL"` +@@ -354,7 +264,8 @@ if [ "$VERIFY_JRUBY" != "" ]; then + echo "Running with instrumented profiler" + fi + +- "$JAVACMD" $PROFILE_ARGS $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -classpath "$JRUBY_CP$CP_DELIMITER$CP$CP_DELIMITER$CLASSPATH" \ ++ "$JAVACMD" $PROFILE_ARGS $JAVA_OPTS "${java_args[@]}" -classpath "$JRUBY_CP$CP_DELIMITER$CP$CP_DELIMITER$CLASSPATH" \ + "-Djruby.home=$JRUBY_HOME" \ ++ "-Djruby.bindir=/usr/bin" \ + "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \ + "-Djruby.shell=$JRUBY_SHELL" \ +@@ -377,7 +287,7 @@ if [ "$VERIFY_JRUBY" != "" ]; then + else + if $cygwin; then + # exec doed not work correctly with cygwin bash +- "$JAVACMD" $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \ ++ "$JAVACMD" $JAVA_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" \ +@@ -390,7 +300,8 @@ else + + exit $JRUBY_STATUS + else +- exec "$JAVACMD" $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \ ++ exec "$JAVACMD" $JAVA_OPTS "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \ + "-Djruby.home=$JRUBY_HOME" \ ++ "-Djruby.bindir=/usr/bin" \ + "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \ + "-Djruby.shell=$JRUBY_SHELL" \ |