commit: 9e646ac7a38a7ae9f591dcd98ecd34710b951d84 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Sun May 16 15:23:46 2021 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sun May 16 18:31:06 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e646ac7
dev-java/xom: remove obsolete Closes: https://bugs.gentoo.org/784095 Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/20839/commits/fae3639075885a5c007b2814e7dbfe96263c40a3 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/xom/Manifest | 3 - dev-java/xom/files/xom-1.2.6.patch | 49 -------------- dev-java/xom/files/xom-strip-fallback-parser.patch | 18 ----- dev-java/xom/xom-1.2.10.ebuild | 79 ---------------------- dev-java/xom/xom-1.3.2.ebuild | 42 ------------ 5 files changed, 191 deletions(-) diff --git a/dev-java/xom/Manifest b/dev-java/xom/Manifest index 2a4c459fafe..8c636006829 100644 --- a/dev-java/xom/Manifest +++ b/dev-java/xom/Manifest @@ -1,4 +1 @@ -DIST jaxen-1.1.6-src.tar.gz 204211 BLAKE2B 02e3ca40f3d6a41d417ae7f40b70ca74b4dff0bb254d5d7a80aeb725595564805bda795ee9d1b1c92ec3b1d59aad3a9cb82d8f2bac5ef0e66a3feca04bb63345 SHA512 84a3beb521c8729d7ad9bcb76a252e12d624614277eee9d5e844f79fcdfc58f5f49eac902256b17c0af6563d4c255249d9124a47c3b02827189a7489f3172309 -DIST xom-1.2.10.tar.gz 11717279 BLAKE2B dd66d423563abd717c0a663db3300b5baccf549f9dd71e42cc86b9c222f60faed1fc8525dbab04c27f271a3f048dcc01fbcb20da6ec6efd093e192c7a4b90685 SHA512 edaa4abbb929f4eba1ee092be7a196ba1c7a359b233a38abbf100dc519a9a6ca2b9a4947497e412f96ceaf509bbd03c0ce25b17e401b6cd0a95fc355bbdc7680 -DIST xom-1.3.2.jar 317416 BLAKE2B cd891743b6c83eaf39be0e7c973b0221330532464dc433f64b769d07e7dd4f43341e01cb6bc4c237b7cab2a939280acde2dfc7f1da4467f87af6458409e7b37c SHA512 958c25262d297280ab87b000a8a9a0fa0842c062a52229f818568f937d5adc69f7b2214b9463a9a75b5d1714487ecc2b434a47c4627d9350e497367787e98aa4 DIST xom-1.3.7-src.tar.gz 5898676 BLAKE2B 963190849bcdb1b4e786a099dd2abd2ed8f17e5b486bce9df48d9f6ddab4f381c3c5c7d70388f9d74710547ff7a62bbd6a2eb9c2a6d6ff8cd06156b83e98aba0 SHA512 9b574f23c9394f5b54dc9b33e41e89638d041337c08336f44f968a55a1633dcc90ff1b520f7ad57cdbe68a1f81e221ac7e83336eb472876ab43939d9ce940262 diff --git a/dev-java/xom/files/xom-1.2.6.patch b/dev-java/xom/files/xom-1.2.6.patch deleted file mode 100644 index 3187e437306..00000000000 --- a/dev-java/xom/files/xom-1.2.6.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -Nur XOM/build.xml XOM_patched/build.xml ---- XOM/build.xml 2010-06-21 06:03:14.000000000 +0300 -+++ XOM_patched/build.xml 2011-03-13 07:05:01.000000000 +0200 -@@ -21,7 +21,6 @@ - subject line. The XOM home page is http://www.xom.nu/ - --> - <project name="XOM" default="help" basedir="."> -- - <description> - Build XOM - </description> -@@ -71,7 +70,7 @@ - <property name="jaxen.dir" value="${build.dir}/jaxen-classes"/> - - <property name="xml-apis.jar" value="${lib.dir}/xml-apis.jar"/> -- <property name="parser.jar" value="${lib.dir}/dtd-xercesImpl.jar"/> -+ <property name="parser.jar" value="${lib.dir}/xercesImpl.jar"/> - <property name="xslt.jar" value="${lib.dir}/xalan.jar"/> - <property name="serializer.jar" value="${lib.dir}/serializer.jar"/> - <property name="tagsoup.jar" value="${lib2.dir}/tagsoup-1.2.jar"/> -@@ -226,7 +225,7 @@ - encoding="UTF-8" - fork="true" - includeAntRuntime="false" -- excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/*Servlet.java"> -+excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/"> - <classpath refid="compile.class.path"/> - </javac> - <copy file="${build.src}/nu/xom/characters.dat" tofile="${build.dest}/nu/xom/characters.dat"/> -@@ -323,7 +322,7 @@ - - <target name="jar" depends="compile" description="Create xom.jar"> - <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" -- classpath="${lib.dir}/jarjar-1.0.jar"/> -+ classpath="${lib.dir}/jarjar.jar"/> - <jarjar jarfile="${build.dir}/${name}-${version}.jar" - basedir="${build.dest}" - index="no" -@@ -862,8 +861,8 @@ - </target> - - -- <target name="compile-jaxen" description="Compile Jaxen" depends="get-jaxen"> -- <javac srcdir="${build.dir}/jaxen-${jaxenversion}/src/java/main" -+ <target name="compile-jaxen" description="Compile Jaxen"> -+ <javac srcdir="lib/jaxen-${jaxenversion}/src/java/main" - destdir="${build.dir}/jaxen-classes" - debug="${debug}" - optimize="${optimize}" diff --git a/dev-java/xom/files/xom-strip-fallback-parser.patch b/dev-java/xom/files/xom-strip-fallback-parser.patch deleted file mode 100644 index 49a324ef2da..00000000000 --- a/dev-java/xom/files/xom-strip-fallback-parser.patch +++ /dev/null @@ -1,18 +0,0 @@ -Author: Ralph Sennhauser <[email protected]> - -Don't build and install fallback parser relying on internel classes of -SUNs/Oracles JVM >= 1.5. This allows building xom using ibm-jdk-bin. #399119 - ---- /tmp/build.xml -+++ /tmp/build.xml -@@ -235,10 +235,6 @@ - <echo file="${build.dest}/nu/xom/version.txt">${version}</echo> - - <copy file="${build.src}/nu/xom/compositions.dat" tofile="${build.dest}/nu/xom/compositions.dat" /> -- -- <!-- This file requires Java 1.5 to generate so we compile it with a -- different target and copy it over here. --> -- <copy file="classes15/nu/xom/JDK15XML1_0Parser.class" tofile="${build.dest}/nu/xom/JDK15XML1_0Parser.class"/> - </target> - - diff --git a/dev-java/xom/xom-1.2.10.ebuild b/dev-java/xom/xom-1.2.10.ebuild deleted file mode 100644 index 434b57752e5..00000000000 --- a/dev-java/xom/xom-1.2.10.ebuild +++ /dev/null @@ -1,79 +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" - -inherit java-pkg-2 java-ant-2 - -JAXEN_V="1.1.6" -JAXEN_P="jaxen-${JAXEN_V}" - -DESCRIPTION="A new XML object model" -HOMEPAGE="http://cafeconleche.org/XOM/index.html"; -# Bundled jaxen as its moved under XOM's namespace -SRC_URI="http://cafeconleche.org/XOM/${P}.tar.gz - http://dist.codehaus.org/jaxen/distributions/${JAXEN_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" - -COMMON_DEPEND="dev-java/xerces:2 - dev-java/xml-commons-external:1.3 - examples? ( java-virtuals/servlet-api:2.4 )" - -RDEPEND=">=virtual/jre-1.4 - ${COMMON_DEPEND}" - -DEPEND=">=virtual/jdk-1.4 - dev-java/jarjar:1 - ${COMMON_DEPEND}" - -S="${WORKDIR}/XOM" - -# Test require network access to pass. -# They need a redirected http document on public web. -RESTRICT="test" - -java_prepare() { - epatch "${FILESDIR}/${PN}-1.2.6.patch" - epatch "${FILESDIR}/${PN}-strip-fallback-parser.patch" #399119 - - # Delete test files as they aren't installed - rm -vr src/nu/xom/tests || die - - # Delete bundled jars - rm -v *.jar lib/*.jar || die - - # Delete bundled classes - find . -name "*.class" -delete -print || die - - # Move bundled jaxen to where the build.xml expects it - mv "${WORKDIR}"/${JAXEN_P}/ lib/ || die - - java-pkg_jar-from --into lib/ xml-commons-external-1.3 - java-pkg_jar-from --into lib/ xerces-2 - java-pkg_jar-from --build-only --into lib/ jarjar-1 - - # Tagsoup is only needed to run betterdoc but we use the pregenerated ones. -} - -src_compile() { - local ant_flags="-Ddebug=off" - use examples && ant_flags="${ant_flags} -Dservlet.jar=$(java-pkg_getjar servlet-api-2.4 servlet-api.jar)" - - ANT_TASKS="jarjar-1" eant jar ${ant_flags}\ - $(use examples && echo samples) -} - -src_install() { - java-pkg_newjar build/${P}.jar ${PN}.jar - use examples && java-pkg_dojar build/xom-samples.jar - dodoc Todo.txt - - use doc && java-pkg_dojavadoc apidocs/ - use source && java-pkg_dosrc src/* - use examples && java-pkg_doexamples --subdir nu/xom/samples src/nu/xom/samples -} diff --git a/dev-java/xom/xom-1.3.2.ebuild b/dev-java/xom/xom-1.3.2.ebuild deleted file mode 100644 index b7321e970a2..00000000000 --- a/dev-java/xom/xom-1.3.2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -JAVA_PKG_IUSE="doc source" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="XML Object Model" -HOMEPAGE="http://cafeconleche.org/XOM/index.html"; -SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${P}.jar" - -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/xerces:2 - dev-java/jaxen:1.1 - dev-java/xml-commons-external:1.3" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.6" - -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.6" - -JAVA_GENTOO_CLASSPATH=" - xerces-2 - jaxen-1.1 - xml-commons-external-1.3" - -JAVA_SRC_DIR="nu" - -src_prepare() { - default - - rm -r nu/xom/integrationtests/ || die -}
