delete old ebuild

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/genlink@2477 6952d904-891a-0410-993b-d76249ca496b
2010-10-06 04:20:09 +00:00 · 2010-10-06 04:20:09 +00:00 · bd876bbeca
commit bd876bbeca
parent cfb4a35921
8 changed files with 0 additions and 1570 deletions
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@ -1,477 +0,0 @@
-# ChangeLog for dev-java/icedtea
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  12 Feb 2010; Mario Fetka <mario.fetka@gmail.com> icedtea-6.1.7.ebuild,
-  icedtea-7.1.12.ebuild:
-  add arm keyword
-
-  10 Feb 2010; Mario Fetka <mario.fetka@gmail.com> icedtea-6.1.7.ebuild,
-  icedtea-7.1.12.ebuild:
-  Bump to newest snapshot from java overlay
-
-  09 Feb 2010; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.7.ebuild,
-  icedtea-7.1.12.ebuild:
-  Add missing app-arch/zip dependency for #258423 and fix some repoman warnings.
-
-  06 Feb 2010; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.7.ebuild,
-  icedtea-7.1.12.ebuild:
-  Add missing package-list files - bug #302654.
-
-  05 Feb 2010; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.7.ebuild,
-  icedtea-7.1.12.ebuild:
-  Honor user-set JAVA_PKG_FORCE_VM for easier troubleshooting as suggested by
-  Dennis Schridde <devurandom@gmx.net> in bug #294027.
-
-  05 Feb 2010; Vlastimil Babka <caster@gentoo.org> icedtea-7.1.12.ebuild:
-  Restrict autoconf dependency to avoid 2.64 for bug #257596.
-
-  05 Feb 2010; Vlastimil Babka <caster@gentoo.org> icedtea-7.1.12.ebuild:
-  Restrict xulrunner dependency to <1.9.2 for bug #303535.
-
-  04 Feb 2010; Vlastimil Babka <caster@gentoo.org> icedtea-7.1.12.ebuild:
-  Reorder VM forcing to place icedtea:6 last (seems not work, might kill it
-  completely), fix checking for rebuild with icedtea:7, remove double
-  java-*_pkg_setup calls.
-
-  04 Feb 2010; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.7.ebuild,
-  icedtea-7.1.12.ebuild:
-  Depend on virtual/libffi - bug #302692. For icedtea:6, use slot deps where
-  appropriate, block on icedtea6 due to file collisions, and add more
-  information in postinst message about plugins. or icedtea:7, also use slot
-  deps, block on icedtea:0 and add missing slot variants to the VM choosing
-  logic.
-
-29 Jan 2010; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea-6.1.7.ebuild:
-	Lower jpeg requirement; 1.7 works with 6b, 7 and 8 properly.
-
-29 Jan 2010; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea-6.1.7.ebuild icedtea-7.1.12.ebuild:
-	Fix LICENSE to include all licenses used by OpenJDK.
-	
-29 Jan 2010; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea-6.1.7.ebuild icedtea-7.1.12.ebuild:
-	Combine IcedTea6 and IcedTea ebuilds, prefixing 6 or 7 to version number.
-	
-28 Jan 2010; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.7.ebuild
-	Add hs16 USE flag so HotSpot 16 can be turned off.
-	
-28 Jan 2010; Vlastimil Babka <caster@gentoo.org> icedtea6-1.7.ebuild:
-	Fix issue with merging binpkg as mentioned in bug #258423.
-
-* icedtea6-1.7 (27 01 2010)
-
-27 Jan 2010; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.7.ebuild
-	icedtea6-1.5.3-r1.ebuild icedtea6-1.6.2-r1.ebuild files/splitdebug.patch
-	files/1.5-cacao-gcc-4.4.patch files/1.6.1-shmproto.patch files/1.6.1-jpeg7.patch
-	files/1.6.2-jpeg8.patch:
-	Bump to new release.  Drop old releases.
-	
-22 Jan 2010; Vlastimil Babka <caster@gentoo.org> +files/1.6.2-jpeg8.patch,
-  icedtea6-1.6.2-r1.ebuild, +icedtea6-1.6.2-r2.ebuild:
-  Revbump that builds against jpeg-8.
-
-* icedtea6-1.6.2-r1 (11 12 2009)
-* icedtea6-1.5.3-r1 (11 12 2009)
-
-11 Dec 2009; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.6.2-r1.ebuild
-	icedtea6-1.5.3-r1.ebuild:
-	Bump.  Include Andrew Haley's debuginfo patch so that jmap works when the
-	splitdebug feature is enabled.
-
-10 Dec 2009; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea-1.12.ebuild:
-	Support building using IcedTea7.
-	
-10 Dec 2009; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.6.2.ebuild
-	icedtea6-1.5.3.ebuild:
-	Don't use IcedTea7 to build.  Using a later version is not supported.
-
-20 Nov 2009; Vlastimil Babka <caster@gentoo.org> icedtea-1.12.ebuild,
-  +files/1.12-shmproto.patch:
-  Fix building with new X headers - bug #288855.
-
-* icedtea-1.12 (17 11 2009)
-
-17 Nov 2009; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea-1.12.ebuild:
-	Bump.
-	
-* icedtea6-1.6.2 (09 11 2009)
-* icedtea6-1.5.3 (09 11 2009)
-
-09 Nov 2009; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.6.2.ebuild
-	icedtea6-1.5.3.ebuild:
-	New security releases (1.5.3, 1.6.2):
-	- (CVE-2009-3728) ICC_Profile file existence detection information leak (6631533)
-	- (CVE-2009-3885) BMP parsing DoS with UNC ICC links (6632445)
-	- (CVE-2009-3881) resurrected classloaders can still have children (6636650) 
-	- (CVE-2009-3882) Numerous static security flaws in Swing (findbugs) (6657026)
-	- (CVE-2009-3883) Mutable statics in Windows PL&F (findbugs) (6657138)
-	- (CVE-2009-3880) UI logging information leakage (6664512)
-	- (CVE-2009-3879) GraphicsConfiguration information leak (6822057)
-	- (CVE-2009-3884) zoneinfo file existence information leak (6824265)
-	- (CVE-2009-2409) deprecate MD2 in SSL cert validation (Kaminsky) (6861062)
-	- (CVE-2009-3873) JPEG Image Writer quantization problem (6862968)
-	- (CVE-2009-3875) MessageDigest.isEqual introduces timing attack vulnerabilities (6863503)
-	- (CVE-2009-3876, CVE-2009-3877) OpenJDK ASN.1/DER input stream parser denial of service (6864911)
-	- (CVE-2009-3869) JRE AWT setDifflCM stack overflow (6872357)
-	- (CVE-2009-3874) ImageI/O JPEG heap overflow (6874643
-	- (CVE-2009-3871) JRE AWT setBytePixels heap overflow (6872358)
-	Drop 1.2, 1.3 and 1.4 releases and associated patches.
-	
-29 Oct 2009; Vlastimil Babka <caster@gentoo.org>
-  +files/1.6.1-shmproto.patch, icedtea6-1.6.1-r1.ebuild:
-  Fix building with new libXext - bug #288855.
-
-11 Oct 2009; Vlastimil Babka <caster@gentoo.org> +files/1.6.1-jpeg7.patch,
-  +icedtea6-1.6.1-r1.ebuild, +files/generate-cacerts.pl:
-  Revbump that fixes issues with jpeg-7 (bug #283248), generates cacerts file
-  from ca-certificates so that SSL works (bug #273306) and adds postinst info
-  about nsplugin compatibility (bug #251344).
-
-* icedtea6-1.6.1 (21 09 2009)
-
-21 Sep 2009; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.6.1.ebuild:
-	New major release (1.6):
-	- Added java method tracing using systemtap version 0.9.9+.
-	- Security fixes for:
-	CVE-2009-2670 - OpenJDK Untrusted applet System properties access
-	CVE-2009-2671 CVE-2009-2672 - OpenJDK Proxy mechanism information leaks
-	CVE-2009-2673 - OpenJDK proxy mechanism allows non-authorized socket connections
-	CVE-2009-2674 - Java Web Start Buffer JPEG processing integer overflow
-	CVE-2009-2675 - Java Web Start Buffer unpack200 processing integer overflow
-	CVE-2009-2625 - OpenJDK XML parsing Denial-Of-Service
-	CVE-2009-2475 - OpenJDK information leaks in mutable variables
-	CVE-2009-2476 - OpenJDK OpenType checks can be bypassed
-	CVE-2009-2689 - OpenJDK JDK13Services grants unnecessary privileges
-	CVE-2009-2690 - OpenJDK private variable information disclosure
-	- FAST interpreter for ARM
-	- Timezone fix: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=377
-	- Stackoverflow error fix: 
-	http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=381
-	- Backport regression (NPE) fix for AccessControlContext fix
-	- Bump to hs14b16
-	- The plugin has been updated to improve stability and cookie support.
-	Support for certificates with mismatched CNs has been added as well.
-	Bug fix update (1.6.1):
-	- Fix no-plugin build
-	- JAR performance improvement (http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/b35f1e5075a4)
-	
-08 Sep 2009; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea-1.11.ebuild:
-	CACAO should be a tar.bz2 not a tar.gz
-	
-* icedtea6-1.5.2 (04 09 2009)
-
-04 Sep 2009; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.5.2.ebuild:
-	Bug fix update:
-	- Timezone fix: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=377
-	- Stackoverflow error fix: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=381
-	- Backport regression (NPE) fix for AccessControlContext fix:
-	  http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=364
-	- Bump to hs14b16
-
-* icedtea-1.11 (26 08 2009)
-
-26 Aug 2009; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea-1.11.ebuild:
-	Bump.  Thanks to Ruediger Gad for reporting the GCC warning failure.
-
-12 Aug 2009; Petteri Räty <betelgeuse@gentoo.org> icedtea6-1.5.1.ebuild:
-  Prefer icedtea6-bin over icedtea6 to avoid circular deps.
-
-* icedtea6-1.5.1 (07 08 2009)
-
-07 Aug 2009; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.5.1.ebuild:
-	Security update.
-
-20 Jul 2009; Petteri Räty <betelgeuse@gentoo.org> icedtea6-1.5.ebuild:
-  Make JAVA_PKG_STRICT happy by adding a DEPEND atom on either ecj or
-  icedtea.
-
-16 Jun 2009; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.5.ebuild files/1.5-cacao-gcc-4.4.patch:
-	Fix issue with CACAO and GCC 4.4.
-
-* icedtea-1.10 (02 06 2009)
-
-02 Jun 2009; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea-1.10.ebuild:
-	Bump.
-
-* icedtea6-1.5 (02 06 2009)
-
-02 Jun 2009; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.5.ebuild:
-	Bump.
-
-18 May 2009; Vlastimil Babka <caster@gentoo.org> icedtea6-1.4.1-r1.ebuild,
-  +files/1.4.1-xulrunner-1.9.1.patch:
-  Add support for API changes in xulrunner 1.9.1_beta4. Backported patch from
-  upstream trunk.
-
-03 May 2009; Vlastimil Babka <caster@gentoo.org> icedtea6-1.4.1-r1.ebuild:
-  Remove unintentional pkgversion change.
-
-18 Apr 2009; Vlastimil Babka <caster@gentoo.org>
-  +files/1.4.1-plugin.patch, +icedtea6-1.4.1-r1.ebuild:
-  Revbump to fix nsplugin. Patch from upstream that was supposed to be in 1.4.1.
-
-* icedtea6-1.4.1 (02 04 2009)
-	
-02 Apr 2009; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.4.1.ebuild:
-	Bump.
-	
-14 Feb 2009; Petteri Räty <betelgeuse@gentoo.org> icedtea6-1.4.ebuild:
-  unset vars in src_compile too so that paludis users don't come asking why
-  it does not work
-
-04 Feb 2009; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.3.1-r2.ebuild icedtea6-1.4.ebuild:
-	Add HotSpot tarball to sources, only unpack icedtea6 (regression from 1.2).
-	
-* icedtea6-1.4 (03 02 2009)
-
-03 Feb 2009; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.4.ebuild:
-	Added.
-	
-28 Jan 2009; Petteri Räty <betelgeuse@gentoo.org> icedtea6-1.3.1-r2.ebuild:
-	Add slot deps to xerces and xalan atoms.
-
-18 Dec 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.3.1-r2.ebuild icedtea6-1.2-r1.ebuild:
-	Remove ~sparc from 1.3, correct copyright headers.
-	
-18 Dec 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.3.1-r2.ebuild icedtea6-1.2-r1.ebuild:
-	Fix find used in permission fixing to not include symbolic links.
-	
-12 Jan 2009; Petteri Räty <betelgeuse@gentoo.org> icedtea6-1.3.1-r2.ebuild:
-	Move configure from src_compile to src_configure as should be done in EAPI 2.
-
-11 Jan 2009; Petteri Räty <betelgeuse@gentoo.org> icedtea6-1.3.1-r2.ebuild:
-	Migrate to EAPI 2.
-
-18 Dec 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.3.1-r2.ebuild:
-	Drop JamVM as it doesn't support -XX.
-
-*icedtea6-1.2-r1 (18 12 2008)
-
-18 Dec 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.2-r1.ebuild files/security-20081202-1.2.patch:
-	Backport security updates to 1.2.
-
-*icedtea6-1.3.1-r2 (18 12 2008)
-
-18 Dec 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.3.1-r2.ebuild files/security-20081202.patch:
-	Security update; bumping revision to ensure this gets out.
-	Also adding support for icedtea6-bin.
-	
-11 Dec 2008; Vlastimil Babka <caster@gentoo.org> icedtea6-1.2.ebuild,
-	icedtea6-1.3.1-r1.ebuild:
-	Add missing libXtst dep.
-
-03 Dec 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.3.1-r1.ebuild files/arch-prefix.patch:
-	Prefix 32-bit builds with 'linux32'.
-	
-01 Dec 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.3.1-r1.ebuild files/cacao-alias.patch:
-	Remove javac.in patch (gcj's java is now fixed) and add
-	support for building CACAO on mixed architectures (e.g. ppc64 with 32bit ul).
-	
-01 Dec 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.3.1-r1.ebuild icedtea6-1.2.ebuild:
-	Add missing X11 dependencies (libXp, libXt, libXau, libXdmcp)
-	
-30 Nov 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.3.1-r1.ebuild files/javac.in.patch:
-        Ensure the native version of ecj is used if available by passing the gcj
-	database to java in javac.in.
-	
-10 Nov 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.3.1-r1.ebuild:
-	Bug 245428;
-	Work with the hack added to the newer Ant builds to properly support environment
-	variables.
-	
-10 Nov 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.3.1-r1.ebuild:
-	Depend on xulrunner only; apparently firefox 3 doesn't always provide
-	enough for the XPCOM plugin.
-	
-10 Nov 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.3.1-r1.ebuild:
-	Restore jdk 1.5 dependency for VM 'magic'.
-	
-08 Nov 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.3.1-r1.ebuild:
-	Move Rhino to runtime dependencies.
-	
-08 Nov 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.3.1-r1.ebuild:
-	Restore libXp fix
-
-07 Nov 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.3.1-r1.ebuild:
-	Remove broken modifications again!
-	
-30 Oct 2008; Vlastimil Babka <caster@gentoo.org> icedtea6-1.3.1-r1.ebuild:
-	Restore my 1.3.1 modifications in 1.3.1-r1.
-
-30 Oct 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.3.1-r1.ebuild:
-	Add missing libXp dependency.
-	
-30 Oct 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.3.1-r1.ebuild:
-	Add back Caster's JAVA_PKG_FORCE_VM hack.
-	
-*icedtea6-1.3.1-r1 (29 10 2008)
-
-29 Oct 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.3.1-r1.ebuild:
-	Switch to new plugin, cleanup ecj dependency, remove --with-gcj in favour
-	of new ecj ebuild and bump to revision 1.
-
-29 Oct 2008; Vlastimil Babka <caster@gentoo.org> icedtea6-1.3.1.ebuild:
-	Change virtual/icedtea-jdk dep to dev-java/icedtea6 dependency to
-	workaround situations where the virtual is not yet installed although
-	icedtea6 is, and portage tries to satisfy the gnu-classpath instead. Hack
-	around with JAVA_PKG_FORCE_VM to select appropriate jdk for building
-	without need to set it as system vm or in jdk.conf. Put rhino also in
-	RDEPEND to fix building with java-strict until I get to know if it's
-	build-only dep or not.
-
-28 Oct 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.3.1.ebuild icedtea6-1.2.ebuild:
-	Add x11-proto/xineramaproto.
-
-*icedtea6-1.3.1 (27 10 2008)
-
-27 Oct 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.3.1.ebuild files/hotspot-1.3.1.patch:
-	Bump to new IcedTea6 1.3.1 release.
-	
-20 Oct 2008; Petteri Räty <betelgeuse@gentoo.org> +files/icedtea6-1.3-autoconf.patch, icedtea6-1.3-r1.ebuild:
-	Add patch for autoconf. Fixes bug #242746. Thanks to Alon Bar-Lev
-	<alon.barlev@gmail.com>.
-
-19 Oct 2008; Petteri Räty <betelgeuse@gentoo.org> icedtea6-1.3-r1.ebuild:
-	Fix pulseaudio dependency atom.
-
-19 Oct 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.3-r1.ebuild:
-	Drop out if trying to bootstrap due to the broken tarball issue.
-	Add PulseAudio support.
-	
-16 Oct 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> files/icedtea6.env:
-	Fixed naming of icedtea6 install directory.
-	
-16 Oct 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.3-r1.ebuild:
-	Allow a CACAO build to build a normal IcedTea.
-
-*icedtea6-1.3-r1 (16 10 2008)
-
-15 Oct 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.3-r1.ebuild:
-	Fixed naming of icedtea6 install directory and added cacao and shark options.
-
-15 Oct 2008; Vlastimil Babka <caster@gentoo.org> icedtea6-1.3.ebuild:
-	Prefer ecj 3.3 over 3.2
-
-*icedtea6-1.3 (15 10 2008)
-
-15 Oct 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.3.ebuild:
-	Added (based on icedtea6-9999).
-
-13 Oct 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.2.ebuild:
-	Fix use of zero flag.
-	
-12 Oct 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.2.ebuild:
-	Remove Gentoo-specific patches and force java, javac and javah with
-	locations from GENTOO_VM.
-	
-09 Oct 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.2.ebuild:
-	Port back debug fix from 9999 ebuild and add JDK check.
-	
-08 Oct 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.2.ebuild:
-	Depend on gnu-classpath-jdk and icedtea-jdk.
-	
-14 Sep 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> files/enable_fix-1.2.patch:
-	Remove prefix on left file in patch; epatch no longer seems to like this.
-	
-14 Sep 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> files/security_and_versioning.patch:
-        Correct placement of version.
-	
-14 Sep 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.2.ebuild files/security_and_versioning.patch:
-	Backport security fixes and include the version number and 'gentoo' in
-	the versioning.
-	
-15 Aug 2008; Petteri Räty <betelgeuse@gentoo.org> icedtea6-9999.ebuild:
-        Remove KEYWORDS from the live ebuild so that users get 1.2 by default.
-
-07 Aug 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-9999.ebuild:
-        Fix rhino_jar declaration.
-	
-01 Aug 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> metadata.xml:
-	Document zero USE flag.
-
-01 Aug 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea-1.7.ebuild icedtea-9999.ebuild:
-        Use dest not ddest for examples directory creation.
-
-31 Jul 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.2.ebuild icedtea6-9999.ebuild:
-        Create directory for examples.
-
-29 Jul 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-9999.ebuild:
-        Only check for Rhino jar when enabled.
-	
-28 Jul 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-9999.ebuild:
-        Remove >= from Rhino dependency following previous change.
-	
-27 Jul 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-9999.ebuild:
-        Use slots for Rhino dependency.
-	
-24 Jul 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-9999.ebuild:
-	Fixing naming of directory from Mercurial eclass.
-
-24 Jul 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-9999.ebuild:
-    Fix Mercurial ebuild to use (undocumented) Mercurial eclass.
-	
-*icedtea6-9999 (24 07 2008)
-
-24 Jul 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-9999.ebuild:
-	New ebuild for current Mercurial version.
-	
-12 Jul 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.1.ebuild icedtea6-1.2.ebuild
-	files/motif.patch files/motif-config.patch files/motif-make.patch:
-        Remove motif dependency and 1.1 ebuild.
-
-19 Jul 2008; James Le Cuirot <chewi@aura-online.co.uk>
-  icedtea6-1.1.ebuild, icedtea6-1.2.ebuild:
-  Add missing inputproto dependency.
-
-17 Jul 2008; James Le Cuirot <chewi@aura-online.co.uk>
-  icedtea6-1.1.ebuild, icedtea6-1.2.ebuild:
-  Make sure ecj 3.4 isn't used because it doesn't work. Also remove duplicate
-  ant-core dependency.
-
-14 Jul 2008; James Le Cuirot <chewi@aura-online.co.uk>
-  icedtea6-1.1.ebuild, icedtea6-1.2.ebuild:
-  Make sure only one version of ecj is passed to configure.
-
-12 Jul 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> metadata.xml:
-	Fix reference to OpenJDK to say OpenJDK6.
-
-12 Jul 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.1.ebuild icedtea6-1.2.ebuild:
-        Fix ecj building, cleanups and port changes to 1.1.
-	
-12 Jul 2008; James Le Cuirot <chewi@aura-online.co.uk> icedtea6-1.2.ebuild:
-	Add IcedTea upgrade functionality, cleanups and break ecj.
-
-02 Jul 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.1.ebuild icedtea6-1.2.ebuild:
-        x86 architecture should be i586 for build directory, and i386 for plugin (!?!?)
-	
-30 Jun 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.1.ebuild icedtea6-1.2.ebuild:
-	x86 architecture should be 'i386' apparently
-
-30 Jun 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> files/javac.in.patch:
-        Remove the -J from the memory option.
-	
-30 Jun 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.1.ebuild icedtea6-1.2.ebuild files/javac.in.patch:
-	Patch javac.in as well so it also gets the benefit of the new memory option.
-
-30 Jun 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.1.ebuild icedtea6-1.2.ebuild:
-	Supply ecj.jar directly to configure.
-
-30 Jun 2008: Andrew John Hughes <gnu_andrew@member.fsf.org> files/icedtea6-1.1.env files/icedtea6-1.2.env files/icedtea6.env:
-        Removed version-specific environments (which are identical anyway).
-
-29 Jun 2008: Andrew John Hughes <gnu_andrew@member.fsf.org> files/javac_fix-1.1.patch files/javac_fix-1.2.patch icedtea6-1.1.ebuild icedtea6-1.2.ebuild:
-        Use Classpath's javac detection.
-
-26 Jun 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.1.ebuild icedtea6-1.2.ebuild:
-
-	Remove slot allocation, making both 0.
-	
-01 Jun 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> files/gjar-1.1.patch files/gjar-1.2.patch icedtea6-1.1.ebuild icedtea6-1.2.ebuild:
-        Fix gjar patches for both versions of icedtea6 and note source of each patch.
-	
-30 May 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> files/gjar.patch icedtea6-1.1.ebuild icedtea6-1.2.ebuild:
-	Add fix for jar cfm@ issue and revert icedtea6-1.2 to depending on virtual/jdk-1.5.
-	
-*icedtea6-1.2 (29 05 2008)
-
-29 May 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.2.ebuild:
-	Added.
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@ -1,23 +0,0 @@
-AUX 1.12-shmproto.patch 960 RMD160 089e0b02a8403c1111624c2cd0406a76bf56fe3b SHA1 08a20bef2677eb3516671c301e73b60e2e49ef25 SHA256 a48cb862ccff03196ec154739865fbc10184da5cbd3a182fd258b462bda83ae7
-AUX generate-cacerts.pl 11051 RMD160 9b874c62ffa0afe16353f1e7b32f124f1d31356f SHA1 65e55b84506ecf14711db0996eccf3cfba2fe9e3 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433
-AUX icedtea.env 1007 RMD160 be7110fe28b8fe108b2c1f091282f9cfae7a456b SHA1 126c17cf3d8893070178a9702fa6b44a42645f65 SHA256 bd7aec8e804cfc51b9056c5c4dead5b97d8a27950e117a2d711aed177c796506
-DIST 0dc08d528c99.tar.gz 49168 RMD160 461e15e8a8b268d372e6d6a34a937e41e1fb0b23 SHA1 5dc26fc6570f16e8754540eebb50d44036b63f11 SHA256 2005bf1e10bfd49002368088e34f26e86652f175ad827824ccfd9cbc0b840512
-DIST 62926c7f67a3.tar.gz 8080848 RMD160 1d9a41c4efddb75181b5cc5e301be4d4d1aead56 SHA1 0cf4d7b56da4edfeab47d413d6bb1b810e347b3f SHA256 fedfee5b5eb0acf4e7c3b90f46c02318e512a67034364d90c411f2b8e3a31cc6
-DIST 83367f01297b.tar.gz 1925467 RMD160 0b2089075c588e2e890aca77a1bba805ceb03df4 SHA1 a9fd477314836c29ed018c7c09169fb25a9e65fe SHA256 01c43af5d3da14ff9a96e769d212b2297c2c6756b28cc6a6d6f00148c2eded26
-DIST b4ab978ce52c.tar.gz 8121502 RMD160 a74e0985537a63363aef1c97d0256eb898f7be88 SHA1 f86f73a6b1458e8a6aeee617bc3af91270baf33d SHA256 1b035a9bf71072b9f60c144c143d501b107a83a009ed31c90c8d0b6d3482a940
-DIST cacao-0.99.4.tar.bz2 2876200 RMD160 94aff00e7e9c10cd36f626e86a9ad8100a72d79b SHA1 e786a21c0f3f8fc1394e5a2a7a3e5607116760ec SHA256 1dfc4903dc0172286df4f1740fd0f12749ac81d51c602290b47cbe83d51e1d56
-DIST cacao-0.99.4.tar.gz 3917411 RMD160 bde50674e07c3a1e6ed8c4a8fdc6273a2a23dd1a SHA1 d9d159f8f905a9fa53ea7ae0f50a442dbd6b5e84 SHA256 c6090c1d2ed3c60acda0076b62563598267be8dab270ce49ee1035002a2510cf
-DIST d728db3889da.tar.gz 1458573 RMD160 a5db577175f8532f78d8580fd636c7a0b625612b SHA1 84570fb6108bb6cdb28caa19905ed9b35aaf2be6 SHA256 67824d9e0e21a1b5b55ee6ebc079260672d7d2ed7b9cfabf0cfe67ffd3160f34
-DIST f0bfd9bd1a0e.tar.gz 72004 RMD160 58e1dfe336ff90063e39a077b91ea99b79678242 SHA1 4de536b309666e3c10c13e59c3aaa31f4f7308a8 SHA256 6a28cd0ba1bcc4290175497e6cfe11295a8e4f82f4c030b3e5686f7c48297936
-DIST fb2ee5e96b17.tar.gz 41664102 RMD160 1a073c3da4a15121c078f4d928241e5449c61173 SHA1 84ccd6d46f859eb1607fdaa64d3f7089a8c06c5a SHA256 dc409e64ef6e7b310d9e7292b15200529b8e6960404a8751c0ec38bb781a0319
-DIST fb68fd18eb9f.tar.gz 48446 RMD160 64650792e35dc8c1cfe6a97597617f1158da9371 SHA1 a7d2a460626a6144bb7698b6591319ae854ec9ba SHA256 7f2f16538bb51081e8483b252f59a2e6e70ba3c33341ed85eaa1532e9fc93dcd
-DIST icedtea-1.12.tar.gz 5792501 RMD160 77fc1b6364b4bf9ff4ce9c3e76774869be570271 SHA1 20b85b6f5604aa143f6bcf3fab8929f58c7e31eb SHA256 e147655d1933d296307d82b1f39fdec84a967cd74392242c3a87a2b053b4427a
-DIST icedtea6-1.7.tar.gz 6086264 RMD160 3d15bad7571c8953064adec4900efe5ed432016c SHA1 17a805d4254a8a8e7c5d759ce5043353114f21ea SHA256 fe91d2e0f4855760c7783df0581637bd7247a81e14b3635e8cfa2767500191a1
-DIST jdk7-jaf-2009_08_28.zip 69593 RMD160 c8a7a8b2663efce6fbd7377b04392be8496affb3 SHA1 8d5607ebf07eb4a57a48e9f4c1738f344e36ac7e SHA256 8c81940b3017c0058367d7e7453123442f2cdd77c2bfe74acd9035f97e4db8e8
-DIST jdk7-jaxp-m5.zip 5898701 RMD160 3262630984c464a5e6eef5d1f76aadbb65b5bcfc SHA1 3caa5ec0687340b04ff0b7f9db454355b18e23f5 SHA256 ebab4c6c4e641a4c95a7b6669e78f9bb1149a11054fc5b423cf292b633d6be53
-DIST jdk7-jaxws-2009_09_28.zip 5446378 RMD160 430b6c8ecf67933fbee23e2622438995062999d4 SHA1 657a69e811dc66bdd09819ce3d8892be35882945 SHA256 272756b999e9ae2435da8d58e259562e61126e1c5b1f9421fe65423217cef8fd
-DIST openjdk-6-src-b17-14_oct_2009.tar.gz 50029293 RMD160 eae59f50916265a4b8e8179b8a7c5eee8b0402de SHA1 096c843f674d231e9b134057339fd1f2b63f6d9d SHA256 2019a4c3d2d14620caa78d7df49fd987a041066b4631bde4fd8424033f3c1785
-EBUILD icedtea-6.1.7.ebuild 10682 RMD160 5c359043770be93f7900448471ed1e456d4ae685 SHA1 3b399171c085c00684de8735662e7155e6ada451 SHA256 65dfa833c2e1059f8c6805f324a4b3c5bc5cee1e48b8db1cb14cc36c6a82caba
-EBUILD icedtea-7.1.12.ebuild 10943 RMD160 065f7b74f39ba8dff9a263139b0203f2a6fac6d9 SHA1 23f83e932648fba49b1878700b004fb462deef17 SHA256 11228d1a8c189a1a917a5820e23d22f1ec4d9282c023e83e3278beb1577bd733
-MISC ChangeLog 21247 RMD160 21bc5243ed8c28a8cd28a21169c358f73fca5f2e SHA1 a0cc8c8abe033414c16121b9d6bcb5f78120a87f SHA256 57c2f469d6bbbb058e3edb71003aa80fdbcc7f0cb7a9b7ccfc36167633c25af0
-MISC metadata.xml 1162 RMD160 c3e931a80446501033f79a0886cb0b4835882701 SHA1 5d14dab9cf8289bbdf9d7a4834a0d80594f602ab SHA256 dc617ed10b4218de991ee411797c7eba819e706145719e52f3913b8362956a7c
--- a/dev-java/icedtea/files/1.12-shmproto.patch
+++ b/dev-java/icedtea/files/1.12-shmproto.patch
@ -1,28 +0,0 @@
--- /dev/null	2009-10-29 20:00:29.463258316 +0100
-+++ patches/icedtea-shmproto.patch	2009-10-29 21:02:36.000000000 +0100
-@@ -0,0 +1,13 @@
-+--- openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c.orig	2009-10-29 21:01:01.000000000 +0100
-++++ openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c	2009-10-29 21:01:56.000000000 +0100
-+@@ -45,6 +45,10 @@
-+ #include <stdlib.h>
-+ 
-+ #include "awt_GraphicsEnv.h"
-++#ifdef MITSHM
-++#include <X11/Xmd.h>
-++#include <X11/extensions/shmproto.h>
-++#endif
-+ #include "awt_Window.h"
-+ #include "awt_util.h"
-+ #include "gdefs.h"
--- Makefile.am.orig	2009-11-20 22:09:16.000000000 +0100
-+++ Makefile.am	2009-11-20 22:08:38.000000000 +0100
-@@ -304,7 +304,8 @@
- 	patches/icedtea-cc-interp-backedge.patch \
- 	patches/icedtea-netx.patch \
- 	patches/icedtea-disable-intree-ec.patch \
-	patches/icedtea-sources.patch
-+	patches/icedtea-sources.patch \
-+	patches/icedtea-shmproto.patch
- 
- if WITH_RHINO
- ICEDTEA_PATCHES += \
--- a/dev-java/icedtea/files/generate-cacerts.pl
+++ b/dev-java/icedtea/files/generate-cacerts.pl
@ -1,358 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright (C) 2007, 2008 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# generate-cacerts.pl generates a JKS keystore named 'cacerts' from
-# OpenSSL's certificate bundle using OpenJDK's keytool.
-
-# First extract each of OpenSSL's bundled certificates into its own
-# aliased filename.
-
-# Downloaded from http://cvs.fedoraproject.org/viewvc/rpms/ca-certificates/F-12/generate-cacerts.pl?revision=1.2
-# Check and prevention of duplicate aliases added by Vlastimil Babka <caster@gentoo.org>
-
-$file = $ARGV[1];
-open(CERTS, $file);
-@certs = <CERTS>;
-close(CERTS);
-
-$pem_file_count = 0;
-$in_cert_block = 0;
-$write_current_cert = 1;
-foreach $cert (@certs)
-{
-    if ($cert =~ /Issuer: /)
-    {
-        $_ = $cert;
-        if ($cert =~ /personal-freemail/)
-        {
-            $cert_alias = "thawtepersonalfreemailca";
-        }
-        elsif ($cert =~ /personal-basic/)
-        {
-            $cert_alias = "thawtepersonalbasicca";
-        }
-        elsif ($cert =~ /personal-premium/)
-        {
-            $cert_alias = "thawtepersonalpremiumca";
-        }
-        elsif ($cert =~ /server-certs/)
-        {
-            $cert_alias = "thawteserverca";
-        }
-        elsif ($cert =~ /premium-server/)
-        {
-            $cert_alias = "thawtepremiumserverca";
-        }
-        elsif ($cert =~ /Class 1 Public Primary Certification Authority$/)
-        {
-            $cert_alias = "verisignclass1ca";
-        }
-        elsif ($cert =~ /Class 1 Public Primary Certification Authority - G2/)
-        {
-            $cert_alias = "verisignclass1g2ca";
-        }
-        elsif ($cert =~
-               /VeriSign Class 1 Public Primary Certification Authority - G3/)
-        {
-            $cert_alias = "verisignclass1g3ca";
-        }
-        elsif ($cert =~ /Class 2 Public Primary Certification Authority$/)
-        {
-            $cert_alias = "verisignclass2ca";
-        }
-        elsif ($cert =~ /Class 2 Public Primary Certification Authority - G2/)
-        {
-            $cert_alias = "verisignclass2g2ca";
-        }
-        elsif ($cert =~
-               /VeriSign Class 2 Public Primary Certification Authority - G3/)
-        {
-            $cert_alias = "verisignclass2g3ca";
-        }
-        elsif ($cert =~ /Class 3 Public Primary Certification Authority$/)
-        {
-            $cert_alias = "verisignclass3ca";
-        }
-        # Version 1 of Class 3 Public Primary Certification Authority
-        # - G2 is added.  Version 3 is excluded.  See below.
-        elsif ($cert =~
-               /VeriSign Class 3 Public Primary Certification Authority - G3/)
-        {
-            $cert_alias = "verisignclass3g3ca";
-        }
-        elsif ($cert =~
-               /RSA Data Security.*Secure Server Certification Authority/)
-        {
-            $cert_alias = "verisignserverca";
-        }
-        elsif ($cert =~ /GTE CyberTrust Global Root/)
-        {
-            $cert_alias = "gtecybertrustglobalca";
-        }
-        elsif ($cert =~ /Baltimore CyberTrust Root/)
-        {
-            $cert_alias = "baltimorecybertrustca";
-        }
-        elsif ($cert =~ /www.entrust.net\/Client_CA_Info\/CPS/)
-        {
-            $cert_alias = "entrustclientca";
-        }
-        elsif ($cert =~ /www.entrust.net\/GCCA_CPS/)
-        {
-            $cert_alias = "entrustglobalclientca";
-        }
-        elsif ($cert =~ /www.entrust.net\/CPS_2048/)
-        {
-            $cert_alias = "entrust2048ca";
-        }
-        elsif ($cert =~ /www.entrust.net\/CPS /)
-        {
-            $cert_alias = "entrustsslca";
-        }
-        elsif ($cert =~ /www.entrust.net\/SSL_CPS/)
-        {
-            $cert_alias = "entrustgsslca";
-        }
-        elsif ($cert =~ /The Go Daddy Group/)
-        {
-            $cert_alias = "godaddyclass2ca";
-        }
-        elsif ($cert =~ /Starfield Class 2 Certification Authority/)
-        {
-            $cert_alias = "starfieldclass2ca";
-        }
-        elsif ($cert =~ /ValiCert Class 2 Policy Validation Authority/)
-        {
-            $cert_alias = "valicertclass2ca";
-        }
-        elsif ($cert =~ /GeoTrust Global CA$/)
-        {
-            $cert_alias = "geotrustglobalca";
-        }
-        elsif ($cert =~ /Equifax Secure Certificate Authority/)
-        {
-            $cert_alias = "equifaxsecureca";
-        }
-        elsif ($cert =~ /Equifax Secure eBusiness CA-1/)
-        {
-            $cert_alias = "equifaxsecureebusinessca1";
-        }
-        elsif ($cert =~ /Equifax Secure eBusiness CA-2/)
-        {
-            $cert_alias = "equifaxsecureebusinessca2";
-        }
-        elsif ($cert =~ /Equifax Secure Global eBusiness CA-1/)
-        {
-            $cert_alias = "equifaxsecureglobalebusinessca1";
-        }
-        elsif ($cert =~ /Sonera Class1 CA/)
-        {
-            $cert_alias = "soneraclass1ca";
-        }
-        elsif ($cert =~ /Sonera Class2 CA/)
-        {
-            $cert_alias = "soneraclass2ca";
-        }
-        elsif ($cert =~ /AAA Certificate Services/)
-        {
-            $cert_alias = "comodoaaaca";
-        }
-        elsif ($cert =~ /AddTrust Class 1 CA Root/)
-        {
-            $cert_alias = "addtrustclass1ca";
-        }
-        elsif ($cert =~ /AddTrust External CA Root/)
-        {
-            $cert_alias = "addtrustexternalca";
-        }
-        elsif ($cert =~ /AddTrust Qualified CA Root/)
-        {
-            $cert_alias = "addtrustqualifiedca";
-        }
-        elsif ($cert =~ /UTN-USERFirst-Hardware/)
-        {
-            $cert_alias = "utnuserfirsthardwareca";
-        }
-        elsif ($cert =~ /UTN-USERFirst-Client Authentication and Email/)
-        {
-            $cert_alias = "utnuserfirstclientauthemailca";
-        }
-        elsif ($cert =~ /UTN - DATACorp SGC/)
-        {
-            $cert_alias = "utndatacorpsgcca";
-        }
-        elsif ($cert =~ /UTN-USERFirst-Object/)
-        {
-            $cert_alias = "utnuserfirstobjectca";
-        }
-        elsif ($cert =~ /America Online Root Certification Authority 1/)
-        {
-            $cert_alias = "aolrootca1";
-        }
-        elsif ($cert =~ /DigiCert Assured ID Root CA/)
-        {
-            $cert_alias = "digicertassuredidrootca";
-        }
-        elsif ($cert =~ /DigiCert Global Root CA/)
-        {
-            $cert_alias = "digicertglobalrootca";
-        }
-        elsif ($cert =~ /DigiCert High Assurance EV Root CA/)
-        {
-            $cert_alias = "digicerthighassuranceevrootca";
-        }
-        elsif ($cert =~ /GlobalSign Root CA$/)
-        {
-            $cert_alias = "globalsignca";
-        }
-        elsif ($cert =~ /GlobalSign Root CA - R2/)
-        {
-            $cert_alias = "globalsignr2ca";
-        }
-        elsif ($cert =~ /Elektronik.*Kas.*2005/)
-        {
-            $cert_alias = "extra-elektronikkas2005";
-        }
-        elsif ($cert =~ /Elektronik/)
-        {
-            $cert_alias = "extra-elektronik2005";
-        }
-        # Mozilla does not provide these certificates:
-        #   baltimorecodesigningca
-        #   gtecybertrust5ca
-        #   trustcenterclass2caii
-        #   trustcenterclass4caii
-        #   trustcenteruniversalcai
-        else
-        {
-            # Generate an alias using the OU and CN attributes of the
-            # Issuer field if both are present, otherwise use only the
-            # CN attribute.  The Issuer field must have either the OU
-            # or the CN attribute.
-            $_ = $cert;
-            if ($cert =~ /OU=/)
-            {
-                s/Issuer:.*?OU=//;
-                # Remove other occurrences of OU=.
-                s/OU=.*CN=//;
-                # Remove CN= if there were not other occurrences of OU=.
-                s/CN=//;
-                s/\/emailAddress.*//;
-                s/Certificate Authority/ca/g;
-                s/Certification Authority/ca/g;
-            }
-            elsif ($cert =~ /CN=/)
-            {
-                s/Issuer:.*CN=//;
-                s/\/emailAddress.*//;
-                s/Certificate Authority/ca/g;
-                s/Certification Authority/ca/g;
-            }
-            s/\W//g;
-            tr/A-Z/a-z/;
-            $cert_alias = "extra-$_";
-
-        }
-        while (-e "$cert_alias.pem")
-        {
-            $cert_alias = "$cert_alias" . "_";
-        }
-    }
-    # When it attempts to parse:
-    #
-    # Class 3 Public Primary Certification Authority - G2, Version 3
-    #
-    # keytool says:
-    #
-    # #2: ObjectId: 1.3.6.1.5.5.7.1.1 Criticality=false
-    # Unparseable AuthorityInfoAccess extension due to
-    # java.io.IOException: Invalid encoding of URI
-    #
-    # If we do not exclude this file
-    # openjdk/jdk/test/lib/security/cacerts/VerifyCACerts.java fails
-    # on this cert, printing:
-    #
-    # Couldn't verify: java.security.SignatureException: Signature
-    # does not match.
-    #
-    elsif ($cert =~
-           /A6:0F:34:C8:62:6C:81:F6:8B:F7:7D:A9:F6:67:58:8A:90:3F:7D:36/)
-    {
-        $write_current_cert = 0;
-        $pem_file_count--;
-    }
-    elsif ($cert eq "-----BEGIN CERTIFICATE-----\n")
-    {
-        if ($in_cert_block != 0)
-        {
-            die "$file is malformed.";
-        }
-        $in_cert_block = 1;
-        if ($write_current_cert == 1)
-        {
-            $pem_file_count++;
-            if (-e "$cert_alias.pem")
-            {
-                print "$cert_alias";
-                die "already exists"
-            }
-            open(PEM, ">$cert_alias.pem");
-            print PEM $cert;
-        }
-    }
-    elsif ($cert eq "-----END CERTIFICATE-----\n")
-    {
-        $in_cert_block = 0;
-        if ($write_current_cert == 1)
-        {
-            print PEM $cert;
-            close(PEM);
-        }
-        $write_current_cert = 1
-    }
-    else
-    {
-        if ($in_cert_block == 1 && $write_current_cert == 1)
-        {
-            print PEM $cert;
-        }
-    }
-}
-
-# Check that the correct number of .pem files were produced.
-@pem_files = <*.pem>;
-if (@pem_files != $pem_file_count)
-{
-    print "$pem_file_count";
-    die "Number of .pem files produced does not match".
-        " number of certs read from $file.";
-}
-
-# Now store each cert in the 'cacerts' file using keytool.
-$certs_written_count = 0;
-foreach $pem_file (@pem_files)
-{
-    system "$ARGV[0] -noprompt -import".
-        " -alias `basename $pem_file .pem`".
-        " -keystore cacerts -storepass 'changeit' -file $pem_file";
-    unlink($pem_file);
-    $certs_written_count++;
-}
-
-# Check that the correct number of certs were added to the keystore.
-if ($certs_written_count != $pem_file_count)
-{
-    die "Number of certs added to keystore does not match".
-        " number of certs read from $file.";
-}
--- a/dev-java/icedtea/files/icedtea.env
+++ b/dev-java/icedtea/files/icedtea.env
@ -1,18 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/files/sun-jdk-1.6.env,v 1.3 2007/04/30 11:03:14 betelgeuse Exp $
-
-VERSION="OpenJDK@SLOT@/IcedTea@SLOT@ @PV@"
-JAVA_HOME=/usr/lib/icedtea@SLOT@
-JDK_HOME=/usr/lib/icedtea@SLOT@
-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="/usr/lib/icedtea@SLOT@/man"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.@SLOT@"
-# 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"
--- a/dev-java/icedtea/icedtea-6.1.7.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.7.ebuild
@ -1,325 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
-# *********************************************************
-
-EAPI="2"
-
-inherit pax-utils java-pkg-2 java-vm-2
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-SLOT="6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~arm"
-
-DESCRIPTION="A harness to build the OpenJDK using Free Software build tools and dependencies"
-ICEDTEA_VER="1.7"
-ICEDTEA_PKG=icedtea${SLOT}-${ICEDTEA_VER}
-OPENJDK_BUILD="17"
-OPENJDK_DATE="14_oct_2009"
-OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
-HOTSPOT_TARBALL="62926c7f67a3.tar.gz"
-CACAO_TARBALL="cacao-0.99.4.tar.gz"
-SRC_URI="http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
-		 http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL}
-		 http://hg.openjdk.java.net/hsx/hsx16/master/archive/${HOTSPOT_TARBALL}
-		 cacao? ( http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/${CACAO_TARBALL} )"
-HOMEPAGE="http://icedtea.classpath.org"
-S=${WORKDIR}/${ICEDTEA_PKG}
-
-# Missing options:
-# shark - still experimental, requires llvm which is not yet packaged
-# visualvm - requries netbeans which would cause major bootstrap issues
-IUSE="cacao debug doc examples +hs16 javascript nio2 +npplugin nsplugin pulseaudio systemtap xrender zero"
-
-# JTReg doesn't pass at present
-RESTRICT="test"
-
-RDEPEND=">=net-print/cups-1.2.12
-	 >=x11-libs/libX11-1.1.3
-	 >=media-libs/freetype-2.3.5
-	 >=media-libs/alsa-lib-1.0
-	 >=x11-libs/gtk+-2.8
-	 >=x11-libs/libXinerama-1.0.2
-	 >=x11-libs/libXp-1.0.0
-	 >=x11-libs/libXi-1.1.3
-	 >=x11-libs/libXau-1.0.3
-	 >=x11-libs/libXdmcp-1.0.2
-	 >=x11-libs/libXtst-1.0.3
-	 >=media-libs/jpeg-6b
-	 >=media-libs/libpng-1.2
-	 >=media-libs/giflib-4.1.6
-	 >=sys-libs/zlib-1.2.3
-	 x11-proto/inputproto
-	 x11-proto/xineramaproto
-	 nsplugin? ( >=net-libs/xulrunner-1.9 )
-	 pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
-	 javascript? ( dev-java/rhino:1.6 )
-	 zero? ( virtual/libffi )
-	 xrender? ( >=x11-libs/libXrender-0.9.4 )
-	 systemtap? ( >=dev-util/systemtap-1 )
-	 !dev-java/icedtea6"
-
-# Additional dependencies for building:
-#   zip: extract OpenJDK tarball, and needed by configure
-#   xalan/xerces: automatic code generation
-#   ant, ecj, jdk: required to build Java code
-# Only ant-core-1.7.1-r2 contains a version of Ant that
-# properly respects environment variables, if the build
-# sets some environment variables.
-#   ca-certificates, perl and openssl are used for the cacerts keystore generation
-#   xext headers have two variants depending on version - bug #288855
-DEPEND="${RDEPEND}
-	|| (
-		>=virtual/gnu-classpath-jdk-1.5
-		dev-java/icedtea6-bin
-		dev-java/icedtea:${SLOT}
-	)
-	|| (
-		dev-java/icedtea6-bin
-		dev-java/icedtea:${SLOT}
-		dev-java/eclipse-ecj:3.3
-	)
-	>=virtual/jdk-1.5
-	app-arch/zip
-	>=dev-java/xalan-2.7.0:0
-	>=dev-java/xerces-2.9.1:2
-	>=dev-java/ant-core-1.7.1-r2
-	app-misc/ca-certificates
-	dev-lang/perl
-	dev-libs/openssl
-	|| (
-		(
-			>=x11-libs/libXext-1.1.1
-			>=x11-proto/xextproto-7.1.1
-			x11-proto/xproto
-		)
-		<x11-libs/libXext-1.1.1
-	)
-	sys-apps/lsb-release"
-
-pkg_setup() {
-# Shark support disabled for now - still experimental and needs sys-devel/llvm
-#	if use shark ; then
-#	  if ( ! use x86 && ! use sparc && ! use ppc ) ; then
-#		eerror "The Shark JIT has known issues on 64-bit platforms.  Please rebuild"
-#		errror "without the shark USE flag turned on."
-#		die "Rebuild without the shark USE flag on."
-#	  fi
-#	  if ( ! use zero ) ; then
-#		eerror "The use of the Shark JIT is only applicable when used with the zero assembler port.";
-#		die "Rebuild without the shark USE flag on or with the zero USE flag turned on."
-#	  fi
-#	fi
-
-	if use nsplugin && ! use npplugin && has_version ">=net-libs/xulrunner-1.9.2"; then
-		eerror "The old plugin will not work with xulrunner >= 1.9.2 / Firefox >= 3.6."
-		die "Rebuild with the npplugin USE flag enabled."
-	fi
-
-	# 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 [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
-		einfo "Honoring user-set JAVA_PKG_FORCE_VM"
-	elif has_version "dev-java/icedtea:${SLOT}"; then
-		JAVA_PKG_FORCE_VM="icedtea6"
-	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/gcj-jdk; then
-		JAVA_PKG_FORCE_VM="gcj-jdk"
-	elif has_version dev-java/cacao; then
-		JAVA_PKG_FORCE_VM="cacao"
-	else
-		JAVA_PKG_FORCE_VM=""
-		# don't die just yet if merging a binpkg - bug #258423
-		DIE_IF_NOT_BINPKG=true
-	fi
-
-	# if the previous failed, don't even run java eclasses pkg_setup
-	# as it might also die when no VM is present
-	if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
-		einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
-		java-vm-2_pkg_setup
-		java-pkg-2_pkg_setup
-	fi
-
-	VMHANDLE="icedtea${SLOT}"
-}
-
-src_unpack() {
-	if [[ -n ${DIE_IF_NOT_BINPKG} ]]; then
-		die "Unable to find a supported VM for building"
-	fi
-	unpack ${ICEDTEA_PKG}.tar.gz
-}
-
-unset_vars() {
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-}
-
-src_configure() {
-	local config procs rhino_jar
-	local vm=$(java-pkg_get-current-vm)
-	local vmhome="/usr/lib/jvm/${vm}"
-
-	# IcedTea6 can't be built using IcedTea7; its class files are too new
-	if [[ "${vm}" == "icedtea6" ]] || [[ "${vm}" == "icedtea6-bin" ]] ; then
-		# If we are upgrading icedtea, then we don't need to bootstrap.
-		config="${config} --with-openjdk=$(java-config -O)"
-	elif [[ "${vm}" == "gcj-jdk" || "${vm}" == "cacao" ]] ; then
-		# For other 1.5 JDKs e.g. GCJ, CACAO.
-		config="${config} --with-ecj-jar=$(java-pkg_getjar --build-only eclipse-ecj:3.3 ecj.jar)" \
-		config="${config} --with-gcj-home=${vmhome}"
-	else
-		eerror "IcedTea${SLOT} must be built with either a JDK based on GNU Classpath or an existing build of IcedTea${SLOT}."
-		die "Install a GNU Classpath JDK (gcj-jdk, cacao)"
-	fi
-
-	# OpenJDK-specific parallelism support.
-	procs=$(echo ${MAKEOPTS} | sed -r 's/.*-j\W*([0-9]+).*/\1/')
-	if [[ -n ${procs} ]] ; then
-		config="${config} --with-parallel-jobs=${procs}";
-		einfo "Configuring using --with-parallel-jobs=${procs}"
-	fi
-
-	if use_zero ; then
-		config="${config} --enable-zero"
-	else
-		config="${config} --disable-zero"
-	fi
-
-	if use javascript ; then
-		rhino_jar=$(java-pkg_getjar rhino:1.6 js.jar);
-	fi
-
-	if use nsplugin && use npplugin ; then
-		config="${config} --enable-npplugin"
-	fi
-
-	if use hs16 ; then
-		config="${config} --with-hotspot-build=hs16"
-	fi
-
-	unset_vars
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
-		--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \
-		--with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
-		--with-java="${vmhome}/bin/java" \
-		--with-javac="${vmhome}/bin/javac" \
-		--with-javah="${vmhome}/bin/javah" \
-		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
-		$(use_enable !debug optimizations) \
-		$(use_enable doc docs) \
-		$(use_enable nsplugin plugin) \
-		$(use_with javascript rhino ${rhino_jar}) \
-		$(use_enable cacao) \
-		$(use_enable pulseaudio pulse-java) \
-		$(use_enable xrender) \
-		$(use_enable systemtap) \
-		$(use_enable nio2) \
-		|| die "configure failed"
-}
-
-src_compile() {
-	# Newer versions of Gentoo's ant add
-	# an environment variable so it works properly...
-	export ANT_RESPECT_JAVA_HOME=TRUE
-	# Also make sure we don't bring in additional tasks
-	export ANT_TASKS=none
-
-	# Paludis does not respect unset from src_configure
-	unset_vars
-	emake -j 1  || die "make failed"
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${D}/${dest}"
-	dodir "${dest}" || die
-
-	local arch=${ARCH}
-	use x86 && arch=i586
-
-	cd "${S}/openjdk/build/linux-${arch}/j2sdk-image" || die
-
-	if use doc ; then
-		# java-pkg_dohtml needed for package-list #302654
-		java-pkg_dohtml -r ../docs/* || die "Failed to install documentation"
-	fi
-
-	# doins can't handle symlinks.
-	cp -vRP bin include jre lib man "${ddest}" || die "failed to copy"
-
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler.
-	pax-mark m $(list-paxables "${ddest}"{,/jre}/bin/*)
-
-	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README || die
-
-	if use examples; then
-		dodir "${dest}/share";
-		cp -vRP demo sample "${ddest}/share/" || die
-	fi
-
-	cp src.zip "${ddest}" || die
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	if use nsplugin; then
-		use x86 && arch=i386;
-		if use npplugin; then
-		   install_mozilla_plugin "${dest}/jre/lib/${arch}/IcedTeaNPPlugin.so";
-		else
-		   install_mozilla_plugin "${dest}/jre/lib/${arch}/IcedTeaPlugin.so";
-		fi
-	fi
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in /usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in /usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-	sed -e "s/@SLOT@/${SLOT}/g" \
-		-e "s/@PV@/${ICEDTEA_VER}/g" \
-		< "${FILESDIR}/icedtea.env" > "${T}/icedtea.env"
-	set_java_env "${T}/icedtea.env"
-}
-
-use_zero() {
-	use zero || ( ! use amd64 && ! use x86 && ! use sparc )
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	if use nsplugin; then
-		elog "The icedtea${SLOT} browser plugin can be enabled using eselect java-nsplugin"
-		if use npplugin; then
-			elog "Note that the IcedTeaNPPlugin works only in browsers based on xulrunner-1.9.1 or later"
-			elog "such as Firefox 3.5+, Chromium and perhaps some others too, and it is considered"
-			elog "alpha quality by upstream. The older plugin can be built with USE=\"-nnplugin\""
-			elog "but it does not support xulrunner-1.9.2 (Firefox 3.6) or Chromium."
-		else
-			elog "Note that the IcedTeaPlugin works only in browsers based on xulrunner-1.9.0 or 1.9.1"
-			elog "such as Firefox 3 or 3.5, Epiphany 2.24 and not in older versions!"
-			elog "Also note that you need to recompile icedtea${SLOT} if you upgrade"
-			elog "from xulrunner-1.9.0 to 1.9.1."
-			elog "To support xulrunner-1.9.2 (Firefox 3.6) and Chromium, enable USE=npplugin"
-		fi
-	fi
-}
--- a/dev-java/icedtea/icedtea-7.1.12.ebuild
+++ b/dev-java/icedtea/icedtea-7.1.12.ebuild
@ -1,321 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
-# *********************************************************
-
-EAPI="2"
-
-inherit autotools flag-o-matic java-pkg-2 java-vm-2 pax-utils
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-SLOT="7"
-#KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~arm"
-
-DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
-ICEDTEA_VER="1.12"
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-OPENJDK_TARBALL="f0bfd9bd1a0e.tar.gz"
-LANGTOOLS_TARBALL="83367f01297b.tar.gz"
-JAXP_TARBALL="fb68fd18eb9f.tar.gz"
-JAXWS_TARBALL="0dc08d528c99.tar.gz"
-CORBA_TARBALL="d728db3889da.tar.gz"
-JDK_TARBALL="fb2ee5e96b17.tar.gz"
-HOTSPOT_TARBALL="b4ab978ce52c.tar.gz"
-CACAO_TARBALL="cacao-0.99.4.tar.bz2"
-JAXP_DROP="jdk7-jaxp-m5.zip"
-JAXWS_DROP="jdk7-jaxws-2009_09_28.zip"
-JAF_DROP="jdk7-jaf-2009_08_28.zip"
-SRC_URI="http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
-		 http://hg.openjdk.java.net/icedtea/jdk7/archive/${OPENJDK_TARBALL}
-		 http://hg.openjdk.java.net/icedtea/jdk7/corba/archive/${CORBA_TARBALL}
-		 http://hg.openjdk.java.net/icedtea/jdk7/jaxp/archive/${JAXP_TARBALL}
-		 http://hg.openjdk.java.net/icedtea/jdk7/jaxws/archive/${JAXWS_TARBALL}
-		 http://hg.openjdk.java.net/icedtea/jdk7/jdk/archive/${JDK_TARBALL}
-		 http://hg.openjdk.java.net/icedtea/jdk7/hotspot/archive/${HOTSPOT_TARBALL}
-		 http://hg.openjdk.java.net/icedtea/jdk7/langtools/archive/${LANGTOOLS_TARBALL}
-		 https://jaxp.dev.java.net/files/documents/913/144160/${JAXP_DROP}
-		 http://kenai.com/projects/jdk7-drops/downloads/download/${JAXWS_DROP}
-		 http://kenai.com/projects/jdk7-drops/downloads/download/${JAF_DROP}
-		 cacao? ( http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/${CACAO_TARBALL} )"
-HOMEPAGE="http://icedtea.classpath.org"
-S=${WORKDIR}/${ICEDTEA_PKG}
-
-# Missing options:
-# shark - still experimental, requires llvm which is not yet packaged
-# visualvm - requries netbeans which would cause major bootstrap issues
-IUSE="cacao debug doc examples javascript nsplugin pulseaudio systemtap xrender zero"
-
-# JTReg doesn't pass at present
-RESTRICT="test"
-
-RDEPEND=">=net-print/cups-1.2.12
-	 >=x11-libs/libX11-1.1.3
-	 >=media-libs/freetype-2.3.5
-	 >=media-libs/alsa-lib-1.0
-	 >=x11-libs/gtk+-2.8
-	 >=x11-libs/libXinerama-1.0.2
-	 >=x11-libs/libXp-1.0.0
-	 >=x11-libs/libXi-1.1.3
-	 >=x11-libs/libXau-1.0.3
-	 >=x11-libs/libXdmcp-1.0.2
-	 >=x11-libs/libXtst-1.0.3
-	 >=media-libs/jpeg-6b
-	 >=media-libs/libpng-1.2
-	 >=media-libs/giflib-4.1.6
-	 >=sys-libs/zlib-1.2.3
-	 x11-proto/inputproto
-	 x11-proto/xineramaproto
-	 nsplugin? ( <net-libs/xulrunner-1.9.2:1.9 )
-	 pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
-	 javascript? ( dev-java/rhino:1.6 )
-	 zero? ( virtual/libffi )
-	 xrender? ( >=x11-libs/libXrender-0.9.4 )
-	 systemtap? ( >=dev-util/systemtap-1 )
-	 !dev-java/icedtea:0"
-
-# Additional dependencies for building:
-#   zip: extract OpenJDK tarball, and needed by configure
-#   xalan/xerces: automatic code generation
-#   ant, ecj, jdk: required to build Java code
-# Only ant-core-1.7.0-r3 in java-overlay contains
-# a version of Ant that properly respects environment
-# variables.  1.7.1-r2 and on will work if the build
-# sets some environment variables.
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-# xext headers have two variants depending on version - bug #288855
-# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
-DEPEND="${RDEPEND}
-	|| (
-		>=virtual/gnu-classpath-jdk-1.5
-		dev-java/icedtea6-bin
-		dev-java/icedtea:7
-		dev-java/icedtea:6
-		dev-java/icedtea6
-	)
-	>=virtual/jdk-1.5
-	app-arch/zip
-	>=dev-java/xalan-2.7.0:0
-	>=dev-java/xerces-2.9.1:2
-	|| (
-	  =dev-java/ant-core-1.7.0-r3
-	  >=dev-java/ant-core-1.7.1-r2
-	)
-	app-misc/ca-certificates
-	dev-lang/perl
-	dev-libs/openssl
-	>=dev-java/ant-nodeps-1.7.0
-	sys-apps/lsb-release
-	 || ( >=sys-devel/autoconf-2.65:2.5 <sys-devel/autoconf-2.64:2.5 )"
-
-pkg_setup() {
-# Shark support disabled for now - still experimental and needs sys-devel/llvm
-#	if use shark ; then
-#	  if ( ! use x86 && ! use sparc && ! use ppc ) ; then
-#		eerror "The Shark JIT has known issues on 64-bit platforms.  Please rebuild"
-#		errror "without the shark USE flag turned on."
-#		die "Rebuild without the shark USE flag on."
-#	  fi
-#	  if ( ! use zero ) ; then
-#		eerror "The use of the Shark JIT is only applicable when used with the zero assembler port.";
-#		die "Rebuild without the shark USE flag on or with the zero USE flag turned on."
-#	  fi
-#	fi
-
-	# 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 [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
-		einfo "Honoring user-set JAVA_PKG_FORCE_VM"
-	elif has_version dev-java/icedtea:7; then
-		JAVA_PKG_FORCE_VM="icedtea7"
-	elif has_version dev-java/icedtea:0; 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/icedtea6; then
-		JAVA_PKG_FORCE_VM="icedtea6"
-	elif has_version dev-java/icedtea:6; 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/cacao; then
-		JAVA_PKG_FORCE_VM="cacao"
-	else
-		JAVA_PKG_FORCE_VM=""
-		# don't die just yet if merging a binpkg - bug #258423
-		DIE_IF_NOT_BINPKG=true
-	fi
-
-	# if the previous failed, don't even run java eclasses pkg_setup
-	# as it might also die when no VM is present
-	if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
-		einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
-		java-vm-2_pkg_setup
-		java-pkg-2_pkg_setup
-	fi
-
-	VMHANDLE="icedtea${SLOT}"
-}
-
-src_unpack() {
-	if [[ -n ${DIE_IF_NOT_BINPKG} ]]; then
-		die "Unable to find a supported VM for building"
-	fi
-	unpack ${ICEDTEA_PKG}.tar.gz
-}
-
-src_prepare() {
-	# bug #288855 - ABI is the same, just definitions moved between headers
-	# conditional patching should be thus safe
-	if has_version ">=x11-libs/libXext-1.1.1"; then
-		epatch "${FILESDIR}/1.12-shmproto.patch"
-
-		eautoreconf || die "eautoreconf failed"
-	fi
-}
-
-unset_vars() {
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-}
-
-src_configure() {
-	local config procs rhino_jar
-	local vm=$(java-pkg_get-current-vm)
-
-	if [[ "${vm}" == "icedtea6" || "${vm}" == "icedtea" ]] || [[ "${vm}" == "icedtea7" ]] || [[ "${vm}" == "icedtea6-bin" ]] ; then
-		# We can't currently bootstrap with a Sun-based JVM :(
-		config="${config} --disable-bootstrap"
-	elif [[ "${vm}" != "gcj-jdk" && "${vm}" != "cacao" ]] ; then
-		eerror "IcedTea must be built with either a JDK based on GNU Classpath or an existing build of IcedTea."
-		die "Install a GNU Classpath JDK (gcj-jdk, cacao)"
-	fi
-
-	# OpenJDK-specific parallelism support.
-	procs=$(echo ${MAKEOPTS} | sed -r 's/.*-j\W*([0-9]+).*/\1/')
-	if [[ -n ${procs} ]] ; then
-		config="${config} --with-parallel-jobs=${procs}";
-		einfo "Configuring using --with-parallel-jobs=${procs}"
-	fi
-
-	if use_zero ; then
-		config="${config} --enable-zero"
-	else
-		config="${config} --disable-zero"
-	fi
-
-	if use javascript ; then
-		rhino_jar=$(java-pkg_getjar rhino:1.6 js.jar);
-	fi
-
-	unset_vars
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
-		--with-corba-src-zip="${DISTDIR}/${CORBA_TARBALL}" \
-		--with-jaxp-src-zip="${DISTDIR}/${JAXP_TARBALL}" \
-		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_TARBALL}" \
-		--with-jdk-src-zip="${DISTDIR}/${JDK_TARBALL}" \
-		--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \
-		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_TARBALL}" \
-		--with-jaxp-drop-zip="${DISTDIR}/${JAXP_DROP}" \
-		--with-jaxws-drop-zip="${DISTDIR}/${JAXWS_DROP}" \
-		--with-jaf-drop-zip="${DISTDIR}/${JAF_DROP}" \
-		--with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
-		--with-jdk-home="$(java-config -O)" \
-		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
-		$(use_enable !debug optimizations) \
-		$(use_enable doc docs) \
-		$(use_enable nsplugin plugin) \
-		$(use_with javascript rhino ${rhino_jar}) \
-		$(use_enable zero) \
-		$(use_enable pulseaudio pulse-java) \
-		$(use_enable xrender) \
-		$(use_enable systemtap) \
-		|| die "configure failed"
-}
-
-src_compile() {
-	# Newer versions of Gentoo's ant add
-	# an environment variable so it works properly...
-	export ANT_RESPECT_JAVA_HOME=TRUE
-
-	# Paludis does not respect unset from src_configure
-	unset_vars
-	emake -j 1  || die "make failed"
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${D}/${dest}"
-	dodir "${dest}" || die
-
-	local arch=${ARCH}
-	use x86 && arch=i586
-
-	cd "${S}/openjdk/build/linux-${arch}/j2sdk-image" || die
-
-	if use doc ; then
-		# java-pkg_dohtml needed for package-list #302654
-		java-pkg_dohtml -r ../docs/* || die "Failed to install documentation"
-	fi
-
-	# doins can't handle symlinks.
-	cp -vRP bin include jre lib man "${ddest}" || die "failed to copy"
-
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler.
-	pax-mark m $(list-paxables "${ddest}"{,/jre}/bin/*)
-
-	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README || die
-
-	if use examples; then
-		dodir "${dest}/share";
-		cp -vRP demo sample "${ddest}/share/" || die
-	fi
-
-	cp src.zip "${ddest}" || die
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	if use nsplugin; then
-		use x86 && arch=i386;
-		install_mozilla_plugin "${dest}/jre/lib/${arch}/IcedTeaPlugin.so";
-	fi
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in /usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in /usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-	sed -e "s/@SLOT@/${SLOT}/g" \
-		-e "s/@PV@/${ICEDTEA_VER}/g" \
-		< "${FILESDIR}/icedtea.env" > "${T}/icedtea.env"
-	set_java_env "${T}/icedtea.env"
-}
-
-use_zero() {
-	use zero || ( ! use amd64 && ! use x86 && ! use sparc )
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	if use nsplugin; then
-		elog "The icedtea${SLOT} browser plugin can be enabled using eselect java-nsplugin"
-		elog "Note that the plugin works only in browsers based on xulrunner-1.9"
-		elog "such as Firefox 3 or Epiphany 2.24 and not in older versions!"
-		elog "Also note that you need to recompile icedtea${SLOT} if you upgrade"
-		elog "from xulrunner-1.9.0 to 1.9.1."
-	fi
-}
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>java</herd>
-<maintainer>
-  <email>gnu_andrew@member.fsf.org</email>
-  <name>Andrew John Hughes</name>
-</maintainer>
-<longdescription>The IcedTea project provides a harness to build the source code from OpenJDK (http://openjdk.java.net) using Free Software build tools along with additional tools such as a browser plugin and Web Start support via NetX. </longdescription>
-<use>
-  <flag name="cacao">Use the CACAO virtual machine instead of HotSpot on x86, amd64 or SPARC architectures.</flag>
-  <flag name="hs16">Use the new version of HotSpot (16).</flag>
-  <flag name="nio2">Enable backport of NIO2 to OpenJDK6.</flag>
-  <flag name="npplugin">Enable the new alpha-quality plugin which works with Firefox 3.6+ and Chromium.</flag>
-  <flag name="shark">Enable Shark JIT support</flag>
-  <flag name="systemtap">Enable SystemTap probes in HotSpot.</flag>
-  <flag name="xrender">Enable support for using XRender with the AWT libraries.</flag>
-  <flag name="zero">Enable the zero assembler port of HotSpot.</flag>
-</use>
-</pkgmetadata>