dev-java/jruby: remove unused patches/files

6 files changed, 0 insertions, 396 deletions

diff --git a/dev-java/jruby/files/10jruby b/dev-java/jruby/files/10jruby
deleted file mode 100644
index 13cb1f984cff..000000000000
--- 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 77bdbda1a61f..000000000000
--- 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 20c50f96c0d2..000000000000
--- 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 100644
index 804d788037fd..000000000000
--- 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-bash-launcher.patch b/dev-java/jruby/files/jruby-bash-launcher.patch
deleted file mode 100644
index d23f6cf200f3..000000000000
--- 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 6688fa9aa01a..000000000000
--- 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
-