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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 36 insertions, 20 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/Manifest b/dev-java/jruby/Manifest
index baca4e7eea6d..708b6e53acaf 100644
--- a/dev-java/jruby/Manifest
+++ b/dev-java/jruby/Manifest
@@ -1,11 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 10jruby 22 RMD160 ac56025539a2bbb7a1506a2df958c73cc1c3aba9 SHA1 caf6b109c0a7cfa53a1e470ba0ca5f27a6578723 SHA256 fb1240cfedd315ba3772830abbc238eb3061088fcf70eb4df7e9a99d92f124e4
 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.5.0-bindir.patch 765 RMD160 2db46224d91c073f0fe1c9ef264abc281631c1ed SHA1 b02c7d072d297c577b9b1f78257a2d333ea9c2c6 SHA256 df24387b0303e26602b016c13ed0dc0f0ceb9879c752af7aeaa0400b59108023
-AUX jruby-1.5.0-system-jars.patch 8043 RMD160 f85397a521492297b53d236479a8e0eab53febd4 SHA1 e88c6253b21402dcaf27cd773cd836cf98f3d72e SHA256 573a529521d51b2f1a17e6a09257787a6e8d1ace71d0fd8f4bd2d269698a86fc
+AUX jruby-1.5.0-system-jars.patch 8113 RMD160 59ac1750a53176c90e134804d7021ca9bab39926 SHA1 d3400e71d456712756d91992a65626c86a316e08 SHA256 69f14036398c8fa2210fee8dee63e85925c37805dd8985586752fad8596c87da
 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
@@ -14,6 +16,13 @@ DIST jruby-src-1.5.1.tar.gz 11260259 RMD160 6bfa5aa1c28d1a9e250be0b8364e423caf90
 EBUILD jruby-1.3.1-r1.ebuild 5362 RMD160 9cc4b0f1cd310a6a3d833e8bb339e15853ca44fa SHA1 cdf3e7003c9794372c3c949c37c92eedb95310bd SHA256 f955390140221f98f15b837fc2d62b45be4c0289fb3521e71e65c554fd1f4218
 EBUILD jruby-1.4.0-r6.ebuild 5777 RMD160 c4e0db8272cc8978f5df2b8ba961aee64b556fb8 SHA1 66403cb4213cc39cab98da522d4dbe61f64e1c6d SHA256 f61a9ca66617fe3278e39b448e55f6c22dce10e8510b4683d3a609a4a47f0a09
 EBUILD jruby-1.4.1.ebuild 5881 RMD160 97f32d9f31ff27594fbabfcfbf86dd042769808b SHA1 49dc88a8d9f27aef94df7fe6fe2a4aa03e4dd064 SHA256 9041a64874bd36aa1ba2469dbe75df66f8eb0a9b9a02ce10224ec03f2c4ea2c3
-EBUILD jruby-1.5.1.ebuild 5639 RMD160 9cf5698a5a13b46540658c06c2df3f3bdbdee0bd SHA1 a7e5972686889b1670cc0247c899f15d7e868048 SHA256 f2a4b32726c410618beb94ff23d36ac8ae6a08b07f31c745bd8e950d2a30b39f
-MISC ChangeLog 11324 RMD160 fc7fe41e1cc972688387afa5a8e46388d8107994 SHA1 3ded930b1f82f6cad875aaa5e3a296af0cc2ab25 SHA256 473e85b7084aa241d20a8c98f247039915ce76590a79347c1b2eb0ec9eb6866c
+EBUILD jruby-1.5.1-r1.ebuild 5724 RMD160 29a79ea7a8a4c3e9776729365fa197379ab10424 SHA1 48d88320f92918772f10fe75eb86f8f4af342c29 SHA256 770ec6b60765cab3c681e357f7222c64611fbe7300d21f8fa91dabc55356017c
+MISC ChangeLog 11904 RMD160 e6eda9df6162afbdaa40863c33880f9e58342bcd SHA1 d16bb02727ea8162e2fe4b4bb8b386980f2a2e35 SHA256 0c3f1581d2f96ee62dc75ef7db7900d1707a8d05e8a00326a4bf6799abcaadca
 MISC metadata.xml 179 RMD160 3813d8d3651faaf99042cb3c776d0bc59ad7b5b4 SHA1 421371d5338c6b9b8b4950c44d78a9dbe79cf64d SHA256 0df27adc265ef6596f973641d25b64b7291c87f1b114d6895f69d222049bed1b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwhM6MACgkQAiZjviIA2XiDmgCgr5BJayHJEwvRNDdBnfij5led
+88EAnjI6gRcV0FjusIx1HpBF2cU3SUjV
+=gz32
+-----END PGP SIGNATURE-----
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() {