gentoo resync : 29.10.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-10-29 11:22:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-10-29 11:22:34 +0000
commit: bd7908c6630f38067350d396ac5d18c3cc2434a0 (patch)
tree: 3559b3e11424f5529527f2474d8a977a91ee3389 /dev-java
parent: 8b2628ad8526c806375e7b157889e4274b70248b (diff)
18 files changed, 98 insertions, 419 deletions
diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 4dfd4e2d313b..ca15fe24798f 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,7 +1,6 @@
-DIST batik-src-1.8.tar.gz 14970684 SHA256 0f1175146d45445fc4940e214c3e1e5cfa0294ae6a9787859bda00964f97c2bd SHA512 352843fd0cec43c6d9d54426fe1c20a9bd2234798404b101f2e8d43f6089c0bf6bb5102cb5674de11d37a0d820a8bb79fe9dd854030b23fd8c68f3931eb12f1b WHIRLPOOL fa50d1f87257c6018f99076bf759066b2311f483d424ef743e45fe17c74c646a215c1211c5431b2a522913f23ff5f53934a1606d4d4a223e8298abd6ce94bb46
+AUX batik-1.9-ImportInfo.patch 439 SHA256 ee49a43fc6bdc8e47cd3d8fd6c3a5b5a3cfda9b40243ecd2a173331f1730fd0a SHA512 ff390670537fd631dbd0041a4496e0a33daa1bbd9390867285d2a817ee7794d19c0d634dbfcf4a1e777db072a0f1b6bc2b68e475bbe590bce825aa7b7d76f643 WHIRLPOOL 561a42cef0363a692d530b675d27252e5b0b693d8243d3eb50ca866043e20f098ee8c398c10cb5bdc1fb703e5f32c68264fa84ad58a62a9d05b1df0d2a7fdb6c
 DIST batik-src-1.9.tar.gz 16748072 SHA256 bef436c0b4ac9a499274a8df9a2769f42ddc6553451dac9a9514b4f55d06c6a3 SHA512 96a5c16bd3d61ea33ed5013fd0b00f1724470d9b667f0f84ef4a29dcaaa19b1cc8ffcc92dc49767f4e29d77a47f99df5afca479336ac5619778b51a6fb6cd952 WHIRLPOOL b389ec0d38e16d4619f0a1e933c357a018e0ae2a0c04900caf53f398180c5a2ca031bd8909ef50aeb2db5c12dd6981cb5d1ec466e4c5fbc0379d0c325f039b25
-EBUILD batik-1.8-r3.ebuild 3221 SHA256 8bcbd2978bed6caddcda654d446fa1d948f3bea289eb405be6a1ed9db08ceaa4 SHA512 b2525a0cf675fc161642c759dcf149dba654a683af50f6b931845cc6021495485b2a405bbc78238720c5fe140a35aa4e88902d907e2a5b0444989b3e2e6ec612 WHIRLPOOL d270887b84758d88e1622d3899e700ad0f8e4ba8dc4d55294e45032cf7f2af6d256711775b56924d33b63d1bf609d68703c4029ac2b2bcd45d6c56dd12914b91
-EBUILD batik-1.9.ebuild 2481 SHA256 79728ec12084bcb504a551214092df4243dfe5f340d6754e02c7f7954525d4d5 SHA512 838618876d2b74a71e2ee13473d156eb636d4b4e7ca20c5d7dbdecb6b49d83f073b0cecbdc0f7ff2815bdd0d5a7466220056664c0055c367a6e124b2ead58ab5 WHIRLPOOL 7aeef998737ffc9b310d024acb1e6486ad4d89baf7915d43d568d0f70f5be166789cff49d9e0cdab8dcb0eca0ef01a402d04698181142f15b0d8d67a156e0870
+EBUILD batik-1.9.ebuild 2608 SHA256 c58a4914f6a0be5ae24c48605c4643a51778c40f263c42aaa590f9741a26cedb SHA512 6dee45bb334ede236b28e376b68526d30c5347441c62687c9f2f062f888174ca59ebe382075df5d14e860384ccc103d1ebdc907dfd40d25d5e87fc78f05834b7 WHIRLPOOL 2f91b0d6cb53e4f1928adff59f961ea5a1da4318086c4da922fc8e26e26d6b7153398a0772474264afa7f8d02c38f46835adfd4335b8a89bc1fa7b35c6d38709
 MISC ChangeLog 3620 SHA256 0b43cc1247da402248b67498fb9df4f36a0f605af8038570928295badbd45cde SHA512 c146c21cda7a3aeb594c8faa07700e4f00abe9fc09cf93684387f636b1a5a8f0f853c38b963d31ba0807887c4d8c8f0b48ad521304d46c3d91542f3357e3533f WHIRLPOOL cf2e350c01e7509de30d04a445201bbd05532924f6bc29e213e36f3508f1c24d2aab07a8f757915dfda78f5f27a0b07fbc9313627b3001cfeaa13f5ac9e30f3e
 MISC ChangeLog-2015 11934 SHA256 b4e2e276895ae399799cbd0b38c7f0e6cdf25d36f2edb18a18f7204d116544d0 SHA512 6360dd5b278ba7904c01f65b5d9a9d972d319619eb4b072f8d240300465818ef7970781481689eea1b68f2a074022f615017db63ccf35fad4eeeee3fedbb7112 WHIRLPOOL 4415633e4890b6ae8586143d4b35fc264ce4f47d3ea7fcd8d36c7fb6e0027ce096ab17da6bdb3982cfdffc16aa898db2489f5270513d8f5d4880209d0ee12e93
 MISC metadata.xml 449 SHA256 959a37e00aaddd59eefd32174bb0673c788c6584b1db2efafda815e1b8122217 SHA512 e437217b578831129aa80be572fd1044db0ee1c0afb0af0538dbed3e7d2ba739062eca68053426c79433ec03128ea0116a4a92be4d1946e20968be3fe89a4e02 WHIRLPOOL e09cb97ce753b75a0d7e8533ceb8e09a84faa460b18cf59ae64558815424f9221388e6c223b0ede50efc4d8c5b5d5870e345c1ebd0c069446a5b5a17a5812d00
diff --git a/dev-java/batik/batik-1.8-r3.ebuild b/dev-java/batik/batik-1.8-r3.ebuild
deleted file mode 100644
index 68d9e0c96d64..000000000000
--- a/dev-java/batik/batik-1.8-r3.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="Java based SVG toolkit"
-HOMEPAGE="https://xmlgraphics.apache.org/batik/"
-SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/source/${PN}-src-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.8"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc python tcl"
-
-CDEPEND="
-	dev-java/xalan:0
-	dev-java/rhino:1.6
-	dev-java/xml-commons-external:1.3
-	dev-java/xmlgraphics-commons:2
-	python? (
-		dev-java/jython:2.7
-	)
-	tcl? (
-		dev-java/jacl:0
-	)
-	dev-java/ant-core:0"
-
-DEPEND="
-	>=virtual/jdk-1.6
-	${CDEPEND}"
-
-RDEPEND="
-	>=virtual/jre-1.6
-	${CDEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="
-	xml-commons-external-1.3
-	xmlgraphics-commons-2
-	xalan
-	rhino-1.6
-"
-
-java_prepare() {
-	# bug #318323
-	for file in build.xml contrib/rasterizertask/build.xml; do
-		java-ant_xml-rewrite -f ${file} -c -e javadoc -a failonerror -v no -a maxmemory -v 512m
-	done
-
-	# Add some missing imports to avoid a compiling issue.
-	# https://bugs.gentoo.org/show_bug.cgi?id=551952
-	# https://issues.apache.org/jira/browse/BATIK-1123
-	local imports=()
-	imports+=(sources/org/apache/batik/script/jpython/JPythonInterpreterFactory.java)
-	imports+=(sources/org/apache/batik/script/jacl/JaclInterpreterFactory.java)
-	for import in ${imports[@]}; do
-		einfo "Fixing missing import in ${import}"
-		sed -i '23i import org.apache.batik.script.ImportInfo;' ${import} || die
-		eend $?
-	done
-
-	cd lib || die
-	rm -v *.jar build/*.jar || die
-	use python && java-pkg_jar-from jython-2.7
-	use tcl && java-pkg_jar-from jacl
-}
-
-src_compile() {
-	# Fails to build on amd64 without this
-	if use amd64 ; then
-		export ANT_OPTS="-Xmx1g"
-	else
-		export ANT_OPTS="-Xmx256m"
-	fi
-
-	eant jars all-jar $(use_doc)
-	cd contrib/rasterizertask || die
-	eant -Dgentoo.classpath="$(java-pkg_getjar ant-core ant.jar):../../classes" jar $(use_doc)
-
-	# batik-all-1.8.jar is a all-in-one jar that contains all other jars.
-	# We don't want to package it.
-	# No actually we do. See bug 556062.
-	# cd "${S}"/"${P}/lib" || die
-	# rm -v ${PN}-all-${PV}.jar || die
-}
-
-src_install() {
-	batik_unversion_jars() {
-		for jar in batik-*.jar; do
-			newj="${jar%-*}.jar"
-			java-pkg_newjar ${jar} ${newj}
-		done
-	}
-
-	# First unversion jars in ${P}/lib
-	cd "${S}"/"${P}"/lib || die
-	batik_unversion_jars
-
-	# Then, only those in ${P}
-	cd "${S}"/"${P}" || die
-	batik_unversion_jars
-
-	# Proceed with documentation installation
-	cd "${S}" || die
-	dodoc README CHANGES
-	use doc && java-pkg_dojavadoc ${P}/docs/javadoc
-
-	# pwd fixes bug #116976
-	java-pkg_dolauncher batik-${SLOT} --pwd "${EPREFIX}/usr/share/${PN}-${SLOT}/" \
-		--main org.apache.batik.apps.svgbrowser.Main
-
-	# To find these lsjar batik-${SLOT} | grep Main.class
-	for launcher in ttf2svg slideshow svgpp rasterizer; do
-		java-pkg_dolauncher batik-${launcher}-${SLOT} \
-			--main org.apache.batik.apps.${launcher}.Main
-	done
-
-	# Install and register the ant task.
-	java-pkg_dojar contrib/rasterizertask/build/lib/RasterizerTask.jar
-	java-pkg_register-ant-task
-}
diff --git a/dev-java/batik/batik-1.9.ebuild b/dev-java/batik/batik-1.9.ebuild
index 19ae6d955c94..ab95a4c9432a 100644
--- a/dev-java/batik/batik-1.9.ebuild
+++ b/dev-java/batik/batik-1.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/sou
 
 LICENSE="Apache-2.0"
 SLOT="1.9"
-KEYWORDS="~amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc python tcl"
 
 CDEPEND="
@@ -26,28 +26,33 @@ CDEPEND="
 	dev-java/xml-commons-external:1.3"
 
 DEPEND="
-	>=virtual/jdk-1.6
-	${CDEPEND}"
+	${CDEPEND}
+	>=virtual/jdk-1.6"
 
 RDEPEND="
-	>=virtual/jre-1.6
-	${CDEPEND}"
+	${CDEPEND}
+	>=virtual/jre-1.6"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
 
 EANT_GENTOO_CLASSPATH="
 	xml-commons-external-1.3
 	xmlgraphics-commons-2
-	xalan
 	rhino-1.6
-"
+	xalan"
 
-java_prepare() {
-	# bug #318323
+src_prepare() {
+	default
+
+	# See bug 318323.
+	local file
 	for file in build.xml contrib/rasterizertask/build.xml; do
 		java-ant_xml-rewrite -f ${file} -c -e javadoc -a failonerror -v no -a maxmemory -v 512m
 	done
 
+	# See bug 628812.
+	use tcl && epatch "${FILESDIR}/${P}-ImportInfo.patch"
+
 	cd lib || die
 	rm -v *.jar build/*.jar || die
 	use python && java-pkg_jar-from jython-2.7
@@ -66,6 +71,7 @@ src_compile() {
 
 src_install() {
 	batik_unversion_jars() {
+		local jar
 		for jar in batik-*.jar; do
 			newj="${jar%-*}.jar"
 			java-pkg_newjar ${jar} ${newj}
@@ -85,11 +91,13 @@ src_install() {
 	dodoc README CHANGES
 	use doc && java-pkg_dojavadoc "${P}/docs/javadoc"
 
-	# pwd fixes bug #116976
-	java-pkg_dolauncher batik-${SLOT} --pwd "${EPREFIX}/usr/share/${PN}-${SLOT}/" \
+	# See bug #116976.
+	java-pkg_dolauncher "batik-${SLOT}" \
+		--pwd "${EPREFIX}/usr/share/${PN}-${SLOT}/" \
 		--main org.apache.batik.apps.svgbrowser.Main
 
 	# To find these lsjar batik-${SLOT} | grep Main.class
+	local launcher
 	for launcher in ttf2svg slideshow svgpp rasterizer; do
 		java-pkg_dolauncher batik-${launcher}-${SLOT} \
 			--main org.apache.batik.apps.${launcher}.Main
diff --git a/dev-java/batik/files/batik-1.9-ImportInfo.patch b/dev-java/batik/files/batik-1.9-ImportInfo.patch
new file mode 100644
index 000000000000..103b99e1b967
--- /dev/null
+++ b/dev-java/batik/files/batik-1.9-ImportInfo.patch
@@ -0,0 +1,10 @@
+--- a/batik-script/src/main/java/org/apache/batik/script/jacl/JaclInterpreterFactory.java	2017-10-28 17:24:11.401276868 +0000
++++ b/batik-script/src/main/java/org/apache/batik/script/jacl/JaclInterpreterFactory.java	2017-10-28 17:27:13.314255999 +0000
+@@ -20,6 +20,7 @@
+ 
+ import java.net.URL;
+ 
++import org.apache.batik.script.ImportInfo;
+ import org.apache.batik.script.Interpreter;
+ import org.apache.batik.script.InterpreterFactory;
+ 
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index ff8c03e2c6bd..1c2b609ae663 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1,6 +1,6 @@
 AUX headless-launcher.bash 67 SHA256 aaa990229cbb46d8b290d1629d5ae2c6e99a0cb9e73f7761fbf32faa927d1319 SHA512 d3a6635105ea62a62f1ff690a457bfbdebe3d15f8fd220f5508a4ec20b8a5c46e66bf9189562661d5053c6ac31a6998d1f4a117e0ac6087b336a0475635d7d3a WHIRLPOOL b8b42ad063f00b67c12500e6eb76e9cc81c66ea7105d3e1db9e26e9d45d1ece90b1c25e85ab66bdbb0504b247a4926fb5b4ff4487b3ee43c0914866d58bcc7e6
 DIST fop-2.0-src.zip 26381859 SHA256 70da9622ce25891d989b8ab25692738c5dd6eb2de6ee9b9300d5487f0378d2ec SHA512 428793303fcf143cffaecadc22cfdb8a065bad0108cceebcabc479d92dbe9834b4f81fd27f3e0314546d848e1960b2fe1a9d443999d8f336f7e87fce771beb7a WHIRLPOOL cfd0ec06fba6fe089fb0bea803668e8c89f80eddd198efda20573274ea0cfa750248f12b50827ab89571a4923f51b307d241ff0a4f236cf4a6e28ea49c8d1ac7
-EBUILD fop-2.0-r2.ebuild 3076 SHA256 6479f5d8103d4802f976ff9b0b73f4c63377ee242bbb13ba61bf12a42ad52f2e SHA512 0be6bbbec5683edfcba7fca5742f25a599ce52fa3f654ace7321d376220726de7ed21cb9ae36cb078c1e2fb275b06b9ca0663deb4a001cbd403bd3e0487edec2 WHIRLPOOL 111d4e50105462ce1296ff6976576acc4e868bd15f2cd7f6e81321e61c29f33e32db28c4d04f5fc8394a92f1aebaec03259a0abc571c28c2e3d231556f778ab2
+EBUILD fop-2.0-r3.ebuild 3071 SHA256 e331df9b297c0772a6455cc067a29d78a16d0ed02e6b9b20baed8e0bc8acc99a SHA512 2c8379748ea5a75274037011089863951d3fbe23d95ac37d22c784f5432774d3f7addb877f21aeafeb73cce21e0a0b5720a82761033c0a69230ba7faf1046e98 WHIRLPOOL 86a169a76935013865f63debe6fe0852e4b5ce9a6472148e5ccc79b4d63619019626f5c69c32d792f2cb85ba11789af0429215a61601d1c1dc67d42f8fdd8ecb
 MISC ChangeLog 3308 SHA256 8430041148bf1688c89fa0cbf861503492ff9c9856e9277a24e52a82891eed86 SHA512 2235349e31d3b2f97fcba0109a1e51ab81dfde399b52407a63bebf9e6fdd847ebe521ecaaa1f8f6e164151164e23dac710f761bcdc3ede1ab4ccdcd86f69cda6 WHIRLPOOL 98618190307c6654134596eb9845ae978d324fe06f3fc0fe1b783a441ec21282a7e51e2ab05ddac5fd49932ceb004e8cb3bf8b28bfc3216550b0e83eca40011a
 MISC ChangeLog-2015 11496 SHA256 d8a6ae1439146b760f5086667b69ac8a5982fdaced5dee57fc7f37c5e48720fc SHA512 e3419f68bc302d6cc3fb77d9f39f99bbaba656b361aad14add3bbc92001087ffd3ab2789efb3e7bcd59b125df16e95911778c7c20b65b3d393cf84bd0cad6e9a WHIRLPOOL 27413d61ba3cd257e87ecd2a3e1c17ee3f857af23259ffac5f412b7c18145e737f94069cf9d345c7ee9d0f1021fe9865b9b13c385b4a2193091479a50266213e
 MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705
diff --git a/dev-java/fop/fop-2.0-r2.ebuild b/dev-java/fop/fop-2.0-r3.ebuild
index b24807e14b2a..308735bc50b0 100644
--- a/dev-java/fop/fop-2.0-r2.ebuild
+++ b/dev-java/fop/fop-2.0-r3.ebuild
@@ -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
 
 # TODO: if 'doc' use flag is used then should build also extra docs ('docs' ant target), currently it cannot
@@ -12,18 +12,18 @@ JAVA_PKG_IUSE="doc examples source test"
 inherit eutils java-pkg-2 java-ant-2
 
 DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
-HOMEPAGE="http://xmlgraphics.apache.org/fop/"
+HOMEPAGE="https://xmlgraphics.apache.org/fop/"
 SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"
 
 KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
 
 # Tests are broken even in 2.0
 RESTRICT="test"
 
-CDEPEND="dev-java/batik:1.8
+CDEPEND="
+	dev-java/batik:1.9
 	dev-java/ant-core:0
 	dev-java/fontbox:1.7
 	dev-java/commons-io:1
@@ -53,7 +53,7 @@ JAVA_ANT_REWRITE_CLASSPATH="true"
 
 EANT_GENTOO_CLASSPATH="
 	ant-core
-	batik-1.8
+	batik-1.9
 	fontbox-1.7
 	commons-io-1
 	commons-logging
diff --git a/dev-java/java-sdk-docs/Manifest b/dev-java/java-sdk-docs/Manifest
index b34abea83ffb..0f5bda888d8e 100644
--- a/dev-java/java-sdk-docs/Manifest
+++ b/dev-java/java-sdk-docs/Manifest
@@ -1,7 +1,7 @@
 DIST jdk-7u80-docs-all.zip 61168809 SHA256 0494bd49bc9cb3cbe3203120ae8b2c8e0aeb1579cb15c0fbd3cd780d19aa200a SHA512 c673c00e55c9a19938c42512cb9c6ae65de9803a1307d11a2043903d87cc36d9ed1f5a1e287040d8570e430cfe55f496354c1242fe6e242f1245f8271394ea1a WHIRLPOOL ad18886c401ec42735665081a0dd5ba3dc7678de0171f3aa8151c2e4ce3392e467be65c602f393da38373e589fa9800ed1afd3601d2cef4e48b06e57f491698e
-DIST jdk-8u144-docs-all.zip 93446459 SHA256 ae2b2fdb162ca5716fe60d8fddbe7b0d2059d2b571311d27d488a20a40c6b3be SHA512 28b4aa92453e61693fd72f190326c69956ab022400031b54490e11d81fb16b847eab8308e51126980d04b7ac21e1ea10c3446e621fef2293bc6e5f6ec9acf970 WHIRLPOOL ac12d6a2d83e6106e30d78ce50091c0f92cdbaefaaf94d61ac21b82e472ce606729a02c0ed9362098bc121ace16f149048df2b9d61640bda685a0d32dfea7555
+DIST jdk-8u152-docs-all.zip 93495668 SHA256 68d1f0f7827d86c6309b04c0f089c219f203158e993a88b47a6acaa0e4b40823 SHA512 5aa49103685fc466bf2c5ff32aeee9ccf5b51359bb8e558bc8f23dc399fb108cba7fd282b669ce3b8062865fc4507afc809f8fb0ca844587eb168ad44c69ad77 WHIRLPOOL a0eff7c33c37c286a69e03340e1ccf5f4c59be40f0a03ff9c800960c2a26971cee22b94829bd1b064b77332b17590969cbcc31f291b7f8da0eebd63e5009aeeb
 EBUILD java-sdk-docs-1.7.0.80.ebuild 1426 SHA256 6c884a3c55040f7da0c974404e26e89c4c28bf9d98ceb6329e8ee74d043d3a4f SHA512 f7e85f9d5f99970e2d122e2e73f80f440e32ce74ce439c3ff2b540b5fd7bc83d7c3881622658342b5ee5a5adb2e451d22fc7dd63cf20eccc7a0d76dbed319c89 WHIRLPOOL 8adb893c98f2f3a076c8c39306c56fb5af106e940ab23cbed92eceff692c18c40d97a30acce4dc001dcf985157e8633102122ee94f756b24d936cf08de93c7e4
-EBUILD java-sdk-docs-1.8.0.144.ebuild 1425 SHA256 255c37678760fa7ee4f8dd69bc3efdffccf27db19740f0ebb80a474ca16468c8 SHA512 940af01d8aad45e3bb0de48414d0efe104432459074590d975c599fca4f9f036a0a256a08e8d2dc94cd1c0d45a3902515c894377ed10a145bcdb470d990fda90 WHIRLPOOL 14a774bd99a92b900ac197e85a2a9a73d384bb02aa4a32d31a0b6c96d7320f15a64faace70ec1cd816b0453e057f0b6e4b5e835d716e179654737d81e404e283
+EBUILD java-sdk-docs-1.8.0.152.ebuild 1425 SHA256 255c37678760fa7ee4f8dd69bc3efdffccf27db19740f0ebb80a474ca16468c8 SHA512 940af01d8aad45e3bb0de48414d0efe104432459074590d975c599fca4f9f036a0a256a08e8d2dc94cd1c0d45a3902515c894377ed10a145bcdb470d990fda90 WHIRLPOOL 14a774bd99a92b900ac197e85a2a9a73d384bb02aa4a32d31a0b6c96d7320f15a64faace70ec1cd816b0453e057f0b6e4b5e835d716e179654737d81e404e283
 MISC ChangeLog 5635 SHA256 95e0680393ed956d8dc3f242772c097a1197251811ef2b1f70eb090d00e40da3 SHA512 5539614479d9c2f4cdcdf0d4f9a63831f4e3b6097726d2755acb14c5fbf4ee08654693a0e77ecff758cc1b14b36ca54b4d0798f8256fdd968715e885ea138886 WHIRLPOOL b86a49860be3ab92ef409603702b9b341c931c1fd0f783e923015039f048be84b7989028f46de59f9bab4e92767d7773a65b721b70b24310e5d9c9fdd8f16e7c
 MISC ChangeLog-2015 19879 SHA256 2c9ffcdd9b85a1bb56678499d00805d39624e639277438a72b8b409a0a17c4e8 SHA512 e79cd5a4c6eee9da7e4561989847281d1d103ed211146845c2a118ffbb8cb6e785bbb655de5a16d76d307d6cc00005282a440ef8c0eb36044eed95962993c220 WHIRLPOOL 1a89b07b0f1b1107930aa5f1afa0beab1795ce1140b4ed45529a25f31d19268a2fedd909ae15f1d0d3f3b10321b7fbf79960617e31970df5a3a1bf8295b66388
 MISC metadata.xml 232 SHA256 0c8d91b3d514ac42d0eaca567346ab909c0f947049c85c25a380ec2400f1b3fb SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893 WHIRLPOOL 3a1a6d054edc9177d85ca868f9b0a6e84ee51bab4fbdbb9b1ead1a03874036bcc3f96e903fb751dc4d29fdb7d6b5f3d8dbe7b042fc697c887e23f41cc9c8c4ac
diff --git a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.144.ebuild b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.152.ebuild
index 823be122dc21..823be122dc21 100644
--- a/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.144.ebuild
+++ b/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.152.ebuild
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index fd94924addfa..0ee5a4bcfbd9 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -6,8 +6,7 @@ AUX jython-2.7_beta1-ant.patch 996 SHA256 4162eb543c70071cac05c4220047296809733f
 AUX jython-2.7_beta1-dont-always-recompile-classes.patch 309 SHA256 323b52653b511d3d4a299d0414716aa3d6e7bfa21094b6090363878f244d7af2 SHA512 75b25d98d8df13d0b9947cbc70a7da59097b89731210504cc26ab18680b93d9ce2cd177480870f985a87d3634d9034b8d9f1bac2c431f4cfe09ab0b54db78b18 WHIRLPOOL 76300b03adaad2d979e4a5a705088ef3410d93643fac0c87b333f88181d4f93c8185630467a272d7fd5f2439784e907814084f5a18f11715d9bc4ce102d03bc5
 AUX jython-2.7_beta2-maxrepeat-import.patch 457 SHA256 0840c1039c0e5821d0ceeb44bdfe1bda52fc2b9da00330c52c2056def2e09a24 SHA512 e06ddb36805e2545f351d9d5df651fa90b0b39d340e4772cbb24910f1e1c999463a21fbe4a62c9cc73f9ccdc0047f8900e6300602cb8d5b70cef7cacf1bd46d0 WHIRLPOOL dc685f8cd5d684a9ea72f3315d9d74b1e51712fb6ef46fb2dec24ec1cb1a1d0094d28c06e32a0089ff659b7a0c402e35b77725e7c971db46bd90767d0eaff3ad
 DIST jython-2.7.0-sources.jar 15371691 SHA256 2b534595d4a08059ebb71b881c58ee830499bb6e9daba7c828a7f1f6c8943f7a SHA512 7583810245d694fd1d99a57ad504fcefdfbc1183def2cbb93ae3660f341104205c73041d846bdcf2b564b3cf4b770b481703c1dcdb1458396812c92d30ee9fa6 WHIRLPOOL e0dbd289c522b41ef2d3f54b01a2f6d44de8755e2eeb7863c8b807d1b179839f20d925e102db324cf85cd82503cd03106b5287ffa7a322a3902d6f24e9cd2a41
-EBUILD jython-2.7.0-r2.ebuild 4299 SHA256 e5d72b08a405a1f69ed621cd9b072102b0900f9cee95fe4fe55a553aaaa1b7d7 SHA512 433cfb7397f96a7e0e7673dab0f788d459d9fa490266d9434c0c0e82f0ecb1d28ed3276276fd3196f865e9a9a456ca75dc259060afddae8ada53700bddfc887e WHIRLPOOL eda646073b481c76fdd96163cfb8549753da2cd02f9a6b1eb8613d8129181db6ba8473d0f977c4359fd231a8673b13ff96d6147c402a85627b91313cfbf1f169
-EBUILD jython-2.7.0.ebuild 5666 SHA256 49b2ac3c6eafee7037c3f6b165f24810d4c0d403e634186be4342f90b728dbf3 SHA512 f8fa49e48f06ac9ecdcba3800d0e9050bd379df36058b0e7ee47a6d978dafdd3aaac8c03db28a80de12b7141259d9297827bc2d7de044a702864a9ed81bdf701 WHIRLPOOL c36b743cad1cc908e4185af8ce12287da9808cc5f56157872d57d906dc0a5bec4969bbd681fd2f013b873f5bcabf1789f0c77f4f06b80872d60b6314729c321e
+EBUILD jython-2.7.0-r2.ebuild 4298 SHA256 5105c65e6b72c315a155c880e231e44d948005fbdec96839cf66b83fb538f69c SHA512 8ff019b22a9a7abac0f96dd4466654333de3f60c72764053f4f26ce995e1200084348aa223edcd3806037cfade26d956f57512d38d733f37652a4cdb590c7e01 WHIRLPOOL 6e3f64a34ffaa5e3d4a952771396f467dcf8a771db61d524727eeff35ba9aade417e2597054cfc53affa56e32ff6737259603b6c82949f81f2db7b49ca7a507d
 MISC ChangeLog 6493 SHA256 db425c5e8ab43a03c932063d59e827148f0a3b48367c77f0a361b8594e515688 SHA512 70d8319bca8e3a4faec942dd16c88ca7a2441ea1b896f17b4559d645abcd62b1d3d78df78621556c6dbfb5b58d18c87ed99240b7dd3ba74c847a79bdd9bbe5f5 WHIRLPOOL 6c3b155f81af4cdf1f18b6290caa248e1a706dc943d730be7693711269b954cf33bd8909aa241890362d2c088f0d5f21610f77c11fcf9eb7dbc3541a86c03952
 MISC ChangeLog-2015 16851 SHA256 19dc522aedb70b79948459e970080a6d8a3a10303079a273586eb2a967b81380 SHA512 5e125a0a005ceb0fdcccd283b4f9dfd310af0e90e4b9be4901e47702a35db5f846373f3a27129020afb1659fe22406c89250bf610a95470d76ff82fe062c8b29 WHIRLPOOL 15b10f7f076cc1eb6d866320c2ffc1159adbba022e006a6ae308cd3ab38603cb81d91debf8950f48e0ee4e6a00736116e9447f8658b377884e093b3d5e06d1fd
-MISC metadata.xml 406 SHA256 aa24488b1d0d7c1227a27148d330f242ddd8c6a65602c8a21a4e3ecf42b5a6b3 SHA512 9f2143723240241788a922cba2adbb5917114bc052b2590eb76777c5db4140ab0360c55cadb17fc5b2006d1947f37e91f5ce88d6abba500e6cb9419854014dac WHIRLPOOL 49104dcd67ccc7794af5b0bb38ce1a5dab51c6bcb40350dfcf4e98d67b2445a05d512184eca3e5f72b7b377bc2ecb6fb6824893fdb3aed6d8f08ba63d790c99c
+MISC metadata.xml 322 SHA256 eb62cf2746f3155986092af544a3be47f79c89ef32d1c7ec8c9e05a3b65cca62 SHA512 e8a44ffb98b2da1c2d60f478d89e45879c3f4516042afed922ee522ded157243381e51b198fd638845e45ceb2255535e25df8a7ce61f267b6222dd94525b2342 WHIRLPOOL 84ae079b74216433e005f2ed2f1abd94e8bad3e067c8fb0c9abbf47ed268dbbdbb96bba531ca7c27466288a3cebd7e380517c2186e7e4608a59feaa73603f4f7
diff --git a/dev-java/jython/jython-2.7.0-r2.ebuild b/dev-java/jython/jython-2.7.0-r2.ebuild
index 852db859cfd4..d8fb023be8a9 100644
--- a/dev-java/jython/jython-2.7.0-r2.ebuild
+++ b/dev-java/jython/jython-2.7.0-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_PV
 
 LICENSE="PSF-2"
 SLOT="2.7"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="examples test"
 
 CP_DEPEND="dev-java/antlr:3
diff --git a/dev-java/jython/jython-2.7.0.ebuild b/dev-java/jython/jython-2.7.0.ebuild
deleted file mode 100644
index 18b533ce3672..000000000000
--- a/dev-java/jython/jython-2.7.0.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc examples source"
-
-inherit eutils java-pkg-2 java-ant-2 python-utils-r1 flag-o-matic
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="An implementation of Python written in Java"
-HOMEPAGE="http://www.jython.org"
-SRC_URI="http://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_PV}/${MY_P}-sources.jar"
-
-LICENSE="PSF-2"
-SLOT="2.7"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="+readline test"
-REQUIRED_USE="test? ( readline )"
-
-CDEPEND="dev-java/ant-core:0
-	dev-java/antlr:3
-	dev-java/netty-transport:0
-	=dev-java/asm-5.0.3:4
-	dev-java/commons-compress:0
-	dev-java/guava:13
-	>=dev-java/java-config-2.1.11-r3
-	dev-java/jffi:1.2
-	dev-java/jline:2
-	dev-java/icu4j:52
-	dev-java/jnr-constants:0
-	dev-java/jnr-posix:3.0
-	dev-java/jnr-netdb:1.0
-	dev-java/stringtemplate:0
-	dev-java/xerces:2
-	java-virtuals/script-api:0
-	java-virtuals/servlet-api:3.0
-	readline? ( >=dev-java/libreadline-java-0.8.0:0 )"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.7"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.7
-	app-arch/unzip
-	test? (
-		dev-java/junit:4
-		dev-java/ant-junit:0
-	)"
-
-S=${WORKDIR}
-
-RESTRICT="test"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="asm-4,commons-compress,guava-13,jffi-1.2,jline-2,"
-EANT_GENTOO_CLASSPATH+="jnr-constants,script-api,servlet-api-3.0,"
-EANT_GENTOO_CLASSPATH+="stringtemplate,xerces-2,icu4j-52,netty-transport,jnr-posix-3.0"
-
-JAVA_ANT_CLASSPATH_TAGS+=" java"
-
-EANT_BUILD_TARGET="developer-build"
-EANT_TEST_EXTRA_ARGS="-Dpython.home=dist"
-
-# jdbc-informix and jdbc-oracle-bin (requires registration) aren't exposed.
-# Uncomment and add to CDEPEND if you want either of them
-#EANT_GENTOO_CLASSPATH+=",jdbc-informix"   EANT_EXTRA_ARGS+=" -Dinformix.present"
-#EANT_GENTOO_CLASSPATH+=",jdbc-oracle-bin" EANT_EXTRA_ARGS+=" -Doracle.present"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.2-distutils_scripts_location.patch
-	"${FILESDIR}"/${PN}-2.5.2-respect_PYTHONPATH.patch
-	"${FILESDIR}"/${PN}-2.7_beta1-ant.patch
-	"${FILESDIR}"/${PN}-2.7_beta1-dont-always-recompile-classes.patch
-	"${FILESDIR}"/${PN}-2.7_beta2-maxrepeat-import.patch
-	"${FILESDIR}"/${PN}-2.7.0-build.xml.patch
-)
-
-java_prepare() {
-	find \( -name '*.jar' -o -name '*.class' \
-		-o -name '*.pyc' -o -name '*.exe' \) -delete
-
-	epatch "${PATCHES[@]}"
-
-	if ! use readline; then
-		rm -v src/org/python/util/ReadlineConsole.java || die
-	fi
-
-	# needed for launchertest
-	chmod +x tests/shell/test-jython.sh || die
-
-	# apparently this can cause problems
-	append-flags -fno-stack-protector
-}
-
-src_compile() {
-	use readline && EANT_GENTOO_CLASSPATH+=",libreadline-java"
-
-	EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --with-dependencies antlr-3,jnr-posix-3.0)"
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only ant-core)"
-
-	sed -i -e "1 a\
-		CLASSPATH=\"$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}\"" \
-		src/shell/jython || die
-
-	java-pkg-2_src_compile
-}
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local instdir=/usr/share/${PN}-${SLOT}
-
-	java-pkg_newjar dist/${PN}-dev.jar
-
-	java-pkg_register-optional-dependency jdbc-mysql
-	java-pkg_register-optional-dependency jdbc-postgresql
-
-	insinto ${instdir}
-	doins -r dist/{Lib,registry}
-
-	dodoc ACKNOWLEDGMENTS NEWS README.txt
-
-	use doc && java-pkg_dohtml -r dist/Doc/javadoc
-	use source && java-pkg_dosrc src/*
-	use examples && java-pkg_doexamples Demo/*
-
-	local java_args=(
-		-Dpython.home="${EPREFIX}"/usr/share/${PN}-${SLOT}
-		-Dpython.executable="${EPREFIX}"/usr/bin/jython${SLOT}
-		-Dpython.cachedir="\${HOME}/.jythoncachedir"
-	)
-
-	java-pkg_dolauncher jython${SLOT} \
-		--main org.python.util.jython \
-		--java_args "${java_args[*]}"
-
-	if use readline; then
-		sed \
-			-e "s/#\(python.console=org.python.util.ReadlineConsole\)/\1/" \
-			-e "/#python.console.readlinelib=JavaReadline/a python.console.readlinelib=GnuReadline" \
-			-i "${ED}"/usr/share/${PN}-${SLOT}/registry || die
-	fi
-
-	# we need a wrapper to help python_optimize
-	cat <<-EOF > "${T}"/jython
-		exec java -cp "$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}:dist/${PN}-dev.jar" \
-			-Dpython.home="${ED}${instdir}" \
-			-Dpython.cachedir="${T}/.jythoncachedir" \
-			-Duser.home="${T}" \
-			org.python.util.jython "\${@}"
-	EOF
-	chmod +x "${T}"/jython || die
-
-	local -x PYTHON="${T}"/jython
-	# we can't get the path from the interpreter since it does some
-	# magic that fails on non-installed copy...
-	local PYTHON_SITEDIR=${EPREFIX}/usr/share/jython-${SLOT}/Lib/site-packages
-	python_export jython${SLOT} EPYTHON
-
-	# compile tests (everything else is compiled already)
-	# we're keeping it quiet since jython reports errors verbosely
-	# and some of the tests are supposed to trigger compile errors
-	python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
-
-	# for python-exec
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_domodule epython.py
-
-	# some of the class files end up with newer timestamps than the files they
-	# were generated from, make sure this doesn't happen
-	find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch
-}
-
-pkg_postinst() {
-	if ! has_version dev-java/jython ; then
-		elog
-		elog "readline can be configured in the registry:"
-		elog
-		elog "python.console=org.python.util.ReadlineConsole"
-		elog "python.console.readlinelib=GnuReadline"
-		elog
-		elog "Global registry: '${EROOT}usr/share/${PN}-${SLOT}/registry'"
-		elog "User registry: '~/.jython'"
-		elog "See http://www.jython.org/docs/registry.html for more information."
-		elog
-	fi
-}
diff --git a/dev-java/jython/metadata.xml b/dev-java/jython/metadata.xml
index 6034fcc96aab..d20250bf86a6 100644
--- a/dev-java/jython/metadata.xml
+++ b/dev-java/jython/metadata.xml
@@ -5,9 +5,6 @@
     <email>java@gentoo.org</email>
     <name>Java</name>
   </maintainer>
-  <use>
-    <flag name="readline">Use GNU readline instead of jline</flag>
-  </use>
   <upstream>
     <remote-id type="sourceforge">jython</remote-id>
   </upstream>
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest
index 4e9dca7f149d..ac512e3ae9ec 100644
--- a/dev-java/oracle-jdk-bin/Manifest
+++ b/dev-java/oracle-jdk-bin/Manifest
@@ -1,21 +1,20 @@
 AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
 AUX oracle-jdk-bin.env.sh 833 SHA256 cef5b8196f18b4c7bd195fbe5084dde6e38b693accfc68859f48cb1460bee4fb SHA512 8d41679b4631016dbe98b15368ed027df9e6f4d96db17133c56bbf16b9a81be908d139617bc5350aa6b0e51bddc56bb1ce1abc5a8a4fad74868172cfdde6ffd8 WHIRLPOOL 0fa41d4b45e7b85628feffb55a8ca5ccb99c8a3e8d59907e42947135ac5cbc39564e609be7901e321ec5a0de8f0b6705e02333a771fa738434774cd198c32770
-DIST jce_policy-8.zip 8409 SHA256 f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512 abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5 WHIRLPOOL 8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc
-DIST jdk-8u144-linux-arm32-vfp-hflt-demos.tar.gz 10431600 SHA256 b113da60e5b0d30e58723a1bd56d46d25767b6c893910ab8bad08f43e463ee86 SHA512 36bc18b6d8d028fc9737803cdf913378c7501aede301c6013567f7eff1b326f44381522a3c5c38869799df6ef4aa4d83912332c3787a305fe6cfe6746a0f906b WHIRLPOOL 8f9da8cdee641320ee86c130db0010bbfc0823cc8e1ecf68e4698d7470b709251c8af56a617ffe3bdd567b77de5a3c0c29caefb8d52a75799d533316cf42ac13
-DIST jdk-8u144-linux-arm32-vfp-hflt.tar.gz 81674263 SHA256 cbbd390e19ab4c473e05f60602ce2804db25e4e35be5ab95f4f1a2aeb5b72383 SHA512 673a2ec7704a921db19e904bf8e8594b003b855de5cecab4419c502b235156a28262643ac235401c96014792897bbc1a51f78ced30e09439628ecd16d841377c WHIRLPOOL feb03cf10b692edf0b94cd46a1fb9cca9e9b1361efb1786d492a52c3ace889c3f294a163ec8bd617be87525957b62d6f1a1383b815ec65b732b70b6a327c5793
-DIST jdk-8u144-linux-arm64-vfp-hflt-demos.tar.gz 10427473 SHA256 ec66001b2f6a6814c4cf6d28f7c59ee5d335cbf50d8a3557c5e9eb46adf09630 SHA512 cbe861d234ca95e542c38ac72a1d84cd36ed895f4c72fbc45e1d4e5e4e73dd10f4b28f2bddb86a9b848b0edf304cc18b8e9b605ac1b94a1d35117fc75dd00748 WHIRLPOOL 39567c138d9c099a7c0e0b642a550d4ad9b53e533520601a1dec0d51a9bff45aa9afe5b31b1b015db8648b2648a609f9e284036b2db98f145b57c5a3a477e43f
-DIST jdk-8u144-linux-arm64-vfp-hflt.tar.gz 78463505 SHA256 bbcf4a0805f9bcead32fd988b74cee61ef6ad90e6d1b4e0dce432ac3fd8e0168 SHA512 42d3db36d7adf5461024202260b940d824c58c35edeb89b7be6f98147f1d556e95ee2f37b35c4468fd4d175f3381ce5bda9d9c2f730d054a7b8e669b469e18d0 WHIRLPOOL 7a0d15c8c5512de0cce0deade9b5f87f505e351c903d04152e860261f4d790e8e656aeb0740bfa9f69f0c2b80fc55a701d8f49ed3d7e1edfcb5293e95a22504e
-DIST jdk-8u144-linux-i586-demos.tar.gz 55071167 SHA256 3e8f02f32b129d681f5f2a0178373d750f4c2352acf55785fdca70c8f9aaf595 SHA512 4f3d5f8ecd56a7955e30cfea12dea4dadad0e955c3b160fddec59e759a9a6653bcb009bccae289fa022dba931fcede8a98d18770a8c18cc49d9da4f8ea0980d6 WHIRLPOOL aed2d4bdcebbaa0ae4adfd3e4eb000ef1499fef1ccc76f4bf00ce63fe5f695777fc3e8c2fd75b852fde8cfa1b06cb5c41c870b802074ec38f6512d296a67da96
-DIST jdk-8u144-linux-i586.tar.gz 188157665 SHA256 624c090647629394ef0ee08d9d8ac5d3d5a9a60fa245fefb2eb417c36c7cb7c4 SHA512 06e08a512af60bafdf3220ab916461c3bac61a3cac19877e9dd0c004c28168243c5f92f3104da1dcfd5eae98e882b224929f72692603455815c0ce8615f5ae9c WHIRLPOOL 79859bb345787155935885b872b6f072b68e81fb0008661344502d461ffd7aac88fe4cc9a2ff03f241ffcd41c0880907cd5353bcaf2f5bf7112dde1057209f85
-DIST jdk-8u144-linux-x64-demos.tar.gz 55093539 SHA256 67fcbd3b54aea3791d10eb3cd74a8fe42c286f0854b6a984b768f9c9c7513ffc SHA512 7f49d29e323237f0144e00883634779809bf41ab0b50875a3a36020521f716149cb38db522763a56249d34a1c3ee6f778b6ecf45b06b492064cc1fce854f9d24 WHIRLPOOL 74db7026f97ed61134313ed6b853d609684e7316d68b3f4880e12fadd9c6d267e79c0b8e10f69fb3f21af29d910cf2ab423b7c23a5f80dfce51389832bdc1aae
-DIST jdk-8u144-linux-x64.tar.gz 185515842 SHA256 e8a341ce566f32c3d06f6d0f0eeea9a0f434f538d22af949ae58bc86f2eeaae4 SHA512 e84bd22105586b4f1cb770942755c3b4ee7e2ca2a94bf0e7d48e5d44586a103dd28432664fd84b260b8bf1d64a1e9dbf49549f194e7202015e603865f4ae1e69 WHIRLPOOL 832b2b2b4790a9ed7499192248f30c9e56d357d52549c39314f992c3757b69ba9cc725356966ad0229c4053b63a56362a26d1a9b2f447c00b5f3d927e1926d8f
-DIST jdk-8u144-macosx-x64.dmg 237607747 SHA256 2450b35e10295ccf3fb1596bdea6f8f5670f7200ae3ac592eb6a54cc030cf94b SHA512 7eab6126044e230bebb1a5817b046bd64d3f57a3dbd3efc6c77411008b2aff7d4bee190906cb19a5ed330a8220b8b6dc47c9fc193eaa9a3c1f74ebbffcee0d6f WHIRLPOOL 7477673f2380a22b8ae9a7381d6b86611c0fbb32a3d94d81247d86924599b2317a7d598521aea51a729a9f553b7e4065799bd935fb0a3c0f53732cd448dcd5f6
-DIST jdk-8u144-macosx-x86_64-demos.zip 55667110 SHA256 d665713ddca2d771a56cef17fe16b9972ad6fed3fe716b18b690cbd8e0e99475 SHA512 252138155cce08eb8c68f1b3e10c621edca1292d69a69d3022bd32d45cb6c2095329cc3ece375124bdd1774e9e7dbae5f47a608f457a0655e2408614965c36bf WHIRLPOOL 86fa1e5b99c1beff5e7f6dd139629bd2f49700e8975be50c88f44d66bc5124bebfa42b487329e805aa79819f339405247750f6c55691af0c748ecdb555c0bf87
-DIST jdk-8u144-solaris-amd64-demos.tar.gz 9765361 SHA256 33f76fb0bec3f554aeb15c02e84c52cdeec77ac72f99f5247cee07035c7779b3 SHA512 a22e58c8a905d87e25184ea020c24dfe8afa4aa314093135643926ecbc734ca06ee58efbfffefc7dcbd013dbf0023ab515448fd48d4a731b656e2f47d22b98cb WHIRLPOOL 82cf282ecbb064567c96f4ee81560588d71e257504eb6b926d6fee8b114781eb5e3881035b250db2436b0a2579bb47309fb51e89f946f61c5b5e27e727749f33
-DIST jdk-8u144-solaris-sparcv9-demos.tar.gz 9793649 SHA256 ceea29533ceb76ed1ee7f65b5935ef0fc53b0afee7c5f4ddb08d4face3b0838e SHA512 ba14fe455acc52f2f6da0c3d419d491f3a3123c7a0f80ce4d130e68a0492e7509e34709ca5921c6f266c468ba085f78d203d8018f1d9df26982e3d2dea72c1c5 WHIRLPOOL 5fe028f3959d2337416f8cb3b9b101dbba4ec42db18abec7641cac3133da44d0938f0429d43be3e2c159957fe5c351a6db81d6b08fddb55cb5abf7ef36e1885c
-DIST jdk-8u144-solaris-sparcv9.tar.gz 103999213 SHA256 fe8e6d12cac940569c5b2270d2d40ed57d6a0861d15d512e4d1cbc55277a2d2d SHA512 0a9ed86237ec253c009f68a3d6832610595623437d25d68c157ef2b5d59e0556acbe229be7b9a1713565b76604bd15474d2ce50ab7c593bf568226e9c1f6f6c7 WHIRLPOOL 24cee16e12c622cc675226842c28211b9d1a7e6079e0e0c0721e7f2cc2fe822e033ffbd405f7d509b5068531d7b9ce525a6628ee4cc3642400f33f7d8f86a8c3
-DIST jdk-8u144-solaris-x64.tar.gz 101700929 SHA256 9eea0096784e6c876aae6918bf4692096bd738200e717da09b4471bd1e706cf1 SHA512 fcd65f556d8565a29d4b7d3d5dec5c52c669c64db536c8ab01749f1f320232e8d42ba3d7012802033d9d7344b9abddd52140e345e4f95a025f00069901726f6b WHIRLPOOL f3ddd659003c5f2d39112132050bc441630c73208900babed8c1ec814c3d73271f8774e9411c8fc3e2eeae31f5312d6731520963c82f1c148d461eab0a355972
-EBUILD oracle-jdk-bin-1.8.0.144.ebuild 11217 SHA256 7d38b9ce9b427217e4eb72114fb47e4ba2abcaf0f85a8681710aa620e3e76c2b SHA512 1f43ffdd08c0e41940f6bd5a535a01f8ba41173bfdaf04f501eb89d05df32c3b8f06fcf78d656836c4ba5f64472e9e31f04224c87f9b47c97d78e61abc2b1ede WHIRLPOOL 5f79d1cc41f28e5c5df2b8211fcacf58764e047d4cc15b8ae0dbc1d69e546f37479ccaaf096075407e2716413c372dd8f598ed6c82e303e0f3b596ba943f62ed
+DIST jdk-8u152-linux-arm32-vfp-hflt-demos.tar.gz 10405226 SHA256 5dba4af988562661f4543f210e0e16be9f4e11885e8addd9b7f8f6e2aa18741b SHA512 774b1957142ca489e362ef6ab48ce152196b64c00d779d051f76421fdf4a52cd7a741cfe3336b02c05f432fd2cb95728cdfd992f4ea3fee56047b40e7ce95053 WHIRLPOOL 1196d099f307f21b22e08c3b4badba33ee0475ebd70091ed98510730f7c492032e02a8dd475bd72b380eb9ceb8980e5a012c0be906d76afd2073e048d94f5909
+DIST jdk-8u152-linux-arm32-vfp-hflt.tar.gz 81729798 SHA256 35ab532355c72310c4c7add2b7c7f9d1eb0e045cf59d3fd69ee08fa6a9e610f0 SHA512 c548c18e2e2c9e2c87ad24841348b676628a33023a70aa0a5dab56d031c1d9c7a4813240a046db96631025d034ed333fec81c8099f02a7c9efd39fecd4592e32 WHIRLPOOL 32119379086fc008957bb6a00012d17e2f7d2a22ebd26f8b6e04a3d6476ab5d98a25bcc51cd5ce3c0eba6422581a050b809ffed2539819295aadef37d6e79383
+DIST jdk-8u152-linux-arm64-vfp-hflt-demos.tar.gz 10434504 SHA256 59c1787ad8b5f604293b09576fc8e872ad3fe32c0df3f3a62c9149dddfe25b24 SHA512 c41cb3f8394f98516e7dce52d8aaaea87d0e1675560292009eba0b4b3e993d1aaef7a7895dd83af2570486af6ca8913f280940d5f7e0051c3cc198a6387d9cd7 WHIRLPOOL ae3189cb9393ae9039ddb7a0c87db4ed30defc9cea5cc7d86de8bc32003f5d33c4200c20a3a10658c21f3099c2d455c3660fd1b4d0b222398cf084d776e36ae6
+DIST jdk-8u152-linux-arm64-vfp-hflt.tar.gz 78513081 SHA256 732609dd090a7d20e09b48b90f8f447497879bb6da1b786a9dd1ea6e91ea178f SHA512 fe35360a9ffa73e9745360560db6a5dee9665d31801ea58bd8be676588c93955f47077dbcb5a415c0074f9759a9cace77916e3b322c572b4d3b23a1d99f16578 WHIRLPOOL 9b1abcfa123d783b4caeaab8f469084647fa8deea3056aba910710e525dc7a89a096909111c24e869557d26db2a363be7008b1bddfaff7f9123b168767b78bf7
+DIST jdk-8u152-linux-i586-demos.tar.gz 55096721 SHA256 0a12f9f08e863a75685b11a66f31e990140777b1a8762cb30d9d617a3a0144a5 SHA512 44776eafd70306a392fae5cf269036d7500c7cbaee13a9fcda14b9f7191376dbfcbb03262693e3114a08f5d4ff27ede1ef570fa6008c9ef71ab3b24d44f9ad2c WHIRLPOOL a4b63c7d05a7b69d0525a1ee743e571ecc289c9abbf283c42ffa99dfa17ac98e822a523ca8d021d4fe3d89b51cfa6072ebed4ed272b772aadbab26cc2e479d8d
+DIST jdk-8u152-linux-i586.tar.gz 192699649 SHA256 fc60b121d4b194fa70084fd0ca0d69e8b78e5db01a071efe200e90eed83c4c3e SHA512 6b7576ec40b0ddd0a54fbcd61c22b95f472192be5855d143387f1b56220dd68e851a8b87894802c181b1039c14f5a278d950f100c4bd10b862fe4049d9294ce2 WHIRLPOOL a4bd3b3eed55c42ae51599783c6a2743edb9aaa090e84dd49708930ea712b9d262c565fcaf1e59d5b48f362ec84cca22da920699b9ef8abfd6e9ec93025bbce5
+DIST jdk-8u152-linux-x64-demos.tar.gz 55162003 SHA256 7f0858d204c952fddc402379c187952fcf75dbe5a02b31e51b8a961320f24afa SHA512 51303580a702c1fd1227d8f57c546b6e11de6a87d3ba32123a3e001688c5ff308efa1feaa6da8d2bcff8143fa61726ba9e4aec959a70e82817d628480b0a576f WHIRLPOOL a42cd6a7f0e3619f6408e7f9a923a48cf05c749b945b2e29999344375f146dd408abc774ca153f2d6ec659ebc14229255bee9b850fe182ad5b6f4394313e3a2f
+DIST jdk-8u152-linux-x64.tar.gz 189784266 SHA256 218b3b340c3f6d05d940b817d0270dfe0cfd657a636bad074dcabe0c111961bf SHA512 b0851d46bf0385b7595f8d60da0f06ccdcd59aac75efa9b48635ba77a3e4eb557cbda5585fa5886787a0e549d9e5cfa4a992741349cfc224b36f180907838321 WHIRLPOOL c1d7030f94585725ae4bbf65893456a376ebd5d8ad9cbd63ef7dc86c0b7b6103c98140bbe955234cf8605b422c00d213f9089b56d36f1c920fdb25835ff45e62
+DIST jdk-8u152-macosx-x64.dmg 259130998 SHA256 9f9008e2b05e431838c8ee5f0d54f7715da386bc70b14d4910766c71e9f7923f SHA512 9b3b8ea5119a2f5d3e221244ec07e6da6405041a65fec6299643133a89434d44719e4ccea35498749c00bc400c125dae7a1f4f41fc44d0d6748235bf92601eb8 WHIRLPOOL 0abda8fa87e1b2d525ba401b6b842fc30728c936d05372bb0e2680b602dcd3cc15fc293a1932c716e9904c4d97b9e57a8f7ac66c8ac4080ea342800f4c57542e
+DIST jdk-8u152-macosx-x86_64-demos.zip 55705509 SHA256 3d05061a5c58da669797cd9f8583412eca34e8b0f8779aa6a45b93daac2d2b43 SHA512 5b17f84aeda22a145d8171c8789a8fa1127d1e9b3b6acabdc9e2ad42e4ac5b8c95f2afc0e1736096bec246ca87a22908a5ede492fde34a081984a02382c19ac3 WHIRLPOOL 261e6b89dbb73aa94f4d3d4dacf2353d11a4bae66d446315c0d588de995dee76d7cda9f89fa325656bc8e39657f4d4faafac6f9a06843a12b3045416f93e9969
+DIST jdk-8u152-solaris-sparcv9-demos.tar.gz 9769313 SHA256 2675ad1157ba9a2db3e5d72e8aa658e0f3388731a435b01f890091aaf509f326 SHA512 32e35cb2b3f9e3cb5b5d77a84612fe37f90879e7eb38578af6a922157f12878d1b5f893a3119df055facf7457a5516f502a7da5cb93fa3d5614fdf1f855ecfb8 WHIRLPOOL d38bf520351be78a9eeae4de8696a5fccabb8fd09a9196f14cdd91db457441c341de6854d922e1bcc4d89e1635ac0912e3bd68c166c457b0b86265a617211c0a
+DIST jdk-8u152-solaris-sparcv9.tar.gz 104117809 SHA256 bb23f8813c99b99130e2a7bc076b22712801f19aa600832cd7ce590995ed0ba2 SHA512 9b87d11325e22bfb5f8e852ef4dcd182f091dcedfe71e5b19cc5a7d82f9f7ccb060b53512bc938d0e617648a8aa766bb722690751521b9a2cc3820507342548d WHIRLPOOL 33a11de9b2969eea74251c1dbe217d311ae0db9ff7190c1c9713898212b9c5b537ff5382d15ce27f45bc362901809f2ad7b8a50a3f01904454c9f6be262743d4
+DIST jdk-8u152-solaris-x64-demos.tar.gz 9756596 SHA256 ea6468eca72d715db7e3e4494fb316b25872b91276b156a598a5ea0bd9baf919 SHA512 1aeaf732ad3956ede4baa005f34024750e03919ef81b608229a3df556b47db1255ce027e4278891644433db0c360225a3e81e9a547d298a4b958beb8691f8ff2 WHIRLPOOL f56dec7bc4e156a5058aec0ed7e6274a043dd8069a0b5f95592155a062e133c04dbbe98e1d91ff7e30f71abd863a90022f3fa4363b4fbffd6bb41f5e0701c7e5
+DIST jdk-8u152-solaris-x64.tar.gz 101758540 SHA256 2bf02d98d0eca1ed55fcf274e6254c3e6e71d8e07700fd1ff9e82c44006abace SHA512 4dd9606be347a61a03c0f670915c4e790d4f5eef80a67922342b539dcae7132b3157df04cd33e5f72fdc7e6fcb43e21b3b387e2da159cdfea0feb01183c68aa0 WHIRLPOOL 476c5af0b835643b4d8605deb8f67ef7448bfb0887088cb632a7464d28863b92a9fae2315ef9e454cbd6e1f693910f329dae84acca0d9cb42b4a986e834a1e1e
+EBUILD oracle-jdk-bin-1.8.0.152-r1.ebuild 10432 SHA256 f2c411c6b77216bb31d755c7eac03c844662c0662aac28178c2d5f8ecd233234 SHA512 9530367083792aceb6a0264a9b1df4268b3221f5061624be9d343fe193def4c56b57d503d29543127f64474f3a03c4f1ce4ecdfd20a468ba6c193feaadcda8e6 WHIRLPOOL fd81b7ed4289f962d9e68565c39aaed01896e4b79edcfc70092232e9ced470d1d32f36ad1514ebe01c8fa36edc40d675fac3cb8d40888cc7867ebbf6f90adc6c
 MISC ChangeLog 13800 SHA256 3649ca9854afa818a93a26b740810cfcb6ce7f5aea15edb3b55cf52a8a3939cb SHA512 cf6f333bd218ed574b9916d02354999de051c0fb8a5882c750b75f83e55593a6d72e218ffb1f8cca59b222df04e8501608d4bdeb6e3489fe021a063fd8f49cb2 WHIRLPOOL 6f1bc3d6a22ffc0eb389e4639f7da0066fa676f726d236aea08db38bb2a7969d55a7de2ca36d821ed7fefef69958f6d766f6bf2ea1770dc9e1c8b4978a230083
 MISC ChangeLog-2015 17787 SHA256 37e99da4dfec1171c0701781550ce770f4efa1b32d5af9424bea788b1bbc3139 SHA512 99879d5ef9201cd716ab2f427a2d0e51c33ad255f49b0b995c7b4a128cefb8dcf7af43915ef593672b67cf8d9691fa94af7355d982893465d6e913599f5fcc1c WHIRLPOOL c3a6bde6dbaea52bb0c84d874460742c84341da0239c43ef36e7a58542b854d55c12157ba9b4746444d3128ce149254dcd7ffd80c28457ad5f5a44a9db936a40
 MISC metadata.xml 947 SHA256 381e51e4a062f891dc9df4efc6e8b0e95fcf6ea735b7b5d886f8e8cc2241e8bb SHA512 e75227c3209a5b85ac0d8f3e0f26752bbe88eca1575e00e75be80beedd65b78765a420fefe33571c6ac90412cf1b3db5768f75e8d6e478714d4f177f100fd815 WHIRLPOOL aecb59d7c2554db8493fa01c1fefe639649d064a42b86e97803fee9206fc81391f93317e96de75921d086e1170f1818df334a17d157d0fbdbc19d7ee4feeaf9b
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.144.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.152-r1.ebuild
index 1e25bc987cec..96e7ab522852 100644
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.144.ebuild
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.152-r1.ebuild
@@ -5,9 +5,8 @@ EAPI=6
 
 inherit eutils java-vm-2 prefix versionator
 
-# This URIs need to be updated when bumping!
+# This URI needs to be updated when bumping!
 JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
 
 # This is a list of archs supported by this update.
 # Currently arm comes and goes.
@@ -38,13 +37,10 @@ DEMOS_amd64="jdk-${MY_PV}-linux-x64-demos.tar.gz"
 DEMOS_arm="jdk-${MY_PV}-linux-arm32-vfp-hflt-demos.tar.gz"
 DEMOS_arm64="jdk-${MY_PV}-linux-arm64-vfp-hflt-demos.tar.gz"
 DEMOS_x86="jdk-${MY_PV}-linux-i586-demos.tar.gz"
-DEMOS_x64_solaris="jdk-${MY_PV}-solaris-amd64-demos.tar.gz"
+DEMOS_x64_solaris="jdk-${MY_PV}-solaris-x64-demos.tar.gz"
 DEMOS_sparc64_solaris="jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz"
 DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.zip"
 
-JCE_DIR="UnlimitedJCEPolicyJDK8"
-JCE_FILE="jce_policy-8.zip"
-
 DESCRIPTION="Oracle's Java SE Development Kit"
 HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
 for d in "${AT_AVAILABLE[@]}"; do
@@ -55,7 +51,6 @@ for d in "${AT_AVAILABLE[@]}"; do
 	SRC_URI+=" )"
 done
 unset d
-SRC_URI+=" jce? ( ${JCE_FILE} )"
 
 LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )"
 SLOT="1.8"
@@ -107,7 +102,6 @@ RDEPEND="!x64-macos? (
 	selinux? ( sec-policy/selinux-java )"
 
 DEPEND="app-arch/zip
-	jce? ( app-arch/unzip )
 	examples? ( x64-macos? ( app-arch/unzip ) )"
 
 S="${WORKDIR}/jdk"
@@ -148,7 +142,6 @@ pkg_nofetch() {
 		distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") )
 	fi
 	check_tarballs_available "${JDK_URI}" "${distfiles[@]}"
-	use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}"
 }
 
 src_unpack() {
@@ -163,7 +156,6 @@ src_unpack() {
 		zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv || die
 		mv Contents/Home "${WORKDIR}"/jdk${MY_PV} || die
 		popd > /dev/null || die
-		use jce && unpack "${JCE_FILE}"
 	else
 		default
 	fi
@@ -175,10 +167,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	if use jce ; then
-		mv "${WORKDIR}"/${JCE_DIR} jre/lib/security/ || die
-	fi
-
 	default
 
 	if [[ -n ${JAVA_PKG_STRICT} ]] ; then
@@ -251,17 +239,8 @@ src_install() {
 		cp -pPR demo sample "${ddest}" || die
 	fi
 
-	if use jce ; then
-		dodir "${dest}"/jre/lib/security/strong-jce
-		mv "${ddest}"/jre/lib/security/US_export_policy.jar \
-			"${ddest}"/jre/lib/security/strong-jce || die
-		mv "${ddest}"/jre/lib/security/local_policy.jar \
-			"${ddest}"/jre/lib/security/strong-jce || die
-		dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
-			"${dest}"/jre/lib/security/US_export_policy.jar
-		dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \
-			"${dest}"/jre/lib/security/local_policy.jar
-	fi
+	ln -s policy/$(usex jce unlimited limited)/{US_export,local}_policy.jar \
+		"${ddest}"/jre/lib/security/ || die
 
 	if use nsplugin ; then
 		local nsplugin_link=${nsplugin##*/}
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index e2edb93607e2..42af440de73a 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -1,9 +1,8 @@
 AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6
 AUX oracle-jre-bin.env.sh 785 SHA256 77cc6b99e02f7f2837b649d002129d3a1ef90ac047afaebbcdb2925e5895e747 SHA512 fee30a728d97822e0189e6687ac285e72270207d43ae2859159cbd212b3897cfa153aa27f66b06ee704ac24637f2d88b579c3aedc4026fd8508d59622e68b0e6 WHIRLPOOL fa163eedb0139bbe01644739609b7678ca6050c890233c5d5deed7e0810714d529e033bc5615f634a2d60b49365d9981a928c05c1a699a6a0c8996b296c98249
-DIST jce_policy-8.zip 8409 SHA256 f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512 abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5 WHIRLPOOL 8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc
-DIST jre-8u144-linux-i586.tar.gz 78658631 SHA256 9ac5b0d6cda9279a4959a6eb635d849d745a37dafc24666539d1c8f7d76ab77a SHA512 038e367fb00007e6b0f70ed3e48f318cfcb4144ef88b3a33d6c152cb186ede43622bc5d2fb40b39c695fdbe1fa735ab97f501a6ad0ed0a6cf48b286cc08e9ceb WHIRLPOOL 0bac95fc572bb1466b3f69c7e3dd03a77611366bc7c8076eb2feac41ecfde9a4aea6bb60b52b9db1dc0ec2bffcf553abe4ac4b1ffd28f7f3e1b6b71cd8ffc2fb
-DIST jre-8u144-linux-x64.tar.gz 75922776 SHA256 4e6e11aad54ae3c716a5607ee88d81f3f1e8b5b23ee474b0272dba351ee9f28a SHA512 fba5a5f5959746cb76a71847f5c6e3142816940d18c0022c0baf59611d43b24fae1052eeb217f09e840b5c393118260fb99dd38d1db7e74bb07ab0c34c2e1d60 WHIRLPOOL ac1921780076ff7ab5be5b942d5be0bab7fe12c027f1564b91734086d14c5a0da6b66d137034d7ee0318c4f72cb843013488591d1066a5f55c66dd4f53561a6f
-EBUILD oracle-jre-bin-1.8.0.144.ebuild 7192 SHA256 42b4605835176fc8e924d3b57688daaff1ab892c9e39ff0fcd6e9f5a867c7cd8 SHA512 8fb779937cb7cf443ca8c22230e98e5f2116ce8b5e6616239ee52f6f615c1c8f348dfcb96b5ff2cbde12885f1765a8049c265e3190776f3e7fb0ccc38d4eae5b WHIRLPOOL bff60b6fce8bcf801cb900edaa8fbaa5555df58a85a6eb6d56955b926187151663b6ee68fe44cf6555496aecc8a2b28e1c0862794417229324d1f5a0418c227d
+DIST jre-8u152-linux-i586.tar.gz 83131659 SHA256 1d0c9202fbed3136d46674547b92d467e28b6256dce5d1793c55c284c285a14d SHA512 8bd655ae97c333ed57991ed6d13d2c2647f85e5a1c853dd76031b8e7689db9a1b183bc665acc5b9f989139b34300ac65ab65c80e18234d6d1b06a4512fc4e542 WHIRLPOOL ea908a4efed078433cfb21ae6f015292ad0910e716e3f1a8748336e44484f0848dc317518e4fac04fd38aa6338f43b389c586b1cb6164639830f0024313688b7
+DIST jre-8u152-linux-x64.tar.gz 80061016 SHA256 ed04ffbf8050a69b15f02c51a2cae8e0de9362e7f6fe8995b1c39c613fc20ede SHA512 7c58ff2c3ac9af423ffab0ebfbfa7b4842072f6554569d76a99f8c82fa6935e36dbcf811f9c5510d71fc87db9520e684d877d99cae95f4874578ba42157ce85d WHIRLPOOL 7a3f4e34d70b4ccc850df754084448065c844973d77dec98ff57c2c8fa6338417b4e3f732995fcbc4e66cd8cbc34a2306aff11c4579749d66e33538c0d724682
+EBUILD oracle-jre-bin-1.8.0.152-r1.ebuild 6433 SHA256 ed549ed2892862187e85e3a298e0c51788e8939dcc717a140d875aec7fbcb57a SHA512 2b26c0a9250fa719b1da5370b8cb632a6bcf6f2336cabe21d086ed73030757776d94de13e3be8a64b1002dfcf3af61501f6a08eb6e903b79888df0e9b96c9908 WHIRLPOOL a980ec648242f82885f84fe576b1d370fa086d3d6d7e414691ce08e9d9190bb5dc970ee615a843bb9b6a09e6379fdf1af0dc95d31402ef72606eee2070935053
 MISC ChangeLog 11392 SHA256 39a831c8202ef166f0d803392aaf33a5a6601418ca79f8ecaa6c83b68d9502a7 SHA512 0ddcfde062ed95e4a63eab563ea82e8d3056ecae7a6846932cebc632678ecd67471642f4855034eeeff1576309d7980f0b29a5ef7258b403803e39cf581d0ec5 WHIRLPOOL c35c02a9ec841f374ee9ab380945c7a9fb3368a9383191e20e0ec790b16a68d704641be1c5793a25fcd6a91803ea6039ce34d194851fa8ce8238832d2d8375c6
 MISC ChangeLog-2015 14832 SHA256 8c74c97192cc9a77e2b2b78a095c8dc32cf08bf6237e2258d5cd130ed763d2fa SHA512 f48a6130827e7069f75f02aaf80121b8c0b7610dfff47b23e99e373222dd6cfcd45281efa5ec7e9a216af5d6119b261585a3071d21d3cb0156acfaf240017d20 WHIRLPOOL ddc5ae2510ec21d4ab0e197a6bfef8d84f803312bcb8a95df409f8bbbd3cc2e8f7f004bbe54419c2841386ae67fe5651645cb326f590f95c7cd34d04d1beab78
 MISC metadata.xml 743 SHA256 d3a8894bd17fccb6162d8d164bae71ca97c90f60ff1ecc64cc414d1daf7d15c0 SHA512 31515728907e1fdc96fe6a27f62585c528370a544a306b4a3a26cf86d8a248211e3852e4a532d9a59be0e534393e6f11bd46df39b439084eb1234d7a6bea4d42 WHIRLPOOL 92faa7971ee6177414168ce1c8a12c9af87653e30f51b98d2d0a16e63f7d35fbb3467a83547f0c59a7f3665aee9ed915a806539b4b0501babb3e8de210b28207
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.144.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.152-r1.ebuild
index 0829cfb55ff3..cdc8dfd0e2db 100644
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.144.ebuild
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.152-r1.ebuild
@@ -5,9 +5,8 @@ EAPI=6
 
 inherit eutils java-vm-2 prefix versionator
 
-# This URIs need updating when bumping!
+# This URI needs to be updated when bumping!
 JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html"
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"
 
 if [[ "$(get_version_component_range 4)" == 0 ]] ; then
 	S_PV="$(get_version_component_range 1-3)"
@@ -21,15 +20,11 @@ MY_PV="$(get_version_component_range 2)${MY_PV_EXT}"
 AT_amd64="jre-${MY_PV}-linux-x64.tar.gz"
 AT_x86="jre-${MY_PV}-linux-i586.tar.gz"
 
-JCE_DIR="UnlimitedJCEPolicyJDK8"
-JCE_FILE="jce_policy-8.zip"
-
 DESCRIPTION="Oracle's Java SE Runtime Environment"
 HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
 SRC_URI="
 	amd64? ( ${AT_amd64} )
-	x86? ( ${AT_x86} )
-	jce? ( ${JCE_FILE} )"
+	x86? ( ${AT_x86} )"
 
 LICENSE="Oracle-BCLA-JavaSE"
 SLOT="1.8"
@@ -78,8 +73,7 @@ RDEPEND="!x64-macos? (
 	!prefix? ( sys-libs/glibc:* )
 	selinux? ( sec-policy/selinux-java )"
 
-DEPEND="app-arch/zip
-	jce? ( app-arch/unzip )"
+DEPEND="app-arch/zip"
 
 S="${WORKDIR}/jre"
 
@@ -91,12 +85,6 @@ pkg_nofetch() {
 	einfo "'${JRE_URI}'"
 	einfo "and move it to '${DISTDIR}'"
 
-	if use jce; then
-		einfo "Also download '${JCE_FILE}' from:"
-		einfo "'${JCE_URI}'"
-		einfo "and move it to '${DISTDIR}'"
-	fi
-
 	einfo
 	einfo "If the above mentioned urls do not point to the correct version anymore,"
 	einfo "please download the files from Oracle's java download archive:"
@@ -116,10 +104,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	if use jce ; then
-		mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die
-	fi
-
 	default
 
 	# Remove the hook that calls Oracle's evil usage tracker. Not just
@@ -170,17 +154,8 @@ src_install() {
 	dodir "${dest}"
 	cp -pPR	bin lib man "${ddest}" || die
 
-	if use jce ; then
-		dodir ${dest}/lib/security/strong-jce
-		mv "${ddest}"/lib/security/US_export_policy.jar \
-			"${ddest}"/lib/security/strong-jce || die
-		mv "${ddest}"/lib/security/local_policy.jar \
-			"${ddest}"/lib/security/strong-jce || die
-		dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \
-			"${dest}"/lib/security/US_export_policy.jar
-		dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \
-			"${dest}"/lib/security/local_policy.jar
-	fi
+	ln -s policy/$(usex jce unlimited limited)/{US_export,local}_policy.jar \
+		"${ddest}"/lib/security/ || die
 
 	if use nsplugin ; then
 		local nsplugin_link=${nsplugin##*/}
diff --git a/dev-java/xp/Manifest b/dev-java/xp/Manifest
index 67fdfbc8e189..a70d2915aadd 100644
--- a/dev-java/xp/Manifest
+++ b/dev-java/xp/Manifest
@@ -1,6 +1,7 @@
 AUX xp-0.5-fix-jdk-1.7-enum.patch 1320 SHA256 0175fb1eb3b55b5c445a331a68c92ad326ccc6cf908939a265c4d7e83b0d2eaf SHA512 37f9b6969edb07d8b824aabcf07b182f77cd0cdac1bec2e84133526fe48fc2cc5fc15d050ee16e7ab46def72a9d1fcb627d426049b258d2bf063feed9928ca14 WHIRLPOOL b83f3c750dcf2b7b48f3563312a804ee4c53738d7df2551c8903441184af1eaf7f83343d00af38bbc32eb2c1cb03a683a4523fa08203087983e8b8e61b2ea701
 DIST xp-0.5.zip 281324 SHA256 38b35ca80627afafdaa2140f7df339164abb5fceffe8b5783dadc75a05662a1d SHA512 5bf354967a1135209d5c6b3be979a311aa5c909493dea16a0efd31a1838dda12be4005ac7e919620ed68266a333fdc93a07853ec1e0af0e83b329bd40bda74b6 WHIRLPOOL 677a8a52ed3d656a1924cf54c82b4c0688c5736771b4add8e878c0e8ecd049efcc85e7f15b883004e4b7d469bbfc207585860e1c2ccfcaa6c4e2fc81cf05d6a5
 EBUILD xp-0.5-r3.ebuild 591 SHA256 5dfe9e406ea8c1247a5ad5e6a451e4e3fe65a13b9a6185c1f1093d958a1ce609 SHA512 f144d37b576906b7533037b0b0226387319128119cc647cdf7aab06f386c6ad2e435bee0bf917bd16958ed36d2644913ebfd6e8be7f92df74359bed96385eedc WHIRLPOOL 20cfe9456f802e2d2d491f2cd70216198bbd2bc467a7420410563769cc6f0e4610744f395464d4db0cc12e4f2cf6ef7352eb4b0a19736896aaf1d138bd22dc31
+EBUILD xp-0.5-r4.ebuild 538 SHA256 1407bbdbe34dec64d1445e7581fd4f9d531cb34d54650c2c0ceccb86c248ef7c SHA512 65e1ee63ecbd0379baad23f7b66fc5b3fef178cb544b7d7ce5d9cda5cd4418f01105f50625e7cdc9a6ad10e790c577e7339e87cae48bff549ce43fe2f7624185 WHIRLPOOL 79c31b3ea36746fb55fb4584d0b823d3b06f03b89623284df391d8d4946758386fffd5417952e9bf0ea35b43fc79877ca90ccdd0fc395b4fe04b0b74db7c480e
 MISC ChangeLog 3119 SHA256 5e63fc915dae4a9f020bb2631bdfae8ed1d47386bb3521d56e3ff67e7d323c69 SHA512 525bb8ecb0080ad084424a681bfa87a5c64a0539fba23ac650ab53313b71b353f0d2cffe031c47719f09ab09249a4441065b0c32b88a291372d51fee95df7d59 WHIRLPOOL 4553dd5e54f16d5bc89bb99672fb7ab3444e6d7de29411e24ed0068d528be6a2bc27d55954969c687c8bcc92ada84d711b08c587572abc4fb1ffdbb1333a5356
 MISC ChangeLog-2015 2102 SHA256 85c1e98c95f9466a989272bdee1d2f2b7c7a367531fbfbc114e48c75e57c37c7 SHA512 a808bfa29ccf76ba6549f8539ac98740b4b8675da0b9b51efa620d8f893966517f39abc6e8d5bda4fa5a1ec60652124e8c450a30f58076642b805bfe989c6ab5 WHIRLPOOL d8be9ca099b5c1c595bb9383c2e75844251cbc6fadb03c150c867c256fd8ee0b37522d52c1c62ce6a6a7d29758b4301f0214f6c24db0fb7bcf98bec55d2eeb14
 MISC metadata.xml 236 SHA256 3e778d35b34b5cc1a4dd7ce105fe7d2a99b25fb6dfe24709455da94baa8a0548 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253 WHIRLPOOL 7967660784d0d28e9a3c3c222c5bf85b3a8b59fd84b61780e4e7cc1aa5d8bd87bee40e4c5c42e646f15d6641fe182340bcbe8be94c785f40e0ac870c7a96e5cc
diff --git a/dev-java/xp/xp-0.5-r4.ebuild b/dev-java/xp/xp-0.5-r4.ebuild
new file mode 100644
index 000000000000..0792ca0805bf
--- /dev/null
+++ b/dev-java/xp/xp-0.5-r4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="XP is an XML 1.0 parser written in Java"
+HOMEPAGE="http://www.jclark.com/xml/xp"
+SRC_URI="ftp://ftp.jclark.com/pub/xml/${PN}.zip -> ${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-jdk-1.7-enum.patch"
+)
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
author	V3n3RiX <venerix@redcorelinux.org>	2017-10-29 11:22:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-10-29 11:22:34 +0000
commit	bd7908c6630f38067350d396ac5d18c3cc2434a0 (patch)
tree	3559b3e11424f5529527f2474d8a977a91ee3389 /dev-java
parent	8b2628ad8526c806375e7b157889e4274b70248b (diff)