Fix usage of system nailgun.

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

4 files changed, 34 insertions, 7 deletions

diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index 32a894753314..6c7070b9c4fb 100644
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -1,6 +1,13 @@
 # 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.48 2010/01/16 21:02:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.49 2010/01/16 21:14:07 flameeyes Exp $
+
+*jruby-1.4.0-r2 (16 Jan 2010)
+
+  16 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -jruby-1.4.0-r1.ebuild, +jruby-1.4.0-r2.ebuild,
+  +files/jruby-1.4.0-system-nailgun.patch:
+  Fix usage of system nailgun.
 
   16 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   jruby-1.4.0-r1.ebuild:
diff --git a/dev-java/jruby/Manifest b/dev-java/jruby/Manifest
index 7b04246a359d..b93b77e2df30 100644
--- a/dev-java/jruby/Manifest
+++ b/dev-java/jruby/Manifest
@@ -7,6 +7,7 @@ AUX ftype-test-fixes.patch 2738 RMD160 9de8f9e14469967b736fbcf48c28a2ee9c366d6e
 AUX gentoo.rb 257 RMD160 3dd119c675829a9196e374f0c290ceac37ddc7c6 SHA1 de86d6471533efb97bbfe24ecb4847610bc1ea42 SHA256 6868b148829f218ff4c739af05e81b1d9da5d295507d99cb1f074ed88d72a1dc
 AUX jruby 97 RMD160 500ca93e1a23897fb3d9ebd0b1a6ba7caec9be1d SHA1 ae79a6d60a9e28034fb08b394cba443fd66ceacf SHA256 579b36ea120de4fc04e384937ecc567a090bb64f276b07cc059d072a5a7d2e60
 AUX jruby-0.9.8-sandbox.patch 522 RMD160 f9aebe3469edb3d2d22d641e616691ff14def7db SHA1 9d983c1bd7cb35239d85af445f5aa7c5d1c143a3 SHA256 1c2701881674a978c9ddc32e2e126cf25690e86011c6301e7f825407fb5810a2
+AUX jruby-1.4.0-system-nailgun.patch 614 RMD160 dfd85eeca56d07ca9774c655592c98cd5c45184b SHA1 42756fac79f7a090ffd33be03b341ec63758084d SHA256 2ff4f4cf0169ffa03352f4342f2fb5a3acfcf091c9d38c93970b6028ca45660c
 AUX user-test-fixes.patch 5147 RMD160 6258879413ae81a18d0c6bcaa3b0661d86a0d14a SHA1 32d3f80db383cf664c9ad1f9e52c2688ae3cbe5c SHA256 f21469d41de9f9b5fb1682596f64899a71c92332db24bf27e8c50dbb1896a92e
 DIST jruby-src-1.0.3.tar.gz 5218289 RMD160 b717863f8455ea5f323dd2b73824c39732dbd7df SHA1 38c091dbd28102013b61b10d1d24c6c237f44937 SHA256 3d10f92d8fd0815529a2ddefc291af288b8f2f51749c347c29006b84a30a2c0a
 DIST jruby-src-1.0.tar.gz 4840184 RMD160 3de4dfa558a12a1643fa2357f3e144e34c5a718d SHA1 f4e18c6c112e1741024d76b10528fef7a242a018 SHA256 80088e32cceb929b0cd0d0115ed800577b7b800d42dca3356e840d1123047b03
@@ -18,13 +19,13 @@ EBUILD jruby-1.0.3.ebuild 4462 RMD160 83c55f4dd8b7d4c2c92843dd26608da2485b004d S
 EBUILD jruby-1.2.0-r1.ebuild 5023 RMD160 8239a5ba7e717c3a434e98a81eb60875f97e3055 SHA1 e02cefc8138981f6d100bf6e633f04db3327000a SHA256 513ec2c93efaa444220c5ca1c2bfeb46c1244de43b900b38386e8d63f9f94d52
 EBUILD jruby-1.3.1-r1.ebuild 5502 RMD160 94388e24d29a24d3b23013125ae38e5a0e3f4846 SHA1 4c66c6df3aab698f950dc28e57208a4c94d523c7 SHA256 b5b064f8bec2f7ab2c045c684dda9171e57d7942dd22dfaec715dbeba3adc620
 EBUILD jruby-1.3.1.ebuild 5552 RMD160 fd6520487dd38cc12dbc5204b985117c700d454f SHA1 5208c74e8b4a45d8198ccf93c2283bc9b2fe7d69 SHA256 af93273763993cf81cfc14efe1735eb00d1fbf256c2164c74602eceb4eafd1bd
-EBUILD jruby-1.4.0-r1.ebuild 5926 RMD160 46ecc5075d446bd6d962ab49622efd3a7e814425 SHA1 6fecc6fd322fea224b27cd425ed05d4ed8957a1e SHA256 7e45fdb830ebc1bd3009ea21d86e18a1252ae480da4da31545a1135d26e10ade
-MISC ChangeLog 8364 RMD160 160a11b16473d7d6409a37bc3eb9f87c15c2bf1b SHA1 01a9eb566e9e7531a98167205cc3dea8af422371 SHA256 b7b7842baf823de9039a7321c32c3a3d683e7d3f0e4489067c33eaea037a3af4
+EBUILD jruby-1.4.0-r2.ebuild 5974 RMD160 2f4409b614f298cf19cdb70e2a3cacbdc8d2168a SHA1 a1ed0c03cc12048970a774401abed49a8e2a6ec1 SHA256 00aecc9151db7f621df58526679b0393d11cbc2449fdf6303e19ed9e946af6ae
+MISC ChangeLog 8576 RMD160 73eaf22bef68826655b0bcad86a9788bb0fbd8b3 SHA1 b2e556cd6571b75d0a0b2344ff2627cd3530bc09 SHA256 9d679c88644eccc3504e9003949a048470f08054f6fb2bbae51272bbb431aeed
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktSKVIACgkQAiZjviIA2XgpogCfTz4B7HYH4USwfdGTIYSkcOCa
-Gf8An0/bHlLFxtGuIIxGWPXbz1l4rcoG
-=XegU
+iEYEARECAAYFAktSK/YACgkQAiZjviIA2Xg0gQCg2Owy1a8fE57GXgqV/P0yG4Gm
+KYwAoKOrows1mDsInS/wmdlKUwyV2BeI
+=G7oe
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jruby/files/jruby-1.4.0-system-nailgun.patch b/dev-java/jruby/files/jruby-1.4.0-system-nailgun.patch
new file mode 100644
index 000000000000..f8fef66fd823
--- /dev/null
+++ b/dev-java/jruby/files/jruby-1.4.0-system-nailgun.patch
@@ -0,0 +1,18 @@
+Index: jruby-1.4.0/bin/jruby
+===================================================================
+--- jruby-1.4.0.orig/bin/jruby
++++ jruby-1.4.0/bin/jruby
+@@ -308,12 +308,7 @@ if $cygwin; then
+ fi
+ 
+ if [ "$nailgun_client" != "" ]; then
+-  if [ -f $JRUBY_HOME/tool/nailgun/ng ]; then
+-    exec $JRUBY_HOME/tool/nailgun/ng org.jruby.util.NailMain $JRUBY_OPTS "$@"
+-  else
+-    echo "error: ng executable not found; run 'make' in ${JRUBY_HOME}/tool/nailgun"
+-    exit 1
+-  fi
++  exec /usr/bin/ng org.jruby.util.NailMain $JRUBY_OPTS "$@"
+ else
+ if [ "$VERIFY_JRUBY" != "" ]; then
+   if [ "$PROFILE_ARGS" != "" ]; then
diff --git a/dev-java/jruby/jruby-1.4.0-r1.ebuild b/dev-java/jruby/jruby-1.4.0-r2.ebuild
index 789e0fcbac5e..e86f875ed017 100644
--- a/dev-java/jruby/jruby-1.4.0-r1.ebuild
+++ b/dev-java/jruby/jruby-1.4.0-r2.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-r1.ebuild,v 1.3 2010/01/16 21:02:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.4.0-r2.ebuild,v 1.1 2010/01/16 21:14:07 flameeyes Exp $
 
 EAPI="2"
 JAVA_PKG_IUSE="doc source test"
@@ -97,6 +97,7 @@ pkg_setup() {
 java_prepare() {
 	epatch "${FILESDIR}/ftype-test-fixes.patch"
 	epatch "${FILESDIR}/user-test-fixes.patch"
+	epatch "${FILESDIR}"/${P}-system-nailgun.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