Package move from icedtea6-bin

(Portage version: 2.2.0_alpha68/cvs/Linux x86_64, RepoMan options: --force)

5 files changed, 634 insertions, 0 deletions

diff --git a/dev-java/icedtea-bin/ChangeLog b/dev-java/icedtea-bin/ChangeLog
new file mode 100644
index 000000000000..3165a1c4440a
--- /dev/null
+++ b/dev-java/icedtea-bin/ChangeLog
@@ -0,0 +1,358 @@
+# ChangeLog for dev-java/icedtea-bin
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.1 2011/10/30 13:53:19 caster Exp $
+
+*icedtea-bin-1.10.4 (30 Oct 2011)
+*icedtea-bin-1.10.3-r2 (30 Oct 2011)
+
+  30 Oct 2011; Vlastimil Babka <caster@gentoo.org> +files/icedtea6-bin.env,
+  +icedtea-bin-1.10.3-r2.ebuild, +icedtea-bin-1.10.4.ebuild, +metadata.xml:
+  Package move from icedtea6-bin
+
+  30 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  icedtea6-bin-1.10.4.ebuild:
+  x86 stable wrt bug #387637
+
+*icedtea6-bin-1.10.4 (22 Oct 2011)
+
+  22 Oct 2011; Vlastimil Babka <caster@gentoo.org> +icedtea6-bin-1.10.4.ebuild:
+  Version bump, security bug #387637. Based on icedtea 1.10.4 and icedtea-web
+  1.1.3. Libpng-1.5 now required as it's stable.
+
+  11 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+  -icedtea6-bin-1.10.3.ebuild, -icedtea6-bin-1.10.3-r1.ebuild:
+  old
+
+  08 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+  icedtea6-bin-1.10.3-r2.ebuild:
+  amd64 stable wrt #385949
+
+  08 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  icedtea6-bin-1.10.3-r2.ebuild:
+  x86 stable wrt bug #385949
+
+*icedtea6-bin-1.10.3-r2 (20 Sep 2011)
+
+  20 Sep 2011; Vlastimil Babka <caster@gentoo.org>
+  +icedtea6-bin-1.10.3-r2.ebuild:
+  Revbump to replace nsplugin part by icedtea-web-1.1.2-r1, which respects
+  LDFLAGS and thus --as-needed removes the (false) libpng14 dependency. Fixes
+  bug #383771.
+
+*icedtea6-bin-1.10.3-r1 (19 Sep 2011)
+
+  19 Sep 2011; Vlastimil Babka <caster@gentoo.org> -icedtea6-bin-1.10.2.ebuild,
+  +icedtea6-bin-1.10.3-r1.ebuild:
+  Revbump to bump icedtea-web to 1.1.2 and provide libpng-1.5 ABI variant,
+  selected at build-time.
+
+  17 Sep 2011; Samuli Suominen <ssuominen@gentoo.org>
+  icedtea6-bin-1.10.2.ebuild, icedtea6-bin-1.10.3.ebuild:
+  Fix media-libs/libpng depend to pull any providing libpng14.so.14 SONAME.
+
+  16 Sep 2011; Vlastimil Babka <caster@gentoo.org> icedtea6-bin-1.10.2.ebuild,
+  icedtea6-bin-1.10.3.ebuild:
+  Bump EAPI to 3 for prefix support.
+
+  15 Sep 2011; Serkan Kaba <serkan@gentoo.org> icedtea6-bin-1.10.2.ebuild,
+  icedtea6-bin-1.10.3.ebuild:
+  Revert prefix keywords.
+
+  15 Sep 2011; Serkan Kaba <serkan@gentoo.org> files/icedtea6-bin.env,
+  icedtea6-bin-1.10.2.ebuild, icedtea6-bin-1.10.3.ebuild:
+  Add prefix to env file.
+
+  02 Aug 2011; Markos Chandras <hwoarang@gentoo.org>
+  icedtea6-bin-1.10.3.ebuild:
+  Stable on amd64 wrt bug #375977
+
+  24 Jul 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  icedtea6-bin-1.10.3.ebuild:
+  x86 stable wrt security bug #375977
+
+*icedtea6-bin-1.10.3 (24 Jul 2011)
+
+  24 Jul 2011; Vlastimil Babka <caster@gentoo.org> -icedtea6-bin-1.9.7.ebuild,
+  -icedtea6-bin-1.10.1.ebuild, +icedtea6-bin-1.10.3.ebuild:
+  Version bump, security bug #375977.
+
+  20 Jun 2011; Markos Chandras <hwoarang@gentoo.org>
+  icedtea6-bin-1.10.2.ebuild:
+  Stable on amd64 wrt bug #370787
+
+  20 Jun 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  icedtea6-bin-1.10.2.ebuild:
+  x86 stable wrt security bug #370787
+
+*icedtea6-bin-1.10.2 (19 Jun 2011)
+
+  19 Jun 2011; Vlastimil Babka <caster@gentoo.org> +icedtea6-bin-1.10.2.ebuild:
+  Version bump, security bug #370787.
+
+*icedtea6-bin-1.10.1 (22 Apr 2011)
+
+  22 Apr 2011; Vlastimil Babka <caster@gentoo.org> -icedtea6-bin-1.9.6.ebuild,
+  icedtea6-bin-1.9.7.ebuild, +icedtea6-bin-1.10.1.ebuild:
+  Version bump, bug #361921. Includes libpng-1.5 support, 1.9.7 restricts dep
+  to =1.4* fixing bug #356743.
+
+  27 Mar 2011; Vlastimil Babka <caster@gentoo.org> icedtea6-bin-1.9.7.ebuild:
+  Change the optional deps to PDEPEND to avoid dependency circles.
+
+  21 Feb 2011; Christian Faulhammer <fauli@gentoo.org>
+  icedtea6-bin-1.9.7.ebuild:
+  stable x86, security bug 355127
+
+  16 Feb 2011; Markos Chandras <hwoarang@gentoo.org> icedtea6-bin-1.9.7.ebuild:
+  Stable on amd64 wrt bug #355127
+
+*icedtea6-bin-1.9.7 (16 Feb 2011)
+
+  16 Feb 2011; Vlastimil Babka <caster@gentoo.org> -icedtea6-bin-1.9.4.ebuild,
+  -icedtea6-bin-1.9.5.ebuild, +icedtea6-bin-1.9.7.ebuild:
+  Version bump, security bug #355127.
+
+  11 Feb 2011; Christian Faulhammer <fauli@gentoo.org>
+  icedtea6-bin-1.9.6.ebuild:
+  stable x86, security bug 354231
+
+  10 Feb 2011; Markos Chandras <hwoarang@gentoo.org> icedtea6-bin-1.9.6.ebuild:
+  Stable on amd64 wrt bug #354231
+
+*icedtea6-bin-1.9.6 (10 Feb 2011)
+
+  10 Feb 2011; Vlastimil Babka <caster@gentoo.org> +icedtea6-bin-1.9.6.ebuild:
+  Version bump, security bug #354231.
+
+  04 Feb 2011; Christian Faulhammer <fauli@gentoo.org>
+  icedtea6-bin-1.9.5.ebuild:
+  stable x86, security bug 353418
+
+  02 Feb 2011; Vlastimil Babka <caster@gentoo.org> icedtea6-bin-1.9.5.ebuild:
+  Change SRC_URI to dev.gentoo.org
+
+*icedtea6-bin-1.9.5 (02 Feb 2011)
+
+  02 Feb 2011; Vlastimil Babka <caster@gentoo.org> -icedtea6-bin-1.9.1.ebuild,
+  -icedtea6-bin-1.9.2.ebuild, +icedtea6-bin-1.9.5.ebuild:
+  Version bump, security bug #353418.
+
+  22 Jan 2011; Markos Chandras <hwoarang@gentoo.org> icedtea6-bin-1.9.4.ebuild:
+  Stable on amd64 wrt bug #352035
+
+  22 Jan 2011; Christian Faulhammer <fauli@gentoo.org>
+  icedtea6-bin-1.9.4.ebuild:
+  stable x86, security bug 352035
+
+*icedtea6-bin-1.9.4 (21 Jan 2011)
+
+  21 Jan 2011; Vlastimil Babka <caster@gentoo.org> icedtea6-bin-1.9.1.ebuild,
+  icedtea6-bin-1.9.2.ebuild, +icedtea6-bin-1.9.4.ebuild:
+  Version bump, security bug #352035 (JNLP security manager bypass -
+  (CVE-2010-4351). Also convert deps to virtual/jpeg, bug #347953.
+
+*icedtea6-bin-1.9.2 (27 Nov 2010)
+
+  27 Nov 2010; Vlastimil Babka <caster@gentoo.org>
+  -icedtea6-bin-1.8.1.ebuild, -icedtea6-bin-1.8.1-r1.ebuild,
+  -icedtea6-bin-1.9.ebuild, +icedtea6-bin-1.9.2.ebuild:
+  Version bump, security bug #346799.
+
+  07 Nov 2010; Samuli Suominen <ssuominen@gentoo.org>
+  icedtea6-bin-1.9.1.ebuild:
+  Fix libjpeg depend to accept libjpeg-turbo >= 1.0.90 wrt #327487.
+
+  13 Oct 2010; Markos Chandras <hwoarang@gentoo.org>
+  icedtea6-bin-1.9.ebuild, icedtea6-bin-1.9.1.ebuild:
+  Revert keywords in 1.9 and stabilize correct version. Bug #340819
+
+  13 Oct 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  icedtea6-bin-1.9.1.ebuild:
+  x86 stable wrt security bug #340819
+
+  13 Oct 2010; Markos Chandras <hwoarang@gentoo.org>
+  icedtea6-bin-1.9.ebuild:
+  Stable on amd64 wrt bug #340819
+
+*icedtea6-bin-1.9.1 (13 Oct 2010)
+
+  13 Oct 2010; Vlastimil Babka <caster@gentoo.org>
+  +icedtea6-bin-1.9.1.ebuild:
+  Version bump, security bug #340819.
+
+*icedtea6-bin-1.9 (09 Sep 2010)
+
+  09 Sep 2010; Vlastimil Babka <caster@gentoo.org> +icedtea6-bin-1.9.ebuild:
+  Version bump.
+
+*icedtea6-bin-1.8.1-r1 (01 Sep 2010)
+
+  01 Sep 2010; Vlastimil Babka <caster@gentoo.org>
+  -icedtea6-bin-1.8.0.ebuild, +icedtea6-bin-1.8.1-r1.ebuild:
+  Revbump to fix default fonts, bug #266295. Also built against newer deps
+  (glibc).
+
+  31 Jul 2010; Markos Chandras <hwoarang@gentoo.org>
+  icedtea6-bin-1.8.1.ebuild:
+  Stable on amd64 wrt bug #330205
+
+  31 Jul 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  icedtea6-bin-1.8.1.ebuild:
+  x86 stable wrt security bug #330205
+
+*icedtea6-bin-1.8.1 (30 Jul 2010)
+
+  30 Jul 2010; Vlastimil Babka <caster@gentoo.org>
+  -icedtea6-bin-1.7.2.ebuild, +icedtea6-bin-1.8.1.ebuild:
+  Version bump, security bug #330205.
+
+  24 Jun 2010; Pacho Ramos <pacho@gentoo.org> icedtea6-bin-1.8.0.ebuild:
+  stable amd64, bug 320163
+
+  24 Jun 2010; Christian Faulhammer <fauli@gentoo.org>
+  icedtea6-bin-1.8.0.ebuild:
+  stable x86, bug 320163
+
+*icedtea6-bin-1.8.0 (17 Apr 2010)
+
+  17 Apr 2010; Vlastimil Babka <caster@gentoo.org>
+  +icedtea6-bin-1.8.0.ebuild:
+  Version bump.
+
+  15 Apr 2010; Vlastimil Babka <caster@gentoo.org>
+  -icedtea6-bin-1.6.2-r2.ebuild, -icedtea6-bin-1.7-r1.ebuild,
+  -icedtea6-bin-1.7.1.ebuild:
+  Remove old.
+
+  15 Apr 2010; Markus Meier <maekke@gentoo.org> icedtea6-bin-1.7.2.ebuild:
+  amd64 stable, bug #312297
+
+  05 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  icedtea6-bin-1.7.2.ebuild:
+  x86 stable wrt security bug #312297
+
+*icedtea6-bin-1.7.2 (01 Apr 2010)
+
+  01 Apr 2010; Vlastimil Babka <caster@gentoo.org>
+  +icedtea6-bin-1.7.2.ebuild:
+  Version bump, security bug #312297. Built from dev-java/icedtea-6.1.7.2-r1
+  which is equal to upstream 1.7.3 release.
+
+  29 Mar 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  icedtea6-bin-1.7.1.ebuild:
+  x86 stable wrt bug #307973
+
+  21 Mar 2010; Vlastimil Babka <caster@gentoo.org>
+  icedtea6-bin-1.7.1.ebuild:
+  Remove QA_EXECSTACK declarations as they no longer apply, #257707.
+
+  19 Mar 2010; Vlastimil Babka <caster@gentoo.org>
+  icedtea6-bin-1.7.1.ebuild:
+  Forgot to lift the libpng version restriction in RDEPEND, #308443
+
+  18 Mar 2010; Vlastimil Babka <caster@gentoo.org>
+  icedtea6-bin-1.7.1.ebuild:
+  Add a distfile with libsplashscreen.so built against libpng-1.4. The file
+  is selected depending on which libpng is installed. Fixes bug #308443.
+
+  11 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  icedtea6-bin-1.6.2-r2.ebuild, icedtea6-bin-1.7-r1.ebuild,
+  icedtea6-bin-1.7.1.ebuild:
+  Restrict libpng depend to libpng12.so.0.
+
+*icedtea6-bin-1.7.1 (03 Mar 2010)
+
+  03 Mar 2010; Vlastimil Babka <caster@gentoo.org>
+  -icedtea6-bin-1.6.2.ebuild, -icedtea6-bin-1.6.2-r1.ebuild,
+  -icedtea6-bin-1.7.ebuild, +icedtea6-bin-1.7.1.ebuild
+  Version bump. Built with jpeg-8 unconditionally since it's stable.
+
+  19 Feb 2010; Markus Meier <maekke@gentoo.org>
+  icedtea6-bin-1.6.2-r2.ebuild:
+  x86 stable, bug #304829
+
+  13 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+  icedtea6-bin-1.6.2-r2.ebuild:
+  amd64 stable wrt #304829
+
+*icedtea6-bin-1.7-r1 (06 Feb 2010)
+
+  06 Feb 2010; Vlastimil Babka <caster@gentoo.org>
+  +icedtea6-bin-1.7-r1.ebuild:
+  Revbump to add missing package-list to USE=doc - bug #302654.
+
+*icedtea6-bin-1.7 (01 Feb 2010)
+
+  01 Feb 2010; Vlastimil Babka <caster@gentoo.org> +icedtea6-bin-1.7.ebuild:
+  Version bump. Contains new IcedTeaNPPlugin compatible with xulrunner 1.9.1
+  and 1.9.2, Firefox 3.5+, Chromium. Also compatible with both jpeg-7 and
+  jpeg-8 - the ebuild detects the installed version in src_unpack().
+
+*icedtea6-bin-1.6.2-r2 (22 Jan 2010)
+
+  22 Jan 2010; Vlastimil Babka <caster@gentoo.org>
+  -icedtea6-bin-1.6.1.ebuild, +icedtea6-bin-1.6.2-r2.ebuild:
+  Revision bump, built with and requiring jpeg-8.
+
+  17 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
+  icedtea6-bin-1.6.1.ebuild, icedtea6-bin-1.6.2.ebuild,
+  icedtea6-bin-1.6.2-r1.ebuild:
+  Restrict depend to =media-libs/jpeg-7* for matching SONAME.
+
+*icedtea6-bin-1.6.2-r1 (16 Jan 2010)
+
+  16 Jan 2010; Petteri Räty <betelgeuse@gentoo.org>
+  +icedtea6-bin-1.6.2-r1.ebuild:
+  Add dep on x11-libs/libXt for the X use flag as the installed jni headers
+  need a file from it.
+
+  28 Dec 2009; Markus Meier <maekke@gentoo.org> icedtea6-bin-1.6.2.ebuild:
+  amd64 stable, bug #292003
+
+  16 Dec 2009; Christian Faulhammer <fauli@gentoo.org>
+  icedtea6-bin-1.6.2.ebuild:
+  stable x86, bug 292003
+
+*icedtea6-bin-1.6.2 (13 Nov 2009)
+
+  13 Nov 2009; Vlastimil Babka <caster@gentoo.org>
+  +icedtea6-bin-1.6.2.ebuild:
+  Version bump. Contains security fixes. The plugin is built for
+  xulrunner-1.9.1-based browsers only.
+
+  05 Nov 2009; Vlastimil Babka <caster@gentoo.org>
+  -icedtea6-bin-1.3.1-r1.ebuild, -icedtea6-bin-1.4.ebuild,
+  -icedtea6-bin-1.4.1.ebuild:
+  Remove old.
+
+*icedtea6-bin-1.6.1 (12 Oct 2009)
+
+  12 Oct 2009; Vlastimil Babka <caster@gentoo.org>
+  +icedtea6-bin-1.6.1.ebuild:
+  Version bump. Fixes bugs #272723 (set as default VM if none set), #273306
+  (empty cacerts breaking SSL), #280375 (nspr-4.8 compatibility), #283248
+  (jpeg-7 compatibility).
+
+  13 Sep 2009; Samuli Suominen <ssuominen@gentoo.org>
+  icedtea6-bin-1.3.1-r1.ebuild, icedtea6-bin-1.4.ebuild,
+  icedtea6-bin-1.4.1.ebuild:
+  Use jpeg-compat wrt #283248, thanks to Florian Scandella for reporting.
+
+*icedtea6-bin-1.4.1 (19 Apr 2009)
+
+  19 Apr 2009; Vlastimil Babka <caster@gentoo.org>
+  +icedtea6-bin-1.4.1.ebuild:
+  Version bump, based on icedtea6-1.4.1-r1 from java-overlay.
+
+*icedtea6-bin-1.4 (09 Feb 2009)
+
+  09 Feb 2009; Vlastimil Babka <caster@gentoo.org> +icedtea6-bin-1.4.ebuild:
+  Version bump, built from icedtea6-1.4 java-overlay r7477. Bug #255493.
+
+*icedtea6-bin-1.3.1-r1 (24 Dec 2008)
+
+  24 Dec 2008; Vlastimil Babka <caster@gentoo.org> +files/icedtea6-bin.env,
+  +metadata.xml, +icedtea6-bin-1.3.1-r1.ebuild:
+  New package, a Gentoo binary build of icedtea6. Based on icedtea6-r2 from
+  java-overlay.
+
diff --git a/dev-java/icedtea-bin/files/icedtea6-bin.env b/dev-java/icedtea-bin/files/icedtea6-bin.env
new file mode 100644
index 000000000000..606b4ace61cd
--- /dev/null
+++ b/dev-java/icedtea-bin/files/icedtea6-bin.env
@@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/files/icedtea6-bin.env,v 1.1 2011/10/30 13:53:19 caster Exp $
+
+VERSION="IcedTea6-bin @PV@"
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea6-bin-@PV@"
+JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea6-bin-@PV@"
+JAVAC=${JAVA_HOME}/bin/javac
+PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
+LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
+MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea6-bin-@PV@/man"
+PROVIDES_TYPE="JDK JRE"
+PROVIDES_VERSION="1.6"
+# Taken from sun.boot.class.path property
+BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
+GENERATION="2"
+ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/icedtea-bin/icedtea-bin-1.10.3-r2.ebuild b/dev-java/icedtea-bin/icedtea-bin-1.10.3-r2.ebuild
new file mode 100644
index 000000000000..23c72227bd6b
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-1.10.3-r2.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-1.10.3-r2.ebuild,v 1.1 2011/10/30 13:53:19 caster Exp $
+
+EAPI="3"
+
+inherit java-vm-2
+
+# this ebuild is for package+slot move from icedtea6-bin
+# and the installation thus follows the old layout
+# future versions will change it
+XPN="icedtea6-bin"
+XP="${XPN}-${PV}"
+
+dist="http://dev.gentoo.org/~caster/distfiles/"
+DESCRIPTION="A Gentoo-made binary build of the icedtea6 JDK"
+TARBALL_VERSION="${PV}-r1"
+SRC_URI="amd64? ( ${dist}/${XPN}-core-${TARBALL_VERSION}-amd64.tar.bz2
+		${dist}/${XPN}-libpng15-${TARBALL_VERSION}-amd64.tar.bz2 )
+	x86? ( ${dist}/${XPN}-core-${TARBALL_VERSION}-x86.tar.bz2
+		${dist}/${XPN}-libpng15-${TARBALL_VERSION}-x86.tar.bz2 )
+	doc? ( ${dist}/${XPN}-doc-${TARBALL_VERSION}.tar.bz2 )
+	examples? (
+		amd64? ( ${dist}/${XPN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
+		x86? ( ${dist}/${XPN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
+	)
+	nsplugin? (
+		amd64? ( ${dist}/${XPN}-nsplugin-${PVR}-amd64.tar.bz2 )
+		x86? ( ${dist}/${XPN}-nsplugin-${PVR}-x86.tar.bz2 )
+	)
+	source? ( ${dist}/${XPN}-src-${TARBALL_VERSION}.tar.bz2 )"
+HOMEPAGE="http://icedtea.classpath.org"
+
+IUSE="X alsa doc examples nsplugin source"
+RESTRICT="strip"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="6"
+KEYWORDS="amd64 x86"
+
+S="${WORKDIR}/${XP}"
+
+RDEPEND=">=sys-devel/gcc-4.3
+	>=sys-libs/glibc-2.11.2
+	>=media-libs/giflib-4.1.6-r1
+	virtual/jpeg
+	>=media-libs/libpng-1.4
+	>=sys-libs/zlib-1.2.3-r1
+	"
+PDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.20 )
+	X? (
+		>=media-libs/freetype-2.3.9:2
+		>=media-libs/fontconfig-2.6.0-r2:1.0
+		>=x11-libs/libXext-1.1
+		>=x11-libs/libXi-1.3
+		>=x11-libs/libXtst-1.1
+		>=x11-libs/libX11-1.3
+		x11-libs/libXt
+	)
+	nsplugin? (
+		>=dev-libs/atk-1.30.0
+		>=dev-libs/glib-2.20.5:2
+		>=dev-libs/nspr-4.8
+		>=x11-libs/cairo-1.8.8
+		>=x11-libs/gtk+-2.20.1:2
+		>=x11-libs/pango-1.24.5
+	)"
+DEPEND=""
+
+pkg_setup() {
+	java-vm-2_pkg_setup
+	VMHANDLE="${XPN}"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	if has_version '>=media-libs/libpng-1.5.0'; then
+		einfo "Installing libpng-1.5 ABI version"
+		local arch=${ARCH}
+		use x86 && arch=i386
+		mv -v ${XP}-libpng15/jre/lib/${arch}/*.so ${XP}/jre/lib/${arch} || die
+	else
+		elog "Installing libpng-1.4 ABI version"
+		elog "You will have to remerge icedtea6-bin after upgrading to libpng-1.5"
+		elog "Note that revdep-rebuild will not do it automatically due to the mask file."
+	fi
+}
+
+src_install() {
+	local dest="/opt/${XP}"
+	local ddest="${D}/${dest}"
+	dodir "${dest}" || die
+
+	local arch=${ARCH}
+
+	# doins can't handle symlinks.
+	cp -pRP bin include jre lib man "${ddest}" || die "failed to copy"
+
+	dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README} || die
+	if use doc ; then
+		dohtml -r ../doc/html/* || die "Failed to install documentation"
+	fi
+
+	if use examples; then
+		cp -pRP share/{demo,sample} "${ddest}" || die
+	fi
+
+	if use source ; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	if use nsplugin ; then
+		cd ..
+		cp -pPR icedtea6-web-bin "${D}/opt/"
+		install_mozilla_plugin "/opt/icedtea6-web-bin/$(get_libdir)/IcedTeaPlugin.so"
+		docinto icedtea-web
+		dodoc doc/icedtea-web/*
+	fi
+
+	set_java_env
+	java-vm_revdep-mask "/opt/${XP}"
+}
+
+pkg_postinst() {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+
+	if use nsplugin; then
+		elog "The icedtea6-bin browser plugin can be enabled using eselect java-nsplugin"
+		elog "Note that the plugin works only in browsers based on xulrunner-1.9.1+"
+		elog "such as Firefox 3.5+ and recent Chromium versions."
+	fi
+}
diff --git a/dev-java/icedtea-bin/icedtea-bin-1.10.4.ebuild b/dev-java/icedtea-bin/icedtea-bin-1.10.4.ebuild
new file mode 100644
index 000000000000..32e3f979c8a0
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-1.10.4.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-1.10.4.ebuild,v 1.1 2011/10/30 13:53:19 caster Exp $
+
+EAPI="3"
+
+inherit java-vm-2
+
+# this ebuild is for package+slot move from icedtea6-bin
+# and the installation thus follows the old layout
+# future versions will change it
+XPN="icedtea6-bin"
+XP="${XPN}-${PV}"
+
+dist="http://dev.gentoo.org/~caster/distfiles/"
+DESCRIPTION="A Gentoo-made binary build of the icedtea6 JDK"
+TARBALL_VERSION="${PV}"
+SRC_URI="amd64? ( ${dist}/${XPN}-core-${TARBALL_VERSION}-amd64.tar.bz2 )
+	x86? ( ${dist}/${XPN}-core-${TARBALL_VERSION}-x86.tar.bz2 )
+	doc? ( ${dist}/${XPN}-doc-${TARBALL_VERSION}.tar.bz2 )
+	examples? (
+		amd64? ( ${dist}/${XPN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
+		x86? ( ${dist}/${XPN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
+	)
+	nsplugin? (
+		amd64? ( ${dist}/${XPN}-nsplugin-${TARBALL_VERSION}-amd64.tar.bz2 )
+		x86? ( ${dist}/${XPN}-nsplugin-${TARBALL_VERSION}-x86.tar.bz2 )
+	)
+	source? ( ${dist}/${XPN}-src-${TARBALL_VERSION}.tar.bz2 )"
+HOMEPAGE="http://icedtea.classpath.org"
+
+IUSE="X alsa doc examples nsplugin source"
+RESTRICT="strip"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="6"
+KEYWORDS="~amd64 x86"
+
+S="${WORKDIR}/${XP}"
+
+RDEPEND=">=sys-devel/gcc-4.3
+	>=sys-libs/glibc-2.11.2
+	>=media-libs/giflib-4.1.6-r1
+	virtual/jpeg
+	>=media-libs/libpng-1.5
+	>=sys-libs/zlib-1.2.3-r1
+	"
+PDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.20 )
+	X? (
+		>=media-libs/freetype-2.3.9:2
+		>=media-libs/fontconfig-2.6.0-r2:1.0
+		>=x11-libs/libXext-1.1
+		>=x11-libs/libXi-1.3
+		>=x11-libs/libXtst-1.1
+		>=x11-libs/libX11-1.3
+		x11-libs/libXt
+	)
+	nsplugin? (
+		>=dev-libs/atk-1.30.0
+		>=dev-libs/glib-2.20.5:2
+		>=dev-libs/nspr-4.8
+		>=x11-libs/cairo-1.8.8
+		>=x11-libs/gtk+-2.20.1:2
+		>=x11-libs/pango-1.24.5
+	)"
+DEPEND=""
+
+pkg_setup() {
+	java-vm-2_pkg_setup
+	VMHANDLE="${XPN}"
+}
+
+src_install() {
+	local dest="/opt/${XP}"
+	local ddest="${D}/${dest}"
+	dodir "${dest}" || die
+
+	local arch=${ARCH}
+
+	# doins can't handle symlinks.
+	cp -pRP bin include jre lib man "${ddest}" || die "failed to copy"
+
+	dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README} || die
+	if use doc ; then
+		dohtml -r ../doc/html/* || die "Failed to install documentation"
+	fi
+
+	if use examples; then
+		cp -pRP share/{demo,sample} "${ddest}" || die
+	fi
+
+	if use source ; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	if use nsplugin ; then
+		cd ..
+		cp -pPR icedtea6-web-bin "${D}/opt/"
+		install_mozilla_plugin "/opt/icedtea6-web-bin/$(get_libdir)/IcedTeaPlugin.so"
+		docinto icedtea-web
+		dodoc doc/icedtea-web/*
+	fi
+
+	set_java_env
+	java-vm_revdep-mask "/opt/${XP}"
+}
+
+pkg_postinst() {
+	# Set as default VM if none exists
+	java-vm-2_pkg_postinst
+
+	if use nsplugin; then
+		elog "The icedtea6-bin browser plugin can be enabled using eselect java-nsplugin"
+		elog "Note that the plugin works only in browsers based on xulrunner-1.9.1+"
+		elog "such as Firefox 3.5+ and recent Chromium versions."
+	fi
+}
diff --git a/dev-java/icedtea-bin/metadata.xml b/dev-java/icedtea-bin/metadata.xml
new file mode 100644
index 000000000000..250f2d1940ea
--- /dev/null
+++ b/dev-java/icedtea-bin/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+</pkgmetadata>