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

[James Le Cuirot]

commit:     6fe4bb91bfce87f1750f0b2468654ca2ad10e763
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  4 15:15:33 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Nov  4 17:52:53 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fe4bb91

dev-java/icedtea: Remove vulnerable 3.5.1 wrt security bug #636522

Package-Manager: Portage-2.3.13, Repoman-2.3.2

 dev-java/icedtea/Manifest             |  11 -
 dev-java/icedtea/icedtea-3.5.1.ebuild | 396 ----------------------------------
 2 files changed, 407 deletions(-)

diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index b911f6f9af0..6a065615b27 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -6,17 +6,6 @@ DIST icedtea-2.6-jdk-082c6e8b8812.tar.bz2 32843611 SHA256 ce4eca8a320c7514a7ecaa
 DIST icedtea-2.6-langtools-cddb1f9f8b9c.tar.bz2 1711691 SHA256 650a2d3881ba02ea10cbb6ddeef3888103fccaa904cb23517e07b3acd26d4c7f SHA512 6301ca17725dcf085b4dea74d453bb2ec9e7620b6791bdba6cf70fd4fac3f53679c8281db17c343ae4639a3c5431d9af09d76619825e2a8f3072bf46e09a9ce1 WHIRLPOOL 75111e57719c8d7956046ffb573682074a9013e6b01636d5083018fae34a6986f58eef2c89281d7708b644cd9847f11c24a6f1f6d18b8ef03ac4f9b801f07628
 DIST icedtea-2.6-openjdk-499e7894cc44.tar.bz2 130600 SHA256 0d521feed6275102ba3b3ee394330fefe20463dd63caa7197c7fd93e132519fe SHA512 95a0168b109266dfe7af97355f34888559f1978201fc7fe9c1b7b15074793d850a68ce031603bb62c4ad6790e8575ebf7e73fca2fdd8f03c9ab0a4e24e3e07b8 WHIRLPOOL 264b87945b13cf6a0adde36b084bb6889a0567e80b035ab4296b8f8bbe433c058ccfa09e32ba1a14914b5b44ea1ecf2a56c8f894c18d31087b0aed504b04a39f
 DIST icedtea-2.6.11.tar.xz 2117880 SHA256 20063c314535e4ed4b8099e497b880e4f346c85e7315a2573d0f398b973777c5 SHA512 b77b5cf632d357f6ca87f2a9cfe179b95941a10e669997feb2506da56baa09fa5b94ea6025471ac6e4165bd9769799c84159d5fa39c19f1111bdb8770314d587 WHIRLPOOL 80af9323a6a8315f0a68a75db736ec35fbfa53a1b30f052cfa80256aa1dd04e9619ef9ccf9999333bc90826ca3b57750c4f62b64549ee39a71e73f7cc57d277b
-DIST icedtea-3.5-aarch32-b93c39bf2bcf.tar.xz 6743892 SHA256 38e24d556aa269a5168e251b1fa97e84467a722fff27fa2f81de315854f18a33 SHA512 11d25efc36eb776fab3dd411c585d7c3ca6793ac54e17952ed43d22a6928a72fdf4625e836edafb07be3c6ee8612e258c749f5f661d61fb4b90675ed93896e48 WHIRLPOOL a4f931e56b27fab5dfa9a8ff053899b51182407eaa7b6db8a00a83915535b48f241776d7d089b532e6bb89ed629273621c9a65faf71a9efbc095ff679bd7a612
-DIST icedtea-3.5-corba-b5485d6bc171.tar.xz 937092 SHA256 0b03af9726b6d47811166ab8343b553de33b4285f780c6c6df98a2e697613a0c SHA512 19d4e311edd3ed5f388373e3c819a9317dbaa561c4a22c924079cef284d16ce06d5468510b84fe3f1867570e8caed915ec4edc2479bd44686493bcf9fbf523de WHIRLPOOL dd4735a77cd8f82bae443a5330a2af97f9c925fa66e94b59cdeb6475dc521e5cd44fa0815ab5c703b1a966e8238789c150985ab354b032ab687575411a5166b7
-DIST icedtea-3.5-hotspot-ecaa25cbc662.tar.xz 6820580 SHA256 a6e974e8447a661e5ae5a17e44b703395d7fc551af540890de4dcda481ebee38 SHA512 c16b5db736b553acb74bce50f37213a181fc26a6fdc7ef9242aa40c46afea78e52ec08a167f5fe29023e0ecef1f92b45b51250208d63ef88f5686fe2b12d4c34 WHIRLPOOL f513fe1e03e6f400991e9fceeacc6eef668a8135c4e7833bebac1b2fb43242195e2b3c3476e339f4e01704b042eb0606e716d3ae974bd226c026cc42eb94cc9f
-DIST icedtea-3.5-jaxp-c8bf6508b7a5.tar.xz 2296924 SHA256 96a844aec7d873a260a22622b028165d862bd5842a64091ed0818309a49225a0 SHA512 5f932ce9453412d3a1b3108cf143836712cc46676093441b02db24652d4d30dbf21849cbb6fe75071961312c747289b8feccdf23c94b9e9ab2b78bdefd7c72df WHIRLPOOL d6d31ec9a2cf395e4d03c63a3ad81ef4192d699fa95b57e94265a4481144519db3f54c127bc71b9d220180fab1c4132bf1955a67c6531ff49dd0d679e50e1f4a
-DIST icedtea-3.5-jaxws-4fb919272935.tar.xz 2267608 SHA256 86ae65fb5a7566216639b915abdf6f2c8522c0bfcc1bf4fe521bc3ce0a72046e SHA512 3259181c303fc1642816e5d3291d81e80fb62764edd38734876e9581d4d1fcb718bf5f2cc8dbf0362f218105effa50fa50a4e4b79e08501e991ff4bdbbf881cb WHIRLPOOL 967599341e5cc990bcb65ddcc58fc4f2a84bdad7aa33e5b7b7114f65167e2d6ce918a8fd70913a368d252c2ce143ff45504e9cb7fa12f0ed3c66ec4b2ed826fc
-DIST icedtea-3.5-jdk-db0baea3a4f0.tar.xz 39030920 SHA256 65286cbd774afd95b8fd2c50c30d9d33d08156243805b10cb373a6463e66dea4 SHA512 9f60583ffd61d8dec73f17c7dbbf12e275c9c46b8cbafc59a969b11a0b65ae1f6366051fc1c76538b217a2b55510e112a815b279a9c19046f7035d2680ca2b9f WHIRLPOOL 8c70a610cb2d77d4c571c165ae4e118450d21425576f77585a0b694ba2abe417f06b235d808822f3449fdfd3d1491b67411ca6ffc4c80a81e515a73fbb7fd8cf
-DIST icedtea-3.5-langtools-74bbbc7a8bd3.tar.xz 2066912 SHA256 fe554a5d3bcd7d5f2a545f6e06a50e3d5adf2619d1566b80acb0b3926953566b SHA512 856fecddf01c6eb89055bd905d0df1d61d4a1605f4663ff33357c1d4372150ddf4d5d2e6e8f2c4d8c92071075b7090c9fdbe5a10d2c0c61b1d242fe938dc1b8c WHIRLPOOL 874b16298640e6555366b387a8257f4405c76e92b7764d0807cd5c33d418c4b03be4486f06f7b7c1fba4997a48ebf4f07f06f4de17f472f040c293f70385cced
-DIST icedtea-3.5-nashorn-bad6bd2d128e.tar.xz 2225708 SHA256 9e47a8838ff9f6aca596c9f07e6af6a24f7db486d1809a6e07d77cd2ecc32555 SHA512 3e3ca6942b32c1b342a108cdd08d72da49249c88c4f5da04b2e822dcb12d144584a10eb7e5c109f9bf49cd84ab957577db83d55ff31471ef76b0748b44b54896 WHIRLPOOL ca2e99d1853a75f1f3c4a6073133d2389b16c7fbd5aa84ae83177898e9972fd1b72bfffd2ab47b1bfa99cb3c509c4420fe4b385bfe1acd95b83285534ac55235
-DIST icedtea-3.5-openjdk-80ab5dd98579.tar.xz 333312 SHA256 5834862d650ed290d88610d60abbfbb1f8bf47cd485051e1617ffee011cede28 SHA512 13ea05cdc90f18a1600c7771314fcf2d07bfef186e7fe9125cf37e4a62f51a1d26dab653ee294fd9079419b3297f812c6b9c516def11ede8355dd2f6d8e7a08a WHIRLPOOL 0fae338f860e1c78f835962716212020f56c50a0dc56fe3d68542f7aa34f0b33578c9d9feb7526d441734c56534aa555a87c8fa504025a839fe59c594c5bb821
-DIST icedtea-3.5-shenandoah-26bb4cd21d34.tar.xz 6928840 SHA256 71b862293bd17e96f5f1a57553c17ae32dca5b4586ba592118b7d16aee63547a SHA512 3cd1856a1dbcdfc7fac3293b7a8b449dc7632b797dab9b665cb9248bcb14f3bb635760f3eaebafbe3f662a24c5125dbb2572c525dbe5d02f02806ae6d8a2eaec WHIRLPOOL 1f4cdb1c068650f4c9fe1c8239cdb6a3fd668d67e8a740f6f088b9d8834bad13fbdcc485ba2e0b6d6049e3f820ee44e38b2da46889217a46f3954cc12ab36b82
-DIST icedtea-3.5.1.tar.xz 1492912 SHA256 8eaa6ac93d4a1989460109246f78427acc5493f847c7b2fc80d3a5d918d811c9 SHA512 2f9283606c275c1b326b39a649cedf0ff3a6b59be1ac455f44ced2fac16fba36758a63f227fa66c1f8ddf252a67540f6332fdf415f9dcbd09fe28308d1989cf6 WHIRLPOOL c6915b3ee3829da96dc890d28188b16e89269041309d8317a7dc17338791e16589ab72c0c0708a97dd492caf770dab2e5875703319993f5aede95078da4aee59
 DIST icedtea-3.6-aarch32-7b008fa0fb6d.tar.xz 6742092 SHA256 c20ed439e32c6d72321097289bf7ac19bfae172a90efe23e08c54e63c53b402c SHA512 5cb9d97eac22fbc576b45201785a9d620daed744a2f43eb711371ff561c7d132ebdc3f291d785d285d4801c0d9b1c3bfaf57488fc8c9d31b69ba8ccd18f6c1b1 WHIRLPOOL 0ba359548f05f888d83534d0308a6bd7501ac6d95dc1f88338e8836959951a2bcea6f686785ffa4945049a345776d0a06dd03b6eebbee289b82df1da41a69be6
 DIST icedtea-3.6-corba-13a5a8a3c66f.tar.xz 938380 SHA256 ad9d8ee4124afa374fb362fc2cbbcbd9efae186ade413a539e36004e70603662 SHA512 5af5898c71e2f8b4feeb55d0976828ed89cc089048b64c5b8ffe55bc0db267e58c21bc6099737a50245352f6b1ccb510fbca3871c371bbc5109323c9a372e698 WHIRLPOOL 6cb3052a8dcf02781af9cc4cfe387f63c69c97f626bc2b2798a86b9c87d593f67d9cee844b2c17d2f2569c3d1b525e50184b0957d9a90f9e864d2bab02acc379
 DIST icedtea-3.6-hotspot-9bad7d4825fb.tar.xz 6820148 SHA256 2fd0b65c57255136b0fcf8ba0b5f5acdbb409af9c35ae4e84cfe7f93fdbfcfd5 SHA512 231775c3f7610388f2f5b11b60aed927e9f50cf0a65bf0675402b72c77ec1c4253e6151cbe0a27f9254297af024eae0f0ddd30a3d4b084699e730249202b9c51 WHIRLPOOL ceb043db7daec74e29b1f565da98baab7433b03ac97c960b3eb48e1b25eec532ae93c25cc280da1b44287a3213b5ccab8b2fa073d3684a40bc47c445a0f88ee5

diff --git a/dev-java/icedtea/icedtea-3.5.1.ebuild b/dev-java/icedtea/icedtea-3.5.1.ebuild
deleted file mode 100644
index 60dc9b5643c..00000000000
--- a/dev-java/icedtea/icedtea-3.5.1.ebuild
+++ /dev/null
@@ -1,396 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Build written by Andrew John Hughes (gnu_andrew@××××××××××.org)
-
-EAPI="6"
-SLOT="8"
-
-inherit check-reqs gnome2-utils java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator
-
-ICEDTEA_VER=$(get_version_component_range 1-3)
-ICEDTEA_BRANCH=$(get_version_component_range 1-2)
-ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
-ICEDTEA_PRE=$(get_version_component_range _)
-
-CORBA_TARBALL="b5485d6bc171.tar.xz"
-JAXP_TARBALL="c8bf6508b7a5.tar.xz"
-JAXWS_TARBALL="4fb919272935.tar.xz"
-JDK_TARBALL="db0baea3a4f0.tar.xz"
-LANGTOOLS_TARBALL="74bbbc7a8bd3.tar.xz"
-OPENJDK_TARBALL="80ab5dd98579.tar.xz"
-NASHORN_TARBALL="bad6bd2d128e.tar.xz"
-HOTSPOT_TARBALL="ecaa25cbc662.tar.xz"
-SHENANDOAH_TARBALL="26bb4cd21d34.tar.xz"
-AARCH32_TARBALL="b93c39bf2bcf.tar.xz"
-
-CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
-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}"
-NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
-HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
-SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}"
-AARCH32_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch32-${AARCH32_TARBALL}"
-
-CACAO_GENTOO_TARBALL="icedtea-${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.xz -> ${OPENJDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
-	${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
-	${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
-	${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
-	${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
-	shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} )
-	arm? ( ${ICEDTEA_URL}/aarch32.tar.xz -> ${AARCH32_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 ~arm ~arm64 ~ppc64 ~x86"
-
-IUSE="+alsa cacao +cups doc examples +gtk headless-awt
-	jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch
-	pulseaudio sctp selinux shenandoah smartcard +source +sunec test +webstart zero"
-
-REQUIRED_USE="gtk? ( !headless-awt )"
-
-# 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="
-	>=media-libs/giflib-4.1.6:0=
-	>=media-libs/libpng-1.2:0=
-	>=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/libXcomposite"
-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"
-
-# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
-COMMON_DEP="
-	>=dev-libs/glib-2.26:2=
-	>=dev-util/systemtap-1
-	media-libs/fontconfig:1.0=
-	>=media-libs/freetype-2.5.3:2=
-	>=media-libs/lcms-2.5:2=
-	>=sys-libs/zlib-1.2.3
-	virtual/jpeg:0=
-	kerberos? ( virtual/krb5 )
-	sctp? ( net-misc/lksctp-tools )
-	smartcard? ( sys-apps/pcsc-lite )
-	sunec? ( >=dev-libs/nss-3.16.1-r1 )"
-
-# Gtk+ will move to COMMON_DEP in time; PR1982
-# gsettings-desktop-schemas will be needed for native proxy support; PR1976
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea:0
-	!dev-java/icedtea-web:7
-	>=gnome-base/gsettings-desktop-schemas-3.12.2
-	virtual/ttf-fonts
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cups? ( ${CUPS_COMMON_DEP} )
-	gtk? (
-		>=dev-libs/atk-1.30.0
-		>=x11-libs/cairo-1.8.8
-		x11-libs/gdk-pixbuf:2
-		>=x11-libs/gtk+-2.8:2
-		>=x11-libs/pango-1.24.5
-	)
-	!headless-awt? ( ${X_COMMON_DEP} )
-	selinux? ( sec-policy/selinux-java )"
-
-# ca-certificates, perl and openssl are used for the cacerts keystore generation
-# perl is needed for running the SystemTap tests
-# lsb-release is used to obtain distro information for the version & crash dump output
-# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
-# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
-# Ant is no longer needed under the new build system
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
-	|| (
-		dev-java/icedtea-bin:8
-		dev-java/icedtea-bin:7
-		dev-java/icedtea:8
-		dev-java/icedtea:7
-	)
-	app-arch/cpio
-	app-arch/unzip
-	app-arch/zip
-	app-misc/ca-certificates
-	dev-lang/perl
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl:0 )
-	sys-apps/attr
-	sys-apps/lsb-release
-	x11-libs/libXt
-	virtual/pkgconfig
-	pax_kernel? ( sys-apps/elfix )"
-
-PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
-	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[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-8 icedtea-bin-8
-		icedtea-7 icedtea-bin-7"
-	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}
-}
-
-src_configure() {
-	# 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"
-
-	local cacao_config config hotspot_port hs_config 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 Zero for now until alternate VMs are working
-	if test "x${hotspot_port}" != "xyes"; then
-			use_zero="yes"
-	fi
-
-	if use shenandoah; then
-		if { use amd64 || use arm64; }; then
-			hs_config="--with-hotspot-build=shenandoah"
-			hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
-		else
-			eerror "Shenandoah can only be built on arm64 and x86_64. Please re-build with USE="-shenandoah""
-		fi
-	else
-		if use arm ; then
-			hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}""
-		else
-			hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
-		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
-		ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
-		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
-		ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
-		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
-
-	# Warn about potential problems with ccache enabled
-	if has ccache ${FEATURES}; then
-		ewarn 'ccache has been known to break IcedTea. Disable it before filing bugs.'
-		config+=" --enable-ccache"
-	else
-		config+=" --disable-ccache"
-	fi
-
-	# PaX breaks pch, bug #601016
-	if use pch && ! host-is-pax; then
-		config+=" --enable-precompiled-headers"
-	else
-		config+=" --disable-precompiled-headers"
-	fi
-
-	config+=" --with-parallel-jobs=$(makeopts_jobs)"
-
-	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-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
-		--with-nashorn-src-zip="${DISTDIR}/${NASHORN_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}" \
-		--mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--with-pkgversion="Gentoo ${PF}" \
-		--disable-downloading --disable-Werror --disable-tests \
-		--enable-system-lcms --enable-system-jpeg \
-		--enable-system-zlib --disable-systemtap-tests \
-		--enable-improved-font-rendering \
-		$(use_enable headless-awt headless) \
-		$(use_enable !headless-awt system-gif) \
-		$(use_enable !headless-awt system-png) \
-		$(use_enable doc docs) \
-		$(use_enable kerberos system-kerberos) \
-		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
-		$(use_enable sctp system-sctp) \
-		$(use_enable smartcard system-pcsc) \
-		$(use_enable sunec) \
-		${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
-}
-
-src_compile() {
-	default
-}
-
-src_test() {
-	default
-}
-
-src_install() {
-	default
-
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${ED}${dest#/}"
-
-	if ! use alsa; then
-		rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
-	fi
-
-	if ! use examples; then
-		rm -r "${ddest}"/demo "${ddest}"/sample || die
-	fi
-
-	if ! use source; then
-		rm -v "${ddest}"/src.zip || die
-	fi
-
-	dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	# 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
-
-	java-vm_install-env "${FILESDIR}/icedtea.env.sh"
-	java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_preinst() {
-	# From 3.4.0 onwards, the arm directory is a symlink to the aarch32
-	# directory. We need to clear the old directory for a clean upgrade.
-	if use arm; then
-		local dir
-		for dir in "${EROOT}usr/$(get_libdir)/icedtea${SLOT}"/{lib,jre/lib}/arm; do
-			if [[ -d ${dir} && ! -L ${dir} ]]; then
-				rm -r "${dir}" || die
-			fi
-		done
-	fi
-
-	gnome2_icon_savelist
-}
-
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }