gentoo resync : 18.11.2019

9 files changed, 17 insertions, 92 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index cbf0ec215b65..9894e2e9e6ad 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-contrib/Manifest b/dev-java/ant-contrib/Manifest
index 626571c9b5a2..ac63dbfdf63c 100644
--- a/dev-java/ant-contrib/Manifest
+++ b/dev-java/ant-contrib/Manifest
@@ -1,6 +1,4 @@
 AUX tests-visibility.patch 755 BLAKE2B 57a0815dc7881b5e5b1ebccf20a139624bc237aa67553634f9a2f91d45065694c655c8a63fc78c64c27e389f31c5a9356cafed8864aa56f720d648eff72a005f SHA512 a848c5573ffc9e02b77dd63c74d4314be5c35e47da7646d048d7e28a098290bc50d30287928ef3e06d8dcbba758b7ec1e87118ebac29bf72b04021f20e8c371d
-DIST ant-contrib-1.0b2-src.tar.bz2 118216 BLAKE2B 518e7bd19280ea035be155a5b8c5f1f5e228a7b24ebe1291c859c2216a57ce673c41f4d8975e73d9a4d07d54fbef404604dd22cc52adfe49820445c05c79e471 SHA512 5245ed1458c9c4892ab8196a8acdf8678aab0d45fc58fcd8ca446e3589f378a9a02de8e608abb75d24fa190cdcbe209454a703eec8d4e563b7690d6d58ea9af8
 DIST ant-contrib-1.0b3-src.tar.bz2 3298187 BLAKE2B 0572d583a770c239880fb7e8e4a1e91331dfe80a52d7cf83a90d108f1e717caa26699dce43b72fb1944a74c8c738ad659f60864e2e8e945c8e91569d80c1214b SHA512 8147ed51612eed9d41515c00ef2bb7210ebd50dba8b471abfadf8a56c67b53c030602ce9e49e9070d72d383de61f290e941a76c282e223330fee606f3633b0a8
-EBUILD ant-contrib-1.0_beta2-r2.ebuild 1455 BLAKE2B e26b5bb6352d9958e95aa914ba564a7b5e671d4c46ee3042476f268000c244ea4132e2f5805ae6b5d6239838fbf89cda662b3097e51c67b54119e8c12181e12f SHA512 60de0610acc54616f3f4763b0d243c3b07c63827ca70e94c5f95bea2e797eb61e7a5b4f937f87a7176ffbb478804c19743d27ebca91378f7c45fd5c96e81518a
 EBUILD ant-contrib-1.0_beta3-r2.ebuild 1825 BLAKE2B b539c4fc5b1b53cf69de7b251191d1c354cf0945eef305ecb367252aa9418c1609ce796602acf952e924a8735ad19c497aafccadab30cefbf21f9b4149669b90 SHA512 8ea1e499c12976ee023e36434690a993d04344839a94e8ab92030a39c32e4cf759c402c0dd3c179b175baf8d8169b436bc373926914a2cbd3057b4e6643bedd4
 MISC metadata.xml 317 BLAKE2B 7a5bf5450578fb6d057233a53ba7f3e7fa6c3f969f7fa0eba8c22ac17b4efa19b270a765043d61635780b0da1f22e8a0d0304f0c15d468f72fafee1341b8131d SHA512 4f45c942983f0ebb77130dc40a6407ec9781bb2657ac24bdebeddcb21135b7f0b39b560015ce5c7b0df3302c1c6d2e5783cf86d73aa372b9e24c8d1df28249c8
diff --git a/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild b/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
deleted file mode 100644
index 8b10e01db511..000000000000
--- a/dev-java/ant-contrib/ant-contrib-1.0_beta2-r2.ebuild
+++ /dev/null
@@ -1,62 +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="A collection of tasks for Apache Ant"
-HOMEPAGE="http://ant-contrib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ant-contrib/${PN}-${PV/_beta/b}-src.tar.bz2"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-
-#	test? ( dev-java/ant-junit dev-java/ant-testutil )
-RDEPEND=">=virtual/jre-1.4
-	>=dev-java/bcel-5.1
-	>=dev-java/xerces-2.7
-	>=dev-java/ant-core-1.7.0"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/tests-visibility.patch"
-	cd "${S}/lib"
-	java-pkg_jar-from ant-core ant.jar
-	java-pkg_jar-from bcel bcel.jar bcel-5.1.jar
-	java-pkg_jar-from xerces-2
-}
-
-EANT_EXTRA_ARGS="-Dversion=${PV} -Ddep.available=true"
-EANT_DOC_TARGET="docs"
-
-# The tests fail to find bcel and fail
-RESTRICT="test"
-
-src_test() {
-	cd test/lib || die
-	java-pkg_jar-from junit junit.jar junit-3.8.1.jar
-	java-pkg_jar-from ant-testutil
-	cd "${S}"
-	local testutil=$(java-pkg_getjars ant-testutil)
-	EANT_TEST_EXTRA_ARGS="-Dtestutil.jar.location=${testutil}" \
-		java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar build/lib/${PN}.jar
-
-	java-pkg_register-ant-task
-	dodoc README.txt || die
-	use doc && java-pkg_dojavadoc build/docs/api
-	use source && java-pkg_dosrc src/net
-	java-pkg_dohtml -r manual
-}
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 3e6ae5f59ab8..152fc53fa0c8 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -15,6 +15,6 @@ DIST OpenJDK8U-jdk_x64_linux_hotspot_8u222b10.tar.gz 104480114 BLAKE2B 83f85b07c
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u232b09.tar.gz 104521598 BLAKE2B 10ec4e5312fdcf1bfbcc85e899795fe0d962b816ba3cd8d229f97f7a273fe2e09666c69c55dda391ec6d44b1ba88810c204a357aefe91328af761f9cc019cd02 SHA512 989e69c8de49048fabc1ba3c91ad7e95329149293f58af545c23a444da974bc6d4157b21facb1298d9a5cac9b552250812c6c71b6652bee93cae7edc1e72ce5a
 EBUILD openjdk-bin-11.0.4_p11.ebuild 3137 BLAKE2B 0718bcbcd50aedd6c446970a9ed652a0ea485949c505129fca1bf9c95ae2df1031000c8e21e736ec178e8acf0c056a29fc0c02283cc47e3cb20c3abe6d4d5a86 SHA512 c59cebe94522c7787487ff5e00d7abcbdd91b9332a161135fcb1d4695a6251ab84cc5b6cd10e5b98377056635bc326a08cafbd05d50949057aa6a8062196cc1e
 EBUILD openjdk-bin-11.0.5_p10.ebuild 3104 BLAKE2B 4afa1206018e23a98cd85f09e90d99c960c6c2cf4fbd65c2c649e46805a1b8b514767cc21abb952932f36debe53a836985f0c2aee0ae9a3f2e3769ce2d26a235 SHA512 341f180a84fc144d18900d87a5c93125f9fbdc80628b0d664a977c820351befce0b1e238e9e93aa035ab664fc63ab37f0f8bc6cef5a8f6ab0bc4e8fe16a6428f
-EBUILD openjdk-bin-8.222_p10-r1.ebuild 2784 BLAKE2B 18478667b7f7c4eddc738a66b0adfd96ae06f2c81d7fa8b9a6527dd9524550d10a5b1565d4a48c6ed1b0a33d86eeedcc2c315edceac7b22c621b802929cae107 SHA512 195842c19cf7b69b04214292eeaecdec2c5ba354740720d5c52e4a5064d31fec03b685b64c2570f0634a49c56b7aeec623583054c1979db794ac3ebf28461136
+EBUILD openjdk-bin-8.222_p10-r1.ebuild 2783 BLAKE2B 9717804b28b0f88ed97e55284435a45919c7487a8d197cb4510ad97a4160e9eb24a33f18480f49730266130a5e396cfcca016f9fd74b0bfac00fe53a25774968 SHA512 5bc1176227ce4afdba80aee89a255f8de6661bec848473494bccc3d5dcede212466401a08ef51656c2de18864fe6590b9592b4d92d507f46a2403c134d2574f5
 EBUILD openjdk-bin-8.232_p09.ebuild 2731 BLAKE2B d4fd186733a850c593d70c6da8f090b18be7fd03deb5cfc1d0491418c3ebbfd1284c430ec1957fef75db1e2805e562ef22769fff47ad1a3f962692e023b34238 SHA512 93bec68d819ec37b976e56cb221d01191441f742109236272b490f460e1ff63068e674f7ab34d1d3f056a83569026ef18a887a975c91a5a1535dd39886b8656e
 MISC metadata.xml 1025 BLAKE2B d7678bc38651044e8551f51b82f628f6c682cd15305fbe4bc9a9fa9b8f66417e526da18d46ff092d1b82a13a83465d060ef6ffbcfa562ba82bfe6fb9e59de60e SHA512 809731d43dcecd74f45e328780e35ba70b4ae384aea3a28c796a84c6ce2ad8bfc7cf0a6920f150cb4096f61147e9d5326128aeddcc14836752694cf5cdd6e7e0
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild
index 7dbd4cdd6a80..b9f011ddd95d 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 "
 
 LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm arm64 ~ppc64"
 
 IUSE="alsa cups examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
 
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 66feda9447f4..c2c62e152d15 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -32,6 +32,6 @@ EBUILD openjdk-11.0.3_p7-r4.ebuild 7412 BLAKE2B ae6891fa80816a734f9f9d85c2345109
 EBUILD openjdk-11.0.4_p11.ebuild 7533 BLAKE2B 5ae76dae294c63c4286cc92c912f86e69fcb087904354408c782ee284c8bd56d4a919edac3c98cf89d10f4d2696c467352648dd5fb578c9c83af37ee318aa2b4 SHA512 f63f91e0c8310890e6616a281d12e2077ad73b35e3d055bc0d63d4c02ea7412a83dbf75c6a7e24e1a6e82919d2207fe6132dd77560500bf6eb5d18628188c36c
 EBUILD openjdk-11.0.5_p10.ebuild 7533 BLAKE2B 5ae76dae294c63c4286cc92c912f86e69fcb087904354408c782ee284c8bd56d4a919edac3c98cf89d10f4d2696c467352648dd5fb578c9c83af37ee318aa2b4 SHA512 f63f91e0c8310890e6616a281d12e2077ad73b35e3d055bc0d63d4c02ea7412a83dbf75c6a7e24e1a6e82919d2207fe6132dd77560500bf6eb5d18628188c36c
 EBUILD openjdk-8.212_p03-r3.ebuild 7338 BLAKE2B 2f1234bc40edaca88f1519a827ce29824b97e2b8ed3cfe366ff5fb7bab342f9ba5eb9f134edc6853de10e9c962e2957436b323720cbd5b455621de4951ae3d8d SHA512 891fa8038fd6ee9990d71817022c1659cb15a98ca738bd89b54977708fcdba96c2d28572414d4e81f36baa6f7342eae0097360ef77eb06debe0b6d0663ada6cc
-EBUILD openjdk-8.222_p10.ebuild 7422 BLAKE2B 7edbfa6f43cf503af54561efa65b026395d1f4407eaa6cc6db41f91fa44e034e154017f6a97334e98c52282ef45230ad8e9438d23d9c3033bef9b78301946ecb SHA512 b361965f81d51626466d47bbdaa3068e0bf14890602ab94ad201b0e1efcdc519ac1a236f00f172e7124fd642cd36482142e9b3f805b14b1a85b33f9e21c8c48d
+EBUILD openjdk-8.222_p10.ebuild 7428 BLAKE2B 9a3b18f0466f7cd99e9e1b9c5d6d5755d2d72d087d4ef8df5c099bae720844632433bc7c2c2c15bc60542b9014e15263366ead0647f6ea08397db86e8df80f21 SHA512 18ff0ab7f26c7be76bd4eb90982103f43da502a067c010c2f808ce51cf432ca30f6be23ade53504347fddffa23d1af9d5e6853d631854d770cc79b0e9f5b22d7
 EBUILD openjdk-8.232_p09.ebuild 7423 BLAKE2B 441c46eab29c687dfd8f3208404e1881cee5b3e6d8693fc9a1b8a9e9d69fd42cc76a020a9208fdcc6773e79db01382687b5ced207d62e832db594e7993c2a3d8 SHA512 ea10d96953b398b5c73a967d22874392f6e733edfccb6e1f1a7ba2afc492fd76c0fe65eb2aac828f3f0c71376b48693510fb443f286d219eddd32af8f68efd29
 MISC metadata.xml 1398 BLAKE2B 7b99e080f6dc261c94314c7f7a0314ee25b48752ca494dd23d1534c5e8e3f930601262a0316ed674786c5fd960dfbc25dd6c6768cd06325ef45c0b41f920eafc SHA512 1747f484c6f784cb551f0969aab9ca1e6c42509c06b6187b72f3e16861ce3e2e71e131deb1ae6ebe2eda1c768276794cd5a0db7918eb419b9502a3c45bf78959
diff --git a/dev-java/openjdk/openjdk-8.222_p10.ebuild b/dev-java/openjdk/openjdk-8.222_p10.ebuild
index 263ac8f7d306..5a7d7cdfbf48 100644
--- a/dev-java/openjdk/openjdk-8.222_p10.ebuild
+++ b/dev-java/openjdk/openjdk-8.222_p10.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 IUSE="alsa debug cups doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source +webstart"
 
 COMMON_DEPEND="
diff --git a/dev-java/resin-servlet-api/Manifest b/dev-java/resin-servlet-api/Manifest
index b4b46f3a1e77..1f6705bb8574 100644
--- a/dev-java/resin-servlet-api/Manifest
+++ b/dev-java/resin-servlet-api/Manifest
@@ -2,7 +2,7 @@ DIST resin-3.0.25-src.zip 10690692 BLAKE2B dde17819f958053bfe2e1ac0068db0a56c068
 DIST resin-4.0.27-src.zip 17990178 BLAKE2B 2da8c4bae7328f0a39fc7cc84c2d7a25408a8242150a9b324cc34a15e0342ed709b9e1db8773873d804d59b47f0c62945433d211fe06ded03db1aad39c46a6d6 SHA512 ce1d7eb19ab722c2942d82b6ce80ddd193907d6062df361501d28adbbe57e6b7a2effc734e7820bc73d7743b2546799bc6badbcc2187c7da75cab0b9294b8a53
 DIST resin-4.0.46-src.zip 40400255 BLAKE2B e31505ba82a8e87ea0b28634b3055c3a01d6629483c2d5ab6af4b428c9cb5d7803b7ed7de58181222bae669412c239458c43be35f23922f3414ce7ac0173ee56 SHA512 49f468706a3269f851a6b359d6020b01dadb312890c97208b1a66353fb82b2d95625947a472d8d3e535d0c52ec6ad3e110eb4d227014fe7a89f313ae1df6970f
 DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 BLAKE2B df087e05a80442c44969ccd20099ad5ff5d1e6ab92886255cfa262bcce73043f07b01109e84e224dd991c43730d6c0795bf63bde3b8aaa5fa6dbf749dfbb78f5 SHA512 23ce290e97f18248e08e0b3b7ccf37f60a4b0bf2c3aa28d856384295a286b3eeb9636e299e0620c2c858f8e523806707fe1d4531070ee7ffb4037ad483e6d035
-EBUILD resin-servlet-api-3.0.25.ebuild 873 BLAKE2B 463298c316c9b75b6d293d363aa7157d582f3569dd5d035dcfdf15c63421dbc92658c09b818a95f629c6d87f5b0d2a711287827b79221a953dc7912fe89d6c7e SHA512 0d77c497b00e905a8cba5733e74bb717e1052136f094cf9b1ec6838a4f59fcf79f2880b0443ec34795d08a77a49b3b81cd602b3503457b3211761a2027bcdeb4
+EBUILD resin-servlet-api-3.0.25.ebuild 801 BLAKE2B 0eabeabd467f5c5d52583b8c386566e74276e49d45618932943eb2dddbffb2013c65bc1c8b49aaea9886de721d153c2b388ce8d49c7ea550f2909cecb5bddaa0 SHA512 b81768a2a58de1a31950862cf64e995391dff3da48b75bd66b29b2db470239e0d5535ed5e72510d544acb7e6121e44b6fcd4aa12b41e96a0b35564547215fa0d
 EBUILD resin-servlet-api-4.0.27.ebuild 1127 BLAKE2B ef2e0779a6ba6ec6bc211fdbffb138aa6dc2442b8c556120e3d3b73abe79942851c3ddc19b560e26037ac04c4e900aaf0e6ea25147237586b7fc14a8260730b1 SHA512 c76c4f45a84e7b1806bdd2b0348e7251e84f4e571ad4c3651a42c5a49672257939a7e9e4a70230d63be6c240d1a4b79d291da5fa7bd94743cbb07332294083db
 EBUILD resin-servlet-api-4.0.46.ebuild 1130 BLAKE2B 2f6725b53f1474c6c02150b70c30f89087ded68f61f0510217203c2a8ecb5327ca5b2886e793163084d9e4839cc8cb7319912520d45b819ec0af0e2407ed68db SHA512 2dd96a756b7433887aa4f9b521c4e385a1dc1e5c887acd73525a42df41e28807ef1070e233f40081eb2d0cac9d0820a145bd95923344e549aaad8503f18e9f9c
 MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild
index e2a5a17df679..9f6176116360 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild
@@ -1,50 +1,39 @@
-# 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="source"
 
-inherit eutils java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="Resin Servlet API 2.4/JSP API 2.0 implementation"
 HOMEPAGE="http://www.caucho.com/"
 SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip
 	mirror://gentoo/resin-gentoo-patches-${PV}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="2.4"
 KEYWORDS="amd64 ppc64 x86"
-
 IUSE=""
 
-COMMON_DEP=""
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.4:*"
 DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${COMMON_DEP}"
+	app-arch/unzip"
 
 S="${WORKDIR}/resin-${PV}"
 
-src_unpack() {
-
-	unpack ${A}
-
-	mkdir "${S}/lib"
+EANT_BUILD_TARGET="jsdk"
+EANT_DOC_TARGET=""
 
-	cd "${S}"
-	epatch "${WORKDIR}/${PV}/resin-${PV}-build.xml.patch"
+src_prepare() {
+	default
 
+	mkdir lib || die
+	eapply "${WORKDIR}/${PV}/resin-${PV}-build.xml.patch"
 }
 
-EANT_BUILD_TARGET="jsdk"
-EANT_DOC_TARGET=""
-
 src_install() {
-
 	java-pkg_newjar "lib/jsdk-24.jar"
 	use source && java-pkg_dosrc "${S}"/modules/jsdk/src/*
-
 }