1 |
commit: a871d2b01b7673788592d8eb1ab34101c187fa79 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 18 14:35:26 2021 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 18 14:36:26 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a871d2b0 |
7 |
|
8 |
dev-java/jaxen: improvements in 1.2.0-r1 |
9 |
|
10 |
1) added support for tests |
11 |
2) added jdom and xom use flags |
12 |
3) cleanup |
13 |
|
14 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
15 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
16 |
|
17 |
dev-java/jaxen/jaxen-1.2.0-r1.ebuild | 43 ++++++++++++++++++++++++++---------- |
18 |
dev-java/jaxen/metadata.xml | 4 +++- |
19 |
2 files changed, 34 insertions(+), 13 deletions(-) |
20 |
|
21 |
diff --git a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild |
22 |
index adfa52aaccf..86f30856f53 100644 |
23 |
--- a/dev-java/jaxen/jaxen-1.2.0-r1.ebuild |
24 |
+++ b/dev-java/jaxen/jaxen-1.2.0-r1.ebuild |
25 |
@@ -19,10 +19,10 @@ SRC_URI="https://github.com/${PN}-xpath/${PN}/archive/refs/tags/v${PV}.tar.gz -> |
26 |
LICENSE="BSD-2" |
27 |
SLOT="1.2" |
28 |
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
29 |
-IUSE="dom4j" |
30 |
+IUSE="dom4j jdom xom" |
31 |
|
32 |
-# It seems that most tests depend on dom4j, jdom and xom which all depend on jaxen |
33 |
-RESTRICT="test" |
34 |
+# It seems that most tests depend on dom4j, jdom and xom which all depend back on jaxen |
35 |
+REQUIRED_USE="test? ( dom4j jdom xom )" |
36 |
|
37 |
# Compile dependencies |
38 |
# POM: pom.xml |
39 |
@@ -31,13 +31,19 @@ RESTRICT="test" |
40 |
# POM: pom.xml |
41 |
# test? junit:junit:3.8.2 -> >=dev-java/junit-3.8.2:0 |
42 |
|
43 |
+CDEPEND=" |
44 |
+ dom4j? ( dev-java/dom4j:1 ) |
45 |
+ jdom? ( dev-java/jdom:0 ) |
46 |
+ xom? ( dev-java/xom:0 ) |
47 |
+" |
48 |
+ |
49 |
DEPEND=" |
50 |
- dev-java/xerces:2 |
51 |
+ ${CDEPEND} |
52 |
>=virtual/jdk-1.8:* |
53 |
- dom4j? ( dev-java/dom4j:1 ) |
54 |
" |
55 |
|
56 |
RDEPEND=" |
57 |
+ ${CDEPEND} |
58 |
>=virtual/jre-1.8:* |
59 |
" |
60 |
|
61 |
@@ -45,18 +51,31 @@ S="${WORKDIR}" |
62 |
|
63 |
DOCS=( "${P}"/{LICENSE.txt,README.md} ) |
64 |
|
65 |
-JAVA_CLASSPATH_EXTRA="xerces-2" |
66 |
JAVA_SRC_DIR="${P}/src/java/main" |
67 |
|
68 |
+JAVA_TEST_SRC_DIR="${P}/src/java/test" |
69 |
+JAVA_TEST_GENTOO_CLASSPATH="junit" |
70 |
+ |
71 |
src_prepare() { |
72 |
default |
73 |
|
74 |
- # solve cyclic deps by removing these dirs |
75 |
- # dom4j, jdom and xom depend on jaxen |
76 |
- # https://bugs.gentoo.org/739894#c9 |
77 |
- rm -rv "${JAVA_SRC_DIR}"/org/jaxen/{jdom,xom} || die |
78 |
- use dom4j || rm -rv "${JAVA_SRC_DIR}"/org/jaxen/dom4j || die |
79 |
- use dom4j && JAVA_GENTOO_CLASSPATH="dom4j-1" |
80 |
+ if use dom4j; then |
81 |
+ JAVA_GENTOO_CLASSPATH+=" dom4j-1" |
82 |
+ else |
83 |
+ rm -rv "${JAVA_SRC_DIR}"/org/jaxen/dom4j || die |
84 |
+ fi |
85 |
+ |
86 |
+ if use jdom; then |
87 |
+ JAVA_GENTOO_CLASSPATH+=" jdom" |
88 |
+ else |
89 |
+ rm -rv "${JAVA_SRC_DIR}"/org/jaxen/jdom || die |
90 |
+ fi |
91 |
+ |
92 |
+ if use xom; then |
93 |
+ JAVA_GENTOO_CLASSPATH+=" xom" |
94 |
+ else |
95 |
+ rm -rv "${JAVA_SRC_DIR}"/org/jaxen/xom || die |
96 |
+ fi |
97 |
} |
98 |
|
99 |
src_install() { |
100 |
|
101 |
diff --git a/dev-java/jaxen/metadata.xml b/dev-java/jaxen/metadata.xml |
102 |
index 418032ce6ec..e20be5fb7b4 100644 |
103 |
--- a/dev-java/jaxen/metadata.xml |
104 |
+++ b/dev-java/jaxen/metadata.xml |
105 |
@@ -6,7 +6,9 @@ |
106 |
<name>Java</name> |
107 |
</maintainer> |
108 |
<use> |
109 |
- <flag name="dom4j">build the org.jaxen.dom4j.Dom4jXPath class</flag> |
110 |
+ <flag name="dom4j">Includes org.jaxen.dom4j package</flag> |
111 |
+ <flag name="jdom">Includes org.jaxen.jdom package</flag> |
112 |
+ <flag name="xom">Includes org.jaxen.xom package</flag> |
113 |
</use> |
114 |
<upstream> |
115 |
<remote-id type="github">jaxen-xpath/jaxen</remote-id> |