[gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/files/, dev-java/dom4j/
commit: 5514fdf0fbce9d9164b96e57db98b0d1a0cf4160
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Fri May 5 22:02:20 2023 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sat May 6 05:03:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5514fdf0
dev-java/dom4j: drop 2.1.3
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/dom4j/Manifest| 1 -
dev-java/dom4j/dom4j-2.1.3.ebuild | 75 --
.../dom4j-2.1.3-xpp3-add-removeAttribute.patch | 47 --
3 files changed, 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
6bd16e8ac34f3af1b9d61218dc6a29862178516cfbb98c6834bf6db846b537e44b48db6ff578b3d67d32c3e2b142e0a2fdcc6dc06a6ea427b04e6bf1f370
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..
--- 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..
--- 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
[gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/
commit: cb85c4fc25cb8d9dd6e0a89ec439b75725b7ff10
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri May 5 18:28:12 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri May 5 18:28:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb85c4fc
dev-java/dom4j: Stabilize 2.1.4 ppc64, #905110
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/dom4j/dom4j-2.1.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/dom4j/dom4j-2.1.4.ebuild
b/dev-java/dom4j/dom4j-2.1.4.ebuild
index 388b81c1023e..1d44328e98cd 100644
--- a/dev-java/dom4j/dom4j-2.1.4.ebuild
+++ b/dev-java/dom4j/dom4j-2.1.4.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-version-${PV}"
LICENSE="dom4j"
SLOT="1"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
IUSE="jaxen"
CP_DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/
commit: 3dbeeaf2e840fbdd2c12a7ed1d06f409d7da88c1
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri May 5 16:05:11 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri May 5 16:05:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dbeeaf2
dev-java/dom4j: Stabilize 2.1.4 arm64, #905110
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/dom4j/dom4j-2.1.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/dom4j/dom4j-2.1.4.ebuild
b/dev-java/dom4j/dom4j-2.1.4.ebuild
index e81983d7d6b5..388b81c1023e 100644
--- a/dev-java/dom4j/dom4j-2.1.4.ebuild
+++ b/dev-java/dom4j/dom4j-2.1.4.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-version-${PV}"
LICENSE="dom4j"
SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
IUSE="jaxen"
CP_DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/
commit: 2c15d992d06a11f59cf355540cae797bda4f10bd
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri May 5 16:05:08 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri May 5 16:05:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c15d992
dev-java/dom4j: Stabilize 2.1.4 amd64, #905110
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/dom4j/dom4j-2.1.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/dom4j/dom4j-2.1.4.ebuild
b/dev-java/dom4j/dom4j-2.1.4.ebuild
index 57e78eb7d856..e81983d7d6b5 100644
--- a/dev-java/dom4j/dom4j-2.1.4.ebuild
+++ b/dev-java/dom4j/dom4j-2.1.4.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-version-${PV}"
LICENSE="dom4j"
SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
IUSE="jaxen"
CP_DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/
commit: 16196eb8d40522607606500a39c43129e8a1184f
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri May 5 16:05:04 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri May 5 16:05:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16196eb8
dev-java/dom4j: Stabilize 2.1.4 x86, #905110
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/dom4j/dom4j-2.1.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/dom4j/dom4j-2.1.4.ebuild
b/dev-java/dom4j/dom4j-2.1.4.ebuild
index 433ef0be38f3..57e78eb7d856 100644
--- a/dev-java/dom4j/dom4j-2.1.4.ebuild
+++ b/dev-java/dom4j/dom4j-2.1.4.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-version-${PV}"
LICENSE="dom4j"
SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
IUSE="jaxen"
CP_DEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/
commit: 33868dec953e72e06162a2f984e1afa7e3be7b7b
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Fri Feb 10 11:39:36 2023 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Mon Mar 27 10:23:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33868dec
dev-java/dom4j: add 2.1.4
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes:
https://github.com/gentoo/gentoo/pull/29519/commits/6a48c0b06691f1d93e5d5af9985817f6301d6314
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/dom4j/Manifest | 1 +
dev-java/dom4j/dom4j-2.1.4.ebuild | 59 +++
2 files changed, 60 insertions(+)
diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
index a884ea898fb6..4562f0eea90e 100644
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@@ -1,2 +1,3 @@
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
6bd16e8ac34f3af1b9d61218dc6a29862178516cfbb98c6834bf6db846b537e44b48db6ff578b3d67d32c3e2b142e0a2fdcc6dc06a6ea427b04e6bf1f370
SHA512
cad582fc12d0741e9e6fd7e0cf80a50feb04f5ef42043df96f8a5b78476c77695d8b43836d2241f76b35676ea759921edd25eaeb2c04ec916eb138aa2901ce5f
diff --git a/dev-java/dom4j/dom4j-2.1.4.ebuild
b/dev-java/dom4j/dom4j-2.1.4.ebuild
new file mode 100644
index ..433ef0be38f3
--- /dev/null
+++ b/dev-java/dom4j/dom4j-2.1.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.dom4j:dom4j:2.1.4"
+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/version-${PV}.tar.gz ->
${P}.tar.gz
+ https://repo1.maven.org/maven2/jaxen/jaxen/1.2.0/jaxen-1.2.0.jar;
+S="${WORKDIR}/${PN}-version-${PV}"
+
+LICENSE="dom4j"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="jaxen"
+
+CP_DEPEND="
+ dev-java/jaxb-api:2
+ dev-java/xpp2:0
+ dev-java/xpp3:0
+ dev-java/xsdlib:0
+"
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*
+ jaxen? ( dev-java/jaxen:1.2[dom4j] )
+ test? ( dev-java/xerces:2 )
+"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*
+ jaxen? ( dev-java/jaxen:1.2[dom4j] )
+"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.dom4j"
+
+# 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_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="testng,xerces-2"
+JAVA_TEST_RESOURCE_DIRS="xml"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_prepare() {
+ java-pkg-2_src_prepare
+ java-pkg_clean ..
+
+ if use jaxen; then
+ JAVA_GENTOO_CLASSPATH+=" jaxen-1.2"
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/
commit: 46188aece08d950987153cadc174b11d0213eaf8
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Mon Jan 10 19:59:59 2022 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Tue Jan 11 08:35:40 2022 +
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 pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/23732
Signed-off-by: Miroslav Šulc 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
6bd16e8ac34f3af1b9d61218dc6a29862178516cfbb98c6834bf6db846b537e44b48db6ff578b3d67d32c3e2b142e0a2fdcc6dc06a6ea427b04e6bf1f370
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..
--- 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..
--- 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
-
[gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/
commit: be4ea30be03d7df16957da33b860134450911eaa
Author: Arthur Zamarin gentoo org>
AuthorDate: Mon Jan 10 19:10:27 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Mon Jan 10 19:10:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be4ea30b
dev-java/dom4j: Keyword 2.1.3 arm, #828049
Signed-off-by: Arthur Zamarin gentoo.org>
dev-java/dom4j/dom4j-2.1.3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/dom4j/dom4j-2.1.3.ebuild
b/dev-java/dom4j/dom4j-2.1.3.ebuild
index 9cf6e22f8633..69be8c48e9fc 100644
--- a/dev-java/dom4j/dom4j-2.1.3.ebuild
+++ b/dev-java/dom4j/dom4j-2.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Skeleton command:
@@ -19,7 +19,7 @@
SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/version-${PV}.tar.gz -
LICENSE="dom4j"
SLOT="1"
-KEYWORDS="amd64 arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
IUSE="jaxen"
CDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/
commit: dd9e500c41a52477f7033d0f26a42921c6fd828b
Author: Sam James gentoo org>
AuthorDate: Thu Dec 2 23:38:40 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Dec 2 23:38:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd9e500c
dev-java/dom4j: Stabilize 2.1.3 arm64, #827967
Signed-off-by: Sam James gentoo.org>
dev-java/dom4j/dom4j-2.1.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/dom4j/dom4j-2.1.3.ebuild
b/dev-java/dom4j/dom4j-2.1.3.ebuild
index 26ca23a6766a..9cf6e22f8633 100644
--- a/dev-java/dom4j/dom4j-2.1.3.ebuild
+++ b/dev-java/dom4j/dom4j-2.1.3.ebuild
@@ -19,7 +19,7 @@
SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/version-${PV}.tar.gz -
LICENSE="dom4j"
SLOT="1"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
IUSE="jaxen"
CDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/
commit: 85d3859acf5f6b3418374d8cf282d7d3275d6294
Author: Sam James gentoo org>
AuthorDate: Thu Dec 2 19:50:15 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Dec 2 19:51:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85d3859a
dev-java/dom4j: Stabilize 2.1.3 ppc64, #827967
Signed-off-by: Sam James gentoo.org>
dev-java/dom4j/dom4j-2.1.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/dom4j/dom4j-2.1.3.ebuild
b/dev-java/dom4j/dom4j-2.1.3.ebuild
index 48d0ffcb2cfa..26ca23a6766a 100644
--- a/dev-java/dom4j/dom4j-2.1.3.ebuild
+++ b/dev-java/dom4j/dom4j-2.1.3.ebuild
@@ -19,7 +19,7 @@
SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/version-${PV}.tar.gz -
LICENSE="dom4j"
SLOT="1"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
IUSE="jaxen"
CDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/
commit: 378ebcbc50c4607bd1c38d95e24e0aab81f3bcfa
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Nov 10 07:04:24 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Nov 10 07:04:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=378ebcbc
dev-java/dom4j: x86 stable wrt bug #719318
Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-java/dom4j/dom4j-2.1.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/dom4j/dom4j-2.1.3.ebuild
b/dev-java/dom4j/dom4j-2.1.3.ebuild
index 604ad5b4e6c..48d0ffcb2cf 100644
--- a/dev-java/dom4j/dom4j-2.1.3.ebuild
+++ b/dev-java/dom4j/dom4j-2.1.3.ebuild
@@ -19,7 +19,7 @@
SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/version-${PV}.tar.gz -
LICENSE="dom4j"
SLOT="1"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
IUSE="jaxen"
CDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/
commit: 7f885e34869646048be49b53d4c75452d8dd02ab
Author: Jakov Smolić gentoo org>
AuthorDate: Sun Nov 7 16:55:41 2021 +
Commit: Jakov Smolić gentoo org>
CommitDate: Sun Nov 7 16:55:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f885e34
dev-java/dom4j: Stabilize 2.1.3 amd64, #719318
Signed-off-by: Jakov Smolić gentoo.org>
dev-java/dom4j/dom4j-2.1.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/dom4j/dom4j-2.1.3.ebuild
b/dev-java/dom4j/dom4j-2.1.3.ebuild
index da4825f390c..604ad5b4e6c 100644
--- a/dev-java/dom4j/dom4j-2.1.3.ebuild
+++ b/dev-java/dom4j/dom4j-2.1.3.ebuild
@@ -19,7 +19,7 @@
SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/version-${PV}.tar.gz -
LICENSE="dom4j"
SLOT="1"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
IUSE="jaxen"
CDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/
commit: 4af3f68ab94567144b2ead2aa0265c0945e584e7
Author: Sam James gentoo org>
AuthorDate: Tue Oct 19 00:14:31 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Oct 19 00:14:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4af3f68a
dev-java/dom4j: Keyword 2.1.3 arm64, #802609
Signed-off-by: Sam James gentoo.org>
dev-java/dom4j/dom4j-2.1.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/dom4j/dom4j-2.1.3.ebuild
b/dev-java/dom4j/dom4j-2.1.3.ebuild
index f3635e0992e..da4825f390c 100644
--- a/dev-java/dom4j/dom4j-2.1.3.ebuild
+++ b/dev-java/dom4j/dom4j-2.1.3.ebuild
@@ -19,7 +19,7 @@
SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/version-${PV}.tar.gz -
LICENSE="dom4j"
SLOT="1"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
IUSE="jaxen"
CDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/
commit: 0802850c519e9d4b0e5d196e46b076549ed3118f
Author: Sam James gentoo org>
AuthorDate: Sat Jul 24 15:21:43 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Jul 24 15:21:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0802850c
dev-java/dom4j: Keyword 2.1.3 ppc64, #802609
Signed-off-by: Sam James gentoo.org>
dev-java/dom4j/dom4j-2.1.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/dom4j/dom4j-2.1.3.ebuild
b/dev-java/dom4j/dom4j-2.1.3.ebuild
index 46f4b495689..f3635e0992e 100644
--- a/dev-java/dom4j/dom4j-2.1.3.ebuild
+++ b/dev-java/dom4j/dom4j-2.1.3.ebuild
@@ -19,7 +19,7 @@
SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/version-${PV}.tar.gz -
LICENSE="dom4j"
SLOT="1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE="jaxen"
CDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/files/, dev-java/dom4j/
commit: fdefd7b25414d9e57612fb8b43c28e7e6e65ce4d
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Mon May 17 13:24:31 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sat Jul 17 12:09:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdefd7b2
dev-java/dom4j: bump to 2.1.3 (CVE-2020-10683)
Bug: https://bugs.gentoo.org/719318
rewritten with java-pkg-simple.eclass
introducing "jaxen" USE flag
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/21319
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/dom4j/Manifest| 2 +
dev-java/dom4j/dom4j-2.1.3.ebuild | 75 ++
.../dom4j-2.1.3-xpp3-add-removeAttribute.patch | 47 ++
dev-java/dom4j/metadata.xml| 3 +
4 files changed, 127 insertions(+)
diff --git a/dev-java/dom4j/Manifest b/dev-java/dom4j/Manifest
index a5c57e59200..8913db1a98e 100644
--- a/dev-java/dom4j/Manifest
+++ b/dev-java/dom4j/Manifest
@@ -1,2 +1,4 @@
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
6bd16e8ac34f3af1b9d61218dc6a29862178516cfbb98c6834bf6db846b537e44b48db6ff578b3d67d32c3e2b142e0a2fdcc6dc06a6ea427b04e6bf1f370
SHA512
cad582fc12d0741e9e6fd7e0cf80a50feb04f5ef42043df96f8a5b78476c77695d8b43836d2241f76b35676ea759921edd25eaeb2c04ec916eb138aa2901ce5f
diff --git a/dev-java/dom4j/dom4j-2.1.3.ebuild
b/dev-java/dom4j/dom4j-2.1.3.ebuild
new file mode 100644
index 000..46f4b495689
--- /dev/null
+++ b/dev-java/dom4j/dom4j-2.1.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 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 ~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
[gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/
commit: 90f6986ce4c132146192a7ab7eb3a0d1da82e8a0
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sun Apr 18 07:51:34 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Apr 18 16:54:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90f6986c
dev-java/dom4j: upgrade jaxen:1.1 -> jaxen:1.2
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20412
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/dom4j/dom4j-1.6.1-r9.ebuild | 84
1 file changed, 84 insertions(+)
diff --git a/dev-java/dom4j/dom4j-1.6.1-r9.ebuild
b/dev-java/dom4j/dom4j-1.6.1-r9.ebuild
new file mode 100644
index 000..717d7ddf29b
--- /dev/null
+++ b/dev-java/dom4j/dom4j-1.6.1-r9.ebuild
@@ -0,0 +1,84 @@
+# 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/*
+}
[gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/
commit: 1cd35b6c3d542f8025b2725e4d487c45f017ac7e
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Sat Apr 17 13:09:05 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sat Apr 17 13:47:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cd35b6c
dev-java/dom4j: Hompage, metadata
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/20422
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/dom4j/dom4j-1.6.1-r8.ebuild | 2 +-
dev-java/dom4j/metadata.xml | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dev-java/dom4j/dom4j-1.6.1-r8.ebuild
b/dev-java/dom4j/dom4j-1.6.1-r8.ebuild
index 894aca08368..cc77ae8243d 100644
--- a/dev-java/dom4j/dom4j-1.6.1-r8.ebuild
+++ b/dev-java/dom4j/dom4j-1.6.1-r8.ebuild
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source test"
inherit java-pkg-2 java-ant-2
DESCRIPTION="XML Java library"
-HOMEPAGE="http://dom4j.sourceforge.net/;
+HOMEPAGE="https://dom4j.github.io/;
SRC_URI="
mirror://sourceforge/dom4j/${P}.tar.gz
mirror://gentoo/${P}-java5.patch.bz2"
diff --git a/dev-java/dom4j/metadata.xml b/dev-java/dom4j/metadata.xml
index af2c88427c7..2d873897cf3 100644
--- a/dev-java/dom4j/metadata.xml
+++ b/dev-java/dom4j/metadata.xml
@@ -11,6 +11,8 @@
and with full support for DOM, SAX and JAXP.
- dom4j
+ dom4j/dom4j
+ https://github.com/dom4j/dom4j/wiki
+ https://github.com/dom4j/dom4j/issues
[gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/
commit: e6f22160f6c316d167d0d51f80969e1c102bf583
Author: Miroslav Šulc gentoo org>
AuthorDate: Fri Mar 12 11:19:25 2021 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Fri Mar 12 12:18:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6f22160
dev-java/dom4j: eapi7, min jdk/jre 1.8
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Miroslav Šulc gentoo.org>
dev-java/dom4j/{dom4j-1.6.1-r7.ebuild => dom4j-1.6.1-r8.ebuild} | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/dev-java/dom4j/dom4j-1.6.1-r7.ebuild
b/dev-java/dom4j/dom4j-1.6.1-r8.ebuild
similarity index 94%
rename from dev-java/dom4j/dom4j-1.6.1-r7.ebuild
rename to dev-java/dom4j/dom4j-1.6.1-r8.ebuild
index b74f951b820..894aca08368 100644
--- a/dev-java/dom4j/dom4j-1.6.1-r7.ebuild
+++ b/dev-java/dom4j/dom4j-1.6.1-r8.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
JAVA_PKG_IUSE="doc source test"
@@ -26,8 +26,9 @@ CDEPEND="
RDEPEND="
${CDEPEND}
- >=virtual/jre-1.6"
+ >=virtual/jre-1.8:*"
+# restricted to jdk 1.8 because it needs javax.xml.bind
DEPEND="
${CDEPEND}
test? (
@@ -35,7 +36,7 @@ DEPEND="
dev-java/ant-junit:0
dev-java/junitperf:0
)
- >=virtual/jdk-1.6"
+ virtual/jdk:1.8"
PDEPEND="dev-java/jaxen:1.1"
[gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/
commit: 8770f0167a206f5832888d0a96c2940b03934d2a Author: Alexis Ballier gentoo org> AuthorDate: Thu Jul 13 17:23:42 2017 + Commit: Alexis Ballier gentoo org> CommitDate: Thu Jul 13 17:27:34 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8770f016 dev-java/dom4j: keyword ~arm64 Package-Manager: Portage-2.3.6, Repoman-2.3.2 dev-java/dom4j/dom4j-1.6.1-r7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-java/dom4j/dom4j-1.6.1-r7.ebuild b/dev-java/dom4j/dom4j-1.6.1-r7.ebuild index 18acf297ecf..9fd5cbffd46 100644 --- a/dev-java/dom4j/dom4j-1.6.1-r7.ebuild +++ b/dev-java/dom4j/dom4j-1.6.1-r7.ebuild @@ -15,7 +15,7 @@ SRC_URI=" LICENSE="dom4j" SLOT="1" -KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="" CDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/
commit: 77cd22f60f380301847f62d41b83bf1898556091
Author: Patrice Clement gentoo org>
AuthorDate: Fri Apr 7 20:58:34 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Fri Apr 7 20:58:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77cd22f6
dev-java/dom4j: clean up old.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-java/dom4j/dom4j-1.6.1-r5.ebuild | 77 ---
dev-java/dom4j/dom4j-1.6.1-r6.ebuild | 79
2 files changed, 156 deletions(-)
diff --git a/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
b/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
deleted file mode 100644
index 47c6f489197..000
--- a/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java library for working with XML"
-HOMEPAGE="http://dom4j.sourceforge.net/;
-SRC_URI="
- mirror://sourceforge/dom4j/${P}.tar.gz
- mirror://gentoo/${P}-java5.patch.bz2"
-
-LICENSE="dom4j"
-SLOT="1"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-CDEPEND="
- dev-java/xpp2:0
- dev-java/xpp3:0
- dev-java/jaxme:0
- dev-java/xsdlib:0
- dev-java/relaxng-datatype:0"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DEPEND="
- ${CDEPEND}
- test? (
- dev-java/ant-junit:0
- dev-java/junitperf:0
- )
- >=virtual/jdk-1.6"
-
-java_prepare() {
- # Circular deps with jaxen #212993
- find -name '*.jar' -! -name jaxen-1.1-beta-6.jar -exec rm -v {} + || die
-
- # Add missing methods to compile on Java 5 #137970
- epatch "${WORKDIR}/${P}-java5.patch"
-}
-
-# 0 - Requires X11.
-# 1 - Fails with JDK 1.7.
-# 2 - Fails with JDK 1.6.
-JAVA_RM_FILES=(
- src/test/org/dom4j/bean/BeansTest.java
- src/test/org/dom4j/io/StaxTest.java
- src/test/org/dom4j/rule/RuleTest.java
-)
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-
-EANT_BUILD_TARGET="clean package"
-EANT_GENTOO_CLASSPATH="jaxme,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"
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_dojar "build/${PN}.jar"
- 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-r6.ebuild
b/dev-java/dom4j/dom4j-1.6.1-r6.ebuild
deleted file mode 100644
index de9cd73a50d..000
--- a/dev-java/dom4j/dom4j-1.6.1-r6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java library for working with XML"
-HOMEPAGE="http://dom4j.sourceforge.net/;
-SRC_URI="
- mirror://sourceforge/dom4j/${P}.tar.gz
- mirror://gentoo/${P}-java5.patch.bz2"
-
-LICENSE="dom4j"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
~x86-linux ~ppc-macos ~x64-macos ~x86-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.6"
-
-DEPEND="
- ${CDEPEND}
- test? (
- dev-java/ant-junit:0
- dev-java/junitperf:0
- )
- >=virtual/jdk-1.6"
-
-PDEPEND="dev-java/jaxen:1.1"
-
-java_prepare() {
- # Circular deps with jaxen #212993
- find -name '*.jar' -! -name jaxen-1.1-beta-6.jar -exec rm -v {} + || die
-
- # Add missing methods to compile on Java 5 #137970
- epatch "${WORKDIR}/${P}-java5.patch"
-}
-
-# 0 - Requires X11.
-# 1 - Fails with JDK 1.7.
-# 2 - Fails with JDK 1.6.
-JAVA_RM_FILES=(
- src/test/org/dom4j/bean/BeansTest.java
- src/test/org/dom4j/io/StaxTest.java
- src/test/org/dom4j/rule/RuleTest.java
-)
-
-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"
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_dojar "build/${PN}.jar"
- java-pkg_register-dependency
[gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/
commit: d775ce07b21b99a09a2ddbae8b98a626f49acb2d
Author: Patrice Clement gentoo org>
AuthorDate: Fri Apr 7 20:57:06 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Fri Apr 7 20:58:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d775ce07
dev-java/dom4j: stable for amd64. mark stable for the remaining arches using
the ALLARCHES policy.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-java/dom4j/dom4j-1.6.1-r7.ebuild | 8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/dev-java/dom4j/dom4j-1.6.1-r7.ebuild
b/dev-java/dom4j/dom4j-1.6.1-r7.ebuild
index 5ed8109c4c7..18acf297ecf 100644
--- a/dev-java/dom4j/dom4j-1.6.1-r7.ebuild
+++ b/dev-java/dom4j/dom4j-1.6.1-r7.ebuild
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source test"
inherit java-pkg-2 java-ant-2
-DESCRIPTION="Java library for working with XML"
+DESCRIPTION="XML Java library"
HOMEPAGE="http://dom4j.sourceforge.net/;
SRC_URI="
mirror://sourceforge/dom4j/${P}.tar.gz
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="dom4j"
SLOT="1"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
CDEPEND="
@@ -59,10 +59,6 @@ src_prepare() {
rm -v "${JAVA_RM_FILES[@]}" || die
}
-# 0 - Requires X11.
-# 1 - Fails with JDK 1.7.
-# 2 - Fails with JDK 1.6.
-
JAVA_ANT_REWRITE_CLASSPATH="yes"
JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
[gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/
commit: a33756daaf14a2155fbf74363871c2219dc52293
Author: Patrice Clement gentoo org>
AuthorDate: Sat Apr 1 21:49:12 2017 +
Commit: Patrice Clement gentoo org>
CommitDate: Sat Apr 1 22:03:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a33756da
dev-java/dom4j: EAPI 6 bump.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-java/dom4j/dom4j-1.6.1-r7.ebuild | 87
1 file changed, 87 insertions(+)
diff --git a/dev-java/dom4j/dom4j-1.6.1-r7.ebuild
b/dev-java/dom4j/dom4j-1.6.1-r7.ebuild
new file mode 100644
index 000..5ed8109c4c7
--- /dev/null
+++ b/dev-java/dom4j/dom4j-1.6.1-r7.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java library for working with XML"
+HOMEPAGE="http://dom4j.sourceforge.net/;
+SRC_URI="
+ mirror://sourceforge/dom4j/${P}.tar.gz
+ mirror://gentoo/${P}-java5.patch.bz2"
+
+LICENSE="dom4j"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
~x86-linux ~ppc-macos ~x64-macos ~x86-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.6"
+
+DEPEND="
+ ${CDEPEND}
+ test? (
+ dev-java/xalan:0
+ dev-java/ant-junit:0
+ dev-java/junitperf:0
+ )
+ >=virtual/jdk-1.6"
+
+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
+}
+
+# 0 - Requires X11.
+# 1 - Fails with JDK 1.7.
+# 2 - Fails with JDK 1.6.
+
+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/*
+}
[gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/
commit: 85a791e393424acc69584f6d36fd4751b0dfee0f
Author: James Le Cuirot gentoo org>
AuthorDate: Sun Feb 21 21:10:05 2016 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sun Feb 21 21:10:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85a791e3
dev-java/dom4j: Remove jaxme (R)DEPEND, add jaxen PDEPEND
jaxme has been effectively included in Java since 6 and should go.
dom4j has a cyclic dependency of jaxen so we already use the bundled
version to build against but a PDEPEND was never added, which leaves
it broken. Closes bug #212993.
Package-Manager: portage-2.2.27
dev-java/dom4j/dom4j-1.6.1-r6.ebuild | 80
1 file changed, 80 insertions(+)
diff --git a/dev-java/dom4j/dom4j-1.6.1-r6.ebuild
b/dev-java/dom4j/dom4j-1.6.1-r6.ebuild
new file mode 100644
index 000..cc6b666
--- /dev/null
+++ b/dev-java/dom4j/dom4j-1.6.1-r6.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java library for working with XML"
+HOMEPAGE="http://dom4j.sourceforge.net/;
+SRC_URI="
+ mirror://sourceforge/dom4j/${P}.tar.gz
+ mirror://gentoo/${P}-java5.patch.bz2"
+
+LICENSE="dom4j"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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.6"
+
+DEPEND="
+ ${CDEPEND}
+ test? (
+ dev-java/ant-junit:0
+ dev-java/junitperf:0
+ )
+ >=virtual/jdk-1.6"
+
+PDEPEND="dev-java/jaxen:1.1"
+
+java_prepare() {
+ # Circular deps with jaxen #212993
+ find -name '*.jar' -! -name jaxen-1.1-beta-6.jar -exec rm -v {} + || die
+
+ # Add missing methods to compile on Java 5 #137970
+ epatch "${WORKDIR}/${P}-java5.patch"
+}
+
+# 0 - Requires X11.
+# 1 - Fails with JDK 1.7.
+# 2 - Fails with JDK 1.6.
+JAVA_RM_FILES=(
+ src/test/org/dom4j/bean/BeansTest.java
+ src/test/org/dom4j/io/StaxTest.java
+ src/test/org/dom4j/rule/RuleTest.java
+)
+
+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"
+
+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/*
+}
[gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/
commit: 8a0c05661c6f83e456c1d579ec9b8fe2b452cf53
Author: Patrice Clement gentoo org>
AuthorDate: Wed Jan 6 09:48:58 2016 +
Commit: Patrice Clement gentoo org>
CommitDate: Wed Jan 6 10:08:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a0c0566
dev-java/dom4j: Clean up old.
Package-Manager: portage-2.2.26
Signed-off-by: Patrice Clement gentoo.org>
dev-java/dom4j/dom4j-1.6.1-r4.ebuild | 71
1 file changed, 71 deletions(-)
diff --git a/dev-java/dom4j/dom4j-1.6.1-r4.ebuild
b/dev-java/dom4j/dom4j-1.6.1-r4.ebuild
deleted file mode 100644
index 1a72d74..000
--- a/dev-java/dom4j/dom4j-1.6.1-r4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java library for working with XML"
-HOMEPAGE="http://dom4j.sourceforge.net/;
-SRC_URI="
- mirror://sourceforge/dom4j/${P}.tar.gz
- mirror://gentoo/${P}-java5.patch.bz2"
-
-LICENSE="dom4j"
-SLOT="1"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
~x64-solaris ~x86-solaris"
-IUSE=""
-
-COMMON_DEP="
- dev-java/jaxme:0
- dev-java/relaxng-datatype:0
- dev-java/xpp2:0
- dev-java/xpp3:0
- dev-java/xsdlib:0
- java-virtuals/stax-api:0"
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.5"
-DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.5
- test? (
- dev-java/ant-junit:0
- dev-java/junitperf:0
- )"
-
-java_prepare() {
- # Circular deps with jaxen #212993
- find -name '*.jar' -! -name jaxen-1.1-beta-6.jar -exec rm -v {} + || die
-
- # Add missing methods to compile on Java 5 #137970
- epatch "${WORKDIR}/${P}-java5.patch"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-EANT_BUILD_TARGET="clean package"
-EANT_GENTOO_CLASSPATH="jaxme,relaxng-datatype,stax-api,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"
-
-src_test() {
- # Needs X11
- rm -v src/test/org/dom4j/bean/BeansTest.java || die
- # Fails with a 1.6 JDK for some reason
- rm -v src/test/org/dom4j/io/StaxTest.java || die
- # Fails with a 1.7 JDK for some reason
- rm -v src/test/org/dom4j/rule/RuleTest.java || die
-
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_dojar build/${PN}.jar
- use doc && java-pkg_dojavadoc build/doc/api
- use source && java-pkg_dosrc src/java/*
-}
[gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/
commit: e4c63cd495ef13213985216b605f997ac1f13a06
Author: Patrice Clement gentoo org>
AuthorDate: Wed Jan 6 09:31:34 2016 +
Commit: Patrice Clement gentoo org>
CommitDate: Wed Jan 6 10:08:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4c63cd4
dev-java/dom4j: Stable for amd64. Retroactively mark stable for the remaining
arches using the ALLARCHES policy.
Package-Manager: portage-2.2.26
Signed-off-by: Patrice Clement gentoo.org>
dev-java/dom4j/dom4j-1.6.1-r5.ebuild | 27 ---
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
b/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
index 4ed4564..c432149 100644
--- a/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
+++ b/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,22 +16,27 @@ SRC_URI="
LICENSE="dom4j"
SLOT="1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
~x64-solaris ~x86-solaris"
IUSE=""
-CDEPEND="dev-java/xpp2:0
+CDEPEND="
+ dev-java/xpp2:0
dev-java/xpp3:0
dev-java/jaxme:0
dev-java/xsdlib:0
dev-java/relaxng-datatype:0"
-RDEPEND="${CDEPEND}
+
+RDEPEND="
+ ${CDEPEND}
>=virtual/jre-1.6"
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.6
+
+DEPEND="
+ ${CDEPEND}
test? (
dev-java/ant-junit:0
dev-java/junitperf:0
- )"
+ )
+ >=virtual/jdk-1.6"
java_prepare() {
# Circular deps with jaxen #212993
@@ -41,9 +46,9 @@ java_prepare() {
epatch "${WORKDIR}/${P}-java5.patch"
}
-# 0 - Needs X11
-# 1 -Fails with a 1.7 JDK for some reason
-# 2 -Fails with a 1.6 JDK for some reason
+# 0 - Requires X11.
+# 1 - Fails with JDK 1.7.
+# 2 - Fails with JDK 1.6.
JAVA_RM_FILES=(
src/test/org/dom4j/bean/BeansTest.java
src/test/org/dom4j/io/StaxTest.java
@@ -67,7 +72,7 @@ src_test() {
}
src_install() {
- java-pkg_dojar build/${PN}.jar
+ java-pkg_dojar "build/${PN}.jar"
use doc && java-pkg_dojavadoc build/doc/api
use source && java-pkg_dosrc src/java/*
}
[gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/
commit: 2c76bb6dd7d9687ab1db00482b676493fd92efd1
Author: Patrice Clement gentoo org>
AuthorDate: Mon Sep 28 16:06:18 2015 +
Commit: Patrice Clement gentoo org>
CommitDate: Mon Sep 28 16:10:43 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c76bb6d
dev-java/dom4j: Removes java-virtual/stax-api and fixes bug 561504.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement gentoo.org>
dev-java/dom4j/dom4j-1.6.1-r5.ebuild | 73
1 file changed, 73 insertions(+)
diff --git a/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
b/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
new file mode 100644
index 000..4ed4564
--- /dev/null
+++ b/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java library for working with XML"
+HOMEPAGE="http://dom4j.sourceforge.net/;
+SRC_URI="
+ mirror://sourceforge/dom4j/${P}.tar.gz
+ mirror://gentoo/${P}-java5.patch.bz2"
+
+LICENSE="dom4j"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
~x64-solaris ~x86-solaris"
+IUSE=""
+
+CDEPEND="dev-java/xpp2:0
+ dev-java/xpp3:0
+ dev-java/jaxme:0
+ dev-java/xsdlib:0
+ dev-java/relaxng-datatype:0"
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.6"
+DEPEND="${CDEPEND}
+ >=virtual/jdk-1.6
+ test? (
+ dev-java/ant-junit:0
+ dev-java/junitperf:0
+ )"
+
+java_prepare() {
+ # Circular deps with jaxen #212993
+ find -name '*.jar' -! -name jaxen-1.1-beta-6.jar -exec rm -v {} + || die
+
+ # Add missing methods to compile on Java 5 #137970
+ epatch "${WORKDIR}/${P}-java5.patch"
+}
+
+# 0 - Needs X11
+# 1 -Fails with a 1.7 JDK for some reason
+# 2 -Fails with a 1.6 JDK for some reason
+JAVA_RM_FILES=(
+ src/test/org/dom4j/bean/BeansTest.java
+ src/test/org/dom4j/io/StaxTest.java
+ src/test/org/dom4j/rule/RuleTest.java
+)
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+JAVA_ANT_ENCODING="ISO-8859-1"
+
+EANT_BUILD_TARGET="clean package"
+EANT_GENTOO_CLASSPATH="jaxme,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"
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_dojar build/${PN}.jar
+ use doc && java-pkg_dojavadoc build/doc/api
+ use source && java-pkg_dosrc src/java/*
+}
