commit: 46188aece08d950987153cadc174b11d0213eaf8 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Mon Jan 10 19:59:59 2022 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Tue Jan 11 08:35:40 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46188aec
dev-java/dom4j: Drop old Closes: https://bugs.gentoo.org/587380 Closes: https://bugs.gentoo.org/689040 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/23732 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/dom4j/Manifest | 2 - dev-java/dom4j/dom4j-1.6.1-r8.ebuild | 84 ------------------------------------ dev-java/dom4j/dom4j-1.6.1-r9.ebuild | 84 ------------------------------------ 3 files changed, 170 deletions(-) diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest index 8913db1a98e9..a884ea898fb6 100644 --- a/dev-java/dom4j/Manifest +++ b/dev-java/dom4j/Manifest @@ -1,4 +1,2 @@ -DIST dom4j-1.6.1-java5.patch.bz2 2900 BLAKE2B cdd7dc901f5292af3ef7f0ea200c3d22bbc8c0adc27606da3c8fbadc44625b114c995321723dca331f0b23d5248e1f9177f0def2f4138eebcbd4aaac0495d4dd SHA512 38da606d77b62976366cd089e5194a922e348ec396e7b9af4dceb0a536c47f66e0900cfa59c91df04aade6076630077a8f88c713b9c20224d69316109b293a96 -DIST dom4j-1.6.1.tar.gz 9687211 BLAKE2B 3daa3729ea071aa87c7c1e1e2b91f1635109774dd2bd564a85265a0286f1369373084b945409d9d5213d66a7e14224033d42c58d80125b7982eef8961eb29248 SHA512 95c5a7105a81734f77b4bf27f8bb0af116bf43d8ad5297a0902a6687a54109a87dffe2953cf430d14947cdaa590aa0fdf083b46a91d1d98d48431cfae4459d94 DIST dom4j-2.1.3.tar.gz 565918 BLAKE2B d6f8c9ae22f84086491ca7e60e5498edda727b219b4fe019da8f62a441dc3cea86ecf0554e32f8e717e21234b8ef8e2905946ab3722462f1fa748ad7e68e9e20 SHA512 8c4d7b4f2dd1b3f806e0d5103101998a094c31e9a4912539dcee32f24b35452c7f0d72c5f4cf55f8a8c9a416fee7284f9bca43ae56b0e66104b2b54fdb49ad96 DIST jaxen-1.2.0.jar 232455 BLAKE2B 6bd16e8ac34f3af1b9d61218dc6a29862178516cfbb98c6834bf6db846b537e44b48db6ff578b3d67d32c3e2b142e44440a2fdcc6dc06a6ea427b04e6bf1f370 SHA512 cad582fc12d0741e9e6fd7e0cf80a50feb04f5ef42043df96f8a5b78476c77695d8b43836d2241f76b35676ea759921edd25eaeb2c04ec916eb138aa2901ce5f diff --git a/dev-java/dom4j/dom4j-1.6.1-r8.ebuild b/dev-java/dom4j/dom4j-1.6.1-r8.ebuild deleted file mode 100644 index cc77ae8243da..000000000000 --- a/dev-java/dom4j/dom4j-1.6.1-r8.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="XML Java library" -HOMEPAGE="https://dom4j.github.io/"; -SRC_URI=" - mirror://sourceforge/dom4j/${P}.tar.gz - mirror://gentoo/${P}-java5.patch.bz2" - -LICENSE="dom4j" -SLOT="1" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -CDEPEND=" - dev-java/xpp2:0 - dev-java/xpp3:0 - dev-java/xsdlib:0 - dev-java/relaxng-datatype:0" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.8:*" - -# restricted to jdk 1.8 because it needs javax.xml.bind -DEPEND=" - ${CDEPEND} - test? ( - dev-java/xalan:0 - dev-java/ant-junit:0 - dev-java/junitperf:0 - ) - virtual/jdk:1.8" - -PDEPEND="dev-java/jaxen:1.1" - -# Add missing methods to compile on Java 5 #137970 -PATCHES=( "${WORKDIR}/${P}-java5.patch" ) - -JAVA_RM_FILES=( - src/test/org/dom4j/bean/BeansTest.java - src/test/org/dom4j/io/StaxTest.java - src/test/org/dom4j/rule/RuleTest.java - src/test/org/dom4j/ThreadingTest.java - src/test/org/dom4j/io/XPP3ReaderTest.java -) - -src_prepare() { - default - - # Circular deps with jaxen #212993 - find -name '*.jar' -! -name jaxen-1.1-beta-6.jar -exec rm -v {} + || die - - rm -v "${JAVA_RM_FILES[@]}" || die -} - -JAVA_ANT_REWRITE_CLASSPATH="yes" -JAVA_ANT_CLASSPATH_TAGS+=" javadoc" - -JAVA_ANT_ENCODING="ISO-8859-1" - -EANT_BUILD_TARGET="clean package" -EANT_GENTOO_CLASSPATH="relaxng-datatype,xpp2,xpp3,xsdlib" -EANT_GENTOO_CLASSPATH_EXTRA="lib/jaxen-1.1-beta-6.jar" -EANT_EXTRA_ARGS="-Dbuild.javadocs=build/doc/api" - -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junitperf,xalan" - -src_test() { - java-pkg-2_src_test -} - -src_install() { - java-pkg_dojar "build/${PN}.jar" - java-pkg_register-dependency jaxen-1.1 - use doc && java-pkg_dojavadoc build/doc/api - use source && java-pkg_dosrc src/java/* -} diff --git a/dev-java/dom4j/dom4j-1.6.1-r9.ebuild b/dev-java/dom4j/dom4j-1.6.1-r9.ebuild deleted file mode 100644 index 717d7ddf29b2..000000000000 --- a/dev-java/dom4j/dom4j-1.6.1-r9.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="XML Java library" -HOMEPAGE="https://dom4j.github.io/"; -SRC_URI=" - mirror://sourceforge/dom4j/${P}.tar.gz - mirror://gentoo/${P}-java5.patch.bz2" - -LICENSE="dom4j" -SLOT="1" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -CDEPEND=" - dev-java/xpp2:0 - dev-java/xpp3:0 - dev-java/xsdlib:0 - dev-java/relaxng-datatype:0" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.8:*" - -# restricted to jdk 1.8 because it needs javax.xml.bind -DEPEND=" - ${CDEPEND} - test? ( - dev-java/xalan:0 - dev-java/ant-junit:0 - dev-java/junitperf:0 - ) - virtual/jdk:1.8" - -PDEPEND="dev-java/jaxen:1.2" - -# Add missing methods to compile on Java 5 #137970 -PATCHES=( "${WORKDIR}/${P}-java5.patch" ) - -JAVA_RM_FILES=( - src/test/org/dom4j/bean/BeansTest.java - src/test/org/dom4j/io/StaxTest.java - src/test/org/dom4j/rule/RuleTest.java - src/test/org/dom4j/ThreadingTest.java - src/test/org/dom4j/io/XPP3ReaderTest.java -) - -src_prepare() { - default - - # Circular deps with jaxen #212993 - find -name '*.jar' -! -name jaxen-1.1-beta-6.jar -exec rm -v {} + || die - - rm -v "${JAVA_RM_FILES[@]}" || die -} - -JAVA_ANT_REWRITE_CLASSPATH="yes" -JAVA_ANT_CLASSPATH_TAGS+=" javadoc" - -JAVA_ANT_ENCODING="ISO-8859-1" - -EANT_BUILD_TARGET="clean package" -EANT_GENTOO_CLASSPATH="relaxng-datatype,xpp2,xpp3,xsdlib" -EANT_GENTOO_CLASSPATH_EXTRA="lib/jaxen.jar" -EANT_EXTRA_ARGS="-Dbuild.javadocs=build/doc/api" - -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junitperf,xalan" - -src_test() { - java-pkg-2_src_test -} - -src_install() { - java-pkg_dojar "build/${PN}.jar" - java-pkg_register-dependency jaxen-1.2 - use doc && java-pkg_dojavadoc build/doc/api - use source && java-pkg_dosrc src/java/* -}
