* [gentoo-commits] proj/ruby-overlay:master commit in: dev-java/jruby/files/1.5.1/, dev-java/jzlib/, dev-java/jruby/files/, ...
@ 2012-04-29 4:50 Diego Elio Pettenò
0 siblings, 0 replies; only message in thread
From: Diego Elio Pettenò @ 2012-04-29 4:50 UTC (permalink / raw
To: gentoo-commits
commit: a19ee0842f74dfe29e51423b2e4f4cf62d4f9fd4
Author: Diego Elio Pettenò <flameeyes <AT> flameeyes <DOT> eu>
AuthorDate: Sun Apr 29 04:50:50 2012 +0000
Commit: Diego Elio Pettenò <flameeyes <AT> gentoo <DOT> org>
CommitDate: Sun Apr 29 04:50:50 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/ruby-overlay.git;a=commit;h=a19ee084
Remove jruby/jzlib since they are now in main tree.
---
dev-java/jruby/ChangeLog | 33 ---
dev-java/jruby/files/1.5.1/build.xml.patch | 20 --
dev-java/jruby/files/1.5.1/testfixes.patch | 80 --------
dev-java/jruby/files/10jruby | 1 -
dev-java/jruby/files/ftype-test-fixes.patch | 79 --------
dev-java/jruby/files/gentoo.rb | 8 -
dev-java/jruby/files/jruby | 4 -
dev-java/jruby/files/jruby-1.6.0-system-jars.patch | 205 --------------------
dev-java/jruby/files/jruby-bash-launcher.patch | 180 -----------------
dev-java/jruby/files/user-test-fixes.patch | 124 ------------
dev-java/jruby/jruby-1.6.4.ebuild | 193 ------------------
dev-java/jruby/jruby-1.6.5.1.ebuild | 198 -------------------
dev-java/jruby/jruby-1.6.7.ebuild | 199 -------------------
dev-java/jruby/metadata.xml | 6 -
dev-java/jzlib/ChangeLog | 10 -
dev-java/jzlib/jzlib-1.1.1.ebuild | 33 ---
dev-java/jzlib/metadata.xml | 6 -
17 files changed, 0 insertions(+), 1379 deletions(-)
diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
deleted file mode 100644
index de24a3e..0000000
--- a/dev-java/jruby/ChangeLog
+++ /dev/null
@@ -1,33 +0,0 @@
-# ChangeLog for dev-java/jruby
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*jruby-1.6.7 (28 Feb 2012)
-
- 28 Feb 2012; Diego E. Pettenò <flameeyes@gentoo.org> +jruby-1.6.7.ebuild:
- Bump jruby version to 1.6.7.
-
- 23 Jan 2012; Hans de Graaff <graaff@gentoo.org> jruby-1.6.5.1.ebuild,
- files/jruby-bash-launcher.patch:
- The properties file is no longer used. Add the bindir option to the wrapper
- instead.
-
- 22 Jan 2012; Hans de Graaff <graaff@gentoo.org> jruby-1.6.5.1.ebuild:
- yecht.jar is no longer a separate jar so it must be included:
- https://github.com/jruby/jruby/commit/6c1d41aedfde705c969abf10cf5384e2be69
-
-*jruby-1.6.5.1 (08 Jan 2012)
-
- 08 Jan 2012; Hans de Graaff <graaff@gentoo.org> jruby-1.6.4.ebuild,
- +jruby-1.6.5.1.ebuild:
- Add jruby 1.6.5.1 work-in-progress ebuild for testing.
-
- 26 Dec 2011; Hans de Graaff <graaff@gentoo.org> jruby-1.6.4.ebuild:
- This is an experimental version, mark it testing.
-
- 27 Sep 2011; Hans de Graaff <graaff@gentoo.org> jruby-1.6.4.ebuild:
- Drop old pkg_postinst instrcutions for upgrading from pre 1.4 jruby versions.
-
- 27 Sep 2011; Hans de Graaff <graaff@gentoo.org> jruby-1.6.4.ebuild:
- yecht will stay bundled for now.
-
diff --git a/dev-java/jruby/files/1.5.1/build.xml.patch b/dev-java/jruby/files/1.5.1/build.xml.patch
deleted file mode 100644
index ef75208..0000000
--- a/dev-java/jruby/files/1.5.1/build.xml.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/build.xml b/build.xml
-index 9857cd2..f0c86b8 100644
---- a/build.xml
-+++ b/build.xml
-@@ -816,6 +817,7 @@
- <sysproperty key="jruby.compile.invokedynamic" value="true"/>
- <sysproperty key="java.awt.headless" value="true"/>
- <sysproperty key="jruby.home" value="${basedir}"/>
-+ <sysproperty key="jruby.bindir" value="${basedir}/bin" />
- <sysproperty key="jruby.lib" value="${lib.dir}"/>
- <sysproperty key="jruby.compile.mode" value="@{compile.mode}"/>
- <sysproperty key="jruby.jit.threshold" value="@{jit.threshold}"/>
-@@ -871,6 +873,7 @@
-
- <sysproperty key="java.awt.headless" value="true"/>
- <sysproperty key="jruby.home" value="${basedir}"/>
-+ <sysproperty key="jruby.bindir" value="${basedir}/bin" />
- <sysproperty key="jruby.lib" value="${lib.dir}"/>
- <sysproperty key="jruby.compile.mode" value="@{compile.mode}"/>
- <sysproperty key="jruby.jit.threshold" value="@{jit.threshold}"/>
diff --git a/dev-java/jruby/files/1.5.1/testfixes.patch b/dev-java/jruby/files/1.5.1/testfixes.patch
deleted file mode 100644
index 2ec2ad2..0000000
--- a/dev-java/jruby/files/1.5.1/testfixes.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff --git a/test/externals/ruby1.8/ruby/test_signal.rb b/test/externals/ruby1.8/ruby/test_signal.rb
-index 83ba834..d669440 100644
---- a/test/externals/ruby1.8/ruby/test_signal.rb
-+++ b/test/externals/ruby1.8/ruby/test_signal.rb
-@@ -13,6 +13,7 @@ class TestSignal < Test::Unit::TestCase
- end
-
- def test_signal
-+ return
- defined?(Process.kill) or return
-
- # FIXME, JRuby fails this test on OpenSolaris 2009.06 and Windows
-diff --git a/test/test_kernel.rb b/test/test_kernel.rb
-index a7de277..0e2a0ec 100644
---- a/test/test_kernel.rb
-+++ b/test/test_kernel.rb
-@@ -738,15 +738,15 @@ class TestKernel < Test::Unit::TestCase
- end
-
- # JRUBY-4348
-- def test_exec_rubyopt
-- old = ENV['RUBYOPT']
-- ENV['RUBYOPT'] = "-v"
-- result = `ruby -e "a=1"`
-- assert_equal 0, $?.exitstatus
-- assert_match /ruby/i, result
-- ensure
-- ENV['RUBYOPT'] = old
-- end
-+ #def test_exec_rubyopt
-+ # old = ENV['RUBYOPT']
-+ # ENV['RUBYOPT'] = "-v"
-+ # result = `ruby -e "a=1"`
-+ # assert_equal 0, $?.exitstatus
-+ # assert_match /ruby/i, result
-+ #ensure
-+ # ENV['RUBYOPT'] = old
-+ #end
-
- # test
- # trace_var
-diff --git a/test/test_thread_service.rb b/test/test_thread_service.rb
-index bd1e2a5..30fec50 100644
---- a/test/test_thread_service.rb
-+++ b/test/test_thread_service.rb
-@@ -13,7 +13,7 @@ class TestThreadService < Test::Unit::TestCase
-
- # access maps and GC a couple times to flush things out
- svc.ruby_thread_map.size
-- GC_COUNT.times {JRuby.gc}
-+ GC_COUNT.times {JRuby.gc; sleep 2}
-
- # confirm the size goes back to the same
- assert_equal start_rt, svc.ruby_thread_map.size
-@@ -25,10 +25,10 @@ class TestThreadService < Test::Unit::TestCase
-
- # spin up 100 Java threads and join them
- (1..10).to_a.map {t = java.lang.Thread.new {}; t.start; t}.map(&:join)
--
-+
- # access maps and GC a couple times to flush things out
- svc.ruby_thread_map.size
-- GC_COUNT.times {JRuby.gc}
-+ GC_COUNT.times {JRuby.gc; sleep 2}
-
- # confirm the size goes back to the same
- assert_equal start_rt, svc.ruby_thread_map.size
-@@ -62,9 +62,9 @@ class TestThreadService < Test::Unit::TestCase
-
- # access maps and GC a couple times to flush things out
- svc.ruby_thread_map.size
-- GC_COUNT.times {JRuby.gc}
-+ GC_COUNT.times {JRuby.gc; sleep 2}
-
- # confirm the thread list is back to what it was
- assert_equal start_list, Thread.list
- end
--end
-\ No newline at end of file
-+end
diff --git a/dev-java/jruby/files/10jruby b/dev-java/jruby/files/10jruby
deleted file mode 100644
index 13cb1f9..0000000
--- a/dev-java/jruby/files/10jruby
+++ /dev/null
@@ -1 +0,0 @@
-JRUBY_OPTS="-rgentoo"
diff --git a/dev-java/jruby/files/ftype-test-fixes.patch b/dev-java/jruby/files/ftype-test-fixes.patch
deleted file mode 100644
index 77bdbda..0000000
--- a/dev-java/jruby/files/ftype-test-fixes.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -Naur jruby-1.2.0.orig/test/externals/ruby_test/test/core/File/class/tc_ftype.rb jruby-1.2.0/test/externals/ruby_test/test/core/File/class/tc_ftype.rb
---- jruby-1.2.0.orig/test/externals/ruby_test/test/core/File/class/tc_ftype.rb 2009-04-26 12:01:41.912584566 +0100
-+++ jruby-1.2.0/test/externals/ruby_test/test/core/File/class/tc_ftype.rb 2009-04-26 12:03:56.000210377 +0100
-@@ -26,28 +26,13 @@
- else
- @char = Pathname.new('/dev/null').realpath
- @fifo = "test_fifo"
-+ @link = "test_link"
-
- system("mkfifo #{@fifo}")
-+ system("ln -snf . #{@link}")
-
-- if File.exists?("/dev/fd0")
-- @block = Pathname.new("/dev/fd0").realpath
-- @link = "/dev/fd0" if File.symlink?("/dev/fd0")
-- elsif File.exists?("/dev/diskette")
-- @block = Pathname.new("/dev/diskette").realpath
-- @link = "/dev/diskette" if File.symlink?("/dev/diskette")
-- elsif File.exists?("/dev/cdrom")
-- @block = Pathname.new("/dev/cdrom").realpath
-- @link = "/dev/cdrom" if File.symlink?("/dev/cdrom")
-- elsif File.exists?("/dev/sr0") # CDROM
-- @block = Pathname.new("/dev/sr0").realpath
-- @link = "/dev/sr0" if File.symlink?("/dev/sr0")
-- elsif File.exists?("/dev/disk0")
-- @block = "/dev/disk0"
-- @link = "/tmp"
-- else
-- @block = nil
-- @link = nil
-- end
-+ @block = %w( /dev/fd0 /dev/diskette /dev/cdrom /dev/sr0 /dev/disk0 ).find { |dev| File.exists?(dev) }
-+ @block = Pathname.new(@block).realpath if @block
- end
- end
-
-@@ -66,22 +51,21 @@
- end
-
- # TODO: Find appropriate tests for MS Windows
-- unless WINDOWS
-- def test_ftype_char
-- assert_equal('characterSpecial', File.ftype(@char))
-- end
-+
-+ def test_ftype_char
-+ assert_equal('characterSpecial', File.ftype(@char)) if @char
-+ end
-
-- def test_ftype_block
-- assert_equal('blockSpecial', File.ftype(@block), "BLOCK WAS: #{@block}")
-- end
-+ def test_ftype_block
-+ assert_equal('blockSpecial', File.ftype(@block), "BLOCK WAS: #{@block}") if @block
-+ end
-
-- def test_ftype_link
-- assert_equal('link', File.ftype(@link))
-- end
-+ def test_ftype_link
-+ assert_equal('link', File.ftype(@link)) if @link
-+ end
-
-- def test_ftype_fifo
-- assert_equal('fifo', File.ftype(@fifo))
-- end
-+ def test_ftype_fifo
-+ assert_equal('fifo', File.ftype(@fifo)) if @fifo
- end
-
- def test_ftype_expected_errors
-@@ -91,6 +75,7 @@
-
- def teardown
- remove_file(@fifo)
-+ remove_file(@link)
-
- @file = nil
- @dir = nil
diff --git a/dev-java/jruby/files/gentoo.rb b/dev-java/jruby/files/gentoo.rb
deleted file mode 100644
index 20c50f9..0000000
--- a/dev-java/jruby/files/gentoo.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# Autoload rubygems as with regular Ruby.
-begin
-require 'rubygems'
-rescue LoadError
-end
-
-# Append regular site_ruby to $LOAD_PATH. Unfortunately the -I option prepends instead.
-$LOAD_PATH.insert(-2, '/usr/lib/ruby/site_ruby/1.8', '/usr/lib/ruby/site_ruby')
diff --git a/dev-java/jruby/files/jruby b/dev-java/jruby/files/jruby
deleted file mode 100755
index 804d788..0000000
--- a/dev-java/jruby/files/jruby
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-export JRUBY_CP=`java-config -d -p jruby`
-exec bash /usr/share/jruby/bin/jruby "${@}"
diff --git a/dev-java/jruby/files/jruby-1.6.0-system-jars.patch b/dev-java/jruby/files/jruby-1.6.0-system-jars.patch
deleted file mode 100644
index 9e31275..0000000
--- a/dev-java/jruby/files/jruby-1.6.0-system-jars.patch
+++ /dev/null
@@ -1,205 +0,0 @@
---- bin/jruby.sh.orig 2011-08-23 19:04:22.000000000 +0200
-+++ bin/jruby.sh 2011-09-05 20:42:16.352279669 +0200
-@@ -20,6 +20,9 @@
-
- # ----- 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"`
-@@ -38,12 +41,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
-@@ -73,74 +78,17 @@
- done
- JRUBY_OPTS=${JRUBY_OPTS_TEMP}
-
--if [ -z "$JAVACMD" ] ; then
-- if [ -z "$JAVA_HOME" ] ; then
-- JAVACMD='java'
-- else
-- JAVACMD="$JAVA_HOME/bin/java"
-- fi
--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.
--#$JAVACMD -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
--
--
--# ----- 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
--
--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=""
-@@ -163,19 +111,19 @@
- elif [ "${val:0:4}" = "-Xss" ]; then
- JAVA_STACK=$val
- elif [ "${val}" = "" ]; then
-- $JAVACMD -help
-+ java -help
- echo "(Prepend -J in front of these options when using 'jruby' command)"
- exit
- elif [ "${val}" = "-X" ]; then
-- $JAVACMD -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
-@@ -209,12 +157,9 @@
- java_args="${java_args} -Djava.awt.headless=true" ;;
- # Run under JDB
- --jdb)
-- if [ -z "$JAVA_HOME" ] ; then
-- JAVACMD='jdb'
-- else
-- JAVACMD="$JAVA_HOME/bin/jdb"
-- fi
-+ JAVACMD="jdb"
- java_args="${java_args} -sourcepath $JRUBY_HOME/lib/ruby/1.8:."
-+
- JRUBY_OPTS="${JRUBY_OPTS} -X+C" ;;
- --client)
- JAVA_VM=-client ;;
-@@ -247,7 +192,7 @@
- fi
-
- # Add a property to report memory max
--JAVA_OPTS="$JAVA_OPTS $JAVA_VM -Djruby.memory.max=${JAVA_MEM} -Djruby.stack.max=${JAVA_STACK}"
-+JAVA_OPTS="$JAVA_OPTS $JAVA_VM -Djruby.memory.max=${JAVA_MEM} -Djruby.stack.max=${JAVA_STACK} -Djruby.bindir=/usr/bin"
-
- # Append the rest of the arguments
- ruby_args="${ruby_args} $@"
-@@ -257,33 +202,17 @@
-
- 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 [ "$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
- echo "Running with instrumented profiler"
- fi
-
-- "$JAVACMD" $PROFILE_ARGS $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -classpath "$JRUBY_CP$CP_DELIMITER$CP$CP_DELIMITER$CLASSPATH" \
-+ "${JAVACMD:-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" \
-@@ -301,7 +232,7 @@
-
- exit $JRUBY_STATUS
- else
-- exec $JAVACMD $JAVA_OPTS $JFFI_OPTS ${java_args} -Xbootclasspath/a:$JRUBY_CP -classpath $CP$CP_DELIMITER$CLASSPATH \
-+ exec ${JAVACMD:-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 \
diff --git a/dev-java/jruby/files/jruby-bash-launcher.patch b/dev-java/jruby/files/jruby-bash-launcher.patch
deleted file mode 100644
index d23f6cf..0000000
--- a/dev-java/jruby/files/jruby-bash-launcher.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-Author: Ralph Sennhauser <sera@gentoo.org>
-
-Set JRUBY_HOME, JRUBY_CP, CP and JAVACMD as appropriate for Gentoo.
-Remove JFFI_OPTS as the system jar knows where to look for the native lib.
-
-diff --git a/bin/jruby.bash b/bin/jruby.bash
-index 731f85e..8299557 100755
---- a/bin/jruby.bash
-+++ b/bin/jruby.bash
-@@ -25,31 +25,7 @@ if [ -z "$JAVA_VM" ]; then
- JAVA_VM=-client
- fi
-
--## resolve links - $0 may be a link to home
--PRG=$0
--progname=`basename "$0"`
--
--while [ -h "$PRG" ] ; do
-- ls=`ls -ld "$PRG"`
-- link=`expr "$ls" : '.*-> \(.*\)$'`
-- if expr "$link" : '.*/.*' > /dev/null; then
-- if expr "$link" : '/' > /dev/null; then
-- PRG="$link"
-- else
-- PRG="`dirname ${PRG}`/${link}"
-- fi
-- else
-- PRG="`dirname $PRG`/$link"
-- 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
--fi
-+JRUBY_HOME="${JRUBY_HOME:-/usr/share/jruby}"
-
- if [ -z "$JRUBY_OPTS" ] ; then
- JRUBY_OPTS=""
-@@ -81,17 +57,7 @@ for opt in ${JRUBY_OPTS[@]}; do
- done
- JRUBY_OPTS=${JRUBY_OPTS_TEMP}
-
--if [ -z "$JAVACMD" ] ; then
-- if [ -z "$JAVA_HOME" ] ; then
-- JAVACMD='java'
-- else
-- if $cygwin; then
-- JAVACMD="`cygpath -u "$JAVA_HOME"`/bin/java"
-- else
-- JAVACMD="$JAVA_HOME/bin/java"
-- fi
-- fi
--fi
-+JAVACMD=java
-
- if [ -z "$JAVA_MEM" ] ; then
- JAVA_MEM=-Xmx500m
-@@ -132,21 +98,7 @@ JRUBY_SHELL=/bin/sh
-
- 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
-+JRUBY_CP="$(java-config-2 -d -p jruby)"
-
- if $cygwin; then
- JRUBY_CP=`cygpath -p -w "$JRUBY_CP"`
-@@ -154,29 +106,7 @@ 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
-+CP="${JRUBY_PARENT_CLASSPATH}"
-
- if $cygwin; then
- # switch delimiter only after building Unix style classpaths
-@@ -254,15 +184,7 @@ do
- java_args=("${java_args[@]}" "-Djava.awt.headless=true") ;;
- # Run under JDB
- --jdb)
-- if [ -z "$JAVA_HOME" ] ; then
-- JAVACMD='jdb'
-- else
-- if $cygwin; then
-- JAVACMD="`cygpath -u "$JAVA_HOME"`/bin/jdb"
-- else
-- JAVACMD="$JAVA_HOME/bin/jdb"
-- fi
-- fi
-+ JAVACMD='jdb'
- java_args=("${java_args[@]}" "-sourcepath" "$JRUBY_HOME/lib/ruby/1.8:.")
- JRUBY_OPTS=("${JRUBY_OPTS[@]}" "-X+C") ;;
- --client)
-@@ -310,18 +232,6 @@ set -- "${ruby_args[@]}"
-
- JAVA_OPTS="$JAVA_OPTS $JAVA_MEM $JAVA_MEM_MIN $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"`
-@@ -354,7 +264,8 @@ if [ "$VERIFY_JRUBY" != "" ]; then
- echo "Running with instrumented profiler"
- fi
-
-- "$JAVACMD" $PROFILE_ARGS $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -classpath "$JRUBY_CP$CP_DELIMITER$CP$CP_DELIMITER$CLASSPATH" \
-+ "$JAVACMD" $PROFILE_ARGS $JAVA_OPTS "${java_args[@]}" -classpath "$JRUBY_CP$CP_DELIMITER$CP$CP_DELIMITER$CLASSPATH" \
- "-Djruby.home=$JRUBY_HOME" \
-+ "-Djruby.bindir=/usr/bin" \
- "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
- "-Djruby.shell=$JRUBY_SHELL" \
-@@ -377,7 +287,7 @@ if [ "$VERIFY_JRUBY" != "" ]; then
- else
- if $cygwin; then
- # exec doed not work correctly with cygwin bash
-- "$JAVACMD" $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
-+ "$JAVACMD" $JAVA_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" \
-@@ -390,7 +300,8 @@ else
-
- exit $JRUBY_STATUS
- else
-- exec "$JAVACMD" $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
-+ exec "$JAVACMD" $JAVA_OPTS "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \
- "-Djruby.home=$JRUBY_HOME" \
-+ "-Djruby.bindir=/usr/bin" \
- "-Djruby.lib=$JRUBY_HOME/lib" -Djruby.script=jruby \
- "-Djruby.shell=$JRUBY_SHELL" \
diff --git a/dev-java/jruby/files/user-test-fixes.patch b/dev-java/jruby/files/user-test-fixes.patch
deleted file mode 100644
index 6688fa9..0000000
--- a/dev-java/jruby/files/user-test-fixes.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-diff -Naur jruby-1.2.0.orig/test/externals/ruby_test/lib/test/helper.rb jruby-1.2.0/test/externals/ruby_test/lib/test/helper.rb
---- jruby-1.2.0.orig/test/externals/ruby_test/lib/test/helper.rb 2009-03-16 15:16:02.000000000 +0000
-+++ jruby-1.2.0/test/externals/ruby_test/lib/test/helper.rb 2009-04-18 00:34:02.198853097 +0100
-@@ -235,31 +235,34 @@
- # Get the user of the current process.
- #
- def get_user
-- user = ENV['USERNAME'] || ENV['USER']
- if WINDOWS
-- if user.nil?
-- buf = 0.chr * MAX_PATH
-- if GetUserName.call(buf, buf.length) == 0
-- raise "Unable to get user name"
-- end
-- user = buf.unpack("A*")
-+ buf = 0.chr * MAX_PATH
-+ if GetUserName.call(buf, buf.length) != 0
-+ buf.unpack("A*")
-+ elsif user = ENV['USERNAME'] || ENV['USER']
-+ user
-+ else
-+ raise "Unable to get user name"
- end
- else
-- user ||= Etc.getpwuid(Process.uid).name
-+ Etc.getpwuid(Process.uid).name
- end
-- user
- end
-
-- # Returns the home directory of the current process owner.
-- #
-+ # Returns the home directory of the current process owner
-+ # according to the HOME/USERPROFILE variable.
- def get_home
-- home = ENV['HOME'] || ENV['USERPROFILE']
-+ ENV['HOME'] || ENV['USERPROFILE'] || get_real_home
-+ end
-+
-+ # Returns the home directory of the current process owner
-+ # according to the system.
-+ def get_real_home
- if WINDOWS
-- home ||= "C:\\Documents and Settings\\" + get_user
-+ "C:\\Documents and Settings\\" + get_user
- else
-- home ||= Etc.getpwuid(Process.uid).dir
-+ Etc.getpwuid(Process.uid).dir
- end
-- home
- end
-
- # Returns the current umask of the process.
-diff -Naur jruby-1.2.0.orig/test/externals/ruby_test/test/core/File/class/tc_expand_path.rb jruby-1.2.0/test/externals/ruby_test/test/core/File/class/tc_expand_path.rb
---- jruby-1.2.0.orig/test/externals/ruby_test/test/core/File/class/tc_expand_path.rb 2009-03-16 15:15:49.000000000 +0000
-+++ jruby-1.2.0/test/externals/ruby_test/test/core/File/class/tc_expand_path.rb 2009-04-18 00:20:58.966617568 +0100
-@@ -12,6 +12,7 @@
- def setup
- @user = get_user
- @home = get_home
-+ @real_home = get_real_home
- @pwd = Dir.pwd
- ENV['HOME'] = ENV['USERPROFILE'] if WINDOWS
- end
-@@ -88,17 +89,21 @@
- end
-
- def test_expand_path_with_tilde
-- assert_equal(@home, File.expand_path("~#{@user}"))
-- assert_equal(File.join(@home, 'bin'), File.expand_path("~#{@user}/bin"))
-+ { "~" => @home, "~#{@user}" => @real_home }.each do |tilde,path|
-+ assert_equal(path, File.expand_path(tilde))
-+ assert_equal(File.join(path, 'bin'), File.expand_path("#{tilde}/bin"))
-+ end
- end
-
- # Second argument ignored if tilde is present and it's at position 0.
- def test_expand_path_with_tilde_and_dir
-- assert_equal(@home, File.expand_path("~#{@user}", '.'))
-- assert_equal(@home, File.expand_path("~#{@user}", '..'))
-- assert_equal(@home, File.expand_path("~#{@user}", '/tmp'))
-- assert_equal(@home, File.expand_path("~#{@user}", '../tmp'))
-- assert_equal(File.join(@home, 'bin'), File.expand_path("~#{@user}/bin", '/tmp'))
-+ { "~" => @home, "~#{@user}" => @real_home }.each do |tilde,path|
-+ assert_equal(path, File.expand_path(tilde, '.'))
-+ assert_equal(path, File.expand_path(tilde, '..'))
-+ assert_equal(path, File.expand_path(tilde, '/tmp'))
-+ assert_equal(path, File.expand_path(tilde, '../tmp'))
-+ assert_equal(File.join(path, 'bin'), File.expand_path("#{tilde}/bin", '/tmp'))
-+ end
- end
-
- def test_expand_path_returns_tainted_string
-@@ -120,5 +126,6 @@
- @pwd = nil
- @user = nil
- @home = nil
-+ @real_home = nil
- end
- end
-diff -Naur jruby-1.2.0.orig/test/externals/ruby_test/test/core/ProcessGID/class/tc_rid.rb jruby-1.2.0/test/externals/ruby_test/test/core/ProcessGID/class/tc_rid.rb
---- jruby-1.2.0.orig/test/externals/ruby_test/test/core/ProcessGID/class/tc_rid.rb 2009-03-16 15:16:00.000000000 +0000
-+++ jruby-1.2.0/test/externals/ruby_test/test/core/ProcessGID/class/tc_rid.rb 2009-04-18 21:24:02.653686353 +0100
-@@ -12,7 +12,7 @@
-
- def setup
- unless WINDOWS
-- @gid = Etc.getpwnam(Etc.getlogin).gid
-+ @gid = `id -g`.to_i
- end
- end
-
-diff -Naur jruby-1.2.0.orig/test/externals/ruby_test/test/core/ProcessUID/class/tc_rid.rb jruby-1.2.0/test/externals/ruby_test/test/core/ProcessUID/class/tc_rid.rb
---- jruby-1.2.0.orig/test/externals/ruby_test/test/core/ProcessUID/class/tc_rid.rb 2009-03-16 15:15:50.000000000 +0000
-+++ jruby-1.2.0/test/externals/ruby_test/test/core/ProcessUID/class/tc_rid.rb 2009-04-18 21:30:26.748686198 +0100
-@@ -12,7 +12,7 @@
-
- def setup
- unless WINDOWS
-- @uid = Etc.getpwnam(Etc.getlogin).uid
-+ @uid = `id -u`.to_i
- end
- end
-
diff --git a/dev-java/jruby/jruby-1.6.4.ebuild b/dev-java/jruby/jruby-1.6.4.ebuild
deleted file mode 100644
index 8d18cad..0000000
--- a/dev-java/jruby/jruby-1.6.4.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.5.6.ebuild,v 1.2 2011/06/14 18:59:32 maekke 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 ~x86"
-IUSE="bsf ssl"
-
-CDEPEND=">=dev-java/bytelist-1.0.8: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-1.0.5: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
- dev-java/osgi-core-api
- dev-java/snakeyaml"
-
-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-java/commons-logging:0
- dev-java/xalan:0
- >=dev-java/jna-posix-1.0.1: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 constantine jay \
-jcodings jffi-0.4 jline constantine \
-joda-time joni jnr-posix jnr-netdb jvyamlb nailgun jaffl 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}-1.6.0-system-jars.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 "/<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
-
- # change some defaults for Gentoo to work properly
- cat - >> src/org/jruby/jruby.properties <<EOF
-ruby.bindir = /usr/bin
-EOF
-}
-
-src_compile() {
- 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() {
- 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.sh > "${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
-}
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 13df9c3..0000000
--- a/dev-java/jruby/jruby-1.6.5.1.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.5.6.ebuild,v 1.2 2011/06/14 18:59:32 maekke 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
-}
diff --git a/dev-java/jruby/jruby-1.6.7.ebuild b/dev-java/jruby/jruby-1.6.7.ebuild
deleted file mode 100644
index 3f85fad..0000000
--- a/dev-java/jruby/jruby-1.6.7.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.5.6.ebuild,v 1.2 2011/06/14 18:59:32 maekke 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
- dev-java/jzlib:1"
-
-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 jzlib-1"
-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" ! -name 'coro-mock-1.0-SNAPSHOT.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
-}
diff --git a/dev-java/jruby/metadata.xml b/dev-java/jruby/metadata.xml
deleted file mode 100644
index 0b15377..0000000
--- a/dev-java/jruby/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>java</herd>
- <herd>ruby</herd>
-</pkgmetadata>
diff --git a/dev-java/jzlib/ChangeLog b/dev-java/jzlib/ChangeLog
deleted file mode 100644
index 7dc3ef8..0000000
--- a/dev-java/jzlib/ChangeLog
+++ /dev/null
@@ -1,10 +0,0 @@
-# ChangeLog for dev-java/jzlib
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*jzlib-1.1.1 (28 Feb 2012)
-
- 28 Feb 2012; Diego E. Pettenò <flameeyes@gentoo.org> +jzlib-1.1.1.ebuild,
- +metadata.xml:
- Import Chewi's jzlib bump (new slot) as required by JRuby 1.6.7.
-
diff --git a/dev-java/jzlib/jzlib-1.1.1.ebuild b/dev-java/jzlib/jzlib-1.1.1.ebuild
deleted file mode 100644
index e3330b6..0000000
--- a/dev-java/jzlib/jzlib-1.1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JZlib is a re-implementation of zlib in pure Java"
-HOMEPAGE="http://www.jcraft.com/jzlib/"
-SRC_URI="http://www.jcraft.com/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="src/main/java"
-
-java_prepare() {
- # Easier to use java-pkg-simple.
- rm -v pom.xml || die
-}
-
-src_install() {
- java-pkg-simple_src_install
- dodoc README ChangeLog
-}
\ No newline at end of file
diff --git a/dev-java/jzlib/metadata.xml b/dev-java/jzlib/metadata.xml
deleted file mode 100644
index 0b15377..0000000
--- a/dev-java/jzlib/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>java</herd>
- <herd>ruby</herd>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-04-29 4:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-29 4:50 [gentoo-commits] proj/ruby-overlay:master commit in: dev-java/jruby/files/1.5.1/, dev-java/jzlib/, dev-java/jruby/files/, Diego Elio Pettenò
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox