[gentoo-commits] proj/ruby-overlay:master commit in: dev-java/jruby/files/, dev-java/jruby/

["Hans de Graaff" <graaff@gentoo.org>]

commit:     d86721adb317670577dcc1d82e06cd94bfdff595
Author:     Hans de Graaff <hans <AT> degraaff <DOT> org>
AuthorDate: Mon Jan 23 20:55:02 2012 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 20:55:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/ruby-overlay.git;a=commit;h=d86721ad

The properties file is no longer used. Add the bindir option to the wrapper instead.

(Portage version: 2.1.10.41/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x8883FA56A308A8D7!)

---
 dev-java/jruby/ChangeLog                       |    5 +++++
 dev-java/jruby/files/jruby-bash-launcher.patch |    6 ++++--
 dev-java/jruby/jruby-1.6.5.1.ebuild            |    5 -----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index 425f143..ea8346a 100644
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  23 Jan 2012; Hans de Graaff <graaff@gentoo.org> jruby-1.6.5.1.ebuild,
+  files/jruby-bash-launcher.patch:
+  The properties file is no longer used. Add the bindir option to the wrapper
+  instead.
+
   22 Jan 2012; Hans de Graaff <graaff@gentoo.org> jruby-1.6.5.1.ebuild:
   yecht.jar is no longer a separate jar so it must be included:
   https://github.com/jruby/jruby/commit/6c1d41aedfde705c969abf10cf5384e2be69

diff --git a/dev-java/jruby/files/jruby-bash-launcher.patch b/dev-java/jruby/files/jruby-bash-launcher.patch
index e962872..d23f6cf 100644
--- a/dev-java/jruby/files/jruby-bash-launcher.patch
+++ b/dev-java/jruby/files/jruby-bash-launcher.patch
@@ -149,13 +149,14 @@ index 731f85e..8299557 100755
  if $cygwin; then
    JRUBY_HOME=`cygpath --mixed "$JRUBY_HOME"`
    JRUBY_SHELL=`cygpath --mixed "$JRUBY_SHELL"`
-@@ -354,7 +264,7 @@ if [ "$VERIFY_JRUBY" != "" ]; then
+@@ -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
@@ -167,12 +168,13 @@ index 731f85e..8299557 100755
        "-Djruby.home=$JRUBY_HOME" \
        "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
        "-Djruby.shell=$JRUBY_SHELL" \
-@@ -390,7 +300,7 @@ else
+@@ -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" \

diff --git a/dev-java/jruby/jruby-1.6.5.1.ebuild b/dev-java/jruby/jruby-1.6.5.1.ebuild
index e5ecfe1..13df9c3 100644
--- a/dev-java/jruby/jruby-1.6.5.1.ebuild
+++ b/dev-java/jruby/jruby-1.6.5.1.ebuild
@@ -121,11 +121,6 @@ java_prepare() {
 	# 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" ! -name "yecht.jar" -delete || die
-
-	# change some defaults for Gentoo to work properly
-	cat - >> src/org/jruby/jruby.properties <<EOF
-ruby.bindir = /usr/bin
-EOF
 }
 
 src_compile() {