* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/files/, dev-java/jdom/
@ 2023-03-27 10:24 Miroslav Šulc
0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2023-03-27 10:24 UTC (permalink / raw
To: gentoo-commits
commit: 5de392670eebc911ec424ea1c560925a2fd0e7dd
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Feb 14 15:25:49 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Mar 27 10:24:05 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5de39267
dev-java/jdom: enable tests
Adds Automatic-module-name via MANIFEST.MF
Enables tests skipping 28 tests which otherwise would fail
see https://bugs.gentoo.org/901743
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/29519
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../files/jdom-2.0.6.1-skip-failing-tests.patch | 248 +++++++++++++++++++++
dev-java/jdom/jdom-2.0.6.1.ebuild | 47 ++--
2 files changed, 278 insertions(+), 17 deletions(-)
diff --git a/dev-java/jdom/files/jdom-2.0.6.1-skip-failing-tests.patch b/dev-java/jdom/files/jdom-2.0.6.1-skip-failing-tests.patch
new file mode 100644
index 000000000000..cb8675153b8a
--- /dev/null
+++ b/dev-java/jdom/files/jdom-2.0.6.1-skip-failing-tests.patch
@@ -0,0 +1,248 @@
+In order to enable tests we skip ( @Ignore ) several of them which
+would otherwise fail, see bug #901743.
+--- a/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java
++++ b/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java
+@@ -86,6 +86,7 @@ import java.util.List;
+
+ import org.junit.Ignore;
+ import org.junit.Test;
++import org.junit.Ignore;
+ import org.xml.sax.Attributes;
+ import org.xml.sax.DTDHandler;
+ import org.xml.sax.EntityResolver;
+@@ -696,6 +697,7 @@ public final class TestSAXBuilder {
+ * are added to the DocType
+ */
+ @Test
++ @Ignore
+ public void test_TCM__void_setExpandEntities_boolean() throws JDOMException, IOException {
+ //test entity exansion on internal entity
+
+--- a/test/src/java/org/jdom2/test/cases/output/AbstractTestOutputter.java
++++ b/test/src/java/org/jdom2/test/cases/output/AbstractTestOutputter.java
+@@ -6,6 +6,7 @@ import java.util.ArrayList;
+ import java.util.List;
+
+ import org.junit.Test;
++import org.junit.Ignore;
+
+ import org.jdom2.Attribute;
+ import org.jdom2.CDATA;
+@@ -483,6 +484,7 @@ public abstract class AbstractTestOutputter {
+ }
+
+ @Test
++ @Ignore
+ public void testDocTypeSimpleISS() {
+ DocType content = new DocType("root");
+ content.setInternalSubset("<!ENTITY name \"value\">");
+@@ -518,6 +520,7 @@ public abstract class AbstractTestOutputter {
+ }
+
+ @Test
++ @Ignore
+ public void testDocTypeSystemIDISS() {
+ DocType content = new DocType("root", "sysid");
+ content.setInternalSubset("internal");
+@@ -553,6 +556,7 @@ public abstract class AbstractTestOutputter {
+ }
+
+ @Test
++ @Ignore
+ public void testDocTypePublicSystemIDISS() {
+ DocType content = new DocType("root", "pubid", "sysid");
+ content.setInternalSubset("internal");
+@@ -768,6 +772,7 @@ public abstract class AbstractTestOutputter {
+ }
+
+ @Test
++ @Ignore
+ public void testOutputElementAttributeNotSpecifiedB() {
+ String txt = "<root atta=\"val\" attb=\"attb\" />";
+ final Element root = new Element("root");
+@@ -1111,6 +1116,7 @@ public abstract class AbstractTestOutputter {
+ }
+
+ @Test
++ @Ignore
+ public void testOutputDocTypeInternalSubset() {
+ String dec = "<!DOCTYPE root [\ninternal]>";
+ DocType dt = new DocType("root");
+@@ -1151,6 +1157,7 @@ public abstract class AbstractTestOutputter {
+ }
+
+ @Test
++ @Ignore
+ public void testOutputDocumentOmitEncoding() {
+ Document doc = new Document();
+ doc.addContent(new Element("root"));
+--- a/test/src/java/org/jdom2/test/cases/output/AbstractTestRoundTrip.java
++++ b/test/src/java/org/jdom2/test/cases/output/AbstractTestRoundTrip.java
+@@ -5,6 +5,7 @@ import static org.junit.Assert.assertTrue;
+ import java.io.IOException;
+
+ import org.junit.Test;
++import org.junit.Ignore;
+
+ import org.jdom2.Document;
+ import org.jdom2.Element;
+@@ -63,6 +64,7 @@ public abstract class AbstractTestRoundTrip {
+ }
+
+ @Test
++ @Ignore
+ public void testNamespaces() throws JDOMException, IOException {
+ final SAXBuilder sb = new SAXBuilder();
+
+@@ -72,6 +74,7 @@ public abstract class AbstractTestRoundTrip {
+ }
+
+ @Test
++ @Ignore
+ public void testComplex() throws JDOMException, IOException {
+ final SAXBuilder sb = new SAXBuilder();
+
+--- a/test/src/java/org/jdom2/test/cases/output/TestDOMOutputter.java
++++ b/test/src/java/org/jdom2/test/cases/output/TestDOMOutputter.java
+@@ -237,6 +237,7 @@ public final class TestDOMOutputter extends AbstractTestOutputter {
+ }
+
+ @Test
++ @Ignore
+ public void testWithDocType() {
+ DocType dt = new DocType("root");
+ dt.setInternalSubset("<!ELEMENT root (#PCDATA)>");
+--- a/test/src/java/org/jdom2/test/cases/output/TestStAXEventOutputter.java
++++ b/test/src/java/org/jdom2/test/cases/output/TestStAXEventOutputter.java
+@@ -347,6 +347,7 @@ public final class TestStAXEventOutputter extends AbstractTestOutputter {
+ }
+
+ @Test
++ @Ignore
+ public void test_HighSurrogatePair() throws XMLStreamException, IOException, JDOMException {
+ SAXBuilder builder = new SAXBuilder();
+ builder.setExpandEntities(true);
+@@ -362,6 +363,7 @@ public final class TestStAXEventOutputter extends AbstractTestOutputter {
+ }
+
+ @Test
++ @Ignore
+ public void test_HighSurrogatePairDecimal() throws JDOMException, IOException, XMLStreamException {
+ SAXBuilder builder = new SAXBuilder();
+ builder.setExpandEntities(true);
+@@ -376,6 +378,7 @@ public final class TestStAXEventOutputter extends AbstractTestOutputter {
+ }
+
+ @Test
++ @Ignore
+ public void test_HighSurrogateAttPair() throws JDOMException, IOException, XMLStreamException {
+ SAXBuilder builder = new SAXBuilder();
+ builder.setExpandEntities(true);
+@@ -390,6 +393,7 @@ public final class TestStAXEventOutputter extends AbstractTestOutputter {
+ }
+
+ @Test
++ @Ignore
+ public void test_HighSurrogateAttPairDecimal() throws JDOMException, IOException, XMLStreamException {
+ SAXBuilder builder = new SAXBuilder();
+ builder.setExpandEntities(true);
+@@ -405,6 +409,7 @@ public final class TestStAXEventOutputter extends AbstractTestOutputter {
+
+ // Construct a raw surrogate pair character and confirm it outputs hex escaped
+ @Test
++ @Ignore
+ public void test_RawSurrogatePair() throws JDOMException, IOException, XMLStreamException {
+ SAXBuilder builder = new SAXBuilder();
+ builder.setExpandEntities(true);
+--- a/test/src/java/org/jdom2/test/cases/output/TestStAXStreamOutputter.java
++++ b/test/src/java/org/jdom2/test/cases/output/TestStAXStreamOutputter.java
+@@ -321,6 +321,7 @@ public final class TestStAXStreamOutputter extends AbstractTestOutputter {
+ }
+
+ @Test
++ @Ignore
+ public void test_HighSurrogatePair() throws XMLStreamException, IOException, JDOMException {
+ SAXBuilder builder = new SAXBuilder();
+ builder.setExpandEntities(true);
+@@ -337,6 +338,7 @@ public final class TestStAXStreamOutputter extends AbstractTestOutputter {
+ }
+
+ @Test
++ @Ignore
+ public void test_HighSurrogatePairDecimal() throws JDOMException, IOException, XMLStreamException {
+ SAXBuilder builder = new SAXBuilder();
+ builder.setExpandEntities(true);
+@@ -352,6 +354,7 @@ public final class TestStAXStreamOutputter extends AbstractTestOutputter {
+ }
+
+ @Test
++ @Ignore
+ public void test_HighSurrogateAttPair() throws JDOMException, IOException, XMLStreamException {
+ SAXBuilder builder = new SAXBuilder();
+ builder.setExpandEntities(true);
+@@ -367,6 +370,7 @@ public final class TestStAXStreamOutputter extends AbstractTestOutputter {
+ }
+
+ @Test
++ @Ignore
+ public void test_HighSurrogateAttPairDecimal() throws JDOMException, IOException, XMLStreamException {
+ SAXBuilder builder = new SAXBuilder();
+ builder.setExpandEntities(true);
+@@ -383,6 +387,7 @@ public final class TestStAXStreamOutputter extends AbstractTestOutputter {
+
+ // Construct a raw surrogate pair character and confirm it outputs hex escaped
+ @Test
++ @Ignore
+ public void test_RawSurrogatePair() throws JDOMException, IOException, XMLStreamException {
+ SAXBuilder builder = new SAXBuilder();
+ builder.setExpandEntities(true);
+--- a/test/src/java/org/jdom2/test/cases/special/TestIssue008ExpandEntity.java
++++ b/test/src/java/org/jdom2/test/cases/special/TestIssue008ExpandEntity.java
+@@ -13,6 +13,7 @@ import org.jdom2.output.XMLOutputter;
+ import org.jdom2.test.util.FidoFetch;
+
+ import org.junit.Test;
++import org.junit.Ignore;
+
+ @SuppressWarnings("javadoc")
+ public class TestIssue008ExpandEntity {
+@@ -53,16 +54,19 @@ public class TestIssue008ExpandEntity {
+ }
+
+ @Test
++ @Ignore
+ public void testFalse() {
+ roundTrip(false, false, null, "<doc>−</doc>");
+ }
+
+ @Test
++ @Ignore
+ public void testFalseUSASCII() {
+ roundTrip(false, false, "US-ASCII", "<doc>−</doc>");
+ }
+
+ @Test
++ @Ignore
+ public void testFalseUTF8() {
+ roundTrip(false, false, "UTF-8", "<doc>−</doc>");
+ }
+@@ -85,16 +89,19 @@ public class TestIssue008ExpandEntity {
+
+
+ @Test
++ @Ignore
+ public void testValidFalse() {
+ roundTrip(false, true, null, "<doc>−</doc>");
+ }
+
+ @Test
++ @Ignore
+ public void testValidFalseUSASCII() {
+ roundTrip(false, true, "US-ASCII", "<doc>−</doc>");
+ }
+
+ @Test
++ @Ignore
+ public void testValidFalseUTF8() {
+ roundTrip(false, true, "UTF-8", "<doc>−</doc>");
+ }
diff --git a/dev-java/jdom/jdom-2.0.6.1.ebuild b/dev-java/jdom/jdom-2.0.6.1.ebuild
index 5cbdaa66520d..774430ba8820 100644
--- a/dev-java/jdom/jdom-2.0.6.1.ebuild
+++ b/dev-java/jdom/jdom-2.0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,15 +12,12 @@ inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Java-based solution for accessing, manipulating, and outputting XML data"
HOMEPAGE="http://www.jdom.org"
SRC_URI="https://github.com/hunterhacker/jdom/archive/${PN^^}-${PV}.tar.gz"
+S="${WORKDIR}/jdom-JDOM-${PV}"
LICENSE="Apache-1.1"
SLOT="2"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-# FAILURES!!!
-# Tests run: 1887, Failures: 23
-RESTRICT="test"
-
CP_DEPEND="
dev-java/iso-relax:0
dev-java/jaxen:1.2
@@ -40,35 +37,51 @@ RDEPEND="
${CP_DEPEND}
"
-S="${WORKDIR}/jdom-JDOM-${PV}"
+PATCHES=( "${FILESDIR}/jdom-2.0.6.1-skip-failing-tests.patch" )
-JAVA_TEST_SRC_DIR="test/src/java"
-JAVA_TEST_RESOURCE_DIRS="test/src/resources"
JAVA_TEST_GENTOO_CLASSPATH="junit-4,xerces-2"
+JAVA_TEST_RESOURCE_DIRS="test/src/resources"
+JAVA_TEST_SRC_DIR="test/src/java"
src_prepare() {
- default
+ java-pkg-2_src_prepare
+ default # bug #780585
java-pkg_clean
+ mkdir core/resources || die
+ cp -r core/{package,resources}/META-INF || die
+
# Remove Android stuff to avoid junit RDEPEND.
rm -vr contrib/src/java/org/jdom2/contrib/android || die
- # There are resources in JAVA_TEST_SRC_DIR
- cp -r test/src/{java,resources}/org || die
- # Remove .java files from JAVA_TEST_RESOURCE_DIRS
- find test/src/resources -type f -name '*.java' -exec rm -rf {} + || die "deleting classes failed"
+ cd test/src/java || die
+ # java-pkg-simple.eclass expects test resources in JAVA_TEST_RESOURCE_DIRS
+ find . -type f ! -name '*.java' \
+ | xargs cp --parent -t ../resources || die
+
+ # We skip testDocTypeDocument() from 3 test classes due to test failures,
+ # see bug #901743. This requires changing also the line endings which would
+ # lead to huge patches. Hence we do this with sed ( 's/\r$//g' ).
+ sed \
+ -e 's/\r$//g' \
+ -e '/import org.junit.Test/a import org.junit.Ignore;' \
+ -e '/testDocTypeDocument()/i @Ignore' \
+ -i org/jdom2/test/cases/input/TestDOMBuilder.java \
+ -i org/jdom2/test/cases/input/TestStAXEventBuilder.java \
+ -i org/jdom2/test/cases/input/TestStAXStreamBuilder.java || die
}
src_compile() {
- JAVA_SRC_DIR="core/src/java"
JAVA_JAR_FILENAME="jdom.jar"
+ JAVA_RESOURCE_DIRS="core/resources"
+ JAVA_SRC_DIR="core/src/java"
java-pkg-simple_src_compile
JAVA_GENTOO_CLASSPATH_EXTRA+=":jdom.jar"
rm -rf target || die
- JAVA_SRC_DIR="contrib/src/java"
- JAVA_RESOURCE_DIRS="contrib/src/resources"
JAVA_JAR_FILENAME="jdom-contrib.jar"
+ JAVA_RESOURCE_DIRS="contrib/src/resources"
+ JAVA_SRC_DIR="contrib/src/java"
java-pkg-simple_src_compile
JAVA_GENTOO_CLASSPATH_EXTRA+=":jdom-contrib.jar"
rm -rf target || die
@@ -85,7 +98,7 @@ src_compile() {
}
src_install() {
- default # https://bugs.gentoo.org/789582
+ default # install README
java-pkg_dojar "jdom.jar"
java-pkg_dojar "jdom-contrib.jar"
if use doc; then
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/files/, dev-java/jdom/
@ 2022-06-23 3:56 Miroslav Šulc
0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2022-06-23 3:56 UTC (permalink / raw
To: gentoo-commits
commit: 0f9a4ef4760d05d8eddbe5ffea7f3b79758dd5f6
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Jun 22 13:41:58 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 03:56:31 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f9a4ef4
dev-java/jdom: drop 2.0.6-r5
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/26040
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/jdom/Manifest | 1 -
dev-java/jdom/files/build-xml-2.patch | 36 --------------------
dev-java/jdom/jdom-2.0.6-r5.ebuild | 64 -----------------------------------
3 files changed, 101 deletions(-)
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index f1a5bdf79b25..ac1c82fc0e38 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,3 +1,2 @@
DIST JDOM-2.0.6.1.tar.gz 8368301 BLAKE2B b9d5d8e611b9a0505c9576f2c4a2243eddd8a171bbe44d83440edf44154cae80138ddca8a0bceb3124a6825111d30641a28d645507a1bacad6a8cb9ad1dbccdd SHA512 c09b422b0635a478cb70e57e4c35bc7f505f6a2730be813d6e63c053814581e4dc3fdf431b945394c30ab37a8fb83fd103767f8de84d28bef79e95e2c37518e1
-DIST JDOM-2.0.6.tar.gz 8344114 BLAKE2B 0b9a568fe4de1fb9afc5a547d75aa1d3556bf497c76e3d32d1ebd7658634ea02e4fafa3c6261b64d9b803fc6e78ae013fb8a366bcbd5024e8ab0aced83f58e33 SHA512 d585b39159f0887485b2e681609b51113de6bc7c43627c42d7e81eb06ac65c507b43cf3d81c5df4399b1e3abf454c8852264a84567940bc5ba0c358eb9c0c4a1
DIST jdom-1.1.3.tar.gz 4233403 BLAKE2B 9e4afacc6f10d2be1d793bd3b9f438f79e8e27f50bcae83eac5054df806c01c211ac493465bcda58ac204e796663ffb8aedf43a177f23c23a69af399243461a0 SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278
diff --git a/dev-java/jdom/files/build-xml-2.patch b/dev-java/jdom/files/build-xml-2.patch
deleted file mode 100644
index 420f9eff1993..000000000000
--- a/dev-java/jdom/files/build-xml-2.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/build.xml 2015-02-15 02:58:04.000000000 +0000
-+++ b/build.xml 2015-08-27 23:11:09.807800249 +0100
-@@ -267,7 +267,7 @@
- </javac>
- </target>
-
-- <target name="compile" depends="compile.core, compile.junit, compile.contrib, compile.samples"
-+ <target name="compile" depends="compile.core, compile.contrib, compile.samples"
- description="Compiles all JDOM code (core, samples, junit, contrib)" />
-
- <!-- =================================================================== -->
-@@ -296,7 +296,7 @@
- <!-- =================================================================== -->
- <!-- Creates the jars -->
- <!-- =================================================================== -->
-- <target name="jars" depends="compile, javadoc"
-+ <target name="jars" depends="compile"
- description="Builds the Jars">
- <fixcrlf srcdir="." includes="**/*.bat" excludes="build*.*" eol="crlf"/>
- <fixcrlf srcdir="." includes="**/*.sh" excludes="build*.*" eol="lf"/>
-@@ -320,6 +320,7 @@
- <fileset dir="${contrib.build}" includes="**/*" />
- <fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />
- </jar>
-+<!--
- <jar jarfile="${package}/${jarbase}-junit.jar" >
- <fileset dir="${junit.build}" includes="**/*" />
- <fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />
-@@ -332,6 +333,7 @@
- <fileset dir="${contrib.src}" includes="**/*" />
- </jar>
-
-+-->
- </target>
-
- <target name="androidtests" depends="jars">
diff --git a/dev-java/jdom/jdom-2.0.6-r5.ebuild b/dev-java/jdom/jdom-2.0.6-r5.ebuild
deleted file mode 100644
index 772c36da6de7..000000000000
--- a/dev-java/jdom/jdom-2.0.6-r5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="JDOM-${PV}"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="https://github.com/hunterhacker/${PN}/archive/${MY_P}.tar.gz"
-HOMEPAGE="http://www.jdom.org"
-
-LICENSE="Apache-1.1"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
- dev-java/iso-relax:0
- dev-java/jaxen:1.2
- dev-java/xalan:0"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.8:*"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.8:*
- test? ( dev-java/ant-junit:0 )"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="jars"
-EANT_TEST_TARGET="junit"
-EANT_GENTOO_CLASSPATH="iso-relax,jaxen-1.2,xalan"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/build-xml-2.patch"
-)
-
-src_prepare() {
- default
- java-pkg_clean
-
- # Remove Android stuff to avoid junit RDEPEND.
- rm -vr contrib/src/java/org/jdom2/contrib/android || die
-}
-
-src_install() {
- java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??.jar ${PN}.jar
- java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??-contrib.jar ${PN}-contrib.jar
-
- dodoc {CHANGES,COMMITTERS,README,TODO}.txt
- use doc && java-pkg_dojavadoc build/apidocs
- use source && java-pkg_dosrc {contrib,core}/src/java/*
-}
-
-src_test() {
- java-pkg-2_src_test
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/files/, dev-java/jdom/
@ 2021-04-18 13:44 Miroslav Šulc
0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2021-04-18 13:44 UTC (permalink / raw
To: gentoo-commits
commit: 50a56a0bf3dd898b5f7c9fea5ce16d8b7bc893b2
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Apr 17 15:18:48 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Apr 18 13:44:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50a56a0b
dev-java/jdom: eapi7, min java 1.8
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20427
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/jdom/files/build-xml-2.patch | 4 +--
dev-java/jdom/jdom-2.0.6-r5.ebuild | 64 +++++++++++++++++++++++++++++++++++
2 files changed, 66 insertions(+), 2 deletions(-)
diff --git a/dev-java/jdom/files/build-xml-2.patch b/dev-java/jdom/files/build-xml-2.patch
index 2e3cb94ef1d..420f9eff199 100644
--- a/dev-java/jdom/files/build-xml-2.patch
+++ b/dev-java/jdom/files/build-xml-2.patch
@@ -1,5 +1,5 @@
---- build.xml.orig 2015-02-15 02:58:04.000000000 +0000
-+++ build.xml 2015-08-27 23:11:09.807800249 +0100
+--- a/build.xml 2015-02-15 02:58:04.000000000 +0000
++++ b/build.xml 2015-08-27 23:11:09.807800249 +0100
@@ -267,7 +267,7 @@
</javac>
</target>
diff --git a/dev-java/jdom/jdom-2.0.6-r5.ebuild b/dev-java/jdom/jdom-2.0.6-r5.ebuild
new file mode 100644
index 00000000000..b1c14083879
--- /dev/null
+++ b/dev-java/jdom/jdom-2.0.6-r5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="JDOM-${PV}"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java API to manipulate XML data"
+SRC_URI="https://github.com/hunterhacker/${PN}/archive/${MY_P}.tar.gz"
+HOMEPAGE="http://www.jdom.org"
+
+LICENSE="Apache-1.1"
+SLOT="2"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+ dev-java/iso-relax:0
+ dev-java/jaxen:1.2
+ dev-java/xalan:0"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.8:*"
+
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.8:*
+ test? ( dev-java/ant-junit:0 )"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_BUILD_TARGET="jars"
+EANT_TEST_TARGET="junit"
+EANT_GENTOO_CLASSPATH="iso-relax,jaxen-1.2,xalan"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}/build-xml-2.patch"
+)
+
+src_prepare() {
+ default
+ java-pkg_clean
+
+ # Remove Android stuff to avoid junit RDEPEND.
+ rm -vr contrib/src/java/org/jdom2/contrib/android || die
+}
+
+src_install() {
+ java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??.jar ${PN}.jar
+ java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??-contrib.jar ${PN}-contrib.jar
+
+ dodoc {CHANGES,COMMITTERS,README,TODO}.txt
+ use doc && java-pkg_dojavadoc build/apidocs
+ use source && java-pkg_dosrc {contrib,core}/src/java/*
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/files/, dev-java/jdom/
@ 2015-08-27 22:52 James Le Cuirot
0 siblings, 0 replies; 4+ messages in thread
From: James Le Cuirot @ 2015-08-27 22:52 UTC (permalink / raw
To: gentoo-commits
commit: f92754eb59a6455a640affcc7e946bba18c58051
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 22:51:36 2015 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 22:52:25 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f92754eb
dev-java/jdom: Another rewrite of the v2 ebuild using Ant
Here comes a new challenger! I got sick of monsieurp and wltjr arguing
about this package so I decided to outdo them both. :) It was awkward
to build before because they had missed the build.xml file present on
GitHub.
* All tests now pass.
* RDEPEND on junit removed.
* Unnecessary xml-commons-external dependency removed.
* License changed as "JDOM" is basically just Apache-1.1.
Package-Manager: portage-2.2.20.1
dev-java/jdom/Manifest | 1 +
dev-java/jdom/files/build-xml-2.patch | 36 +++++++++++
dev-java/jdom/jdom-2.0.6-r1.ebuild | 64 ------------------
dev-java/jdom/jdom-2.0.6-r2.ebuild | 79 -----------------------
dev-java/jdom/jdom-2.0.6-r3.ebuild | 118 ----------------------------------
dev-java/jdom/jdom-2.0.6-r4.ebuild | 56 ++++++++++++++++
6 files changed, 93 insertions(+), 261 deletions(-)
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index a643f6e..3cbcf34 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,3 +1,4 @@
+DIST JDOM-2.0.6.tar.gz 8344114 SHA256 81790196ecbd9cf62cb2aa2a9c14153d74dae3a0364a9a262f42098c6d3c165d SHA512 d585b39159f0887485b2e681609b51113de6bc7c43627c42d7e81eb06ac65c507b43cf3d81c5df4399b1e3abf454c8852264a84567940bc5ba0c358eb9c0c4a1 WHIRLPOOL 71df273140951ac9f5b2f9b06b7f8aa2fe43d05d93ceec9a508856a1cd5c571d897809d5b692fcf28ea0f45c203346b02745f170fac548b77e47904a3f8ce817
DIST jdom-1.0.tar.gz 3571788 SHA256 fdb77a2c9f8f91a9bd898a0d99b941b79137b5ab692e35ca17dcb73a58b15f77 SHA512 0bf1df21cdacdddb1df8bdfc2c4aa307bb6516a7614eb7382e99a60d03d9fcf77333e84f37ed653f264e7e9cdecb91fb9e2e11fcf76d70b3068bf238be4d0b24 WHIRLPOOL 329163b0a6838322be5174e7a6eddcafeddecc54e541cbdb28748f99da88c79349f67bd79c88bda6944d142440df8d21b21cb0fbb2b1497a6fc84f30a531f8f3
DIST jdom-1.1.3.tar.gz 4233403 SHA256 d471718c4ac7a1a2f10715b93cb3fcd2ecbab60384b73ad1c089712e47bd8d1f SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278 WHIRLPOOL b9f610001e152c41fcd3a0328b4ff563b33220f2cde8571ba09dd9063bc63fe51af80229c2bfdd7aeff4a0b354cd04a8d11f9fccb42b8620b2225c6f9ecd38e0
DIST jdom-2.0.6.zip 7464948 SHA256 86b8683187ca28a935991cbffe5d1a9cfe88e5141e14905694a95e832f775b12 SHA512 dc84ede1eb05f7178a7f5b55f4035655096becee483966d7e0934484522c5981a1fdca836ae9ea6f3d2538c50b7a3cb9029264cd6427f5308d3ac7666e160cff WHIRLPOOL d568a18d8fc369ec0cf2954b16d2360ac934726c93ea31a59d75bc1913a9b1fba5d7cd02f6822ab21000b8df51380f2087e8690a3b66352e8d1267809091b374
diff --git a/dev-java/jdom/files/build-xml-2.patch b/dev-java/jdom/files/build-xml-2.patch
new file mode 100644
index 0000000..2e3cb94
--- /dev/null
+++ b/dev-java/jdom/files/build-xml-2.patch
@@ -0,0 +1,36 @@
+--- build.xml.orig 2015-02-15 02:58:04.000000000 +0000
++++ build.xml 2015-08-27 23:11:09.807800249 +0100
+@@ -267,7 +267,7 @@
+ </javac>
+ </target>
+
+- <target name="compile" depends="compile.core, compile.junit, compile.contrib, compile.samples"
++ <target name="compile" depends="compile.core, compile.contrib, compile.samples"
+ description="Compiles all JDOM code (core, samples, junit, contrib)" />
+
+ <!-- =================================================================== -->
+@@ -296,7 +296,7 @@
+ <!-- =================================================================== -->
+ <!-- Creates the jars -->
+ <!-- =================================================================== -->
+- <target name="jars" depends="compile, javadoc"
++ <target name="jars" depends="compile"
+ description="Builds the Jars">
+ <fixcrlf srcdir="." includes="**/*.bat" excludes="build*.*" eol="crlf"/>
+ <fixcrlf srcdir="." includes="**/*.sh" excludes="build*.*" eol="lf"/>
+@@ -320,6 +320,7 @@
+ <fileset dir="${contrib.build}" includes="**/*" />
+ <fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />
+ </jar>
++<!--
+ <jar jarfile="${package}/${jarbase}-junit.jar" >
+ <fileset dir="${junit.build}" includes="**/*" />
+ <fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />
+@@ -332,6 +333,7 @@
+ <fileset dir="${contrib.src}" includes="**/*" />
+ </jar>
+
++-->
+ </target>
+
+ <target name="androidtests" depends="jars">
diff --git a/dev-java/jdom/jdom-2.0.6-r1.ebuild b/dev-java/jdom/jdom-2.0.6-r1.ebuild
deleted file mode 100644
index 737403e..0000000
--- a/dev-java/jdom/jdom-2.0.6-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="source test doc"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="http://www.jdom.org/dist/binary/${P}.zip"
-HOMEPAGE="http://www.jdom.org"
-LICENSE="JDOM"
-SLOT="2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-CDEPEND="dev-java/iso-relax:0
- dev-java/jaxen:1.1
- dev-java/xalan:0
- dev-java/junit:4
- dev-java/xml-commons-external:1.4"
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.6"
-DEPEND="${CDEPEND}
- app-arch/unzip
- >=virtual/jdk-1.6"
-IUSE=""
-
-S="${WORKDIR}"
-
-JAVA_GENTOO_CLASSPATH="xalan,junit-4,jaxen-1.1,iso-relax,xml-commons-external-1.4"
-JAVA_SRC_DIR="org"
-
-src_unpack() {
- default
- cd "${S}"
- unpack ./"${P}-sources".jar
-}
-
-java_prepare() {
- find "${S}"/lib -type f -delete || die
-}
-
-src_compile() {
- java-pkg-simple_src_compile
-}
-
-src_install() {
- java-pkg-simple_src_install
- use source && java-pkg_dosrc org
-}
-
-src_test() {
- local DIR="org/jdom2/test"
- local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
-
- local TESTS=$(find "${DIR}" -name "*Test.java" ! -name "Abstract*")
- TESTS="${TESTS//src\/test\/java\/}"
- TESTS="${TESTS//.java}"
- TESTS="${TESTS//\//.}"
-
- ejavac -classpath "${CP}" -d "${DIR}" $(find "${DIR}" -name "*.java")
- ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/jdom/jdom-2.0.6-r2.ebuild b/dev-java/jdom/jdom-2.0.6-r2.ebuild
deleted file mode 100644
index c3bc88d..0000000
--- a/dev-java/jdom/jdom-2.0.6-r2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="source test doc"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="http://www.jdom.org/dist/binary/${P}.zip"
-HOMEPAGE="http://www.jdom.org"
-LICENSE="JDOM"
-SLOT="2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-CDEPEND="
- test? (
- dev-java/junit:4
- )
- dev-java/xalan:0
- dev-java/jaxen:1.1
- dev-java/iso-relax:0
- dev-java/xml-commons-external:1.4"
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- ${CDEPEND}"
-IUSE=""
-
-S="${WORKDIR}"
-
-JAVA_GENTOO_CLASSPATH="xalan,jaxen-1.1,iso-relax,xml-commons-external-1.4"
-JAVA_SRC_DIR="org"
-
-src_unpack() {
- default
- cd "${S}"
- unpack ./"${P}-sources".jar
-}
-
-java_prepare() {
- find "${S}"/lib -type f -delete || die
- if ! use test; then
- local UNIT_TESTS=(
- "${S}"/org/jdom2/test
- "${S}"/org/jdom2/Test*.java
- "${S}"/org/jdom2/contrib/android/TranslateTests.java
- "${S}"/org/jdom2/input/sax/TestTextBuffer.java
- )
-
- rm -rf "${UNIT_TESTS[@]}" || die
- else
- JAVA_GENTOO_CLASSPATH+=",junit-4"
- fi
-}
-
-src_compile() {
- java-pkg-simple_src_compile
-}
-
-src_install() {
- java-pkg-simple_src_install
- use source && java-pkg_dosrc org
-}
-
-src_test() {
- local DIR="org/jdom2/test"
- local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
-
- local TESTS=$(find "${DIR}" -name "*Test.java" ! -name "Abstract*")
- TESTS="${TESTS//src\/test\/java\/}"
- TESTS="${TESTS//.java}"
- TESTS="${TESTS//\//.}"
-
- ejavac -classpath "${CP}" -d "${DIR}" $(find "${DIR}" -name "*.java")
- ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/jdom/jdom-2.0.6-r3.ebuild b/dev-java/jdom/jdom-2.0.6-r3.ebuild
deleted file mode 100644
index be6ed0e..0000000
--- a/dev-java/jdom/jdom-2.0.6-r3.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="source test doc"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="http://www.jdom.org/dist/binary/${P}.zip"
-HOMEPAGE="http://www.jdom.org"
-LICENSE="JDOM"
-SLOT="2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-CDEPEND="
- test? (
- dev-java/junit:4
- )
- dev-java/xalan:0
- dev-java/jaxen:1.1
- dev-java/iso-relax:0
- dev-java/xml-commons-external:1.4"
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- ${CDEPEND}"
-IUSE=""
-
-S="${WORKDIR}"
-
-JAVA_GENTOO_CLASSPATH="xalan,jaxen-1.1,iso-relax,xml-commons-external-1.4"
-JAVA_SRC_DIR="org"
-
-# Dubious tests:
-# They either do not pass or don't have runnable methods (i.e. tests)
-UNIT_TESTS=(
- org/jdom2/test/cases/input/sax/TestXMLReaderSAX2Factory.java
- org/jdom2/test/cases/input/sax/TestXMLReaderSingletons.java
- org/jdom2/test/cases/input/sax/TestXMLReaderXSDFactory.java
- org/jdom2/test/cases/input/sax/TestXMLReaderJAXPFactory.java
- org/jdom2/test/cases/input/sax/TestXMLReaderSchemaFactory.java
- org/jdom2/test/cases/input/TestSAXComplexSchema.java
- org/jdom2/test/cases/input/TestSAXBuilder.java
- org/jdom2/test/cases/input/TestSAXHandler.java
- org/jdom2/test/cases/input/TestDOMBuilder.java
- org/jdom2/test/cases/input/TestDTDParser.java
- org/jdom2/test/cases/input/TestJDOMParseExceptn.java
- org/jdom2/test/cases/input/TestStAXEventBuilder.java
- org/jdom2/test/cases/input/TestBuilderErrorHandler.java
- org/jdom2/test/cases/input/TestStAXStreamBuilder.java
- org/jdom2/test/cases/input/HelpTestDOMBuilder.java
- org/jdom2/test/cases/special/TestIssue008ExpandEntity.java
- org/jdom2/test/cases/located/TestLocatedJDOMFactory.java
- org/jdom2/test/cases/xpath/TestJaxenXPathHelper.java
- org/jdom2/test/cases/xpath/TestDefaultXPathHelper.java
-)
-
-src_unpack() {
- default
- cd "${S}"
- unpack ./"${P}-sources".jar
-}
-
-java_prepare() {
- find "${S}"/lib -type f -delete || die
- if use test; then
- JAVA_GENTOO_CLASSPATH+=",junit-4"
- else
- # Override the array with different files.
- UNIT_TESTS=(
- org/jdom2/test
- org/jdom2/Test*.java
- org/jdom2/contrib/android/TranslateTests.java
- org/jdom2/input/sax/TestTextBuffer.java
- )
- fi
-
- rm -rf "${UNIT_TESTS[@]}" || die
-}
-
-src_compile() {
- java-pkg-simple_src_compile
-}
-
-src_install() {
- java-pkg-simple_src_install
- use source && java-pkg_dosrc org
-}
-
-src_test() {
- local DIR="org/jdom2/test"
- local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})"
- local TESTS=()
-
- while read -d $'\0' -r file; do
- basefile=$(basename ${file})
- {
- # Skip if starts with Abstract
- [[ ${basefile} =~ ^Abstract ]] || \
- # Skip if doesn't starts with Test
- [[ ! ${basefile} =~ ^Test ]] || \
- # Skip if doesn't end with the .java extension
- [[ ! ${basefile} =~ \.java$ ]]
- } && continue
- TESTS+=(${file})
- done < <(find "${DIR}" -type f -print0)
-
- # Turn ${TESTS[@}} array into a string
- TESTS="${TESTS[@]}"
- TESTS="${TESTS//src\/test\/java\/}"
- TESTS="${TESTS//.java}"
- TESTS="${TESTS//\//.}"
-
- ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/jdom/jdom-2.0.6-r4.ebuild b/dev-java/jdom/jdom-2.0.6-r4.ebuild
new file mode 100644
index 0000000..17153ec
--- /dev/null
+++ b/dev-java/jdom/jdom-2.0.6-r4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="JDOM-${PV}"
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Java API to manipulate XML data"
+SRC_URI="https://github.com/hunterhacker/${PN}/archive/${MY_P}.tar.gz"
+HOMEPAGE="http://www.jdom.org"
+LICENSE="Apache-1.1"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+CDEPEND="dev-java/iso-relax:0
+ dev-java/jaxen:1.1
+ dev-java/xalan:0"
+
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.6"
+
+DEPEND="${CDEPEND}
+ >=virtual/jdk-1.6
+ test? ( dev-java/ant-junit:0 )"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_BUILD_TARGET="jars"
+EANT_TEST_TARGET="junit"
+EANT_GENTOO_CLASSPATH="iso-relax,jaxen-1.1,xalan"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+java_prepare() {
+ epatch "${FILESDIR}/build-xml-2.patch"
+ find -name "*.jar" -delete || die
+
+ # Remove Android stuff to avoid junit RDEPEND.
+ rm -vr contrib/src/java/org/jdom2/contrib/android || die
+}
+
+src_install() {
+ java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??.jar ${PN}.jar
+ java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??-contrib.jar ${PN}-contrib.jar
+
+ dodoc {CHANGES,COMMITTERS,README,TODO}.txt
+ use doc && java-pkg_dojavadoc build/apidocs
+ use source && java-pkg_dosrc {contrib,core}/src/java/*
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-03-27 10:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-27 10:24 [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/files/, dev-java/jdom/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2022-06-23 3:56 Miroslav Šulc
2021-04-18 13:44 Miroslav Šulc
2015-08-27 22:52 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox