dev-java/icedtea: Goodbye Java 7!

Package-Manager: Portage-2.3.16, Repoman-2.3.6

4 files changed, 4 insertions, 401 deletions

diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 35d2eb77de44..c629cf52eb31 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,12 +1,4 @@
-DIST icedtea-2.6-corba-803456f62297.tar.bz2 1073306 SHA256 ff818ceedd154fa4d55d38b50fccd6a19de242a592d9ffbed7368bc56c091b81 SHA512 87b374d6907dcd72043cb3a86eed08e836861c238282fdd8c9684b6653b5788f1d183038572282f92dd81381765ac41243c6faa52033173157bb8b48b928d071 WHIRLPOOL fd9c85f496fc129ca2f7f90afd6c5e824d1f2e44b2ac54147f20c45855eab6107479d6f9ab0d218e56323cbfd78f0f66701ebaa1ec5f7cb115d7eff0a854f9a6
-DIST icedtea-2.6-hotspot-809ae803d8ea.tar.bz2 8210978 SHA256 a6055f2eb2c6f159fdc20fc5268ffb27d6cb7959ed7af28ee8a0f862b5b6dbf8 SHA512 8d4bb7a97e2213d21a99261d9f9a32824830f1b178260cb170eeb45ac54414bd26042dc75b2dc719850638571cf8057d7d3fdb65c32fbed8797e6242ba257e7f WHIRLPOOL e398a14c87bd46ed8e44427aa1630e1d1304b5e5cdf2bde9b2a9f565a88ecc3463eee173c652e47082d8942a04717b39f0c325f87c42f6861bdcf843e5b5fb39
-DIST icedtea-2.6-jaxp-46f2d7395127.tar.bz2 2733486 SHA256 a2642f8792edf7e40169ddafcd7a3c297e75b41f7c65fac2a84787376a65977d SHA512 a08618aca24f80f67669f62743150eaf7a33a602f9b5d806f3c0213261144a15006c4348800e25d5746500735498bc0c8380ee9adc75b6fce17283d9f4971358 WHIRLPOOL 2e2cdea8dae12ba7aedc16197c32e0bac376cbca675334eab6c7cde62a2de38887366212cec9f5fd13fa945f5e11d370462edc6531584d6a78148d9c7807d9fb
-DIST icedtea-2.6-jaxws-e17af60ebbd6.tar.bz2 2022975 SHA256 a299f434b48e5ed1e57085be5515ea1dbfbad971d08d386f070d653d2ea878be SHA512 145ae63e81a1c2cce6e462c2b38b05d79d138a89f5f4176151e87a8dcfb27c0b8f47c826ea12d85acdd31733ea253aaf9fbb019e605a4cc24c4b66803ca01f61 WHIRLPOOL eb404fd684c1f156f0fc481da0137c31a1eabce2f9867e8a67a67a392b1e62b741b32d3b23ef9c3866026bac87925279159abbc6c6b84521e05ea2f099aafe0e
-DIST icedtea-2.6-jdk-082c6e8b8812.tar.bz2 32843611 SHA256 ce4eca8a320c7514a7ecaa513a2a9cbb82a74e0256c8ba277fa692debe952eb5 SHA512 7974d9d7d55c4a57b53ee5e29f36ef058d207eee1701eac0e8b32b8f13a9084b08ff9fcde00cb16f4c23fa6bf371361f183b07f418cd6d200b67a67f86fa6785 WHIRLPOOL 431b45c17a9834799cacc575c9d96b8e7a19460491edcbfe01101270602aca0fc522dcebedce6bcf33f61bab632d58f169e0af70636533bdc4c3f51337d8a48f
-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.6-aarch32-7b008fa0fb6d.tar.xz 6742092 SHA256 c20ed439e32c6d72321097289bf7ac19bfae172a90efe23e08c54e63c53b402c SHA512 5cb9d97eac22fbc576b45201785a9d620daed744a2f43eb711371ff561c7d132ebdc3f291d785d285d4801c0d9b1c3bfaf57488fc8c9d31b69ba8ccd18f6c1b1 WHIRLPOOL 0ba359548f05f888d83534d0308a6bd7501ac6d95dc1f88338e8836959951a2bcea6f686785ffa4945049a345776d0a06dd03b6eebbee289b82df1da41a69be6
+DIST icedtea-3.6-aarch32-7b008fa0fb6d.tar.xz 6742092 BLAKE2B 3bbc62d745a48ef06ca2cdb8b1acbebcda37731e8121377f55ef572cf64287814a27465726ed3a61f56e684198d397a351f186bd85415f49990a0579c7bbafad SHA512 5cb9d97eac22fbc576b45201785a9d620daed744a2f43eb711371ff561c7d132ebdc3f291d785d285d4801c0d9b1c3bfaf57488fc8c9d31b69ba8ccd18f6c1b1
 DIST icedtea-3.6-corba-13a5a8a3c66f.tar.xz 938380 BLAKE2B 3060158fd278a1c79da4095787a4d6a934641a733c6001a6afb1ba2025efb3cb3ad811c13de13db8f6db8e9eaa606cfdafb8586dd0c78ece81312c2d772257b4 SHA512 5af5898c71e2f8b4feeb55d0976828ed89cc089048b64c5b8ffe55bc0db267e58c21bc6099737a50245352f6b1ccb510fbca3871c371bbc5109323c9a372e698
 DIST icedtea-3.6-hotspot-9bad7d4825fb.tar.xz 6820148 BLAKE2B 5a885bdbf1339c512b0941c93c3a1dd6151633b75471f76564c08f7930068c6200c771b8a812381c750545a26fef3d5c5a1f03b7c241d4e18bc5b3ebe30225fd SHA512 231775c3f7610388f2f5b11b60aed927e9f50cf0a65bf0675402b72c77ec1c4253e6151cbe0a27f9254297af024eae0f0ddd30a3d4b084699e730249202b9c51
 DIST icedtea-3.6-jaxp-947a7b1ce48b.tar.xz 2297468 BLAKE2B 0fb3376b7a5f2a419d40a0e5da353a77e6274fba60287d15a63b092e6694a14af9aca71c3f485a77bb8f7c2a741505bc62f6fbe988e7e182c173a9eaf157a31e SHA512 b557ef3a702ec2689578485d6a7444350aa6ce55b0eea6757996b52026e877861f6989a33b4b429dc56cbf7ff81c142696dac893552bdc7330213f45cbbea665
@@ -15,8 +7,7 @@ DIST icedtea-3.6-jdk-a05e38417041.tar.xz 39075276 BLAKE2B d1ae911f47d3fd1be1b15d
 DIST icedtea-3.6-langtools-61a1c711f7ab.tar.xz 2065880 BLAKE2B 47268b281d169b3dd355f5c199f6cdc085685c085537b6c8c34385427a3cb806c7b90e44e5ab9b79d9bddb494b50cb03079a94bbde9a8ddd800f6cc6ce14add9 SHA512 92787dcd32ef1f19c1bc01d0dc1e604c09af81dc380eef6584f6c7bc221b285cc14ec5c13226178e2f44e904353af69f416bafe55db6ad414ad79db4878220d8
 DIST icedtea-3.6-nashorn-a2d2fc80c97a.tar.xz 2231644 BLAKE2B a32b75a5a97b233afc9420708aabf3c6b0800ef61b6e108871e732d6c2ceb9cce540245e275f76e43c1da4ec079c9ce2692c3bbadbc7eee2bbd4cdf066789ebc SHA512 950989f71c7fef858eb8cd20024a2094e8d102b921d05fb1e4a320a431c3306178269e737f02318c448f57cd540ae6996552880ae419ef647e7dedb6b4a6ebbf
 DIST icedtea-3.6-openjdk-eb577ed6ec93.tar.xz 333636 BLAKE2B cf804790add194b62f7ead5f0f23ae4bf414142c1b3d241eb90f04594af0f76d165f060a87b006d3f431acafb6280512ba638b28c76cdd6d52f99ab24b5a136c SHA512 db794e9bd39f8994b29677dec62b5f47e5ab92b75a3c9c1922903095269a94d4f44b57a73360d64671f3c9a1403d83dbd0251354818842b2f95ac13073d19f27
-DIST icedtea-3.6-shenandoah-7eeed7dc4676.tar.xz 6935216 SHA256 0e04e065df996b967c1c9b5b14765c0b55e91c1efd5bc55a733eefca6bb21586 SHA512 4f3938acc6c49a5b9178618fd4f60a0458cbe5a3df82cb46a5dcafc6e63a74216eea55c42fee5a7ad964cc39ea816f3734dd3a8806cc71feba86e150760b3a55 WHIRLPOOL 4e79d937f5190681f6a2172099bbcb3be068b7c3115e1fe2228bfc552b2f8e2280f3f53a9bac162f2d89b11ff5cb3801ec74ed72caf00a230a26427f500ae0a6
+DIST icedtea-3.6-shenandoah-7eeed7dc4676.tar.xz 6935216 BLAKE2B 063d498832d5aaed280cc4d55aebbe95c900405e7229e1b5f81c12adcf0787c25f76c91db32985477bb7b98b0c1500c96579c9420d35c159f1c0c16027c7fc08 SHA512 4f3938acc6c49a5b9178618fd4f60a0458cbe5a3df82cb46a5dcafc6e63a74216eea55c42fee5a7ad964cc39ea816f3734dd3a8806cc71feba86e150760b3a55
 DIST icedtea-3.6.0.tar.xz 1489504 BLAKE2B 759adf7a4fad51fe0f80028d4174feb93afe0aece121be3e0794de620300a384ad0107eadb5c3f4dd5a3aeeaad496a510298d05c9a8e0f07b3b997e59ec4306b SHA512 7e19b66267266453b4aabeefcebe0d889604b329a5ad0338cc54cb49cef2b806fbc7cc0dd7078df231b04e033abe0c47de1b4c78e2f68682d9243e3064159c28
-DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 BLAKE2B 5c1faa3cbbfea62f819562a01ec389f3682cf3164d06f5404d1d16359c87b37d6ae4101f7c33cde30bad4f3d52af18f0f410e36868b2c9d1280661d2340e683b SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23
 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
diff --git a/dev-java/icedtea/files/icedtea.env.sh b/dev-java/icedtea/files/icedtea.env.sh
index cf3791afd738..ac8303bda073 100644
--- a/dev-java/icedtea/files/icedtea.env.sh
+++ b/dev-java/icedtea/files/icedtea.env.sh
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 VERSION="IcedTea JDK ${PV}"
@@ -7,7 +7,7 @@ JDK_HOME="${EPREFIX}/usr/$(get_libdir)/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/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/$([[ ${SLOT} = 7 ]] && printf :\${JAVA_HOME}/jre/lib/$(get_system_arch)/xawt/)"
+LDPATH="\${JAVA_HOME}/jre/lib/$(get_system_arch)/:\${JAVA_HOME}/jre/lib/$(get_system_arch)/server/"
 MANPATH="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man"
 PROVIDES_TYPE="JDK JRE"
 PROVIDES_VERSION="1.${SLOT}"
diff --git a/dev-java/icedtea/icedtea-7.2.6.11.ebuild b/dev-java/icedtea/icedtea-7.2.6.11.ebuild
deleted file mode 100644
index 0b01f2d8254d..000000000000
--- a/dev-java/icedtea/icedtea-7.2.6.11.ebuild
+++ /dev/null
@@ -1,387 +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@member.fsf.org)
-
-EAPI="6"
-SLOT="7"
-
-inherit check-reqs gnome2-utils 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="803456f62297.tar.bz2"
-JAXP_TARBALL="46f2d7395127.tar.bz2"
-JAXWS_TARBALL="e17af60ebbd6.tar.bz2"
-JDK_TARBALL="082c6e8b8812.tar.bz2"
-LANGTOOLS_TARBALL="cddb1f9f8b9c.tar.bz2"
-OPENJDK_TARBALL="499e7894cc44.tar.bz2"
-HOTSPOT_TARBALL="809ae803d8ea.tar.bz2"
-
-CACAO_TARBALL="cacao-c182f119eaad.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}"
-
-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.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}/hotspot.tar.bz2 -> ${HOTSPOT_GENTOO_TARBALL}
-	${ICEDTEA_URL}/langtools.tar.bz2 -> ${LANGTOOLS_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 ~arm64 ~x86"
-
-IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt
-	jamvm javascript +jbootstrap kerberos libressl nsplugin nss pax_kernel
-	pulseaudio sctp selinux 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:=
-	>=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/libXt
-	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"
-
-COMMON_DEP="
-	app-misc/mime-types
-	>=dev-libs/glib-2.26:2
-	>=dev-util/systemtap-1
-	media-libs/fontconfig
-	>=media-libs/freetype-2.5.3:2=
-	>=media-libs/lcms-2.5
-	>=sys-libs/zlib-1.2.3:=
-	virtual/jpeg:0=
-	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
-	)
-	javascript? ( dev-java/rhino:1.6 )
-	kerberos? ( virtual/krb5 )
-	nss? ( >=dev-libs/nss-3.12.5-r1 )
-	sctp? ( net-misc/lksctp-tools )
-	smartcard? ( sys-apps/pcsc-lite )
-	sunec? ( >=dev-libs/nss-3.16.1-r1 )"
-
-# gsettings-desktop-schemas is needed for native proxy support. #431972
-RDEPEND="${COMMON_DEP}
-	!dev-java/icedtea:0
-	!dev-java/icedtea-web:7
-	>=gnome-base/gsettings-desktop-schemas-3.12.2
-	media-fonts/dejavu
-	alsa? ( ${ALSA_COMMON_DEP} )
-	cjk? (
-		media-fonts/arphicfonts
-		media-fonts/baekmuk-fonts
-		media-fonts/lklug
-		media-fonts/lohit-fonts
-		media-fonts/sazanami
-	)
-	cups? ( ${CUPS_COMMON_DEP} )
-	!headless-awt? ( ${X_COMMON_DEP} )
-	selinux? ( sec-policy/selinux-java )"
-
-# 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
-DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
-	|| (
-		>=dev-java/gcj-jdk-4.3
-		dev-java/icedtea-bin:7
-		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
-	!libressl? ( dev-libs/openssl )
-	libressl? ( dev-libs/libressl )
-	sys-apps/attr
-	sys-apps/lsb-release
-	virtual/pkgconfig
-	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 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}
-}
-
-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 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
-
-	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="${DISTDIR}/${HOTSPOT_GENTOO_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}" \
-		--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 system-gif) \
-		$(use_enable !headless-awt system-png) \
-		$(use_enable !debug optimizations) \
-		$(use_enable cups system-cups) \
-		$(use_enable doc docs) \
-		$(use_enable gtk system-gtk) \
-		$(use_enable kerberos system-kerberos) \
-		$(use_enable nss) \
-		$(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}
-}
-
-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() {
-	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 headless-awt; then
-		rm -vr "${ddest}"/jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*,libjavagtk.*} \
-		   "${ddest}"/{,jre/}bin/policytool "${ddest}"/bin/appletviewer || 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() {
-	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
-
-	gnome2_icon_savelist;
-}
-
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index fd585923d58d..533bc719560c 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -26,7 +26,6 @@
   <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
   <flag name="jamvm">Use the JamVM virtual machine rather than HotSpot.</flag>
   <flag name="jbootstrap">If possible, recompile the final IcedTea executables with itself.</flag>
-  <flag name="nss">Enable NSS security provider support.</flag>
   <flag name="nsplugin">Enable browser plugin (NPPlugin), requires also the webstart flag to be enabled.</flag>
   <flag name="pax_kernel">Apply patch needed for pax enabled kernels.</flag>
   <flag name="shenandoah">Include the Shenandoah ultra-low pause time garbage collector (-XX:+UseShenandoahGC) (x86_64 only)</flag>