gentoo resync : 16.06.2018

11 files changed, 213 insertions, 73 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index ca3417f43fd0..146159d69fc4 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-ivy/Manifest b/dev-java/ant-ivy/Manifest
index b3fba3b598b8..d095587b2e80 100644
--- a/dev-java/ant-ivy/Manifest
+++ b/dev-java/ant-ivy/Manifest
@@ -1,6 +1,4 @@
 AUX 1.4.1-javadoc.patch 500 BLAKE2B 9954ccef76c45a403d444a730986c15d9fc5c6106908a209691a04c1e3b24af21eddccf217c46120cc2c89eabe0cfe277fe245b7e174974de29ec2bd5affca2b SHA512 e50463fb7bb7ffd493ad212cf2fbdef89e454de48521c6903ddbd9c7ba1a799172cf36265c6131e3a81136c0872977c63e654b7ce2913aac3672357718b8f93f
-AUX ivy-1.3.1-noresolve.patch 371 BLAKE2B aa9cead35ea3bf8b4dd9ad0009a5794dc16598f2a3428cc41e2a46c0b6a946be78263f56390f4da5e5dc2940abdaa217489271c6effb07de7d3ee7445f900f3f SHA512 fa520c8bf17813c3aa9c6b41b50bf844c86b959b2046b64241bddc16675a7a2583151813b6ad3dd7369ab1ee453909fe84a34d8e4c81ee5729e9c929d9690b02
-AUX ivy-1.3.1-tasks.patch 593 BLAKE2B 7d6b478ced62f35619490248b3f62a32869695fdef67c0a5fe19cb52de565c5c20f1a3e903406aef6835559d84ba668c0dfa5e2ce8d78c9b86c645b89fc9fcf4 SHA512 399f5fd76af888d4aacac83ce0a1311e26e49f3101dc1577615b576057197518348917a7670d916e502ac4caa2620d9824470e72acd9708a35463d044e733278
 DIST apache-ivy-2.3.0-src.tar.gz 2790722 BLAKE2B 87a79bad15b9b74517ce240fcfd0ae9e58b67816f0ec1fbd14081a17bd837c497da419d0b45ad63b3782b151e86c85b79cafa11f8c1170ab0287597be78cabe7 SHA512 fde43ff288cd8c77f2bdecdcbf52f180247ed99a8526be9d875d60e209b66155d5526e968400382d2cef22cabb8899c3b0912e049ae7d23e2cb79be8a81fe00f
 DIST ivy-1.4.1-src.zip 751792 BLAKE2B 3a6ca8aaa49be9c664c3de4789debfe5770bb32084c548aa49a8d6146b55391729d5d68758e26f29253ab727e8a2a731961ba45419f3c1a212b26d74f33b0a0e SHA512 8ccb4680e8c32178bf12b74f4c6df668bbdd06c6dce6a2d0bf1b9daeec8fb5166d4d510cadb247dc4e2a91b71f5dc7fc429d0d7faed95a2898fd4f9d0888ee8d
 EBUILD ant-ivy-1.4.1-r1.ebuild 1759 BLAKE2B 30c437cccd0d86ca2a8b162569602ab2571ff570e6e373dd17f47d60df5c06c6ae8726caf67290d2a0d2b250de63f9638f17aa84cbf8ff9f479d66b161c503ca SHA512 21028c7fe5712daf3680fec1137261b9bde21fb46f0633abbbd98fab4e41d2cdd63d5364d6de4275f667f778a9c8b2ebfeed56b8ffc0d4b25cb8ae039f802a20
diff --git a/dev-java/ant-ivy/files/ivy-1.3.1-noresolve.patch b/dev-java/ant-ivy/files/ivy-1.3.1-noresolve.patch
deleted file mode 100644
index 206141f4c260..000000000000
--- a/dev-java/ant-ivy/files/ivy-1.3.1-noresolve.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru ivy-1.3.1.vanilla/build.xml ivy-1.3.1/build.xml
---- ivy-1.3.1.vanilla/build.xml	2006-08-21 16:11:08.000000000 +0200
-+++ ivy-1.3.1/build.xml	2006-08-21 16:11:21.000000000 +0200
-@@ -9,7 +9,7 @@
- 	</target>

- 

- 	<target name="resolve" depends="prepare">

--		<ivy:retrieve/>

-+		<!-- <ivy:retrieve/> -->

- 	</target>

- 

- 	<target name="build" depends="resolve">

diff --git a/dev-java/ant-ivy/files/ivy-1.3.1-tasks.patch b/dev-java/ant-ivy/files/ivy-1.3.1-tasks.patch
deleted file mode 100644
index 4e392f079352..000000000000
--- a/dev-java/ant-ivy/files/ivy-1.3.1-tasks.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nru ivy-1.3.1-vanilla/build.xml ivy-1.3.1/build.xml
---- ivy-1.3.1-vanilla/build.xml	2006-08-21 19:34:19.000000000 +0200
-+++ ivy-1.3.1/build.xml	2006-08-21 19:35:18.000000000 +0200
-@@ -33,6 +33,16 @@
-   		<jar 	destfile="${artifacts.build.dir}/ivy.jar"

- 				basedir="${classes.build.dir}"/>

- 	</target>

-+

-+	<target name="javadoc">

-+		<javadoc destdir="${javadoc.build.dir}">

-+			<fileset dir="${src.dir}"/>

-+		</javadoc>

-+	</target>

-+

-+	<target name="clean">

-+		<delete dir="${build.dir}"/>

-+	</target>

- 	

- 	<target name="test" depends="jar">

- 		<path id="run.classpath">

diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index f4358c344d74..74ada9a0598b 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -5,13 +5,28 @@ DIST icedtea-bin-core-3.7.0-arm64.tar.xz 59140980 BLAKE2B 5615ba4c7ff2af6890a2d8
 DIST icedtea-bin-core-3.7.0-ppc64.tar.xz 54288800 BLAKE2B 4858529c37e05158c481f634796202a9cfeb3dcdf0c11dfe3b84d63d238790c714f0f4aaaf37a54d7d13ddbdab7d7a7083d73f9ea684508145ba0c6a725ce346 SHA512 b6411ef98525bd90c42c017b91a2acc3e4a94e9965391b7432b60d24d980667cdda27f527d0dfeb2d60285c3d34b2aaa4e7485b4b8f07e8e47b07bbbf5fd9b94
 DIST icedtea-bin-core-3.7.0-ppc64le.tar.xz 54323992 BLAKE2B eb03570034b7d271974c50c5649891522b89c3bb82437f7feeab12a228685f2d93e827493df7f72235cffa253e6c83ca9c9ae2bd16204987f3b67af452307cff SHA512 593c0947252bc5290684f8056a20ba7ebbe9517e0c118009446df43da15a6e18a1e4593675242bc001edab078e3a914a610a86559e4d7ea20b6d2349cf3977c1
 DIST icedtea-bin-core-3.7.0-x86.tar.xz 61466288 BLAKE2B d63b381f9ad6f1724f9fe549550252b8d298b8c5cbb1351ee13c7ecf9c052fdc1ce0a4d4eac27b9a4a5700bc1734f3d3f985deec0f97f97c473911ac749dabeb SHA512 cbec66498b016daae78a8ed7e8646a844538c0b7d87615aa71dead9539164799991cf8c11f51de8ae438045b2f8ae8a9c99b79c7b0d04e09d97d208d6d544b35
+DIST icedtea-bin-core-3.8.0-amd64.tar.xz 61957580 BLAKE2B 8648338daf7152a0c0317e33fa1433dd44b9e3f712e49ec4e9af907f94063e6c193effd350265ab9b89ab19d3411ac523693d381c0cd7f604f45c241d1843820 SHA512 856a9d2da9b4b1f9400742d17f6f4c0cb43e37c738c5ea8feba763554b8a4ef2f529f59e81fc6919318df7cf7fb1d94a8a682220fcd82b4d723376031b8575ee
+DIST icedtea-bin-core-3.8.0-arm.tar.xz 58006344 BLAKE2B 6792056b8ebe82976dbd288cbf2906b00124aef4958ad2e073d57c746d6fee3e0181c61381744bdeb34daf54524ddebae692e01a52f3a5cb88fc34e1156bc9c1 SHA512 e2025746421ae197f0ecf0702890f3a8be62ac7bd7cf08b35250a88ccf7fa37ab52bfa0c6c09d8801f6c8d4282677f957ccbcf54c7f501b441b196dba7eb9f9c
+DIST icedtea-bin-core-3.8.0-arm64.tar.xz 59142392 BLAKE2B aa653348bb9d76ecccf27c76daac5f25e8bb58e95a0aaca05c233fbdec42f9c0f285cef1397a99cc5f15f154c8d2fcb9c9e36867da369a984692abeba57b711d SHA512 fc6531dec845e8a0dbe2ffafc0f01093ac5ed861b4321825e04f9a72892c0eeebbe5ff36186ef6ad098aed0d6fe79a5324c55e709362cb5f44bdc7d5666a19be
+DIST icedtea-bin-core-3.8.0-ppc64.tar.xz 54282712 BLAKE2B 78f9f9fbbcdb5f36a970497eed6ea77ed142d32beec74caea489ee7105e08151878a622fef5ea66b521103dc5b561203c4bf3fe7ab2b80ac304b5d4bd2d1d84d SHA512 d354b2eeb591dc73c9547a56f1421b034c7789cfb44a7f6b717ebce39113b319b3c3afbc7367e14c86b42a52e2c27fb69a016657581ab7f3586b6a7cc62b0137
+DIST icedtea-bin-core-3.8.0-ppc64le.tar.xz 54314152 BLAKE2B 4a7988672a1bced1bc10c8ca7d6299e27aac624af6f6d1335c1a4722508aadb408e3f210de82491f3acc2873868d7f04bb26840161c56741ffd16c6c43e84430 SHA512 1382711e50f90ab1943c98214fdfdb971129eeb6ebdd710ecc8bf777487ce85aaee0e5c8dd17ac403e00f20a8829c1f1afcdf648794a08da6be9b0500d959815
+DIST icedtea-bin-core-3.8.0-x86.tar.xz 61435788 BLAKE2B 5b4da8a54354287994d249ab2b3d2011ccfc987675e1899789f2a09b709e54fbf586b76a98839acad88b81fdef624b58e3821fbd416ea8bcf710293619ef9941 SHA512 623fc1b1f125b241642219e3060396395a6d802c73b440689c984ea259a1a0bad7b8ae04a300058f0a2815abb590e2b77bcaf3b4cddf2a9ed37a0789b87f25ba
 DIST icedtea-bin-doc-3.7.0.tar.xz 11682076 BLAKE2B 6c4629cfee975532aae9692061037662761ff4a0e3d13e72e167edfa90c81894894b48e97ad0077b38ba9e7081e21d157969f471988150a11f11a0b1ca6bf073 SHA512 e9c9ffe923fd6d6cd2dbb1bed402cba282baf17791c87b6fe12907fb4da3e401f4d101a06e1e6614d1d75d5b49a3e7cc60912a67af4dc25a4351d38c5c8ed391
+DIST icedtea-bin-doc-3.8.0.tar.xz 11683136 BLAKE2B 37fd84b58f6d6934b4775b23c3cfd47dbf275083719361ef74d55dcd2385f822b8cd0257e76cf4a194cc6d555c579a8373b39f72f4a8e80b8511acb5a0b2b537 SHA512 aee063874fa2de7cc7848deb511b1373df14ecb530eb00887920ca82b9af80763616ac4df641cd0debbf08011f71b20e8b250384e9d142387139e7698dece53a
 DIST icedtea-bin-examples-3.7.0-amd64.tar.xz 1856720 BLAKE2B d5e4497f946b48cd5e5a85c770674df5a9976d95fa4a5a562b53b0073ec51d4be3d6a9ca7145b3f79a31f89a3400493efe8c6cf425359d259c78dfa4f384bd6a SHA512 1155b8bf339b04e33ce986f0eb3fd9736e11d55ff2c3f7e515c74e83fe9cdc52e28a156f81b9f76efa769312fdb5a4080725ba7ef3e321e76caf6c911e8b7cd2
 DIST icedtea-bin-examples-3.7.0-arm.tar.xz 1840032 BLAKE2B 3f9ed953df3ea7d47dc43855256cf54c834d4b1ad4cc20114c2ba9cbf02f3cfcc1603da7e17325414368d7acddb717b116433efa52d987aabd5ae2dd8d1d21c5 SHA512 ff21951c7d81819c86366d4b6b450a14de6f45ab7916ae1061a9e7ef631f466df30434ed1f44bf007b7ae6693899e653e36e95c1e9f615e67f66bd4607dc62b3
 DIST icedtea-bin-examples-3.7.0-arm64.tar.xz 1838264 BLAKE2B 00c55e5af20654e3225622e7ccf55fb844870ee7e77683d9bb4b37181aab3ac119d5e7b4418bb0e50ebc87c3eb6ec9f37f745bfc5f0073ce33b8991e2ab20d68 SHA512 deeabd2bfc87eeb7d1f94b73501ec54f3c54a29fb9a857dca5cbe37fde49a63ec81049b62840eb6a36f6313ccffcad0910bd5d75e8de31ebabd59a129d613558
 DIST icedtea-bin-examples-3.7.0-ppc64.tar.xz 1847956 BLAKE2B 25ee12262da772e6fbecb57f67644981603919ce4711319bdcb771f6208109b6ef23ee0b6c5595a9490d1eb8f556303a023caa9d92d4d1059aa4c486f264ea14 SHA512 9f1dd454b3473efb5b32eec1abb5babe0d1fb16baaaa7daf197770add5bb230575b4de5c52b15c0eae65cbda8341a7f5fbb2f4092752e1dfc135cb2eaa77fa43
 DIST icedtea-bin-examples-3.7.0-ppc64le.tar.xz 1845292 BLAKE2B 1e8cdf15a1e4bc641b707f8df0432da83d874e74b41cac81445c3cc32d239d0e1370165ec847dcf4fbea8023fd44980b4b426459b4b4f69d850cd21aacd919da SHA512 a1c71085e8a9053ff8cf0c3c10c901657079a3df631994ce4c621ba25b9e89f211372fcb95c9b0dc1828fe4fa76ee2c0a33716da1b7c0a4af491fd418b799df4
 DIST icedtea-bin-examples-3.7.0-x86.tar.xz 1862536 BLAKE2B 7b033ad8e12cd4bb899acc40803bba9fcad1b5b6761cef65bdbb02b578478e09c64fda815cb4c518608d2a8120683a7d932341cd6d971adf381beb9cea7cbee3 SHA512 b3eb96ce677ee525ff5447e7ec0391e2bf5d79f451c71a3d78923c66664e8fa08008a4a3a90af2ae4c7a65787b86cb2f5a3689393d3548f2e9b229157313e887
+DIST icedtea-bin-examples-3.8.0-amd64.tar.xz 1856688 BLAKE2B c6ab09ae55a2c1ae42485acffa72ed7a16a5a19e5ee105f2e4e856c7929ac9758a5ff04873a5e3114f4fcb84184a85d30503904eeb21c34010b72b23b2b9f98d SHA512 de48a06fc39393e5967cf83565ce42845ce864104038a2094555cee4331ce1dbe1cc7e56668b773581a9f2e8bbd11c23dc77d922d20e0d80251ced09edd509be
+DIST icedtea-bin-examples-3.8.0-arm.tar.xz 1840028 BLAKE2B 9b4023252d5a862d2d769764cffe702ce6fe24c3870554b3c15cf0726435bb079f3c5bd53adcf851aee5af1f3ce9cc9c0d0b5ca53e8902935f88a2a423429a53 SHA512 70b5134bcbf41ace25967a1a75c6d8b55c9bb0f1c72bc4ef3bdb45a18356340b828d0666b1581ab4c2605244256db9acea9a229e53c5bc53e016a32057eb27c1
+DIST icedtea-bin-examples-3.8.0-arm64.tar.xz 1838420 BLAKE2B 6be665c5ee12ab6063fa01f13e4d5cdd957f844a498b6267a585c5f84faaff378661e012b6ef37ffc8e1fd81d14962413308a1717314d0928ae351d6c5de58c2 SHA512 30c32731ba7744d8dd1ea8b09c1540fded244f4fd641b29db441069510ed5691a2937a38821e821f47f73724e1ae3714dc5f9bab766daf1547b1a39ad5a346f1
+DIST icedtea-bin-examples-3.8.0-ppc64.tar.xz 1848128 BLAKE2B 2326df5f72f0c597b547afa06c2b73117b12d2eb96ef190a39c23a3b16e6b792487a077d4f07b00f6cfd446bff6069cc33bdb0635af8503b1ce9e38d5bd4c001 SHA512 266c7def17c119cf1b1f18729a8160a819a578868d73d175a18d486d924a355162a0c74858eb7bb21c75974ab6bc16e9de83d27d519bdc2ebefc9cba88ee669a
+DIST icedtea-bin-examples-3.8.0-ppc64le.tar.xz 1845000 BLAKE2B 1a08259383e40c7759af27b653835c5ece49721b9f12b21b24ec29e9f43d276d4fab616db7270ad9e290f49a08fbb5cf3a8b157bd56391ff1b209507e33df1be SHA512 51d7ac3901126a075825627e48f306b14157abcab82bd0c9989c443892c4fd7743fd37efa9cf6decc5465a1a682e7a0f710713991970a8b99d76619e36fb30dd
+DIST icedtea-bin-examples-3.8.0-x86.tar.xz 1862620 BLAKE2B d7ec2c538708620ce6dac1e09a91054a16e34400a2cd96266044c919d98a6433581089fe2f4d7e79c8253e258a19d4f32c45b10abd204baa43067eb3259e9388 SHA512 e7c6cc7f98f345987e1c003c479d65546deb086c8c281e99e475c448a470423789058575ff366a5b4819fac9115fbf648de686ac393450989e6dee75fd01fc9b
 DIST icedtea-bin-src-3.7.0.tar.xz 45735652 BLAKE2B c972f209e42df27137da8c03bb8555ec5831d49915c7b139578ff5e60efce9a1dbf390682604302d21bbd91f8e41da5079106ca0b016e2211453c5067e3de172 SHA512 67377e2dba3226146f220d7b923ad2a693949241d0c40dfcbceb47f691a6ce4fdedb28cbab3f4f5976029021b918cec49a7e61b373385a4b0514e10761fd3254
+DIST icedtea-bin-src-3.8.0.tar.xz 45741844 BLAKE2B b06e21b2d243a4be4e8328e7551285df9e71697b04b74a98a10293cbc8ee13bb570183e3c15511434e0b21a9052fbf945da8872c5db40fe28564794557f2d67e SHA512 527bbcec8d1c6a638e0861fb8041c94eda4d5d51ecc5a6ecaa615db155ba8cb1563e5009c4031c6b161328ff75654f2b46b09b08279260745288c5876336bd3e
 EBUILD icedtea-bin-3.7.0.ebuild 4356 BLAKE2B bd289cf7f42575d459a230abd0a0222815eb3ae18c79ebb665243840ef0ab6a7bfefbb667fe74da5168d6bad4fb638b16faf30691bc15c73a9d086e1f6096741 SHA512 04ec5586aa23ed5158be531b05dd9b13a9aeb8e057362582c977b8fa90648399d31aa484bf51e29aa7ecd8d16b124e60ebfc37f2f265f9ee2835a45dfa0095c8
+EBUILD icedtea-bin-3.8.0.ebuild 4358 BLAKE2B 145b0771605a13f6ba79bc6f1b2978a222bd1758ec6e85a5b5460fedc91f3b95ff521bcb019df8e3b5272a0d1022773d1f91014d65696bbe7d5b0da4b802417a SHA512 c63529298e95589ba94f3815173730eb33f73b93bae4dd463fb1f0a3cfb6c2d3fcdc190be4a022e4fcc29d812f49b7e33c2bfa669d32d37b2799de242843dcab
 MISC metadata.xml 448 BLAKE2B 5bc2cad0b1033c4e9eabfa2f651599c869f5c37f65b391885258063c7f2edcb0dbf6789e60de11302f87765fabf29a7453eb8ee61223c5d9a07a8e5efbd9a9e0 SHA512 4b2db8049d7a61cb4abeab6f602c585ca0841f0943411e14a991ed9d130e3a99997ee0c1c0383f9dc6a5c989292f8be659c70b6162271bc7cf9f6fa5a114d4ba
diff --git a/dev-java/icedtea-bin/icedtea-bin-3.8.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.8.0.ebuild
new file mode 100644
index 000000000000..a4893f3ff5e8
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-3.8.0.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Don't block arm. See bug #600134.
+#MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
+KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+inherit java-vm-2 multilib-build toolchain-funcs
+
+abi_uri() {
+	echo "${2-$1}? (
+			${BASE_URI}/${PN}-core-${PV}-${1}.tar.xz
+			examples? ( ${BASE_URI}/${PN}-examples-${PV}-${1}.tar.xz )
+		)"
+}
+
+BASE_URI="https://dev.gentoo.org/~chewi/distfiles"
+SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
+	source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
+	multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-x86.tar.xz ) ) )
+	big-endian? ( $(abi_uri ppc64) )
+	!big-endian? ( $(abi_uri ppc64le ppc64) )
+	$(abi_uri amd64)
+	$(abi_uri arm)
+	$(abi_uri arm64)
+	$(abi_uri x86)"
+
+DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
+HOMEPAGE="http://icedtea.classpath.org"
+LICENSE="GPL-2-with-classpath-exception"
+SLOT="8"
+
+IUSE="+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart"
+REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="opt/.*"
+
+RDEPEND=">=dev-libs/glib-2.42:2%
+	>=media-libs/fontconfig-2.11:1.0%
+	>=media-libs/freetype-2.5.5:2%
+	>=media-libs/lcms-2.9:2%
+	>=sys-libs/zlib-1.2.8-r1%
+	virtual/jpeg:62%
+	alsa? ( >=media-libs/alsa-lib-1.0% )
+	cups? ( >=net-print/cups-2.0% )
+	gtk? (
+		>=dev-libs/atk-2.16.0%
+		>=x11-libs/cairo-1.14.2%
+		x11-libs/gdk-pixbuf:2%
+		>=x11-libs/gtk+-2.24:2%
+		>=x11-libs/pango-1.36%
+	)
+	!headless-awt? (
+		media-libs/giflib:0/7%
+		=media-libs/libpng-1.6*%
+		>=x11-libs/libX11-1.6%
+		>=x11-libs/libXcomposite-0.4%
+		>=x11-libs/libXext-1.3%
+		>=x11-libs/libXi-1.7%
+		>=x11-libs/libXrender-0.9.8%
+		>=x11-libs/libXtst-1.2%
+	)"
+
+RDEPEND=">=sys-devel/gcc-6.4.0[multilib?]
+	>=sys-libs/glibc-2.25[multilib?]
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-java )
+	multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
+	!multilib? ( ${RDEPEND//%/} )"
+
+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}"
+
+pkg_pretend() {
+	if [[ "$(tc-is-softfloat)" != "no" ]]; then
+		die "These binaries require a hardfloat system."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# I wouldn't normally use -f below but symlinks in the arm files
+	# make this fail otherwise and any other approach would be tedious.
+
+	if ! use alsa; then
+		rm -fv */jre/lib/*/libjsoundalsa.* || die
+	fi
+
+	if use headless-awt; then
+		rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
+		   */{,jre/}bin/policytool */bin/appletviewer || die
+	fi
+}
+
+multilib_src_install() {
+	local dest="/opt/${P}-${ABI}"
+	dest="${dest/%-${DEFAULT_ABI}/}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	if multilib_is_native_abi; then
+		dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+		use doc && dodoc -r ${P}/doc/html
+
+		# doins doesn't preserve executable bits.
+		cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
+
+		if use examples; then
+			cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
+		fi
+
+		if use source; then
+			cp ${P}/src.zip "${ddest}" || die
+		fi
+
+		# Use default VMHANDLE.
+		java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+	else
+		local x native=$(get_system_arch ${DEFAULT_ABI})
+
+		for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do
+			dodir "${dest}"${x%/*}
+			cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die
+		done
+
+		for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do
+			[[ ${x##*/} = ${native} ]] && continue
+			[[ -e "${ddest}"/${x#*/} ]] && continue
+			dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/}
+		done
+
+		# Use ABI-suffixed VMHANDLE.
+		VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
+	fi
+
+	# Both icedtea itself and the icedtea ebuild set PAX markings but we
+	# disable them for the icedtea-bin build because the line below will
+	# respect end-user settings when icedtea-bin is actually installed.
+	java-vm_set-pax-markings "${ddest}"
+
+	# Each invocation appends to the config.
+	java-vm_revdep-mask "${EPREFIX}${dest}"
+}
+
+src_install() {
+	if use multilib; then
+		multilib_foreach_abi multilib_src_install
+	else
+		multilib_src_install
+	fi
+
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 18eba43df41b..549e51f3137f 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,17 +1,17 @@
 AUX generate-cacerts.pl 11051 BLAKE2B e6d54319153735bd4b445581dfbd2b78e2e27a19f3b8a78d2fe6912efa207d133fa550652295648bc0bd1370956f71374d4b42de71776fa253f44d4e9dff2527 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97
 AUX icedtea.env.sh 954 BLAKE2B 4cb0d8baef5f9a6527b8d15e7258805bb859cd79aec1ee0dbbb2aa369d0ecc83cb11a482d6bf5a17a6692da1bdf40ec1544ecdf31d46bcded7a3832d0553ee1a SHA512 80161624e52e705cab16edf04e304906dc0a37b86442e63a9ff8fdda321c4888ab12e8b66dc2f4487fe9bd86bb9f33d597b489d2d486894a36e91ed7563ef23a
-DIST icedtea-3.7-aarch32-1cd346521065.tar.xz 6756352 BLAKE2B dce797dd03cb84631367a6536fdc3fdc98d4f47c7414a2782f1f18f7efbba96d042efb3f044d02af6a83f2c1f5ddf48656aed9a18d121a193077210f95c071c0 SHA512 3ed8d17c2209da39b21b57c96ee87453cf5dcacb6060f88bcbc0247a905eed07f2e763d3dbe34f3fba797b28b19d0c6e73603cb7d9ea145fa515ceb9ca807403
-DIST icedtea-3.7-corba-872ca6c060bb.tar.xz 941016 BLAKE2B 30424376c9050bf144feeafb350325fec3402751e521bd2224e22e45a95d2c13251c81641f89661c98a90e4b4132f9bdad9c2d72a200a2474d7652e4c96a8645 SHA512 5fae98bec6b54c4bcc374db940256163fa9db2c8f9447c78e61887ecbce16f98bbd00720e9fe78f860bb2d83bc062e3beb430b637ea200d935aaae1f3e905243
-DIST icedtea-3.7-hotspot-074a569c30e4.tar.xz 6832164 BLAKE2B 86d563253094a5da07fc193bae073c936b4f6e35b3bd39dac7af3768877b7ecf2570b9150bfad5b957b5b3b22e2472e6a8223fbb5548abe72138ab7418901fef SHA512 c7c2e4ccccdc4fd9ac2f4c71e9a89997dd68fbd73a966015f9e764489cdf0027479d4c335c8f339d5ee2eb2968bc187a12e3c5e72d94ad59556cfb452a732658
-DIST icedtea-3.7-jaxp-154d73707643.tar.xz 2286776 BLAKE2B bc854478de03f1bf8ff81d1e410870f0cd12eb8b8cde0de09a98fd45dbf671b348b76da0ccf00a8244cca528950bfa6405bd99e388708ab203145b27da7f5adc SHA512 4c4c17a61c74dcfe8f6187055f43e47daa0f2f5f9ab6692f2149c98e4306d6e582c21d3d8d3061cfd2e7807889f645f3b8a446a7b84ca556459225df593ba996
-DIST icedtea-3.7-jaxws-3f0a3aea44b4.tar.xz 2270116 BLAKE2B 8d1f10dbfd57eb94c2bb6a2ae5da0cd8fe08b85bc8eb842a6a303c11e071d69d28cdcd601d827108a4673c6114eb8a0224323ce7b5a271aedfcae47517b0338a SHA512 d68741e7f60c87c22e50c50852bbf0598f36c3c594bd70d6f575c4962b5c8d7ff99a83ddd570a15497f4f47d456c26c400b523f789dbfca542dbf023b8e93f9e
-DIST icedtea-3.7-jdk-80cebaab0ba5.tar.xz 39140728 BLAKE2B b72aeb286b3d836c9f542d27b578bc6ddde3ecda31262a0c3a5dfa3c56bbfda1c0e2e1aff73fc6236c686d3b4a97c704be97ff8cdfc168b9d891288e3cf3374f SHA512 0cc54dd32a06595ae30e087ada15b0dee2f17f0ef9e5aa8e93fd7beba2937e774d444586f06208e26b904f024b6dc458855d35f59b2d531b801529daa67e3cb8
-DIST icedtea-3.7-langtools-0a2dce555d35.tar.xz 2068748 BLAKE2B 7de5a7cd33250b969f8cb7f326ff38516a6c282417fa656e0edd7c23344ce35bd493d0129eb551c4f0ea8d9f940e82b1e144fa7b833eeb2db475304816fe9d11 SHA512 46016102f230eb56c614fc44d1deb698bb39cade7e5d34b9a2bcf792014c57f88d15d6c3ceff456dfef9e1eaa99486901784c1254afeb3cc67338dd500ef526f
-DIST icedtea-3.7-nashorn-136ab780f038.tar.xz 2229708 BLAKE2B 5246143d84734d1dfbb60802d763d3880c76e79b425ffe31d41c89a11fee601a75e2804b4f0cb1e645395730e44815aeffd71d80183b06f04fdcfdf47403d7bf SHA512 4ca935a07bb7b5b8e3f0274bc120b6264290b6218a97457a6648ade04bd302b3838b398bd7ce423dcfe2f9bee03827332bd61abb21d9d8e58232b01acf48ccf6
-DIST icedtea-3.7-openjdk-644bdc77dd18.tar.xz 335052 BLAKE2B 2bc4dea15f1e283c40b9e97a4f7bc4e5420ab37ffec2d9a889d15a2f26b579d01bbd3c93d31497fc7ef3a660486f87c350f09e3564fbf6e4e810821d7b06009f SHA512 c8049c0101d270a8cce87973b60ddcea60297604dcc1d7cf6b26efe7c06806b18ab9f2a6012fc382b366009ec43d1cd5a27714ef5ec6028c71992eb4e8b6d1c1
-DIST icedtea-3.7-shenandoah-773364cde857.tar.xz 6948788 BLAKE2B 16dcc546ee7e02011ca2b9bc1c0811235fb0d1a87a551552d88799d4f8115b18eb378239f6b74503309be42f1c46cc60c986294d5cbb0dd67d9a07aa3b4294d9 SHA512 ada797ad0a82f08018337ee90ba5c74ef242d97dfdca73ecc0d76b498014875611bb0c32c7237371b87eb75f3ef506467a7c66a4d587122e01e9799a1bcd50ec
-DIST icedtea-3.7.0.tar.xz 1487360 BLAKE2B efef75c5ac615c21310f16f50fc425c5a760767e581004e7f545749f67cd1e0b238de735787a01e5a85ca6b72c351ee32a7c8f0aa3ec34d6dfe6a8e2e024ca06 SHA512 f2dc2464139d18385d4734e6380d7c4efc69f0e5b507218397032e0ea1b2e0d96688c88979de90a1fcd453809a4b1d6081ce2970f4e3cc73a236bd2d17bcc704
+DIST icedtea-3.8-aarch32-bd08b7f27e11.tar.xz 6762428 BLAKE2B d5c6b97ad133faf21f16328e1a86fe22a1e3bdcba73d43728cceddb6341f529661202e5384f3a7bc9f0de4bac9af897b86f942cbfaa310a44b959b0be5b55fde SHA512 99715812bf7b71e2031e96e27b27745d6963ee9749886a61a982628b5d95b9491a7696cf733d06adedef75dbb8dabecf5ffb72531e6b19329121b0e4f1b08afb
+DIST icedtea-3.8-corba-75fd375dd38a.tar.xz 942152 BLAKE2B 86ca4a62d8dfe7b8fec3a90471b48e2d0711fe708654695ddddbbc400bf71f1f3a3926f28989940ff325c0e171989336082d271ab468a13e38dfd93d680437d5 SHA512 a41d53d2d6471b94878ba18caf525f1b64e72c2ae6926a9f1f5dac2e9a9366151d35156fb519cca8aeeda97d8e42cc258a93390170859b3035de4da69e48e321
+DIST icedtea-3.8-hotspot-cb5711bf53d9.tar.xz 6838240 BLAKE2B a2419e93d736458c7853800c0efbd8a5035b2baa2b239e4326bdf70c5b6f08d36a96ae53b29de978e493c40ccf146f2c2115a08413b1fbf25c51850eb83fc4c2 SHA512 8c4b060611b867c43fbe6cac3d2f06f6979950781872b387220e12c7066b3efde24160b7bd03189350a6518615b492703425c2ea67a26c6b4d187f843093a780
+DIST icedtea-3.8-jaxp-2b279bb3475b.tar.xz 2287836 BLAKE2B 3705c8137a29a706aefe3dbb32fb0042e81c50cddcc54c31448d2c6f2c5a27ab3ea7e7f03f82990c379b9f39368aaeb6d8ee8adb56ecbf21faddb35d1727be07 SHA512 3eb04788776612f0de0b058908417c4735e6b1cfb56afaf73748e1f3121b25d6eea710cd1d72ed19f8788c8e00b701265d79237da3542d0947c00d37b4308e9c
+DIST icedtea-3.8-jaxws-c54a27559acb.tar.xz 2270928 BLAKE2B 2c5adb94aabd276fb00840ef6b0dfd04a36d728c603c8281bdbcc3d13b393144fb2336d4da54085ab999ef6725b6f706d727645a36b77f4a1294177947b6059f SHA512 1431e71e2281eef893904e686c8d33587c4332ed7cfacd5fd2e278fe0a4e6f225e03d22b8ca73517b030e3e33ffba964f023bed9b9e4f4a6f14b8cced43ce0a5
+DIST icedtea-3.8-jdk-9c9ff65b03b6.tar.xz 39146448 BLAKE2B 1f9a4efcc5697ce73af9018d39c632cecbca6945c4065f089db027d1fa86b6c315ead93f3acd291615c68edc057b470abe1cd0316300f54113eada7789b3a5cd SHA512 9f6b6e42e8bea6a00c9833bd9775bfa5c63d1126e25fc376f4ba2cf5601dea8ab6a3f1d442d5fb188de3f74ce0a6410dc3a8463f798b1aa23822a272faa5aa73
+DIST icedtea-3.8-langtools-21524ad5b914.tar.xz 2070064 BLAKE2B 5a5dcc0e40e08330e29850d99810fe62fc233390347ebb21fe12f606ddc6e8b5fe2060fe181210626d1e2ddc92828779f8fc138bdfda90f7b66f88e75f80ea43 SHA512 fd57023505d69246593ed24d90ad7052a88362ef7106900eca59e61ad5cadc247215cc9e8d410f9150e33a72126247ce1bb809540985062515b3d31d77d1535e
+DIST icedtea-3.8-nashorn-bb3e3345d3ec.tar.xz 2317148 BLAKE2B 9d85532853dfde6fcbf406d52f29e3b8130e5435e38200a48aadb16b4aa8a9dfe70fe6f7f83c4bd170e25a61fbaf3a8499893ae247239594e004f1a4aa37e708 SHA512 7c6d51a6565fe8c670a59caf001b1c0821b7fb2e42b2bbe24b35e337df4fc664c87868e0c55dcaa168f9c3e973ab9e75bca93d660e242c07d0f21eff83d674b5
+DIST icedtea-3.8-openjdk-499b993b345a.tar.xz 335928 BLAKE2B bb49fd086851110e9beb993167f2cb9b217800086070a1ba04a6b96b9e130157a2d8420a056e2e71e98144cd94454aa4c3a568c038f1b282cbc06b25df49a54c SHA512 e438a7ab0eb4e4374278afdbd40cab66875c9704f80a8963f0c965ce995744bcf23814c734ffd10e95329c7b767337fff18e3478c3f03481f8e15a5a9bfc853f
+DIST icedtea-3.8-shenandoah-c44a9eef4985.tar.xz 6954776 BLAKE2B 348735f8a2ecd656c4d323dd870fa63d028757a57babe0f4ffa0977d0446f17cd80a6709147b98d6712e1b5d26719cfad1ea01536930dddcf7389947b43a7d7d SHA512 2e84c6b398f35e59d3819e5ce23dd573e76c385c47f9971d6b77def1cfc1b19a86288e3cdbd78aa6dcdab068128852f4a1c82cf13229a760b1f625095cd51514
+DIST icedtea-3.8.0.tar.xz 1496972 BLAKE2B 9a376539ca2c4c8560aeaaa2fbc65c61a90519b9c87e924e2d54ef150401676e90df0fb5143fd90e9e4c6d254db56617456a668bf886573854f299402af378d8 SHA512 6336d35c11dbe16c96bc07eaa760fd849a2cd317416aba72b0732f8f1e52c9e3fedde5398d4a7f5a3057d4b6ae229965d597b3f5df09a76b5f31bbad0ad02a9a
 DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
 DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
-EBUILD icedtea-3.7.0.ebuild 13807 BLAKE2B 93daeaf425e9f5e2f9d8cff2ee860f0c6ecea434fd1a3bfab16c2beacc14cb03c4582740dce1631a0ddcd6f14045114ba6369763cd9ab78dee15ece8c1e35c91 SHA512 db5020fe05c94030a71a98aa3cadf11e78388c37f31b5709103d61c910bddea4ec2e29fdf5573d270473fff0efdb425432cc88bddb3b272bebbb7c8dc9da6335
-MISC metadata.xml 1957 BLAKE2B 46e8fcdad93fb80f91e0af3b2cabfaecca347a17537ce9dac81b76dcd85e5b1532cb63bea6dad6d1d5d9423c1a08315c43ca54b559370e44c413ab92a5ec5649 SHA512 cbfb9a87cee0ab7d7245f758840c96b320bd8f50567d9181830155d849dc411fb17f2e0dde6ecbb840fe48268f5bc09840e3cce25edb73224286c854ae38db1e
+EBUILD icedtea-3.8.0.ebuild 13684 BLAKE2B 57a8b0939d2011883e1c47ecfc027604f874e4230aaa3a45a5a736362bfdd72367fd104958c8d672c298f6f355d44dcae74c9d22c52d61db09dc593d6312fca8 SHA512 715ce9bcf5d53c606d8c4e38e606a96802c31b9373b250a5161b4ada0a94b2b36dc740f29ac86101976bb60e98f73770556fbebfd7737afdb09cb13e9e306a17
+MISC metadata.xml 2310 BLAKE2B eab8a40ebfc3b3f462fed14a7f21187aa0546e9b3925d8e08951c99ac8ebf846c184d37ed271f07d6bdde6379be92f7fa0244d7be8d0cec29a354c1ac75f69a2 SHA512 e4f1924775a63f058fbc5a385ade16a95115cee0b9ee3c4de05f2e904861e1c3de4f643c4c330da90879ed0a54eed7199b41def3193a494e0eb038ce820e673d
diff --git a/dev-java/icedtea/icedtea-3.7.0.ebuild b/dev-java/icedtea/icedtea-3.8.0.ebuild
index 8605d13cd9d0..b4fcc1e0a37e 100644
--- a/dev-java/icedtea/icedtea-3.7.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.8.0.ebuild
@@ -13,16 +13,16 @@ ICEDTEA_BRANCH=$(get_version_component_range 1-2)
 ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
 ICEDTEA_PRE=$(get_version_component_range _)
 
-CORBA_TARBALL="872ca6c060bb.tar.xz"
-JAXP_TARBALL="154d73707643.tar.xz"
-JAXWS_TARBALL="3f0a3aea44b4.tar.xz"
-JDK_TARBALL="80cebaab0ba5.tar.xz"
-LANGTOOLS_TARBALL="0a2dce555d35.tar.xz"
-OPENJDK_TARBALL="644bdc77dd18.tar.xz"
-NASHORN_TARBALL="136ab780f038.tar.xz"
-HOTSPOT_TARBALL="074a569c30e4.tar.xz"
-SHENANDOAH_TARBALL="773364cde857.tar.xz"
-AARCH32_TARBALL="1cd346521065.tar.xz"
+CORBA_TARBALL="75fd375dd38a.tar.xz"
+JAXP_TARBALL="2b279bb3475b.tar.xz"
+JAXWS_TARBALL="c54a27559acb.tar.xz"
+JDK_TARBALL="9c9ff65b03b6.tar.xz"
+LANGTOOLS_TARBALL="21524ad5b914.tar.xz"
+OPENJDK_TARBALL="499b993b345a.tar.xz"
+NASHORN_TARBALL="bb3e3345d3ec.tar.xz"
+HOTSPOT_TARBALL="cb5711bf53d9.tar.xz"
+SHENANDOAH_TARBALL="c44a9eef4985.tar.xz"
+AARCH32_TARBALL="bd08b7f27e11.tar.xz"
 
 CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
 JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
@@ -67,7 +67,7 @@ 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"
+	pulseaudio sctp selinux shenandoah smartcard +source +sunec +system-lcms test +webstart zero"
 
 REQUIRED_USE="gtk? ( !headless-awt )"
 
@@ -97,13 +97,13 @@ COMMON_DEP="
 	>=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 )"
+	sunec? ( >=dev-libs/nss-3.16.1-r1 )
+	system-lcms? ( >=media-libs/lcms-2.9:2= )"
 
 # Gtk+ will move to COMMON_DEP in time; PR1982
 # gsettings-desktop-schemas will be needed for native proxy support; PR1976
@@ -136,7 +136,6 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_
 		dev-java/icedtea-bin:7
 		dev-java/icedtea:8
 		dev-java/icedtea:7
-		dev-java/oracle-jdk-bin:1.8
 	)
 	app-arch/cpio
 	app-arch/unzip
@@ -195,8 +194,7 @@ pkg_setup() {
 
 	JAVA_PKG_WANT_BUILD_VM="
 		icedtea-8 icedtea-bin-8
-		icedtea-7 icedtea-bin-7
-		oracle-jdk-bin-1.8"
+		icedtea-7 icedtea-bin-7"
 	JAVA_PKG_WANT_SOURCE="1.5"
 	JAVA_PKG_WANT_TARGET="1.5"
 
@@ -245,9 +243,6 @@ src_configure() {
 	# 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"
-
-		# Work around stack alignment issue, bug #647954.
-		use x86 && append-flags -mincoming-stack-boundary=2
 	fi
 
 	# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
@@ -335,14 +330,14 @@ src_configure() {
 		--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 \
+		--disable-systemtap-tests --enable-improved-font-rendering \
+		--enable-system-jpeg --enable-system-zlib \
 		$(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_enable system-lcms) \
 		$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
 		$(use_enable sctp system-sctp) \
 		$(use_enable smartcard system-pcsc) \
diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml
index 10578ad3a5f8..31b4e46c9906 100644
--- a/dev-java/icedtea/metadata.xml
+++ b/dev-java/icedtea/metadata.xml
@@ -24,11 +24,15 @@
   <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="kerberos">Link against Kerberos in order to obtain the cache location.</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>
+  <flag name="pch">Build using pre-compiled headers.</flag>
+  <flag name="sctp">Build the SCTP NIO channel implementation against lksctp</flag>
+  <flag name="shenandoah">Include the Shenandoah ultra-low pause time garbage collector (-XX:+UseShenandoahGC) (arm64 and x86_64 only)</flag>
   <flag name="smartcard">Build the PCSC driver against pcsc-lite</flag>
   <flag name="sunec">Build the SunEC provider against system NSS</flag>
+  <flag name="system-lcms">Build against the system LCMS installation rather than the in-tree copy.</flag>
   <flag name="zero">Enable Zero assembler port (usually for non-HotSpot architectures)</flag>
   <flag name="webstart">Enable Web Start support (via NetX).</flag>
 </use>
diff --git a/dev-java/sbt/Manifest b/dev-java/sbt/Manifest
index f966469f0019..b2896c1d9cde 100644
--- a/dev-java/sbt/Manifest
+++ b/dev-java/sbt/Manifest
@@ -3,5 +3,5 @@ DIST sbt-0.13.13-ivy2-deps.tar.xz 121677604 BLAKE2B 7f6e508104a99c36f8f928550f7c
 DIST sbt-0.13.13-sbt-deps.tar.xz 34750700 BLAKE2B 5856f19d19255a6c4a373086962f3bff195d03193bb74d8d3aee1cfb2749ef3638f5c26dff7cb7c455c5b4ce67e8cf4fa46bbf9a8363f80dc26092e6df768d81 SHA512 0bfd35a6926545da7340f7ee72e420121f2bb2f83d98d420b7f65b465d207b1b30a48788914e7b1fdf575a4fee870f2632b0717f1a7a2c19e2f2d5794d08b4da
 DIST sbt-0.13.13-src.tar.xz 35911028 BLAKE2B 42157af03ae3567a2acc67cc0c96a9ffe19b69d60fddfde1cd65bbc410c14b09e5da0febb8225e49693c380a444b752296c29a21cc7f2239ee49ccef5128a3ff SHA512 351f18108a23014ee7ffd5c4713f390728fb98b742efdc139e094e64df7800f399d088600d245631635b0f6f4cb69c6cd327aafa3b0bf8a233fcbf0cb4ac5702
 DIST sbt-launch-0.13.13.jar 1210231 BLAKE2B 754abad78cec4f6b040fb63dcb62e549768174b22cf3f9ab7d2419736d4f09b53863cf645b38d7d534deb1c6e897f55d8b1b5fa82462ca9d906c410d22c0c198 SHA512 78e7ce21c610e83a532b04491e13d53b4193205328adce473252d523fe0ca0f3892dba900f01ff6e28d94a17c3ba1ebbe7d85fd6ce9900c48263bc4816da37ef
-EBUILD sbt-0.13.13.ebuild 5722 BLAKE2B cd472cd6233577b014a80638b2b7b57560662325a9ac04601d492b7be501142c8dbd46dc435119f56c1c9c1d9b96a465c5e8353450bf6152dc3f33cc2e433d6d SHA512 5f15598ae5313acfb0acd547467e6d7d3a5d4a1f234cf98069f189b1f4626ac3748181520db50db98898aa6729b7be5386659db445d314b5d9080adf8b47df79
+EBUILD sbt-0.13.13.ebuild 5723 BLAKE2B 7dda64dcbe85254f3a8f1ca806743860e2ee195da33539675b2c74be63d4c558f631fbcd59f9b7bb2b9982141436fb0fe562058b5c1926f9e9fe03310d192fa0 SHA512 ffa78742cdf4ae788bb18db200c09c24fa0a0bb3c37588e142aa1aa96da90ce4e2adccbdd34d804b644c2c5c1c9006f712aa1004076757007796da0b8e788b26
 MISC metadata.xml 525 BLAKE2B c70c7e88be5a5b06cbc422d6f354535711d06590780285ee1fd7e6668a0205795a4295869d61fb91b201df9ec2c275e4d74a07734fcc39bac9d4fbf2632f4b9d SHA512 53269c8f362ba0415988cfb9889a7af2c67a6788d85fbe4d9008fbed1cc0a3d3bddc2a6049c6d0ba23c28e3ad2d65f240a9085ceaccc5d55d4387e4dd90c5505
diff --git a/dev-java/sbt/sbt-0.13.13.ebuild b/dev-java/sbt/sbt-0.13.13.ebuild
index f881129e9bef..4dab11033829 100644
--- a/dev-java/sbt/sbt-0.13.13.ebuild
+++ b/dev-java/sbt/sbt-0.13.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,7 +12,7 @@ L_P="${L_PN}-${PV}"
 SV="2.11"
 
 DESCRIPTION="sbt is a build tool for Scala and Java projects that aims to do the basics well"
-HOMEPAGE="http://www.scala-sbt.org/"
+HOMEPAGE="https://www.scala-sbt.org/"
 EGIT_COMMIT="v${PV}"
 EGIT_REPO_URI="https://github.com/sbt/sbt.git"
 SRC_URI="