[gentoo-commits] proj/java:master commit in: dev-java/icedtea/

["Andrew John Hughes" <gnu_andrew@member.fsf.org>]

commit:     4b633f1557fa5cb7e6ee11e5d4a40ae862b6df2c
Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Thu Jul 23 02:18:05 2015 +0000
Commit:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Thu Jul 23 02:18:05 2015 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=4b633f15

Add final 2.5.x release, 2.5.6: http://bitly.com/it20506

Package-Manager: portage-2.2.20

 dev-java/icedtea/ChangeLog              |   6 +
 dev-java/icedtea/Manifest               |   9 +
 dev-java/icedtea/icedtea-7.2.5.6.ebuild | 432 ++++++++++++++++++++++++++++++++
 3 files changed, 447 insertions(+)

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 3d382ad..9b64fa0 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*icedtea-7.2.5.6 (23 Jul 2015)
+
+  23 Jul 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
+  +icedtea-7.2.5.6.ebuild:
+  Add final 2.5.x release, 2.5.6: http://bitly.com/it20506
+
 *icedtea-7.2.6.1 (21 Jul 2015)
 
   21 Jul 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>

diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index c3e1c5d..bdb8b49 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,3 +1,12 @@
+DIST icedtea-2.5-aarch64-b19bc5aeaa09.tar.bz2 8157927 SHA256 00043b0c09aa06ce1766c2973d18b0283bd2128a44c94cde97b626a4856b68b3 SHA512 ce9d1ee654e9c25bb2cb8953aab838b206e96fe27804acaa0ed652d8b1bc6dffb138c90ea7e188b189c3ec743dc594c6c49d7217d14cd88ecb6bb9314c74f44c WHIRLPOOL f001f9a290941c36607abb36e2c1faeb4ff6a9fa5a7c1877ad29c2335840ad1c3d5efa090a44ff086dcb62ffd5a3e418f19d7ac16520724029fc2658ce19af53
+DIST icedtea-2.5-corba-a146d87ff390.tar.bz2 1070505 SHA256 d2c060e77ac62a2ace76cf7d098973803398a33c627b40401ca36e9344442136 SHA512 065f138eeedddf0703a2229d10c384a6003b4404a6fa2766ef3a1df8d29d71f1fddc609b9840ddaa31553a29c287eab33d368e227ccc25650aba4e98d50b4aa2 WHIRLPOOL 274acd68bf5e06d68bac50253ebb0e68bf0333188636ce7d96a403778af737547d4a3a154c1bc99c8151816b18dba25cdda1febf19cada7f2e9f3c0884a3c51e
+DIST icedtea-2.5-hotspot-383de087ee57.tar.bz2 7802328 SHA256 2831eeb73a4af0007fb31978e8a17aae1e9677bd545563956f99b1e0ec8bb923 SHA512 42d540632e315318e91a61ee21e2fb6c8e4b813d5bba734b9a1658be8799063a7547d6ee30846a070e806e63f77220a08e215d071c8f622cddfc1f923e9d7d07 WHIRLPOOL 747c4b273126989081789574a63a99ca8a03e9024e5626e9dd78c320df047bcb774610efb4a32cab8bf25b1e8b71f8b4268d298338edac512a46a43dc55179ba
+DIST icedtea-2.5-jaxp-3d9457280537.tar.bz2 2738979 SHA256 488480d8f69297e38f4b6df0131dfc445b59cad9b99327f29096ad820c972c38 SHA512 743931ba791ba09d5f0c45d589e5ba2562f6bed395f766619c8d1d15fd35f709e888017387d6cd01005156dca756450c7c0d286ca8a1585c012099164d977920 WHIRLPOOL 3f78e43fd0a31f97b944ff87133795a0a71be9a8b0b4efeb718ff215d947267270de8533d4378d82f2685cc69f9b599b5acf70564527fb37452666e998a8ebc1
+DIST icedtea-2.5-jaxws-bc5d03e92fd3.tar.bz2 2019582 SHA256 98c6c09d41ef3d179fb4f47e733be0f306ad85479473d5ec51c58acac07cf491 SHA512 a50929f80c40ddf11ad35571540a7d09c6b069b4d055dec41ff6c50d1d737bcf26fc7d14096d4528d184f7c83cadc61cf764664ecd25693afdbe48e59bf00c68 WHIRLPOOL c3e40d74a9ac4c2aa9e9a722c39de36f713b85b36517b8e1bc3b992d040a695c4fd50bafce5f4a4a8f55522faf580c16ba87818368d5a48d05e7e9a809880966
+DIST icedtea-2.5-jdk-48b2e510f78e.tar.bz2 31880992 SHA256 c944ef8d1810e861b54d3f8122960dd4b247b52ed23afd5b1cb053da988fffe4 SHA512 84f4122ec8336b5e3c71b17426f77d0b7719d0e688f3c5a9606db5749187e7858334de5438b683729b73fb91200b8cf087ee2166cd284baab38b3ac5d08ac6a1 WHIRLPOOL 68d2f890434afab440dd8e63fcfc00bdeb792b276ed9bbf2eb813197e2842d7d5903f1f3ca04df830118ced1fe2443b211faebf6f172d9e6dfab82fb1e2ebf22
+DIST icedtea-2.5-langtools-a6d3d79b4547.tar.bz2 1702391 SHA256 9f272f88ea0e8c090fb659c48f96f73fb066e6863f13f293e4ab19d691254693 SHA512 4a39600151f400cf6c17124757e4e8e877cf863445b9c95fb6c8c095f3f46072054f1b2f0262b4964594d6a330579cead0fdd423d61cfd425ec05b90121f79fe WHIRLPOOL 553ede3cf18308f79f4cedf57b2f491780532e23c546e158aca286076d6ab618d1fdf6d825a79fcf3c1a9fc18b2c130d2f84c29c37f3e19fe6e01a14bcb969d8
+DIST icedtea-2.5-openjdk-44f140fd2873.tar.bz2 127517 SHA256 d100158d10a47b064f700f516874c987f105e05947e580d5a143e00fb0b30fad SHA512 82bceecd1fb29b184ea45e5cfbf819b497707e041bc8d25a4ca8447e736db5f5d859dd9ad0129ba2fe300ce3d2ace18d8e528967ec43e467ef12991a860ea5d3 WHIRLPOOL e037bbbd9f85d81ce57759e68f40116db3178a43f4260806e0734fc2a1cd05f86f43cdd82aacaa8f4780e75a1ec7c7e0a7780baf722803a0a711506f0ba847f2
+DIST icedtea-2.5.6.tar.xz 2034152 SHA256 bb3c7e9fd372c737849d9d3129d935174492a0d924a2801223c822426338b8c4 SHA512 773601e4fc08d9a448f6f306e5678eca6f0b5b4704cdca66a40434de6e6b8208bc826e2a63235160b6b88bd92d746f8f7d1a74cfcfc0eaa58417ac3c8cb8aeb3 WHIRLPOOL 2443d7e1387f7d4d9f5b05d85a1768c9346e394713333862e62e24585091aaab0d74f9099c8aa1bd6add5b4cd5179132c238021f1a40576c7a40de43ab170bce
 DIST icedtea-2.6-corba-2545636482d6.tar.bz2 1071895 SHA256 cd03d97c171a2d45ca94c1642265e09c09a459b1d4ac1191f82af88ca171f6f8 SHA512 16a0bd71db484cd948ef3e941566af5b63d657f4d946caed0cef2fb104680beb21bd8633a6f48501c987cedb7949d7228ca7957e5fae3f4adc9ec48050193a12 WHIRLPOOL 98a317a85c4eed1098c7391f67e6687869337a1576bedc65ec4ddfde5885b4c514d12a5aebdac20a70970bb4c79d8b14f7bc153bf0b105b747f4e63ac79c3b79
 DIST icedtea-2.6-hotspot-b19bc5aeaa09.tar.bz2 8157927 SHA256 00043b0c09aa06ce1766c2973d18b0283bd2128a44c94cde97b626a4856b68b3 SHA512 ce9d1ee654e9c25bb2cb8953aab838b206e96fe27804acaa0ed652d8b1bc6dffb138c90ea7e188b189c3ec743dc594c6c49d7217d14cd88ecb6bb9314c74f44c WHIRLPOOL f001f9a290941c36607abb36e2c1faeb4ff6a9fa5a7c1877ad29c2335840ad1c3d5efa090a44ff086dcb62ffd5a3e418f19d7ac16520724029fc2658ce19af53
 DIST icedtea-2.6-jaxp-ffbe529eeac7.tar.bz2 2737160 SHA256 c00c4c2889f77c4615fd655415067e14840764f52e503f220ed324720117faeb SHA512 1d8e68f0118f0e8465e333a8edd8aa9fdc16591c62bf4cc5c7791fb7f9acb97b9c6290fa4879a13138a68cb8b4fa93534cef3ebaee7bb8f3c0565595a3228493 WHIRLPOOL e85c5840883eaef4b1ebbb2dd0bae7d82457e01b6591653ac8d2d12a045f0736cb85b4c056a33614df7bb3b63cd61cf9e7caecdb5dae5f1d6be4f7ed1456cb53

diff --git a/dev-java/icedtea/icedtea-7.2.5.6.ebuild b/dev-java/icedtea/icedtea-7.2.5.6.ebuild
new file mode 100644
index 0000000..a013aee
--- /dev/null
+++ b/dev-java/icedtea/icedtea-7.2.5.6.ebuild
@@ -0,0 +1,432 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.5.5.ebuild,v 1.5 2015/06/20 13:45:07 chewi Exp $
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
+# *********************************************************
+
+EAPI="5"
+SLOT="7"
+
+inherit check-reqs eutils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator virtualx
+
+ICEDTEA_VER=$(get_version_component_range 2-4)
+ICEDTEA_BRANCH=$(get_version_component_range 2-3)
+ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
+ICEDTEA_PRE=$(get_version_component_range _)
+CORBA_TARBALL="a146d87ff390.tar.bz2"
+JAXP_TARBALL="3d9457280537.tar.bz2"
+JAXWS_TARBALL="bc5d03e92fd3.tar.bz2"
+JDK_TARBALL="48b2e510f78e.tar.bz2"
+LANGTOOLS_TARBALL="a6d3d79b4547.tar.bz2"
+OPENJDK_TARBALL="44f140fd2873.tar.bz2"
+HOTSPOT_TARBALL="383de087ee57.tar.bz2"
+AARCH64_TARBALL="b19bc5aeaa09.tar.bz2"
+
+CACAO_TARBALL="e215e36be9fc.tar.gz"
+JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
+
+CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
+JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
+JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
+JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
+LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
+OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
+HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
+AARCH64_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch64-${AARCH64_TARBALL}"
+
+CACAO_GENTOO_TARBALL="icedtea-cacao-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
+
+DROP_URL="http://icedtea.classpath.org/download/drops"
+ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_PKG="${ICEDTEA_PKG}.tar.xz"
+SRC_URI="
+	http://icedtea.classpath.org/download/source/${SRC_PKG}
+	${ICEDTEA_URL}/openjdk.tar.bz2 -> ${OPENJDK_GENTOO_TARBALL}
+	${ICEDTEA_URL}/corba.tar.bz2 -> ${CORBA_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jaxp.tar.bz2 -> ${JAXP_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jaxws.tar.bz2 -> ${JAXWS_GENTOO_TARBALL}
+	${ICEDTEA_URL}/jdk.tar.bz2 -> ${JDK_GENTOO_TARBALL}
+	${ICEDTEA_URL}/langtools.tar.bz2 -> ${LANGTOOLS_GENTOO_TARBALL}
+	arm? ( ${ICEDTEA_URL}/aarch64.tar.bz2 -> ${AARCH64_GENTOO_TARBALL} )
+	arm64? ( ${ICEDTEA_URL}/aarch64.tar.bz2 -> ${AARCH64_GENTOO_TARBALL} )
+	!arm? ( !arm64? ( ${ICEDTEA_URL}/hotspot.tar.bz2 -> ${HOTSPOT_GENTOO_TARBALL} ) )
+	${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
+	${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_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"
+KEYWORDS="~amd64"
+RESTRICT="test"
+
+IUSE="+X +alsa cacao cjk +cups debug doc examples infinality jamvm javascript +jbootstrap kerberos +nsplugin
+	nss pax_kernel pulseaudio selinux smartcard +source +sunec test zero +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/atk-1.30.0
+	>=dev-libs/glib-2.26:2
+	media-libs/fontconfig
+	>=media-libs/freetype-2.5.3:2=[infinality?]
+	>=x11-libs/cairo-1.8.8:=
+	x11-libs/gdk-pixbuf:2
+	>=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
+	x11-libs/libXt
+	>=x11-libs/pango-1.24.5"
+X_DEPEND="
+	>=x11-libs/libXau-1.0.3
+	>=x11-libs/libXdmcp-1.0.2
+	>=x11-libs/libXinerama-1.0.2
+	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/lcms-2.5
+	>=media-libs/libpng-1.2:0=
+	>=sys-libs/zlib-1.2.3:=
+	virtual/jpeg:0=
+	javascript? ( dev-java/rhino:1.6 )
+	nss? ( >=dev-libs/nss-3.12.5-r1 )
+	kerberos? ( virtual/krb5 )
+	>=dev-util/systemtap-1
+	smartcard? ( sys-apps/pcsc-lite )
+	sunec? ( >=dev-libs/nss-3.16.1-r1 )
+	!dev-java/icedtea-web:7"
+
+# cups is needed for X. #390945 #390975
+# gsettings-desktop-schemas is needed for native proxy support. #431972
+RDEPEND="${COMMON_DEP}
+	!dev-java/icedtea:0
+	X? (
+		${CUPS_COMMON_DEP}
+		${X_COMMON_DEP}
+		media-fonts/dejavu
+		cjk? (
+			media-fonts/arphicfonts
+			media-fonts/baekmuk-fonts
+			media-fonts/lklug
+			media-fonts/lohit-fonts
+			media-fonts/sazanami
+		)
+	)
+	alsa? ( ${ALSA_COMMON_DEP} )
+	cups? ( ${CUPS_COMMON_DEP} )
+	selinux? ( sec-policy/selinux-java )
+	>=gnome-base/gsettings-desktop-schemas-3.12.2"
+
+# 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
+# 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:7
+		dev-java/icedtea-bin:6
+		dev-java/icedtea:7
+		dev-java/icedtea:6
+	)
+	app-arch/cpio
+	app-arch/unzip
+	app-arch/zip
+	app-misc/ca-certificates
+	>=dev-java/ant-core-1.8.2
+	dev-lang/perl
+	>=dev-libs/libxslt-1.1.26
+	dev-libs/openssl
+	virtual/pkgconfig
+	sys-apps/attr
+	sys-apps/lsb-release
+	${X_DEPEND}
+	pax_kernel? ( sys-apps/elfix )"
+
+PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
+	nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
+	pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+icedtea_check_requirements() {
+	local CHECKREQS_DISK_BUILD
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="9000M"
+	else
+		CHECKREQS_DISK_BUILD="8500M"
+	fi
+
+	check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+	icedtea_check_requirements
+}
+
+pkg_setup() {
+	icedtea_check_requirements
+
+	JAVA_PKG_WANT_BUILD_VM="
+		icedtea-7 icedtea-bin-7
+		icedtea-6 icedtea-bin-6
+		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 ${SRC_PKG}
+}
+
+java_prepare() {
+	# For bootstrap builds as the sandbox control file might not yet exist.
+	addpredict /proc/self/coredump_filter
+
+	# icedtea doesn't like some locales. #330433 #389717
+	export LANG="C" LC_ALL="C"
+}
+
+src_configure() {
+	local cacao_config config hotspot_port hs_tarball jamvm_config use_cacao use_jamvm use_zero zero_config
+	local vm=$(java-pkg_get-current-vm)
+
+	# gcj-jdk ensures ecj is present.
+	if use jbootstrap || has "${vm}" gcj-jdk; then
+		use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+		config+=" --enable-bootstrap"
+	else
+		config+=" --disable-bootstrap"
+	fi
+
+	# Use Zero if requested
+	if use zero; then
+		use_zero="yes"
+	fi
+
+	# Use JamVM if requested
+	if use jamvm; then
+		use_jamvm="yes"
+	fi
+
+	# Use CACAO if requested
+	if use cacao; then
+		use_cacao="yes"
+	fi
+
+	# Are we on a architecture with a HotSpot port?
+	# In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
+	if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
+		hotspot_port="yes"
+	fi
+
+	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+	# Otherwise use CACAO on ppc and Zero on anything else
+	if test "x${hotspot_port}" != "xyes"; then
+		if use ppc; then
+			use_cacao="yes"
+		else
+			use_zero="yes"
+		fi
+	fi
+
+	# Turn on JamVM if needed (non-HS archs) or requested
+	if test "x${use_jamvm}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
+			ewarn 'If so, please rebuild with USE="-jamvm"'
+		fi
+		jamvm_config="--enable-jamvm"
+	fi
+
+	# Turn on CACAO if needed (non-HS archs) or requested
+	if test "x${use_cacao}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
+			ewarn 'If so, please rebuild with USE="-cacao"'
+		fi
+		cacao_config="--enable-cacao"
+	fi
+
+	# Turn on Zero if needed (non-HS/CACAO archs) or requested
+	if test "x${use_zero}" = "xyes"; then
+		if test "x${hotspot_port}" = "xyes"; then
+			ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
+		fi
+		zero_config="--enable-zero"
+	fi
+
+	# Use appropriate HotSpot tarball for architecture
+	if { use arm || use arm64; }; then
+		hs_tarball="${DISTDIR}/${AARCH64_GENTOO_TARBALL}";
+	else
+		hs_tarball="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}";
+	fi
+
+	config+=" --with-parallel-jobs=$(makeopts_jobs)"
+
+	if use javascript ; then
+		config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
+	else
+		config+=" --without-rhino"
+	fi
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	econf ${config} \
+		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
+		--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
+		--with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
+		--with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
+		--with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
+		--with-hotspot-src-zip="${hs_tarball}" \
+		--with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
+		--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
+		--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
+		--with-jdk-home="$(java-config -O)" \
+		--prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
+		--with-pkgversion="Gentoo ${PF}" \
+		--disable-downloading --disable-Werror \
+		--disable-hotspot-tests --disable-jdk-tests \
+		--enable-system-lcms --enable-system-gif \
+		--enable-system-jpeg --enable-system-png \
+		--enable-system-zlib \
+		$(use_enable !debug optimizations) \
+		$(use_enable doc docs) \
+		$(use_enable nss) \
+		$(use_enable kerberos system-kerberos) \
+		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+		$(use_enable smartcard system-pcsc) \
+		$(use_enable sunec) \
+		$(use_enable infinality) \
+		${zero_config} ${cacao_config} ${jamvm_config}
+}
+
+src_compile() {
+	# Would use GENTOO_VM otherwise.
+	export ANT_RESPECT_JAVA_HOME=TRUE
+
+	# With ant >=1.8.2 all required tasks are part of ant-core
+	export ANT_TASKS="none"
+
+	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
+	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 doesn't preserve executable bits.
+	cp -vRP bin include jre lib man "${ddest}" || die
+
+	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
+
+	if use doc; then
+		docinto html
+		dodoc -r ../docs/*
+	fi
+
+	if use examples; then
+		cp -vRP demo sample "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	# provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool
+	if use webstart || use nsplugin; then
+		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
+		dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
+	fi
+	if use webstart; then
+		dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
+		dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
+	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
+
+	# OpenJDK7 should be able to use fontconfig instead, but wont hurt to
+	# install it anyway. 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
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_preinst() {
+	if has_version "<=dev-java/icedtea-7.2.0:7"; then
+		# portage would preserve the symlink otherwise, related to bug #384397
+		rm -f "${EROOT}/usr/lib/jvm/icedtea7"
+		elog "To unify the layout and simplify scripts, the identifier of Icedtea-7*"
+		elog "has changed from 'icedtea7' to 'icedtea-7' starting from version 7.2.0-r1"
+		elog "If you had icedtea7 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
+}