From 0e52cbae2c719c3ef794ebeb0f4374fb96efcff3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 6 May 2023 11:33:44 +0100 Subject: gentoo auto-resync : 06:05:2023 - 11:33:44 --- dev-java/Manifest.gz | Bin 56979 -> 56979 bytes dev-java/dom4j/Manifest | 3 - dev-java/dom4j/dom4j-2.1.3.ebuild | 75 ------------------ .../dom4j-2.1.3-xpp3-add-removeAttribute.patch | 47 ------------ dev-java/jaxen/Manifest | 2 - dev-java/jaxen/jaxen-1.2.0-r1.ebuild | 84 --------------------- dev-java/xom/Manifest | 2 - dev-java/xom/xom-1.3.7.ebuild | 66 ---------------- 8 files changed, 279 deletions(-) delete mode 100644 dev-java/dom4j/dom4j-2.1.3.ebuild delete mode 100644 dev-java/dom4j/files/dom4j-2.1.3-xpp3-add-removeAttribute.patch delete mode 100644 dev-java/jaxen/jaxen-1.2.0-r1.ebuild delete mode 100644 dev-java/xom/xom-1.3.7.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index 878f8ab4c01f..d06c4d7c5b60 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest index b0f277d8e184..8b8417280709 100644 --- a/dev-java/dom4j/Manifest +++ b/dev-java/dom4j/Manifest @@ -1,7 +1,4 @@ -AUX dom4j-2.1.3-xpp3-add-removeAttribute.patch 1847 BLAKE2B 08e1bc056f0982c4fb30782321724137870afd81d1d9158cd6a2179fb50b8c77cec3e5c2e7e2d97072cd60122e7b5ad3b8a8107f7d85e99fda7ab06dd0f276bd SHA512 7c0da264384436bd3565d098059faac6ea0ac3a75d1bd21a22fa51dc9e77027c4acf0efccc0e1cfc7a4bed191e65d25eb4fc4b6fdb10f315202b1c93f0c15be4 -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 -EBUILD dom4j-2.1.3.ebuild 2250 BLAKE2B e49e599471e8bb71cdf607dcde2d8899a55f9a5ba3b1f7a3b2a51562c0379c77a31bea78e15f3d933b2a89a6044270ff0681606f0cd5ef6193460b3d8d28d874 SHA512 fd60f6eab2ce00a1b66a08ee3f20ddb1e490c1fd15bfe15b23eccd914eac01dc31916eaf81fa19854fb3fe116dbd57ec46cac1accd6ba908951bdc4c10bde19d EBUILD dom4j-2.1.4.ebuild 1417 BLAKE2B 335d0b983d320f205f17af6497a4b2fad0142e2a97158e54a556e19657b2cea884da7ab96974d532c6b9055a6b0e0ff969ea12f91c35849400e70c211acc91f4 SHA512 50afa7d7fd0a60f78acaef06d92a2d6f6b8e511e18b9c6daf7a957c1047987101bfc302e9754ffb03e081b86cd70b3fcd0345b12fea6d0008e51380d09d91da5 MISC metadata.xml 715 BLAKE2B c04caaffea1283ffce1b0057504dc0f1962cdab8c5f17ec933699b1731d75799ce969ee41b75f004d64de46b0be92cc36bd7147d4e06d1f53245a570264be0a8 SHA512 23834e036c2ff56e52bc5f7d2b4eb357dc438fd44245bf30bf2c2946a50b7872f07b2651df2ed4772235cf1457928c71fc1d993c6a7e9229e247fc15a279a456 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 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 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(); - } diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest index 29a6cb977a00..1c3e95d97e18 100644 --- a/dev-java/jaxen/Manifest +++ b/dev-java/jaxen/Manifest @@ -1,5 +1,3 @@ -DIST jaxen-1.2.0.tar.gz 282829 BLAKE2B 4d89d4fd3dfd8c4113fe7ecc05597ea9dd743d9c871f320936809016ae8cb3a3d4fb3f935de19463e6c99db1b67eff3545e909b707e81f4c0f114ec0f0e7bb97 SHA512 cecfc62eab1cf6586b28594855bd983679a932dbdc6cbdd07d85a9a9458e78b2e784dfd6287e6e87e4f4443239eefbeac59a7316dae53b818379daaccae56b53 DIST jaxen-2.0.0.tar.gz 348084 BLAKE2B 0dd90e040c865e0c2588f93ead9aadd64d49a8559a7c48255bdf89cca88967a60c8c0817ee4b234352fc0c8c3607e00e08c21df4580be7a889ca748073184f54 SHA512 897d8ee72b2ee3743118e363f66e1ccf5195863e4395dbdffa33b0bd7339663d85946f5e6eb37891e2ebb1572cab610a98a3690bdcc3993a2d2be4ae7920f174 -EBUILD jaxen-1.2.0-r1.ebuild 1912 BLAKE2B b7c2b6d75ae49f3df6a46c20a23488f9084fc81d39cec91e3d5258c8ba26532bc03c7da45a4520c245a5b9132d40437cf93b0ab7eefa18459401fe6e091ce1e0 SHA512 f9a9252c02312941af0c08073956449834a5baaf19ff0ebe32fd279cda927e0e6b951c928270e3699d3fccf54b8867f5198aec24ddf8977339e78dbad6d3f3d8 EBUILD jaxen-2.0.0.ebuild 1382 BLAKE2B 04b963571099a10a993527401ee57c9f720a14d407390c3abaedb1df95d82eea4a891c183f56428e8db42b0d07f73c1d39b5f80984593290214e76ea64d2df6a SHA512 7be4b9fc8177d4f65e53558251392a1112e347d1b62835594b073fc15fd090162b51546d33be0e5f0a4b66dca14f1b03174a1721e18c4b02a9536988c98a26aa MISC metadata.xml 719 BLAKE2B 81b0a7991de9a06ca79c793dc619356856370488753d22fbfc77d92e5323ab6a5cd489fe9098a60d1de248fa481d906696a20032e7a27972f9630d72a8175906 SHA512 221fb2b9430c909ea27039513feb2c9395992cd67ec087e008cc284dcb3a8d19fd373405c52d59f0ad41cf481586ce58588c04b05e864cc7731d6c4162a3544d diff --git a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild deleted file mode 100644 index 263da0bf4a88..000000000000 --- a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# 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://github.com/jaxen-xpath/jaxen/archive/refs/tags/v1.2.0.tar.gz --slot 1.2 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jaxen-1.2.0.ebuild - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" -MAVEN_ID="jaxen:jaxen:1.2.0" -JAVA_TESTING_FRAMEWORKS="junit" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Jaxen is a universal XPath engine for Java" -HOMEPAGE="http://www.cafeconleche.org/jaxen/" -SRC_URI="https://github.com/${PN}-xpath/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="1.2" -KEYWORDS="amd64 ~arm arm64 ppc64 x86" -IUSE="dom4j jdom xom" - -# It seems that most tests depend on dom4j, jdom and xom which all depend back on jaxen -REQUIRED_USE="test? ( dom4j jdom xom )" - -# Compile dependencies -# POM: pom.xml -# xerces:xercesImpl:2.6.2 -> >=dev-java/xerces-2.12.0:2 -# xml-apis:xml-apis:1.3.02 -> >=dev-java/xml-commons-external-1.4.01:1.4 -# POM: pom.xml -# test? junit:junit:3.8.2 -> >=dev-java/junit-3.8.2:0 - -CDEPEND=" - dom4j? ( dev-java/dom4j:1 ) - jdom? ( dev-java/jdom:0 ) - xom? ( dev-java/xom:0 ) -" - -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.8:* -" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.8:* -" - -S="${WORKDIR}/${P}" - -DOCS=( "${S}"/{LICENSE.txt,README.md} ) - -JAVA_SRC_DIR="src/java/main" - -JAVA_TEST_SRC_DIR="src/java/test" -JAVA_TEST_GENTOO_CLASSPATH="junit" - -src_prepare() { - default - - if use dom4j; then - JAVA_GENTOO_CLASSPATH+=" dom4j-1" - else - rm -rv "${JAVA_SRC_DIR}"/org/jaxen/dom4j || die - fi - - if use jdom; then - JAVA_GENTOO_CLASSPATH+=" jdom" - else - rm -rv "${JAVA_SRC_DIR}"/org/jaxen/jdom || die - fi - - if use xom; then - JAVA_GENTOO_CLASSPATH+=" xom" - else - rm -rv "${JAVA_SRC_DIR}"/org/jaxen/xom || die - fi -} - -src_install() { - default - java-pkg-simple_src_install -} diff --git a/dev-java/xom/Manifest b/dev-java/xom/Manifest index 31c3ed44d1d6..a4f4dcf3ea40 100644 --- a/dev-java/xom/Manifest +++ b/dev-java/xom/Manifest @@ -1,6 +1,4 @@ AUX xom-1.3.7-disable-invalid-test.patch 1303 BLAKE2B 5a15e175bc32c6fde77675f4e737e4df2a9a91d99cbb9b954f13a740b2de3435efeb12f03a02eb7aa57e48d45ea90a7ceb998ec68f919ea5478941223dc6a334 SHA512 de929d1e81def5b0bd390ff1498a08e88c06714149ad4cb719be28c110d79b1deb1327239c32d471b0a9f146a9f9231889e4727790b7a15ed55df930d1f07b3e -DIST xom-1.3.7-src.tar.gz 5898676 BLAKE2B 963190849bcdb1b4e786a099dd2abd2ed8f17e5b486bce9df48d9f6ddab4f381c3c5c7d70388f9d74710547ff7a62bbd6a2eb9c2a6d6ff8cd06156b83e98aba0 SHA512 9b574f23c9394f5b54dc9b33e41e89638d041337c08336f44f968a55a1633dcc90ff1b520f7ad57cdbe68a1f81e221ac7e83336eb472876ab43939d9ce940262 DIST xom-1.3.8-src.tar.gz 5898196 BLAKE2B 59d2af50b1f662419cf9e860c9946b250b3a803b3e3190483bef5d9b77a51272f1f2b11b10da1d72daff5f9a38dfdd3c3c13d15de7b1d9e19372895316df0033 SHA512 4a9b328a51fc24a447271e52b2c084178e2a5091b6e37a6dcb05cfa7c1aeacc426bae896a84dd9a7adc425f77785c12f0ee23805863f096232ad6ca4a2335b44 -EBUILD xom-1.3.7.ebuild 1670 BLAKE2B 7be5543510ceaf1a9a97110417493b51c2481fdff6f985392456063fdd035175cc5dd58bcf475eb6b9345573f14d2d7bdd20dd2d93ea5fc910fc5bc6ef1e18ec SHA512 3b25b044d20351d9eb5d51e1b497cdb731c70e6b25e313e7a0d5bbd2248fe00d09ba0d6013db98811965186b8ac5610d9d1a0387b9ad2a1f93fa49b641c3b889 EBUILD xom-1.3.8-r1.ebuild 2760 BLAKE2B 61f2e0c3d078e1571c95d77c1eb0b17cb71c662e5cc5f4c4ef956716bfd18ec5510431960e64e3e56d1469eecb426e703f89f231a9ec90a9c48ffd412e58b13b SHA512 1cfa6edf4604a84857860a426acd0b4e315f8d34594985246025ff1acb130cac4d3c88dc9b1c6abdc6cc3fb42502718a6203ffb468f8a707c946885c43e6dccb MISC metadata.xml 483 BLAKE2B f0994332615be07a760e59ac8a996bddfafda98afbac6cc412b670edd0fbcba142200d760d01cf04e2cb33852765974240497c349b382a8e09117ad09bcb52d1 SHA512 2da8b77a95753572e7d9f89bacc92ecf0f9a4e1324df33731f32f00c6ba8a73a128126b1164947698223b56bb61f24a2f6b831636dc2ad9d5c6ade4a81372476 diff --git a/dev-java/xom/xom-1.3.7.ebuild b/dev-java/xom/xom-1.3.7.ebuild deleted file mode 100644 index 5289b1b22b80..000000000000 --- a/dev-java/xom/xom-1.3.7.ebuild +++ /dev/null @@ -1,66 +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" -JAVA_TESTING_FRAMEWORKS="junit" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="XML Object Model" -HOMEPAGE="https://xom.nu" -SRC_URI="https://github.com/elharo/${PN}/releases/download/v${PV}/${P}-src.tar.gz" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" - -CDEPEND=" - dev-java/jaxen:1.2 - dev-java/xerces:2" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.8:*" - -DEPEND=" - ${CDEPEND} - dev-java/junit:0 - >=virtual/jdk-1.8:*" - -JAVA_GENTOO_CLASSPATH="jaxen-1.2,xerces-2" -JAVA_SRC_DIR="src/main/java" -JAVA_RESOURCE_DIRS="src/main/resources" - -JAVA_TEST_GENTOO_CLASSPATH="junit" -JAVA_TEST_SRC_DIR="src/test/java" - -PATCHES=( - "${FILESDIR}/${P}-disable-invalid-test.patch" -) - -src_prepare() { - default - - java-pkg_clean - - # removing directories based on build.xml - rm -rv XOM/src/nu/xom/benchmarks/ || die - rm -rv XOM/src/nu/xom/integrationtests/ || die - rm -rv XOM/src/nu/xom/samples/ || die - rm -rv XOM/src/nu/xom/tools/ || die - - # reorganize the code and resources so that it goes well with java-pkg-simple - mkdir -pv ${JAVA_SRC_DIR} ${JAVA_RESOURCE_DIRS} ${JAVA_TEST_SRC_DIR}/nu/xom || die - mv -v XOM/src/nu/xom/tests ${JAVA_TEST_SRC_DIR}/nu/xom/ || die - mv -v XOM/data . || die - pushd XOM/src || die - for file in $(find -type f -name "*.java"); do - cp --parents -R ${file} "${WORKDIR}/${JAVA_SRC_DIR}" || die - done - for file in $(find -type f ! -name "*.java"); do - cp --parents -R ${file} "${WORKDIR}/${JAVA_RESOURCE_DIRS}" || die - done - popd -} -- cgit v1.2.3