Security bump

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x3C5CF75A

3 files changed, 334 insertions, 16 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 624a440852fb..14b9a9c2ee9b 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/icedtea
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.89 2013/02/05 07:33:54 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.90 2013/02/11 05:51:50 sera Exp $
+
+*icedtea-6.1.12.1 (11 Feb 2013)
+
+  11 Feb 2013; Ralph Sennhauser <sera@gentoo.org> +icedtea-6.1.12.1.ebuild:
+  Security bump
 
   05 Feb 2013; Rick Farina <zerochaos@gentoo.org> icedtea-6.1.12.0.ebuild:
   adding ~arm
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index b50d92b1e64d..114efc59ebf2 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX fontconfig.Gentoo.properties.src 15602 SHA256 d48a9b43d82f45425464e985955f3f3700738a98c0dc97ab7577230ca11fe647 SHA512 eac3fd310bf0757284a4a0c3c72759a8516bd2d9b8f9d9c7df10ff15fd291833d5adb5429b166175c6f333c883974d56fe7d0339cc16db3a5786a77780217a39 WHIRLPOOL f9f702848c38ef9cca0577f1db5a7c4cd6847e79d205b8e855c14b3a80070328b12fdcd854f5bd2dcf07c7cb9bd2aaf433a770a0752ec01a4e8b308dedf3bf19
 AUX generate-cacerts.pl 11051 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97 WHIRLPOOL ad0e7946b1f055542f8a76b1050ae841bc7b6498305def9881d2f5d2177a82b77d25bf20e97488e2c84bbe0c3834421caea7e5bf4ea990c783908bc19133e619
@@ -23,6 +23,7 @@ DIST dc9234e25ab0.tar.gz 1453876 SHA256 911a049e735c1ab0dfa65426ada7a11494d51fec
 DIST icedtea-2.3.4.tar.gz 5043197 SHA256 ea859f37fb20904ffd40802a41396326f7e301fa6873d88d01bf4afef5a60ca8 SHA512 c236257579da2258571a995ba4180bcc2274cee6351a16503da51374fb39c60113064b6c125b81103f1ccc3ac4b609868771ee0647153ee6953d9b7a8763bdeb WHIRLPOOL 7b0f8db20f6818fe819644f8219ad13e2f6ca50b2e306f4784aeebc1fa4d0b798c29c8b9aeec7b4d08e5319e5a6739dcb2cb673969495b4b3c70084247703e8e
 DIST icedtea6-1.11.5.tar.gz 6411576 SHA256 258d81d957f8ab9322fbaf7c90647f27f6b4e675504fa279858e6dfe513f7574 SHA512 ba09bb5e6e9f1fc4781fbee69f72360ede4d22c560c3232c2316f240c61e3ef2919d9987ca6a9a74dd9ea3365ab03a54d7006cf8354054866267a7edee48346a WHIRLPOOL d1c5b02521da961dba08361a1a49841cf15e57df188347bad42976ed0627197185c6503834c392e69617a77861aa09d95f4a3bb8141031815bf8142e2efe21bc
 DIST icedtea6-1.12.0.tar.gz 6482285 SHA256 4f27f3f42b57836cfb11541736282ccfc22de3f4acc0e540560fcf5512d66ced SHA512 79a7b206438a5dcd6ad3a78a7a80f8d486325182ac1b9c1d22ae009147a22ab061684eba0bbf6498fc543b0b490f989170c71bc7f8175751c8f4a44071946c3c WHIRLPOOL a25d096865672fc1a0ffbcd9e03157a62d29e4c8cffaae05e714c44a4d43eacb6467b64193f8530a7b4bda56e63e6fbbf92df3d0dc0aca078c5b1fc5cac23671
+DIST icedtea6-1.12.1.tar.gz 6668139 SHA256 8e73a3939ba8c2cca888defc6c90811c959273a9bc7bd1352338a72cefcf1157 SHA512 db44d7674e51320984a12f684cf4c9d2392af4e671988359b7cd581b5a740a790eee710f28eff988ac0c666893311b8d0c7cf302c0e38b8b9d03f8683d07d08f WHIRLPOOL 40fc32696b807061b9d85a81beab8f1ef31a6da9a900075d50780fdf436230da46fa7af06d092048e8859455191135cc1ca5e6cc371f91469e7ae4ea653694c1
 DIST jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz 298435 SHA256 bfa706402ac934d24f7119eb78f6be65e91439a4b2e49dbcc21e288137808f03 SHA512 fa3428d8997f9696cce4fa32c9de677ef193bc12236ef8b431af647b57d26725f4a3019abc87ade0cf10c7d6a745c18eb78e8e126d6842e788c8cefcbd2b006d WHIRLPOOL d1ca7dc677b7abbd600262f30c2c3774f502ef661f3dca60d4664c87b50b9a90c808e106f607a1dde7b3f4cf44a7a4a9e647877a2cc3332866b6b2bd34eb2a2a
 DIST jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz 294537 SHA256 47fce7bd556c1b1d29a93b8c45497e0d872b48b7f535066b303336f29d0f0d8d SHA512 8b479a23f4c2eb16100bb0745452c652849f8e18912756e2d9f8ac9cd395f4bcf89af89d6feda25c8ec41cb90b7f17bebe646637234ed360c65da2a45dbbac04 WHIRLPOOL b9ba7a0c73e16245c109f983435f00a9349c747cc5b5ef4592b8aaf7efc95af0992d9c897530a12e886e7f20687a290f70f3cb27529f1661bc37d76d00f2b2af
 DIST jaxp144_03.zip 5964999 SHA256 c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012 SHA512 fe65d396d0a57bc2b5dd2d8b00b0ecea860d4e5a5c9cb489bc5b9d7abd90861dedd26088184de93807646277c23d3712e8af79e56251f079ef22ed5a3b8f9a90 WHIRLPOOL 16ebcc9715ca221b7a6cc802367b33b74636bf7fe06035df798d47a6de1ec8ab370027fa17b37e6e5f4dd1a1059a4f8ffd236a4c969594d9a7479b198a6928f4
@@ -33,23 +34,18 @@ DIST openjdk-6-src-b24-14_nov_2011.tar.gz 45742125 SHA256 f84e7f0938f4939660ff8f
 DIST openjdk-6-src-b27-26_oct_2012.tar.gz 45789350 SHA256 044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0 SHA512 4198f11b2f49c9bc5ffbeadf2d0d87dfa413a918d49faff3a043266bf4a2fa99579fba3c6d75164d87e88b8fc5c97c3c1527560eb25c55cdd42ad813c8e175e8 WHIRLPOOL 5038258710f2c0eac1a5a1957629998d931d49a6145450485b84e21988d8fdfa5127dc0852067319fb2ac054f621ec511c0d8e01961943c7e4a223049317b894
 EBUILD icedtea-6.1.11.5.ebuild 10670 SHA256 7ec451b5e53b50a634cc026e47ee701695beea59dbd3794bf224e6557d6faa7e SHA512 83bb6f3c0a6fc2fc2c67b16f7e20e2d40b9422f0baf3b872adac8a782a5c93b721a6674f3d204d537c4556d48037f7ced570cb9f4dc75ebcdae84b49da5cb93d WHIRLPOOL d80fabe21656692166851bcb1052d41f4be3245d5956064244fe265205c062593dfd0003d2c1cc66fc2d494c3fae0fc1f6556d10367dbc9577a24f5474a4338b
 EBUILD icedtea-6.1.12.0.ebuild 9862 SHA256 a6a25bf70815e1cb234b626ead974aca6b2382cf8304f2cf26eb638bc974f34d SHA512 cc5687b5abc5f0d98d9f5f79ee1bf20bed4d7033f4ce86aac5b02a42816a3188459443663e070dabc261192923d044dd8c3b657e3864673f02b706309a281b19 WHIRLPOOL 9599aedbe84a48b31e936dcfd2d82aba07a7643a33ac829e3ff3c4295689f29295d7e36c567b1dae8a5ec8665808b222c8d7b43a1009f3e509c548d20898bae3
+EBUILD icedtea-6.1.12.1.ebuild 9777 SHA256 f8078fd5e91284029c5ed0ff0ef1df0d81ff983f2a25928fa3912d935c3db3b6 SHA512 b583370bfc5d6a1e746464f20eb99b57bb5873d5fff54813ae69eb0d989b2367db0e3d339b3c5a2d85a83fdddf17673c912e104fc0d306b22fc6cf96a05e12bc WHIRLPOOL 2d0e39960d5b2d19547384b21d1da13251e88668a9c80d3ba22e5044f2b474f36f2a43aa7a55c4e009e024f321afa91cf406b1a9295463d28c0c3f6567b41ee0
 EBUILD icedtea-7.2.3.4.ebuild 10854 SHA256 a7e87339bdd132e1a7c7495e825b1f077412dd501f4a7a77d149c9f3a6b402bc SHA512 67434d0447f6640d7304243405630cc180d2719556dbd797ff947c13298efc7e1874b5adacd6157137ebc86da90da70d5796de21be5005aac7b7caf7f018da61 WHIRLPOOL 979c91ff2a230633a4eebd5802850c520e4c8d09b745e03dd6facc08701b62b596cf35396413e82aba6cf5615f6ffa08550f7b898f14afbcae11cf605c755045
-MISC ChangeLog 20277 SHA256 249fc68703607e13f2656c0e463d93a1aa3779d610ec30baa460df49cac1fcc9 SHA512 ceec36626c680784f1ab2b23cb45ed1f30374231dcf039f15af5cb7587dfa30e418cb75ede331e429d74665558ad87c9375cffeba150433ca20d80306a196fdb WHIRLPOOL 6e8cc0c3ae06a3e6d4ec7af57c6a35df079f7c1c2c532abc33cc2c88cbce0bbe0350b56e8dfab324340eda1a9addfa7b752cdcc76ab4c1237df16b41b31eeaeb
+MISC ChangeLog 20398 SHA256 1c7787c0f8dbf9c890d693672f2a0f93381018bff82354cf7f422e11f196286e SHA512 e0a92c22db2c6d83cd10d21bb1033f7f3beaa23715a7e1247b90208025b7c0a25392e9546435e1086a588c4c184b60251479a7382126c4ede60a38de2a0257c2 WHIRLPOOL de65b3d02579318b2cd7813e4fbce16e46b1752bd96c78cab1c81d82eec292110c0d6dcbeb5c95916f3124c5abc28693debf18694ffc74d095400f31b8836230
 MISC metadata.xml 1493 SHA256 13532771b5aeb1b23a22b1ea5947feabe6011d567d15e38e676e4045e8adcf12 SHA512 ecd4563d7550be63e20371b67510d16582d661914df3ccad31faa59e173aa51d81a3ae6b19518dfb86bce23f231ad0fc44f042ff187613fe2ec9680f1621061d WHIRLPOOL 3bb02e03a422667191a98bc0cfa695b0f35a565d38b979f413b2a0768d6fea2d47692279433ab85e4871ee5968e81e1e229a09f134f68e0c0966cecb9646a23a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRELXjAAoJEKXdFCfdEflKRgUQAJS7tpG/v0/sVAA0Amq0o7Sz
-HB8pACSvoM62F1Exzjs/nLxVycKNYBJxNcEYmDSFiLK6VoDiN7DhfYSsFGbfc8iB
-1wC80AEWOBx+558/MlOhwMZrbFshdgrBmEo0ZW3Tk3j0XQKbja0yk8zXQ/HKNxGz
-Y7ZUTVdl2E/P9ir+q+wRJIhgZE6Mjc9vAKdEOhyFXFwGxIDoyC5DLSJool3B75rJ
-0kfsmUlkFazZke+mzmB9C4JQn2alvF0XTsBoJn+sKu++5z6FL7UvVLukFSSUdHAX
-ataDvv/xACdw81UacqgOwQK4ruUQfVr0UHIW9Jw5c9llDQ7NqtwpJmao7amIIRMp
-TrlFpe0pbXRxdU5+k13+CAlde6cewMDfKmFxHLufwY1iGWXRcdyiO4J6t9zvmEwV
-FZoWu5HdQWoRDUsnc74UEHUw10YfxxObIQ7r/kJ0/jg50T+joq7v1ciQ+4ClAzy0
-5tQb+b08J8uR9KeAbFNXmoBRAKZxTW8Ytra0mnJ4P40OIS0BtH2RhHDnZy1+vKb2
-BnXSDsRNsAPxmLReJp9aE4O8z0g8ghu28AY0UojcVhlnN7ly1BS8esaNYuA60usZ
-pqz4+yY506Jb4hzMOHhgzcAnJwoANYulKI8rkz80AUf8S6e2emT51mpDI0Ix43+t
-NMlb+gKmNe5QqS1rXSCl
-=Vzvd
+iQEcBAEBCAAGBQJRGIglAAoJELjwI6Q8XPdaae0H/iTnYINnZ5vXIfh5qiQjdOzf
+VNXkQ1oNLrAIQgawQYDEq/N4sJiNjdQMTbOJAPq+hXYrrVm4/+ALSYJCyAi6Rv9v
+qAFG0BVGT+jEpZCBqUA/UHoDRls2bL8yHkqRjYh/SabKzEPxC8i+P9jaZrocc1tU
+3pH+sn4fdhNwnn72rq50KYKip/26LCCt8Mp3zI7wmonbXlGaer6bAqqVFLVXy+UE
+w7nDYTKdHk4V0ODhLJn1/lMMYApkeKOaOX1MqFf/c91b6MPjFGo9vfHT3//4s4p/
+HnCuaNi3Rf50yKgnU4bLFcbEUiGhI/TDl/FbHRp7FpGe/qDjBYjEvlgGlOalhMQ=
+=BhcU
 -----END PGP SIGNATURE-----
diff --git a/dev-java/icedtea/icedtea-6.1.12.1.ebuild b/dev-java/icedtea/icedtea-6.1.12.1.ebuild
new file mode 100644
index 000000000000..4f59b0c4ef0f
--- /dev/null
+++ b/dev-java/icedtea/icedtea-6.1.12.1.ebuild
@@ -0,0 +1,317 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.12.1.ebuild,v 1.1 2013/02/11 05:51:50 sera Exp $
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
+# *********************************************************
+
+EAPI="4"
+
+inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx
+
+ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
+OPENJDK_BUILD="27"
+OPENJDK_DATE="26_oct_2012"
+OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
+JAXP_TARBALL="jaxp144_04.zip"
+JAXWS_TARBALL="jdk6-jaxws2_1_6-2011_06_13.zip"
+JAF_TARBALL="jdk6-jaf-b20.zip"
+# Download cacao and jamvm regardless for use with EXTRA_ECONF
+CACAO_TARBALL="68fe50ac34ec.tar.gz"
+JAMVM_TARBALL="jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="http://icedtea.classpath.org"
+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://icedtea.classpath.org/download/drops/${JAXWS_TARBALL}
+	http://icedtea.classpath.org/download/drops/${JAF_TARBALL}
+	http://icedtea.classpath.org/download/drops/${JAXP_TARBALL}
+	http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL}
+	http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL}"
+
+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 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+
+IUSE="+X +alsa cacao cjk +cups debug doc examples javascript +jbootstrap +nsplugin
+	+nss pax_kernel pulseaudio +source systemtap test +webstart"
+
+# Ideally the following were optional at build time.
+ALSA_COMMON_DEP="
+	>=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP="
+	>=net-print/cups-1.2.12"
+X_COMMON_DEP="
+	dev-libs/glib
+	>=media-libs/freetype-2.3.5
+	>=x11-libs/gtk+-2.8:2
+	>=x11-libs/libX11-1.1.3
+	>=x11-libs/libXext-1.1.1
+	>=x11-libs/libXi-1.1.3
+	>=x11-libs/libXrender-0.9.4
+	>=x11-libs/libXtst-1.0.3"
+X_DEPEND="
+	>=x11-libs/libXau-1.0.3
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXinerama-1.0.2
+	>=x11-libs/libXp-1.0.0
+	x11-proto/inputproto
+	>=x11-proto/xextproto-7.1.1
+	x11-proto/xineramaproto
+	x11-proto/xproto"
+
+COMMON_DEP="
+	>=media-libs/giflib-4.1.6
+	>=media-libs/libpng-1.2
+	>=sys-libs/zlib-1.2.3
+	virtual/jpeg
+	javascript? ( dev-java/rhino:1.6 )
+	nss? ( >=dev-libs/nss-3.12.5-r1 )
+	pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
+	systemtap? ( >=dev-util/systemtap-1 )"
+
+# media-fonts/lklug needs ppc ppc64 keywords
+RDEPEND="${COMMON_DEP}
+	!dev-java/icedtea6
+	X? (
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			!ppc? ( !ppc64? ( media-fonts/lklug ) )
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )"
+
+# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+# xext headers have two variants depending on version - bug #288855
+# !eclipse-ecj-3.7 - bug #392587
+# autoconf - as long as we use eautoreconf, version restrictions for bug #294918
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP}
+	|| (
+		>=dev-java/gcj-jdk-4.3
+		dev-java/icedtea-bin:6
+		dev-java/icedtea:6
+	)
+	app-arch/cpio
+	app-arch/unzip
+	app-arch/zip
+	app-misc/ca-certificates
+	>=dev-java/ant-core-1.8.1
+	dev-java/ant-nodeps
+	dev-lang/perl
+	>=dev-libs/libxslt-1.1.26
+	dev-libs/openssl
+	virtual/pkgconfig
+	sys-apps/lsb-release
+	${X_DEPEND}
+	pax_kernel? ( sys-apps/paxctl )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:6 )
+	nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+pkg_setup() {
+	JAVA_PKG_WANT_BUILD_VM="
+		icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin
+		gcj-jdk"
+	JAVA_PKG_WANT_SOURCE="1.5"
+	JAVA_PKG_WANT_TARGET="1.5"
+
+	java-vm-2_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${ICEDTEA_PKG}.tar.gz
+}
+
+java_prepare() {
+	# icedtea doesn't like some locales. #330433 #389717
+	export LANG="C" LC_ALL="C"
+}
+
+bootstrap_impossible() {
+	# Fill this according to testing what works and what not
+	has "${1}" # icedtea6 icedtea-6 icedtea6-bin icedtea-bin-6
+}
+
+src_configure() {
+	local config bootstrap enable_cacao
+	local vm=$(java-pkg_get-current-vm)
+
+	# IcedTea6 can't be built using IcedTea7; its class files are too new
+	# Whether to bootstrap
+	bootstrap="disable"
+	if use jbootstrap; then
+		if bootstrap_impossible "${vm}"; then
+			einfo "Bootstrap with ${vm} is currently not possible and thus disabled, ignoring USE=jbootstrap"
+		else
+			bootstrap="enable"
+		fi
+	fi
+
+	if has "${vm}" gcj-jdk; then
+		# gcj-jdk ensures ecj is present.
+		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+		bootstrap="enable"
+	fi
+
+	config="${config} --${bootstrap}-bootstrap"
+
+	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+	# Otherwise use CACAO
+	if ! has "${ARCH}" amd64 sparc x86; then
+		enable_cacao=yes
+	elif use cacao; then
+		ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
+		ewarn 'If so, please rebuild with USE="-cacao"'
+		enable_cacao=yes
+	fi
+
+	if [[ ${enable_cacao} ]]; then
+		config="${config} --enable-cacao"
+	fi
+
+	# OpenJDK-specific parallelism support. Bug #389791, #337827
+	# Implementation modified from waf-utils.eclass
+	# Note that "-j" is converted to "-j1" as the system doesn't support --load-average
+	local procs=$(echo -j1 ${MAKEOPTS} | sed -r "s/.*(-j\s*|--jobs=)([0-9]+).*/\2/" )
+	config="${config} --with-parallel-jobs=${procs}";
+	einfo "Configuring using --with-parallel-jobs=${procs}"
+
+	if use javascript ; then
+		config="${config} --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
+	else
+		config="${config} --without-rhino"
+	fi
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	econf ${config} \
+		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
+		--with-jaxp-drop-zip="${DISTDIR}/${JAXP_TARBALL}" \
+		--with-jaxws-drop-zip="${DISTDIR}/${JAXWS_TARBALL}" \
+		--with-jaf-drop-zip="${DISTDIR}/${JAF_TARBALL}" \
+		--with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
+		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_TARBALL}" \
+		--with-jdk-home="$(java-config -O)" \
+		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
+		--disable-downloading \
+		$(use_enable !debug optimizations) \
+		$(use_enable doc docs) \
+		$(use_enable nss) \
+		$(use_enable pulseaudio pulse-java) \
+		$(use_enable systemtap) \
+		$(use_with pax_kernel pax paxctl)
+}
+
+src_compile() {
+	# Would use GENTOO_VM otherwise.
+	export ANT_RESPECT_JAVA_HOME=TRUE
+
+	# Load the least that's needed to avoid possible classpath collisions.
+	export ANT_TASKS="ant-nodeps"
+
+	emake
+}
+
+src_test() {
+	# Use Xvfb for tests
+	unset DISPLAY
+
+	Xemake check
+}
+
+src_install() {
+	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+	local ddest="${ED}/${dest}"
+	dodir "${dest}"
+
+	dodoc README NEWS AUTHORS THANKYOU
+	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
+
+	cd openjdk.build/j2sdk-image || die
+
+	# Ensures HeadlessGraphicsEnvironment is used.
+	if ! use X; then
+		rm -r jre/lib/$(get_system_arch)/xawt || die
+	fi
+
+	# Don't hide classes
+	rm lib/ct.sym || die
+
+	#402507
+	mkdir jre/.systemPrefs || die
+	touch jre/.systemPrefs/.system.lock || die
+	touch jre/.systemPrefs/.systemRootModFile || die
+
+	# doins can't handle symlinks.
+	cp -vRP bin include jre lib man "${ddest}" || die
+
+	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
+
+	if use doc; then
+		# java-pkg_dohtml needed for package-list #302654
+		java-pkg_dohtml -r ../docs/* || die
+	fi
+
+	if use examples; then
+		dodir "${dest}/share";
+		cp -vRP demo sample "${ddest}/share/" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	# Fix the permissions.
+	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+	# Needs to be done before generating cacerts
+	java-vm_set-pax-markings "${ddest}"
+
+	# We need to generate keystore - bug #273306
+	einfo "Generating cacerts file from certificates in ${EPREFIX}/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 "${EPREFIX}"/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
+
+	# Bug 390663
+	cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
+	eprefixify "${T}"/fontconfig.Gentoo.properties
+	insinto "${dest}"/jre/lib
+	doins "${T}"/fontconfig.Gentoo.properties
+
+	set_java_env "${FILESDIR}/icedtea.env"
+	if ! use X || ! use alsa || ! use cups; then
+		java-vm_revdep-mask "${dest}"
+	fi
+}
+
+pkg_preinst() {
+	if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
+		# portage would preserve the symlink otherwise, related to bug #384397
+		rm -f "${EROOT}/usr/lib/jvm/icedtea6"
+		elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
+		elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
+		elog "If you had icedtea6 as system VM, the change should be automatic, however"
+		elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
+		elog "and the same holds for any user VM settings. Sorry for the inconvenience."
+	fi
+}