From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SOM6O-00035W-6S for garchives@archives.gentoo.org; Sun, 29 Apr 2012 04:51:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44028E05AF; Sun, 29 Apr 2012 04:51:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D5F3CE05AF for ; Sun, 29 Apr 2012 04:51:01 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 126951B4004 for ; Sun, 29 Apr 2012 04:51:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D4591E5403 for ; Sun, 29 Apr 2012 04:50:58 +0000 (UTC) From: "Diego Elio Pettenò" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Diego Elio Pettenò" Message-ID: <1335675050.a19ee0842f74dfe29e51423b2e4f4cf62d4f9fd4.flameeyes@gentoo> Subject: [gentoo-commits] proj/ruby-overlay:master commit in: dev-java/jruby/files/1.5.1/, dev-java/jzlib/, dev-java/jruby/files/, ... X-VCS-Repository: proj/ruby-overlay X-VCS-Files: dev-java/jruby/ChangeLog dev-java/jruby/files/1.5.1/build.xml.patch dev-java/jruby/files/1.5.1/testfixes.patch dev-java/jruby/files/10jruby dev-java/jruby/files/ftype-test-fixes.patch dev-java/jruby/files/gentoo.rb dev-java/jruby/files/jruby dev-java/jruby/files/jruby-1.6.0-system-jars.patch dev-java/jruby/files/jruby-bash-launcher.patch dev-java/jruby/files/user-test-fixes.patch dev-java/jruby/jruby-1.6.4.ebuild dev-java/jruby/jruby-1.6.5.1.ebuild dev-java/jruby/jruby-1.6.7.ebuild dev-java/jruby/metadata.xml dev-java/jzlib/ChangeLog dev-java/jzlib/jzlib-1.1.1.ebuild dev-java/jzlib/metadata.xml X-VCS-Directories: dev-java/jruby/files/1.5.1/ dev-java/jzlib/ dev-java/jruby/files/ dev-java/jruby/ X-VCS-Committer: flameeyes X-VCS-Committer-Name: Diego Elio Pettenò X-VCS-Revision: a19ee0842f74dfe29e51423b2e4f4cf62d4f9fd4 X-VCS-Branch: master Date: Sun, 29 Apr 2012 04:50:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: aa27a891-3a72-4f9d-8620-45e6f9bae7fe X-Archives-Hash: f25828d3924be8bfccbd930bb713d56e commit: a19ee0842f74dfe29e51423b2e4f4cf62d4f9fd4 Author: Diego Elio Petten=C3=B2 flameeyes eu> AuthorDate: Sun Apr 29 04:50:50 2012 +0000 Commit: Diego Elio Petten=C3=B2 gentoo org> CommitDate: Sun Apr 29 04:50:50 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/ruby-overlay.= git;a=3Dcommit;h=3Da19ee084 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=C3=B2 +jruby-1.6.7= .ebuild: - Bump jruby version to 1.6.7. - - 23 Jan 2012; Hans de Graaff jruby-1.6.5.1.ebuild, - files/jruby-bash-launcher.patch: - The properties file is no longer used. Add the bindir option to the wr= apper - instead. - - 22 Jan 2012; Hans de Graaff 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/6c1d41aedfde705c969abf10cf5384e2= be69 - -*jruby-1.6.5.1 (08 Jan 2012) - - 08 Jan 2012; Hans de Graaff 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 jruby-1.6.4.ebuild: - This is an experimental version, mark it testing. - - 27 Sep 2011; Hans de Graaff jruby-1.6.4.ebuild: - Drop old pkg_postinst instrcutions for upgrading from pre 1.4 jruby ve= rsions. - - 27 Sep 2011; Hans de Graaff 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 @@ - - - -+ - - - -@@ -871,6 +873,7 @@ -=20 - - -+ - - - 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 -=20 - def test_signal -+ return - defined?(Process.kill) or return -=20 - # 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 -=20 - # JRUBY-4348 -- def test_exec_rubyopt -- old =3D ENV['RUBYOPT'] -- ENV['RUBYOPT'] =3D "-v" -- result =3D `ruby -e "a=3D1"` -- assert_equal 0, $?.exitstatus -- assert_match /ruby/i, result -- ensure -- ENV['RUBYOPT'] =3D old -- end -+ #def test_exec_rubyopt -+ # old =3D ENV['RUBYOPT'] -+ # ENV['RUBYOPT'] =3D "-v" -+ # result =3D `ruby -e "a=3D1"` -+ # assert_equal 0, $?.exitstatus -+ # assert_match /ruby/i, result -+ #ensure -+ # ENV['RUBYOPT'] =3D old -+ #end -=20 - # 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 - =20 - # 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} - =20 - # 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 -=20 - # spin up 100 Java threads and join them - (1..10).to_a.map {t =3D java.lang.Thread.new {}; t.start; t}.map(&:= join) -- =20 -+ =20 - # 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} -=20 - # 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 - =20 - # 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} - =20 - # 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=3D"-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/clas= s/tc_ftype.rb jruby-1.2.0/test/externals/ruby_test/test/core/File/class/t= c_ftype.rb ---- jruby-1.2.0.orig/test/externals/ruby_test/test/core/File/class/tc_ft= ype.rb 2009-04-26 12:01:41.912584566 +0100 -+++ jruby-1.2.0/test/externals/ruby_test/test/core/File/class/tc_ftype.r= b 2009-04-26 12:03:56.000210377 +0100 -@@ -26,28 +26,13 @@ - else - @char =3D Pathname.new('/dev/null').realpath - @fifo =3D "test_fifo" -+ @link =3D "test_link" -=20 - system("mkfifo #{@fifo}") -+ system("ln -snf . #{@link}") -=20 -- if File.exists?("/dev/fd0") -- @block =3D Pathname.new("/dev/fd0").realpath -- @link =3D "/dev/fd0" if File.symlink?("/dev/fd0") -- elsif File.exists?("/dev/diskette") -- @block =3D Pathname.new("/dev/diskette").realpath -- @link =3D "/dev/diskette" if File.symlink?("/dev/diskette"= ) -- elsif File.exists?("/dev/cdrom") -- @block =3D Pathname.new("/dev/cdrom").realpath -- @link =3D "/dev/cdrom" if File.symlink?("/dev/cdrom") -- elsif File.exists?("/dev/sr0") # CDROM -- @block =3D Pathname.new("/dev/sr0").realpath -- @link =3D "/dev/sr0" if File.symlink?("/dev/sr0")=20 -- elsif File.exists?("/dev/disk0") -- @block =3D "/dev/disk0" -- @link =3D "/tmp" -- else -- @block =3D nil -- @link =3D nil -- end -+ @block =3D %w( /dev/fd0 /dev/diskette /dev/cdrom /dev/sr0 /dev= /disk0 ).find { |dev| File.exists?(dev) } -+ @block =3D Pathname.new(@block).realpath if @block - end - end -=20 -@@ -66,22 +51,21 @@ - end -=20 - # TODO: Find appropriate tests for MS Windows -- unless WINDOWS -- def test_ftype_char -- assert_equal('characterSpecial', File.ftype(@char)) -- end -+ =20 -+ def test_ftype_char -+ assert_equal('characterSpecial', File.ftype(@char)) if @char -+ end -=20 -- 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: #{@b= lock}") if @block -+ end -=20 -- def test_ftype_link -- assert_equal('link', File.ftype(@link)) -- end -+ def test_ftype_link -+ assert_equal('link', File.ftype(@link)) if @link -+ end -=20 -- def test_ftype_fifo -- assert_equal('fifo', File.ftype(@fifo)) -- end -+ def test_ftype_fifo -+ assert_equal('fifo', File.ftype(@fifo)) if @fifo - end -=20 - def test_ftype_expected_errors -@@ -91,6 +75,7 @@ -=20 - def teardown - remove_file(@fifo) -+ remove_file(@link) - =20 - @file =3D nil - @dir =3D 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 pr= epends 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=3D`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-jav= a/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 @@ -=20 - # ----- Verify and Set Required Environment Variables -----------------= -------- -=20 -+# This will be filled in by the ebuild after install -+JRUBY_HOME=3D -+ - ## resolve links - $0 may be a link to home - PRG=3D$0 - progname=3D`basename "$0"` -@@ -38,12 +41,14 @@ - fi - done -=20 --JRUBY_HOME_1=3D`dirname "$PRG"` # the ./bin dir --if [ "$JRUBY_HOME_1" =3D '.' ] ; then -- cwd=3D`pwd` -- JRUBY_HOME=3D`dirname $cwd` # JRUBY-2699 --else -- JRUBY_HOME=3D`dirname "$JRUBY_HOME_1"` # the . dir -+if [ -z "$JRUBY_HOME" ]; then -+ JRUBY_HOME_1=3D`dirname "$PRG"` -+ if [ "$JRUBY_HOME_1" =3D '.' ] ; then -+ cwd=3D`pwd` -+ JRUBY_HOME=3D`dirname $cwd` # JRUBY-2699 -+ else -+ JRUBY_HOME=3D`dirname "$JRUBY_HOME_1"` # the . dir -+ fi - fi -=20 - if [ -z "$JRUBY_OPTS" ] ; then -@@ -73,74 +78,17 @@ - done - JRUBY_OPTS=3D${JRUBY_OPTS_TEMP} -=20 --if [ -z "$JAVACMD" ] ; then -- if [ -z "$JAVA_HOME" ] ; then -- JAVACMD=3D'java' -- else -- JAVACMD=3D"$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 er= ror. --#$JAVACMD -version -- - JRUBY_SHELL=3D/bin/sh -=20 - # ----- Set Up The Boot Classpath -------------------------------------= ------ -=20 --CP_DELIMITER=3D":" -- --# add main jruby jar to the bootclasspath --for j in "$JRUBY_HOME"/lib/jruby.jar "$JRUBY_HOME"/lib/jruby-complete.j= ar; do -- if [ ! -e "$j" ]; then -- continue -- fi -- if [ "$JRUBY_CP" ]; then -- JRUBY_CP=3D"$JRUBY_CP$CP_DELIMITER$j" -- else -- JRUBY_CP=3D"$j" -- fi -- if [ $JRUBY_ALREADY_ADDED ]; then -- echo "WARNING: more than one JRuby JAR found in lib directory" -- fi -- JRUBY_ALREADY_ADDED=3Dtrue --done -- -- --# ----- Set Up The System Classpath -----------------------------------= -------- -- --if [ "$JRUBY_PARENT_CLASSPATH" !=3D "" ]; then -- # Use same classpath propagated from parent jruby -- CP=3D$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" =3D=3D "$JRUBY_HOME"/lib/jruby.jar ]; then -- continue -- fi -- if [ "$j" =3D=3D "$JRUBY_HOME"/lib/jruby-complete.jar ]; then -- continue -- fi -- if [ "$CP" ]; then -- CP=3D"$CP$CP_DELIMITER$j" -- else -- CP=3D"$j" -- fi -- done -- --fi -- -+JRUBY_CP=3D"$(java-config -d -p jruby)" -+CP=3D"${JRUBY_PARENT_CLASSPATH}" -=20 - # ----- Execute The Requested Command ---------------------------------= -------- -=20 --if [ -z "$JAVA_MEM" ] ; then -- JAVA_MEM=3D-Xmx500m --fi -- --if [ -z "$JAVA_STACK" ] ; then -- JAVA_STACK=3D-Xss1024k --fi -+JAVA_MEM=3D${JAVA_MEM:--Xmx500m} -+JAVA_STACK=3D${JAVA_STACK:--Xss1024k} -=20 - JAVA_VM=3D-client - JAVA_ENCODING=3D"" -@@ -163,19 +111,19 @@ - elif [ "${val:0:4}" =3D "-Xss" ]; then - JAVA_STACK=3D$val - elif [ "${val}" =3D "" ]; then -- $JAVACMD -help -+ java -help - echo "(Prepend -J in front of these options when using 'jru= by' command)"=20 - exit - elif [ "${val}" =3D "-X" ]; then -- $JAVACMD -X -+ java -X - echo "(Prepend -J in front of these options when using 'jru= by' command)"=20 - exit - elif [ "${val}" =3D "-classpath" ]; then -- CP=3D"$CP$CP_DELIMITER$2" -+ CP=3D"$CP:$2" - CLASSPATH=3D"" - shift - elif [ "${val}" =3D "-cp" ]; then -- CP=3D"$CP$CP_DELIMITER$2" -+ CP=3D"$CP:$2" - CLASSPATH=3D"" - shift - else -@@ -209,12 +157,9 @@ - java_args=3D"${java_args} -Djava.awt.headless=3Dtrue" ;; - # Run under JDB - --jdb) -- if [ -z "$JAVA_HOME" ] ; then -- JAVACMD=3D'jdb' -- else -- JAVACMD=3D"$JAVA_HOME/bin/jdb" -- fi=20 -+ JAVACMD=3D"jdb" - java_args=3D"${java_args} -sourcepath $JRUBY_HOME/lib/ruby/1.8:= ." -+ - JRUBY_OPTS=3D"${JRUBY_OPTS} -X+C" ;; - --client) - JAVA_VM=3D-client ;; -@@ -247,7 +192,7 @@ - fi -=20 - # Add a property to report memory max --JAVA_OPTS=3D"$JAVA_OPTS $JAVA_VM -Djruby.memory.max=3D${JAVA_MEM} -Djru= by.stack.max=3D${JAVA_STACK}" -+JAVA_OPTS=3D"$JAVA_OPTS $JAVA_VM -Djruby.memory.max=3D${JAVA_MEM} -Djru= by.stack.max=3D${JAVA_STACK} -Djruby.bindir=3D/usr/bin" -=20 - # Append the rest of the arguments - ruby_args=3D"${ruby_args} $@" -@@ -257,33 +202,17 @@ -=20 - JAVA_OPTS=3D"$JAVA_OPTS $JAVA_MEM $JAVA_STACK" -=20 --JFFI_BOOT=3D"" --if [ -d $JRUBY_HOME/lib/native/ ]; then -- for d in $JRUBY_HOME/lib/native/*`uname -s`; do -- if [ -z "$JFFI_BOOT" ]; then -- JFFI_BOOT=3D"$d" -- else -- JFFI_BOOT=3D"$JFFI_BOOT:$d" -- fi -- done --fi --JFFI_OPTS=3D"-Djffi.boot.library.path=3D$JFFI_BOOT" -=20 -=20 - if [ "$nailgun_client" !=3D "" ]; then -- if [ -f $JRUBY_HOME/tool/nailgun/ng ]; then -- exec $JRUBY_HOME/tool/nailgun/ng org.jruby.util.NailMain $JRUBY_OPT= S "$@" -- else -- echo "error: ng executable not found; run 'make' in ${JRUBY_HOME}/t= ool/nailgun" -- exit 1 -- fi -+ exec /usr/bin/ng org.jruby.util.NailMain $JRUBY_OPTS "$@" - else - if [ "$VERIFY_JRUBY" !=3D "" ]; then - if [ "$PROFILE_ARGS" !=3D "" ]; then - echo "Running with instrumented profiler" - fi -=20 -- "$JAVACMD" $PROFILE_ARGS $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -c= lasspath "$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=3D$JRUBY_HOME" \ - "-Djruby.lib=3D$JRUBY_HOME/lib" -Djruby.script=3Djruby \ - "-Djruby.shell=3D$JRUBY_SHELL" \ -@@ -301,7 +232,7 @@ -=20 - exit $JRUBY_STATUS - else -- exec $JAVACMD $JAVA_OPTS $JFFI_OPTS ${java_args} -Xbootclasspath/a:$J= RUBY_CP -classpath $CP$CP_DELIMITER$CLASSPATH \ -+ exec ${JAVACMD:-java} $JAVA_OPTS $JFFI_OPTS ${java_args} -Xbootclassp= ath/a:$JRUBY_CP -classpath $CP:$CLASSPATH \ - -Djruby.home=3D$JRUBY_HOME \ - -Djruby.lib=3D$JRUBY_HOME/lib -Djruby.script=3Djruby \ - -Djruby.shell=3D$JRUBY_SHELL \ diff --git a/dev-java/jruby/files/jruby-bash-launcher.patch b/dev-java/jr= uby/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 - -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 li= b. - -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=3D-client - fi -=20 --## resolve links - $0 may be a link to home --PRG=3D$0 --progname=3D`basename "$0"` -- --while [ -h "$PRG" ] ; do -- ls=3D`ls -ld "$PRG"` -- link=3D`expr "$ls" : '.*-> \(.*\)$'` -- if expr "$link" : '.*/.*' > /dev/null; then -- if expr "$link" : '/' > /dev/null; then -- PRG=3D"$link" -- else -- PRG=3D"`dirname ${PRG}`/${link}" -- fi -- else -- PRG=3D"`dirname $PRG`/$link" -- fi --done -- --JRUBY_HOME_1=3D`dirname "$PRG"` # the ./bin dir --if [ "$JRUBY_HOME_1" =3D '.' ] ; then -- cwd=3D`pwd` -- JRUBY_HOME=3D`dirname $cwd` # JRUBY-2699 --else -- JRUBY_HOME=3D`dirname "$JRUBY_HOME_1"` # the . dir --fi -+JRUBY_HOME=3D"${JRUBY_HOME:-/usr/share/jruby}" -=20 - if [ -z "$JRUBY_OPTS" ] ; then - JRUBY_OPTS=3D"" -@@ -81,17 +57,7 @@ for opt in ${JRUBY_OPTS[@]}; do - done - JRUBY_OPTS=3D${JRUBY_OPTS_TEMP} -=20 --if [ -z "$JAVACMD" ] ; then -- if [ -z "$JAVA_HOME" ] ; then -- JAVACMD=3D'java' -- else -- if $cygwin; then -- JAVACMD=3D"`cygpath -u "$JAVA_HOME"`/bin/java" -- else -- JAVACMD=3D"$JAVA_HOME/bin/java" -- fi -- fi --fi -+JAVACMD=3Djava -=20 - if [ -z "$JAVA_MEM" ] ; then - JAVA_MEM=3D-Xmx500m -@@ -132,21 +98,7 @@ JRUBY_SHELL=3D/bin/sh -=20 - CP_DELIMITER=3D":" -=20 --# add main jruby jar to the bootclasspath --for j in "$JRUBY_HOME"/lib/jruby.jar "$JRUBY_HOME"/lib/jruby-complete.j= ar; do -- if [ ! -e "$j" ]; then -- continue -- fi -- if [ "$JRUBY_CP" ]; then -- JRUBY_CP=3D"$JRUBY_CP$CP_DELIMITER$j" -- else -- JRUBY_CP=3D"$j" -- fi -- if [ $JRUBY_ALREADY_ADDED ]; then -- echo "WARNING: more than one JRuby JAR found in lib directory" -- fi -- JRUBY_ALREADY_ADDED=3Dtrue --done -+JRUBY_CP=3D"$(java-config-2 -d -p jruby)" -=20 - if $cygwin; then - JRUBY_CP=3D`cygpath -p -w "$JRUBY_CP"` -@@ -154,29 +106,7 @@ fi -=20 - # ----- Set Up The System Classpath -----------------------------------= -------- -=20 --if [ "$JRUBY_PARENT_CLASSPATH" !=3D "" ]; then -- # Use same classpath propagated from parent jruby -- CP=3D$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" =3D=3D "$JRUBY_HOME"/lib/jruby.jar ]; then -- continue -- fi -- if [ "$j" =3D=3D "$JRUBY_HOME"/lib/jruby-complete.jar ]; then -- continue -- fi -- if [ "$CP" ]; then -- CP=3D"$CP$CP_DELIMITER$j" -- else -- CP=3D"$j" -- fi -- done -- -- if $cygwin; then -- CP=3D`cygpath -p -w "$CP"` -- fi --fi -+CP=3D"${JRUBY_PARENT_CLASSPATH}" -=20 - if $cygwin; then - # switch delimiter only after building Unix style classpaths -@@ -254,15 +184,7 @@ do - java_args=3D("${java_args[@]}" "-Djava.awt.headless=3Dtrue") ;; - # Run under JDB - --jdb) -- if [ -z "$JAVA_HOME" ] ; then -- JAVACMD=3D'jdb' -- else -- if $cygwin; then -- JAVACMD=3D"`cygpath -u "$JAVA_HOME"`/bin/jdb" -- else -- JAVACMD=3D"$JAVA_HOME/bin/jdb" -- fi -- fi=20 -+ JAVACMD=3D'jdb' - java_args=3D("${java_args[@]}" "-sourcepath" "$JRUBY_HOME/lib/r= uby/1.8:.") - JRUBY_OPTS=3D("${JRUBY_OPTS[@]}" "-X+C") ;; - --client) -@@ -310,18 +232,6 @@ set -- "${ruby_args[@]}" -=20 - JAVA_OPTS=3D"$JAVA_OPTS $JAVA_MEM $JAVA_MEM_MIN $JAVA_STACK" -=20 --JFFI_BOOT=3D"" --if [ -d "$JRUBY_HOME/lib/native/" ]; then -- for d in $JRUBY_HOME/lib/native/*`uname -s`; do -- if [ -z "$JFFI_BOOT" ]; then -- JFFI_BOOT=3D"$d" -- else -- JFFI_BOOT=3D"$JFFI_BOOT:$d" -- fi -- done --fi --JFFI_OPTS=3D"-Djffi.boot.library.path=3D$JFFI_BOOT" -- - if $cygwin; then - JRUBY_HOME=3D`cygpath --mixed "$JRUBY_HOME"` - JRUBY_SHELL=3D`cygpath --mixed "$JRUBY_SHELL"` -@@ -354,7 +264,8 @@ if [ "$VERIFY_JRUBY" !=3D "" ]; then - echo "Running with instrumented profiler" - fi -=20 -- "$JAVACMD" $PROFILE_ARGS $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -c= lasspath "$JRUBY_CP$CP_DELIMITER$CP$CP_DELIMITER$CLASSPATH" \ -+ "$JAVACMD" $PROFILE_ARGS $JAVA_OPTS "${java_args[@]}" -classpath "$JR= UBY_CP$CP_DELIMITER$CP$CP_DELIMITER$CLASSPATH" \ - "-Djruby.home=3D$JRUBY_HOME" \ -+ "-Djruby.bindir=3D/usr/bin" \ - "-Djruby.lib=3D$JRUBY_HOME/lib" -Djruby.script=3Djruby \ - "-Djruby.shell=3D$JRUBY_SHELL" \ -@@ -377,7 +287,7 @@ if [ "$VERIFY_JRUBY" !=3D "" ]; then - else - if $cygwin; then - # exec doed not work correctly with cygwin bash -- "$JAVACMD" $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -Xbootclasspat= h/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \ -+ "$JAVACMD" $JAVA_OPTS "${java_args[@]}" -Xbootclasspath/a:"$JRUBY_C= P" -classpath "$CP$CP_DELIMITER$CLASSPATH" \ - "-Djruby.home=3D$JRUBY_HOME" \ - "-Djruby.lib=3D$JRUBY_HOME/lib" -Djruby.script=3Djruby \ - "-Djruby.shell=3D$JRUBY_SHELL" \ -@@ -390,7 +300,8 @@ else -=20 - exit $JRUBY_STATUS - else -- exec "$JAVACMD" $JAVA_OPTS "$JFFI_OPTS" "${java_args[@]}" -Xbootcla= sspath/a:"$JRUBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \ -+ exec "$JAVACMD" $JAVA_OPTS "${java_args[@]}" -Xbootclasspath/a:"$JR= UBY_CP" -classpath "$CP$CP_DELIMITER$CLASSPATH" \ - "-Djruby.home=3D$JRUBY_HOME" \ -+ "-Djruby.bindir=3D/usr/bin" \ - "-Djruby.lib=3D$JRUBY_HOME/lib" -Djruby.script=3Djruby \ - "-Djruby.shell=3D$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 0= 0:34:02.198853097 +0100 -@@ -235,31 +235,34 @@ - # Get the user of the current process. - # - def get_user -- user =3D ENV['USERNAME'] || ENV['USER'] - if WINDOWS -- if user.nil? -- buf =3D 0.chr * MAX_PATH -- if GetUserName.call(buf, buf.length) =3D=3D 0 -- raise "Unable to get user name" -- end -- user =3D buf.unpack("A*") -+ buf =3D 0.chr * MAX_PATH -+ if GetUserName.call(buf, buf.length) !=3D 0 -+ buf.unpack("A*") -+ elsif user =3D ENV['USERNAME'] || ENV['USER'] -+ user -+ else -+ raise "Unable to get user name" - end - else -- user ||=3D Etc.getpwuid(Process.uid).name -+ Etc.getpwuid(Process.uid).name - end -- user - end -=20 -- # Returns the home directory of the current process owner. -- #=20 -+ # Returns the home directory of the current process owner -+ # according to the HOME/USERPROFILE variable. - def get_home -- home =3D ENV['HOME'] || ENV['USERPROFILE'] -+ ENV['HOME'] || ENV['USERPROFILE'] || get_real_home -+ end -+ =20 -+ # Returns the home directory of the current process owner -+ # according to the system. -+ def get_real_home - if WINDOWS -- home ||=3D "C:\\Documents and Settings\\" + get_user -+ "C:\\Documents and Settings\\" + get_user - else -- home ||=3D Etc.getpwuid(Process.uid).dir -+ Etc.getpwuid(Process.uid).dir - end -- home - end - =20 - # Returns the current umask of the process. -diff -Naur jruby-1.2.0.orig/test/externals/ruby_test/test/core/File/clas= s/tc_expand_path.rb jruby-1.2.0/test/externals/ruby_test/test/core/File/c= lass/tc_expand_path.rb ---- jruby-1.2.0.orig/test/externals/ruby_test/test/core/File/class/tc_ex= pand_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 =3D get_user - @home =3D get_home -+ @real_home =3D get_real_home - @pwd =3D Dir.pwd - ENV['HOME'] =3D ENV['USERPROFILE'] if WINDOWS - end -@@ -88,17 +89,21 @@ - end -=20 - def test_expand_path_with_tilde -- assert_equal(@home, File.expand_path("~#{@user}")) -- assert_equal(File.join(@home, 'bin'), File.expand_path("~#{@user}= /bin")) -+ { "~" =3D> @home, "~#{@user}" =3D> @real_home }.each do |tilde,pa= th| -+ assert_equal(path, File.expand_path(tilde)) -+ assert_equal(File.join(path, 'bin'), File.expand_path("#{tilde= }/bin")) -+ end - end -=20 - # 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')) -+ { "~" =3D> @home, "~#{@user}" =3D> @real_home }.each do |tilde,pa= th| -+ 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 -=20 - def test_expand_path_returns_tainted_string -@@ -120,5 +126,6 @@ - @pwd =3D nil - @user =3D nil - @home =3D nil -+ @real_home =3D nil - end - end -diff -Naur jruby-1.2.0.orig/test/externals/ruby_test/test/core/ProcessGI= D/class/tc_rid.rb jruby-1.2.0/test/externals/ruby_test/test/core/ProcessG= ID/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_r= id.rb 2009-04-18 21:24:02.653686353 +0100 -@@ -12,7 +12,7 @@ -=20 - def setup - unless WINDOWS -- @gid =3D Etc.getpwnam(Etc.getlogin).gid -+ @gid =3D `id -g`.to_i - end - end -=20 -diff -Naur jruby-1.2.0.orig/test/externals/ruby_test/test/core/ProcessUI= D/class/tc_rid.rb jruby-1.2.0/test/externals/ruby_test/test/core/ProcessU= ID/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_r= id.rb 2009-04-18 21:30:26.748686198 +0100 -@@ -12,7 +12,7 @@ -=20 - def setup - unless WINDOWS -- @uid =3D Etc.getpwnam(Etc.getlogin).uid -+ @uid =3D `id -u`.to_i - end - end -=20 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=3D"2" -JAVA_PKG_IUSE=3D"doc source test" -inherit eutils java-pkg-2 java-ant-2 - -MY_PV=3D"${PV/_rc1/RC1}" - -DESCRIPTION=3D"Java-based Ruby interpreter implementation" -HOMEPAGE=3D"http://jruby.codehaus.org/" -SRC_URI=3D"http://jruby.org.s3.amazonaws.com/downloads/${PV}/${PN}-src-$= {PV}.tar.gz" -LICENSE=3D"|| ( CPL-1.0 GPL-2 LGPL-2.1 )" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"bsf ssl" - -CDEPEND=3D">=3Ddev-java/bytelist-1.0.8:0 - >=3Ddev-java/constantine-0.6:0 - >=3Ddev-java/jline-0.9.94:0 - >=3Ddev-java/joni-1.1.3:0 - >=3Ddev-java/jnr-posix-1.1.3:0 - >=3Ddev-java/jnr-netdb-1.0:0 - >=3Ddev-java/jvyamlb-0.2.5:0 - >=3Ddev-java/asm-3.2:3 - >=3Ddev-java/jcodings-1.0.5:0 - >=3Ddev-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=3D"${CDEPEND} - >=3Dvirtual/jre-1.6" - -DEPEND=3D"${CDEPEND} - >=3Dvirtual/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 - >=3Ddev-java/jna-posix-1.0.1:0 - ) - !! ~/= 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=3D302187" - fail=3D"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=3D"128m"/maxmemory=3D"192m"/' \ - -e "/RetroWeaverTask/d" \ - -e "//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.j= ar" -delete || die - - # change some defaults for Gentoo to work properly - cat - >> src/org/jruby/jruby.properties < 'build.classpath'@:path =3D>\"#{ENV['JRUBY_CP']}:= lib/jruby.jar\"@g" \ - rakelib/commands.rake || die - #sed -i "s@:refid =3D> 'test.class.path'@:path =3D> \"#{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=3D`java-pkg_getjars ${EANT_GENTOO_CLASSPATH// /,},junit-4` - cpath=3D"$(echo ${cpath} | sed -e "s_${ROOT}/usr/share/jruby/lib/jruby.= jar:__g")" - cpath=3D"${cpath}:$(java-pkg_getjars --build-only commons-logging,xalan= )" - EANT_GENTOO_CLASSPATH=3D"" - - local flags=3D"" - use bsf && flags=3D"-Dbsf.present=3Dtrue" - - #Clear RUBYOPT - export RUBYOPT=3D"" - export JRUBY_CP=3D"${cpath}" - ANT_TASKS=3D"ant-junit4 ant-trax" \ - JRUBY_OPTS=3D"" eant test -Djdk1.5+=3Dtrue -Djruby.bindir=3Dbin \ - -Dgentoo.classpath=3D"${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=3D/s:=3D:=3D/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 'ubygem= s.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=3D"4" -JAVA_PKG_IUSE=3D"doc source test" -inherit eutils java-pkg-2 java-ant-2 - -MY_PV=3D"${PV/_rc1/RC1}" - -DESCRIPTION=3D"Java-based Ruby interpreter implementation" -HOMEPAGE=3D"http://jruby.codehaus.org/" -SRC_URI=3D"http://jruby.org.s3.amazonaws.com/downloads/${PV}/${PN}-src-$= {PV}.tar.gz" -LICENSE=3D"|| ( CPL-1.0 GPL-2 LGPL-2.1 )" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"bsf ssl" - -# jffi still needed? Or do we call that jnr-ffi? -# jnr-ffi depends on jffi which depends on libffi -CDEPEND=3D">=3Ddev-java/bytelist-1.0.8:0 - >=3Ddev-java/jline-0.9.94:0 - >=3Ddev-java/joni-1.1.3:0 - >=3Ddev-java/jnr-netdb-1.0:0 - >=3Ddev-java/jvyamlb-0.2.5:0 - >=3Ddev-java/asm-3.2:3 - >=3Ddev-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 - >=3Ddev-java/snakeyaml-1.9:0" - -RDEPEND=3D"${CDEPEND} - >=3Dvirtual/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=3D"${CDEPEND} - >=3Dvirtual/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 - ) - !! ~/= 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=3D302187" - fail=3D"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=3D"128m"/maxmemory=3D"192m"/' \ - -e "/RetroWeaverTask/d" \ - -e "/yecht/! { //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.j= ar" -delete || die -} - -src_compile() { - # Avoid generating the ri cache since that currently fails. - local flags=3D"-Dgenerate-ri-cache.hasrun=3Dtrue" - #local flags=3D"" - use bsf && flags=3D"-Dbsf.present=3Dtrue" - - export RUBYOPT=3D"" - einfo $RUBYOPT - #eant jar $(use_doc apidocs) -Djdk1.5+=3Dtrue ${flags} - eant -Djdk1.5+=3Dtrue ${flags} -} - -src_test() { - if [ ${UID} =3D=3D 0 ] ; then - ewarn 'The tests will fail if run as root so skipping them.' - ewarn 'Enable FEATURES=3D"userpriv" if you want to run them.' - return - fi - # Our jruby.jar is unbundled so we need to add the classpath to this te= st. - 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 =3D> 'build.classpath'@:path =3D>\"#{ENV['JRUBY_CP']}:= lib/jruby.jar\"@g" \ - rakelib/commands.rake || die - #sed -i "s@:refid =3D> 'test.class.path'@:path =3D> \"#{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=3D`java-pkg_getjars ${EANT_GENTOO_CLASSPATH// /,},junit-4` - cpath=3D"$(echo ${cpath} | sed -e "s_${ROOT}/usr/share/jruby/lib/jruby.= jar:__g")" - cpath=3D"${cpath}:$(java-pkg_getjars --build-only commons-logging,xalan= )" - EANT_GENTOO_CLASSPATH=3D"" - - local flags=3D"" - use bsf && flags=3D"-Dbsf.present=3Dtrue" - - #Clear RUBYOPT - export RUBYOPT=3D"" - export JRUBY_CP=3D"${cpath}" - ANT_TASKS=3D"ant-junit4 ant-trax" \ - JRUBY_OPTS=3D"" eant test -Djdk1.5+=3Dtrue -Djruby.bindir=3Dbin \ - -Dgentoo.classpath=3D"${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=3D/s:=3D:=3D/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 'ubygem= s.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=3D"4" -JAVA_PKG_IUSE=3D"doc source test" -inherit eutils java-pkg-2 java-ant-2 - -MY_PV=3D"${PV/_rc1/RC1}" - -DESCRIPTION=3D"Java-based Ruby interpreter implementation" -HOMEPAGE=3D"http://jruby.codehaus.org/" -SRC_URI=3D"http://jruby.org.s3.amazonaws.com/downloads/${PV}/${PN}-src-$= {PV}.tar.gz" -LICENSE=3D"|| ( CPL-1.0 GPL-2 LGPL-2.1 )" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"bsf ssl" - -# jffi still needed? Or do we call that jnr-ffi? -# jnr-ffi depends on jffi which depends on libffi -CDEPEND=3D">=3Ddev-java/bytelist-1.0.8:0 - >=3Ddev-java/jline-0.9.94:0 - >=3Ddev-java/joni-1.1.3:0 - >=3Ddev-java/jnr-netdb-1.0:0 - >=3Ddev-java/jvyamlb-0.2.5:0 - >=3Ddev-java/asm-3.2:3 - >=3Ddev-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 - >=3Ddev-java/snakeyaml-1.9:0 - dev-java/jzlib:1" - -RDEPEND=3D"${CDEPEND} - >=3Dvirtual/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=3D"${CDEPEND} - >=3Dvirtual/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 - ) - !! ~/= 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=3D302187" - fail=3D"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=3D"128m"/maxmemory=3D"192m"/' \ - -e "/RetroWeaverTask/d" \ - -e "/yecht/! { //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.j= ar" ! -name 'coro-mock-1.0-SNAPSHOT.jar' -delete || die -} - -src_compile() { - # Avoid generating the ri cache since that currently fails. - local flags=3D"-Dgenerate-ri-cache.hasrun=3Dtrue" - #local flags=3D"" - use bsf && flags=3D"-Dbsf.present=3Dtrue" - - export RUBYOPT=3D"" - einfo $RUBYOPT - #eant jar $(use_doc apidocs) -Djdk1.5+=3Dtrue ${flags} - eant -Djdk1.5+=3Dtrue ${flags} -} - -src_test() { - if [ ${UID} =3D=3D 0 ] ; then - ewarn 'The tests will fail if run as root so skipping them.' - ewarn 'Enable FEATURES=3D"userpriv" if you want to run them.' - return - fi - # Our jruby.jar is unbundled so we need to add the classpath to this te= st. - 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 =3D> 'build.classpath'@:path =3D>\"#{ENV['JRUBY_CP']}:= lib/jruby.jar\"@g" \ - rakelib/commands.rake || die - #sed -i "s@:refid =3D> 'test.class.path'@:path =3D> \"#{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=3D`java-pkg_getjars ${EANT_GENTOO_CLASSPATH// /,},junit-4` - cpath=3D"$(echo ${cpath} | sed -e "s_${ROOT}/usr/share/jruby/lib/jruby.= jar:__g")" - cpath=3D"${cpath}:$(java-pkg_getjars --build-only commons-logging,xalan= )" - EANT_GENTOO_CLASSPATH=3D"" - - local flags=3D"" - use bsf && flags=3D"-Dbsf.present=3Dtrue" - - #Clear RUBYOPT - export RUBYOPT=3D"" - export JRUBY_CP=3D"${cpath}" - ANT_TASKS=3D"ant-junit4 ant-trax" \ - JRUBY_OPTS=3D"" eant test -Djdk1.5+=3Dtrue -Djruby.bindir=3Dbin \ - -Dgentoo.classpath=3D"${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=3D/s:=3D:=3D/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 'ubygem= s.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 @@ - - - - java - ruby - 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=C3=B2 +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=3D"4" -JAVA_PKG_IUSE=3D"doc source" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION=3D"JZlib is a re-implementation of zlib in pure Java" -HOMEPAGE=3D"http://www.jcraft.com/jzlib/" -SRC_URI=3D"http://www.jcraft.com/${PN}/${P}.zip" - -LICENSE=3D"BSD" -SLOT=3D"1" -KEYWORDS=3D"~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=3D"" - -DEPEND=3D">=3Dvirtual/jdk-1.5" -RDEPEND=3D">=3Dvirtual/jre-1.5" - -S=3D"${WORKDIR}/${P}" -JAVA_SRC_DIR=3D"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 @@ - - - - java - ruby -