old

(Portage version: 2.1.3_rc5)

14 files changed, 0 insertions, 518 deletions

diff --git a/sys-devel/gettext/files/digest-gettext-0.12.1-r2 b/sys-devel/gettext/files/digest-gettext-0.12.1-r2
deleted file mode 100644
index f78de81b6df0..000000000000
--- a/sys-devel/gettext/files/digest-gettext-0.12.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5d4bddd300072315e668247e5b7d5bdb gettext-0.12.1.tar.gz 5727037
-RMD160 6c1736308617e62b265a40cbd1f7f038b9a6bee8 gettext-0.12.1.tar.gz 5727037
-SHA256 95a05acbaaa9c13eb449d438e65e2d75ec78bacffd6f6cd720536465ca3c1583 gettext-0.12.1.tar.gz 5727037
diff --git a/sys-devel/gettext/files/digest-gettext-0.14.1-r1 b/sys-devel/gettext/files/digest-gettext-0.14.1-r1
deleted file mode 100644
index 626674ca9492..000000000000
--- a/sys-devel/gettext/files/digest-gettext-0.14.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 78f4b862510beb2e5d43223dd610e77d gettext-0.14.1.tar.gz 6550874
-RMD160 7da98c6effeab12c09eaa8f2b2a14ab1571331ee gettext-0.14.1.tar.gz 6550874
-SHA256 41f20c469c7759acb34cfa7e0b3cac9096d59a58ad800e471f07424a8e7adbb7 gettext-0.14.1.tar.gz 6550874
diff --git a/sys-devel/gettext/files/digest-gettext-0.14.2 b/sys-devel/gettext/files/digest-gettext-0.14.2
deleted file mode 100644
index eaa5d1623cac..000000000000
--- a/sys-devel/gettext/files/digest-gettext-0.14.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 197a6ed4c86d60379a0acdc2633b9a64 gettext-0.14.2.tar.gz 6977309
-RMD160 1f2f3a8f02fbbec9060bda93628c66b31cefa6c1 gettext-0.14.2.tar.gz 6977309
-SHA256 b9dac74fec09a594be52022547c390a1420fd4d03285aff648680fbfb41e9512 gettext-0.14.2.tar.gz 6977309
diff --git a/sys-devel/gettext/files/digest-gettext-0.14.4 b/sys-devel/gettext/files/digest-gettext-0.14.4
deleted file mode 100644
index 69838b84f142..000000000000
--- a/sys-devel/gettext/files/digest-gettext-0.14.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7580b2d77ef26cafa248f525dcb960c3 gettext-0.14.4.tar.gz 7034035
-RMD160 86a021dd370747ce8fbb972ee5de9e297c3e2266 gettext-0.14.4.tar.gz 7034035
-SHA256 766382497a4631e3c2f04eb370452b775f1122dc27902f01bd94779ffcdf5639 gettext-0.14.4.tar.gz 7034035
diff --git a/sys-devel/gettext/files/digest-gettext-0.14.5 b/sys-devel/gettext/files/digest-gettext-0.14.5
deleted file mode 100644
index 5ed78c61410f..000000000000
--- a/sys-devel/gettext/files/digest-gettext-0.14.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e2f6581626a22a0de66dce1d81d00de3 gettext-0.14.5.tar.gz 7105715
-RMD160 d31c8e49671f00623ce1e6f73716a5abcd1c7ec2 gettext-0.14.5.tar.gz 7105715
-SHA256 a8aea89f4c187f5ba57d39e68f47a4c7f4752bdd0642fe89e3e941d6378907ab gettext-0.14.5.tar.gz 7105715
diff --git a/sys-devel/gettext/files/digest-gettext-0.14.6 b/sys-devel/gettext/files/digest-gettext-0.14.6
deleted file mode 100644
index b0bab1cd1509..000000000000
--- a/sys-devel/gettext/files/digest-gettext-0.14.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c26fc7f0a493c5c7c39bbc4e7ed42790 gettext-0.14.6.tar.gz 7102365
-RMD160 02138d12fd4d9ce0b3bda2d132f1569b30d16726 gettext-0.14.6.tar.gz 7102365
-SHA256 4cf3165d3477a23174170e89bfa3af963ac43eb3b51b32e343dab807c841a0b0 gettext-0.14.6.tar.gz 7102365
diff --git a/sys-devel/gettext/files/digest-gettext-0.15 b/sys-devel/gettext/files/digest-gettext-0.15
deleted file mode 100644
index ab028c6c56a0..000000000000
--- a/sys-devel/gettext/files/digest-gettext-0.15
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 16bc6e4d37ac3d07495f737a2349a22b gettext-0.15.tar.gz 8081941
-RMD160 e485b60965cf74808801e674c570c7ccd63bd61e gettext-0.15.tar.gz 8081941
-SHA256 178100e9375df74e6569e8ac89790b713476204e27283287e2637d07a5760e08 gettext-0.15.tar.gz 8081941
diff --git a/sys-devel/gettext/files/digest-gettext-0.15-r1 b/sys-devel/gettext/files/digest-gettext-0.15-r1
deleted file mode 100644
index ab028c6c56a0..000000000000
--- a/sys-devel/gettext/files/digest-gettext-0.15-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 16bc6e4d37ac3d07495f737a2349a22b gettext-0.15.tar.gz 8081941
-RMD160 e485b60965cf74808801e674c570c7ccd63bd61e gettext-0.15.tar.gz 8081941
-SHA256 178100e9375df74e6569e8ac89790b713476204e27283287e2637d07a5760e08 gettext-0.15.tar.gz 8081941
diff --git a/sys-devel/gettext/files/gettext-0.12.1-tempfile.patch b/sys-devel/gettext/files/gettext-0.12.1-tempfile.patch
deleted file mode 100644
index bfa89fc4772f..000000000000
--- a/sys-devel/gettext/files/gettext-0.12.1-tempfile.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -ur gettext-0.14.1.orig/gettext-tools/misc/autopoint.in gettext-0.14.1/gettext-tools/misc/autopoint.in
---- gettext-0.14.1.orig/gettext-tools/misc/autopoint.in	2004-01-29 20:17:27.000000000 +0100
-+++ gettext-0.14.1/gettext-tools/misc/autopoint.in	2004-09-20 10:26:14.000000000 +0200
-@@ -39,14 +39,7 @@
-     */* | *\\*) ;;
-     *) # Need to look in the PATH.
-       if test "${PATH_SEPARATOR+set}" != set; then
--        { echo "#! /bin/sh"; echo "exit 0"; } > /tmp/conf$$.sh
--        chmod +x /tmp/conf$$.sh
--        if (PATH="/nonexistent;/tmp"; conf$$.sh) >/dev/null 2>&1; then
--          PATH_SEPARATOR=';'
--        else
--          PATH_SEPARATOR=:
--        fi
--        rm -f /tmp/conf$$.sh
-+        PATH_SEPARATOR=:
-       fi
-       save_IFS="$IFS"; IFS="$PATH_SEPARATOR"
-       for dir in $PATH; do
-@@ -318,7 +311,15 @@
- cvs_dir=tmpcvs$$
- work_dir=tmpwrk$$
- mkdir "$cvs_dir"
-+if [ $? -ne 0 ]; then
-+  echo "ERROR making $cvs_dir"
-+  exit 1
-+fi
- mkdir "$work_dir"
-+if [ $? -ne 0 ]; then
-+  echo "ERROR making $work_dir"
-+  exit 1
-+fi
- CVSROOT="$srcdir/$cvs_dir"
- export CVSROOT
- unset CVS_CLIENT_LOG
-@@ -417,6 +417,10 @@
-     # Recompute base. It was clobbered by the recursive call.
-     base=`echo "$1" | sed -e 's,/[^/]*$,,'`
-     test -d "$base" || { echo "Creating directory $base"; mkdir "$base"; }
-+    if [ $? -ne 0 ]; then
-+      echo "ERROR making directory $base"
-+      exit 1
-+    fi
-   fi
- }
- 
-diff -ur gettext-0.14.1.orig/gettext-tools/misc/gettextize.in gettext-0.14.1/gettext-tools/misc/gettextize.in
---- gettext-0.14.1.orig/gettext-tools/misc/gettextize.in	2004-01-20 12:30:06.000000000 +0100
-+++ gettext-0.14.1/gettext-tools/misc/gettextize.in	2004-09-20 10:22:39.000000000 +0200
-@@ -39,14 +39,7 @@
-     */* | *\\*) ;;
-     *) # Need to look in the PATH.
-       if test "${PATH_SEPARATOR+set}" != set; then
--        { echo "#! /bin/sh"; echo "exit 0"; } > /tmp/conf$$.sh
--        chmod +x /tmp/conf$$.sh
--        if (PATH="/nonexistent;/tmp"; conf$$.sh) >/dev/null 2>&1; then
--          PATH_SEPARATOR=';'
--        else
--          PATH_SEPARATOR=:
--        fi
--        rm -f /tmp/conf$$.sh
-+        PATH_SEPARATOR=:
-       fi
-       save_IFS="$IFS"; IFS="$PATH_SEPARATOR"
-       for dir in $PATH; do
diff --git a/sys-devel/gettext/files/gettext-0.12.1-without_java.patch b/sys-devel/gettext/files/gettext-0.12.1-without_java.patch
deleted file mode 100644
index d60dde9dcbc6..000000000000
--- a/sys-devel/gettext/files/gettext-0.12.1-without_java.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-Submitted By: Tushar Teredesai <tushar@linuxfromscratch.org>
-Date: 2003-11-15
-Initial Package Version: 0.12.1
-Origin: None
-Description: Adds logic to bypass checking for java/gcj. This is useful
-when building gettext in Ch 5 (If java is found on the host, gettext build
-libs that link to the host and also causes failure of some tests during make check).
-To bypass Java checks, pass the option --without-java to configure.
-diff -ur gettext-0.12.1.orig/gettext-runtime/configure gettext-0.12.1/gettext-runtime/configure
---- gettext-0.12.1.orig/gettext-runtime/configure	2003-05-22 08:38:47.000000000 -0500
-+++ gettext-0.12.1/gettext-runtime/configure	2003-10-15 18:20:49.000000000 -0600
-@@ -3268,6 +3268,16 @@
- 
- 
- 
-+if test "${with_java+set}" = set; then
-+  withval="$with_java"
-+  test "$withval" = no || with_java=yes
-+else
-+  with_java=yes
-+fi;
-+if test "$with_java" = no ; then
-+    echo "Skipping Java compiler checks..."
-+else
-+
-   echo "$as_me:$LINENO: checking for Java compiler" >&5
- echo $ECHO_N "checking for Java compiler... $ECHO_C" >&6
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -3490,6 +3500,7 @@
-   echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
-+fi
- 
- if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
-   BUILDJAVA=yes
-diff -ur gettext-0.12.1.orig/gettext-tools/configure gettext-0.12.1/gettext-tools/configure
---- gettext-0.12.1.orig/gettext-tools/configure	2003-05-22 08:40:24.000000000 -0500
-+++ gettext-0.12.1/gettext-tools/configure	2003-10-15 18:21:15.000000000 -0600
-@@ -3070,6 +3070,16 @@
- 
- 
- 
-+if test "${with_java+set}" = set; then
-+  withval="$with_java"
-+  test "$withval" = no || with_java=yes
-+else
-+  with_java=yes
-+fi;
-+if test "$with_java" = no ; then
-+    echo "Skipping Java native compiler checks..."
-+else
-+
-   echo "$as_me:$LINENO: checking for Java to native code compiler" >&5
- echo $ECHO_N "checking for Java to native code compiler... $ECHO_C" >&6
-   # Search for the gcj command or use the one provided by the user.
-@@ -3161,6 +3171,7 @@
-     HAVE_GCJ=
-   fi
- 
-+fi
- 
- 
- 
-@@ -3423,6 +3434,10 @@
- 
- 
- 
-+if test "$with_java" = no ; then
-+    echo "Skipping Java compiler checks..."
-+else
-+
-   echo "$as_me:$LINENO: checking for Java compiler" >&5
- echo $ECHO_N "checking for Java compiler... $ECHO_C" >&6
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -3646,6 +3661,8 @@
- echo "${ECHO_T}no" >&6
- fi
- 
-+fi
-+
- if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
-   BUILDJAVA=yes
- else
-@@ -3653,6 +3670,10 @@
- fi
- 
- 
-+if test "$with_java" = no ; then
-+    echo "Skipping Java VM checks..."
-+else
-+
- 
-   echo "$as_me:$LINENO: checking for Java virtual machine" >&5
- echo $ECHO_N "checking for Java virtual machine... $ECHO_C" >&6
-@@ -3840,7 +3861,7 @@
- echo "${ECHO_T}$ac_result" >&6
- 
- 
--
-+fi
- 
- 
- 
diff --git a/sys-devel/gettext/files/gettext-0.14.1-no-java-tests.patch b/sys-devel/gettext/files/gettext-0.14.1-no-java-tests.patch
deleted file mode 100644
index 1c71b9292d65..000000000000
--- a/sys-devel/gettext/files/gettext-0.14.1-no-java-tests.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -Nura gettext-0.14.1/gettext-tools/tests/Makefile.am gettext-0.14.1.sparc/gettext-tools/tests/Makefile.am
---- gettext-0.14.1/gettext-tools/tests/Makefile.am	2004-01-15 08:30:24.000000000 -0300
-+++ gettext-0.14.1.sparc/gettext-tools/tests/Makefile.am	2004-10-05 23:10:19.000000000 -0300
-@@ -52,7 +52,6 @@
- 	msgmerge-update-1 msgmerge-update-2 msgmerge-update-3 \
- 	msgunfmt-1 \
- 	msgunfmt-csharp-1 \
--	msgunfmt-java-1 \
- 	msgunfmt-properties-1 \
- 	msgunfmt-tcl-1 \
- 	msguniq-1 msguniq-2 msguniq-3 msguniq-4 \
-@@ -65,8 +64,6 @@
- 	xgettext-csharp-4 xgettext-csharp-5 \
- 	xgettext-elisp-1 \
- 	xgettext-glade-1 xgettext-glade-2 xgettext-glade-3 \
--	xgettext-java-1 xgettext-java-2 xgettext-java-3 xgettext-java-4 \
--	xgettext-java-5 \
- 	xgettext-librep-1 \
- 	xgettext-lisp-1 \
- 	xgettext-objc-1 xgettext-objc-2 \
-@@ -86,7 +83,6 @@
- 	format-csharp-1 format-csharp-2 \
- 	format-elisp-1 format-elisp-2 \
- 	format-gcc-internal-1 format-gcc-internal-2 \
--	format-java-1 format-java-2 \
- 	format-librep-1 format-librep-2 \
- 	format-lisp-1 format-lisp-2 \
- 	format-php-1 format-php-2 \
-@@ -102,7 +98,7 @@
- 	plural-1 plural-2 \
- 	lang-c lang-c++ lang-objc lang-sh lang-bash lang-python-1 \
- 	lang-python-2 lang-clisp lang-elisp lang-librep lang-smalltalk \
--	lang-java lang-csharp lang-gawk lang-pascal lang-ycp lang-tcl \
-+	lang-csharp lang-gawk lang-pascal lang-ycp lang-tcl \
- 	lang-perl-1 lang-perl-2 lang-php lang-po lang-rst
- 
- EXTRA_DIST += $(TESTS) \
-diff -Nura gettext-0.14.1/gettext-tools/tests/Makefile.in gettext-0.14.1.sparc/gettext-tools/tests/Makefile.in
---- gettext-0.14.1/gettext-tools/tests/Makefile.in	2004-01-29 14:13:39.000000000 -0300
-+++ gettext-0.14.1.sparc/gettext-tools/tests/Makefile.in	2004-10-05 23:10:06.000000000 -0300
-@@ -381,7 +381,6 @@
- 	msgmerge-update-1 msgmerge-update-2 msgmerge-update-3 \
- 	msgunfmt-1 \
- 	msgunfmt-csharp-1 \
--	msgunfmt-java-1 \
- 	msgunfmt-properties-1 \
- 	msgunfmt-tcl-1 \
- 	msguniq-1 msguniq-2 msguniq-3 msguniq-4 \
-@@ -394,8 +393,6 @@
- 	xgettext-csharp-4 xgettext-csharp-5 \
- 	xgettext-elisp-1 \
- 	xgettext-glade-1 xgettext-glade-2 xgettext-glade-3 \
--	xgettext-java-1 xgettext-java-2 xgettext-java-3 xgettext-java-4 \
--	xgettext-java-5 \
- 	xgettext-librep-1 \
- 	xgettext-lisp-1 \
- 	xgettext-objc-1 xgettext-objc-2 \
-@@ -415,7 +412,6 @@
- 	format-csharp-1 format-csharp-2 \
- 	format-elisp-1 format-elisp-2 \
- 	format-gcc-internal-1 format-gcc-internal-2 \
--	format-java-1 format-java-2 \
- 	format-librep-1 format-librep-2 \
- 	format-lisp-1 format-lisp-2 \
- 	format-php-1 format-php-2 \
-@@ -431,7 +427,7 @@
- 	plural-1 plural-2 \
- 	lang-c lang-c++ lang-objc lang-sh lang-bash lang-python-1 \
- 	lang-python-2 lang-clisp lang-elisp lang-librep lang-smalltalk \
--	lang-java lang-csharp lang-gawk lang-pascal lang-ycp lang-tcl \
-+	lang-csharp lang-gawk lang-pascal lang-ycp lang-tcl \
- 	lang-perl-1 lang-perl-2 lang-php lang-po lang-rst
- 
- 
diff --git a/sys-devel/gettext/files/gettext-0.14.1-tempfile.patch b/sys-devel/gettext/files/gettext-0.14.1-tempfile.patch
deleted file mode 100644
index 78de04610918..000000000000
--- a/sys-devel/gettext/files/gettext-0.14.1-tempfile.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -ur gettext-0.14.1.orig/gettext-tools/misc/autopoint.in gettext-0.14.1/gettext-tools/misc/autopoint.in
---- gettext-0.14.1.orig/gettext-tools/misc/autopoint.in	2004-01-29 20:17:27.000000000 +0100
-+++ gettext-0.14.1/gettext-tools/misc/autopoint.in	2004-09-20 10:26:14.000000000 +0200
-@@ -39,14 +39,7 @@
-     */* | *\\*) ;;
-     *) # Need to look in the PATH.
-       if test "${PATH_SEPARATOR+set}" != set; then
--        { echo "#! /bin/sh"; echo "exit 0"; } > /tmp/conf$$.sh
--        chmod +x /tmp/conf$$.sh
--        if (PATH="/nonexistent;/tmp"; conf$$.sh) >/dev/null 2>&1; then
--          PATH_SEPARATOR=';'
--        else
--          PATH_SEPARATOR=:
--        fi
--        rm -f /tmp/conf$$.sh
-+        PATH_SEPARATOR=:
-       fi
-       save_IFS="$IFS"; IFS="$PATH_SEPARATOR"
-       for dir in $PATH; do
-@@ -318,7 +311,15 @@
- cvs_dir=tmpcvs$$
- work_dir=tmpwrk$$
- mkdir "$cvs_dir"
-+if [ $? -ne 0 ]; then
-+  echo "ERROR making $cvs_dir"
-+  exit 1
-+fi
- mkdir "$work_dir"
-+if [ $? -ne 0 ]; then
-+  echo "ERROR making $work_dir"
-+  exit 1
-+fi
- CVSROOT="$srcdir/$cvs_dir"
- export CVSROOT
- unset CVS_CLIENT_LOG
-@@ -384,8 +385,7 @@
- # original - too great risk of version mismatch.
- if test -z "$force"; then
-   mismatch=
--  mismatchfile="${TMPDIR-/tmp}"/autopoint$$.diff
--  rm -f "$mismatchfile"
-+  mismatchfile="`mktemp -t autopoint.diff.XXXXXX`"
-   for file in `find "$work_dir/archive" -type f -print | sed -e "s,^$work_dir/archive/,," | LC_ALL=C sort`; do
-     func_destfile "$file"
-     if test -n "$destfile"; then
-@@ -417,6 +417,10 @@
-     # Recompute base. It was clobbered by the recursive call.
-     base=`echo "$1" | sed -e 's,/[^/]*$,,'`
-     test -d "$base" || { echo "Creating directory $base"; mkdir "$base"; }
-+    if [ $? -ne 0 ]; then
-+      echo "ERROR making directory $base"
-+      exit 1
-+    fi
-   fi
- }
- 
-diff -ur gettext-0.14.1.orig/gettext-tools/misc/gettextize.in gettext-0.14.1/gettext-tools/misc/gettextize.in
---- gettext-0.14.1.orig/gettext-tools/misc/gettextize.in	2004-01-20 12:30:06.000000000 +0100
-+++ gettext-0.14.1/gettext-tools/misc/gettextize.in	2004-09-20 10:22:39.000000000 +0200
-@@ -39,14 +39,7 @@
-     */* | *\\*) ;;
-     *) # Need to look in the PATH.
-       if test "${PATH_SEPARATOR+set}" != set; then
--        { echo "#! /bin/sh"; echo "exit 0"; } > /tmp/conf$$.sh
--        chmod +x /tmp/conf$$.sh
--        if (PATH="/nonexistent;/tmp"; conf$$.sh) >/dev/null 2>&1; then
--          PATH_SEPARATOR=';'
--        else
--          PATH_SEPARATOR=:
--        fi
--        rm -f /tmp/conf$$.sh
-+        PATH_SEPARATOR=:
-       fi
-       save_IFS="$IFS"; IFS="$PATH_SEPARATOR"
-       for dir in $PATH; do
diff --git a/sys-devel/gettext/files/gettext-0.14.1-without_java.patch b/sys-devel/gettext/files/gettext-0.14.1-without_java.patch
deleted file mode 100644
index d60dde9dcbc6..000000000000
--- a/sys-devel/gettext/files/gettext-0.14.1-without_java.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-Submitted By: Tushar Teredesai <tushar@linuxfromscratch.org>
-Date: 2003-11-15
-Initial Package Version: 0.12.1
-Origin: None
-Description: Adds logic to bypass checking for java/gcj. This is useful
-when building gettext in Ch 5 (If java is found on the host, gettext build
-libs that link to the host and also causes failure of some tests during make check).
-To bypass Java checks, pass the option --without-java to configure.
-diff -ur gettext-0.12.1.orig/gettext-runtime/configure gettext-0.12.1/gettext-runtime/configure
---- gettext-0.12.1.orig/gettext-runtime/configure	2003-05-22 08:38:47.000000000 -0500
-+++ gettext-0.12.1/gettext-runtime/configure	2003-10-15 18:20:49.000000000 -0600
-@@ -3268,6 +3268,16 @@
- 
- 
- 
-+if test "${with_java+set}" = set; then
-+  withval="$with_java"
-+  test "$withval" = no || with_java=yes
-+else
-+  with_java=yes
-+fi;
-+if test "$with_java" = no ; then
-+    echo "Skipping Java compiler checks..."
-+else
-+
-   echo "$as_me:$LINENO: checking for Java compiler" >&5
- echo $ECHO_N "checking for Java compiler... $ECHO_C" >&6
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -3490,6 +3500,7 @@
-   echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
-+fi
- 
- if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
-   BUILDJAVA=yes
-diff -ur gettext-0.12.1.orig/gettext-tools/configure gettext-0.12.1/gettext-tools/configure
---- gettext-0.12.1.orig/gettext-tools/configure	2003-05-22 08:40:24.000000000 -0500
-+++ gettext-0.12.1/gettext-tools/configure	2003-10-15 18:21:15.000000000 -0600
-@@ -3070,6 +3070,16 @@
- 
- 
- 
-+if test "${with_java+set}" = set; then
-+  withval="$with_java"
-+  test "$withval" = no || with_java=yes
-+else
-+  with_java=yes
-+fi;
-+if test "$with_java" = no ; then
-+    echo "Skipping Java native compiler checks..."
-+else
-+
-   echo "$as_me:$LINENO: checking for Java to native code compiler" >&5
- echo $ECHO_N "checking for Java to native code compiler... $ECHO_C" >&6
-   # Search for the gcj command or use the one provided by the user.
-@@ -3161,6 +3171,7 @@
-     HAVE_GCJ=
-   fi
- 
-+fi
- 
- 
- 
-@@ -3423,6 +3434,10 @@
- 
- 
- 
-+if test "$with_java" = no ; then
-+    echo "Skipping Java compiler checks..."
-+else
-+
-   echo "$as_me:$LINENO: checking for Java compiler" >&5
- echo $ECHO_N "checking for Java compiler... $ECHO_C" >&6
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -3646,6 +3661,8 @@
- echo "${ECHO_T}no" >&6
- fi
- 
-+fi
-+
- if test -n "$HAVE_JAVACOMP" && test -n "$JAR"; then
-   BUILDJAVA=yes
- else
-@@ -3653,6 +3670,10 @@
- fi
- 
- 
-+if test "$with_java" = no ; then
-+    echo "Skipping Java VM checks..."
-+else
-+
- 
-   echo "$as_me:$LINENO: checking for Java virtual machine" >&5
- echo $ECHO_N "checking for Java virtual machine... $ECHO_C" >&6
-@@ -3840,7 +3861,7 @@
- echo "${ECHO_T}$ac_result" >&6
- 
- 
--
-+fi
- 
- 
- 
diff --git a/sys-devel/gettext/files/gettext-0.14.2-no-java-tests.patch b/sys-devel/gettext/files/gettext-0.14.2-no-java-tests.patch
deleted file mode 100644
index 60e074825600..000000000000
--- a/sys-devel/gettext/files/gettext-0.14.2-no-java-tests.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- gettext-0.14.2/gettext-tools/tests/Makefile.am
-+++ gettext-0.14.2/gettext-tools/tests/Makefile.am
-@@ -53,7 +53,6 @@
- 	msgmerge-update-1 msgmerge-update-2 msgmerge-update-3 \
- 	msgunfmt-1 \
- 	msgunfmt-csharp-1 \
--	msgunfmt-java-1 \
- 	msgunfmt-properties-1 \
- 	msgunfmt-tcl-1 \
- 	msguniq-1 msguniq-2 msguniq-3 msguniq-4 \
-@@ -66,8 +65,6 @@
- 	xgettext-csharp-4 xgettext-csharp-5 \
- 	xgettext-elisp-1 \
- 	xgettext-glade-1 xgettext-glade-2 xgettext-glade-3 \
--	xgettext-java-1 xgettext-java-2 xgettext-java-3 xgettext-java-4 \
--	xgettext-java-5 \
- 	xgettext-librep-1 \
- 	xgettext-lisp-1 \
- 	xgettext-objc-1 xgettext-objc-2 \
-@@ -88,7 +85,6 @@
- 	format-csharp-1 format-csharp-2 \
- 	format-elisp-1 format-elisp-2 \
- 	format-gcc-internal-1 format-gcc-internal-2 \
--	format-java-1 format-java-2 \
- 	format-librep-1 format-librep-2 \
- 	format-lisp-1 format-lisp-2 \
- 	format-php-1 format-php-2 \
-@@ -105,7 +101,7 @@
- 	plural-1 plural-2 \
- 	lang-c lang-c++ lang-objc lang-sh lang-bash lang-python-1 \
- 	lang-python-2 lang-clisp lang-elisp lang-librep lang-guile \
--	lang-smalltalk lang-java lang-csharp lang-gawk lang-pascal \
-+	lang-smalltalk lang-csharp lang-gawk lang-pascal \
- 	lang-ycp lang-tcl lang-perl-1 lang-perl-2 lang-php lang-po lang-rst
- 
- EXTRA_DIST += $(TESTS) \
---- gettext-0.14.2/gettext-tools/tests/Makefile.in
-+++ gettext-0.14.2/gettext-tools/tests/Makefile.in
-@@ -397,7 +397,6 @@
- 	msgmerge-update-1 msgmerge-update-2 msgmerge-update-3 \
- 	msgunfmt-1 \
- 	msgunfmt-csharp-1 \
--	msgunfmt-java-1 \
- 	msgunfmt-properties-1 \
- 	msgunfmt-tcl-1 \
- 	msguniq-1 msguniq-2 msguniq-3 msguniq-4 \
-@@ -410,8 +409,6 @@
- 	xgettext-csharp-4 xgettext-csharp-5 \
- 	xgettext-elisp-1 \
- 	xgettext-glade-1 xgettext-glade-2 xgettext-glade-3 \
--	xgettext-java-1 xgettext-java-2 xgettext-java-3 xgettext-java-4 \
--	xgettext-java-5 \
- 	xgettext-librep-1 \
- 	xgettext-lisp-1 \
- 	xgettext-objc-1 xgettext-objc-2 \
-@@ -432,7 +429,6 @@
- 	format-csharp-1 format-csharp-2 \
- 	format-elisp-1 format-elisp-2 \
- 	format-gcc-internal-1 format-gcc-internal-2 \
--	format-java-1 format-java-2 \
- 	format-librep-1 format-librep-2 \
- 	format-lisp-1 format-lisp-2 \
- 	format-php-1 format-php-2 \
-@@ -449,7 +445,7 @@
- 	plural-1 plural-2 \
- 	lang-c lang-c++ lang-objc lang-sh lang-bash lang-python-1 \
- 	lang-python-2 lang-clisp lang-elisp lang-librep lang-guile \
--	lang-smalltalk lang-java lang-csharp lang-gawk lang-pascal \
-+	lang-smalltalk lang-csharp lang-gawk lang-pascal \
- 	lang-ycp lang-tcl lang-perl-1 lang-perl-2 lang-php lang-po lang-rst
- 
-