* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2015-08-25 22:12 Patrice Clement
0 siblings, 0 replies; 31+ messages in thread
From: Patrice Clement @ 2015-08-25 22:12 UTC (permalink / raw
To: gentoo-commits
commit: 762e1d624b1bd525f10e72c233d2236279cb83a9
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 23:11:42 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 23:12:28 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=762e1d62
dev-java/jdom: Do away with the hacks and rewrite this ebuild from scratch using java-pkg-simple. Doing so, this eclass is now generating the documentation for free. Fixes 551700.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/jdom/jdom-2.0.6-r1.ebuild | 64 ++++++++++++++++++++++++++++++++++++++
1 file changed, 64 insertions(+)
diff --git a/dev-java/jdom/jdom-2.0.6-r1.ebuild b/dev-java/jdom/jdom-2.0.6-r1.ebuild
new file mode 100644
index 0000000..737403e
--- /dev/null
+++ b/dev-java/jdom/jdom-2.0.6-r1.ebuild
@@ -0,0 +1,64 @@
+# 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}
+}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2015-08-26 8:18 Patrice Clement
0 siblings, 0 replies; 31+ messages in thread
From: Patrice Clement @ 2015-08-26 8:18 UTC (permalink / raw
To: gentoo-commits
commit: e7679104686aa06eba5659ab59c1d1669a46bd4f
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 09:16:21 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 09:16:48 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7679104
dev-java/jdom: Tests are not unconditional anymore. Fixes bug 551700.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/jdom/jdom-2.0.6-r2.ebuild | 79 ++++++++++++++++++++++++++++++++++++++
1 file changed, 79 insertions(+)
diff --git a/dev-java/jdom/jdom-2.0.6-r2.ebuild b/dev-java/jdom/jdom-2.0.6-r2.ebuild
new file mode 100644
index 0000000..c3bc88d
--- /dev/null
+++ b/dev-java/jdom/jdom-2.0.6-r2.ebuild
@@ -0,0 +1,79 @@
+# 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}
+}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2015-08-27 9:24 Patrice Clement
0 siblings, 0 replies; 31+ messages in thread
From: Patrice Clement @ 2015-08-27 9:24 UTC (permalink / raw
To: gentoo-commits
commit: a454bc9baa8794a3aaa4e86f0bc30473cf9982da
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 10:22:58 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 10:24:25 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a454bc9b
dev-java/jdom: rework src_test function and the whole tests handling reasoning.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/jdom/jdom-2.0.6-r3.ebuild | 118 +++++++++++++++++++++++++++++++++++++
1 file changed, 118 insertions(+)
diff --git a/dev-java/jdom/jdom-2.0.6-r3.ebuild b/dev-java/jdom/jdom-2.0.6-r3.ebuild
new file mode 100644
index 0000000..be6ed0e
--- /dev/null
+++ b/dev-java/jdom/jdom-2.0.6-r3.ebuild
@@ -0,0 +1,118 @@
+# 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}
+}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2015-09-29 21:20 James Le Cuirot
0 siblings, 0 replies; 31+ messages in thread
From: James Le Cuirot @ 2015-09-29 21:20 UTC (permalink / raw
To: gentoo-commits
commit: 84dca9ac6f7fc04c2836b54904bcfe6091f3ad4d
Author: William L. Thomson Jr <wlt <AT> o-sinc <DOT> com>
AuthorDate: Fri Sep 18 00:51:33 2015 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Sep 29 21:20:01 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84dca9ac
dev-java/jdom: Removed older beta versions
Still need to remove 1.0 versions once other ebuilds with updated
slots get marked stable, leaving just 1.1.x versions behind
eventually.
dev-java/jdom/Manifest | 2 -
dev-java/jdom/jdom-1.0_beta10-r4.ebuild | 72 --------------------------------
dev-java/jdom/jdom-1.0_beta10-r6.ebuild | 71 --------------------------------
dev-java/jdom/jdom-1.0_beta9-r2.ebuild | 73 ---------------------------------
dev-java/jdom/jdom-1.0_beta9-r4.ebuild | 59 --------------------------
5 files changed, 277 deletions(-)
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index 3cbcf34..7d42334 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -2,5 +2,3 @@ DIST JDOM-2.0.6.tar.gz 8344114 SHA256 81790196ecbd9cf62cb2aa2a9c14153d74dae3a036
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
-DIST jdom-b10.tar.gz 3565663 SHA256 be6771052ec6d33a192416a9acd0694f1ee2bb5a8eaf506f927a74f56d648a66 SHA512 afea09b55815d021691b682e0a2e006ebbee699e0fa879ffb17712896eea6453016ec49fd6eee8758565eae68f236d5dddcc7fc940dca76c0e580e69bb544f52 WHIRLPOOL 69e555bb7edbf6fd107f58e0f06954683e25f9be46bc9668cce2570ed1d20f285e09b19372288b8a7cd3c4de955f4d16ca54c9cb6c20c1f5966865f439f0b8d3
-DIST jdom-b9.tar.gz 3417274 SHA256 00c4ddf640b17768582bba0e8b8a2584fe42b2540a98d1bfa276fa43bef1a676 SHA512 b210938c2ec539a59664586ef979d834817fba08c96d30fd9696a72ce3961693faa3ea3718687cd208cb35c4227c2e908b2ea9f981ba97b1991414f6347e0963 WHIRLPOOL f5059bb062986ace5ae4872afbf59333c8d9fbf676066135d5fe79806c28bea4c5e3ec8071e2c3fd546c6b4e4c4adafdbae187cc2c340cd78912f6b5d6a4b356
diff --git a/dev-java/jdom/jdom-1.0_beta10-r4.ebuild b/dev-java/jdom/jdom-1.0_beta10-r4.ebuild
deleted file mode 100644
index 975fcac..0000000
--- a/dev-java/jdom/jdom-1.0_beta10-r4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="jdom"
-MY_PV="b10"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="http://www.jdom.org/dist/source/archive/${MY_P}.tar.gz"
-HOMEPAGE="http://www.jdom.org"
-LICENSE="JDOM"
-SLOT="${PV}"
-KEYWORDS="amd64 ppc x86"
-COMMON_DEP="dev-java/saxpath
- >=dev-java/xerces-2.7"
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
- ${COMMON_DEP}"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- rm -v build/*.jar lib/*.jar || die
- rm -rf build/{apidocs,samples} || die
-
- cd "${S}/lib"
- java-pkg_jar-from saxpath,xerces-2
-
- if has_version '=dev-java/jaxen-1.1*'; then
- elog "jaxen detected - building jaxen support."
- elog "you can ignore the warnings below"
- elog "one day there will be better solution"
- JAVA_PKG_STRICT="" java-pkg_jar-from jaxen-1.1
- fi
-}
-
-src_compile() {
- # to prevent a newer jdom from going into cp
- # (EANT_ANT_TASKS doesn't work with none)
- ANT_TASKS="none" eant package $(use_doc)
-}
-
-src_install() {
- java-pkg_dojar build/*.jar
-
- dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt || die
- use doc && java-pkg_dojavadoc build/apidocs
- use examples && java-pkg_doexamples samples
- use source && java-pkg_dosrc src/java/org
-}
-
-pkg_postinst() {
- if ! has_version '=dev-java/jaxen-1.1*'; then
- elog ""
- elog "If you want jaxen support for jdom then"
- elog "please emerge =dev-java/jaxen-1.1* first and"
- elog "re-emerge jdom. Sorry for the"
- elog "inconvenience, this is to break out of the"
- elog "circular dependencies."
- elog ""
- fi
-}
diff --git a/dev-java/jdom/jdom-1.0_beta10-r6.ebuild b/dev-java/jdom/jdom-1.0_beta10-r6.ebuild
deleted file mode 100644
index 60cd422..0000000
--- a/dev-java/jdom/jdom-1.0_beta10-r6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="jdom"
-MY_PV="b10"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="http://www.jdom.org/dist/source/archive/${MY_P}.tar.gz"
-HOMEPAGE="http://www.jdom.org"
-LICENSE="JDOM"
-SLOT="${PV}"
-KEYWORDS="amd64 ppc ppc64 ~x86"
-COMMON_DEP="dev-java/saxpath
- >=dev-java/xerces-2.7"
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
- ${COMMON_DEP}"
-PDEPEND="~dev-java/jdom-jaxen-${PV}"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- rm -v build/*.jar lib/*.jar || die
- rm -rf build/{apidocs,samples} || die
-
- rm -v src/java/org/jdom/xpath/JaxenXPath.java \
- || die "Unable to remove Jaxen Binding class."
-
- cd "${S}/lib"
- java-pkg_jar-from saxpath,xerces-2
-}
-
-src_compile() {
- # to prevent a newer jdom from going into cp
- # (EANT_ANT_TASKS doesn't work with none)
- ANT_TASKS="none" eant package $(use_doc)
-}
-
-src_install() {
- java-pkg_dojar build/*.jar
-
- java-pkg_register-dependency "jdom-jaxen-${SLOT}"
-
- dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt || die
- use doc && java-pkg_dojavadoc build/apidocs
- use examples && java-pkg_doexamples samples
- use source && java-pkg_dosrc src/java/org
-}
-
-pkg_postinst() {
- if ! has_version '=dev-java/jaxen-1.1*'; then
- elog ""
- elog "If you want jaxen support for jdom then"
- elog "please emerge =dev-java/jaxen-1.1* first and"
- elog "re-emerge jdom. Sorry for the"
- elog "inconvenience, this is to break out of the"
- elog "circular dependencies."
- elog ""
- fi
-}
diff --git a/dev-java/jdom/jdom-1.0_beta9-r2.ebuild b/dev-java/jdom/jdom-1.0_beta9-r2.ebuild
deleted file mode 100644
index bf931f2..0000000
--- a/dev-java/jdom/jdom-1.0_beta9-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="jdom"
-MY_PV="b9"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="http://www.jdom.org/dist/source/archive/${MY_P}.tar.gz"
-HOMEPAGE="http://www.jdom.org"
-LICENSE="JDOM"
-SLOT="${PV}"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-
-COMMON_DEP="dev-java/saxpath
- >=dev-java/xerces-2.7"
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
- ${COMMON_DEP}"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- rm -v build/*.jar lib/*.jar || die
- rm -rf build/apidocs || die
-
- cd "${S}/lib"
- java-pkg_jar-from saxpath,xerces-2
-
- if has_version '=dev-java/jaxen-1.1*'; then
- elog "jaxen detected - building jaxen support."
- elog "you can ignore the warnings below"
- elog "one day there will be better solution"
- JAVA_PKG_STRICT="" java-pkg_jar-from jaxen-1.1
- fi
-}
-
-src_compile() {
- # to prevent a newer jdom from going into cp
- # (EANT_ANT_TASKS doesn't work with none)
- ANT_TASKS="none" eant package $(use_doc)
-}
-
-src_install() {
- java-pkg_dojar build/*.jar
-
- dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt || die
- use doc && java-pkg_dojavadoc build/apidocs
- use examples && java-pkg_doexamples samples
- use source && java-pkg_dosrc src/java/org
-}
-
-pkg_postinst() {
- if ! has_version '=dev-java/jaxen-1.1*'; then
- elog ""
- elog "If you want jaxen support for jdom then"
- elog "please emerge =dev-java/jaxen-1.1* first and"
- elog "re-emerge jdom. Sorry for the"
- elog "inconvenience, this is to break out of the"
- elog "circular dependencies."
- elog ""
- fi
-}
diff --git a/dev-java/jdom/jdom-1.0_beta9-r4.ebuild b/dev-java/jdom/jdom-1.0_beta9-r4.ebuild
deleted file mode 100644
index f818663..0000000
--- a/dev-java/jdom/jdom-1.0_beta9-r4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="jdom"
-MY_PV="b9"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="http://www.jdom.org/dist/source/archive/${MY_P}.tar.gz"
-HOMEPAGE="http://www.jdom.org"
-LICENSE="JDOM"
-SLOT="${PV}"
-KEYWORDS="amd64 ppc ppc64 ~x86"
-
-COMMON_DEP="dev-java/saxpath
- >=dev-java/xerces-2.7"
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
- ${COMMON_DEP}"
-PDEPEND="~dev-java/jdom-jaxen-${PV}"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- rm -v build/*.jar lib/*.jar || die
- rm -v src/java/org/jdom/xpath/JaxenXPath.java \
- || die "Unable to remove Jaxen Binding class."
- rm -rf build/apidocs || die
-
- cd "${S}/lib"
- java-pkg_jar-from saxpath,xerces-2
-}
-
-src_compile() {
- # to prevent a newer jdom from going into cp
- # (EANT_ANT_TASKS doesn't work with none)
- ANT_TASKS="none" eant package $(use_doc)
-}
-
-src_install() {
- java-pkg_dojar build/*.jar
-
- java-pkg_register-dependency "jdom-jaxen-${SLOT}"
-
- dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt || die
- use doc && java-pkg_dojavadoc build/apidocs
- use examples && java-pkg_doexamples samples
- use source && java-pkg_dosrc src/java/org
-}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2015-09-29 21:20 James Le Cuirot
0 siblings, 0 replies; 31+ messages in thread
From: James Le Cuirot @ 2015-09-29 21:20 UTC (permalink / raw
To: gentoo-commits
commit: fc43f9d1ec25953787e92c01a02581fc7a0d2f88
Author: William L. Thomson Jr <wlt <AT> o-sinc <DOT> com>
AuthorDate: Fri Sep 18 00:37:22 2015 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Sep 29 21:19:54 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc43f9d1
dev-java/jdom: Added ~arm keyword, jdom-1.0-r4 had it and others
This is the same codebase, the stable version, thus should be fine on
as the older version was. Hasn't been tested though, no arm
hardware. Fixes QA dep issues for latest version of dev-java/saxon
keyworded for ~arm.
dev-java/jdom/jdom-1.1.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jdom/jdom-1.1.3.ebuild b/dev-java/jdom/jdom-1.1.3.ebuild
index dbf6f1e..5403ba9 100644
--- a/dev-java/jdom/jdom-1.1.3.ebuild
+++ b/dev-java/jdom/jdom-1.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.jdom.org/dist/binary/archive/${P}.tar.gz"
HOMEPAGE="http://www.jdom.org"
LICENSE="JDOM"
SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
COMMON_DEP="dev-java/saxpath
>=dev-java/xerces-2.7"
RDEPEND=">=virtual/jre-1.6"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2016-01-06 10:11 Patrice Clement
0 siblings, 0 replies; 31+ messages in thread
From: Patrice Clement @ 2016-01-06 10:11 UTC (permalink / raw
To: gentoo-commits
commit: 9b13ac0d8584bd7342d6c2ac50988ebcf4ff482b
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 6 09:47:59 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jan 6 10:08:44 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b13ac0d
dev-java/jdom: 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 <monsieurp <AT> gentoo.org>
dev-java/jdom/jdom-1.1.3.ebuild | 2 +-
dev-java/jdom/jdom-2.0.6-r4.ebuild | 24 ++++++++++++++++--------
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/dev-java/jdom/jdom-1.1.3.ebuild b/dev-java/jdom/jdom-1.1.3.ebuild
index 13745ff..328bd8d 100644
--- a/dev-java/jdom/jdom-1.1.3.ebuild
+++ b/dev-java/jdom/jdom-1.1.3.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$
diff --git a/dev-java/jdom/jdom-2.0.6-r4.ebuild b/dev-java/jdom/jdom-2.0.6-r4.ebuild
index 17153ec..5a1abb4 100644
--- a/dev-java/jdom/jdom-2.0.6-r4.ebuild
+++ b/dev-java/jdom/jdom-2.0.6-r4.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$
@@ -14,17 +14,20 @@ 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"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE="test"
-CDEPEND="dev-java/iso-relax:0
+CDEPEND="
+ dev-java/xalan:0
dev-java/jaxen:1.1
- dev-java/xalan:0"
+ dev-java/iso-relax:0"
-RDEPEND="${CDEPEND}
+RDEPEND="
+ ${CDEPEND}
>=virtual/jre-1.6"
-DEPEND="${CDEPEND}
+DEPEND="
+ ${CDEPEND}
>=virtual/jdk-1.6
test? ( dev-java/ant-junit:0 )"
@@ -34,9 +37,14 @@ EANT_TEST_TARGET="junit"
EANT_GENTOO_CLASSPATH="iso-relax,jaxen-1.1,xalan"
S="${WORKDIR}/${PN}-${MY_P}"
+PATCHES=(
+ "${FILESDIR}/build-xml-2.patch"
+)
+
java_prepare() {
- epatch "${FILESDIR}/build-xml-2.patch"
- find -name "*.jar" -delete || die
+ java-pkg_clean
+
+ epatch "${PATCHES[@]}"
# Remove Android stuff to avoid junit RDEPEND.
rm -vr contrib/src/java/org/jdom2/contrib/android || die
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2016-01-06 10:11 Patrice Clement
0 siblings, 0 replies; 31+ messages in thread
From: Patrice Clement @ 2016-01-06 10:11 UTC (permalink / raw
To: gentoo-commits
commit: bd7f79301fef6a9ff67124c6dba0e31d94bc1c0a
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 6 09:48:34 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jan 6 10:08:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd7f7930
dev-java/jdom: Clean up old.
Package-Manager: portage-2.2.26
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/jdom/Manifest | 1 -
dev-java/jdom/jdom-2.0.6.ebuild | 76 -----------------------------------------
2 files changed, 77 deletions(-)
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index 7d42334..770d574 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,4 +1,3 @@
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/jdom-2.0.6.ebuild b/dev-java/jdom/jdom-2.0.6.ebuild
deleted file mode 100644
index 76dcf19..0000000
--- a/dev-java/jdom/jdom-2.0.6.ebuild
+++ /dev/null
@@ -1,76 +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"
-
-#JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2
-
-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"
-
-COMMON_DEP="dev-java/iso-relax
- dev-java/jaxen:1.1
- dev-java/xalan
- dev-java/xml-commons-external:1.4"
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.6"
-DEPEND="${COMMON_DEP}
- app-arch/unzip
- test? ( dev-java/junit:0 )
- >=virtual/jdk-1.6"
-IUSE=""
-
-S="${WORKDIR}"
-
-src_unpack() {
- unpack ${A}
- unpack ./${P}-sources.jar
-}
-
-java_prepare() {
- find "${S}" -name '*.jar' -delete || die
- mkdir "${S}"/classes "${S}"/docs
-}
-
-src_compile() {
- find org -name "*.java" > "${T}"/src.list
-
- local cp="$(java-pkg_getjars iso-relax,jaxen-1.1,xalan,xml-commons-external-1.4)"
- if use test ; then
- cp="${cp}:junit.jar"
- else
- sed -i 's/PerfTest/PerfTemp/' "${T}"/src.list || die "Failed to rename PerfTest"
- sed -i '/test/Id' "${T}"/src.list || die "Failed to remove test classes"
- sed -i 's/PerfTemp/PerfTest/' "${T}"/src.list || die "Failed to rename PerfTest"
- fi
-
- ejavac -d "${S}"/classes -cp ${cp} "@${T}"/src.list
-
- # Disabled for the time being.
- # if use doc; then
- # ejavadoc -d "${S}"/docs -classpath ${cp} "@${T}"/src.list -quiet || die "javadoc failed"
- # fi
-
- cd "${S}"/classes
- jar -cf "${S}"/${PN}.jar * || die "failed to create jar"
-}
-
-src_install() {
- java-pkg_dojar ${PN}.jar
-
- # Disabled for the time being.
- # if use doc; then
- # java-pkg_dojavadoc docs
- # fi
-
- dodoc README.txt LICENSE.txt || die
- use source && java-pkg_dosrc org
-}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2016-01-06 10:11 Patrice Clement
0 siblings, 0 replies; 31+ messages in thread
From: Patrice Clement @ 2016-01-06 10:11 UTC (permalink / raw
To: gentoo-commits
commit: 330d72c5303b1faafa7d45e9445d578932f91e46
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 6 09:44:45 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jan 6 10:08:37 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=330d72c5
dev-java/jdom: Housekeeping.
Package-Manager: portage-2.2.26
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/jdom/jdom-1.1.3.ebuild | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/dev-java/jdom/jdom-1.1.3.ebuild b/dev-java/jdom/jdom-1.1.3.ebuild
index 5403ba9..13745ff 100644
--- a/dev-java/jdom/jdom-1.1.3.ebuild
+++ b/dev-java/jdom/jdom-1.1.3.ebuild
@@ -13,18 +13,15 @@ HOMEPAGE="http://www.jdom.org"
LICENSE="JDOM"
SLOT="0"
KEYWORDS="amd64 ~arm ppc ppc64 x86"
-COMMON_DEP="dev-java/saxpath
- >=dev-java/xerces-2.7"
+IUSE=""
+
RDEPEND=">=virtual/jre-1.6"
-# ${COMMON_DEP}"
DEPEND=">=virtual/jdk-1.6"
-# ${COMMON_DEP}"
-IUSE=""
S="${WORKDIR}/${PN}"
java_prepare() {
- find "${S}" -name '*.jar' -delete || die
+ java-pkg_clean
rm -r build/apidocs || die
@@ -43,12 +40,9 @@ java_prepare() {
}
EANT_BUILD_TARGET="package"
-#EANT_GENTOO_CLASSPATH="saxpath,xerces-2"
src_install() {
java-pkg_dojar build/*.jar
-
- #java-pkg_register-dependency "jdom-jaxen-${SLOT}"
dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt || die
use doc && java-pkg_dojavadoc build/apidocs
use examples && java-pkg_doexamples samples
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2017-07-13 18:32 Alexis Ballier
0 siblings, 0 replies; 31+ messages in thread
From: Alexis Ballier @ 2017-07-13 18:32 UTC (permalink / raw
To: gentoo-commits
commit: b408fc2e9deae3543a084e81ccd99c8c9a9eacdb
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 13 18:32:11 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jul 13 18:32:24 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b408fc2e
dev-java/jdom: keyword ~arm64
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-java/jdom/jdom-1.1.3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/jdom/jdom-1.1.3.ebuild b/dev-java/jdom/jdom-1.1.3.ebuild
index 163a31b9884..50b12a26e0c 100644
--- a/dev-java/jdom/jdom-1.1.3.ebuild
+++ b/dev-java/jdom/jdom-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.jdom.org/dist/binary/archive/${P}.tar.gz"
HOMEPAGE="http://www.jdom.org"
LICENSE="JDOM"
SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
IUSE=""
RDEPEND=">=virtual/jre-1.6"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2018-06-03 2:59 Aaron Bauman
0 siblings, 0 replies; 31+ messages in thread
From: Aaron Bauman @ 2018-06-03 2:59 UTC (permalink / raw
To: gentoo-commits
commit: 66172acb5a15b03e4aeaaaa419d37f38e9b67985
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 3 00:40:59 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Jun 3 02:59:03 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66172acb
dev-java/jdom: drop old EAPI
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-java/jdom/jdom-1.0-r2.ebuild | 67 ----------------------------------------
1 file changed, 67 deletions(-)
diff --git a/dev-java/jdom/jdom-1.0-r2.ebuild b/dev-java/jdom/jdom-1.0-r2.ebuild
deleted file mode 100644
index 2e92729fbb7..00000000000
--- a/dev-java/jdom/jdom-1.0-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="http://www.jdom.org/dist/source/${P}.tar.gz"
-HOMEPAGE="http://www.jdom.org"
-LICENSE="JDOM"
-SLOT="${PV}"
-KEYWORDS="amd64 ppc64 x86"
-COMMON_DEP="dev-java/saxpath
- >=dev-java/xerces-2.7"
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
- ${COMMON_DEP}"
-IUSE=""
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- rm -v build/*.jar lib/*.jar || die
- rm -rf build/{apidocs,samples} || die
-
- cd "${S}/lib"
- java-pkg_jar-from saxpath,xerces-2
-
- if has_version '=dev-java/jaxen-1.1*'; then
- elog "jaxen detected - building jaxen support."
- elog "you can ignore the warnings below"
- elog "one day there will be better solution"
- JAVA_PKG_STRICT="" java-pkg_jar-from jaxen-1.1
- fi
-}
-
-src_compile() {
- # to prevent a newer jdom from going into cp
- # (EANT_ANT_TASKS doesn't work with none)
- ANT_TASKS="none" eant package $(use_doc)
-}
-
-src_install() {
- java-pkg_dojar build/*.jar
-
- dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt || die
- use doc && java-pkg_dojavadoc build/apidocs
- use examples && java-pkg_doexamples samples
- use source && java-pkg_dosrc src/java/org
-}
-
-pkg_postinst() {
- if ! has_version '=dev-java/jaxen-1.1*'; then
- elog ""
- elog "If you want jaxen support for jdom then"
- elog "please emerge =dev-java/jaxen-1.1* first and"
- elog "re-emerge jdom. Sorry for the"
- elog "inconvenience, this is to break out of the"
- elog "circular dependencies."
- elog ""
- fi
-}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2019-05-18 1:14 Aaron Bauman
0 siblings, 0 replies; 31+ messages in thread
From: Aaron Bauman @ 2019-05-18 1:14 UTC (permalink / raw
To: gentoo-commits
commit: 1c32bfdf4490e796bf0222dc26e31bfd80933149
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 01:07:17 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat May 18 01:07:17 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c32bfdf
dev-java/jdom: arm64 stable
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="arm64"
dev-java/jdom/jdom-1.1.3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/jdom/jdom-1.1.3.ebuild b/dev-java/jdom/jdom-1.1.3.ebuild
index 50b12a26e0c..8fc3d32e45a 100644
--- a/dev-java/jdom/jdom-1.1.3.ebuild
+++ b/dev-java/jdom/jdom-1.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.jdom.org/dist/binary/archive/${P}.tar.gz"
HOMEPAGE="http://www.jdom.org"
LICENSE="JDOM"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
IUSE=""
RDEPEND=">=virtual/jre-1.6"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2020-07-16 22:40 Sam James
0 siblings, 0 replies; 31+ messages in thread
From: Sam James @ 2020-07-16 22:40 UTC (permalink / raw
To: gentoo-commits
commit: 438d69a5026063cbb5f34922ebe2b0ec4a203de7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 16 22:35:42 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 16 22:35:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=438d69a5
dev-java/jdom: arm keyworded (bug #720116)
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/jdom/jdom-2.0.6-r4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/jdom/jdom-2.0.6-r4.ebuild b/dev-java/jdom/jdom-2.0.6-r4.ebuild
index 518050c9502..8b29afa8593 100644
--- a/dev-java/jdom/jdom-2.0.6-r4.ebuild
+++ b/dev-java/jdom/jdom-2.0.6-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -13,7 +13,7 @@ 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 ppc64 x86"
+KEYWORDS="amd64 ~arm ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2020-07-20 1:10 Sam James
0 siblings, 0 replies; 31+ messages in thread
From: Sam James @ 2020-07-20 1:10 UTC (permalink / raw
To: gentoo-commits
commit: 089456793d6f320d1e0f7bf29f07ecb5a88d3113
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 20 01:08:43 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 01:08:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08945679
dev-java/jdom: arm64 keyworded (bug #720116)
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/jdom/jdom-2.0.6-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jdom/jdom-2.0.6-r4.ebuild b/dev-java/jdom/jdom-2.0.6-r4.ebuild
index 8b29afa8593..30bbc1c03e9 100644
--- a/dev-java/jdom/jdom-2.0.6-r4.ebuild
+++ b/dev-java/jdom/jdom-2.0.6-r4.ebuild
@@ -13,7 +13,7 @@ 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 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2021-04-18 13:47 Miroslav Šulc
0 siblings, 0 replies; 31+ messages in thread
From: Miroslav Šulc @ 2021-04-18 13:47 UTC (permalink / raw
To: gentoo-commits
commit: 66def6829fd53aa633e35ee64094f77ae91aa3b4
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 18 13:46:51 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Apr 18 13:46:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66def682
dev-java/jdom: reverted 2.0.6-r5 to unstable
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/jdom/jdom-2.0.6-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jdom/jdom-2.0.6-r5.ebuild b/dev-java/jdom/jdom-2.0.6-r5.ebuild
index b1c14083879..89c91adcfed 100644
--- a/dev-java/jdom/jdom-2.0.6-r5.ebuild
+++ b/dev-java/jdom/jdom-2.0.6-r5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.jdom.org"
LICENSE="Apache-1.1"
SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2021-04-19 11:16 Miroslav Šulc
0 siblings, 0 replies; 31+ messages in thread
From: Miroslav Šulc @ 2021-04-19 11:16 UTC (permalink / raw
To: gentoo-commits
commit: 51463a0723ee5c3bd185033b81ccc55e9ddde06a
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Apr 19 09:05:12 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 11:15:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51463a07
dev-java/jdom: EAPI 7, min java 1.8
Bug: https://bugs.gentoo.org/784038
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/20451
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/jdom/jdom-1.1.3-r1.ebuild | 51 ++++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
diff --git a/dev-java/jdom/jdom-1.1.3-r1.ebuild b/dev-java/jdom/jdom-1.1.3-r1.ebuild
new file mode 100644
index 00000000000..f176d2284a8
--- /dev/null
+++ b/dev-java/jdom/jdom-1.1.3-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Java API to manipulate XML data"
+SRC_URI="http://www.jdom.org/dist/binary/archive/${P}.tar.gz"
+HOMEPAGE="http://www.jdom.org"
+
+LICENSE="JDOM"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+ default
+ java-pkg_clean
+
+ rm -r build/apidocs || die
+
+ rm -v src/java/org/jdom/xpath/JaxenXPath.java \
+ || die "Unable to remove Jaxen Binding class."
+
+ sed -i -e 's|${name}-${version.impl}|${name}|g' \
+ -e 's|<jar jarfile="${build.dir}/${name}-sources|<!-- <jar jarfile="${build.dir}/${name}-sources|' \
+ -e 's|build.javadocs}" />|build.javadocs}" /> -->|' \
+ "${S}"/build.xml || die
+
+ if ! use doc; then
+ sed -i -e 's|depends="compile,javadoc"|depends="compile"|' \
+ "${S}"/build.xml || die
+ fi
+}
+
+EANT_BUILD_TARGET="package"
+
+src_install() {
+ java-pkg_dojar build/*.jar
+ dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt
+ use doc && java-pkg_dojavadoc build/apidocs
+ use examples && java-pkg_doexamples samples
+ use source && java-pkg_dosrc src/java/org
+}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2021-04-19 11:16 Miroslav Šulc
0 siblings, 0 replies; 31+ messages in thread
From: Miroslav Šulc @ 2021-04-19 11:16 UTC (permalink / raw
To: gentoo-commits
commit: 9a0501f1ddb6da4857bdfffaaca5045327513f2b
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 19 11:15:47 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 11:15:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a0501f1
dev-java/jdom: removed obsolete 1.1.3
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/jdom/jdom-1.1.3.ebuild | 49 -----------------------------------------
1 file changed, 49 deletions(-)
diff --git a/dev-java/jdom/jdom-1.1.3.ebuild b/dev-java/jdom/jdom-1.1.3.ebuild
deleted file mode 100644
index 7d7440c0978..00000000000
--- a/dev-java/jdom/jdom-1.1.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 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
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="http://www.jdom.org/dist/binary/archive/${P}.tar.gz"
-HOMEPAGE="http://www.jdom.org"
-LICENSE="JDOM"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-S="${WORKDIR}/${PN}"
-
-java_prepare() {
- java-pkg_clean
-
- rm -r build/apidocs || die
-
- rm -v src/java/org/jdom/xpath/JaxenXPath.java \
- || die "Unable to remove Jaxen Binding class."
-
- sed -i -e 's|${name}-${version.impl}|${name}|g' \
- -e 's|<jar jarfile="${build.dir}/${name}-sources|<!-- <jar jarfile="${build.dir}/${name}-sources|' \
- -e 's|build.javadocs}" />|build.javadocs}" /> -->|' \
- "${S}"/build.xml || die
-
- if ! use doc; then
- sed -i -e 's|depends="compile,javadoc"|depends="compile"|' \
- "${S}"/build.xml || die
- fi
-}
-
-EANT_BUILD_TARGET="package"
-
-src_install() {
- java-pkg_dojar build/*.jar
- dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt
- use doc && java-pkg_dojavadoc build/apidocs
- use examples && java-pkg_doexamples samples
- use source && java-pkg_dosrc src/java/org
-}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2021-04-22 20:25 Sam James
0 siblings, 0 replies; 31+ messages in thread
From: Sam James @ 2021-04-22 20:25 UTC (permalink / raw
To: gentoo-commits
commit: 4e67b2afc80a83ea171e5d3e62d02b84f1812e4e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 22 20:24:56 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 22 20:24:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e67b2af
dev-java/jdom: Stabilize 2.0.6-r5 amd64, #783897
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/jdom/jdom-2.0.6-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jdom/jdom-2.0.6-r5.ebuild b/dev-java/jdom/jdom-2.0.6-r5.ebuild
index 89c91adcfed..6ebc16ddfbd 100644
--- a/dev-java/jdom/jdom-2.0.6-r5.ebuild
+++ b/dev-java/jdom/jdom-2.0.6-r5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.jdom.org"
LICENSE="Apache-1.1"
SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2021-04-23 13:33 Sam James
0 siblings, 0 replies; 31+ messages in thread
From: Sam James @ 2021-04-23 13:33 UTC (permalink / raw
To: gentoo-commits
commit: f6648ab942297e150f8bce0d2cb927dbb280bcb4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 23 13:32:20 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 23 13:32:20 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6648ab9
dev-java/jdom: Stabilize 2.0.6-r5 ppc64, #783897
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/jdom/jdom-2.0.6-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jdom/jdom-2.0.6-r5.ebuild b/dev-java/jdom/jdom-2.0.6-r5.ebuild
index 6ebc16ddfbd..ae8fd7f121a 100644
--- a/dev-java/jdom/jdom-2.0.6-r5.ebuild
+++ b/dev-java/jdom/jdom-2.0.6-r5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.jdom.org"
LICENSE="Apache-1.1"
SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2021-04-25 16:09 Sam James
0 siblings, 0 replies; 31+ messages in thread
From: Sam James @ 2021-04-25 16:09 UTC (permalink / raw
To: gentoo-commits
commit: afa8d5723a146c7c740d1c757f1227dc74620394
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 25 16:07:17 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 16:08:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afa8d572
dev-java/jdom: Stabilize 2.0.6-r5 arm64, #783897
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/jdom/jdom-2.0.6-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jdom/jdom-2.0.6-r5.ebuild b/dev-java/jdom/jdom-2.0.6-r5.ebuild
index ae8fd7f121a..74fde49b3c1 100644
--- a/dev-java/jdom/jdom-2.0.6-r5.ebuild
+++ b/dev-java/jdom/jdom-2.0.6-r5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.jdom.org"
LICENSE="Apache-1.1"
SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2021-05-16 14:55 Sam James
0 siblings, 0 replies; 31+ messages in thread
From: Sam James @ 2021-05-16 14:55 UTC (permalink / raw
To: gentoo-commits
commit: 78b242f754fe61e885c1ee8315ae492686201813
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 16 14:55:16 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 16 14:55:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78b242f7
dev-java/jdom: Stabilize 2.0.6-r5 x86, #783897
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/jdom/jdom-2.0.6-r5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jdom/jdom-2.0.6-r5.ebuild b/dev-java/jdom/jdom-2.0.6-r5.ebuild
index 74fde49b3c1..772c36da6de 100644
--- a/dev-java/jdom/jdom-2.0.6-r5.ebuild
+++ b/dev-java/jdom/jdom-2.0.6-r5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.jdom.org"
LICENSE="Apache-1.1"
SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
IUSE="test"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2021-05-16 18:11 Miroslav Šulc
0 siblings, 0 replies; 31+ messages in thread
From: Miroslav Šulc @ 2021-05-16 18:11 UTC (permalink / raw
To: gentoo-commits
commit: 59d6aca7837f819d9bc5f4bc69209c1348f3b6d2
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun May 16 18:11:20 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun May 16 18:11:20 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59d6aca7
dev-java/jdom: removed obsolete 2.0.6-r4
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/jdom/jdom-2.0.6-r4.ebuild | 64 --------------------------------------
1 file changed, 64 deletions(-)
diff --git a/dev-java/jdom/jdom-2.0.6-r4.ebuild b/dev-java/jdom/jdom-2.0.6-r4.ebuild
deleted file mode 100644
index 8549f9e42e1..00000000000
--- a/dev-java/jdom/jdom-2.0.6-r4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="JDOM-${PV}"
-JAVA_PKG_IUSE="doc source"
-
-inherit epatch 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/xalan:0
- dev-java/jaxen:1.1
- dev-java/iso-relax: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}"
-
-PATCHES=(
- "${FILESDIR}/build-xml-2.patch"
-)
-
-java_prepare() {
- java-pkg_clean
-
- epatch "${PATCHES[@]}"
-
- # 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] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2022-05-22 17:24 Florian Schmaus
0 siblings, 0 replies; 31+ messages in thread
From: Florian Schmaus @ 2022-05-22 17:24 UTC (permalink / raw
To: gentoo-commits
commit: 348d30ce4af35fa75876c248b52800eae26421fd
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri May 6 17:41:20 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun May 22 17:19:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=348d30ce
dev-java/jdom: add 2.0.6.1
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/25477
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
dev-java/jdom/Manifest | 1 +
dev-java/jdom/jdom-2.0.6.1.ebuild | 97 +++++++++++++++++++++++++++++++++++++++
dev-java/jdom/metadata.xml | 3 ++
3 files changed, 101 insertions(+)
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index 251072f6c988..f1a5bdf79b25 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,2 +1,3 @@
+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/jdom-2.0.6.1.ebuild b/dev-java/jdom/jdom-2.0.6.1.ebuild
new file mode 100644
index 000000000000..3c0b46178bc4
--- /dev/null
+++ b/dev-java/jdom/jdom-2.0.6.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.jdom:jdom2:2.0.6.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+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"
+
+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
+ dev-java/xalan:0
+"
+
+DEPEND="
+ >=virtual/jdk-1.8:*
+ ${CP_DEPEND}
+ test? (
+ dev-java/xerces:2
+ )
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}
+"
+
+S="${WORKDIR}/jdom-JDOM-${PV}"
+
+JAVA_TEST_SRC_DIR="test/src/java"
+JAVA_TEST_RESOURCE_DIRS="test/src/resources"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4,xerces-2"
+
+src_prepare() {
+ default
+ java-pkg_clean
+
+ # 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"
+}
+
+src_compile() {
+ JAVA_SRC_DIR="core/src/java"
+ JAVA_JAR_FILENAME="jdom.jar"
+ 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-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":jdom-contrib.jar"
+ rm -rf target || die
+
+ if use doc; then
+ JAVA_SRC_DIR=()
+ JAVA_SRC_DIR=(
+ "core/src/java"
+ "contrib/src/java"
+ )
+ JAVA_JAR_FILENAME="ignoreme.jar"
+ java-pkg-simple_src_compile
+ fi
+}
+
+src_install() {
+ default # https://bugs.gentoo.org/789582
+ java-pkg_dojar "jdom.jar"
+ java-pkg_dojar "jdom-contrib.jar"
+ if use doc; then
+ java-pkg_dojavadoc target/api
+ fi
+ if use source; then
+ java-pkg_dosrc "core/src/java/*" "contrib/src/java/*"
+ fi
+}
diff --git a/dev-java/jdom/metadata.xml b/dev-java/jdom/metadata.xml
index 129b89aa2cb9..8495676e21fd 100644
--- a/dev-java/jdom/metadata.xml
+++ b/dev-java/jdom/metadata.xml
@@ -8,4 +8,7 @@
<upstream>
<remote-id type="github">hunterhacker/jdom</remote-id>
</upstream>
+ <longdescription>
+ JDOM is a Java-oriented object model which models XML documents. It provides a Java-centric means of generating and manipulating XML documents. While JDOM interoperates well with existing standards such as the Simple API for XML (SAX) and the Document Object Model (DOM), it is not an abstraction layer or enhancement to those APIs. Rather, it seeks to provide a robust, light-weight means of reading and writing XML data without the complex and memory-consumptive options that current API offerings provide.
+ </longdescription>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2022-06-22 11:40 Jakov Smolić
0 siblings, 0 replies; 31+ messages in thread
From: Jakov Smolić @ 2022-06-22 11:40 UTC (permalink / raw
To: gentoo-commits
commit: e11807df6bf41d21d020d1e68e7570ace29147de
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 22 11:40:14 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 11:40:14 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e11807df
dev-java/jdom: Stabilize 2.0.6.1 ppc64, #853316
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
dev-java/jdom/jdom-2.0.6.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jdom/jdom-2.0.6.1.ebuild b/dev-java/jdom/jdom-2.0.6.1.ebuild
index 48233ea9fd24..b3c7a1f22702 100644
--- a/dev-java/jdom/jdom-2.0.6.1.ebuild
+++ b/dev-java/jdom/jdom-2.0.6.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/hunterhacker/jdom/archive/${PN^^}-${PV}.tar.gz"
LICENSE="Apache-1.1"
SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
# FAILURES!!!
# Tests run: 1887, Failures: 23
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2022-06-22 13:12 Jakov Smolić
0 siblings, 0 replies; 31+ messages in thread
From: Jakov Smolić @ 2022-06-22 13:12 UTC (permalink / raw
To: gentoo-commits
commit: b663e1dc89f0c8bfaeb353cd73952ab95c980ed9
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 22 13:12:27 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 13:12:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b663e1dc
dev-java/jdom: Stabilize 2.0.6.1 arm64, #853316
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
dev-java/jdom/jdom-2.0.6.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jdom/jdom-2.0.6.1.ebuild b/dev-java/jdom/jdom-2.0.6.1.ebuild
index b3c7a1f22702..975f7cb7c8d9 100644
--- a/dev-java/jdom/jdom-2.0.6.1.ebuild
+++ b/dev-java/jdom/jdom-2.0.6.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/hunterhacker/jdom/archive/${PN^^}-${PV}.tar.gz"
LICENSE="Apache-1.1"
SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
# FAILURES!!!
# Tests run: 1887, Failures: 23
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2022-06-22 13:25 Agostino Sarubbo
0 siblings, 0 replies; 31+ messages in thread
From: Agostino Sarubbo @ 2022-06-22 13:25 UTC (permalink / raw
To: gentoo-commits
commit: 50c6135f990626bd85d0ca375a698820d7e6abf3
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 22 13:25:00 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 13:25:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50c6135f
dev-java/jdom: x86 stable wrt bug #853316
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-java/jdom/jdom-2.0.6.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jdom/jdom-2.0.6.1.ebuild b/dev-java/jdom/jdom-2.0.6.1.ebuild
index 975f7cb7c8d9..5cbdaa66520d 100644
--- a/dev-java/jdom/jdom-2.0.6.1.ebuild
+++ b/dev-java/jdom/jdom-2.0.6.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/hunterhacker/jdom/archive/${PN^^}-${PV}.tar.gz"
LICENSE="Apache-1.1"
SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
# FAILURES!!!
# Tests run: 1887, Failures: 23
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2024-06-17 8:51 Miroslav Šulc
0 siblings, 0 replies; 31+ messages in thread
From: Miroslav Šulc @ 2024-06-17 8:51 UTC (permalink / raw
To: gentoo-commits
commit: 3c4baec4bf2bfa4712e2f72926b3a2265cfd5bf5
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Jun 10 08:42:07 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jun 17 08:50:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c4baec4
dev-java/jdom: rewrite with java-pkg-simple
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/36770/commits/0a79200c736822650c8eb22d7d8981c93ea49fe0
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/jdom/jdom-1.1.3-r2.ebuild | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/dev-java/jdom/jdom-1.1.3-r2.ebuild b/dev-java/jdom/jdom-1.1.3-r2.ebuild
new file mode 100644
index 000000000000..e321b981d167
--- /dev/null
+++ b/dev-java/jdom/jdom-1.1.3-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java API to manipulate XML data"
+HOMEPAGE="http://jdom.org"
+SRC_URI="http://jdom.org/dist/binary/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="JDOM"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {CHANGES,COMMITTERS,README,TODO}.txt )
+
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+ java-pkg-2_src_prepare
+ java-pkg_clean
+
+ # circular dependency with jaxen-1.2[jdom]
+ rm -v src/java/org/jdom/xpath/JaxenXPath.java \
+ || die "Unable to remove Jaxen Binding class."
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ use examples && java-pkg_doexamples samples
+}
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2024-07-17 6:12 Sam James
0 siblings, 0 replies; 31+ messages in thread
From: Sam James @ 2024-07-17 6:12 UTC (permalink / raw
To: gentoo-commits
commit: 4501dc94977d13e86fddf5212a21f0c618741603
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 17 06:12:04 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 17 06:12:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4501dc94
dev-java/jdom: Stabilize 1.1.3-r2 arm64, #936193
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/jdom/jdom-1.1.3-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jdom/jdom-1.1.3-r2.ebuild b/dev-java/jdom/jdom-1.1.3-r2.ebuild
index fa2b7f8a9ac8..418f0eb3906d 100644
--- a/dev-java/jdom/jdom-1.1.3-r2.ebuild
+++ b/dev-java/jdom/jdom-1.1.3-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}"
LICENSE="JDOM"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2024-07-17 6:12 Sam James
0 siblings, 0 replies; 31+ messages in thread
From: Sam James @ 2024-07-17 6:12 UTC (permalink / raw
To: gentoo-commits
commit: 8b66e586dab7475aa49e148ffd17a92b7580cb9a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 17 06:12:02 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 17 06:12:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b66e586
dev-java/jdom: Stabilize 1.1.3-r2 amd64, #936193
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/jdom/jdom-1.1.3-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jdom/jdom-1.1.3-r2.ebuild b/dev-java/jdom/jdom-1.1.3-r2.ebuild
index e321b981d167..fa2b7f8a9ac8 100644
--- a/dev-java/jdom/jdom-1.1.3-r2.ebuild
+++ b/dev-java/jdom/jdom-1.1.3-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}"
LICENSE="JDOM"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2024-07-17 6:12 Sam James
0 siblings, 0 replies; 31+ messages in thread
From: Sam James @ 2024-07-17 6:12 UTC (permalink / raw
To: gentoo-commits
commit: 257c0e172aff819b82dbba0e7348c514c6c250d6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 17 06:12:06 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 17 06:12:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=257c0e17
dev-java/jdom: Stabilize 1.1.3-r2 ppc64, #936193
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/jdom/jdom-1.1.3-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jdom/jdom-1.1.3-r2.ebuild b/dev-java/jdom/jdom-1.1.3-r2.ebuild
index a0bdd3a8c4ac..e4c3088a799d 100644
--- a/dev-java/jdom/jdom-1.1.3-r2.ebuild
+++ b/dev-java/jdom/jdom-1.1.3-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}"
LICENSE="JDOM"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2024-07-17 6:12 Sam James
0 siblings, 0 replies; 31+ messages in thread
From: Sam James @ 2024-07-17 6:12 UTC (permalink / raw
To: gentoo-commits
commit: ca1827039e786a387bd649ad42db04c85689317e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 17 06:12:05 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 17 06:12:05 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca182703
dev-java/jdom: Stabilize 1.1.3-r2 x86, #936193
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/jdom/jdom-1.1.3-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/jdom/jdom-1.1.3-r2.ebuild b/dev-java/jdom/jdom-1.1.3-r2.ebuild
index 418f0eb3906d..a0bdd3a8c4ac 100644
--- a/dev-java/jdom/jdom-1.1.3-r2.ebuild
+++ b/dev-java/jdom/jdom-1.1.3-r2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}"
LICENSE="JDOM"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
^ permalink raw reply related [flat|nested] 31+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/
@ 2024-07-17 9:47 Miroslav Šulc
0 siblings, 0 replies; 31+ messages in thread
From: Miroslav Šulc @ 2024-07-17 9:47 UTC (permalink / raw
To: gentoo-commits
commit: c68c71f4fc818cd57c501cd668e68a38ad82be7e
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Jul 17 07:11:33 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Jul 17 09:47:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c68c71f4
dev-java/jdom: drop 1.1.3-r1
Closes: https://bugs.gentoo.org/934484
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/jdom/jdom-1.1.3-r1.ebuild | 51 --------------------------------------
1 file changed, 51 deletions(-)
diff --git a/dev-java/jdom/jdom-1.1.3-r1.ebuild b/dev-java/jdom/jdom-1.1.3-r1.ebuild
deleted file mode 100644
index f176d2284a81..000000000000
--- a/dev-java/jdom/jdom-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="http://www.jdom.org/dist/binary/archive/${P}.tar.gz"
-HOMEPAGE="http://www.jdom.org"
-
-LICENSE="JDOM"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
- default
- java-pkg_clean
-
- rm -r build/apidocs || die
-
- rm -v src/java/org/jdom/xpath/JaxenXPath.java \
- || die "Unable to remove Jaxen Binding class."
-
- sed -i -e 's|${name}-${version.impl}|${name}|g' \
- -e 's|<jar jarfile="${build.dir}/${name}-sources|<!-- <jar jarfile="${build.dir}/${name}-sources|' \
- -e 's|build.javadocs}" />|build.javadocs}" /> -->|' \
- "${S}"/build.xml || die
-
- if ! use doc; then
- sed -i -e 's|depends="compile,javadoc"|depends="compile"|' \
- "${S}"/build.xml || die
- fi
-}
-
-EANT_BUILD_TARGET="package"
-
-src_install() {
- java-pkg_dojar build/*.jar
- dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt
- use doc && java-pkg_dojavadoc build/apidocs
- use examples && java-pkg_doexamples samples
- use source && java-pkg_dosrc src/java/org
-}
^ permalink raw reply related [flat|nested] 31+ messages in thread
end of thread, other threads:[~2024-07-17 9:47 UTC | newest]
Thread overview: 31+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-05-16 18:11 [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2024-07-17 9:47 Miroslav Šulc
2024-07-17 6:12 Sam James
2024-07-17 6:12 Sam James
2024-07-17 6:12 Sam James
2024-07-17 6:12 Sam James
2024-06-17 8:51 Miroslav Šulc
2022-06-22 13:25 Agostino Sarubbo
2022-06-22 13:12 Jakov Smolić
2022-06-22 11:40 Jakov Smolić
2022-05-22 17:24 Florian Schmaus
2021-05-16 14:55 Sam James
2021-04-25 16:09 Sam James
2021-04-23 13:33 Sam James
2021-04-22 20:25 Sam James
2021-04-19 11:16 Miroslav Šulc
2021-04-19 11:16 Miroslav Šulc
2021-04-18 13:47 Miroslav Šulc
2020-07-20 1:10 Sam James
2020-07-16 22:40 Sam James
2019-05-18 1:14 Aaron Bauman
2018-06-03 2:59 Aaron Bauman
2017-07-13 18:32 Alexis Ballier
2016-01-06 10:11 Patrice Clement
2016-01-06 10:11 Patrice Clement
2016-01-06 10:11 Patrice Clement
2015-09-29 21:20 James Le Cuirot
2015-09-29 21:20 James Le Cuirot
2015-08-27 9:24 Patrice Clement
2015-08-26 8:18 Patrice Clement
2015-08-25 22:12 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox