# 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.58 2010/04/27 09:23:58 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.59 2010/06/19 11:07:14 ali_bush Exp $
+
+*jruby-1.5.1 (17 Jun 2010)
+
+ 17 Jun 2010; Alistair Bush <ali_bush@gentoo.org>
+ +files/jruby-1.5.0-bindir.patch, +files/jruby-1.5.0-system-jars.patch,
+ +jruby-1.5.1.ebuild:
+ Version Bump.
*jruby-1.4.1 (27 Apr 2010)
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 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
DIST jruby-src-1.4.1.tar.gz 12351374 RMD160 079036e7df373d444221083a9487b6ad8a676879 SHA1 282a730d33fe5ba0686297de6ff68eee443e67ab SHA256 685e6ba0a4709e06fab1158ef6e4d2b246ab91a770fe8b5c1b642d55d22c725a
+DIST jruby-src-1.5.1.tar.gz 11260259 RMD160 6bfa5aa1c28d1a9e250be0b8364e423caf905c17 SHA1 b022ad9a5a24a207fcb3e0ded76f70bc305b67ba SHA256 0ddfa33e42510e1c2848dacbde51a7642d7a411583a235f4e78c77036aa1bcac
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 5880 RMD160 3bd8ab3506f07ce508e0ad18a6ffde5857efb50b SHA1 9febbf5d580f27d8d57b27b1bdeecb5fde0d3474 SHA256 d51c99da7f464efac0e01bc68ea983aa2560dbe38d94d1d2aadd6d978ef6f358
-MISC ChangeLog 11130 RMD160 390301052beb0f82ba359bb6e2c14881a4b21086 SHA1 d0c62dd1aa6f7911f9d222a4be5a7b723dc8303b SHA256 60466680adb898a18139a843771ccc8f049f5b9c0e30a3f200fe7a9eff44dc91
+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
MISC metadata.xml 179 RMD160 3813d8d3651faaf99042cb3c776d0bc59ad7b5b4 SHA1 421371d5338c6b9b8b4950c44d78a9dbe79cf64d SHA256 0df27adc265ef6596f973641d25b64b7291c87f1b114d6895f69d222049bed1b
--- /dev/null
+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);
+
--- /dev/null
+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"
+
+-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 -dp 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
# 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.1.ebuild,v 1.1 2010/04/27 09:23:58 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.4.1.ebuild,v 1.2 2010/06/19 11:07:14 ali_bush Exp $
EAPI="2"
JAVA_PKG_IUSE="doc source test"
# Tests work for ali_bush inside the ebuild env
# but fail when using vanilla src tarball.
# Restrict tests so we can stablise this package.
-#RESTRICT="test"
+RESTRICT="test"
S="${WORKDIR}/${PN}-${MY_PV}"
--- /dev/null
+# 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 $
+
+EAPI="2"
+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"
+IUSE="bsf ssl"
+
+CDEPEND=">=dev-java/bytelist-1.0.2:0
+ >=dev-java/constantine-0.6:0
+ >=dev-java/jline-0.9.94:0
+ >=dev-java/joni-1.1.3:0
+ >=dev-java/jnr-posix-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:0
+ >=dev-java/jffi-0.7_pre:0.4
+ dev-java/joda-time:0
+ dev-util/jay:0[java]
+ dev-java/nailgun:0
+ dev-java/jaffl:0
+ dev-java/jgrapht:0
+ dev-java/ant-core:0
+ dev-java/bsf:2.3"
+
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.6"
+
+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-ruby/jruby-1.3.1-r1"
+
+PDEPEND="ssl? ( dev-ruby/jruby-openssl )"
+
+# Tests fail completely.
+# Complaining about missing auto_gem
+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 constantine jay \
+jcodings jffi-0.4 jline constantine \
+joda-time joni jnr-posix jnr-netdb jvyamlb nailgun jaffl jgrapht"
+EANT_NEEDS_TOOLS="true"
+
+pkg_setup() {
+ 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}/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
+ # is slightly easier so go with this one.
+ sed -r -i \
+ -e 's/maxmemory="128m"/maxmemory="192m"/' \
+ -e "/RetroWeaverTask/d" \
+ -e "/<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" -delete || die
+ rm lib/profile.jar || die
+}
+
+src_compile() {
+ eant jar $(use_doc apidocs) -Djdk1.5+=true
+}
+
+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
+
+ mkdir -p usr
+
+ ln -s "${S}/bin" "${S}/usr/bin"
+
+ # TODO check this.
+ # ali_bush was getting crashes while attempting to run a test.
+ # No info about why it crashed seemed to be produced.
+ # remove it as temp fix.
+ #sed -i -e '/MRI/d' build.xml || die "Failed to sed build.xml"
+
+ # 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
+
+ #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")"
+ EANT_GENTOO_CLASSPATH=""
+ ANT_TASKS="ant-junit4 ant-trax" \
+ JRUBY_CP="${cpath}" \
+ JRUBY_OPTS="" eant test -Djdk1.5+=true -Djruby.bindir=bin \
+ -Dgentoo.classpath="${cpath}"
+}
+
+src_install() {
+ local bin
+
+ 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
+
+ # 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 > "${T}"/jruby
+
+ dobin "${T}"/jruby "${S}"/bin/j{irb{,_swing},rubyc} || die
+
+ insinto "${RUBY_HOME}"
+ doins -r "${S}"/lib/ruby/{1.8,1.9,site_ruby} || die
+
+ # 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
+}
+
+pkg_postinst() {
+ ewarn "If you're updating from <=jruby-1.4.0, you're going to get errors related"
+ ewarn "to gentoo.rb load failure."
+ ewarn "This is due to a stray definition of JRUBY_OPTS variable from the previous ebuilds."
+ ewarn "To solve the problem, either login in a new shell, use 'env -i ${SHELL} --login'"
+ ewarn "or explicitly unset the variable before running jruby."
+}
projects / gentoo.git / commitdiff