gentoo resync : 28.04.2021

7 files changed, 42 insertions, 158 deletions

diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest
index b6c1c04feab3..f7eb90f4bfec 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -1,15 +1,11 @@
 DIST commons-lang-2.0-src.tar.gz 440989 BLAKE2B d71d73504c740138bdb9c1e190e0f4e846fb08a35d8ee2430ac2e24b0094e83cfc8cab9eaa44230c0d7fd26ec768bf7b448f04e123467acc20d49af6efe3008b SHA512 aecbbdd8eb2712981dcd8615bac2ec69e3ea7ae137407287d2a9b3eeaddb48e5367bc9c5cb8d232429ac6091548dac8af67e0593366365c04fcfe39984c3e549
 DIST commons-lang-2.6-src.tar.gz 564032 BLAKE2B 9d72b0426f2146eaa8498a6601edf80dbf45a16ef5ee14cf4ed87130e6d3732d5c713f25f44c10435baa1357f61a271acb88483915968aaf645d1ceaa318c601 SHA512 4a30ed153f93fe6616a28974721bdf005d064203ef8a3dd375d6c1176647c0cdbd29cfde2a580e2c8d26bfa4655be6be7025b8ccae94086dcd816676c5cf8e87
 DIST commons-lang-3.11.tar.gz 1054329 BLAKE2B 7d198e2e7f09f3711909a168cbef405d06aff7482d8ab87059aa11584e82d950ea32f1c1a4d0c9c6c54729396e6b5ee6165a7689b3c38081af31b7a3dad23657 SHA512 ebcb13e47c24e6984835d9d6904fe33077aa3ba781cd61db109fa7005517e4e74cf086c4789a1d65cf3d6c4924b32337c98827a75f91aab908d8e8b9d3b92087
-DIST commons-lang-3.6.tar.gz 852347 BLAKE2B 4a3ad5f557d27e4a109f6e65f9fe8d792b017376227747669bf949725cdc3817a7f14766e121db099e027fc3c322eeb3f68c41786be9a8d500172cfd3c104c7f SHA512 fb627605154c1b3d4561c27ad931bfcac43303ce98ffca8fca538ce6368506cdd2b80de7f22a93ca628e86804923940dd9909bb884c77ca196b654521febc60a
+DIST commons-lang-3.12.0-sources.tar.gz 1072858 BLAKE2B d6b7ee9ef165e60f61d8d0dfaaf38919877f2edc6742cd58b2b70d379e807e75d9dc24e19f23db1b174d1797d6ef0af7700d686dd835d7a40bf2b2a91346e215 SHA512 80d1b960ae0b02859be329ea60d68cef33f3c7be7ec19752b3c9cfef442adef480878317ce2cfa309a27e662e2c72cab22023eaa3702e27970a1e5d55ca43f57
 DIST commons-lang3-3.1-src.tar.gz 638619 BLAKE2B f971afc9bdd3896178bc4be0b6c5d8809f1c1ac0d69ad73ba0d71c185c600ca7a55c3b4877af64b552ccebed9567aa7830f236f2c0d9c38f259870b894c9d745 SHA512 4d201c695a9b908a1809bbab689f80c6aa508b221b4c2786974eada08e647936f5879841c64eed509032ffdd5410735480e7ecb2910295d0f79e857c27019560
-DIST commons-lang3-3.3.2-src.tar.gz 740462 BLAKE2B dbf8fe7f6a4bb0cf462e2281d709e4ecd65e5fa116bb707af14a2b7b248eb1877f872f937fde2e5743bbe9b4775fabd1d0897ebeb8ebe92af235914cac7dbc2f SHA512 be889e0e9d7aaa7d6635e41c17d19dd1e5f9e03fd78eac61fd5f5483321170b9a72007ad0bfa7023e6ff55ae418b40eaa01dae350641c4e88138ac59d4001667
-DIST commons-lang3-3.4-src.tar.gz 771275 BLAKE2B 870f9c5aa18cb68cb88edc28d426df258af69eb6efc3dfe77bab40e2e81bddd4e56b1244a5ad4433f9dd4c0d533dc7b3b10c865fcaaefd9602e1f681bb48538b SHA512 44e93f2d8f7e6a54becaa797ee3348c6125ccdce96d772158f2a1e5ba2a7ecaecf00a6290f2e0fe2fa61db422313709ec6bc836d9296e2f16c5acf6635bb12b5
 EBUILD commons-lang-2.0-r3.ebuild 839 BLAKE2B 0d2d338ce391a152b73127792904096a744f18aa0ab5cf426bf8e48226a13924de745e43c91866db7e7b5a70cf558285654e2fb4efcac352b9faa323bcf65d9f SHA512 c8f1172157f4ecc2c2b44443a4c9fe14d824164869692b6e3d52684d17792f19c125b23bbebf5b5ab67d4a4e2718f629d9d5600ad98663e024040f0246acc41d
-EBUILD commons-lang-2.6-r1.ebuild 827 BLAKE2B 991053bb232631eeafb475a9b9009debdd9061a48b95cf6af5ca13d22fb1b971f9fa0c84e3682af8cc535902ac5a173e36f732b4902024c14e69829e68847b53 SHA512 ee4d564cf8534a349d8a226fb7bdd7223c0fb5270e9ed34ec133861b2e4be5a65dcc07cd56a28fa05e042f9741a8f049e75382e465fd4bcc742f8d52749e934a
+EBUILD commons-lang-2.6-r1.ebuild 869 BLAKE2B 014e28d08de2cd8bd5ca9dd2d5492566f14864a00ac86cf4e262953396a74aef22882704c2c136c23070758bc5d832a0986c478e1fc0f141b9e4f5727841ebc5 SHA512 6575b1287b05a662f34d80bba40fad7b75f357331f4723900c0e2a5c6294a308acccb2664d9ce0dec0bec87fc0c819efb31f667dc242c22cc18ce508bee5388f
 EBUILD commons-lang-3.1.ebuild 825 BLAKE2B 828fefecb0daecd2c0dee1da07be43d676a55e152ff630e967626fa74e6a58abd6918a6e558e8bf6120435c62b64956aa6e9c05fdd0c44917dbe0241ad4a33a4 SHA512 7d2158fabad2919520b3fe56c78c6b6fe584711fbb0a2f21335f785bc82f842ab947078c0c93a7e641918f3c6d8c0152c41e2f2e09d43524aee44afb5900915b
-EBUILD commons-lang-3.11.ebuild 951 BLAKE2B 704e2be7815cff79dfedb91a93f00cdbecf7996345b9dd36d38922a9481ba5a183d3274a2b36086f6e1d4e709725b210f83a513c5af561059294c424e45b0fd4 SHA512 f16c46323d0ce1c24a9e4e3ad1b4898fd47c5cdc7a35f38cd53dffee20a0d813a328147915662b629d7cdfd07733879eac4b406109db540b641bac18acb529e4
-EBUILD commons-lang-3.3.2.ebuild 1100 BLAKE2B 1a62aaf270ae857c17bfd2e1b0523605cc522f0d8c90ca531ef5a1d520a6ce877a41070570a615e59bd0cb18e328703e166a9f7127e82b2a7a5218f591fee69f SHA512 4ff45b980f45fa148d8c96070cf9702c51fa704d2233bc918f957cd811275522a755526bff5f91d5b398ff204419fd089c7b7cda5416406ee635e49e4d8e0687
-EBUILD commons-lang-3.4.ebuild 1098 BLAKE2B 730dc1990a6fbb1b1a5e2adfdcb894cf13204c97c4155a1db010534564aa9e6923c92da1d7ba6e72298c1de5f6d28a46c6ce609f6a7574528a3548c8546cd06a SHA512 7f258175bc790a329ab8ebe5e9723c1b77d07492c78614fd394bda06062bc7d23f56fe7927ff1ae1c31da686efa2aef4fcb0330f2a17c7803445861a6793b984
-EBUILD commons-lang-3.6.ebuild 953 BLAKE2B 133a34d3bcaf126e47bc77bb4c576d8694fcc3280879557de4cd2191b921728b768ae1929a10ee48a8c42e9e7bc562c0984a0ab59f0a1c752718b029d3e20948 SHA512 ebfa6e7974747646c039afce008bde32b571146f7d710952d8c7e845a0fe77310e097c4c81985e034738570e43aee1ddef921a175097b2f9a68b29f48ad6e8c2
+EBUILD commons-lang-3.11-r1.ebuild 996 BLAKE2B 4d54b5a13578969627f1171a6e64ed6dd573250ad03bbbbdc601b3abc833b8634efc2aba5d50ff2ce9aaf29f0e767ecd0b81fae4fa4d9cd46fb7170f27e15133 SHA512 a67800e8302e5a413cae003d3c3d1bdb1db3ab28b41b250b1e842c43d7f478caf37f158cb5454366cdc0fb51913351da94ef131c060706de417069c9ac0921a2
+EBUILD commons-lang-3.12.0.ebuild 1040 BLAKE2B 776631cfa442dfe17533e1d65ac9b816837fd3bb6a5f19b82a61aa27c9349d52b90184fde0aa7241dd170fd04a3be0abac4e7cdbdde8dc1533f842c199b85514 SHA512 f1f56b70a2aad5f6f17723ffd0d04c70bdd4bb5b07eb682689d54442162ccc72908b52a3dddf4f7fe0d18d4d470d795fdf4432dae9d702734a967a6636f24ecc
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild b/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
index 9e6ffed902c1..ce82157c1ae7 100644
--- a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
+
 JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-lang:commons-lang:2.6"
 
 inherit java-pkg-2 java-ant-2
 
diff --git a/dev-java/commons-lang/commons-lang-3.11.ebuild b/dev-java/commons-lang/commons-lang-3.11-r1.ebuild
index e589a3f8da69..bb2399c94a7a 100644
--- a/dev-java/commons-lang/commons-lang-3.11.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.11-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.commons:commons-lang3:3.11"
 
 inherit java-pkg-2 java-pkg-simple
 
@@ -13,8 +14,8 @@ DESCRIPTION="Commons components to manipulate core java classes"
 HOMEPAGE="https://commons.apache.org/lang"
 SRC_URI="mirror://apache/commons/lang/source/${MY_P}-src.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
-SLOT="3.11"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+SLOT="3.6"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 
 CDEPEND="
 	dev-java/easymock:3.2
diff --git a/dev-java/commons-lang/commons-lang-3.12.0.ebuild b/dev-java/commons-lang/commons-lang-3.12.0.ebuild
new file mode 100644
index 000000000000..a3ff872376f8
--- /dev/null
+++ b/dev-java/commons-lang/commons-lang-3.12.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://mirror.checkdomain.de/apache//commons/lang/source/commons-lang3-3.12.0-src.tar.gz --slot 3.6 --keywords "~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" --ebuild commons-lang-3.12.0.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.commons:commons-lang3:3.12.0"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Commons components to manipulate core java classes"
+HOMEPAGE="https://commons.apache.org/proper/commons-lang/"
+SRC_URI="mirror://apache/commons/lang/source/${PN}3-${PV}-src.tar.gz -> ${P}-sources.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="3.6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}/${PN}3-${PV}-src"
+
+JAVA_ENCODING="ISO-8859-1"
+
+JAVA_SRC_DIR="src/main/java"
diff --git a/dev-java/commons-lang/commons-lang-3.3.2.ebuild b/dev-java/commons-lang/commons-lang-3.3.2.ebuild
deleted file mode 100644
index 477194ec9605..000000000000
--- a/dev-java/commons-lang/commons-lang-3.3.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}3-${PV}"
-
-DESCRIPTION="Commons components to manipulate core java classes"
-HOMEPAGE="http://commons.apache.org/lang/"
-SRC_URI="mirror://apache/commons/lang/source/${MY_P}-src.tar.gz"
-
-DEPEND=">=virtual/jdk-1.6
-	!ppc? (
-		!ppc64? (
-			test? (
-				dev-java/ant-junit4
-				dev-java/commons-io:1
-				dev-java/easymock:3.2
-			)
-		)
-	)"
-
-RDEPEND=">=virtual/jre-1.6"
-
-LICENSE="Apache-2.0"
-SLOT="3.3"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-RESTRICT+=" ppc? ( test ) ppc64? ( test )"
-
-S="${WORKDIR}/${MY_P}-src"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2,commons-io-1,junit-4"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_install() {
-	java-pkg_newjar target/${MY_P}.jar ${PN}.jar
-
-	dodoc RELEASE-NOTES.txt NOTICE.txt
-
-	use doc && java-pkg_dojavadoc target/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
-
-src_test() {
-	LC_ALL=C java-pkg-2_src_test
-}
diff --git a/dev-java/commons-lang/commons-lang-3.4.ebuild b/dev-java/commons-lang/commons-lang-3.4.ebuild
deleted file mode 100644
index 9a70bac5f9a7..000000000000
--- a/dev-java/commons-lang/commons-lang-3.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="${PN}3-${PV}"
-
-DESCRIPTION="Commons components to manipulate core java classes"
-HOMEPAGE="http://commons.apache.org/lang/"
-SRC_URI="mirror://apache/commons/lang/source/${MY_P}-src.tar.gz"
-
-DEPEND=">=virtual/jdk-1.6
-	!ppc? (
-		!ppc64? (
-			test? (
-				dev-java/ant-junit4
-				dev-java/commons-io:1
-				dev-java/easymock:3.2
-			)
-		)
-	)"
-
-RDEPEND=">=virtual/jre-1.6"
-
-LICENSE="Apache-2.0"
-SLOT="3.4"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-RESTRICT+=" ppc? ( test ) ppc64? ( test )"
-
-S="${WORKDIR}/${MY_P}-src"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-EANT_TEST_GENTOO_CLASSPATH="easymock-3.2,commons-io-1,junit-4"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_install() {
-	java-pkg_newjar target/${MY_P}.jar ${PN}.jar
-
-	dodoc RELEASE-NOTES.txt NOTICE.txt
-
-	use doc && java-pkg_dojavadoc target/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
-
-src_test() {
-	LC_ALL=C java-pkg-2_src_test
-}
diff --git a/dev-java/commons-lang/commons-lang-3.6.ebuild b/dev-java/commons-lang/commons-lang-3.6.ebuild
deleted file mode 100644
index 0cade53ae7f2..000000000000
--- a/dev-java/commons-lang/commons-lang-3.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="${PN}3-${PV}"
-
-DESCRIPTION="Commons components to manipulate core java classes"
-HOMEPAGE="http://commons.apache.org/lang"
-SRC_URI="mirror://apache/commons/lang/source/${MY_P}-src.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="3.6"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-
-CDEPEND="
-	dev-java/easymock:3.2
-	dev-java/commons-io:1"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8"
-
-S="${WORKDIR}/${MY_P}-src"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-JAVA_GENTOO_CLASSPATH="
-	easymock-3.2
-	commons-io-1"
-
-DOCS=( CONTRIBUTING.md NOTICE.txt RELEASE-NOTES.txt LICENSE.txt README.md )
-
-src_prepare() {
-	default
-	rm -rv src/test || die
-}
-
-src_install() {
-	einstalldocs
-	java-pkg-simple_src_install
-}