From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- dev-java/commons-digester/Manifest | 11 +- .../commons-digester-1.8.1-r2.ebuild | 57 ---- .../commons-digester-2.1-r1.ebuild | 58 ---- .../commons-digester-2.1-r2.ebuild | 2 +- .../commons-digester-3.2-r2.ebuild | 60 ----- .../commons-digester-3.2-r3.ebuild | 2 +- .../files/1.8.1-build.xml-jar-target.patch | 27 -- .../files/commons-digester-2.1-build.xml | 294 --------------------- 8 files changed, 4 insertions(+), 507 deletions(-) delete mode 100644 dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild delete mode 100644 dev-java/commons-digester/commons-digester-2.1-r1.ebuild delete mode 100644 dev-java/commons-digester/commons-digester-3.2-r2.ebuild delete mode 100644 dev-java/commons-digester/files/1.8.1-build.xml-jar-target.patch delete mode 100644 dev-java/commons-digester/files/commons-digester-2.1-build.xml (limited to 'dev-java/commons-digester') diff --git a/dev-java/commons-digester/Manifest b/dev-java/commons-digester/Manifest index 0b82c2810a20..f7954941deee 100644 --- a/dev-java/commons-digester/Manifest +++ b/dev-java/commons-digester/Manifest @@ -1,12 +1,5 @@ -AUX 1.8.1-build.xml-jar-target.patch 1099 BLAKE2B e1ce425c943ebb36dd73447aa7d41c3fad20d22c75bc0d63d4137dd8be0afbeed4cf30a6ad48b24e5f3c9c1c018ce091c2a4d107aff8c62c161895c2bb78fcb8 SHA512 f28fd46608ca3817739ac4cdb07bf57ec28e0ebb22c3d086ef36567b44bb595b040dc27bb57a89f55568b8e4966b627f18829171908c14b4cced99787fc623c5 -AUX commons-digester-2.1-build.xml 12816 BLAKE2B 7309479a61897c3ecc28e6394714c1fb4691035f2f57f64f8dcccfab407a681e4ca2076ddf2cd783ec3bb0b726d38033b63c10444169d029fe39613ab0760c4c SHA512 f42f80e68e8b6d31b07add393e1adc1714278e9e8e6ccab08dfb6a131bdafeab1ae5c5859e81dabc5acff88d2151093d82a3e089293f653bcab307451839c0ef -DIST commons-digester-1.8.1-src.tar.gz 303266 BLAKE2B 618885c812a9bf40c080bc5736b8b4be4e18fe4d2f732d2a44d39369ae6cf3beb3af0cf500da3d103d7aa8c18b41b84d06907b6fc90f7f10d30840d6cfc83012 SHA512 0a39069662b4792d4856b79b5cedc2b44cb70303a19045d21c233d45ae4dde9e80662bd242a381e759d7cdb5adaf0b9fa6206bb8397b53348fa9eac12e9a4e96 DIST commons-digester-2.1-src.tar.gz 304060 BLAKE2B 2360f6f8ab77b20ad6b4058e0437aa792bf3886ddec2e09b6db259bc142c070965ce066ef224e92fb91614075631a2af1358ae4b4fc065fe9118e1d2559bb9bb SHA512 6bdb63431ed1e17f5e8ba24951762750a0e59b70c76eabecbf13f5fe6974864825456beed615c8f2c16f9a2f1404f2e56bdbc3ba335656c3661d5f368c708b88 DIST commons-digester-3.2.tar.gz 324555 BLAKE2B 7b8bdaa70eeafb069e9ecbfe697ab86f5167ae3b9933e8aa306f0080de0ec99d12bd023067678b7b904329178f553fd6d4d98141ab329154a1c27385b33e449f SHA512 6d5ed9a1cc7612244747dcbd5c713349f27d63d1cef39fa368b4e91eaa3b1fe7043ab2fb498a73e8afde8081b8ff26a966e5b87b8b6dc68a3d907e9b25aa7cad -DIST commons-digester3-3.2-src.tar.gz 324555 BLAKE2B 7b8bdaa70eeafb069e9ecbfe697ab86f5167ae3b9933e8aa306f0080de0ec99d12bd023067678b7b904329178f553fd6d4d98141ab329154a1c27385b33e449f SHA512 6d5ed9a1cc7612244747dcbd5c713349f27d63d1cef39fa368b4e91eaa3b1fe7043ab2fb498a73e8afde8081b8ff26a966e5b87b8b6dc68a3d907e9b25aa7cad -EBUILD commons-digester-1.8.1-r2.ebuild 1324 BLAKE2B 2cef18509056f371eb658b67e4a9eff75d6eae6e197eaaf8887a674850399d4f58543913e43113e35e9a5dc2da1ad8397b84711713d82158d6a0fe07ad895117 SHA512 0ac87e54cb3e3ecd4872c9df9ea2bc2174ca8a52922582575ec0006e6e484e6e7e3c878525705de4ba42a58d36fe9235f47065d8837c44c905d8b03ce4481a81 -EBUILD commons-digester-2.1-r1.ebuild 1310 BLAKE2B 3e8e5971648240771f5031f90991ee20a5009f42c81ac7cd72f7145331212bf19dba9688ce501081562f08cb01b4bd5510d77ab37638d047d5d6803374e6cc24 SHA512 86db8e1e6fbcc76f64f90f20e14efb30cb29427525147204f6edcb845b90082ba53f0e46f3db4d6a751105c0429da672bbb943b256bafb6a859efb520e63130a -EBUILD commons-digester-2.1-r2.ebuild 1994 BLAKE2B 9cdff6f6e00f6cc706c02d50d7cacca8aa6ad01e929aa78aa2c8521decdef9d45ee87bd053a6749d2e6ffb7b80250b5d98f52213c80b0dc25a28368041ff1d2f SHA512 261a0882d8f16eba2c2a3b42b5c19ce3ccd8e3f7690a5e7c36327b9f11ad628b59c6ab6723e87e492d1ac471e04fcf59d91a5ba5601a1842e478bb97da6831a2 -EBUILD commons-digester-3.2-r2.ebuild 1336 BLAKE2B 4f9b7003b2c7b09cd21d79f0f2fb2e0f970a85c48d502e9921ae2e55883edeb5008630bde20f6428b2d91583527a73b8d9630603a608ea06120797631d909c4b SHA512 4325436fc97d1378b011ab7bde10a6187b8e7e0ef7b305e28d531780bc36225f8838bd5aeb5e7dde2c8da5031e97ff68da4f6932c2bdfa685ba836afe2ea5a75 -EBUILD commons-digester-3.2-r3.ebuild 2384 BLAKE2B 26b082902710279cf3b185f928a6a903cee6bec2206fccd1396d81e0ef981d7274388e52eaaf498e223e4537086314da05ceae6832e75935e39cba6af0295845 SHA512 ce7ee2520094c7eeb3b5914f100503f5450ed4c74706cc7634484c7c21971566f8de563812946b5dada35f79f2bcb737b55bff21593252648fea6d0fd2a29d6a +EBUILD commons-digester-2.1-r2.ebuild 1991 BLAKE2B 2f97f8099b4669c8f5a68ad17b5b5aa21fbd491f098cb69350ef3b405448e23c3d830516943b42e6776b8f9038a45fbc3bf51065d6de4f2d473827b9069daf5d SHA512 ea2e7788cbf1164457e1dce9dae443196fdaedc59ff1f5edfc1db31a62a6c771b51ebe606e0ab75a6294893b72ea8a10bdb3289beaa77c4da01f22d5ddd02f90 +EBUILD commons-digester-3.2-r3.ebuild 2381 BLAKE2B 6110eebe1e85e84244c69696d8d8711a873303b33cd3af6f0942bcbb1d11d764f7df46b333fd08462725915266fc81aa5cfd89239629b9ba8f15ccc4c8261f3b SHA512 1476892c5b07b7606599955bf87f9591f3672cdd64d47f26ec38cd935d253a6ddb043334a6ec22d44cae2c4908e642633ead1785a2dcb7fb55f23e96187f95ff MISC metadata.xml 482 BLAKE2B 2c8b9ab044dd5e95d9f17fcb0e284c7d8ed87727fa891bc6c15414b8db928346e8af71222bb3e6daec5ce682cfe72c7f315aa55d1dd5d55531554ab7d4ddc863 SHA512 31bd4dd9999a412986ac2dcc5cccffd7dd1f36ce8bf148f93dd35115da003c2663a0f5994a3e2a44ad537c26ee534294c80697f986737c02f434b3646e8f7c40 diff --git a/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild b/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild deleted file mode 100644 index 7fef273f04d0..000000000000 --- a/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -JAVA_PKG_IUSE="doc examples source test" - -inherit epatch java-pkg-2 java-ant-2 - -MY_P="${P}-src" -DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects" -HOMEPAGE="http://commons.apache.org/digester/" -SRC_URI="mirror://apache/commons/digester/source/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ppc64 x86" -IUSE="" - -CDEPEND="dev-java/commons-beanutils:1.7 - >=dev-java/commons-collections-2.1:0 - >=dev-java/commons-logging-1.0.2:0" -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" -DEPEND=">=virtual/jdk-1.6 - test? ( - dev-java/junit:0 - dev-java/ant-junit:0 - ) - ${CDEPEND}" - -S="${WORKDIR}/${P}-src" - -# don't rewrite build.xml in examples -JAVA_PKG_BSFIX_ALL="no" - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-collections,commons-logging" - -java_prepare() { - epatch "${FILESDIR}/${PV}-build.xml-jar-target.patch" -} - -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit" - -src_test() { - java-pkg-2_src_test -} - -src_install() { - java-pkg_dojar "dist/${PN}.jar" - - dodoc RELEASE-NOTES.txt - - use doc && java-pkg_dojavadoc dist/docs/api - use source && java-pkg_dosrc src/java/org - use examples && java-pkg_doexamples src/examples -} diff --git a/dev-java/commons-digester/commons-digester-2.1-r1.ebuild b/dev-java/commons-digester/commons-digester-2.1-r1.ebuild deleted file mode 100644 index 0533f4f8b685..000000000000 --- a/dev-java/commons-digester/commons-digester-2.1-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -JAVA_PKG_IUSE="doc examples source test" -MAVEN_ID="commons-digester:commons-digester:2.1" - -inherit java-pkg-2 java-ant-2 - -MY_P="${P}-src" - -DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects" -HOMEPAGE="http://commons.apache.org/digester/" -SRC_URI="mirror://apache/commons/digester/source/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="2.1" -KEYWORDS="amd64 ppc64 x86" - -CDEPEND="dev-java/commons-beanutils:1.7 - >=dev-java/commons-collections-2.1:0 - >=dev-java/commons-logging-1.0.2:0" - -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" - -DEPEND=">=virtual/jdk-1.6 - ${CDEPEND} - test? ( - dev-java/junit:0 - dev-java/ant-junit:0 - )" - -S="${WORKDIR}/${P}-src" - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-collections,commons-logging" - -java_prepare() { - cp "${FILESDIR}"/${P}-build.xml build.xml || die -} - -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit" - -src_test() { - java-pkg-2_src_test -} - -src_install() { - java-pkg_newjar target/${PN}.jar - - dodoc RELEASE-NOTES.txt - - use doc && java-pkg_dojavadoc target/site/apidocs - use source && java-pkg_dosrc src/main/java/org - use examples && java-pkg_doexamples src/examples -} diff --git a/dev-java/commons-digester/commons-digester-2.1-r2.ebuild b/dev-java/commons-digester/commons-digester-2.1-r2.ebuild index 7db4511aecd1..2999e8c31357 100644 --- a/dev-java/commons-digester/commons-digester-2.1-r2.ebuild +++ b/dev-java/commons-digester/commons-digester-2.1-r2.ebuild @@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/digester/source/commons-digester-2.1-src.tar.gz LICENSE="Apache-2.0" SLOT="2.1" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ppc64 x86" # Common dependencies # POM: pom.xml diff --git a/dev-java/commons-digester/commons-digester-3.2-r2.ebuild b/dev-java/commons-digester/commons-digester-3.2-r2.ebuild deleted file mode 100644 index f30609298a34..000000000000 --- a/dev-java/commons-digester/commons-digester-3.2-r2.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -JAVA_PKG_IUSE="doc examples source test" - -inherit java-pkg-2 java-ant-2 - -MY_P="${PN}3-${PV}-src" - -DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects" -HOMEPAGE="http://commons.apache.org/digester/" -SRC_URI="mirror://apache/commons/digester/source/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="3.2" -KEYWORDS="amd64 ppc64 x86" - -CDEPEND="dev-java/cglib:3 - dev-java/commons-beanutils:1.7 - >=dev-java/commons-logging-1.0.2:0" - -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" - -DEPEND=">=virtual/jdk-1.6 - ${CDEPEND} - test? ( - dev-java/junit:4 - dev-java/ant-junit:0 - )" - -S="${WORKDIR}/${MY_P}" - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-logging,cglib-3" - -java_prepare() { - cp "${FILESDIR}"/${PN}-2.1-build.xml build.xml || die - - # Doesn't work. - rm -v src/test/java/org/apache/commons/digester3/Digester153TestCase.java -} - -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4" - -src_test() { - java-pkg-2_src_test -} - -src_install() { - java-pkg_newjar target/${PN}.jar - - dodoc RELEASE-NOTES.txt - - use doc && java-pkg_dojavadoc target/site/apidocs - use source && java-pkg_dosrc src/main/java/org - use examples && java-pkg_doexamples src/examples -} diff --git a/dev-java/commons-digester/commons-digester-3.2-r3.ebuild b/dev-java/commons-digester/commons-digester-3.2-r3.ebuild index 45e85fb373f2..14a7ba03b87c 100644 --- a/dev-java/commons-digester/commons-digester-3.2-r3.ebuild +++ b/dev-java/commons-digester/commons-digester-3.2-r3.ebuild @@ -18,7 +18,7 @@ SRC_URI="mirror://apache/commons/digester/source/${PN}3-${PV}-src.tar.gz -> ${P} LICENSE="Apache-2.0" SLOT="3.2" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ppc64 x86" # 1) atomWithNamespaceParse(org.apache.commons.digester3.xmlrules.SetNamespaceURITestCase) # java.net.UnknownHostException: commons.apache.org diff --git a/dev-java/commons-digester/files/1.8.1-build.xml-jar-target.patch b/dev-java/commons-digester/files/1.8.1-build.xml-jar-target.patch deleted file mode 100644 index ec523a011458..000000000000 --- a/dev-java/commons-digester/files/1.8.1-build.xml-jar-target.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- build.xml.orig 2009-02-15 21:06:33.000000000 +0100 -+++ build.xml 2009-02-15 21:07:25.000000000 +0100 -@@ -117,6 +117,7 @@ - - - -+ - - - -@@ -140,6 +141,7 @@ - - - -+ - - - -@@ -256,7 +258,7 @@ - - - -- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - =================================== WARNING =================================== - JUnit is not present in your $ANT_HOME/lib directory. Tests not executed. - =============================================================================== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3