--- /usr/portage/layman/java-overlay/dev-java/icedtea/icedtea-1.10.ebuild	2009-08-10 23:36:14.000000000 +0200
+++ icedtea-1.11.ebuild	2009-08-26 00:20:59.168038788 +0200
@@ -1,21 +1,23 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Build written by Andrew John Hughes
+# Edited by Ruediger Gad
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="2"
 
-inherit autotools pax-utils java-pkg-2 java-vm-2
+inherit autotools pax-utils java-pkg-2 java-vm-2 flag-o-matic
 
 DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-OPENJDK_TARBALL="0d76c4da605f.tar.gz"
-LANGTOOLS_TARBALL="0f653be1a42f.tar.gz"
-JAXP_TARBALL="748976d69503.tar.gz"
-JAXWS_TARBALL="faac46e2e60f.tar.gz"
-CORBA_TARBALL="e9ba2b962ddf.tar.gz"
-JDK_TARBALL="3d024b86523a.tar.gz"
-HOTSPOT_TARBALL="aa0c48844632.tar.gz"
+OPENJDK_TARBALL="e7eeeda332ec.tar.gz"
+LANGTOOLS_TARBALL="634f519d6f9a.tar.gz"
+JAXP_TARBALL="b3d2bf4c255d.tar.gz"
+JAXWS_TARBALL="c37936a72332.tar.gz"
+CORBA_TARBALL="1741ea5cb854.tar.gz"
+JDK_TARBALL="51fcc41d8b24.tar.gz"
+HOTSPOT_TARBALL="945fcffdbcab.tar.gz"
 CACAO_TARBALL="cacao-0.99.4.tar.gz"
+
 SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz
 		 http://hg.openjdk.java.net/icedtea/jdk7/archive/${OPENJDK_TARBALL}
 		 http://hg.openjdk.java.net/icedtea/jdk7/corba/archive/${CORBA_TARBALL}
@@ -36,8 +38,8 @@
 RESTRICT="test"
 
 LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-#KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 RDEPEND=">=net-print/cups-1.2.12
 	 >=x11-libs/libX11-1.1.3
@@ -101,12 +103,14 @@
 
 	# quite a hack since java-config does not provide a way for a package
 	# to limit supported VM's for building and their preferred order
-	if has_version dev-java/icedtea6; then
+	# Pull icedtea in front in order to build icedtea with itself instead of
+	# with icedtea6 in case we have icedtea already installed.
+	if has_version dev-java/icedtea; then
+	        JAVA_PKG_FORCE_VM="icedtea"
+	elif has_version dev-java/icedtea6; then
 		JAVA_PKG_FORCE_VM="icedtea6"
 	elif has_version dev-java/icedtea6-bin; then
 		JAVA_PKG_FORCE_VM="icedtea6-bin"
-	elif has_version dev-java/icedtea; then
-		JAVA_PKG_FORCE_VM="icedtea"
 	elif has_version dev-java/gcj-jdk; then
 		JAVA_PKG_FORCE_VM="gcj-jdk"
 	elif has_version dev-java/cacao; then
@@ -134,9 +138,7 @@
 	local vmhome="/usr/lib/jvm/${vm}"
 
 	if [[ "${vm}" == "icedtea6" || "${vm}" == "icedtea" ]] || [[ "${vm}" == "icedtea6-bin" ]] ; then
-		# If we are upgrading icedtea, then we don't need to bootstrap.
-		config="${config} --with-icedtea"
-		config="${config} --with-icedtea-home=$(java-config -O)"
+		config="${config} --disable-bootstrap"
 	elif [[ "${vm}" == "gcj-jdk" || "${vm}" == "cacao" ]] ; then
 		# For other 1.5 JDKs e.g. GCJ, CACAO.
 		config="${config} --with-ecj-jar=$(java-pkg_getjar eclipse-ecj:3.3 ecj.jar)" \
@@ -166,6 +168,15 @@
 
 	unset_vars
 
+	# Filtering of CFLAGS is necessary at least here for building (using gcc 4.3.3-r2 
+	# on x86_64). The build error happens in the JAX-WS component and is caused
+	# because of compilation with -Werror which seems to be "hard coded"
+	# somewhere.
+	export ALLOWED_FLAGS="-march -pipe"
+	strip-flags
+	filter-flags -O*
+	einfo "Using CFLAGS: ${CFLAGS}"
+
 	econf ${config} \
 		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
 		--with-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \
@@ -225,7 +236,6 @@
 	pax-mark m $(list-paxables "${ddest}"{,/jre}/bin/*)
 
 	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README || die
-	dohtml README.html || die
 
 	if use examples; then
 		dodir "${dest}/share";