diff options
author | Volkmar W. Pogatzki <gentoo@pogatzki.net> | 2023-05-06 00:02:20 +0200 |
---|---|---|
committer | Miroslav Šulc <fordfrog@gentoo.org> | 2023-05-06 07:03:43 +0200 |
commit | 5514fdf0fbce9d9164b96e57db98b0d1a0cf4160 (patch) | |
tree | 8c75d2bf92392df407d5718d4a579abcd79f474b /dev-java | |
parent | dev-python/iminuit: fix building with gcc-13 (diff) | |
download | gentoo-5514fdf0fbce9d9164b96e57db98b0d1a0cf4160.tar.gz gentoo-5514fdf0fbce9d9164b96e57db98b0d1a0cf4160.tar.bz2 gentoo-5514fdf0fbce9d9164b96e57db98b0d1a0cf4160.zip |
dev-java/dom4j: drop 2.1.3
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/dom4j/Manifest | 1 | ||||
-rw-r--r-- | dev-java/dom4j/dom4j-2.1.3.ebuild | 75 | ||||
-rw-r--r-- | dev-java/dom4j/files/dom4j-2.1.3-xpp3-add-removeAttribute.patch | 47 |
3 files changed, 0 insertions, 123 deletions
diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest index 4562f0eea90e..5e15c8c800a1 100644 --- a/dev-java/dom4j/Manifest +++ b/dev-java/dom4j/Manifest @@ -1,3 +1,2 @@ -DIST dom4j-2.1.3.tar.gz 565918 BLAKE2B d6f8c9ae22f84086491ca7e60e5498edda727b219b4fe019da8f62a441dc3cea86ecf0554e32f8e717e21234b8ef8e2905946ab3722462f1fa748ad7e68e9e20 SHA512 8c4d7b4f2dd1b3f806e0d5103101998a094c31e9a4912539dcee32f24b35452c7f0d72c5f4cf55f8a8c9a416fee7284f9bca43ae56b0e66104b2b54fdb49ad96 DIST dom4j-2.1.4.tar.gz 566090 BLAKE2B 3078389c947d6915f001a6b59e1398c037d9b696186a9386a00f79b6aec33093e1786903eff35d4d9766345c3fa4f644dd756b431f4f9772b988038d8b48ce17 SHA512 bb735222c8b7dd3788bd8be3b265814d8f3133d42b750a2911464c92dacff1172067d3eedd6736014879ea9e54af32d46a45224522e6a6f2607d25c0fc9e6f38 DIST jaxen-1.2.0.jar 232455 BLAKE2B 6bd16e8ac34f3af1b9d61218dc6a29862178516cfbb98c6834bf6db846b537e44b48db6ff578b3d67d32c3e2b142e44440a2fdcc6dc06a6ea427b04e6bf1f370 SHA512 cad582fc12d0741e9e6fd7e0cf80a50feb04f5ef42043df96f8a5b78476c77695d8b43836d2241f76b35676ea759921edd25eaeb2c04ec916eb138aa2901ce5f diff --git a/dev-java/dom4j/dom4j-2.1.3.ebuild b/dev-java/dom4j/dom4j-2.1.3.ebuild deleted file mode 100644 index 69be8c48e9fc..000000000000 --- a/dev-java/dom4j/dom4j-2.1.3.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom dom4j-2.1.3.pom --download-uri https://github.com/dom4j/dom4j/archive/refs/tags/version-2.1.3.tar.gz --slot 1 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild dom4j-2.1.3.ebuild - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="org.dom4j:dom4j:2.1.3" -JAVA_TESTING_FRAMEWORKS="testng" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="flexible XML framework for Java" -HOMEPAGE="https://dom4j.github.io/" -SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/version-${PV}.tar.gz -> ${P}.tar.gz - https://repo1.maven.org/maven2/jaxen/jaxen/1.2.0/jaxen-1.2.0.jar" - -LICENSE="dom4j" -SLOT="1" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" -IUSE="jaxen" - -CDEPEND=" - dev-java/jaxb-api:2 - dev-java/xpp2:0 - dev-java/xpp3:0 - dev-java/xsdlib:0 - jaxen? ( dev-java/jaxen:1.2[dom4j] ) -" -DEPEND="${CDEPEND} - >=virtual/jdk-1.8:* - test? ( dev-java/xerces:2 ) -" - -# Runtime dependencies -# POM: ${P}.pom -# javax.xml.bind:jaxb-api:2.2.12 -> !!!groupId-not-found!!! -# javax.xml.stream:stax-api:1.0-2 -> java-virtuals/stax-api:0 -# jaxen:jaxen:1.1.6 -> >=dev-java/jaxen-1.2.0:1.2 -# net.java.dev.msv:xsdlib:2013.6.1 -> >=dev-java/xsdlib-20090415:0 -# pull-parser:pull-parser:2 -> >=dev-java/xpp2-2.1.10:0 -# xpp3:xpp3:1.1.4c -> >=dev-java/xpp3-1.1.4c:0 - -RDEPEND="${CDEPEND} - >=virtual/jre-1.8:* -" - -PATCHES=( - # XmlStartTag.java:31: error: ProxyXmlStartTag is not abstract and does not override abstract method removeAttributeByRawName - # patch from https://github.com/dom4j/dom4j/pull/22 - "${FILESDIR}"/dom4j-2.1.3-xpp3-add-removeAttribute.patch -) - -S="${WORKDIR}/${PN}-version-${PV}" - -# dom4j has a cyclic dependency on jaxen[dom4j]. -# The downloaded jaxen-1.2.0.jar is provided for compilation only. -# No prebuilt software is actually installed onto the system. -JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/jaxen-1.2.0.jar" -JAVA_GENTOO_CLASSPATH="jaxb-api-2,xpp2,xpp3,xsdlib" -JAVA_SRC_DIR="src/main/java" - -JAVA_TEST_GENTOO_CLASSPATH="testng,xerces-2" -JAVA_TEST_SRC_DIR="src/test/java" -JAVA_TEST_RESOURCE_DIRS="xml" - -src_prepare() { - default - - if use jaxen; then - JAVA_GENTOO_CLASSPATH+=" jaxen-1.2" - fi -} diff --git a/dev-java/dom4j/files/dom4j-2.1.3-xpp3-add-removeAttribute.patch b/dev-java/dom4j/files/dom4j-2.1.3-xpp3-add-removeAttribute.patch deleted file mode 100644 index a58a06dfcd61..000000000000 --- a/dev-java/dom4j/files/dom4j-2.1.3-xpp3-add-removeAttribute.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/src/main/java/org/dom4j/xpp/ProxyXmlStartTag.java b/src/main/java/org/dom4j/xpp/ProxyXmlStartTag.java -index 08b88fc..aa27c10 100644 ---- a/src/main/java/org/dom4j/xpp/ProxyXmlStartTag.java -+++ b/src/main/java/org/dom4j/xpp/ProxyXmlStartTag.java -@@ -211,7 +211,7 @@ public class ProxyXmlStartTag implements XmlStartTag { - * @throws XmlPullParserException - * DOCUMENT ME! - */ -- public void removeAtttributes() throws XmlPullParserException { -+ public void removeAttributes() throws XmlPullParserException { - if (element != null) { - element.setAttributes(new ArrayList()); - -@@ -221,6 +221,33 @@ public class ProxyXmlStartTag implements XmlStartTag { - } - } - -+ public boolean removeAttributeByName(String namespaceURI, String localName) throws XmlPullParserException { -+ if (element != null) { -+ for (Iterator<Attribute> iter = element.attributeIterator(); iter.hasNext();) { -+ Attribute attribute = iter.next(); -+ -+ if (namespaceURI.equals(attribute.getNamespaceURI()) -+ && localName.equals(attribute.getName())) { -+ return element.remove(attribute); -+ } -+ } -+ } -+ return false; -+ } -+ -+ public boolean removeAttributeByRawName(String rawName) throws XmlPullParserException { -+ if (element != null) { -+ for (Iterator<Attribute> iter = element.attributeIterator(); iter.hasNext();) { -+ Attribute attribute = iter.next(); -+ -+ if (rawName.equals(attribute.getQualifiedName())) { -+ return element.remove(attribute); -+ } -+ } -+ } -+ return false; -+ } -+ - public String getLocalName() { - return element.getName(); - } |