[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2023-05-05 Thread Miroslav Šulc
commit: b465b4674df7b2dc59251f92f7127063ee856217
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri May  5 22:04:47 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat May  6 05:03:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b465b467

dev-java/jaxen: drop 1.2.0-r1

Closes: https://bugs.gentoo.org/792315
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/30888
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jaxen/Manifest  |  1 -
 dev-java/jaxen/jaxen-1.2.0-r1.ebuild | 84 
 2 files changed, 85 deletions(-)

diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index 251dffcfcdd0..3b203f52423c 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,2 +1 @@
-DIST jaxen-1.2.0.tar.gz 282829 BLAKE2B 
4d89d4fd3dfd8c4113fe7ecc05597ea9dd743d9c871f320936809016ae8cb3a3d4fb3f935de19463e6c99db1b67eff3545e909b707e81f4c0f114ec0f0e7bb97
 SHA512 
cecfc62eab1cf6586b28594855bd983679a932dbdc6cbdd07d85a9a9458e78b2e784dfd6287e6e87e4f4443239eefbeac59a7316dae53b818379daaccae56b53
 DIST jaxen-2.0.0.tar.gz 348084 BLAKE2B 
0dd90e040c865e0c2588f93ead9aadd64d49a8559a7c48255bdf89cca88967a60c8c0817ee4b234352fc0c8c3607e00e08c21df4580be7a889ca748073184f54
 SHA512 
897d8ee72b2ee3743118e363f66e1ccf5195863e4395dbdffa33b0bd7339663d85946f5e6eb37891e2ebb1572cab610a98a3690bdcc3993a2d2be4ae7920f174

diff --git a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild 
b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
deleted file mode 100644
index 263da0bf4a88..
--- a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri 
https://github.com/jaxen-xpath/jaxen/archive/refs/tags/v1.2.0.tar.gz --slot 1.2 
--keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jaxen-1.2.0.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="jaxen:jaxen:1.2.0"
-JAVA_TESTING_FRAMEWORKS="junit"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Jaxen is a universal XPath engine for Java"
-HOMEPAGE="http://www.cafeconleche.org/jaxen/;
-SRC_URI="https://github.com/${PN}-xpath/${PN}/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="1.2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE="dom4j jdom xom"
-
-# It seems that most tests depend on dom4j, jdom and xom which all depend back 
on jaxen
-REQUIRED_USE="test? ( dom4j jdom xom )"
-
-# Compile dependencies
-# POM: pom.xml
-# xerces:xercesImpl:2.6.2 -> >=dev-java/xerces-2.12.0:2
-# xml-apis:xml-apis:1.3.02 -> >=dev-java/xml-commons-external-1.4.01:1.4
-# POM: pom.xml
-# test? junit:junit:3.8.2 -> >=dev-java/junit-3.8.2:0
-
-CDEPEND="
-   dom4j? ( dev-java/dom4j:1 )
-   jdom? ( dev-java/jdom:0 )
-   xom? ( dev-java/xom:0 )
-"
-
-DEPEND="
-   ${CDEPEND}
-   >=virtual/jdk-1.8:*
-"
-
-RDEPEND="
-   ${CDEPEND}
-   >=virtual/jre-1.8:*
-"
-
-S="${WORKDIR}/${P}"
-
-DOCS=( "${S}"/{LICENSE.txt,README.md} )
-
-JAVA_SRC_DIR="src/java/main"
-
-JAVA_TEST_SRC_DIR="src/java/test"
-JAVA_TEST_GENTOO_CLASSPATH="junit"
-
-src_prepare() {
-   default
-
-   if use dom4j; then
-   JAVA_GENTOO_CLASSPATH+=" dom4j-1"
-   else
-   rm -rv "${JAVA_SRC_DIR}"/org/jaxen/dom4j || die
-   fi
-
-   if use jdom; then
-   JAVA_GENTOO_CLASSPATH+=" jdom"
-   else
-   rm -rv "${JAVA_SRC_DIR}"/org/jaxen/jdom || die
-   fi
-
-   if use xom; then
-   JAVA_GENTOO_CLASSPATH+=" xom"
-   else
-   rm -rv "${JAVA_SRC_DIR}"/org/jaxen/xom || die
-   fi
-}
-
-src_install() {
-   default
-   java-pkg-simple_src_install
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2023-05-05 Thread Arthur Zamarin
commit: 0270c6c60a27b48f2f07939870b86070933a4fb6
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=0270c6c6

dev-java/jaxen: Stabilize 2.0.0 ppc64, #905110

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/jaxen/jaxen-2.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jaxen/jaxen-2.0.0.ebuild 
b/dev-java/jaxen/jaxen-2.0.0.ebuild
index 38ad8ec1bbee..87e5391e9b4a 100644
--- a/dev-java/jaxen/jaxen-2.0.0.ebuild
+++ b/dev-java/jaxen/jaxen-2.0.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="BSD-2"
 SLOT="1.2"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE="dom4j jdom xom"
 
 # It seems that most tests depend on dom4j, jdom and xom which all depend back 
on jaxen



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2023-05-05 Thread Arthur Zamarin
commit: 013865925c00e7cd4598f7105562a9baec571fcf
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri May  5 16:05:05 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri May  5 16:05:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01386592

dev-java/jaxen: Stabilize 2.0.0 x86, #905110

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/jaxen/jaxen-2.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jaxen/jaxen-2.0.0.ebuild 
b/dev-java/jaxen/jaxen-2.0.0.ebuild
index c8ec4f551e2f..6189b83321cd 100644
--- a/dev-java/jaxen/jaxen-2.0.0.ebuild
+++ b/dev-java/jaxen/jaxen-2.0.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="BSD-2"
 SLOT="1.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="dom4j jdom xom"
 
 # It seems that most tests depend on dom4j, jdom and xom which all depend back 
on jaxen



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2023-05-05 Thread Arthur Zamarin
commit: 55b7536d097eaa72af969ff5fc0bd89798d24790
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri May  5 16:05:12 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri May  5 16:05:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55b7536d

dev-java/jaxen: Stabilize 2.0.0 arm64, #905110

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/jaxen/jaxen-2.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jaxen/jaxen-2.0.0.ebuild 
b/dev-java/jaxen/jaxen-2.0.0.ebuild
index 509b3bd0a3c7..38ad8ec1bbee 100644
--- a/dev-java/jaxen/jaxen-2.0.0.ebuild
+++ b/dev-java/jaxen/jaxen-2.0.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="BSD-2"
 SLOT="1.2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="dom4j jdom xom"
 
 # It seems that most tests depend on dom4j, jdom and xom which all depend back 
on jaxen



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2023-05-05 Thread Arthur Zamarin
commit: 127957f6ea75d0c0c7c3080456f744f9beaaeddc
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=127957f6

dev-java/jaxen: Stabilize 2.0.0 amd64, #905110

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/jaxen/jaxen-2.0.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jaxen/jaxen-2.0.0.ebuild 
b/dev-java/jaxen/jaxen-2.0.0.ebuild
index 6189b83321cd..509b3bd0a3c7 100644
--- a/dev-java/jaxen/jaxen-2.0.0.ebuild
+++ b/dev-java/jaxen/jaxen-2.0.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="BSD-2"
 SLOT="1.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="dom4j jdom xom"
 
 # It seems that most tests depend on dom4j, jdom and xom which all depend back 
on jaxen



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2023-03-27 Thread Miroslav Šulc
commit: e81a4c2c98277f767aaa2210b3fe9c1f17b811b1
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Feb 11 08:19:46 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Mar 27 10:24:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e81a4c2c

dev-java/jaxen: add 2.0.0

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jaxen/Manifest   |  1 +
 dev-java/jaxen/jaxen-2.0.0.ebuild | 67 +++
 2 files changed, 68 insertions(+)

diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index b85b4cd1177a..251dffcfcdd0 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1 +1,2 @@
 DIST jaxen-1.2.0.tar.gz 282829 BLAKE2B 
4d89d4fd3dfd8c4113fe7ecc05597ea9dd743d9c871f320936809016ae8cb3a3d4fb3f935de19463e6c99db1b67eff3545e909b707e81f4c0f114ec0f0e7bb97
 SHA512 
cecfc62eab1cf6586b28594855bd983679a932dbdc6cbdd07d85a9a9458e78b2e784dfd6287e6e87e4f4443239eefbeac59a7316dae53b818379daaccae56b53
+DIST jaxen-2.0.0.tar.gz 348084 BLAKE2B 
0dd90e040c865e0c2588f93ead9aadd64d49a8559a7c48255bdf89cca88967a60c8c0817ee4b234352fc0c8c3607e00e08c21df4580be7a889ca748073184f54
 SHA512 
897d8ee72b2ee3743118e363f66e1ccf5195863e4395dbdffa33b0bd7339663d85946f5e6eb37891e2ebb1572cab610a98a3690bdcc3993a2d2be4ae7920f174

diff --git a/dev-java/jaxen/jaxen-2.0.0.ebuild 
b/dev-java/jaxen/jaxen-2.0.0.ebuild
new file mode 100644
index ..c8ec4f551e2f
--- /dev/null
+++ b/dev-java/jaxen/jaxen-2.0.0.ebuild
@@ -0,0 +1,67 @@
+# 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="jaxen:jaxen:2.0.0"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jaxen is a universal XPath engine for Java"
+HOMEPAGE="http://www.cafeconleche.org/jaxen/;
+SRC_URI="https://github.com/${PN}-xpath/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+S="${WORKDIR}/${P}"
+
+LICENSE="BSD-2"
+SLOT="1.2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="dom4j jdom xom"
+
+# It seems that most tests depend on dom4j, jdom and xom which all depend back 
on jaxen
+REQUIRED_USE="test? ( dom4j jdom xom )"
+
+CDEPEND="
+   dom4j? ( dev-java/dom4j:1 )
+   jdom? ( dev-java/jdom:0 )
+   xom? ( dev-java/xom:0 )
+"
+
+DEPEND="
+   ${CDEPEND}
+   >=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+   ${CDEPEND}
+   >=virtual/jre-1.8:*
+"
+
+JAVA_AUTOMATIC_MODULE_NAME="org.jaxen"
+JAVA_SRC_DIR="core/src/java/main"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit"
+JAVA_TEST_SRC_DIR="core/src/java/test"
+
+src_prepare() {
+   java-pkg-2_src_prepare
+
+   if use dom4j; then
+   JAVA_GENTOO_CLASSPATH+=" dom4j-1"
+   else
+   rm -rv "${JAVA_SRC_DIR}"/org/jaxen/dom4j || die
+   fi
+
+   if use jdom; then
+   JAVA_GENTOO_CLASSPATH+=" jdom"
+   else
+   rm -rv "${JAVA_SRC_DIR}"/org/jaxen/jdom || die
+   fi
+
+   if use xom; then
+   JAVA_GENTOO_CLASSPATH+=" xom"
+   else
+   rm -rv "${JAVA_SRC_DIR}"/org/jaxen/xom || die
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2022-05-06 Thread Arthur Zamarin
commit: 5af706ae00d43b3ff51a9a90c065cf03ed57c34e
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri May  6 06:51:39 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri May  6 07:08:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5af706ae

dev-java/jaxen: drop 1.1.6-r2

Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/25345
Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-java/jaxen/Manifest  |  1 -
 dev-java/jaxen/jaxen-1.1.6-r2.ebuild | 39 
 2 files changed, 40 deletions(-)

diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index e9646ad9808e..b85b4cd1177a 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,2 +1 @@
-DIST jaxen-1.1.6.jar 409677 BLAKE2B 
55e03939420c103fb5a6d323595ff0cb7653885eb9ba233fd581c5376d2ac90eecde7aa5576f602cdc459cfd9ba9e79c6bb5bfab3ed7805e717a21670a5748ee
 SHA512 
979044fe959493eb6d66fa92b420251cd9c12414051ff6956d5835888a8999d4f337c18646c53806fc19203cef744f53b7597850cd2f695910c90df7a9725b48
 DIST jaxen-1.2.0.tar.gz 282829 BLAKE2B 
4d89d4fd3dfd8c4113fe7ecc05597ea9dd743d9c871f320936809016ae8cb3a3d4fb3f935de19463e6c99db1b67eff3545e909b707e81f4c0f114ec0f0e7bb97
 SHA512 
cecfc62eab1cf6586b28594855bd983679a932dbdc6cbdd07d85a9a9458e78b2e784dfd6287e6e87e4f4443239eefbeac59a7316dae53b818379daaccae56b53

diff --git a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild 
b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
deleted file mode 100644
index be43e2578b5a..
--- a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
+++ /dev/null
@@ -1,39 +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"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java XPath Engine"
-HOMEPAGE="https://github.com/codehaus;
-SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> 
${P}.jar"
-
-LICENSE="JDOM"
-SLOT="1.1"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-RDEPEND="
-   ${CDEPEND}
-   >=virtual/jre-1.8:*"
-
-DEPEND="
-   ${CDEPEND}
-   >=virtual/jdk-1.8:*"
-
-JAVA_SRC_DIR="org"
-
-src_prepare() {
-   default
-
-   # xom depends on jaxen already. if we don't remove xom packages here and
-   # require jaxen to depend on xom, we end up in a circular dep.
-   # I fear though that removing those classes might bite us somewhere down
-   # the line...
-   rm -rv org/jaxen/{dom4j,jdom,xom} || die
-
-   # this is now part of jdk
-   rm -rv org/w3c || die
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/files/, dev-java/jaxen/

2021-05-16 Thread Miroslav Šulc
commit: f2c766c83929924f607613d6e1a3ae645e8042f4
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sun May 16 16:13:14 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun May 16 18:31:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2c766c8

dev-java/jaxen: remove obsolete

Closes: https://bugs.gentoo.org/757990
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/20839/commits/1dad1441c5102c8bafc0fdd715ddf1a7852dfe3e
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jaxen/Manifest   |   1 -
 dev-java/jaxen/files/jaxen-1.1.4_maven1-build.xml | 200 --
 dev-java/jaxen/jaxen-1.1.4-r1.ebuild  |  51 --
 3 files changed, 252 deletions(-)

diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index b1138e4df53..e9646ad9808 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,3 +1,2 @@
-DIST jaxen-1.1.4-src.tar.gz 268493 BLAKE2B 
ff51cf3b6507f19549ab864fa4cd53d0b2d0c34a21a944d22feed74d58fb71c0273f5b560cc9c02aa50748f672115e77fab24a2d986508841d6a0ba4b8911690
 SHA512 
11c1c744af030c50579f872d8c8bf437e48ab4a01e6dd34529f2d9039c154533edaa9b5a367a866e2b57f311f717be300db8f80423c5492be38e0cffc031
 DIST jaxen-1.1.6.jar 409677 BLAKE2B 
55e03939420c103fb5a6d323595ff0cb7653885eb9ba233fd581c5376d2ac90eecde7aa5576f602cdc459cfd9ba9e79c6bb5bfab3ed7805e717a21670a5748ee
 SHA512 
979044fe959493eb6d66fa92b420251cd9c12414051ff6956d5835888a8999d4f337c18646c53806fc19203cef744f53b7597850cd2f695910c90df7a9725b48
 DIST jaxen-1.2.0.tar.gz 282829 BLAKE2B 
4d89d4fd3dfd8c4113fe7ecc05597ea9dd743d9c871f320936809016ae8cb3a3d4fb3f935de19463e6c99db1b67eff3545e909b707e81f4c0f114ec0f0e7bb97
 SHA512 
cecfc62eab1cf6586b28594855bd983679a932dbdc6cbdd07d85a9a9458e78b2e784dfd6287e6e87e4f4443239eefbeac59a7316dae53b818379daaccae56b53

diff --git a/dev-java/jaxen/files/jaxen-1.1.4_maven1-build.xml 
b/dev-java/jaxen/files/jaxen-1.1.4_maven1-build.xml
deleted file mode 100644
index efbdd2074bb..000
--- a/dev-java/jaxen/files/jaxen-1.1.4_maven1-build.xml
+++ /dev/null
@@ -1,200 +0,0 @@
-
-
-
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
-
-
-
-
-
-
-  
-  
-
-  
-
-
-
-
-
-  
-
-
-  
-
-  
-
-  
-  
-
-
-  
-
-  
-  
-
-  
-  
-
-  
-  
-
-
-  
-  
-
-
-  
-  
-
-  
-  
-
-  
-  
-
-
-  
-  
-  
-  
-
-
-
-  
-  
-
-  
-
-  
-
-  
-  
-= WARNING 

-Junit isn't present in your ${ANT_HOME}/lib directory. Tests not 
executed.
-
==
-  
-  
-
-
-  
-
-  
-  
-
-
-  
-
-  
-  
-
-
-  
-
-
-
-
-  
-
-  
-
-  
-  
-
-http://repo1.maven.org/maven/dom4j/jars/dom4j-1.6.1.jar;>
-http://dist.codehaus.org//dom4j/jars/dom4j-1.6.1.jar;>
-  
-  
-
-
-  
-  
-
-http://repo1.maven.org/maven/jdom/jars/jdom-1.0.jar;>
-http://dist.codehaus.org//jdom/jars/jdom-1.0.jar;>
-  
-  
-
-
-  
-  
-
-http://repo1.maven.org/maven/xml-apis/jars/xml-apis-1.3.02.jar;>
-http://dist.codehaus.org//xml-apis/jars/xml-apis-1.3.02.jar;>
-  
-  
-
-
-  
-  
-
-http://repo1.maven.org/maven/xerces/jars/xercesImpl-2.6.2.jar;>
-http://dist.codehaus.org//xerces/jars/xercesImpl-2.6.2.jar;>
-  
-  
-
-
-  
-  
-
-http://repo1.maven.org/maven/xom/jars/xom-1.0.jar;>
-http://dist.codehaus.org//xom/jars/xom-1.0.jar;>
-  
-  
-
-
-  
-  
-
-http://repo1.maven.org/maven/maven-plugins/plugins/maven-cobertura-plugin-1.3.jar;>
-http://dist.codehaus.org//maven-plugins/plugins/maven-cobertura-plugin-1.3.jar;>
-  
-  
-
-
-  
-  
-
-http://repo1.maven.org/maven/maven-plugins/plugins/maven-findbugs-plugin-1.3.1.jar;>
-http://dist.codehaus.org//maven-plugins/plugins/maven-findbugs-plugin-1.3.1.jar;>
-  
-  
-
-
-  
-  
-  
-
-Proxy used :
-Proxy host [${proxy.host}]
-Proxy port [${proxy.port}]
-Proxy user [${proxy.username}]
-
-  
-  
-Proxy not used.
-  
-  
-
-
-  
-

diff --git a/dev-java/jaxen/jaxen-1.1.4-r1.ebuild 
b/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
deleted file mode 100644
index 8968d7a7d6f..000
--- a/dev-java/jaxen/jaxen-1.1.4-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=5
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-

[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2021-05-16 Thread Sam James
commit: febfde41b3bb8a380466b09a9457670115455fe5
Author: Sam James  gentoo  org>
AuthorDate: Sun May 16 14:55:14 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 16 14:55:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=febfde41

dev-java/jaxen: Stabilize 1.2.0-r1 x86, #783897

Signed-off-by: Sam James  gentoo.org>

 dev-java/jaxen/jaxen-1.2.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild 
b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
index 4cc392e08f2..211abc53f20 100644
--- a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
+++ b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/${PN}-xpath/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="BSD-2"
 SLOT="1.2"
-KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 IUSE="dom4j jdom xom"
 
 # It seems that most tests depend on dom4j, jdom and xom which all depend back 
on jaxen



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2021-05-16 Thread Sam James
commit: 612e406a7f2d4ac789958dd27fa3b62d682861dc
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri Apr 30 08:47:58 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 16 14:15:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=612e406a

dev-java/jaxen: adjust path for ${S}

Closes: https://bugs.gentoo.org/786975
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/20611
Signed-off-by: Sam James  gentoo.org>

 dev-java/jaxen/jaxen-1.2.0-r1.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild 
b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
index 3722e883f75..4cc392e08f2 100644
--- a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
+++ b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
@@ -47,13 +47,13 @@ RDEPEND="
>=virtual/jre-1.8:*
 "
 
-S="${WORKDIR}"
+S="${WORKDIR}/${P}"
 
-DOCS=( "${P}"/{LICENSE.txt,README.md} )
+DOCS=( "${S}"/{LICENSE.txt,README.md} )
 
-JAVA_SRC_DIR="${P}/src/java/main"
+JAVA_SRC_DIR="src/java/main"
 
-JAVA_TEST_SRC_DIR="${P}/src/java/test"
+JAVA_TEST_SRC_DIR="src/java/test"
 JAVA_TEST_GENTOO_CLASSPATH="junit"
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2021-05-16 Thread Sam James
commit: 80e91625e0d6191413e1d2246ad45ea7b1936702
Author: Sam James  gentoo  org>
AuthorDate: Sun May 16 12:40:52 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 16 12:44:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80e91625

dev-java/jaxen: Stabilize 1.1.6-r2 arm64, #757990

Signed-off-by: Sam James  gentoo.org>

 dev-java/jaxen/jaxen-1.1.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild 
b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
index 90a7eed0092..be43e2578b5 100644
--- a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${
 
 LICENSE="JDOM"
 SLOT="1.1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
 RDEPEND="
${CDEPEND}



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2021-05-10 Thread Agostino Sarubbo
commit: 56522c379fa210945ef36d1967de5dcce4aad5e9
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon May 10 06:57:53 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon May 10 06:57:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56522c37

dev-java/jaxen: x86 stable wrt bug #757990

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-java/jaxen/jaxen-1.1.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild 
b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
index 5f921311ff4..90a7eed0092 100644
--- a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${
 
 LICENSE="JDOM"
 SLOT="1.1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 
 RDEPEND="
${CDEPEND}



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2021-05-01 Thread Agostino Sarubbo
commit: 62c6e1ee98f67b3066220ee4788940fd9accda81
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat May  1 18:18:42 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat May  1 18:19:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62c6e1ee

dev-java/jaxen: amd64 stable wrt bug #757990

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-java/jaxen/jaxen-1.1.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild 
b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
index e8fcb57853e..5f921311ff4 100644
--- a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${
 
 LICENSE="JDOM"
 SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
 
 RDEPEND="
${CDEPEND}



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2021-04-25 Thread Sam James
commit: afdc4bc14818bd9ece8d5c106c8f99adb03970f1
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 25 16:07:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 25 16:08:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afdc4bc1

dev-java/jaxen: Stabilize 1.2.0-r1 arm64, #783897

Signed-off-by: Sam James  gentoo.org>

 dev-java/jaxen/jaxen-1.2.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild 
b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
index a62eb32679b..3722e883f75 100644
--- a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
+++ b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/${PN}-xpath/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="BSD-2"
 SLOT="1.2"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 IUSE="dom4j jdom xom"
 
 # It seems that most tests depend on dom4j, jdom and xom which all depend back 
on jaxen



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2021-04-23 Thread Sam James
commit: e5b93f36675d9bf1ca3443084077f8772ac37dd8
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 23 13:32:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 23 13:32:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5b93f36

dev-java/jaxen: Stabilize 1.2.0-r1 ppc64, #783897

Signed-off-by: Sam James  gentoo.org>

 dev-java/jaxen/jaxen-1.2.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild 
b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
index 22b1e23539f..a62eb32679b 100644
--- a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
+++ b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/${PN}-xpath/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="BSD-2"
 SLOT="1.2"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
 IUSE="dom4j jdom xom"
 
 # It seems that most tests depend on dom4j, jdom and xom which all depend back 
on jaxen



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2021-04-22 Thread Sam James
commit: bb943c627d27218a3ce7ad525b582457b0100f5b
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr 22 20:24:57 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr 22 20:24:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb943c62

dev-java/jaxen: Stabilize 1.2.0-r1 amd64, #783897

Signed-off-by: Sam James  gentoo.org>

 dev-java/jaxen/jaxen-1.2.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild 
b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
index 86f30856f53..22b1e23539f 100644
--- a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
+++ b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/${PN}-xpath/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="BSD-2"
 SLOT="1.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="dom4j jdom xom"
 
 # It seems that most tests depend on dom4j, jdom and xom which all depend back 
on jaxen



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2021-04-20 Thread Sergei Trofimovich
commit: da2dd8cdccab8212576ec8abc8944740e6e1f673
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Apr 20 06:38:33 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Apr 20 06:39:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da2dd8cd

dev-java/jaxen: stable 1.1.6-r2 for ppc64

stable wrt bug #757990

Package-Manager: Portage-3.0.18, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-java/jaxen/jaxen-1.1.6-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild 
b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
index 6890318a492..e8fcb57853e 100644
--- a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${
 
 LICENSE="JDOM"
 SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
 
 RDEPEND="
${CDEPEND}



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2021-04-18 Thread Miroslav Šulc
commit: 32cb01b62afda801850f94351b0e98c85835cc8b
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Apr 17 00:34:33 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Apr 18 14:37:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32cb01b6

dev-java/jaxen: remove obsolete version

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/commits/e170e46fab3c453f69a5a777ada66793c0ee08ee
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jaxen/jaxen-1.2.0.ebuild | 63 ---
 1 file changed, 63 deletions(-)

diff --git a/dev-java/jaxen/jaxen-1.2.0.ebuild 
b/dev-java/jaxen/jaxen-1.2.0.ebuild
deleted file mode 100644
index a3bec68c55b..000
--- a/dev-java/jaxen/jaxen-1.2.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri 
https://github.com/jaxen-xpath/jaxen/archive/refs/tags/v1.2.0.tar.gz --slot 1.2 
--keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jaxen-1.2.0.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="jaxen:jaxen:1.2.0"
-JAVA_TESTING_FRAMEWORKS="junit"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Jaxen is a universal XPath engine for Java."
-HOMEPAGE="http://www.cafeconleche.org/jaxen/;
-SRC_URI="https://github.com/${PN}-xpath/${PN}/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="1.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-# It seems that most tests depend on dom4j, jdom and xom which all depend on 
jaxen
-RESTRICT="test"
-
-# Compile dependencies
-# POM: pom.xml
-# xerces:xercesImpl:2.6.2 -> >=dev-java/xerces-2.12.0:2
-# xml-apis:xml-apis:1.3.02 -> >=dev-java/xml-commons-external-1.4.01:1.4
-# POM: pom.xml
-# test? junit:junit:3.8.2 -> >=dev-java/junit-3.8.2:0
-
-DEPEND="
-   >=virtual/jdk-1.8:*
-   ${CDEPEND}
-   >=dev-java/xerces-2.12.0:2
-"
-
-RDEPEND="
-   >=virtual/jre-1.8:*
-   ${CDEPEND}
-"
-
-S="${WORKDIR}"
-
-DOCS=( "${P}"/{LICENSE.txt,README.md} )
-
-JAVA_CLASSPATH_EXTRA="xerces-2"
-JAVA_SRC_DIR="${P}/src/java/main"
-
-src_prepare() {
-   default
-
-   # solve cyclic deps by removing these dirs
-   # dom4j, jdom and xom depend on jaxen
-   # https://bugs.gentoo.org/739894#c9
-   rm -rv "${JAVA_SRC_DIR}"/org/jaxen/{dom4j,jdom,xom} || die
-}
-
-src_install() {
-   default
-   java-pkg-simple_src_install
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2021-04-18 Thread Miroslav Šulc
commit: a871d2b01b7673788592d8eb1ab34101c187fa79
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Apr 18 14:35:26 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Apr 18 14:36:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a871d2b0

dev-java/jaxen: improvements in 1.2.0-r1

1) added support for tests
2) added jdom and xom use flags
3) cleanup

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jaxen/jaxen-1.2.0-r1.ebuild | 43 ++--
 dev-java/jaxen/metadata.xml  |  4 +++-
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild 
b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
index adfa52aaccf..86f30856f53 100644
--- a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
+++ b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
@@ -19,10 +19,10 @@ 
SRC_URI="https://github.com/${PN}-xpath/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 LICENSE="BSD-2"
 SLOT="1.2"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="dom4j"
+IUSE="dom4j jdom xom"
 
-# It seems that most tests depend on dom4j, jdom and xom which all depend on 
jaxen
-RESTRICT="test"
+# It seems that most tests depend on dom4j, jdom and xom which all depend back 
on jaxen
+REQUIRED_USE="test? ( dom4j jdom xom )"
 
 # Compile dependencies
 # POM: pom.xml
@@ -31,13 +31,19 @@ RESTRICT="test"
 # POM: pom.xml
 # test? junit:junit:3.8.2 -> >=dev-java/junit-3.8.2:0
 
+CDEPEND="
+   dom4j? ( dev-java/dom4j:1 )
+   jdom? ( dev-java/jdom:0 )
+   xom? ( dev-java/xom:0 )
+"
+
 DEPEND="
-   dev-java/xerces:2
+   ${CDEPEND}
>=virtual/jdk-1.8:*
-   dom4j? ( dev-java/dom4j:1 )
 "
 
 RDEPEND="
+   ${CDEPEND}
>=virtual/jre-1.8:*
 "
 
@@ -45,18 +51,31 @@ S="${WORKDIR}"
 
 DOCS=( "${P}"/{LICENSE.txt,README.md} )
 
-JAVA_CLASSPATH_EXTRA="xerces-2"
 JAVA_SRC_DIR="${P}/src/java/main"
 
+JAVA_TEST_SRC_DIR="${P}/src/java/test"
+JAVA_TEST_GENTOO_CLASSPATH="junit"
+
 src_prepare() {
default
 
-   # solve cyclic deps by removing these dirs
-   # dom4j, jdom and xom depend on jaxen
-   # https://bugs.gentoo.org/739894#c9
-   rm -rv "${JAVA_SRC_DIR}"/org/jaxen/{jdom,xom} || die
-   use dom4j || rm -rv "${JAVA_SRC_DIR}"/org/jaxen/dom4j || die
-   use dom4j && JAVA_GENTOO_CLASSPATH="dom4j-1"
+   if use dom4j; then
+   JAVA_GENTOO_CLASSPATH+=" dom4j-1"
+   else
+   rm -rv "${JAVA_SRC_DIR}"/org/jaxen/dom4j || die
+   fi
+
+   if use jdom; then
+   JAVA_GENTOO_CLASSPATH+=" jdom"
+   else
+   rm -rv "${JAVA_SRC_DIR}"/org/jaxen/jdom || die
+   fi
+
+   if use xom; then
+   JAVA_GENTOO_CLASSPATH+=" xom"
+   else
+   rm -rv "${JAVA_SRC_DIR}"/org/jaxen/xom || die
+   fi
 }
 
 src_install() {

diff --git a/dev-java/jaxen/metadata.xml b/dev-java/jaxen/metadata.xml
index 418032ce6ec..e20be5fb7b4 100644
--- a/dev-java/jaxen/metadata.xml
+++ b/dev-java/jaxen/metadata.xml
@@ -6,7 +6,9 @@
Java


-   build the org.jaxen.dom4j.Dom4jXPath 
class
+   Includes org.jaxen.dom4j package
+   Includes org.jaxen.jdom package
+   Includes org.jaxen.xom package


jaxen-xpath/jaxen



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2021-04-18 Thread Miroslav Šulc
commit: 320febf55dc6464a2981caa0210a4c17fa1d9cb6
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri Apr 16 23:49:36 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Apr 18 14:36:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=320febf5

dev-java/jaxen: support dom4j

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/commits/d3942f9178435b4cd21749278f4e6f1d064b26c6
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jaxen/jaxen-1.2.0-r1.ebuild | 65 
 dev-java/jaxen/metadata.xml  |  3 ++
 2 files changed, 68 insertions(+)

diff --git a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild 
b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
new file mode 100644
index 000..adfa52aaccf
--- /dev/null
+++ b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri 
https://github.com/jaxen-xpath/jaxen/archive/refs/tags/v1.2.0.tar.gz --slot 1.2 
--keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jaxen-1.2.0.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="jaxen:jaxen:1.2.0"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jaxen is a universal XPath engine for Java."
+HOMEPAGE="http://www.cafeconleche.org/jaxen/;
+SRC_URI="https://github.com/${PN}-xpath/${PN}/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="1.2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="dom4j"
+
+# It seems that most tests depend on dom4j, jdom and xom which all depend on 
jaxen
+RESTRICT="test"
+
+# Compile dependencies
+# POM: pom.xml
+# xerces:xercesImpl:2.6.2 -> >=dev-java/xerces-2.12.0:2
+# xml-apis:xml-apis:1.3.02 -> >=dev-java/xml-commons-external-1.4.01:1.4
+# POM: pom.xml
+# test? junit:junit:3.8.2 -> >=dev-java/junit-3.8.2:0
+
+DEPEND="
+   dev-java/xerces:2
+   >=virtual/jdk-1.8:*
+   dom4j? ( dev-java/dom4j:1 )
+"
+
+RDEPEND="
+   >=virtual/jre-1.8:*
+"
+
+S="${WORKDIR}"
+
+DOCS=( "${P}"/{LICENSE.txt,README.md} )
+
+JAVA_CLASSPATH_EXTRA="xerces-2"
+JAVA_SRC_DIR="${P}/src/java/main"
+
+src_prepare() {
+   default
+
+   # solve cyclic deps by removing these dirs
+   # dom4j, jdom and xom depend on jaxen
+   # https://bugs.gentoo.org/739894#c9
+   rm -rv "${JAVA_SRC_DIR}"/org/jaxen/{jdom,xom} || die
+   use dom4j || rm -rv "${JAVA_SRC_DIR}"/org/jaxen/dom4j || die
+   use dom4j && JAVA_GENTOO_CLASSPATH="dom4j-1"
+}
+
+src_install() {
+   default
+   java-pkg-simple_src_install
+}

diff --git a/dev-java/jaxen/metadata.xml b/dev-java/jaxen/metadata.xml
index fa38cb92d41..418032ce6ec 100644
--- a/dev-java/jaxen/metadata.xml
+++ b/dev-java/jaxen/metadata.xml
@@ -5,6 +5,9 @@
j...@gentoo.org
Java

+   
+   build the org.jaxen.dom4j.Dom4jXPath 
class
+   

jaxen-xpath/jaxen
https://github.com/jaxen-xpath/jaxen/wiki/Jaxen-Wiki



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2021-04-14 Thread Miroslav Šulc
commit: 6927974be2accd41a2a1dda22f4620e3c30ed5b7
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Apr 10 11:15:29 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Apr 14 14:46:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6927974b

dev-java/jaxen: bump to 1.2.0

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/20353/commits/06cd9472d76561a36510f0676aabc3878c25a3ba
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jaxen/Manifest   |  1 +
 dev-java/jaxen/jaxen-1.2.0.ebuild | 63 +++
 2 files changed, 64 insertions(+)

diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index be542192d8d..b1138e4df53 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,2 +1,3 @@
 DIST jaxen-1.1.4-src.tar.gz 268493 BLAKE2B 
ff51cf3b6507f19549ab864fa4cd53d0b2d0c34a21a944d22feed74d58fb71c0273f5b560cc9c02aa50748f672115e77fab24a2d986508841d6a0ba4b8911690
 SHA512 
11c1c744af030c50579f872d8c8bf437e48ab4a01e6dd34529f2d9039c154533edaa9b5a367a866e2b57f311f717be300db8f80423c5492be38e0cffc031
 DIST jaxen-1.1.6.jar 409677 BLAKE2B 
55e03939420c103fb5a6d323595ff0cb7653885eb9ba233fd581c5376d2ac90eecde7aa5576f602cdc459cfd9ba9e79c6bb5bfab3ed7805e717a21670a5748ee
 SHA512 
979044fe959493eb6d66fa92b420251cd9c12414051ff6956d5835888a8999d4f337c18646c53806fc19203cef744f53b7597850cd2f695910c90df7a9725b48
+DIST jaxen-1.2.0.tar.gz 282829 BLAKE2B 
4d89d4fd3dfd8c4113fe7ecc05597ea9dd743d9c871f320936809016ae8cb3a3d4fb3f935de19463e6c99db1b67eff3545e909b707e81f4c0f114ec0f0e7bb97
 SHA512 
cecfc62eab1cf6586b28594855bd983679a932dbdc6cbdd07d85a9a9458e78b2e784dfd6287e6e87e4f4443239eefbeac59a7316dae53b818379daaccae56b53

diff --git a/dev-java/jaxen/jaxen-1.2.0.ebuild 
b/dev-java/jaxen/jaxen-1.2.0.ebuild
new file mode 100644
index 000..a3bec68c55b
--- /dev/null
+++ b/dev-java/jaxen/jaxen-1.2.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri 
https://github.com/jaxen-xpath/jaxen/archive/refs/tags/v1.2.0.tar.gz --slot 1.2 
--keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild jaxen-1.2.0.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="jaxen:jaxen:1.2.0"
+JAVA_TESTING_FRAMEWORKS="junit"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Jaxen is a universal XPath engine for Java."
+HOMEPAGE="http://www.cafeconleche.org/jaxen/;
+SRC_URI="https://github.com/${PN}-xpath/${PN}/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="1.2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# It seems that most tests depend on dom4j, jdom and xom which all depend on 
jaxen
+RESTRICT="test"
+
+# Compile dependencies
+# POM: pom.xml
+# xerces:xercesImpl:2.6.2 -> >=dev-java/xerces-2.12.0:2
+# xml-apis:xml-apis:1.3.02 -> >=dev-java/xml-commons-external-1.4.01:1.4
+# POM: pom.xml
+# test? junit:junit:3.8.2 -> >=dev-java/junit-3.8.2:0
+
+DEPEND="
+   >=virtual/jdk-1.8:*
+   ${CDEPEND}
+   >=dev-java/xerces-2.12.0:2
+"
+
+RDEPEND="
+   >=virtual/jre-1.8:*
+   ${CDEPEND}
+"
+
+S="${WORKDIR}"
+
+DOCS=( "${P}"/{LICENSE.txt,README.md} )
+
+JAVA_CLASSPATH_EXTRA="xerces-2"
+JAVA_SRC_DIR="${P}/src/java/main"
+
+src_prepare() {
+   default
+
+   # solve cyclic deps by removing these dirs
+   # dom4j, jdom and xom depend on jaxen
+   # https://bugs.gentoo.org/739894#c9
+   rm -rv "${JAVA_SRC_DIR}"/org/jaxen/{dom4j,jdom,xom} || die
+}
+
+src_install() {
+   default
+   java-pkg-simple_src_install
+}



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2021-04-14 Thread Miroslav Šulc
commit: 915144db3409aec8129428befd868ea1cecd0245
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Tue Apr 13 09:26:11 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Apr 14 14:41:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=915144db

dev-java/jaxen: remove old and broken versions

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/20353/commits/4cb3493d6c30767743af2806f03f36e0bace7d25
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jaxen/jaxen-1.1.6-r1.ebuild | 45 
 dev-java/jaxen/jaxen-1.1.6.ebuild| 36 -
 2 files changed, 81 deletions(-)

diff --git a/dev-java/jaxen/jaxen-1.1.6-r1.ebuild 
b/dev-java/jaxen/jaxen-1.1.6-r1.ebuild
deleted file mode 100644
index c364ebdd023..000
--- a/dev-java/jaxen/jaxen-1.1.6-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java XPath Engine"
-HOMEPAGE="https://github.com/codehaus;
-SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> 
${P}.jar"
-
-LICENSE="JDOM"
-SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-
-CDEPEND="
-   dev-java/jdom:0
-   dev-java/dom4j:1"
-
-RDEPEND="
-   ${CDEPEND}
-   >=virtual/jre-1.6"
-
-DEPEND="
-   ${CDEPEND}
-   >=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="
-   jdom
-   dom4j-1
-"
-
-JAVA_SRC_DIR="org"
-
-src_prepare() {
-   default
-
-   # xom depends on jaxen already. if we don't remove xom packages here and
-   # require jaxen to depend on xom, we end up in a circular dep.
-   # I fear though that removing those classes might bite us somewhere down
-   # the line...
-   rm -rv org/jaxen/xom || die
-}

diff --git a/dev-java/jaxen/jaxen-1.1.6.ebuild 
b/dev-java/jaxen/jaxen-1.1.6.ebuild
deleted file mode 100644
index 77b073b118a..000
--- a/dev-java/jaxen/jaxen-1.1.6.ebuild
+++ /dev/null
@@ -1,36 +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"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A Java XPath Engine"
-HOMEPAGE="https://github.com/codehaus;
-SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> 
${P}.jar"
-
-LICENSE="JDOM"
-SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-CDEPEND="
-   dev-java/dom4j:1
-   dev-java/jdom:0
-   dev-java/xom:0"
-
-RDEPEND="
-   ${CDEPEND}
-   >=virtual/jre-1.6"
-
-DEPEND="
-   ${CDEPEND}
-   >=virtual/jdk-1.6"
-
-JAVA_GENTOO_CLASSPATH="
-   xom
-   jdom
-   dom4j-1
-"



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2021-04-14 Thread Miroslav Šulc
commit: 1d803b3f2b662d31ac3ab47abafc6aea09fdf80b
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Tue Apr 13 09:01:41 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Apr 14 14:41:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d803b3f

dev-java/jaxen: bug https://bugs.gentoo.org/739894

Closes: https://bugs.gentoo.org/739894
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/20353/commits/2bd5ea67f87385106092c8ca44cca70ba67a0c71
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jaxen/jaxen-1.1.6-r2.ebuild | 36 
 1 file changed, 36 insertions(+)

diff --git a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild 
b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
new file mode 100644
index 000..bc0878f8ca6
--- /dev/null
+++ b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java XPath Engine"
+HOMEPAGE="https://github.com/codehaus;
+SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> 
${P}.jar"
+
+LICENSE="JDOM"
+SLOT="1.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+   ${CDEPEND}
+   >=virtual/jre-1.8:*"
+
+DEPEND="
+   ${CDEPEND}
+   >=virtual/jdk-1.8:*"
+
+JAVA_SRC_DIR="org"
+
+src_prepare() {
+   default
+
+   # xom depends on jaxen already. if we don't remove xom packages here and
+   # require jaxen to depend on xom, we end up in a circular dep.
+   # I fear though that removing those classes might bite us somewhere down
+   # the line...
+   rm -rv org/jaxen/{dom4j,jdom,xom} || die
+}



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2021-04-14 Thread Miroslav Šulc
commit: abcecdf8e1047dd912323ff494f557e03d3b813c
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Apr 14 14:40:44 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Apr 14 14:41:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abcecdf8

dev-java/jaxen: removed code that is already part of jdk

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jaxen/jaxen-1.1.6-r2.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild 
b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
index bc0878f8ca6..6890318a492 100644
--- a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
@@ -33,4 +33,7 @@ src_prepare() {
# I fear though that removing those classes might bite us somewhere down
# the line...
rm -rv org/jaxen/{dom4j,jdom,xom} || die
+
+   # this is now part of jdk
+   rm -rv org/w3c || die
 }



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2021-04-13 Thread Miroslav Šulc
commit: 77d8f2fbdd4b87e55c01b293d40310e751d7f44a
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Mon Apr 12 10:09:24 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Apr 13 10:41:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77d8f2fb

dev-java/jaxen: 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/20353/commits/511eed9a6f4ea6f74ae4f261a6eabdb5cd0a05d1
Signed-off-by: Miroslav Šulc  gentoo.org>

 dev-java/jaxen/metadata.xml | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/dev-java/jaxen/metadata.xml b/dev-java/jaxen/metadata.xml
index 952a4b9b605..fa38cb92d41 100644
--- a/dev-java/jaxen/metadata.xml
+++ b/dev-java/jaxen/metadata.xml
@@ -5,4 +5,10 @@
j...@gentoo.org
Java

+   
+   jaxen-xpath/jaxen
+   https://github.com/jaxen-xpath/jaxen/wiki/Jaxen-Wiki
+   https://github.com/jaxen-xpath/jaxen/issues
+   
https://github.com/jaxen-xpath/jaxen/wiki/Changelog
+   
 



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2019-05-17 Thread Aaron Bauman
commit: 551a8de2e664533c8b97b4c0bb09e1c37e936cbe
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sat May 18 01:06:35 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sat May 18 01:06:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=551a8de2

dev-java/jaxen: arm64 stable

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="arm64"

 dev-java/jaxen/jaxen-1.1.4-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/jaxen/jaxen-1.1.4-r1.ebuild 
b/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
index c9891f11b42..7b7eabf7522 100644
--- a/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ 
SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}-src.tar.gz;
 
 LICENSE="JDOM"
 SLOT="1.1"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 CDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2019-05-06 Thread Patrice Clement
commit: 0e4fd62af2583e30ca93ffc7c509352d32ac6663
Author: Patrice Clement  gentoo  org>
AuthorDate: Fri Apr 19 08:06:58 2019 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Mon May  6 09:29:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e4fd62a

dev-java/jaxen: remove xom dependency.

* Clean up xom Java classes.

Signed-off-by: Patrice Clement  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
Closes: https://github.com/gentoo/gentoo/pull/11727

 dev-java/jaxen/jaxen-1.1.6-r1.ebuild | 45 
 1 file changed, 45 insertions(+)

diff --git a/dev-java/jaxen/jaxen-1.1.6-r1.ebuild 
b/dev-java/jaxen/jaxen-1.1.6-r1.ebuild
new file mode 100644
index 000..c364ebdd023
--- /dev/null
+++ b/dev-java/jaxen/jaxen-1.1.6-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java XPath Engine"
+HOMEPAGE="https://github.com/codehaus;
+SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> 
${P}.jar"
+
+LICENSE="JDOM"
+SLOT="1.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CDEPEND="
+   dev-java/jdom:0
+   dev-java/dom4j:1"
+
+RDEPEND="
+   ${CDEPEND}
+   >=virtual/jre-1.6"
+
+DEPEND="
+   ${CDEPEND}
+   >=virtual/jdk-1.6"
+
+JAVA_GENTOO_CLASSPATH="
+   jdom
+   dom4j-1
+"
+
+JAVA_SRC_DIR="org"
+
+src_prepare() {
+   default
+
+   # xom depends on jaxen already. if we don't remove xom packages here and
+   # require jaxen to depend on xom, we end up in a circular dep.
+   # I fear though that removing those classes might bite us somewhere down
+   # the line...
+   rm -rv org/jaxen/xom || die
+}



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2017-07-13 Thread Alexis Ballier
commit: ef017da68375e7941311698561e4a6373042cd02
Author: Alexis Ballier  gentoo  org>
AuthorDate: Thu Jul 13 22:25:47 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Thu Jul 13 22:26:20 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef017da6

dev-java/jaxen: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-java/jaxen/jaxen-1.1.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jaxen/jaxen-1.1.6.ebuild 
b/dev-java/jaxen/jaxen-1.1.6.ebuild
index ccb59e9c946..77b073b118a 100644
--- a/dev-java/jaxen/jaxen-1.1.6.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.6.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${
 
 LICENSE="JDOM"
 SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 CDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2017-07-04 Thread Patrice Clement
commit: b1ad51b149b5c9626eaa5e9e16960be64f8cd8bc
Author: Patrice Clement  gentoo  org>
AuthorDate: Tue Jul  4 21:38:13 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Jul  4 21:44:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1ad51b1

dev-java/jaxen: update HOMEPAGE.

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 dev-java/jaxen/jaxen-1.1.6.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/jaxen/jaxen-1.1.6.ebuild 
b/dev-java/jaxen/jaxen-1.1.6.ebuild
index 3c85fd37d6e..ccb59e9c946 100644
--- a/dev-java/jaxen/jaxen-1.1.6.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.6.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
@@ -8,7 +8,7 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="A Java XPath Engine"
-HOMEPAGE="http://jaxen.codehaus.org/;
+HOMEPAGE="https://github.com/codehaus;
 SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> 
${P}.jar"
 
 LICENSE="JDOM"



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2016-10-08 Thread Patrice Clement
commit: 875b8ff4c7be8efb197693bae5aebbda6f2cb5ba
Author: Patrice Clement  gentoo  org>
AuthorDate: Sat Oct  8 18:45:22 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Oct  8 19:02:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=875b8ff4

dev-java/jaxen: add ~x86 back.

Package-Manager: portage-2.3.0

 dev-java/jaxen/jaxen-1.1.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/jaxen/jaxen-1.1.6.ebuild 
b/dev-java/jaxen/jaxen-1.1.6.ebuild
index 3e6a341..4041f17 100644
--- a/dev-java/jaxen/jaxen-1.1.6.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.6.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${
 
 LICENSE="JDOM"
 SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~ppc64"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 IUSE=""
 
 CDEPEND="



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2016-10-08 Thread Patrice Clement
commit: 0f31e53397278b19326659347cc0c1a45908c765
Author: Patrice Clement  gentoo  org>
AuthorDate: Sat Oct  8 18:43:17 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Oct  8 19:02:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f31e533

dev-java/jaxen: Stable for amd64. Mark stable for the remaining arches via the 
ALLARCHES policy.

Package-Manager: portage-2.3.0

 dev-java/jaxen/jaxen-1.1.4-r1.ebuild | 24 ++--
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/dev-java/jaxen/jaxen-1.1.4-r1.ebuild 
b/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
index 1f16dcc..ceb123a 100644
--- a/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
@@ -9,23 +9,27 @@ JAVA_PKG_IUSE="doc examples source test"
 inherit java-pkg-2 java-ant-2
 
 DESCRIPTION="A Java XPath Engine"
-HOMEPAGE="http://jaxen.codehaus.org/;
+HOMEPAGE="http://jaxen.org;
 SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}-src.tar.gz;
 
 LICENSE="JDOM"
 SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
-COMMON_DEP="
-   dev-java/dom4j:1
+CDEPEND="
+   dev-java/xom:0
dev-java/jdom:0
-   dev-java/xom:0"
-RDEPEND=">=virtual/jre-1.4
-   ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
+   dev-java/dom4j:1"
+
+RDEPEND="
+   ${CDEPEND}
+   >=virtual/jre-1.4"
+
+DEPEND="
+   ${CDEPEND}
test? ( dev-java/ant-junit:0 )
-   ${COMMON_DEP}"
+   >=virtual/jdk-1.4"
 
 JAVA_ANT_REWRITE_CLASSPATH="yes"
 EANT_GENTOO_CLASSPATH="dom4j-1,jdom,xom"
@@ -40,7 +44,7 @@ src_test() {
 }
 
 src_install() {
-   java-pkg_newjar target/${P}.jar
+   java-pkg_newjar "target/${P}.jar"
 
use doc && java-pkg_dojavadoc dist/docs/api
use examples && java-pkg_doexamples src/java/samples



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2016-10-08 Thread Patrice Clement
commit: 3f941dd4057d6bc54b5a845e08cb94c1a711c301
Author: Patrice Clement  gentoo  org>
AuthorDate: Sat Oct  8 18:44:18 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Oct  8 19:02:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f941dd4

dev-java/jaxen: clean up old.

Package-Manager: portage-2.3.0

 dev-java/jaxen/Manifest   |  1 -
 dev-java/jaxen/jaxen-1.1.1.ebuild | 55 ---
 2 files changed, 56 deletions(-)

diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index 2d95461..33d4b6c 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -1,3 +1,2 @@
-DIST jaxen-1.1.1-src.tar.gz 271343 SHA256 
f24ae604a20da87e3716bb1d441c483e56479eaef4e99888f41be06059790bca SHA512 
095523a1600324a2d2f748717c6af0ffe216120b834c1157912b57ea076c639aa3e47fe87da0316cae491ba838765e5e06bc304cdb610789101a54192d976940
 WHIRLPOOL 
2fec877f4b3e565304a7cd8bc7b5b391eaa74068c6bf241d8b2ef0fe5973273164247ec1166fedfbf92f082aa1120a4a3f0ce47e0e13a15add75ac00c128810a
 DIST jaxen-1.1.4-src.tar.gz 268493 SHA256 
97d039a029ccaddf5ef301cafd1da8549b8360fe3ca0c15d65fc57162cd4433e SHA512 
11c1c744af030c50579f872d8c8bf437e48ab4a01e6dd34529f2d9039c154533edaa9b5a367a866e2b57f311f717be300db8f80423c5492be38e0cffc031
 WHIRLPOOL 
44e3449ec8c0c15496c9528c668593d3dde67da67108e5927aee630df6ee3803999f812ab7597f37a68829e95a435fe6699bc9681583f6a500cd55cc51fbd6dc
 DIST jaxen-1.1.6.jar 409677 SHA256 
7d865e649e3dda2a26d9aee3f7f2e9e10569aee688463feb57d0bda16745eaa2 SHA512 
979044fe959493eb6d66fa92b420251cd9c12414051ff6956d5835888a8999d4f337c18646c53806fc19203cef744f53b7597850cd2f695910c90df7a9725b48
 WHIRLPOOL 
a46f4be76d43a0072b4b426b41d5e2df800ec71582724cb0036f010cbc3a9c8e39d4fc87511f6dba79b329cee072feaec506d730bbcc6decc5325d3ccfe866f6

diff --git a/dev-java/jaxen/jaxen-1.1.1.ebuild 
b/dev-java/jaxen/jaxen-1.1.1.ebuild
deleted file mode 100644
index 67938ac..
--- a/dev-java/jaxen/jaxen-1.1.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 eutils java-ant-2
-
-MY_P=${P/_beta/-beta-}
-DESCRIPTION="A Java XPath Engine"
-HOMEPAGE="http://jaxen.org/;
-SRC_URI="http://dist.codehaus.org/${PN}/distributions/${MY_P}-src.tar.gz;
-
-LICENSE="JDOM"
-SLOT="1.1"
-KEYWORDS="amd64 ~arm ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux 
~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc source test"
-
-COMMON_DEP="~dev-java/jdom-1.0
-   =dev-java/dom4j-1*
-   dev-java/xom"
-RDEPEND=">=virtual/jre-1.4
-   ${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.4
-   test? ( dev-java/ant-junit =dev-java/junit-3* )
-   ${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-   unpack ${A}
-
-   cd "${S}"
-   java-ant_ignore-system-classes
-
-   mkdir -p "${S}/target/lib"
-   cd "${S}/target/lib"
-   java-pkg_jar-from dom4j-1
-   java-pkg_jar-from jdom-1.0
-   java-pkg_jar-from xom
-}
-
-src_install() {
-   java-pkg_newjar target/${MY_P}.jar
-
-   use doc && java-pkg_dojavadoc dist/docs/api
-   use examples && java-pkg_doexamples src/java/samples
-   use source && java-pkg_dosrc src/java/main/*
-}
-
-src_test() {
-   java-pkg_jar-from --into target/lib junit
-   ANT_TASKS="ant-junit" eant test -DJunit.present=true
-}



[gentoo-commits] repo/gentoo:master commit in: dev-java/jaxen/

2015-09-29 Thread James Le Cuirot
commit: 23234d982123dc31d1da22a76ca2c6c4f91b451c
Author: William L. Thomson Jr  o-sinc  com>
AuthorDate: Thu Sep 17 23:57:32 2015 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Sep 29 21:19:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23234d98

dev-java/jaxen: Updated dev-java/jdom slot from 1.0 -> 0 for v1

 dev-java/jaxen/{jaxen-1.1.4.ebuild => jaxen-1.1.4-r1.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-java/jaxen/jaxen-1.1.4.ebuild 
b/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
similarity index 94%
rename from dev-java/jaxen/jaxen-1.1.4.ebuild
rename to dev-java/jaxen/jaxen-1.1.4-r1.ebuild
index 2503e98..4c078bf 100644
--- a/dev-java/jaxen/jaxen-1.1.4.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.4-r1.ebuild
@@ -19,7 +19,7 @@ IUSE=""
 
 COMMON_DEP="
dev-java/dom4j:1
-   dev-java/jdom:1.0
+   dev-java/jdom:0
dev-java/xom:0"
 RDEPEND=">=virtual/jre-1.4
${COMMON_DEP}"
@@ -28,7 +28,7 @@ DEPEND=">=virtual/jdk-1.4
${COMMON_DEP}"
 
 JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="dom4j-1,jdom-1.0,xom"
+EANT_GENTOO_CLASSPATH="dom4j-1,jdom,xom"
 EANT_TEST_EXTRA_ARGS="-DJunit.present=true"
 
 java_prepare() {