Add patch to fix one further issue (don't revbump just yet).

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

4 files changed, 26 insertions, 7 deletions

diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index f7d11cbfa04a..8b2e34ff8ab7 100644
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -1,6 +1,10 @@
 # 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.52 2010/01/23 23:02:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.53 2010/01/24 00:54:52 flameeyes Exp $
+
+  24 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  jruby-1.4.0-r4.ebuild, +files/jruby-1.4.0-bindir.patch:
+  Add patch to fix one further issue (don't revbump just yet).
 
 *jruby-1.4.0-r4 (23 Jan 2010)
 
diff --git a/dev-java/jruby/Manifest b/dev-java/jruby/Manifest
index a74bf241233f..9a26eeb883cf 100644
--- a/dev-java/jruby/Manifest
+++ b/dev-java/jruby/Manifest
@@ -6,18 +6,19 @@ AUX auto_gem.rb 159 RMD160 fbf261e5cf0a8450c51c33a7ad4dafbab21bd518 SHA1 8dde3d7
 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.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
 EBUILD jruby-1.3.1-r1.ebuild 5502 RMD160 94388e24d29a24d3b23013125ae38e5a0e3f4846 SHA1 4c66c6df3aab698f950dc28e57208a4c94d523c7 SHA256 b5b064f8bec2f7ab2c045c684dda9171e57d7942dd22dfaec715dbeba3adc620
-EBUILD jruby-1.4.0-r4.ebuild 5635 RMD160 82be3f2f119b5e7b1faa0b99a66a848f167ff324 SHA1 ebec93d29e562a42ee9450a006ede49aa55c0f09 SHA256 3a833d8a64c88e19a934a2706aa97f09e5fe1d8a98da855b5215efd935509240
-MISC ChangeLog 9789 RMD160 f69b982ece1262cd4329e574733ca7437c197b19 SHA1 461bd12751913db1f99d427ca9d8ef5bbcad1ad6 SHA256 5f696129ac7f791424c4298aa9445884e2df9698aff04f96eef8cba421568ef3
+EBUILD jruby-1.4.0-r4.ebuild 5675 RMD160 4de267a5dc112d74aeb0dd8a1d3aedb1a83d01af SHA1 87cc2b17f1292cbaa89c39195c4803b03b991e1c SHA256 e91613114e812adfa3f3b15e49e7fee739ca412ee43821807391cf059eb4de33
+MISC ChangeLog 9967 RMD160 54a1031db4304dc0f05dbce9b63bf5655258896d SHA1 e498d8fa12e7767971ecbfaa383f4a0e182cbf21 SHA256 82fd91bb0940576141319af2b01e627066fbbe93533fb368abe3b8da94f80edf
 MISC metadata.xml 179 RMD160 3813d8d3651faaf99042cb3c776d0bc59ad7b5b4 SHA1 421371d5338c6b9b8b4950c44d78a9dbe79cf64d SHA256 0df27adc265ef6596f973641d25b64b7291c87f1b114d6895f69d222049bed1b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktbf+4ACgkQAiZjviIA2Xh8ZQCfRFf/4ONQEAccDVhlgHAYfVGt
-yTwAoKnKqvMxHrwgIBVOUCV6Aq2xcc3b
-=xNYb
+iEYEARECAAYFAktbmlEACgkQAiZjviIA2XgkbwCeJrI3s/xCj0tANgCewZ2PDueZ
+HEQAoOwAHqG/DriQq+V3ShPyIcNTVpV9
+=TZeJ
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jruby/files/jruby-1.4.0-bindir.patch b/dev-java/jruby/files/jruby-1.4.0-bindir.patch
new file mode 100644
index 000000000000..cf736a62efca
--- /dev/null
+++ b/dev-java/jruby/files/jruby-1.4.0-bindir.patch
@@ -0,0 +1,13 @@
+Index: jruby-1.4.0/src/org/jruby/libraries/RbConfigLibrary.java
+===================================================================
+--- jruby-1.4.0.orig/src/org/jruby/libraries/RbConfigLibrary.java
++++ jruby-1.4.0/src/org/jruby/libraries/RbConfigLibrary.java
+@@ -113,7 +113,7 @@ public class RbConfigLibrary implements 
+         } else {
+             normalizedHome = runtime.getJRubyHome();
+         }
+-        setConfig(configHash, "bindir", new NormalizedFile(normalizedHome, "bin").getPath());
++        setConfig(configHash, "bindir", "/usr/bin");
+         setConfig(configHash, "RUBY_INSTALL_NAME", jrubyScript());
+         setConfig(configHash, "ruby_install_name", jrubyScript());
+         setConfig(configHash, "SHELL", jrubyShell());
diff --git a/dev-java/jruby/jruby-1.4.0-r4.ebuild b/dev-java/jruby/jruby-1.4.0-r4.ebuild
index 316025187511..a7abb10cfed5 100644
--- a/dev-java/jruby/jruby-1.4.0-r4.ebuild
+++ b/dev-java/jruby/jruby-1.4.0-r4.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-r4.ebuild,v 1.1 2010/01/23 23:02:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.4.0-r4.ebuild,v 1.2 2010/01/24 00:54:52 flameeyes Exp $
 
 EAPI="2"
 JAVA_PKG_IUSE="doc source test"
@@ -94,6 +94,7 @@ java_prepare() {
 	epatch "${FILESDIR}/ftype-test-fixes.patch"
 	epatch "${FILESDIR}/user-test-fixes.patch"
 	epatch "${FILESDIR}"/${P}-system-jars.patch
+	epatch "${FILESDIR}"/${P}-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