Cleanup.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x8883FA56A308A8D7!

7 files changed, 11 insertions, 794 deletions

diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index dca0aaa8ae45..be5c4d03de5b 100644
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jruby
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.96 2014/05/03 21:31:48 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.97 2014/05/13 04:52:49 graaff Exp $
+
+  13 May 2014; Hans de Graaff <graaff@gentoo.org> -jruby-1.6.5.1.ebuild,
+  -files/jruby-1.4.0-bindir.patch, -files/jruby-1.4.0-system-jars-r2.patch,
+  -files/jruby-1.5.0-system-jars.patch,
+  -files/jruby-1.5.6-rubygems-1.8.x.patch:
+  Cleanup.
 
 *jruby-1.7.12 (03 May 2014)
 
diff --git a/dev-java/jruby/Manifest b/dev-java/jruby/Manifest
index 780302910bed..f623479c91e7 100644
--- a/dev-java/jruby/Manifest
+++ b/dev-java/jruby/Manifest
@@ -7,31 +7,21 @@ AUX 10jruby 22 SHA256 fb1240cfedd315ba3772830abbc238eb3061088fcf70eb4df7e9a99d92
 AUX ftype-test-fixes.patch 2738 SHA256 82fd519cc11271e4d475529a308dbcf70526c18f7c1f193a2ef93d6f0b4fdd2b SHA512 b5c27bb01512fcd0dac194f056c0598026183439650c2c78bfcdedf7bd0cb9c68afb54a0e26a82c04351fc305808c7affde0d9e8b540afc2f2b98eed07d85e48 WHIRLPOOL 3860239eaf7e5b43f8c9ce90f327a1faca5d7a0d15b9e420b31acdce34b1a60aeeb721ce9f6212de75bddbb042317b594aa0a2da13287317d94faf07cd717ddb
 AUX gentoo.rb 257 SHA256 6868b148829f218ff4c739af05e81b1d9da5d295507d99cb1f074ed88d72a1dc SHA512 4d4a3423a0d69e6d99e8d401061bb904b9b51acd45a6d04203b51ca6d9e000ce679eada9af5d763a0cd5c252649a99690d3147019d26cafd9ab037ad012d8578 WHIRLPOOL a020c2ac04924c38f2b97f653f29712578caae7ec0eb8f2eb511cde1e468437f798f3928ffc2e84569a8557239b4b5fc27ace7c72a57a9bcb77aa055ba429ed2
 AUX jruby 97 SHA256 579b36ea120de4fc04e384937ecc567a090bb64f276b07cc059d072a5a7d2e60 SHA512 fa6d744dcbc30c2d04d3b228dff529a03da041ca69a6f535e36b19cb3a9573bcd2b8e58ec53ad40ee0dc629a6e735722bbec944feed6189814f0e81f9238ce87 WHIRLPOOL eb88039fe3052e4830bbd5b9892a76a99c2bb924b439f2134696ef8510cc9189cf8435b1f45a67c3b7f54a64b5209e5768703316d000e884befba021a90c551b
-AUX jruby-1.4.0-bindir.patch 743 SHA256 27352afbc6a3898c50e3628911062c01090209d0cfdb7b221aca4aa526031b11 SHA512 bebeb3a6cf9ee939bc4c4c1839763abada0c3e4bcc5b0c89f6e0781b6d313bd301f35a56c6837f7dd468ba87c80902b064c689221c5766a141eeffedfe21676c WHIRLPOOL a14a3ab0e8d131927f6854342c91d4da3b070997a9d9600994e78b505bd84c9bcdf20443f393b7e350ac73e55b268d3ab3efde525913b57604cf9d0ab1acd6a3
-AUX jruby-1.4.0-system-jars-r2.patch 8332 SHA256 92f67d30f0be4ff029d3045e9446b5191da474fe0280269e4b1dc5b026e51556 SHA512 09dfc2a7f6584ee2c38334da3f321c01fc7ce0cf9397acf1bc7f7304e9a8ae3ce112b6fdaec4b57e0015571cc4cb3b6ed37bb3351d303b66261d9f950a226185 WHIRLPOOL 4a3aff44f6011bd5db2ec908dc14f281337f0f9155e57b6b74de7a2ff86ae5a73ee807be13293115a2bd7f08037f18cd62b9df5bbf8a27872c95579d18e0603b
-AUX jruby-1.5.0-system-jars.patch 8113 SHA256 8c386f1d0e08b75a9f986e317d822c393231316d46eca0030ed67fe40dfbe3b5 SHA512 2847200766063fc256bcca1d7b86488fb2f8ddef9ae54004b91d45427e08cec10748acb1684be399fff99fb8b7192fdda509f68e0635e3cc9d34a551abc4bdeb WHIRLPOOL ba7318be5684bd597c2ec94b617809f311440a724bf41cc17d7ee46ce12cc130c7fc29686118006a942d9eaf7957b8af396861d4fcbbb514b8429db30193046e
-AUX jruby-1.5.6-rubygems-1.8.x.patch 815 SHA256 cb003cceee89149074c422c53cfaf7b49341bff8f2faf7aa70173fc954ccddd2 SHA512 eca0008b7ad1f26dfb6558d163c11e6f4ca21923f70c787ba21de59a3a7f56f7e8c7cbe6fb6a572a01ec6df4d7b28ad3645101496081bc2920d40aa7af4ba5a1 WHIRLPOOL d6dc9b651fa4df8d71be92a1259e75eec60e4595945265399231e59443c183ed465b1de7004f264d867980ea421b08cf3ae5773c078be58d67c5bfb414976afd
 AUX jruby-1.6.8-bash-launcher.patch 5524 SHA256 cc58b2031adac2dbe849e39a1c910b40596c581b36405865a510777aceaab86f SHA512 aeb088f8ebef122515efe6a3e6e8f76ba87f145d7f67bb016d875b61f02a772fd3678cbf62d7e28a552ded7fe2c49e5f0f9746a4cb8edccb14c97491f053a4d1 WHIRLPOOL f44a6899e92b54fafab01cfdf69215038f42f8e8317bebbec5a65acd6f69b88740ab6b4a32d71ad9eb9ef4b442b0e17de3629192d36cbfa159968587685b27b9
 AUX jruby-1.7.12-bash-launcher.patch 5158 SHA256 de07a6e67ed80dccb6e14c9d429eaa1045bf38e45d822bbfd34714a52a1055a9 SHA512 b51db965233226c805eafb0d071fec6827d36660c9a0075ec0f4e36845f37269258d188d504ec9db0257e8671cea19cc493ae71a1ef658ad4ec7da6aefcb3184 WHIRLPOOL 26b8519e9a4a004574bc4a763b789a685e8aff2f220b20bb6eb0cf6af68a980d419c80b6ca695a85f2b13f70174e03c957dabd07ee5fc936a49b4cd0876c8d78
 AUX jruby-bash-launcher.patch 5505 SHA256 e0997049a7bb829c06178cbbab4c5281ec9dac2e1ee8f018613cf9ddc35aea3e SHA512 d03a4eb7cba95da9da93696ef76dc452606f199c91da703da4d23bf048eb495db5ce6c2bd079d33a7428955379217b642af8924acab231fc087caf46ba0a6cd8 WHIRLPOOL e6b0f6ff6ec7c2f0cd6436262f7d6f931535d8aaf87327ea7e0e432600c046a9ced97d5774c6be46888856dd9fba8458eff9d5197b2cffde39ed2b38ce4b75f7
 AUX user-test-fixes.patch 5147 SHA256 f21469d41de9f9b5fb1682596f64899a71c92332db24bf27e8c50dbb1896a92e SHA512 7e5a0342d42abe8af6b7e98edc9e2d1d52dfe1dc3852704931d67ff29bc1e499ba88be19dedee57173571311b7549ded43f39f9edca559e3706ef5e99d0e3cbd WHIRLPOOL cc00358195398194db2c7b678147fee36f54be5c3edff5dcc348ba357ed46131e858166819f2e2fae93385ec8398fa9efb32d2a07ae40164ab243dfac55cc1d1
 DIST jruby-1.7.12-mvn-ant-ant.patch 210806 SHA256 3a46445615a3b4c6dcfea5e8b1cbf00177e81516c7fd70c619812be8ae0edf98 SHA512 18ab5e9a0ca04deccfe2ffaeba54c2c79c6f17fc5277bf32b800279f5a2a1c6e62ec273276b5b951d13d78b0de7b535b651a0d564b788cd972186895a3ab96ae WHIRLPOOL 23cdec09c9cae819d184676c57cc6fe2bc01b1c1a3dd574ae264e22796624beec31b2d5f8bec195594292b7dc742427c6e8f2f2bd48fad552a3fdb2cab0a2f07
-DIST jruby-src-1.6.5.1.tar.gz 14284770 SHA256 1126f29b888b5427c2d416042a6c010849ab1d29ee9be97e592caf6859921be5 SHA512 f777e8c09e1f3e2be42a2043cf189496f826158769c0fd82a4bc6912fdbc63905905a4a32534adc156efe0c3cbb4e198077c61262fad0463b42515b8e2f96821 WHIRLPOOL 440c2a36c9862819956afbefc2e1c6af060526bf80fd31c5551cb4ab3d74f366eb95af19fd2e40208527d8d66382ea9dd80f16c165d48f3924cd8de5a850a82b
 DIST jruby-src-1.6.8.tar.gz 14709528 SHA256 7832053682bf791de7a5b062b5c8a3521ad5d6468141238551a9959649df973a SHA512 924114149bd7ce81b15c71e80cf53f4b50eb8d5220098e5ead2b447b96a6a405d93a219fb19fb7a0b9e4dc6798fd99b547b2352aabe4f84b5a694fe6760fd24d WHIRLPOOL 1f21b0899ac6c37b1e3e94aa7ef0927a720092f3a8687ba476cc70d8cd58228dbfdf1e2ea3e29414c14c329f1b6f61178ae34dd40bdf8a4c39cae5251849ac6c
 DIST jruby-src-1.7.12.tar.gz 10537791 SHA256 c10c0581abe7d55519273b91bddf9d44610baf69b875473593fd739b0c059cc7 SHA512 f68e72c37543a5301041a1700b9a3ef07ea5be43b806187f49e7ef6172315c5cd2aa4d74466273122e35b1a190f9a0fb097127c9530f48740f278ff6f87704fe WHIRLPOOL 5b82c5ac00761a62c6d319dc9ff319a5036c7b30724449149595fbaac117a2dca61bc13480db79ef85f10278607556f7091698021c3a7cfd3b1359603755e01a
-EBUILD jruby-1.6.5.1.ebuild 6166 SHA256 0226625830fd1bd91108abe111e253d694c596e55e53f18991ebfec20f4109d7 SHA512 0f9fecd1dcc4036f9667ecfa5b614eddbe7a9139eed878ca48794d39655c03e639000d2a2ab70fdc794aaa2cdeab4b54dacc4f500b1944b5316b3abe06d160aa WHIRLPOOL 8412d6e039e49baf356e2f4d2890901fb322c397bbd29a27ea8dadd9cc4baf1d3448cd293559957ef1c01b3dbe9f1eddf630c106644b8da78682b848b16997a5
 EBUILD jruby-1.6.8-r1.ebuild 6241 SHA256 629c8b241ee5dd32c42cf0a86d93fa3d1e77f9b00b0cd18d4a3262db2cf2703b SHA512 e58d4de4b9dabb5fdb5705d34d04fb97469a3aa0880df2446fec5f7f617f400e1a119153bc2fdee60f6d44a79f837b6bf3c2fb76ba92fbf3aa9961686f921732 WHIRLPOOL dd0f72f218ffa32c451b723f398bd4b359c5a994ee68a3f95cedcf0b5fc282b11c77e1eb3962ea514719802b7e41404aefaf89855a68617ba772eb29acec5b73
 EBUILD jruby-1.7.12.ebuild 5601 SHA256 7ea327ded51905130305d24a6101283f8691769cb05fb1be3b5be84fbee26e2f SHA512 ad5012ba09b5ae1ef54e665864a17c8ba04c413d872fb7133a37e4e96a8d64112153fb0853224efca87b76b626af888f9de2a30eb1195b37a1516edcc75f30ae WHIRLPOOL 283700b993952385d9b1f6547db53da66728dce12f19de9981491bf5f1d78e897a29b5fff386165267afb3e753342e6086e87fe6cd02ca4e3e255ad52f1af080
-MISC ChangeLog 17405 SHA256 913a0e427153364bc968bc42ae6afba069afb9a9306a265025bd5cf50b9d5980 SHA512 1364f612e6a1b8883f954423a5c9eb27e20e51f7e0601e464a0d96e692932a4a608bc7074c133e18404083015d050d1122908a9009a3622f2f4ff5da737c2239 WHIRLPOOL dd1ba338784500d46414d751b3fcc88170cbf6bbaecd8c375fae5f8f816b234a5520232045baecde4f4a3e61aac91ef6ca78e8c41a13a175505f1b764c8fcbd9
+MISC ChangeLog 17649 SHA256 e31b9748b0792d4242370c5969ac5b36e50916a087c14054f96a7d52f645c82e SHA512 b29cf89acf5636260c211be1d9bad96439cd5e2f9ee7cd1c809673debcf8e32883bfb5563bce717507240d9195eb9167ab32bcc8088063dc3f51dbd60b13a288 WHIRLPOOL a4cc2c993c30e1dd471b7279b561cc2fcb220f5a8b10de98e5c35c776416bb9f3d5d0d2b13d35d78d62671a783c2cd331c1ea21274ab60d9b65aa1af1ad7663d
 MISC metadata.xml 179 SHA256 0df27adc265ef6596f973641d25b64b7291c87f1b114d6895f69d222049bed1b SHA512 d6f0a7b7511f9d016fa3464817f8921b958ba50a25eb834c453a9ab937d0f12f7ca418fb70c3c847568da1e48aecb10f7e0fa2898bb956e9cd9b60886033725c WHIRLPOOL d6f2832d5f7db39b2ca75bacd4c3b1b9d854c3404d1ad405f9befe8e34c86a155cb6dda3eb1b93b30d8d35b83accf4567079f4d13c1a1a06e19078afe2e81ea5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTZV/1AAoJEJWyH81tNOV9CKoH/AjjsF2oJtqFLmp2cUuJPmN8
-Lp/kWJlBG/agWp+y9x6noIsHgw6cAgfi7v2or2izNu9IyRPZaOIWN+V/p6lEHi8z
-D7LzrPdCUNfF5V0gqcHKT30nA0qne9BifxFxGnz5WLSYa2a2Zb9cxg/pmW01TOxd
-xYggRyooTPKixwRNxFcmvcwJ/xHpMSgEh6ZGu0D/LMQxvvDZ69jBn9mU7iM8IMHO
-TxdsQp+/6Rp267Zlh2Hz7R27YJYRAcDUQUhcv3MLOd8/qUKF7SSn6IeneCFrW3Cj
-+2AN07cYvcHIVOgpXqhprB6LoNOS5NsQt3IwC81HCewWXtZ9wZF9jlndZcs0ir0=
-=Ui+Q
+iF4EAREIAAYFAlNxpSIACgkQiIP6VqMIqNcanQD+IYCHUunWIDbaNhtZDZt+Kkwr
+0qjIECExlU3DFM9os+UA/0od4R+0hX7wSWk7UmDaFfM9uOdMx3r0o2s08mbBUt9G
+=NlVe
 -----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
deleted file mode 100644
index cf736a62efca..000000000000
--- a/dev-java/jruby/files/jruby-1.4.0-bindir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/files/jruby-1.4.0-system-jars-r2.patch b/dev-java/jruby/files/jruby-1.4.0-system-jars-r2.patch
deleted file mode 100644
index 8b96db90c9fc..000000000000
--- a/dev-java/jruby/files/jruby-1.4.0-system-jars-r2.patch
+++ /dev/null
@@ -1,276 +0,0 @@
-Index: jruby-1.4.0/bin/jruby
-===================================================================
---- jruby-1.4.0.orig/bin/jruby
-+++ jruby-1.4.0/bin/jruby
-@@ -11,26 +11,17 @@
- #
- # -----------------------------------------------------------------------------
- 
--cygwin=false
--
- # ----- Identify OS we are running under --------------------------------------
- case "`uname`" in
--  CYGWIN*) cygwin=true;;
-   Darwin) darwin=true;;
- esac
- 
--#
--# Figure out the OS and cpu the same as JNA would, so the library path can be set
--#
--case "`uname -m`" in
--  i[34567]86) JNA_CPU=i386; JNA_ALT_CPU=amd64;;
--  i86pc) JNA_CPU="x86"; JNA_ALT_CPU=amd64;;
--  amd64|x86_64) JNA_CPU=amd64; JNA_ALT_CPU=i386;;
--  sparc*) JNA_CPU=sparc; JNA_ALT_CPU=sparcv9;;
--esac
--
- # ----- Verify and Set Required Environment Variables -------------------------
- 
-+# This will be filled in by the ebuild after install
-+JRUBY_HOME=
-+
-+# ++ebuild-cut-here++
- ## resolve links - $0 may be a link to  home
- PRG=$0
- progname=`basename "$0"`
-@@ -49,13 +40,16 @@ while [ -h "$PRG" ] ; do
-   fi
- done
- 
--JRUBY_HOME_1=`dirname "$PRG"`           # the ./bin dir
--if [ "$JRUBY_HOME_1" = '.' ] ; then
--  cwd=`pwd`
--  JRUBY_HOME=`dirname $cwd` # JRUBY-2699
--else
--  JRUBY_HOME=`dirname "$JRUBY_HOME_1"`  # the . dir
-+if [ -z "$JRUBY_HOME" ]; then
-+  JRUBY_HOME_1=`dirname "$PRG"`           # the ./bin dir
-+  if [ "$JRUBY_HOME_1" = '.' ] ; then
-+    cwd=`pwd`
-+    JRUBY_HOME=`dirname $cwd` # JRUBY-2699
-+  else
-+    JRUBY_HOME=`dirname "$JRUBY_HOME_1"`  # the . dir
-+  fi
- fi
-+# --ebuild-cut-here--
- 
- if [ -z "$JRUBY_OPTS" ] ; then
-   JRUBY_OPTS=""
-@@ -84,72 +78,17 @@ for opt in ${JRUBY_OPTS[@]}; do
- done
- JRUBY_OPTS=${JRUBY_OPTS_TEMP}
- 
--if [ -z "$JAVA_HOME" ] ; then
--  JAVA_CMD='java'
--else
--  if $cygwin; then
--    JAVA_HOME=`cygpath -u "$JAVA_HOME"`
--  fi
--  JAVA_CMD="$JAVA_HOME/bin/java"
--fi
--
--# If you're seeing odd exceptions, you may have a bad JVM install.
--# Uncomment this and report the version to the JRuby team along with error.
--#$JAVA_CMD -version
--
- JRUBY_SHELL=/bin/sh
- 
- # ----- Set Up The Boot Classpath -------------------------------------------
- 
--CP_DELIMITER=":"
--
--# add jruby jars for command-line execution
--for j in "$JRUBY_HOME"/lib/{jruby*,bsf}.jar; do
--    if [ "$JRUBY_CP" ]; then
--        JRUBY_CP="$JRUBY_CP$CP_DELIMITER$j"
--        else
--        JRUBY_CP="$j"
--    fi
--done
--
--if $cygwin; then
--    JRUBY_CP=`cygpath -p -w "$JRUBY_CP"`
--fi
--
--# ----- Set Up The System Classpath -------------------------------------------
--
--if [ "$JRUBY_PARENT_CLASSPATH" != "" ]; then
--    # Use same classpath propagated from parent jruby
--    CP=$JRUBY_PARENT_CLASSPATH
--else
--    # add other jars in lib to CP for command-line execution
--    for j in "$JRUBY_HOME"/lib/*.jar; do
--        if [ "$CP" ]; then
--            CP="$CP$CP_DELIMITER$j"
--            else
--            CP="$j"
--        fi
--    done
--
--    if $cygwin; then
--        CP=`cygpath -p -w "$CP"`
--    fi
--fi
--
--if $cygwin; then
--    # switch delimiter only after building Unix style classpaths
--    CP_DELIMITER=";"
--fi
-+JRUBY_CP=$(java-config -d -p jruby)
-+CP=${JRUBY_PARENT_CLASSPATH}
- 
- # ----- Execute The Requested Command -----------------------------------------
- 
--if [ -z "$JAVA_MEM" ] ; then
--  JAVA_MEM=-Xmx500m
--fi
--
--if [ -z "$JAVA_STACK" ] ; then
--  JAVA_STACK=-Xss1024k
--fi
-+JAVA_MEM=${JAVA_MEM:--Xmx500m}
-+JAVA_STACK=${JAVA_STACK:--Xss1024k}
- 
- JAVA_VM=-client
- JAVA_ENCODING=""
-@@ -172,18 +111,18 @@ do
-         elif [ "${val:0:4}" = "-Xss" ]; then
-             JAVA_STACK=$val
-         elif [ "${val}" = "" ]; then
--            $JAVA_CMD -help
-+            java -help
-             echo "(Prepend -J in front of these options when using 'jruby' command)" 
-             exit
-         elif [ "${val}" = "-X" ]; then
--            $JAVA_CMD -X
-+            java -X
-             echo "(Prepend -J in front of these options when using 'jruby' command)" 
-             exit
-         elif [ "${val}" = "-classpath" ]; then
--            CP="$CP$CP_DELIMITER$2"
-+            CP="$CP:$2"
-             shift
-         elif [ "${val}" = "-cp" ]; then
--            CP="$CP$CP_DELIMITER$2"
-+            CP="$CP:$2"
-             shift
-         else
-             if [ "${val:0:3}" = "-ea" ]; then
-@@ -221,14 +160,7 @@ do
-         java_args=("${java_args[@]}" "-Djava.awt.headless=true") ;;
-      # Run under JDB
-      --jdb)
--        if [ -z "$JAVA_HOME" ] ; then
--          JAVA_CMD='jdb'
--        else
--          if $cygwin; then
--            JAVA_HOME=`cygpath -u "$JAVA_HOME"`
--          fi
--          JAVA_CMD="$JAVA_HOME/bin/jdb"
--        fi 
-+        JAVA_CMD='jdb'
-         java_args=("${java_args[@]}" "-sourcepath" "$JRUBY_HOME/lib/ruby/1.8:.")
-         JRUBY_OPTS=("${JRUBY_OPTS[@]}" "-X+C") ;;
-      --client)
-@@ -270,57 +202,17 @@ ruby_args=("${ruby_args[@]}" "$@")
- set -- "${ruby_args[@]}"
- 
- JAVA_OPTS="$JAVA_OPTS $JAVA_MEM $JAVA_STACK"
--JNA_OS="`uname -s | tr '[:upper:]' '[:lower:]'`"
--case "$JNA_OS" in
--darwin) JNA_PATH="$JRUBY_HOME/lib/native/darwin";;
--  *) JNA_PATH="$JRUBY_HOME/lib/native/${JNA_OS}-${JNA_CPU}:$JRUBY_HOME/lib/native/${JNA_OS}-${JNA_ALT_CPU}";;
--esac
--#JAVA_OPTS="$JAVA_OPTS -Djna.boot.library.path=$JNA_PATH"
--JAVA_JNA="-Djna.boot.library.path=$JNA_PATH"
- 
--JFFI_BOOT=""
--for d in $JRUBY_HOME/lib/native/*`uname -s`; do
--  if [ -z "$JFFI_BOOT" ]; then
--    JFFI_BOOT="$d"
--  else
--    JFFI_BOOT="$JFFI_BOOT:$d"
--  fi
--done
--JFFI_OPTS="-Djffi.boot.library.path=$JFFI_BOOT"
--
--if $cygwin; then
--  JRUBY_HOME=`cygpath --mixed "$JRUBY_HOME"`
--  JRUBY_SHELL=`cygpath --mixed "$JRUBY_SHELL"`
--  
--  if [[ ( "${1:0:1}" = "/" ) && ( ( -f "$1" ) || ( -d "$1" )) ]]; then
--    win_arg=`cygpath -w "$1"`
--    shift
--    win_args=("$win_arg" "$@")
--    set -- "${win_args[@]}"
--  fi
--
--  # fix JLine to use UnixTerminal
--  stty -icanon min 1 -echo > /dev/null 2>&1
--  if [ $? = 0 ]; then
--    JAVA_OPTS="$JAVA_OPTS -Djline.terminal=jline.UnixTerminal"
--  fi
--
--fi
-+JAVA_JNA="-Djna.boot.library.path=$(java-config -i jna)"
- 
- 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
--else
--if [ "$VERIFY_JRUBY" != "" ]; then
-+  exec /usr/bin/ng org.jruby.util.NailMain $JRUBY_OPTS "$@"
-+elif [ "$VERIFY_JRUBY" != "" ]; then
-   if [ "$PROFILE_ARGS" != "" ]; then
-       echo "Running with instrumented profiler"
-   fi
- 
--  "$JAVA_CMD" $PROFILE_ARGS $JAVA_OPTS "$JAVA_JNA" "$JFFI_OPTS" "${java_args[@]}" -classpath "$JRUBY_CP$CP_DELIMITER$CP$CP_DELIMITER$CLASSPATH" \
-+  "${JAVA_CMD:-java}" $PROFILE_ARGS $JAVA_OPTS "$JAVA_JNA" "${java_args[@]}" -classpath "$JRUBY_CP:$CP:$CLASSPATH" \
-     "-Djruby.home=$JRUBY_HOME" \
-     "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
-     "-Djruby.shell=$JRUBY_SHELL" \
-@@ -335,34 +228,13 @@ if [ "$VERIFY_JRUBY" != "" ]; then
-       rm profile.txt
-   fi
- 
--  if $cygwin; then
--    stty icanon echo > /dev/null 2>&1
--  fi
--
-   exit $JRUBY_STATUS
- else
--  if $cygwin; then
--    # exec doed not work correctly with cygwin bash
--    "$JAVA_CMD" $JAVA_OPTS "$JAVA_JNA" "$JFFI_OPTS" "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
--      "-Djruby.home=$JRUBY_HOME" \
--      "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
--      "-Djruby.shell=$JRUBY_SHELL" \
--      $java_class $JRUBY_OPTS "$@"
--
--    # Record the exit status immediately, or it will be overridden.
--    JRUBY_STATUS=$?
--
--    stty icanon echo > /dev/null 2>&1
--
--    exit $JRUBY_STATUS
--  else
--    exec "$JAVA_CMD" $JAVA_OPTS "$JAVA_JNA" "$JFFI_OPTS" "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
--      "-Djruby.home=$JRUBY_HOME" \
--      "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
--      "-Djruby.shell=$JRUBY_SHELL" \
--      $java_class $JRUBY_OPTS "$@"
--  fi
--fi
-+  exec "${JAVA_CMD:-java}" $JAVA_OPTS "$JAVA_JNA" "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP:$CLASSPATH" \
-+    "-Djruby.home=$JRUBY_HOME" \
-+    "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
-+    "-Djruby.shell=$JRUBY_SHELL" \
-+    $java_class $JRUBY_OPTS "$@"
- fi
- 
- # Be careful adding code down here, you might override the exit
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
deleted file mode 100644
index 70b9b9edc4de..000000000000
--- a/dev-java/jruby/files/jruby-1.5.0-system-jars.patch
+++ /dev/null
@@ -1,273 +0,0 @@
-diff -Naur jruby-1.5.1.bak/bin/jruby.sh jruby-1.5.1/bin/jruby.sh
---- jruby-1.5.1.bak/bin/jruby.sh	2010-06-15 21:23:11.000000000 +1200
-+++ jruby-1.5.1/bin/jruby.sh	2010-06-15 21:29:14.000000000 +1200
-@@ -11,16 +11,16 @@
- #
- # -----------------------------------------------------------------------------
- 
--cygwin=false
--
- # ----- Identify OS we are running under --------------------------------------
- case "`uname`" in
--  CYGWIN*) cygwin=true;;
-   Darwin) darwin=true;;
- esac
- 
- # ----- Verify and Set Required Environment Variables -------------------------
- 
-+#This will be filled in by the ebuild after install
-+JRUBY_HOME=
-+
- ## resolve links - $0 may be a link to  home
- PRG=$0
- progname=`basename "$0"`
-@@ -39,12 +39,14 @@
-   fi
- done
- 
--JRUBY_HOME_1=`dirname "$PRG"`           # the ./bin dir
--if [ "$JRUBY_HOME_1" = '.' ] ; then
--  cwd=`pwd`
--  JRUBY_HOME=`dirname $cwd` # JRUBY-2699
--else
--  JRUBY_HOME=`dirname "$JRUBY_HOME_1"`  # the . dir
-+if [ -z "$JRUBY_HOME" ]; then
-+  JRUBY_HOME_1=`dirname "$PRG"`
-+  if [ "$JRUBY_HOME_1" = '.' ] ; then
-+    cwd=`pwd`
-+    JRUBY_HOME=`dirname $cwd` # JRUBY-2699
-+  else
-+    JRUBY_HOME=`dirname "$JRUBY_HOME_1"`  # the . dir
-+  fi
- fi
- 
- if [ -z "$JRUBY_OPTS" ] ; then
-@@ -74,85 +76,17 @@
- done
- JRUBY_OPTS=${JRUBY_OPTS_TEMP}
- 
--if [ -z "$JAVA_HOME" ] ; then
--  JAVA_CMD='java'
--else
--  if $cygwin; then
--    JAVA_HOME=`cygpath -u "$JAVA_HOME"`
--  fi
--  JAVA_CMD="$JAVA_HOME/bin/java"
--fi
--
--# If you're seeing odd exceptions, you may have a bad JVM install.
--# Uncomment this and report the version to the JRuby team along with error.
--#$JAVA_CMD -version
--
- JRUBY_SHELL=/bin/sh
- 
- # ----- Set Up The Boot Classpath -------------------------------------------
- 
--CP_DELIMITER=":"
--
--# add main jruby jar to the bootclasspath
--for j in "$JRUBY_HOME"/lib/jruby.jar "$JRUBY_HOME"/lib/jruby-complete.jar; do
--    if [ ! -e "$j" ]; then
--      continue
--    fi
--    if [ "$JRUBY_CP" ]; then
--        JRUBY_CP="$JRUBY_CP$CP_DELIMITER$j"
--        else
--        JRUBY_CP="$j"
--    fi
--    if [ $JRUBY_ALREADY_ADDED ]; then
--        echo "WARNING: more than one JRuby JAR found in lib directory"
--    fi
--    JRUBY_ALREADY_ADDED=true
--done
--
--if $cygwin; then
--    JRUBY_CP=`cygpath -p -w "$JRUBY_CP"`
--fi
--
--# ----- Set Up The System Classpath -------------------------------------------
--
--if [ "$JRUBY_PARENT_CLASSPATH" != "" ]; then
--    # Use same classpath propagated from parent jruby
--    CP=$JRUBY_PARENT_CLASSPATH
--else
--    # add other jars in lib to CP for command-line execution
--    for j in "$JRUBY_HOME"/lib/*.jar; do
--        if [ "$j" == "$JRUBY_HOME"/lib/jruby.jar ]; then
--          continue
--        fi
--        if [ "$j" == "$JRUBY_HOME"/lib/jruby-complete.jar ]; then
--          continue
--        fi
--        if [ "$CP" ]; then
--            CP="$CP$CP_DELIMITER$j"
--            else
--            CP="$j"
--        fi
--    done
--
--    if $cygwin; then
--        CP=`cygpath -p -w "$CP"`
--    fi
--fi
--
--if $cygwin; then
--    # switch delimiter only after building Unix style classpaths
--    CP_DELIMITER=";"
--fi
-+JRUBY_CP="$(java-config -d -p jruby)"
-+CP="${JRUBY_PARENT_CLASSPATH}"
- 
- # ----- Execute The Requested Command -----------------------------------------
- 
--if [ -z "$JAVA_MEM" ] ; then
--  JAVA_MEM=-Xmx500m
--fi
--
--if [ -z "$JAVA_STACK" ] ; then
--  JAVA_STACK=-Xss1024k
--fi
-+JAVA_MEM=${JAVA_MEM:--Xmx500m}
-+JAVA_STACK=${JAVA_STACK:--Xss1024k}
- 
- JAVA_VM=-client
- JAVA_ENCODING=""
-@@ -175,19 +109,19 @@
-         elif [ "${val:0:4}" = "-Xss" ]; then
-             JAVA_STACK=$val
-         elif [ "${val}" = "" ]; then
--            $JAVA_CMD -help
-+            java -help
-             echo "(Prepend -J in front of these options when using 'jruby' command)" 
-             exit
-         elif [ "${val}" = "-X" ]; then
--            $JAVA_CMD -X
-+            java -X
-             echo "(Prepend -J in front of these options when using 'jruby' command)" 
-             exit
-         elif [ "${val}" = "-classpath" ]; then
--            CP="$CP$CP_DELIMITER$2"
-+            CP="$CP:$2"
-             CLASSPATH=""
-             shift
-         elif [ "${val}" = "-cp" ]; then
--            CP="$CP$CP_DELIMITER$2"
-+            CP="$CP:$2"
-             CLASSPATH=""
-             shift
-         else
-@@ -224,15 +158,8 @@
-         java_args=("${java_args[@]}" "-Djava.awt.headless=true") ;;
-      # Run under JDB
-      --jdb)
--        if [ -z "$JAVA_HOME" ] ; then
--          JAVA_CMD='jdb'
--        else
--          if $cygwin; then
--            JAVA_HOME=`cygpath -u "$JAVA_HOME"`
--          fi
--          JAVA_CMD="$JAVA_HOME/bin/jdb"
--        fi 
--        java_args=("${java_args[@]}" "-sourcepath" "$JRUBY_HOME/lib/ruby/1.8:.")
-+        JAVA_CMD="jdb"
-+     	java_args=("${java_args[@]}" "-sourcepath" "$JRUBY_HOME/lib/ruby/1.8:.")
-         JRUBY_OPTS=("${JRUBY_OPTS[@]}" "-X+C") ;;
-      --client)
-         JAVA_VM=-client ;;
-@@ -275,51 +202,16 @@
- 
--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
--  for d in $JRUBY_HOME/lib/native/*`uname -s`; do
--    if [ -z "$JFFI_BOOT" ]; then
--      JFFI_BOOT="$d"
--    else
--      JFFI_BOOT="$JFFI_BOOT:$d"
--    fi
--  done
--fi
--JFFI_OPTS="-Djffi.boot.library.path=$JFFI_BOOT"
--
--if $cygwin; then
--  JRUBY_HOME=`cygpath --mixed "$JRUBY_HOME"`
--  JRUBY_SHELL=`cygpath --mixed "$JRUBY_SHELL"`
--  
--  if [[ ( "${1:0:1}" = "/" ) && ( ( -f "$1" ) || ( -d "$1" )) ]]; then
--    win_arg=`cygpath -w "$1"`
--    shift
--    win_args=("$win_arg" "$@")
--    set -- "${win_args[@]}"
--  fi
--
--  # fix JLine to use UnixTerminal
--  stty -icanon min 1 -echo > /dev/null 2>&1
--  if [ $? = 0 ]; then
--    JAVA_OPTS="$JAVA_OPTS -Djline.terminal=jline.UnixTerminal"
--  fi
--
--fi
-+JFFI_OPTS="-Djffi.boot.library.path=$(java-config -di jffi-0.4)"
- 
- 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
--else
--if [ "$VERIFY_JRUBY" != "" ]; then
-+    exec /usr/bin/ng org.jruby.util.NailMain $JRUBY_OPTS "$@"
-+elif [ "$VERIFY_JRUBY" != "" ]; then
-   if [ "$PROFILE_ARGS" != "" ]; then
-       echo "Running with instrumented profiler"
-   fi
- 
--  "$JAVA_CMD" $PROFILE_ARGS $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -classpath "$JRUBY_CP$CP_DELIMITER$CP$CP_DELIMITER$CLASSPATH" \
-+  "${JAVA_CMD:-java}" $PROFILE_ARGS $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -classpath "$JRUBY_CP:$CP:$CLASSPATH" \
-     "-Djruby.home=$JRUBY_HOME" \
-     "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
-     "-Djruby.shell=$JRUBY_SHELL" \
-@@ -334,34 +226,14 @@
-       rm profile.txt
-   fi
- 
--  if $cygwin; then
--    stty icanon echo > /dev/null 2>&1
--  fi
--
-   exit $JRUBY_STATUS
- else
--  if $cygwin; then
--    # exec doed not work correctly with cygwin bash
--    "$JAVA_CMD" $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
--      "-Djruby.home=$JRUBY_HOME" \
--      "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
--      "-Djruby.shell=$JRUBY_SHELL" \
--      $java_class $JRUBY_OPTS "$@"
--
--    # Record the exit status immediately, or it will be overridden.
--    JRUBY_STATUS=$?
--
--    stty icanon echo > /dev/null 2>&1
-+  exec "${JAVA_CMD:-java}" $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP:$CLASSPATH" \
-+    "-Djruby.home=$JRUBY_HOME" \
-+    "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
-+    "-Djruby.shell=$JRUBY_SHELL" \
-+    $java_class $JRUBY_OPTS "$@"
- 
--    exit $JRUBY_STATUS
--  else
--    exec "$JAVA_CMD" $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
--      "-Djruby.home=$JRUBY_HOME" \
--      "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
--      "-Djruby.shell=$JRUBY_SHELL" \
--      $java_class $JRUBY_OPTS "$@"
--  fi
--fi
- fi
- 
- # Be careful adding code down here, you might override the exit
diff --git a/dev-java/jruby/files/jruby-1.5.6-rubygems-1.8.x.patch b/dev-java/jruby/files/jruby-1.5.6-rubygems-1.8.x.patch
deleted file mode 100644
index b90fc25e9ce8..000000000000
--- a/dev-java/jruby/files/jruby-1.5.6-rubygems-1.8.x.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Take into account that newer versions of rubygems (ca. 1.5 and newer)
-no longer have set_paths. Rescuing the error should be backward
-compatible. jruby 1.6 and newer have a newer bundled rubygems with a
-newer engine definition that should not have this problem.
-
---- lib/ruby/site_ruby/1.8/rubygems/defaults/jruby.rb.orig	2011-10-22 12:21:04.000000000 +0200
-+++ lib/ruby/site_ruby/1.8/rubygems/defaults/jruby.rb	2011-10-22 13:15:09.000000000 +0200
-@@ -14,7 +14,10 @@
-       original_ensure_gem_subdirectories(gemdir) unless jarred_path? gemdir.to_s
-     end
- 
--    alias_method :original_set_paths, :set_paths
-+    begin
-+      alias_method :original_set_paths, :set_paths
-+    rescue NameError
-+    end
-     def set_paths(gpaths)
-       original_set_paths(gpaths)
-       @gem_path.reject! {|p| !readable_path? p }
diff --git a/dev-java/jruby/jruby-1.6.5.1.ebuild b/dev-java/jruby/jruby-1.6.5.1.ebuild
deleted file mode 100644
index 54a2cc0ec6f0..000000000000
--- a/dev-java/jruby/jruby-1.6.5.1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.6.5.1.ebuild,v 1.5 2014/05/03 21:31:48 tomwij Exp $
-
-EAPI="4"
-JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PV="${PV/_rc1/RC1}"
-
-DESCRIPTION="Java-based Ruby interpreter implementation"
-HOMEPAGE="http://jruby.codehaus.org/"
-SRC_URI="http://jruby.org.s3.amazonaws.com/downloads/${PV}/${PN}-src-${PV}.tar.gz"
-LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="bsf ssl"
-
-# jffi still needed? Or do we call that jnr-ffi?
-#  jnr-ffi depends on jffi which depends on libffi
-CDEPEND=">=dev-java/bytelist-1.0.8:0
-	>=dev-java/jline-0.9.94:0
-	>=dev-java/joni-1.1.3:0
-	>=dev-java/jnr-netdb-1.0:0
-	>=dev-java/jvyamlb-0.2.5:0
-	>=dev-java/asm-3.2:3
-	>=dev-java/jcodings-1.0.5:0
-	dev-java/jffi:1.0
-	dev-java/jnr-constants:0
-	dev-java/jnr-ffi:0.5
-	dev-java/jnr-posix:1.1
-	dev-java/joda-time:0
-	dev-util/jay:0[java]
-	dev-java/nailgun:0
-	dev-java/jgrapht:0
-	dev-java/ant-core:0
-	dev-java/bsf:2.3
-	dev-java/osgi-core-api:0
-	>=dev-java/snakeyaml-1.9:0"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.6"
-
-# Is jna-posix still needed? Or has that been renamed to jnr-posix?
-#  jna-posix is the original project name which was abononed years ago.
-#  jnr-posix < 1.1.8 are from the original fork
-#  later jnr-posix are from the jnr umbrella project.
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.6
-	test? (
-		dev-java/ant-junit4:0
-		dev-java/ant-trax:0
-		dev-java/junit:4
-		java-virtuals/jdk-with-com-sun
-		dev-java/commons-logging:0
-		dev-java/xalan:0
-	)
-	!!<dev-ruby/jruby-1.3.1-r1"
-
-PDEPEND="ssl? ( dev-ruby/jruby-openssl )"
-
-# Tests fail.
-# Need to stop injecting jar's into classpath.
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-RUBY_HOME=/usr/share/${PN}/lib/ruby
-SITE_RUBY=${RUBY_HOME}/site_ruby
-GEMS=${RUBY_HOME}/gems
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-EANT_GENTOO_CLASSPATH="ant-core asm-3 bsf-2.3 bytelist jnr-constants jay \
-jcodings jffi-1.0 jline \
-joda-time joni jnr-ffi-0.5 jnr-posix-1.1 jnr-netdb jvyamlb nailgun jgrapht osgi-core-api \
-snakeyaml"
-EANT_NEEDS_TOOLS="true"
-
-pkg_setup() {
-	unset RUBYOPT
-	java-pkg-2_pkg_setup
-
-	local fail
-
-	for directory in "${GEMS}" "${SITE_RUBY}"; do
-		if [[ -L ${directory} ]]; then
-			eerror "${directory} is a symlink. Please do the following to resolve the situation:"
-			echo 'emerge -an app-portage/gentoolkit'
-			echo 'equery -qC b '"${directory}"' | sort | uniq | sed s/^/=/ > ~/jruby.fix'
-			echo 'emerge -1C $(< ~/jruby.fix)'
-			echo "rm ${directory}"
-			echo 'emerge -1 $(< ~/jruby.fix)'
-			echo 'rm ~/jruby.fix'
-
-			eerror "For more information, please see http://bugs.gentoo.org/show_bug.cgi?id=302187"
-			fail="true"
-		fi
-	done
-
-	if [[ -n ${fail} ]]; then
-		die "Please address the above errors, then run emerge --resume"
-	fi
-}
-
-java_prepare() {
-	epatch "${FILESDIR}"/${PN}-bash-launcher.patch
-	epatch "${FILESDIR}/1.5.1/build.xml.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
-	# is slightly easier so go with this one.
-	sed -r -i \
-		-e 's/maxmemory="128m"/maxmemory="192m"/' \
-		-e "/RetroWeaverTask/d" \
-		-e "/yecht/! { /<zipfileset .+\/>/d }" \
-		build.xml || die
-
-	sed -i -e '/Arndt/d' src/org/jruby/RubyBigDecimal.java
-
-	# 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
-}
-
-src_compile() {
-	# Avoid generating the ri cache since that currently fails.
-	local flags="-Dgenerate-ri-cache.hasrun=true"
-	#local flags=""
-	use bsf && flags+=" -Dbsf.present=true"
-
-	export RUBYOPT=""
-	einfo $RUBYOPT
-	#eant jar $(use_doc apidocs) -Djdk1.5+=true ${flags}
-	eant -Djdk1.5+=true ${flags}
-}
-
-src_test() {
-	if [ ${UID} == 0 ] ; then
-		ewarn 'The tests will fail if run as root so skipping them.'
-		ewarn 'Enable FEATURES="userpriv" if you want to run them.'
-		return
-	fi
-	# Our jruby.jar is unbundled so we need to add the classpath to this test.
-	sed -i "s:java -jar:java -Xbootclasspath/a\:#{ENV['JRUBY_CP']} -jar:g" test/test_load_compiled_ruby_class_from_classpath.rb || die
-	sed -i "s@:refid => 'build.classpath'@:path =>\"#{ENV['JRUBY_CP']}:lib/jruby.jar\"@g" \
-		rakelib/commands.rake || die
-	#sed -i "s@:refid => 'test.class.path'@:path => \"#{ENV['JRUBY_CP']}@g" \
-	#	rakelib/commands.rake || die
-
-	#bsf optionally depends on jruby, which means that the previously
-	#installed jruby will be added to classpath, nasty things will happen.
-	local cpath=`java-pkg_getjars ${EANT_GENTOO_CLASSPATH// /,},junit-4`
-	cpath="$(echo ${cpath} | sed -e "s_${ROOT}/usr/share/jruby/lib/jruby.jar:__g")"
-	cpath="${cpath}:$(java-pkg_getjars --build-only commons-logging,xalan)"
-	EANT_GENTOO_CLASSPATH=""
-
-	local flags=""
-	use bsf && flags="-Dbsf.present=true"
-
-	#Clear RUBYOPT
-	export RUBYOPT=""
-	export JRUBY_CP="${cpath}"
-	ANT_TASKS="ant-junit4 ant-trax" \
-		JRUBY_OPTS="" eant test -Djdk1.5+=true -Djruby.bindir=bin \
-		-Dgentoo.classpath="${cpath}" ${flags}
-}
-
-src_install() {
-	java-pkg_dojar lib/${PN}.jar
-	dodoc README docs/{*.txt,README.*} || die
-
-	use doc && java-pkg_dojavadoc docs/api
-	use source && java-pkg_dosrc src/org
-
-# Use the bash based launcher to preserve whitespace in arguments.
-# Ie allow >jruby -e "puts 'hello'"< to work otherwise
-# >jruby -e "\"puts 'hello'\""< is needed.
-#
-#	# We run the sed here in install so that we don't get the wrong
-#	# data during the test phase!
-#	sed \
-#		-e '/++ebuild-cut-here++/, /--ebuild-cut-here--/ d' \
-#		-e '/^JRUBY_HOME=/s:=:=/usr/share/jruby:' \
-#		bin/jruby.sh > "${T}"/jruby
-
-	newbin bin/jruby.bash jruby
-	dobin bin/j{irb{,_swing},rubyc}
-
-	insinto "${RUBY_HOME}"
-	doins -r "${S}"/lib/ruby/{1.8,1.9,site_ruby}
-
-	# Remove all the references to RubyGems as we're just going to
-	# install it through dev-ruby/rubygems.
-	find "${D}${RUBY_HOME}" -type f \
-		'(' '(' -path '*rubygems*' -not -name 'jruby.rb' ')' -or -name 'ubygems.rb' -or -name 'datadir.rb' ')' \
-		-delete || die
-}