Fix bindir definition, or rather workaround since the properties don't seem to get respected from the file.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 23 insertions, 16 deletions

diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index 5378c79b7639..3a6512c44d94 100644
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -1,6 +1,20 @@
 # 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.59 2010/06/19 11:07:14 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.60 2010/06/22 22:08:33 flameeyes Exp $
+
+  22 Jun 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/jruby-1.5.0-bindir.patch, files/jruby-1.5.0-system-jars.patch,
+  -jruby-1.5.1.ebuild, +jruby-1.5.1-r1.ebuild:
+  Fix bindir definition, or rather workaround since the properties don't
+  seem to get respected from the file.
+
+*jruby-1.5.1-r1 (22 Jun 2010)
+
+  22 Jun 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -files/jruby-1.5.0-bindir.patch, files/jruby-1.5.0-system-jars.patch,
+  -jruby-1.5.1.ebuild, +jruby-1.5.1-r1.ebuild:
+  Make sure that the reported bindir is correct, otherwise rake will always
+  fail.
 
 *jruby-1.5.1 (17 Jun 2010)
 
diff --git a/dev-java/jruby/files/jruby-1.5.0-bindir.patch b/dev-java/jruby/files/jruby-1.5.0-bindir.patch
deleted file mode 100644
index 88390b223adb..000000000000
--- a/dev-java/jruby/files/jruby-1.5.0-bindir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur jruby-1.5.0.orig/src/org/jruby/libraries/RbConfigLibrary.java jruby-1.5.0/src/org/jruby/libraries/RbConfigLibrary.java
---- jruby-1.5.0.orig/src/org/jruby/libraries/RbConfigLibrary.java	2010-05-16 08:54:49.000000000 +1200
-+++ jruby-1.5.0/src/org/jruby/libraries/RbConfigLibrary.java	2010-05-16 23:24:36.000000000 +1200
-@@ -135,7 +135,7 @@
-         // Use property for binDir if available, otherwise fall back to common bin default
-         String binDir = SafePropertyAccessor.getProperty("jruby.bindir");
-         if (binDir == null) {
--            binDir = new NormalizedFile(normalizedHome, "bin").getPath();
-+            binDir = new NormalizedFile(normalizedHome, "/usr/bin").getPath();
-         }
-         setConfig(configHash, "bindir", binDir);
- 
diff --git a/dev-java/jruby/files/jruby-1.5.0-system-jars.patch b/dev-java/jruby/files/jruby-1.5.0-system-jars.patch
index 294feedbbaf6..8260df1b81b9 100644
--- a/dev-java/jruby/files/jruby-1.5.0-system-jars.patch
+++ b/dev-java/jruby/files/jruby-1.5.0-system-jars.patch
@@ -176,7 +176,8 @@ diff -Naur jruby-1.5.1.bak/bin/jruby.sh jruby-1.5.1/bin/jruby.sh
          JAVA_VM=-client ;;
 @@ -275,51 +202,16 @@
  
- JAVA_OPTS="$JAVA_OPTS $JAVA_MEM $JAVA_STACK"
+-JAVA_OPTS="$JAVA_OPTS $JAVA_MEM $JAVA_STACK"
++JAVA_OPTS="$JAVA_OPTS $JAVA_MEM $JAVA_STACK -Djruby.bindir=/usr/bin"
  
 -JFFI_BOOT=""
 -if [ -d $JRUBY_HOME/lib/native/ ]; then
diff --git a/dev-java/jruby/jruby-1.5.1.ebuild b/dev-java/jruby/jruby-1.5.1-r1.ebuild
index c10b6b3f6328..537e9e9d822c 100644
--- a/dev-java/jruby/jruby-1.5.1.ebuild
+++ b/dev-java/jruby/jruby-1.5.1-r1.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.5.1.ebuild,v 1.1 2010/06/19 11:07:14 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.5.1-r1.ebuild,v 1.1 2010/06/22 22:08:33 flameeyes Exp $
 
 EAPI="2"
 JAVA_PKG_IUSE="doc source test"
@@ -95,7 +95,6 @@ java_prepare() {
 	#epatch "${FILESDIR}/ftype-test-fixes.patch"
 	#epatch "${FILESDIR}/user-test-fixes.patch"
 	epatch "${FILESDIR}"/${PN}-1.5.0-system-jars.patch
-	epatch "${FILESDIR}"/${PN}-1.5.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
@@ -112,6 +111,11 @@ java_prepare() {
 	# 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
+
+	# change some defaults for Gentoo to work properly
+	cat - >> src/org/jruby/jruby.properties <<EOF
+jruby.bindir = /usr/bin
+EOF
 }
 
 src_compile() {