# HG changeset patch
# User Binki <ohnobinki@ohnopublishing.net>
# Date 2009-07-20 23:21:31
# Node ID 0562f4921050f2d77789b486e7139ceee0d52d9d
# Parent  85c5388b6ac764b63df95ae3335f687c2fc3b50e

dev-java/gcj: removed

diff --git a/dev-java/gcj/.svn/all-wcprops b/dev-java/gcj/.svn/all-wcprops
deleted file mode 100644
--- a/dev-java/gcj/.svn/all-wcprops
+++ /dev/null
@@ -1,17 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 53
-/svn/proj/java/!svn/ver/6075/gcj-overlay/dev-java/gcj
-END
-Manifest
-K 25
-svn:wc:ra_dav:version-url
-V 62
-/svn/proj/java/!svn/ver/6075/gcj-overlay/dev-java/gcj/Manifest
-END
-gcj-4.3.0_alpha20080313.ebuild
-K 25
-svn:wc:ra_dav:version-url
-V 84
-/svn/proj/java/!svn/ver/6075/gcj-overlay/dev-java/gcj/gcj-4.3.0_alpha20080313.ebuild
-END
diff --git a/dev-java/gcj/.svn/entries b/dev-java/gcj/.svn/entries
deleted file mode 100644
--- a/dev-java/gcj/.svn/entries
+++ /dev/null
@@ -1,55 +0,0 @@
-8
-
-dir
-6236
-http://overlays.gentoo.org/svn/proj/java/gcj-overlay/dev-java/gcj
-http://overlays.gentoo.org/svn/proj/java
-
-
-
-2008-03-16T14:19:38.237731Z
-6075
-geki
-
-
-svn:special svn:externals svn:needs-lock
-
-
-
-
-
-
-
-
-
-
-
-fe387f86-7aec-0310-8f44-a148a97195aa
-
-files
-dir
-
-Manifest
-file
-
-
-
-
-2008-03-18T15:54:34.000000Z
-d7125f29ede1f894355ffb7a7c0d94c1
-2008-03-16T14:19:38.237731Z
-6075
-geki
-
-gcj-4.3.0_alpha20080313.ebuild
-file
-
-
-
-
-2008-03-18T15:54:34.000000Z
-a415d345a11f5e57530dbe916130d14a
-2008-03-16T14:19:38.237731Z
-6075
-geki
-
diff --git a/dev-java/gcj/.svn/format b/dev-java/gcj/.svn/format
deleted file mode 100644
--- a/dev-java/gcj/.svn/format
+++ /dev/null
@@ -1,1 +0,0 @@
-8
diff --git a/dev-java/gcj/.svn/text-base/Manifest.svn-base b/dev-java/gcj/.svn/text-base/Manifest.svn-base
deleted file mode 100644
--- a/dev-java/gcj/.svn/text-base/Manifest.svn-base
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX gcc-configure-LANG.patch 2052 RMD160 91f5b90600dfccb10c4e2308a5a1485275fdfeee SHA1 56ecd1d6f2e4bd0b35ac108be72a4f6f60212c38 SHA256 63de6d2dcfe14f21d147abeb1390405b9220c03f8e968f482d4b4c1cf279c88b
-AUX gcj-4.3-tools.jar-path.diff 1808 RMD160 d969cc6765fced33fb6d609dc03052293c426249 SHA1 b715c4ee085edf5d479fd1caa14069994987a53c SHA256 db4ed3ba52618e6ce80cb540d82aded41229fe339ecc3bb8a1fa29a88949de6b
-AUX gcj-config 1948 RMD160 a20ecc91ecf43dd15a78d3bfde270811646906a9 SHA1 9061c1c7f4af450616235a655f21a10b49cc43c3 SHA256 b4827c03c23f46c8227186bfa9c8178c34153caf280338bcef8843d2aeab5c51
-AUX gentoo-multilib-fixincludes.diff 1141 RMD160 fe54fe912f6bf57017d85c6fac57e932c80d53ee SHA1 a48a6bd5e4a013a81d6fb26f9b0df793b5d2b5c1 SHA256 02f010daefd560fd348f7746a8763fe55fc0b6a55bf9580c15ca4c03d83507ea
-AUX gjar.diff 4149 RMD160 3abf0f0671f2d2eeb06b8b5e054bc5fa00ce3c53 SHA1 d37c0125af6870861d1a0811b4d77d5ef3ae857e SHA256 06796062f47842520a3bce838aecf376ed0f8dc13f61fe46f1b340e96ec7ead4
-AUX rebuild-classmap-db 2846 RMD160 e697aa36a7dd1cba031ef4f78e99a50527e76eb0 SHA1 66e43a6ffb218cdaafae44ed183f94914dac4ad3 SHA256 ef947736442c22867c988afa21e3cfc5576bd1cdd37c4fd4c84632e1f6458c72
-DIST gcc-4.3-20080313.tar.bz2 56234118 RMD160 0cc391d971899366a42e42e1a87084c6b8d4454b SHA1 8ff200972c8393689bd166f09ab8b885c0364daf SHA256 cc9ec42a9b7b4f43cafbeeee48f8c9f9abfcc7810f3b20e0dcfb4b70041d77f4
-EBUILD gcj-4.3.0_alpha20080313.ebuild 1518 RMD160 f8fb1aa41bf01b1fddb4d7e4206b9290fdd75550 SHA1 a6f5b2e7e196f4c0a44e81410d47213e7a08ddc8 SHA256 32bf50d1d6ae44f3470d8f5261cd4798485bae1c71b1d1a1ea86845cca2d44fe
diff --git a/dev-java/gcj/.svn/text-base/gcj-4.3.0_alpha20080313.ebuild.svn-base b/dev-java/gcj/.svn/text-base/gcj-4.3.0_alpha20080313.ebuild.svn-base
deleted file mode 100644
--- a/dev-java/gcj/.svn/text-base/gcj-4.3.0_alpha20080313.ebuild.svn-base
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Header: $
-
-ECJ_VER="3.4"
-
-inherit gcc-java-2
-
-DESCRIPTION="The GNU Compiler for the Java(tm) Programming Language"
-HOMEPAGE="http://gcc.gnu.org/java/"
-
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-SLOT="4.3"
-
-RDEPEND="virtual/libc
-	virtual/libiconv
-	=dev-java/eclipse-ecj-${ECJ_VER}*
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/gmp-4.2.1
-	>=dev-libs/mpfr-2.2.0_p10
-	!nogtk? ( >=x11-libs/gtk+-2.8
-		>=x11-libs/cairo-1.0.2
-		x11-libs/pango
-		x11-libs/libXt
-		x11-libs/libX11
-		x11-libs/libXtst
-		x11-proto/xproto
-		x11-proto/xextproto )
-	gconf? ( >=gnome-base/gconf-2.14 )
-	>=media-libs/libart_lgpl-2.1
-	>=sys-libs/ncurses-5.2-r2
-	nls? ( sys-devel/gettext )"
-DEPEND="${RDEPEND}
-	>=sys-apps/texinfo-4.2-r4
-	>=sys-devel/bison-1.875
-	>=sys-devel/binutils-2.16.1"
-
-pkg_setup() {
-	gcj_pkg_setup
-}
-
-src_unpack() {
-	gcj_src_unpack
-}
-
-src_compile() {
-	gcj_src_compile
-}
-
-pkg_preinst() {
-	:;
-}
-
-src_install() {
-	gcj_src_install
-
-	# copy scripts
-	exeinto /usr/bin
-	doexe ${FILESDIR}/gcj-config
-	doexe ${FILESDIR}/rebuild-classmap-db
-}
-
-pkg_postinst() {
-	ewarn "This gcj ebuild is provided for your convenience, and the use"
-	ewarn "of this JDK replacement is not supported by the Gentoo Developers."
-	ewarn
-	ewarn "You are on your own using this! If you have any interesting news"
-	ewarn "let us know: http://forums.gentoo.org/viewtopic-t-379693.html"
-
-	gcj-config ${P}
-}
-
-pkg_prerm() {
-	:;
-}
-
-pkg_postrm() {
-	:;
-}
diff --git a/dev-java/gcj/Manifest b/dev-java/gcj/Manifest
deleted file mode 100644
--- a/dev-java/gcj/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX classpath_javax.swing.text.PlainView_divide_zero.patch 1302 RMD160 9f52d6e0b98eca8c4c8027d75ae2246db83baee6 SHA1 03b2eafb7eab826be4a9722b3f7a6c1c8b2b37c3 SHA256 be2fbca542a81f78ca141f08b43b0e79750aaf5c670b7945eb65138d1a0bbb6c
-AUX gcc-configure-LANG.patch 2052 RMD160 91f5b90600dfccb10c4e2308a5a1485275fdfeee SHA1 56ecd1d6f2e4bd0b35ac108be72a4f6f60212c38 SHA256 63de6d2dcfe14f21d147abeb1390405b9220c03f8e968f482d4b4c1cf279c88b
-AUX gcj-4.3-tools.jar-path.diff 1808 RMD160 d969cc6765fced33fb6d609dc03052293c426249 SHA1 b715c4ee085edf5d479fd1caa14069994987a53c SHA256 db4ed3ba52618e6ce80cb540d82aded41229fe339ecc3bb8a1fa29a88949de6b
-AUX gcj-config 1948 RMD160 a20ecc91ecf43dd15a78d3bfde270811646906a9 SHA1 9061c1c7f4af450616235a655f21a10b49cc43c3 SHA256 b4827c03c23f46c8227186bfa9c8178c34153caf280338bcef8843d2aeab5c51
-AUX gentoo-multilib-fixincludes.diff 1141 RMD160 fe54fe912f6bf57017d85c6fac57e932c80d53ee SHA1 a48a6bd5e4a013a81d6fb26f9b0df793b5d2b5c1 SHA256 02f010daefd560fd348f7746a8763fe55fc0b6a55bf9580c15ca4c03d83507ea
-AUX gjar.diff 4149 RMD160 3abf0f0671f2d2eeb06b8b5e054bc5fa00ce3c53 SHA1 d37c0125af6870861d1a0811b4d77d5ef3ae857e SHA256 06796062f47842520a3bce838aecf376ed0f8dc13f61fe46f1b340e96ec7ead4
-AUX rebuild-classmap-db 2846 RMD160 e697aa36a7dd1cba031ef4f78e99a50527e76eb0 SHA1 66e43a6ffb218cdaafae44ed183f94914dac4ad3 SHA256 ef947736442c22867c988afa21e3cfc5576bd1cdd37c4fd4c84632e1f6458c72
-DIST gcc-4.3-20080313.tar.bz2 56234118 RMD160 0cc391d971899366a42e42e1a87084c6b8d4454b SHA1 8ff200972c8393689bd166f09ab8b885c0364daf SHA256 cc9ec42a9b7b4f43cafbeeee48f8c9f9abfcc7810f3b20e0dcfb4b70041d77f4
-EBUILD gcj-4.3.0_alpha20080313-r1.ebuild 1602 RMD160 72a70e5658d9af788467f57d327a17c02090fbdc SHA1 0ab68c82dde67b4313ffc4fda6f9e955362531b1 SHA256 0ec73a78b1c299501aa3adf510f2b998941ce623749127a3e37a2c84f8eadc31
diff --git a/dev-java/gcj/files/.svn/all-wcprops b/dev-java/gcj/files/.svn/all-wcprops
deleted file mode 100644
--- a/dev-java/gcj/files/.svn/all-wcprops
+++ /dev/null
@@ -1,41 +0,0 @@
-K 25
-svn:wc:ra_dav:version-url
-V 59
-/svn/proj/java/!svn/ver/5565/gcj-overlay/dev-java/gcj/files
-END
-gcj-4.3-tools.jar-path.diff
-K 25
-svn:wc:ra_dav:version-url
-V 87
-/svn/proj/java/!svn/ver/4021/gcj-overlay/dev-java/gcj/files/gcj-4.3-tools.jar-path.diff
-END
-gcj-config
-K 25
-svn:wc:ra_dav:version-url
-V 70
-/svn/proj/java/!svn/ver/5565/gcj-overlay/dev-java/gcj/files/gcj-config
-END
-gcc-configure-LANG.patch
-K 25
-svn:wc:ra_dav:version-url
-V 84
-/svn/proj/java/!svn/ver/2507/gcj-overlay/dev-java/gcj/files/gcc-configure-LANG.patch
-END
-gjar.diff
-K 25
-svn:wc:ra_dav:version-url
-V 69
-/svn/proj/java/!svn/ver/2700/gcj-overlay/dev-java/gcj/files/gjar.diff
-END
-rebuild-classmap-db
-K 25
-svn:wc:ra_dav:version-url
-V 79
-/svn/proj/java/!svn/ver/4600/gcj-overlay/dev-java/gcj/files/rebuild-classmap-db
-END
-gentoo-multilib-fixincludes.diff
-K 25
-svn:wc:ra_dav:version-url
-V 92
-/svn/proj/java/!svn/ver/5325/gcj-overlay/dev-java/gcj/files/gentoo-multilib-fixincludes.diff
-END
diff --git a/dev-java/gcj/files/.svn/entries b/dev-java/gcj/files/.svn/entries
deleted file mode 100644
--- a/dev-java/gcj/files/.svn/entries
+++ /dev/null
@@ -1,102 +0,0 @@
-8
-
-dir
-6236
-http://overlays.gentoo.org/svn/proj/java/gcj-overlay/dev-java/gcj/files
-http://overlays.gentoo.org/svn/proj/java
-
-
-
-2007-10-29T16:25:55.769718Z
-5565
-geki
-
-
-svn:special svn:externals svn:needs-lock
-
-
-
-
-
-
-
-
-
-
-
-fe387f86-7aec-0310-8f44-a148a97195aa
-
-gcj-4.3-tools.jar-path.diff
-file
-
-
-
-
-2008-03-18T15:54:34.000000Z
-602eb960c7752cc4877309e691110c06
-2007-03-17T17:49:28.561065Z
-4021
-geki
-
-gcj-config
-file
-
-
-
-
-2008-03-18T15:54:34.000000Z
-983dba8a32e9740c90abf9e0648ea1ff
-2007-10-29T16:25:55.769718Z
-5565
-geki
-has-props
-
-gcc-configure-LANG.patch
-file
-
-
-
-
-2008-03-18T15:54:34.000000Z
-e1d606df0fb23c52c4ec513d52fa50ab
-2006-07-22T17:34:59.296351Z
-2507
-geki
-
-gjar.diff
-file
-
-
-
-
-2008-03-18T15:54:34.000000Z
-aa0f410921144d59a239c7d434928b5c
-2006-09-04T17:18:30.239227Z
-2700
-geki
-
-rebuild-classmap-db
-file
-
-
-
-
-2008-03-18T15:54:34.000000Z
-4583c161b4ebc92cc68e7aa06a28d108
-2007-05-10T12:51:18.267340Z
-4600
-geki
-has-props
-
-gentoo-multilib-fixincludes.diff
-file
-
-
-
-
-2008-03-18T15:54:34.000000Z
-96c60ed54d3adee3b78b6d69f570f15a
-2007-08-23T19:23:19.075376Z
-5325
-geki
-
diff --git a/dev-java/gcj/files/.svn/format b/dev-java/gcj/files/.svn/format
deleted file mode 100644
--- a/dev-java/gcj/files/.svn/format
+++ /dev/null
@@ -1,1 +0,0 @@
-8
diff --git a/dev-java/gcj/files/.svn/prop-base/gcj-config.svn-base b/dev-java/gcj/files/.svn/prop-base/gcj-config.svn-base
deleted file mode 100644
--- a/dev-java/gcj/files/.svn/prop-base/gcj-config.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 14
-svn:executable
-V 1
-*
-END
diff --git a/dev-java/gcj/files/.svn/prop-base/rebuild-classmap-db.svn-base b/dev-java/gcj/files/.svn/prop-base/rebuild-classmap-db.svn-base
deleted file mode 100644
--- a/dev-java/gcj/files/.svn/prop-base/rebuild-classmap-db.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 14
-svn:executable
-V 1
-*
-END
diff --git a/dev-java/gcj/files/.svn/text-base/gcc-configure-LANG.patch.svn-base b/dev-java/gcj/files/.svn/text-base/gcc-configure-LANG.patch.svn-base
deleted file mode 100644
--- a/dev-java/gcj/files/.svn/text-base/gcc-configure-LANG.patch.svn-base
+++ /dev/null
@@ -1,64 +0,0 @@
-The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in 
-option parsing, it may break.
-
-http://bugs.gentoo.org/103483
-
---- configure
-+++ configure
-@@ -54,6 +54,19 @@
- infodir='${prefix}/info'
- mandir='${prefix}/man'
- 
-+# NLS nuisances.
-+for as_var in \
-+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+  LC_TELEPHONE LC_TIME
-+do
-+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+    eval $as_var=C; export $as_var
-+  else
-+    unset $as_var
-+  fi
-+done
-+
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-@@ -452,16 +463,6 @@
-   esac
- done
- 
--# NLS nuisances.
--# Only set these to C if already set.  These must not be set unconditionally
--# because not all systems understand e.g. LANG=C (notably SCO).
--# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
--# Non-C LC_CTYPE values break the ctype check.
--if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
--if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
--if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
--
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
- rm -rf conftest* confdefs.h
- # AIX cpp loses on an empty file, so make sure it contains at least a newline.
-@@ -1850,6 +1850,19 @@
- # Compiler output produced by configure, useful for debugging
- # configure, is in ./config.log if it exists.
- 
-+# NLS nuisances.
-+for as_var in \
-+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+  LC_TELEPHONE LC_TIME
-+do
-+  if (set +x; test -z "`(eval \$as_var=C; export \$as_var) 2>&1`"); then
-+    eval \$as_var=C; export \$as_var
-+  else
-+    unset \$as_var
-+  fi
-+done
-+
- ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
- for ac_option
- do
diff --git a/dev-java/gcj/files/.svn/text-base/gcj-4.3-tools.jar-path.diff.svn-base b/dev-java/gcj/files/.svn/text-base/gcj-4.3-tools.jar-path.diff.svn-base
deleted file mode 100644
--- a/dev-java/gcj/files/.svn/text-base/gcj-4.3-tools.jar-path.diff.svn-base
+++ /dev/null
@@ -1,39 +0,0 @@
---- libjava/classpath/tools/Makefile.am.orig	2007-03-17 18:43:46.000000000 +0100
-+++ libjava/classpath/tools/Makefile.am	2007-03-17 18:44:19.000000000 +0100
-@@ -204,13 +204,13 @@
- ## END GCJ LOCAL
- ## First add classpath tools stuff.
- 	(cd classes; \
--	if test "$(ZIP)" != ""; then $(ZIP) -r ../$(TOOLS_ZIP) .; fi; \
--	if test "$(FASTJAR)" != ""; then $(FASTJAR) cf ../$(TOOLS_ZIP) .; fi; \
-+	if test "$(ZIP)" != ""; then $(ZIP) -r ../$(TOOLS_ZIP) *; fi; \
-+	if test "$(FASTJAR)" != ""; then $(FASTJAR) cf ../$(TOOLS_ZIP) *; fi; \
- 	cd ..)
- ## Now add ASM classes.
- 	(cd asm; \
--	if test "$(ZIP)" != ""; then $(ZIP) -u -r ../$(TOOLS_ZIP) .; fi; \
--	if test "$(FASTJAR)" != ""; then $(FASTJAR) uf ../$(TOOLS_ZIP) .; fi; \
-+	if test "$(ZIP)" != ""; then $(ZIP) -u -r ../$(TOOLS_ZIP) *; fi; \
-+	if test "$(FASTJAR)" != ""; then $(FASTJAR) uf ../$(TOOLS_ZIP) *; fi; \
- 	cd ..)
- 	rm -rf asm classes classes.lst asm.lst
- 
---- libjava/classpath/tools/Makefile.in.orig	2007-03-17 18:43:55.000000000 +0100
-+++ libjava/classpath/tools/Makefile.in	2007-03-17 18:44:44.000000000 +0100
-@@ -1121,12 +1121,12 @@
- 	cp -pR $(srcdir)/asm .
- 	cp -pR $(srcdir)/classes .
- 	(cd classes; \
--	if test "$(ZIP)" != ""; then $(ZIP) -r ../$(TOOLS_ZIP) .; fi; \
--	if test "$(FASTJAR)" != ""; then $(FASTJAR) cf ../$(TOOLS_ZIP) .; fi; \
-+	if test "$(ZIP)" != ""; then $(ZIP) -r ../$(TOOLS_ZIP) *; fi; \
-+	if test "$(FASTJAR)" != ""; then $(FASTJAR) cf ../$(TOOLS_ZIP) *; fi; \
- 	cd ..)
- 	(cd asm; \
--	if test "$(ZIP)" != ""; then $(ZIP) -u -r ../$(TOOLS_ZIP) .; fi; \
--	if test "$(FASTJAR)" != ""; then $(FASTJAR) uf ../$(TOOLS_ZIP) .; fi; \
-+	if test "$(ZIP)" != ""; then $(ZIP) -u -r ../$(TOOLS_ZIP) *; fi; \
-+	if test "$(FASTJAR)" != ""; then $(FASTJAR) uf ../$(TOOLS_ZIP) *; fi; \
- 	cd ..)
- 	rm -rf asm classes classes.lst asm.lst
- 
diff --git a/dev-java/gcj/files/.svn/text-base/gcj-config.svn-base b/dev-java/gcj/files/.svn/text-base/gcj-config.svn-base
deleted file mode 100644
--- a/dev-java/gcj/files/.svn/text-base/gcj-config.svn-base
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh
-
-if [[ ! -f /etc/env.d/99gcj ]] ; then
-	echo "Setting correct LDPATH ..."
-	rm -rf /etc/env.d/99gcj
-	echo "LDPATH=\"/usr/lib/gcj/lib\"" > /etc/env.d/99gcj
-	/usr/sbin/env-update || echo "ERROR: env-update failed?!"
-fi
-
-LIBDIR="lib"
-INSTPATH="/usr/${LIBDIR}"
-CONFFILE="/usr/share/gcj-config/conf"
-if [[ ! -f "${CONFFILE}" ]] ; then
-	echo "Configuration file missing!"
-	echo "Generating dummy configuration file."
-	echo
-	echo "You have to set your prefered GCJ now!"
-	echo
-	echo "Run:"
-	echo "# gcj-config -l"
-	echo "# gcj-config gcj-<VERSION>"
-
-	mkdir -p $(dirname ${CONFFILE})
-	echo "current=\"${INSTPATH}/gcj-4.1.0/bin\"" > ${CONFFILE}
-
-	exit 1
-fi
-
-GCJ="$(sed -n -r -e "s:^current=.*/(gcj-.*)/.*:\1:p" ${CONFFILE})"
-if [[ ${#} -eq 0 ]] ; then
-	echo "Version set: ${GCJ}"
-	echo
-	echo "	List of GCJ installations:	gcj-config -l"
-	echo "	Set GCJ version:		gcj-config gcj-VERSION"
-else
-	case ${1} in
-		--gcj)
-if [[ ${CBUILD} != ${CHOST} ]]; then
-	echo "$(sed -n -r -e "s:current=\"(.*)\":\1:p" ${CONFFILE})/${CHOST}-gcj"
-else
-	echo "$(sed -n -r -e "s:current=\"(.*)\":\1:p" ${CONFFILE})/gcj"
-fi
-;;
-		--dbtool)
-echo "$(sed -n -r -e "s:current=\"(.*)\":\1:p" ${CONFFILE})/gcj-dbtool"
-;;
-		--gij)
-echo "$(sed -n -r -e "s:current=\"(.*)\":\1:p" ${CONFFILE})/gij"
-;;
-		--gjar)
-echo "$(sed -n -r -e "s:current=\"(.*)\":\1:p" ${CONFFILE})/gjar"
-;;
-		-l)
-for v in $(ls -1 ${INSTPATH} | grep gcj-); do
-	[[ ${v} == ${GCJ} ]] && v="${v} *"
-	echo "${v}"
-done
-;;
-		--version)
-echo "$(sed -n -r -e "s:current=\".*gcj-(.*)/.*\":\1:p" ${CONFFILE})"
-;;
-		gcj-*)
-if [[ ${1} == ${GCJ} ]] ; then
-	echo "Already set!"
-else
-	found="no"
-	for v in $(ls -1 ${INSTPATH} | grep gcj-); do
-		[[ ${v} == ${1} ]] && found="yes"
-	done
-
-	if [[ ${found} == "no" ]] ; then
-		echo "${1} not found!"
-	else
-		sed -e "s:${GCJ}:${1}:g" -i ${CONFFILE}
-		rm -f /usr/lib/gcj
-		ln -s ${INSTPATH}/${1} /usr/lib/gcj
-	fi
-fi
-;;
-		*)
-echo "Something wrong you do!"
-exit 1
-;;
-	esac
-fi
-
-exit 0
diff --git a/dev-java/gcj/files/.svn/text-base/gentoo-multilib-fixincludes.diff.svn-base b/dev-java/gcj/files/.svn/text-base/gentoo-multilib-fixincludes.diff.svn-base
deleted file mode 100644
--- a/dev-java/gcj/files/.svn/text-base/gentoo-multilib-fixincludes.diff.svn-base
+++ /dev/null
@@ -1,28 +0,0 @@
---- fixincludes/fixincl.x	2007-07-26 00:51:47.000000000 +0100
-+++ fixincludes/fixincl.x	2007-08-08 00:39:26.000000000 +0100
-@@ -6349,7 +6349,7 @@
-  *  content bypass pattern - skip fix if pattern found
-  */
- tSCC zStdio_Stdarg_HBypass0[] =
--       "include.*(stdarg.h|machine/ansi.h)";
-+       "include.*(stdarg.h|machine/ansi.h)|gentoo-multilib";
- 
- #define    STDIO_STDARG_H_TEST_CT  1
- static tTestDesc aStdio_Stdarg_HTests[] = {
---- fixincludes/inclhack.def	2007-07-26 00:51:47.000000000 +0100
-+++ fixincludes/inclhack.def	2007-08-08 00:18:06.129542000 +0100
-@@ -3457,12 +3457,12 @@
- /*
-  *  Arrange for stdio.h to use stdarg.h to define __gnuc_va_list.
-  *  On 4BSD-derived systems, stdio.h defers to machine/ansi.h; that's
-- *  OK too.
-+ *  OK too.  Gentoo multilib uses a wrapper for stdio.h; skip it.
-  */
- fix = {
-     hackname = stdio_stdarg_h;
-     files    = stdio.h;
--    bypass   = "include.*(stdarg\.h|machine/ansi\.h)";
-+    bypass   = "include.*(stdarg\.h|machine/ansi\.h)|gentoo-multilib";
-     /*
-      * On Solaris 10, this fix is unncessary; <stdio.h> includes
-      * <iso/stdio_iso.h>, which includes <sys/va_list.h>.
diff --git a/dev-java/gcj/files/.svn/text-base/gjar.diff.svn-base b/dev-java/gcj/files/.svn/text-base/gjar.diff.svn-base
deleted file mode 100644
--- a/dev-java/gcj/files/.svn/text-base/gjar.diff.svn-base
+++ /dev/null
@@ -1,97 +0,0 @@
---- libjava/Makefile.am.orig	2006-09-04 17:22:31.000000000 +0200
-+++ libjava/Makefile.am	2006-09-04 17:24:34.000000000 +0200
-@@ -68,7 +68,7 @@
- ## For now, only on native systems.  FIXME.
- if NATIVE
- bin_PROGRAMS = jv-convert gij grmic grmiregistry gcj-dbtool \
--	gappletviewer gjarsigner gkeytool
-+	gappletviewer gjarsigner gkeytool gjar
- 
- ## It is convenient to actually build and install the default database
- ## when gcj-dbtool is available.
-@@ -785,6 +785,17 @@
- gjarsigner_DEPENDENCIES = libgcj-tools.la
- 
- ## This is a dummy definition.
-+gjar_SOURCES =
-+gjar_LDFLAGS = --main=gnu.classpath.tools.jar.Main \
-+	-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
-+gjar_LINK = $(GCJLINK)
-+## See jv_convert_LDADD.
-+gjar_LDADD = -L$(here)/.libs libgcj-tools.la
-+## Depend on the spec file to make sure it is up to date before
-+## linking this program.
-+gjar_DEPENDENCIES = libgcj-tools.la
-+
-+## This is a dummy definition.
- gkeytool_SOURCES =
- gkeytool_LDFLAGS = --main=gnu.classpath.tools.keytool.Main \
- 	-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
---- libjava/Makefile.in.orig	2006-09-04 17:32:46.000000000 +0200
-+++ libjava/Makefile.in	2006-09-04 17:35:34.000000000 +0200
-@@ -46,7 +46,8 @@
- @NATIVE_TRUE@bin_PROGRAMS = jv-convert$(EXEEXT) gij$(EXEEXT) \
- @NATIVE_TRUE@	grmic$(EXEEXT) grmiregistry$(EXEEXT) \
- @NATIVE_TRUE@	gcj-dbtool$(EXEEXT) gappletviewer$(EXEEXT) \
--@NATIVE_TRUE@	gjarsigner$(EXEEXT) gkeytool$(EXEEXT)
-+@NATIVE_TRUE@	gjarsigner$(EXEEXT) gkeytool$(EXEEXT) \
-+@NATIVE_TRUE@	gjar$(EXEEXT)
- @BASH_JAR_TRUE@am__append_4 = scripts/jar
- @USING_GCC_TRUE@am__append_5 = $(WARNINGS)
- @USING_BOEHMGC_TRUE@am__append_6 = boehm.cc
-@@ -391,6 +392,8 @@
- gen_from_JIS_LDADD = $(LDADD)
- am_gij_OBJECTS =
- gij_OBJECTS = $(am_gij_OBJECTS)
-+am_gjar_OBJECTS =
-+gjar_OBJECTS = $(am_gjar_OBJECTS)
- am_gjarsigner_OBJECTS =
- gjarsigner_OBJECTS = $(am_gjarsigner_OBJECTS)
- am_gkeytool_OBJECTS =
-@@ -430,16 +433,17 @@
- 	$(libgcj_la_SOURCES) $(libgcj_bc_la_SOURCES) \
- 	$(libgij_la_SOURCES) $(libjvm_la_SOURCES) \
- 	$(gappletviewer_SOURCES) $(gcj_dbtool_SOURCES) \
--	$(gen_from_JIS_SOURCES) $(gij_SOURCES) $(gjarsigner_SOURCES) \
--	$(gkeytool_SOURCES) $(grmic_SOURCES) $(grmiregistry_SOURCES) \
--	$(jv_convert_SOURCES)
-+	$(gen_from_JIS_SOURCES) $(gij_SOURCES) $(gjar_SOURCES) \
-+	$(gjarsigner_SOURCES) $(gkeytool_SOURCES) $(grmic_SOURCES) \
-+	$(grmiregistry_SOURCES) $(jv_convert_SOURCES)
- DIST_SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) \
- 	$(libgcj_tools_la_SOURCES) $(am__libgcj_la_SOURCES_DIST) \
- 	$(libgcj_bc_la_SOURCES) $(libgij_la_SOURCES) \
- 	$(libjvm_la_SOURCES) $(gappletviewer_SOURCES) \
- 	$(gcj_dbtool_SOURCES) $(am__gen_from_JIS_SOURCES_DIST) \
--	$(gij_SOURCES) $(gjarsigner_SOURCES) $(gkeytool_SOURCES) \
--	$(grmic_SOURCES) $(grmiregistry_SOURCES) $(jv_convert_SOURCES)
-+	$(gij_SOURCES) $(gjar_SOURCES) $(gjarsigner_SOURCES) \
-+	$(gkeytool_SOURCES) $(grmic_SOURCES) $(grmiregistry_SOURCES) \
-+	$(jv_convert_SOURCES)
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
- 	install-exec-recursive install-info-recursive \
-@@ -7359,6 +7363,13 @@
- gjarsigner_LINK = $(GCJLINK)
- gjarsigner_LDADD = -L$(here)/.libs libgcj-tools.la
- gjarsigner_DEPENDENCIES = libgcj-tools.la
-+gjar_SOURCES = 
-+gjar_LDFLAGS = --main=gnu.classpath.tools.jar.Main \
-+	-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
-+
-+gjar_LINK = $(GCJLINK)
-+gjar_LDADD = -L$(here)/.libs libgcj-tools.la
-+gjar_DEPENDENCIES = libgcj-tools.la
- gkeytool_SOURCES = 
- gkeytool_LDFLAGS = --main=gnu.classpath.tools.keytool.Main \
- 	-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
-@@ -8048,6 +8059,9 @@
- gij$(EXEEXT): $(gij_OBJECTS) $(gij_DEPENDENCIES) 
- 	@rm -f gij$(EXEEXT)
- 	$(gij_LINK) $(gij_LDFLAGS) $(gij_OBJECTS) $(gij_LDADD) $(LIBS)
-+gjar$(EXEEXT): $(gjar_OBJECTS) $(gjar_DEPENDENCIES) 
-+	@rm -f gjar$(EXEEXT)
-+	$(gjar_LINK) $(gjar_LDFLAGS) $(gjar_OBJECTS) $(gjar_LDADD) $(LIBS)
- gjarsigner$(EXEEXT): $(gjarsigner_OBJECTS) $(gjarsigner_DEPENDENCIES) 
- 	@rm -f gjarsigner$(EXEEXT)
- 	$(gjarsigner_LINK) $(gjarsigner_LDFLAGS) $(gjarsigner_OBJECTS) $(gjarsigner_LDADD) $(LIBS)
diff --git a/dev-java/gcj/files/.svn/text-base/rebuild-classmap-db.svn-base b/dev-java/gcj/files/.svn/text-base/rebuild-classmap-db.svn-base
deleted file mode 100644
--- a/dev-java/gcj/files/.svn/text-base/rebuild-classmap-db.svn-base
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/bin/sh
-
-# Author:	Hanno Meyer-Thurow
-# Revision:	4
-#
-# Use:		Rebuild your classmap database.
-
-# defaults
-JAVA_PKG_DB_TOOL="${JAVA_PKG_DB_TOOL:="$(gcj-config --dbtool)"}"
-JAVA_PKG_CLASSMAP="${JAVA_PKG_CLASSMAP:="/usr/share/java/classmap.gcjdb"}"
-
-# functions
-die() {
-	echo "ERROR: ${@}"
-	exit 1
-}
-
-show_help() {
-	echo "To rebuild your database run:"
-	echo "	'${0} <database file> [ <packages> | <path> ]'"
-	echo
-	echo "To print only what would be done run:"
-	echo "	'${0} printonly [ <packages> | <path> ]'"
-	echo
-	echo "To recreate the default database with all packages being checked execute:"
-	echo "	'${0} ${JAVA_PKG_CLASSMAP}'"
-	echo
-	echo "---------------"
-	echo " database file:		/path/to/classmap.gcjdb"
-	echo " packages:		comma-separated list of packages from 'java-config -l'"
-	echo " path:			fetch Jar files recursively from path"
-}
-
-get_classpath() {
-	local classpath
-	if [ -d "${@}" ] ; then
-		local jar
-		for jar in $(find ${@} -type f -name '*.jar') ; do
-			[[ ( -f "${jar}" ) && ( ".jar" == "${jar: -4:4}" ) ]] \
-				&& classpath="${jar}:${classpath}"
-		done
-		classpath=${classpath%:}
-	else
-		classpath="$(java-config --classpath=${@} 2>&1)"
-	fi
-
-	if [[ "${classpath}" =~ "ERROR" ]] ; then
-		die "A package missing/mispelled?!"
-	fi
-
-	echo "${classpath}"
-}
-
-check_jar() {
-	local ret_val=0
-	if [ -L "${1}" ] || [ ".jar" != "${1: -4:4}" ] ; then
-		echo -e "\033[01;31mno jarfile:\033[0m ${1}"
-		ret_val=1
-	elif [ ! -f "${2}" ] ; then
-		echo -e "\033[01;31mnot found:\033[0m ${2}"
-		ret_val=1
-	fi
-	return ${ret_val}
-}
-
-add_lib() {
-	echo "register: ${2}"
-	if [ "${DB_FILE}" != "printonly" ] ; then
-		${JAVA_PKG_DB_TOOL} -a ${DB_FILE} ${1} ${2} \
-			|| die "failed to register jar file"
-	fi
-}
-
-reg_pkgs() {
-	local pkg pkgs
-	for pkg in $(java-config -l | cut -d] -f1 | cut -c2-) ; do
-		pkgs="${pkg},${pkgs}"
-	done
-	pkgs="${pkgs//vm,active,the,by,Provided,}"
-	reg_classpath "${pkgs%,}"
-}
-
-reg_classpath() {
-	echo "check classpath ..."
-	local classpath="$(get_classpath "${1}")"
-
-	echo "${classpath}"
-	echo
-
-	local jar to
-	for jar in ${classpath//:/ } ; do
-		to="$(dirname ${jar})/lib$(basename ${jar}).so"
-		check_jar "${jar}" "${to}" && add_lib "${jar}" "${to}"
-	done
-}
-
-# errors
-if [[ ( ${#} -lt 1 ) || ( ${#} -ge 3 ) ]] ; then
-	show_help
-	exit 1
-fi
-
-if [ ! -x "$(which ${JAVA_PKG_DB_TOOL})" ] ; then
-	die "Java database tool unusable!"
-fi
-
-DB_FILE="${1}"
-
-if [ "${DB_FILE}" != "printonly" ] ; then
-	if [ ! -d "$(dirname ${DB_FILE})" ] ; then
-		die "Path to database file missing?!"
-	fi
-
-	if [ ".gcjdb" != "${DB_FILE: -6:6}" ] ; then
-		die "Given file has unknown format?!"
-	fi
-fi
-
-# start
-echo "(re-)create classmap database (${DB_FILE})"
-echo
-if [ "${DB_FILE}" != "printonly" ] ; then
-	rm -f ${DB_FILE}
-	${JAVA_PKG_DB_TOOL} -n ${DB_FILE}
-fi
-
-if [ -n "${2}" ] ; then
-	reg_classpath "${2}"
-else
-	reg_pkgs
-fi
-
-echo "... done!"
-exit 0
diff --git a/dev-java/gcj/files/classpath_javax.swing.text.PlainView_divide_zero.patch b/dev-java/gcj/files/classpath_javax.swing.text.PlainView_divide_zero.patch
deleted file mode 100644
--- a/dev-java/gcj/files/classpath_javax.swing.text.PlainView_divide_zero.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- libjava/classpath/javax/swing/text/PlainView.java~	2007-01-09 14:58:05.000000000 -0500
-+++ libjava/classpath/javax/swing/text/PlainView.java	2008-05-03 10:22:48.000000000 -0400
-@@ -295,9 +295,9 @@
-     Rectangle clip = g.getClipBounds();
-     SwingUtilities.computeIntersection(rect.x, rect.y, rect.width, rect.height,
-                                        clip);
--    int line0 = (clip.y - rect.y) / height;
-+    int line0 = height == 0 ? 0 : (clip.y - rect.y) / height;
-     line0 = Math.max(0, Math.min(line0, count - 1));
--    int line1 = (clip.y + clip.height - rect.y) / height;
-+    int line1 = height == 0 ? 0 : (clip.y + clip.height - rect.y) / height;
-     line1 = Math.max(0, Math.min(line1, count - 1));
-     int y = rect.y + metrics.getAscent() + height * line0;
-     for (int i = line0; i <= line1; i++)
-@@ -452,7 +452,8 @@
-         // Inside the allocation vertically. Determine line and X offset.
-         Document doc = getDocument();
-         Element root = doc.getDefaultRootElement();
--        int line = Math.abs(((int) y - rec.y) / metrics.getHeight());
-+	int met_height = metrics.getHeight();
-+        int line = met_height == 0 ? 0 : Math.abs(((int) y - rec.y) / met_height);
-         if (line >= root.getElementCount())
-           pos = getEndOffset() - 1;
-         else
diff --git a/dev-java/gcj/files/gcc-configure-LANG.patch b/dev-java/gcj/files/gcc-configure-LANG.patch
deleted file mode 100644
--- a/dev-java/gcj/files/gcc-configure-LANG.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in 
-option parsing, it may break.
-
-http://bugs.gentoo.org/103483
-
---- configure
-+++ configure
-@@ -54,6 +54,19 @@
- infodir='${prefix}/info'
- mandir='${prefix}/man'
- 
-+# NLS nuisances.
-+for as_var in \
-+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+  LC_TELEPHONE LC_TIME
-+do
-+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+    eval $as_var=C; export $as_var
-+  else
-+    unset $as_var
-+  fi
-+done
-+
- # Initialize some other variables.
- subdirs=
- MFLAGS= MAKEFLAGS=
-@@ -452,16 +463,6 @@
-   esac
- done
- 
--# NLS nuisances.
--# Only set these to C if already set.  These must not be set unconditionally
--# because not all systems understand e.g. LANG=C (notably SCO).
--# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
--# Non-C LC_CTYPE values break the ctype check.
--if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
--if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
--if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
--if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
--
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
- rm -rf conftest* confdefs.h
- # AIX cpp loses on an empty file, so make sure it contains at least a newline.
-@@ -1850,6 +1850,19 @@
- # Compiler output produced by configure, useful for debugging
- # configure, is in ./config.log if it exists.
- 
-+# NLS nuisances.
-+for as_var in \
-+  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-+  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-+  LC_TELEPHONE LC_TIME
-+do
-+  if (set +x; test -z "`(eval \$as_var=C; export \$as_var) 2>&1`"); then
-+    eval \$as_var=C; export \$as_var
-+  else
-+    unset \$as_var
-+  fi
-+done
-+
- ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
- for ac_option
- do
diff --git a/dev-java/gcj/files/gcj-4.3-tools.jar-path.diff b/dev-java/gcj/files/gcj-4.3-tools.jar-path.diff
deleted file mode 100644
--- a/dev-java/gcj/files/gcj-4.3-tools.jar-path.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- libjava/classpath/tools/Makefile.am.orig	2007-03-17 18:43:46.000000000 +0100
-+++ libjava/classpath/tools/Makefile.am	2007-03-17 18:44:19.000000000 +0100
-@@ -204,13 +204,13 @@
- ## END GCJ LOCAL
- ## First add classpath tools stuff.
- 	(cd classes; \
--	if test "$(ZIP)" != ""; then $(ZIP) -r ../$(TOOLS_ZIP) .; fi; \
--	if test "$(FASTJAR)" != ""; then $(FASTJAR) cf ../$(TOOLS_ZIP) .; fi; \
-+	if test "$(ZIP)" != ""; then $(ZIP) -r ../$(TOOLS_ZIP) *; fi; \
-+	if test "$(FASTJAR)" != ""; then $(FASTJAR) cf ../$(TOOLS_ZIP) *; fi; \
- 	cd ..)
- ## Now add ASM classes.
- 	(cd asm; \
--	if test "$(ZIP)" != ""; then $(ZIP) -u -r ../$(TOOLS_ZIP) .; fi; \
--	if test "$(FASTJAR)" != ""; then $(FASTJAR) uf ../$(TOOLS_ZIP) .; fi; \
-+	if test "$(ZIP)" != ""; then $(ZIP) -u -r ../$(TOOLS_ZIP) *; fi; \
-+	if test "$(FASTJAR)" != ""; then $(FASTJAR) uf ../$(TOOLS_ZIP) *; fi; \
- 	cd ..)
- 	rm -rf asm classes classes.lst asm.lst
- 
---- libjava/classpath/tools/Makefile.in.orig	2007-03-17 18:43:55.000000000 +0100
-+++ libjava/classpath/tools/Makefile.in	2007-03-17 18:44:44.000000000 +0100
-@@ -1121,12 +1121,12 @@
- 	cp -pR $(srcdir)/asm .
- 	cp -pR $(srcdir)/classes .
- 	(cd classes; \
--	if test "$(ZIP)" != ""; then $(ZIP) -r ../$(TOOLS_ZIP) .; fi; \
--	if test "$(FASTJAR)" != ""; then $(FASTJAR) cf ../$(TOOLS_ZIP) .; fi; \
-+	if test "$(ZIP)" != ""; then $(ZIP) -r ../$(TOOLS_ZIP) *; fi; \
-+	if test "$(FASTJAR)" != ""; then $(FASTJAR) cf ../$(TOOLS_ZIP) *; fi; \
- 	cd ..)
- 	(cd asm; \
--	if test "$(ZIP)" != ""; then $(ZIP) -u -r ../$(TOOLS_ZIP) .; fi; \
--	if test "$(FASTJAR)" != ""; then $(FASTJAR) uf ../$(TOOLS_ZIP) .; fi; \
-+	if test "$(ZIP)" != ""; then $(ZIP) -u -r ../$(TOOLS_ZIP) *; fi; \
-+	if test "$(FASTJAR)" != ""; then $(FASTJAR) uf ../$(TOOLS_ZIP) *; fi; \
- 	cd ..)
- 	rm -rf asm classes classes.lst asm.lst
- 
diff --git a/dev-java/gcj/files/gcj-config b/dev-java/gcj/files/gcj-config
deleted file mode 100755
--- a/dev-java/gcj/files/gcj-config
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh
-
-if [[ ! -f /etc/env.d/99gcj ]] ; then
-	echo "Setting correct LDPATH ..."
-	rm -rf /etc/env.d/99gcj
-	echo "LDPATH=\"/usr/lib/gcj/lib\"" > /etc/env.d/99gcj
-	/usr/sbin/env-update || echo "ERROR: env-update failed?!"
-fi
-
-LIBDIR="lib"
-INSTPATH="/usr/${LIBDIR}"
-CONFFILE="/usr/share/gcj-config/conf"
-if [[ ! -f "${CONFFILE}" ]] ; then
-	echo "Configuration file missing!"
-	echo "Generating dummy configuration file."
-	echo
-	echo "You have to set your prefered GCJ now!"
-	echo
-	echo "Run:"
-	echo "# gcj-config -l"
-	echo "# gcj-config gcj-<VERSION>"
-
-	mkdir -p $(dirname ${CONFFILE})
-	echo "current=\"${INSTPATH}/gcj-4.1.0/bin\"" > ${CONFFILE}
-
-	exit 1
-fi
-
-GCJ="$(sed -n -r -e "s:^current=.*/(gcj-.*)/.*:\1:p" ${CONFFILE})"
-if [[ ${#} -eq 0 ]] ; then
-	echo "Version set: ${GCJ}"
-	echo
-	echo "	List of GCJ installations:	gcj-config -l"
-	echo "	Set GCJ version:		gcj-config gcj-VERSION"
-else
-	case ${1} in
-		--gcj)
-if [[ ${CBUILD} != ${CHOST} ]]; then
-	echo "$(sed -n -r -e "s:current=\"(.*)\":\1:p" ${CONFFILE})/${CHOST}-gcj"
-else
-	echo "$(sed -n -r -e "s:current=\"(.*)\":\1:p" ${CONFFILE})/gcj"
-fi
-;;
-		--dbtool)
-echo "$(sed -n -r -e "s:current=\"(.*)\":\1:p" ${CONFFILE})/gcj-dbtool"
-;;
-		--gij)
-echo "$(sed -n -r -e "s:current=\"(.*)\":\1:p" ${CONFFILE})/gij"
-;;
-		--gjar)
-echo "$(sed -n -r -e "s:current=\"(.*)\":\1:p" ${CONFFILE})/gjar"
-;;
-		-l)
-for v in $(ls -1 ${INSTPATH} | grep gcj-); do
-	[[ ${v} == ${GCJ} ]] && v="${v} *"
-	echo "${v}"
-done
-;;
-		--version)
-echo "$(sed -n -r -e "s:current=\".*gcj-(.*)/.*\":\1:p" ${CONFFILE})"
-;;
-		gcj-*)
-if [[ ${1} == ${GCJ} ]] ; then
-	echo "Already set!"
-else
-	found="no"
-	for v in $(ls -1 ${INSTPATH} | grep gcj-); do
-		[[ ${v} == ${1} ]] && found="yes"
-	done
-
-	if [[ ${found} == "no" ]] ; then
-		echo "${1} not found!"
-	else
-		sed -e "s:${GCJ}:${1}:g" -i ${CONFFILE}
-		rm -f /usr/lib/gcj
-		ln -s ${INSTPATH}/${1} /usr/lib/gcj
-	fi
-fi
-;;
-		*)
-echo "Something wrong you do!"
-exit 1
-;;
-	esac
-fi
-
-exit 0
diff --git a/dev-java/gcj/files/gentoo-multilib-fixincludes.diff b/dev-java/gcj/files/gentoo-multilib-fixincludes.diff
deleted file mode 100644
--- a/dev-java/gcj/files/gentoo-multilib-fixincludes.diff
+++ /dev/null
@@ -1,28 +0,0 @@
---- fixincludes/fixincl.x	2007-07-26 00:51:47.000000000 +0100
-+++ fixincludes/fixincl.x	2007-08-08 00:39:26.000000000 +0100
-@@ -6349,7 +6349,7 @@
-  *  content bypass pattern - skip fix if pattern found
-  */
- tSCC zStdio_Stdarg_HBypass0[] =
--       "include.*(stdarg.h|machine/ansi.h)";
-+       "include.*(stdarg.h|machine/ansi.h)|gentoo-multilib";
- 
- #define    STDIO_STDARG_H_TEST_CT  1
- static tTestDesc aStdio_Stdarg_HTests[] = {
---- fixincludes/inclhack.def	2007-07-26 00:51:47.000000000 +0100
-+++ fixincludes/inclhack.def	2007-08-08 00:18:06.129542000 +0100
-@@ -3457,12 +3457,12 @@
- /*
-  *  Arrange for stdio.h to use stdarg.h to define __gnuc_va_list.
-  *  On 4BSD-derived systems, stdio.h defers to machine/ansi.h; that's
-- *  OK too.
-+ *  OK too.  Gentoo multilib uses a wrapper for stdio.h; skip it.
-  */
- fix = {
-     hackname = stdio_stdarg_h;
-     files    = stdio.h;
--    bypass   = "include.*(stdarg\.h|machine/ansi\.h)";
-+    bypass   = "include.*(stdarg\.h|machine/ansi\.h)|gentoo-multilib";
-     /*
-      * On Solaris 10, this fix is unncessary; <stdio.h> includes
-      * <iso/stdio_iso.h>, which includes <sys/va_list.h>.
diff --git a/dev-java/gcj/files/gjar.diff b/dev-java/gcj/files/gjar.diff
deleted file mode 100644
--- a/dev-java/gcj/files/gjar.diff
+++ /dev/null
@@ -1,97 +0,0 @@
---- libjava/Makefile.am.orig	2006-09-04 17:22:31.000000000 +0200
-+++ libjava/Makefile.am	2006-09-04 17:24:34.000000000 +0200
-@@ -68,7 +68,7 @@
- ## For now, only on native systems.  FIXME.
- if NATIVE
- bin_PROGRAMS = jv-convert gij grmic grmiregistry gcj-dbtool \
--	gappletviewer gjarsigner gkeytool
-+	gappletviewer gjarsigner gkeytool gjar
- 
- ## It is convenient to actually build and install the default database
- ## when gcj-dbtool is available.
-@@ -785,6 +785,17 @@
- gjarsigner_DEPENDENCIES = libgcj-tools.la
- 
- ## This is a dummy definition.
-+gjar_SOURCES =
-+gjar_LDFLAGS = --main=gnu.classpath.tools.jar.Main \
-+	-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
-+gjar_LINK = $(GCJLINK)
-+## See jv_convert_LDADD.
-+gjar_LDADD = -L$(here)/.libs libgcj-tools.la
-+## Depend on the spec file to make sure it is up to date before
-+## linking this program.
-+gjar_DEPENDENCIES = libgcj-tools.la
-+
-+## This is a dummy definition.
- gkeytool_SOURCES =
- gkeytool_LDFLAGS = --main=gnu.classpath.tools.keytool.Main \
- 	-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
---- libjava/Makefile.in.orig	2006-09-04 17:32:46.000000000 +0200
-+++ libjava/Makefile.in	2006-09-04 17:35:34.000000000 +0200
-@@ -46,7 +46,8 @@
- @NATIVE_TRUE@bin_PROGRAMS = jv-convert$(EXEEXT) gij$(EXEEXT) \
- @NATIVE_TRUE@	grmic$(EXEEXT) grmiregistry$(EXEEXT) \
- @NATIVE_TRUE@	gcj-dbtool$(EXEEXT) gappletviewer$(EXEEXT) \
--@NATIVE_TRUE@	gjarsigner$(EXEEXT) gkeytool$(EXEEXT)
-+@NATIVE_TRUE@	gjarsigner$(EXEEXT) gkeytool$(EXEEXT) \
-+@NATIVE_TRUE@	gjar$(EXEEXT)
- @BASH_JAR_TRUE@am__append_4 = scripts/jar
- @USING_GCC_TRUE@am__append_5 = $(WARNINGS)
- @USING_BOEHMGC_TRUE@am__append_6 = boehm.cc
-@@ -391,6 +392,8 @@
- gen_from_JIS_LDADD = $(LDADD)
- am_gij_OBJECTS =
- gij_OBJECTS = $(am_gij_OBJECTS)
-+am_gjar_OBJECTS =
-+gjar_OBJECTS = $(am_gjar_OBJECTS)
- am_gjarsigner_OBJECTS =
- gjarsigner_OBJECTS = $(am_gjarsigner_OBJECTS)
- am_gkeytool_OBJECTS =
-@@ -430,16 +433,17 @@
- 	$(libgcj_la_SOURCES) $(libgcj_bc_la_SOURCES) \
- 	$(libgij_la_SOURCES) $(libjvm_la_SOURCES) \
- 	$(gappletviewer_SOURCES) $(gcj_dbtool_SOURCES) \
--	$(gen_from_JIS_SOURCES) $(gij_SOURCES) $(gjarsigner_SOURCES) \
--	$(gkeytool_SOURCES) $(grmic_SOURCES) $(grmiregistry_SOURCES) \
--	$(jv_convert_SOURCES)
-+	$(gen_from_JIS_SOURCES) $(gij_SOURCES) $(gjar_SOURCES) \
-+	$(gjarsigner_SOURCES) $(gkeytool_SOURCES) $(grmic_SOURCES) \
-+	$(grmiregistry_SOURCES) $(jv_convert_SOURCES)
- DIST_SOURCES = $(lib_gnu_awt_xlib_la_SOURCES) \
- 	$(libgcj_tools_la_SOURCES) $(am__libgcj_la_SOURCES_DIST) \
- 	$(libgcj_bc_la_SOURCES) $(libgij_la_SOURCES) \
- 	$(libjvm_la_SOURCES) $(gappletviewer_SOURCES) \
- 	$(gcj_dbtool_SOURCES) $(am__gen_from_JIS_SOURCES_DIST) \
--	$(gij_SOURCES) $(gjarsigner_SOURCES) $(gkeytool_SOURCES) \
--	$(grmic_SOURCES) $(grmiregistry_SOURCES) $(jv_convert_SOURCES)
-+	$(gij_SOURCES) $(gjar_SOURCES) $(gjarsigner_SOURCES) \
-+	$(gkeytool_SOURCES) $(grmic_SOURCES) $(grmiregistry_SOURCES) \
-+	$(jv_convert_SOURCES)
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
- 	install-exec-recursive install-info-recursive \
-@@ -7359,6 +7363,13 @@
- gjarsigner_LINK = $(GCJLINK)
- gjarsigner_LDADD = -L$(here)/.libs libgcj-tools.la
- gjarsigner_DEPENDENCIES = libgcj-tools.la
-+gjar_SOURCES = 
-+gjar_LDFLAGS = --main=gnu.classpath.tools.jar.Main \
-+	-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
-+
-+gjar_LINK = $(GCJLINK)
-+gjar_LDADD = -L$(here)/.libs libgcj-tools.la
-+gjar_DEPENDENCIES = libgcj-tools.la
- gkeytool_SOURCES = 
- gkeytool_LDFLAGS = --main=gnu.classpath.tools.keytool.Main \
- 	-rpath $(toolexeclibdir) -shared-libgcc $(THREADLDFLAGS)
-@@ -8048,6 +8059,9 @@
- gij$(EXEEXT): $(gij_OBJECTS) $(gij_DEPENDENCIES) 
- 	@rm -f gij$(EXEEXT)
- 	$(gij_LINK) $(gij_LDFLAGS) $(gij_OBJECTS) $(gij_LDADD) $(LIBS)
-+gjar$(EXEEXT): $(gjar_OBJECTS) $(gjar_DEPENDENCIES) 
-+	@rm -f gjar$(EXEEXT)
-+	$(gjar_LINK) $(gjar_LDFLAGS) $(gjar_OBJECTS) $(gjar_LDADD) $(LIBS)
- gjarsigner$(EXEEXT): $(gjarsigner_OBJECTS) $(gjarsigner_DEPENDENCIES) 
- 	@rm -f gjarsigner$(EXEEXT)
- 	$(gjarsigner_LINK) $(gjarsigner_LDFLAGS) $(gjarsigner_OBJECTS) $(gjarsigner_LDADD) $(LIBS)
diff --git a/dev-java/gcj/files/rebuild-classmap-db b/dev-java/gcj/files/rebuild-classmap-db
deleted file mode 100755
--- a/dev-java/gcj/files/rebuild-classmap-db
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/bin/sh
-
-# Author:	Hanno Meyer-Thurow
-# Revision:	4
-#
-# Use:		Rebuild your classmap database.
-
-# defaults
-JAVA_PKG_DB_TOOL="${JAVA_PKG_DB_TOOL:="$(gcj-config --dbtool)"}"
-JAVA_PKG_CLASSMAP="${JAVA_PKG_CLASSMAP:="/usr/share/java/classmap.gcjdb"}"
-
-# functions
-die() {
-	echo "ERROR: ${@}"
-	exit 1
-}
-
-show_help() {
-	echo "To rebuild your database run:"
-	echo "	'${0} <database file> [ <packages> | <path> ]'"
-	echo
-	echo "To print only what would be done run:"
-	echo "	'${0} printonly [ <packages> | <path> ]'"
-	echo
-	echo "To recreate the default database with all packages being checked execute:"
-	echo "	'${0} ${JAVA_PKG_CLASSMAP}'"
-	echo
-	echo "---------------"
-	echo " database file:		/path/to/classmap.gcjdb"
-	echo " packages:		comma-separated list of packages from 'java-config -l'"
-	echo " path:			fetch Jar files recursively from path"
-}
-
-get_classpath() {
-	local classpath
-	if [ -d "${@}" ] ; then
-		local jar
-		for jar in $(find ${@} -type f -name '*.jar') ; do
-			[[ ( -f "${jar}" ) && ( ".jar" == "${jar: -4:4}" ) ]] \
-				&& classpath="${jar}:${classpath}"
-		done
-		classpath=${classpath%:}
-	else
-		classpath="$(java-config --classpath=${@} 2>&1)"
-	fi
-
-	if [[ "${classpath}" =~ "ERROR" ]] ; then
-		die "A package missing/mispelled?!"
-	fi
-
-	echo "${classpath}"
-}
-
-check_jar() {
-	local ret_val=0
-	if [ -L "${1}" ] || [ ".jar" != "${1: -4:4}" ] ; then
-		echo -e "\033[01;31mno jarfile:\033[0m ${1}"
-		ret_val=1
-	elif [ ! -f "${2}" ] ; then
-		echo -e "\033[01;31mnot found:\033[0m ${2}"
-		ret_val=1
-	fi
-	return ${ret_val}
-}
-
-add_lib() {
-	echo "register: ${2}"
-	if [ "${DB_FILE}" != "printonly" ] ; then
-		${JAVA_PKG_DB_TOOL} -a ${DB_FILE} ${1} ${2} \
-			|| die "failed to register jar file"
-	fi
-}
-
-reg_pkgs() {
-	local pkg pkgs
-	for pkg in $(java-config -l | cut -d] -f1 | cut -c2-) ; do
-		pkgs="${pkg},${pkgs}"
-	done
-	pkgs="${pkgs//vm,active,the,by,Provided,}"
-	reg_classpath "${pkgs%,}"
-}
-
-reg_classpath() {
-	echo "check classpath ..."
-	local classpath="$(get_classpath "${1}")"
-
-	echo "${classpath}"
-	echo
-
-	local jar to
-	for jar in ${classpath//:/ } ; do
-		to="$(dirname ${jar})/lib$(basename ${jar}).so"
-		check_jar "${jar}" "${to}" && add_lib "${jar}" "${to}"
-	done
-}
-
-# errors
-if [[ ( ${#} -lt 1 ) || ( ${#} -ge 3 ) ]] ; then
-	show_help
-	exit 1
-fi
-
-if [ ! -x "$(which ${JAVA_PKG_DB_TOOL})" ] ; then
-	die "Java database tool unusable!"
-fi
-
-DB_FILE="${1}"
-
-if [ "${DB_FILE}" != "printonly" ] ; then
-	if [ ! -d "$(dirname ${DB_FILE})" ] ; then
-		die "Path to database file missing?!"
-	fi
-
-	if [ ".gcjdb" != "${DB_FILE: -6:6}" ] ; then
-		die "Given file has unknown format?!"
-	fi
-fi
-
-# start
-echo "(re-)create classmap database (${DB_FILE})"
-echo
-if [ "${DB_FILE}" != "printonly" ] ; then
-	rm -f ${DB_FILE}
-	${JAVA_PKG_DB_TOOL} -n ${DB_FILE}
-fi
-
-if [ -n "${2}" ] ; then
-	reg_classpath "${2}"
-else
-	reg_pkgs
-fi
-
-echo "... done!"
-exit 0
diff --git a/dev-java/gcj/gcj-4.3.0_alpha20080313-r1.ebuild b/dev-java/gcj/gcj-4.3.0_alpha20080313-r1.ebuild
deleted file mode 100644
--- a/dev-java/gcj/gcj-4.3.0_alpha20080313-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# Header: $
-
-ECJ_VER="3.4"
-
-inherit gcc-java-2 eutils
-
-DESCRIPTION="The GNU Compiler for the Java(tm) Programming Language"
-HOMEPAGE="http://gcc.gnu.org/java/"
-
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-SLOT="4.3"
-
-RDEPEND="virtual/libc
-	virtual/libiconv
-	=dev-java/eclipse-ecj-${ECJ_VER}*
-	>=sys-libs/zlib-1.1.4
-	>=dev-libs/gmp-4.2.1
-	>=dev-libs/mpfr-2.2.0_p10
-	!nogtk? ( >=x11-libs/gtk+-2.8
-		>=x11-libs/cairo-1.0.2
-		x11-libs/pango
-		x11-libs/libXt
-		x11-libs/libX11
-		x11-libs/libXtst
-		x11-proto/xproto
-		x11-proto/xextproto )
-	gconf? ( >=gnome-base/gconf-2.14 )
-	>=media-libs/libart_lgpl-2.1
-	>=sys-libs/ncurses-5.2-r2
-	nls? ( sys-devel/gettext )"
-DEPEND="${RDEPEND}
-	>=sys-apps/texinfo-4.2-r4
-	>=sys-devel/bison-1.875
-	>=sys-devel/binutils-2.16.1"
-
-pkg_setup() {
-	gcj_pkg_setup
-}
-
-src_unpack() {
-	gcj_src_unpack
-	epatch "${FILESDIR}/classpath_javax.swing.text.PlainView_divide_zero.patch"
-}
-
-src_compile() {
-	gcj_src_compile
-}
-
-pkg_preinst() {
-	:;
-}
-
-src_install() {
-	gcj_src_install
-
-	# copy scripts
-	exeinto /usr/bin
-	doexe ${FILESDIR}/gcj-config
-	doexe ${FILESDIR}/rebuild-classmap-db
-}
-
-pkg_postinst() {
-	ewarn "This gcj ebuild is provided for your convenience, and the use"
-	ewarn "of this JDK replacement is not supported by the Gentoo Developers."
-	ewarn
-	ewarn "You are on your own using this! If you have any interesting news"
-	ewarn "let us know: http://forums.gentoo.org/viewtopic-t-379693.html"
-
-	gcj-config ${P}
-}
-
-pkg_prerm() {
-	:;
-}
-
-pkg_postrm() {
-	:;
-}