gentoo resync : 10.11.2019

17 files changed, 93 insertions, 171 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index ada24f86fbb6..cbf0ec215b65 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/avalon-framework/Manifest b/dev-java/avalon-framework/Manifest
index eecb5b863034..77d271aa7885 100644
--- a/dev-java/avalon-framework/Manifest
+++ b/dev-java/avalon-framework/Manifest
@@ -1,8 +1,6 @@
 AUX build.xml 1838 BLAKE2B aa6ad2f58ef4bc96837c5f616376e2bc6dca2b338d0bdbff575b4ba0e45381e18d96c3266769fa23af60888d1baeb86e9456abb091f08cf92a54389e579a05d4 SHA512 a6dafeac52a7e7421c6e97972407b7b5424a8e35bae66153c52b92419c038d0cf31a049619b843ece7f26bcb1fbd675ea36475857609820ab6c66d03d4f8da2b
 DIST avalon-framework-4.1.5.src.tar.gz 99475 BLAKE2B c57c89661042137dd0f5b8d6fe4295030a861499b300d84a8c2dc6364d6bdca443cda96e954816da0351fda3d3ce70d47734656949bffba8d823f7e1c9f4ead9 SHA512 7a15dc2f7c691d7daaa5cbb589eb21e23ef8d6232b5bd1b6b3bb1d6962f4a4dd2dff0c0a1793309d7e8f3aaf4e75de65a9705431e1103c2e33c575770131471b
 DIST avalon-framework-4.2.0-src.tar.gz 68887 BLAKE2B da71631548bf725315c57439c5db017107d4dac529fbfdd59f68da6b97faa8b9a78fc5d89b05ccd05c7ec68b2de05d286ece6654137278b3e8873c78c65adf6c SHA512 b53dc20ecec058ef0b35a626bea6e04f85f6ae8b3645d7dc5c33c194db49b42071093cd305ef718f925b948ec1b885b2a0d8bec534592f97dc48d6e93db45671
-EBUILD avalon-framework-4.1.5-r1.ebuild 938 BLAKE2B 8a90f236e04c7426b8355a2be582ad63cdae1f51aca3ccae040a8516f36c0d15f1ad31836640b0e34890737ddd0845ce46e4008f240120ffb5f407fca794eed0 SHA512 0fc9453981fc142476db62e1870a3cf9a307a101cd591456226d8a2e590df78c6eb3f5ca1250b2180fb5b997b9c220331be6db4e7bffbcc660c3ab21f23c3c3e
-EBUILD avalon-framework-4.1.5-r2.ebuild 914 BLAKE2B 26937446350fe6414acbf0b1be55fee5bfb39735d47df274a2fa08a1f93f983f3ceff905a0644c59c0bd2a791df3644a36cea8163b2d650dbd18e85446cdabdf SHA512 bd0da169742a646e2f1394c7fc44fb9a94cc0074d90343666e078b8a467dffa57873638649bbadfae18b89383247da8e725af6adb9e507ecfc6a68d1d0e728bf
-EBUILD avalon-framework-4.2.0-r1.ebuild 1028 BLAKE2B e50a838974b65e28852713104412f87871a2faae183dc1bcee5711f56a63c460052e9c28d4cd4fb52333fd43bcbb16229726638c307ac1a99bc4f2ad92e231b7 SHA512 3816f82e7a60b4deaf313b0f6258a5af0815e2f2852e7ec62c06d85b1fabb54a82745202545150b755dc693996bca04595c5bab7b4fc4084a3dd409cbbacf576
-EBUILD avalon-framework-4.2.0-r2.ebuild 1000 BLAKE2B 8fe088a40db9d861defc7711a701dcdd82340b7808c9dbac59d0a11f06d5c2081b934cc475e6d19f4b4c5d19ab3b23692916750111d024aa6f6edd87a4735f53 SHA512 efbcddb1ef8ac8ac21efb7a096d9921c423f6a69fdd6a18af1742ae063dcf83f8031cb84928b9a958e1b981cd268c4150ddbc75cb67d66ab19978c38b4465452
+EBUILD avalon-framework-4.1.5-r2.ebuild 912 BLAKE2B 21826ee57ae0b7416c9f788023df6ddef04179b7f57fb92c6cdc95996e44c89f2c8a3a5e0b447c41484aba6aa512369a652dd73987911165425de90bba6516a5 SHA512 f9bf863f6bddf52aed8b471916c6e4ea97dd6140820081235011ffeebe1331c337deb11762f1f1b0457490296827532dcd173ab352da732c311ff02ef795b992
+EBUILD avalon-framework-4.2.0-r2.ebuild 998 BLAKE2B 4ec6b85a20b7364367715cc157a2f1850729cdfd31c75aabece68039e1a8680b02a445ccc1f728595e4ed1e38c319d40f52c903e3d45fb84a2653bb33c2ddb89 SHA512 3952ee84211430b442e245ba912c46e9fd9f78b5236b2a0a51cea9df0f7d0fe05f0bc38ebf3388cc2ca84db7f6e9d58bb466664e09b67fa61445ede78541c69b
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild b/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild
deleted file mode 100644
index 437f5b34706d..000000000000
--- a/dev-java/avalon-framework/avalon-framework-4.1.5-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Avalon Framework"
-HOMEPAGE="http://avalon.apache.org/"
-SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}.src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4.1"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-COMMON_DEP="
-	=dev-java/avalon-logkit-2*
-	>=dev-java/log4j-1.2.9"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	cp "${FILESDIR}"/build.xml ./build.xml || die "ANT update failure!"
-	local libs="log4j,avalon-logkit-2.0"
-	echo "classpath=$(java-pkg_getjars ${libs})" > build.properties
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/dist/avalon-framework.jar
-
-	use doc && java-pkg_dojavadoc "${S}"/target/docs
-	use source && java-pkg_dosrc impl/src/java/*
-}
diff --git a/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild b/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild
index 7e5dfc7ae7a9..55985d937eb6 100644
--- a/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.1.5-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}.src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.1"
-KEYWORDS="~amd64 ~ppc64 x86 ~amd64-linux"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux"
 IUSE=""
 
 CDEPEND="dev-java/avalon-logkit:2.0
diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild
deleted file mode 100644
index 3e4cd5c81682..000000000000
--- a/dev-java/avalon-framework/avalon-framework-4.2.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Avalon Framework"
-HOMEPAGE="http://avalon.apache.org/"
-SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="4.2"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-COMMON_DEP="=dev-java/avalon-logkit-2*
-	>=dev-java/log4j-1.2.9"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	cp "${FILESDIR}/build.xml" ./build.xml || die "ANT update failure!"
-	local libs="log4j,avalon-logkit-2.0"
-	echo "classpath=$(java-pkg_getjars ${libs})" > build.properties
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/dist/avalon-framework.jar
-
-	dodoc NOTICE.TXT || die
-	use doc && java-pkg_dojavadoc target/docs
-	use source && java-pkg_dosrc impl/src/java/*
-}
diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
index a401ed26401c..ba8118af4f5f 100644
--- a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/avalon/avalon-framework/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="4.2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 CDEPEND="dev-java/avalon-logkit:2.0
diff --git a/dev-java/picocontainer/Manifest b/dev-java/picocontainer/Manifest
index 16e97175829c..5e30b24ca6dc 100644
--- a/dev-java/picocontainer/Manifest
+++ b/dev-java/picocontainer/Manifest
@@ -1,3 +1,3 @@
 DIST picocontainer-1.1-src.tar.gz 83564 BLAKE2B 193d042400e4509e82c8dd521fc4ee8a246f0b8111cd875810260d510bef08970ac632f3e81c370290e6074dcc75348af7db71abc9047e49b323910d03e932f4 SHA512 adee3e5f46cc8f9a57db1c3e08b4730430daf92c090413ce061576c272b0a1a8bad94281a7a0bd4bdfa8fec8ca051bd15560d0a0fb0ca65cee39ea5ff1b15777
-EBUILD picocontainer-1.1-r1.ebuild 1226 BLAKE2B cb70328dc89644a88856df59f1026df5e4094e8fa8b3858e97fa242c5d6a1ceca87959a8d300c6014d40ee05056b6f48702e9255b3b8540bc0bef52ec6d3dded SHA512 796faf47ab39e427be485acb6e8a38f079ede29cf29de36f5c43e43674688400f4f8e94c922b01d5bda542a1329d6f6230a8cb15ecb5d3fb123bcc3e5081cd44
+EBUILD picocontainer-1.1-r1.ebuild 1210 BLAKE2B 9381142489327a2f0b3b649197bba21994874fabba059f0778139a3ce2acf4e6417e13f051df4f32737814a83336c6f566d9ad4da9fcc1eff2820d6c324297b8 SHA512 c9e86aeb5700b4aa4f9f47c62c1065c695df206503bc0db082b20100ffe2a18353c3fcf3618df5048b625193027363b18544a572d69401fed40cc97606235fd9
 MISC metadata.xml 628 BLAKE2B 0a6d660b64c4a9bd642e3f990fd715e02037fe67526e0215631f65afdececeaea34486a166e7e5a4b811fa6e7494a90f685a3e27fd5df15c0e2071eff332aa9b SHA512 24a5b116cc43b3dbefa809f4ba45c50b08f5a3f8ad2db6a93fa8618e2f9dee6b1a09163d03b036f3ecad5f7f475748fac05c6ab213d61031942b9a0e24ba3cab
diff --git a/dev-java/picocontainer/picocontainer-1.1-r1.ebuild b/dev-java/picocontainer/picocontainer-1.1-r1.ebuild
index a49d6d45238c..426b18e4aeb6 100644
--- a/dev-java/picocontainer/picocontainer-1.1-r1.ebuild
+++ b/dev-java/picocontainer/picocontainer-1.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit java-pkg-2 java-ant-2
 
@@ -25,9 +25,9 @@ DEPEND=">=virtual/jdk-1.4
 
 RESTRICT="test"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	default
+
 	# Don't run tests automatically
 	sed -i -e 's/compile,test/compile/' build.xml || die
 
diff --git a/dev-java/radeox/Manifest b/dev-java/radeox/Manifest
index 0132f227174d..83f43eab6c6e 100644
--- a/dev-java/radeox/Manifest
+++ b/dev-java/radeox/Manifest
@@ -1,3 +1,3 @@
 DIST radeox-1.0-BETA-2-src.tgz 1720998 BLAKE2B 2142933e8eca18578333c8d144c7cdd79b62c96433c479578e3b9a779de77f9535140f8cb69f399ca868a2dda445099cc60f4df35e7cf26fe3bd72b3acdc6363 SHA512 57e746e2cb3f6a39ab0e7e7171c4c47325712a61235a9622205d5f069cb4f82492ebec8482eb674619c9d58699a501461c863a97119ca674a337af5a331389d2
-EBUILD radeox-1.0_beta2-r1.ebuild 1105 BLAKE2B 8b1093201c55efb86c14e21cf93f0c3026b773149a42e62c422dc418b20e4899ca6a97bb9a44ffa9f331e79c622e134072a07be5db5df0f9492d677f9f5e3179 SHA512 413b63fdc6440aac3e59e2a29746e169061b6e413aa0d941106e3ba0c668e431da17c11ee39db0b700f736d29040cce4d586e236b1832e2c1d65c51498ab9269
+EBUILD radeox-1.0_beta2-r1.ebuild 1079 BLAKE2B 844be5ee20d3a714ed198d5a156faf6056ecca81db87fe444874f07b70618068c4d8b868f7e2f8dd26c5e4c8914aeaa9683d412a86f194a4c1d8bcaf1da1658a SHA512 461a9afa749f5bad179928ba176a78b036dd47968e099c8def9bb4eb482a4b7c3ffece83b9765334eb77d2a4cbfbccf27b017b4b3b9fa5f47254309f600a2387
 MISC metadata.xml 655 BLAKE2B 4a37407e7b85b3053cbd8287272c070f53c3be44c760c172cde49e85131d23bcc8fb7defbd7f8b3a1db83a0b6270a6b38be67e2996bc452cf1076114c3d830b6 SHA512 71964076f4e7cda88973c4f51c28f40df3400be100b322da00f811b68755ec2a4008bc4fb61dde3babdfa6a06d6c55b0e17addd86ee9f40a695c20ff9a4cfe96
diff --git a/dev-java/radeox/radeox-1.0_beta2-r1.ebuild b/dev-java/radeox/radeox-1.0_beta2-r1.ebuild
index 8b728eddce57..0619bfaeff1e 100644
--- a/dev-java/radeox/radeox-1.0_beta2-r1.ebuild
+++ b/dev-java/radeox/radeox-1.0_beta2-r1.ebuild
@@ -1,49 +1,50 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
+MY_P="${P/_beta/-BETA-}"
 DESCRIPTION="Radeox Wiki render engine"
 HOMEPAGE="http://www.radeox.org"
-MY_PV="${PV/_beta/-BETA-}"
-MY_P="${PN}-${MY_PV}"
 SRC_URI="ftp://snipsnap.org/radeox/${MY_P}-src.tgz"
-LICENSE="LGPL-2.1"
+
+LICENSE="LGPL-2.1+"
 SLOT="1"
 KEYWORDS="amd64 x86"
 IUSE=""
-RDEPEND=">=virtual/jre-1.4
-	=dev-java/commons-logging-1*"
+
+RDEPEND=">=virtual/jre-1.4:*
+	=dev-java/commons-logging-1*:0"
 DEPEND=">=virtual/jdk-1.4
 	${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+EANT_BUILD_TARGET="jar jar-api"
+
+src_prepare() {
+	default
 
 	# TOOD:
 	# these would get bundled to the final jar
 	# we should try to run the tests though
 	rm -rf  src/org/radeox/example/ \
-		src/test/ src/org/radeox/test/
+		src/test/ src/org/radeox/test/ || die
 
 	rm -v lib/*.jar || die
 	rm -v src/org/radeox/filter/*.class || die
 	rm -v src/org/radeox/*/*/*.class || die
-	cd lib
+
+	cd lib || die
 	java-pkg_jar-from commons-logging
 }
 
-EANT_BUILD_TARGET="jar jar-api"
-
 src_install() {
-	dodoc Changes.txt README Radeox.version || die
+	dodoc Changes.txt README Radeox.version
 	use doc && java-pkg_dojavadoc docs/api
 	use source && java-pkg_dosrc src/org
 	java-pkg_dojar lib/{radeox,radeox-api}.jar
diff --git a/dev-java/sun-jai-bin/Manifest b/dev-java/sun-jai-bin/Manifest
index 7c282a28bd9a..f1283bef84e3 100644
--- a/dev-java/sun-jai-bin/Manifest
+++ b/dev-java/sun-jai-bin/Manifest
@@ -1,5 +1,5 @@
 DIST jai-1_1_3-lib-linux-amd64.tar.gz 3510451 BLAKE2B c16dc0e04127bf57df6390dc9d99a1e44040c0fe81ccacc88698493d3fd3483aae12d664a89bc13939655d21ce2d92b64537b073c0d1063bbf91e18129da5eb4 SHA512 5089b696baabdea9622683aa7a3569daf724fd7fa8a4f1c95073b9e96ff5c37fc55a9e3a6fe499abafe61f5f4a109770bd27172ae6711ab7b4da3de55d8b0f56
 DIST jai-1_1_3-lib-linux-i586.tar.gz 3501711 BLAKE2B eec4976124a9701367e7b61c652ed619df69fa12eb02c5288d9d1ba4845ca7e2315514fba1f75f15c8bbb90cba981972961e8d1e843a8a8ac2b000e5e4917975 SHA512 bd142eea557b68d10d26a18b6b0d04e5cb42212e98268035b1b3615d6489bbc4fa07ad141fd04fc5ae3c74f1703c9ade77130cbf8a61603b4b271e3a0e06e860
-EBUILD sun-jai-bin-1.1.3-r1.ebuild 1099 BLAKE2B e676b1f401b9d4c16a604fd56db30d94cb30d1511e8ac1d57f68429828523809e8e93d24b9e78469133c02c07886ac57a6a8e89fbf304891a7a44acca0c33c33 SHA512 ece3afc3dd782f133a85bb5b3578034878464290f08b0c6361cfe62ba53b6a3c78cf1e77e536e4c34e6ace9620c257441c5ca5fcef6a82662bc5ca8378ff9938
-EBUILD sun-jai-bin-1.1.3.ebuild 968 BLAKE2B 932fd60c60f522e0e0f1942ee5dbc759ec26b05f66c8486c9410898d2f46fcd14d34080f5bc6de27153a61c682a8aadf6395c38254801757544bcad8f59f54df SHA512 863bfcb88aa6dc625d44d79b12116c584b660b852c36095c10b27aff814ef6a28dfc175f8aa5c7bbf43147056ae275f4eb7a17e403b51898b03221a1a1f85f28
+EBUILD sun-jai-bin-1.1.3-r1.ebuild 1099 BLAKE2B 0257abd4b7fd290f56200786782459183a09c1c55e7cfe8702b85447f8f05b8e80e21a688e26bdb000b5ae28cae43bd9f9ea3b234df2cc5e3723781c6f0c3e34 SHA512 621448fc993b3376701632312d1efc7d8e675b7f3eeaf1ed2391a58b3e0e10e212a8dae9b69f2d52473703ff695e1c0edd5fc416ba9fcf8dd4e98dd2c74e0150
+EBUILD sun-jai-bin-1.1.3.ebuild 972 BLAKE2B 5a01a6d125320dfceef4871770b63dbcc55502f9d9d5ceb59303d1750ce4f8b4616e85379e7b2afea8160f901a279b157cf979491c657978b07ae33d0dfe14e3 SHA512 520e8987eec54ad7e6c379e39a209e3cc9baf3ef5e1e54da7c108f0fd74f65a018fec5081b3f1ca41e17bd6f41cf6761495fb91a09840f043c69bb8c5b362420
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r1.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r1.ebuild
index 50218694eb44..b611b620af97 100644
--- a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r1.ebuild
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit java-pkg-2
 
@@ -18,28 +18,29 @@ SRC_URI="
 LICENSE="sun-bcla-jai"
 SLOT="0"
 KEYWORDS="amd64"
+IUSE=""
+
 DEPEND=""
 RDEPEND=">=virtual/jre-1.3"
-IUSE=""
-RESTRICT="mirror"
+
+RESTRICT="bindist mirror"
 QA_PREBUILT="*"
 
-S=${WORKDIR}/${MY_P}/
+S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	rm "${S}/LICENSE-jai.txt"
+src_prepare() {
+	default
+	rm LICENSE-jai.txt || die
 }
 
 src_compile() { :; }
 
 src_install() {
-	dodoc *.txt || die
+	dodoc *.txt
 
-	cd lib
-	java-pkg_dojar *.jar
-	use x86 && java-pkg_doso *.so
-	use amd64 && java-pkg_doso *.so
+	java-pkg_dojar lib/*.jar
+	use x86 && java-pkg_doso lib/*.so
+	use amd64 && java-pkg_doso lib/*.so
 }
 
 pkg_postinst() {
diff --git a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
index 20d0c2afe551..f244a96c1c95 100644
--- a/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
+++ b/dev-java/sun-jai-bin/sun-jai-bin-1.1.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit java-pkg-2
 
@@ -9,20 +9,23 @@ MY_PV=${PV//./_}
 DESCRIPTION="JAI is a class library for managing images"
 HOMEPAGE="https://jai.dev.java.net/"
 SRC_URI="http://download.java.net/media/jai/builds/release/${MY_PV}/jai-${MY_PV}-lib-linux-i586.tar.gz"
+
 LICENSE="sun-bcla-jai"
 SLOT="0"
 KEYWORDS="amd64 ppc64 x86"
+IUSE=""
+
 DEPEND="app-arch/unzip"
 RDEPEND=">=virtual/jre-1.3"
-IUSE=""
-RESTRICT="mirror"
+
+RESTRICT="bindist mirror"
 QA_PREBUILT="*"
 
-S=${WORKDIR}/jai-${MY_PV}/
+S=${WORKDIR}/jai-${MY_PV}
 
-src_unpack() {
-	unpack ${A}
-	rm "${S}"/LICENSE-jai.txt
+src_prepare() {
+	default
+	rm LICENSE-jai.txt || die
 }
 
 src_compile() { :; }
@@ -30,9 +33,8 @@ src_compile() { :; }
 src_install() {
 	dodoc *.txt
 
-	cd lib
-	java-pkg_dojar *.jar
-	use x86 && java-pkg_doso *.so
+	java-pkg_dojar lib/*.jar
+	use x86 && java-pkg_doso lib/*.so
 }
 
 pkg_postinst() {
diff --git a/dev-java/sun-jms/Manifest b/dev-java/sun-jms/Manifest
index b5decd477f05..f2b8d577f6f5 100644
--- a/dev-java/sun-jms/Manifest
+++ b/dev-java/sun-jms/Manifest
@@ -1,3 +1,3 @@
 DIST jms-1_1-fr-apidocs.zip 361922 BLAKE2B 75342eaeb56ba329948a226f48304e0a520e83f7284d5d8b46b981531b7f8c78283e38b2a488177349aaabb70276fd4ca09bc86993800906aea1469a6549f318 SHA512 ac2c7925b7f5bd3918f0c69a7b18dfa2a15f58243aef7cb429c0571ea218860fc146fd355c905e17310072263f64385b9010eafb1050158f42f498d7f21dfe1d
-EBUILD sun-jms-1.1-r2.ebuild 1340 BLAKE2B 9810cd67decb03abc317a1663ef9a58a1f73a24553ef70d3b86859275e2947469f89e4aa3b4f402624ede326542ee87aff2ab2c0d06b1fac46993bc796c9e2ab SHA512 1b153505d533077344ca88989348f4ddf3257b23ed917379d7d9be68cde6dadd48e876cab14beff4b827d937e77c82b5f9316799da17ea89595ea13e18cf2b17
+EBUILD sun-jms-1.1-r2.ebuild 1341 BLAKE2B c0cdbc4246630d5023af3e90509b27da205013fbb3fb8c81de696d3467dc5d554ef96347e7915632f64b953f0e04c4fdd1d4d630f8c7ce2da71caa8b25afb597 SHA512 6990f55025910b65215a2bd31f5e8bac42c0aeb9c3363d97b03646cb9f97fb8f0413ca8cbe750e2ac66624294e7c2fcfd27c6d15fd6b931428efcf28a0b1f199
 MISC metadata.xml 420 BLAKE2B d00cdddbce707b1fbe67e796c7f62bc4f942c6f4e3c5af1aa3a643846dabded18b41b1e35d4e93cca068d2d0656fd5a88d65abfdc303cf5b6293d8fcd39be61d SHA512 60f2556340ffa7951c69e1bef1a5eda1905a02f3a1e72199c7af02225844c805fa2154ce6629b6d8bafcece22fc3d1c75349021af6932dff3ffaf952fdcb818c
diff --git a/dev-java/sun-jms/sun-jms-1.1-r2.ebuild b/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
index 3a8512d4b2dc..8c1ffebbb3c8 100644
--- a/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
+++ b/dev-java/sun-jms/sun-jms-1.1-r2.ebuild
@@ -1,23 +1,27 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit java-pkg-2
 
 DOWNLOAD_PAGE="http://download.oracle.com/otndocs/jcp/7542-jms-1.1-fr-doc-oth-JSpec/"
 At="jms-${PV/./_}-fr-apidocs.zip"
+
 DESCRIPTION="The Java Message Service (JMS) API"
 HOMEPAGE="http://java.sun.com/products/jms/"
 SRC_URI="${At}"
+
 LICENSE="sun-bcla-jms"
 SLOT=0
 KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc"
+
 RDEPEND=">=virtual/jre-1.3"
 DEPEND="app-arch/unzip
 	>=virtual/jdk-1.3"
-RESTRICT="fetch"
+
+RESTRICT="bindist fetch"
 
 S="${WORKDIR}/${PN//sun-/}${PV}"
 
@@ -33,22 +37,22 @@ pkg_nofetch() {
 	einfo
 }
 
-src_unpack() {
-	unpack ${A}
-	rm -v "${S}"/lib/*.jar
+src_prepare() {
+	default
+	rm -v lib/*.jar || die
 }
 
 src_compile() {
-	mkdir build
-	cd src/share
-	ejavac -nowarn -d "${S}"/build $(find . -name "*.java") || die "failed too build"
+	mkdir build || die
+	cd src/share || die
+	ejavac -nowarn -d "${S}"/build $(find . -name "*.java") || die
 	if use doc ; then
-		mkdir "${S}"/api
-		javadoc -d "${S}"/api -quiet javax.jms
+		mkdir "${S}"/api || die
+		javadoc -d "${S}"/api -quiet javax.jms || die
 	fi
 
-	cd "${S}"
-	jar cf jms.jar -C build . || die "failed too create jar"
+	cd "${S}" || die
+	jar cf jms.jar -C build . || die
 }
 
 src_install() {
diff --git a/dev-java/wsdl4j/Manifest b/dev-java/wsdl4j/Manifest
index 90c326e7251a..b305738746f9 100644
--- a/dev-java/wsdl4j/Manifest
+++ b/dev-java/wsdl4j/Manifest
@@ -1,5 +1,5 @@
 AUX 1.6.2-tests-sandbox.patch 548 BLAKE2B aba74bdc87f3a35b46a80e20968e926f604a2dc13bfd48569f62fc72b7c8e2bbcb5df33af712c19a548a8c9668195cc340be92fa60e21ab36b0ab0c089de1d23 SHA512 bed0bcf00856309d8f628d4a41774a112bd26c651e9fdfa00af3113d780f430e6b50213fe0f743b486aafb78f11cdd924c4dd8eef64300715a8e88c64c11368b
 DIST jwsdltck-bin-1.2.zip 599377 BLAKE2B 0f99dc93a1b22019c572fe55585ee285c72e1dabcecc5cf93fa635b12a39a43686f0ff704a0c9ea25c682a882c4580fd82cf2015a9d4417dd28bc87d0b32a670 SHA512 a8f86d9895c588d752d266413e77c2a8db241e9cf9c199909f2e9d1d1b3b1b03eaa6b5841c62b0e7a7c779089eb6721797fdb4f2db841789a6a19884bd48711b
 DIST wsdl4j-src-1.6.2.zip 172400 BLAKE2B 96fa6a9098993ba20a277004515a4cd29bae84450b86398ceb1dc7835f14f17b39e5daf87d557b4378860c9d24e5928a80bb30b2d953fdc8fcae7d97ae8454f5 SHA512 55d0b8eb6a08cecd4a48223a9f29fe6ed0e00ec4dca99f44a04882efdba448601bb7dadcaa347e32e3ff5bb9e3334503d6666ca2a6276c7bb48b80acea57b751
-EBUILD wsdl4j-1.6.2.ebuild 1379 BLAKE2B 62573ab9c6c4129bc3b56be19193b5bc0f1ee9466b6f0698df63fd3bed3fc6ea71dab0680eebc3cd94054030f86b69bffadfd70243f5da2380b420052d898f30 SHA512 92ef127ddac2d70d6ee02dfec6c9ec80698c639f7a93ed15241bfa29b57fd7cf0d174dd1bbaf8a3e26c09601a9f2cdca931fcf876c1298391b110213742a455d
+EBUILD wsdl4j-1.6.2.ebuild 1372 BLAKE2B 6b51c82b5212dc88f52e26403a726c34cab12c3aad1ecaa544581be15ca41a1ca701c8f1240bebb85837e3d1d9e030e0cec0808d13890013f3a17c35c851e714 SHA512 67e9173dc5bf7191730eac1cf1fdc4dd85365db39ce7bbefeea51062919cf6a1ada646b64ce9e7fa0fb6d64eb2e6c49da62565c48cda905ca4f00f3ab3d00c00
 MISC metadata.xml 314 BLAKE2B 0148774951355ef90d4345572a6a0fecfcc8340b6fd88ed7a18f40b719844e1e9c530b0dfc4917f9b11640871642e4cae06714f7083161136efbe56b2c15caa4 SHA512 2d7d312851cbed77b5a2156bb5d157f8f8fe911ef9c4eb16b645ca4b17892a7d70a02a9d07f8c36fb92a285717c68718e798d37eb140f2391e4ab828a60110fa
diff --git a/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild b/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild
index 0c4ab5f3f3c5..671b3781782a 100644
--- a/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild
+++ b/dev-java/wsdl4j/wsdl4j-1.6.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit versionator java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Web Services Description Language for Java Toolkit (WSDL4J)"
 HOMEPAGE="http://wsdl4j.sourceforge.net"
@@ -19,35 +19,37 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip
 LICENSE="CPL-1.0"
 SLOT="0"
 KEYWORDS="amd64 ~ppc64 x86"
+# tests fail with encoding errors
+RESTRICT="test"
 
 DEPEND=">=virtual/jdk-1.4
-	test? ( =dev-java/junit-3.8* )
+	test? ( dev-java/junit:0 )
 	app-arch/unzip"
 RDEPEND=">=virtual/jre-1.4"
 
-S="${WORKDIR}/${PN}-$(replace_all_version_separators _)"
-TCK_S="${WORKDIR}/${TCK}-$(replace_all_version_separators _ ${TCK_V})"
+S="${WORKDIR}/${P//./_}"
+TCK_S="${WORKDIR}/${TCK}-${TCK_V//./_}"
 
-src_unpack() {
-	unpack ${A}
+EANT_BUILD_TARGET="compile"
+EANT_DOC_TARGET="javadocs"
+
+src_prepare() {
+	default
 	if use test; then
 		rm -v "${TCK_S}"/lib/*.jar || die
-		epatch "${FILESDIR}/1.6.2-tests-sandbox.patch"
+		eapply "${FILESDIR}/1.6.2-tests-sandbox.patch"
 	fi
 }
 
-EANT_BUILD_TARGET="compile"
-EANT_DOC_TARGET="javadocs"
-
 src_test() {
-	ln -s "${TCK_S}" test
-	cd "${TCK_S}"
+	ln -s "${TCK_S}" test || die
+	cd "${TCK_S}" || die
 	java-ant_rewrite-classpath
 	local junit="$(java-pkg_getjars junit)"
 	eant -Dbuild.lib="${S}/test/lib" compile \
 		-Dgentoo.classpath="${S}/build/lib/${PN}.jar:${junit}"
-	cd "${S}"
-	mkdir "${T}/lib"
+	cd "${S}" || die
+	mkdir "${T}/lib" || die
 	ANT_TASKS="ant-junit" eant test -Dtemp.dir="${T}"
 }