From 3b08f674e3f771b49370edb144dab0958c8cf721 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 31 Aug 2021 08:59:54 +0100
Subject: gentoo resync : 31.08.2021

---
 dev-java/commons-lang/Manifest                   |  2 +-
 dev-java/commons-lang/commons-lang-2.6-r1.ebuild | 37 ----------------------
 dev-java/commons-lang/commons-lang-2.6-r2.ebuild | 39 ++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 38 deletions(-)
 delete mode 100644 dev-java/commons-lang/commons-lang-2.6-r1.ebuild
 create mode 100644 dev-java/commons-lang/commons-lang-2.6-r2.ebuild

(limited to 'dev-java/commons-lang')

diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest
index dd041b81f783..1cfd88ce24ed 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -1,5 +1,5 @@
 DIST commons-lang-2.6-src.tar.gz 564032 BLAKE2B 9d72b0426f2146eaa8498a6601edf80dbf45a16ef5ee14cf4ed87130e6d3732d5c713f25f44c10435baa1357f61a271acb88483915968aaf645d1ceaa318c601 SHA512 4a30ed153f93fe6616a28974721bdf005d064203ef8a3dd375d6c1176647c0cdbd29cfde2a580e2c8d26bfa4655be6be7025b8ccae94086dcd816676c5cf8e87
 DIST commons-lang-3.12.0-sources.tar.gz 1072858 BLAKE2B d6b7ee9ef165e60f61d8d0dfaaf38919877f2edc6742cd58b2b70d379e807e75d9dc24e19f23db1b174d1797d6ef0af7700d686dd835d7a40bf2b2a91346e215 SHA512 80d1b960ae0b02859be329ea60d68cef33f3c7be7ec19752b3c9cfef442adef480878317ce2cfa309a27e662e2c72cab22023eaa3702e27970a1e5d55ca43f57
-EBUILD commons-lang-2.6-r1.ebuild 869 BLAKE2B 014e28d08de2cd8bd5ca9dd2d5492566f14864a00ac86cf4e262953396a74aef22882704c2c136c23070758bc5d832a0986c478e1fc0f141b9e4f5727841ebc5 SHA512 6575b1287b05a662f34d80bba40fad7b75f357331f4723900c0e2a5c6294a308acccb2664d9ce0dec0bec87fc0c819efb31f667dc242c22cc18ce508bee5388f
+EBUILD commons-lang-2.6-r2.ebuild 940 BLAKE2B 7099bc7cf2c34f571689352f915f53d1f0279cf925a31b1ae890acf55bcf7f9b321d6bce0c001e9a128c79cf9dc7412858a2008352d9d051b3e29653922a87a4 SHA512 dc3ce86ceae7d667572578748ad0e831091ed10e1706901e580232eb03489fb1c67b7cdd31495f6ef6fd140b1ef2e278a4554b051473482022ea8b1df1e1d0e2
 EBUILD commons-lang-3.12.0.ebuild 1036 BLAKE2B 23160f04bf20a6431d0b569a93c56bbdd08a4ea5ea3a135d1da55c52800fda51524877c507ac244e8e0cba93c7cae8d9210e13df1590ab5021cd2b0e01b9e706 SHA512 530f95c61531f1a1dd96e15dfc48e1224908bb76cb2d1e1edd3b6cf7ab629a8c482344f0a78b28a74bc196fc8606a838e5a86f9c3061620f1d49174ab7b26097
 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
deleted file mode 100644
index ce82157c1ae7..000000000000
--- a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
+++ /dev/null
@@ -1,37 +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"
-MAVEN_ID="commons-lang:commons-lang:2.6"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Commons components to manipulate core java classes"
-HOMEPAGE="http://commons.apache.org/lang/"
-SRC_URI="mirror://apache/commons/lang/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
-SLOT="2.1"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
-	test? (
-		dev-java/ant-junit:0
-	)"
-
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/${P}-src"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-src_install() {
-	java-pkg_newjar "target/${P}.jar" "${PN}.jar"
-	dodoc RELEASE-NOTES.txt NOTICE.txt
-	dohtml *.html
-	use doc && java-pkg_dojavadoc target/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/commons-lang/commons-lang-2.6-r2.ebuild b/dev-java/commons-lang/commons-lang-2.6-r2.ebuild
new file mode 100644
index 000000000000..4e9a61a966be
--- /dev/null
+++ b/dev-java/commons-lang/commons-lang-2.6-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="commons-lang:commons-lang:2.6"
+JAVA_PKG_WANT_SOURCE="1.4"
+JAVA_PKG_WANT_TARGET="1.4"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Commons components to manipulate core java classes"
+HOMEPAGE="https://commons.apache.org/proper/commons-lang/"
+SRC_URI="mirror://apache/commons/lang/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.1"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+
+DEPEND="virtual/jdk:1.8
+	test? (
+		dev-java/ant-junit:0
+	)"
+
+RDEPEND="virtual/jre:1.8"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+
+src_install() {
+	java-pkg_newjar "target/${P}.jar" "${PN}.jar"
+	dodoc RELEASE-NOTES.txt NOTICE.txt
+	docinto html
+	dodoc *.html
+	use doc && java-pkg_dojavadoc target/apidocs
+	use source && java-pkg_dosrc src/main/java/*
+}
-- 
cgit v1.2.3