Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/dom4j/
Date: Fri, 07 Apr 2017 21:11:29
Message-Id: 1491598731.77cd22f60f380301847f62d41b83bf1898556091.monsieurp@gentoo
1 commit: 77cd22f60f380301847f62d41b83bf1898556091
2 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 7 20:58:34 2017 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 7 20:58:51 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77cd22f6
7
8 dev-java/dom4j: clean up old.
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 dev-java/dom4j/dom4j-1.6.1-r5.ebuild | 77 -----------------------------------
13 dev-java/dom4j/dom4j-1.6.1-r6.ebuild | 79 ------------------------------------
14 2 files changed, 156 deletions(-)
15
16 diff --git a/dev-java/dom4j/dom4j-1.6.1-r5.ebuild b/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
17 deleted file mode 100644
18 index 47c6f489197..00000000000
19 --- a/dev-java/dom4j/dom4j-1.6.1-r5.ebuild
20 +++ /dev/null
21 @@ -1,77 +0,0 @@
22 -# Copyright 1999-2017 Gentoo Foundation
23 -# Distributed under the terms of the GNU General Public License v2
24 -
25 -EAPI=5
26 -
27 -JAVA_PKG_IUSE="doc source test"
28 -
29 -inherit java-pkg-2 java-ant-2
30 -
31 -DESCRIPTION="Java library for working with XML"
32 -HOMEPAGE="http://dom4j.sourceforge.net/"
33 -SRC_URI="
34 - mirror://sourceforge/dom4j/${P}.tar.gz
35 - mirror://gentoo/${P}-java5.patch.bz2"
36 -
37 -LICENSE="dom4j"
38 -SLOT="1"
39 -KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
40 -IUSE=""
41 -
42 -CDEPEND="
43 - dev-java/xpp2:0
44 - dev-java/xpp3:0
45 - dev-java/jaxme:0
46 - dev-java/xsdlib:0
47 - dev-java/relaxng-datatype:0"
48 -
49 -RDEPEND="
50 - ${CDEPEND}
51 - >=virtual/jre-1.6"
52 -
53 -DEPEND="
54 - ${CDEPEND}
55 - test? (
56 - dev-java/ant-junit:0
57 - dev-java/junitperf:0
58 - )
59 - >=virtual/jdk-1.6"
60 -
61 -java_prepare() {
62 - # Circular deps with jaxen #212993
63 - find -name '*.jar' -! -name jaxen-1.1-beta-6.jar -exec rm -v {} + || die
64 -
65 - # Add missing methods to compile on Java 5 #137970
66 - epatch "${WORKDIR}/${P}-java5.patch"
67 -}
68 -
69 -# 0 - Requires X11.
70 -# 1 - Fails with JDK 1.7.
71 -# 2 - Fails with JDK 1.6.
72 -JAVA_RM_FILES=(
73 - src/test/org/dom4j/bean/BeansTest.java
74 - src/test/org/dom4j/io/StaxTest.java
75 - src/test/org/dom4j/rule/RuleTest.java
76 -)
77 -
78 -JAVA_ANT_REWRITE_CLASSPATH="yes"
79 -JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
80 -
81 -JAVA_ANT_ENCODING="ISO-8859-1"
82 -
83 -EANT_BUILD_TARGET="clean package"
84 -EANT_GENTOO_CLASSPATH="jaxme,relaxng-datatype,xpp2,xpp3,xsdlib"
85 -EANT_GENTOO_CLASSPATH_EXTRA="lib/jaxen-1.1-beta-6.jar"
86 -EANT_EXTRA_ARGS="-Dbuild.javadocs=build/doc/api"
87 -
88 -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junitperf"
89 -
90 -src_test() {
91 - java-pkg-2_src_test
92 -}
93 -
94 -src_install() {
95 - java-pkg_dojar "build/${PN}.jar"
96 - use doc && java-pkg_dojavadoc build/doc/api
97 - use source && java-pkg_dosrc src/java/*
98 -}
99
100 diff --git a/dev-java/dom4j/dom4j-1.6.1-r6.ebuild b/dev-java/dom4j/dom4j-1.6.1-r6.ebuild
101 deleted file mode 100644
102 index de9cd73a50d..00000000000
103 --- a/dev-java/dom4j/dom4j-1.6.1-r6.ebuild
104 +++ /dev/null
105 @@ -1,79 +0,0 @@
106 -# Copyright 1999-2017 Gentoo Foundation
107 -# Distributed under the terms of the GNU General Public License v2
108 -
109 -EAPI=5
110 -
111 -JAVA_PKG_IUSE="doc source test"
112 -
113 -inherit java-pkg-2 java-ant-2
114 -
115 -DESCRIPTION="Java library for working with XML"
116 -HOMEPAGE="http://dom4j.sourceforge.net/"
117 -SRC_URI="
118 - mirror://sourceforge/dom4j/${P}.tar.gz
119 - mirror://gentoo/${P}-java5.patch.bz2"
120 -
121 -LICENSE="dom4j"
122 -SLOT="1"
123 -KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
124 -IUSE=""
125 -
126 -CDEPEND="
127 - dev-java/xpp2:0
128 - dev-java/xpp3:0
129 - dev-java/xsdlib:0
130 - dev-java/relaxng-datatype:0"
131 -
132 -RDEPEND="
133 - ${CDEPEND}
134 - >=virtual/jre-1.6"
135 -
136 -DEPEND="
137 - ${CDEPEND}
138 - test? (
139 - dev-java/ant-junit:0
140 - dev-java/junitperf:0
141 - )
142 - >=virtual/jdk-1.6"
143 -
144 -PDEPEND="dev-java/jaxen:1.1"
145 -
146 -java_prepare() {
147 - # Circular deps with jaxen #212993
148 - find -name '*.jar' -! -name jaxen-1.1-beta-6.jar -exec rm -v {} + || die
149 -
150 - # Add missing methods to compile on Java 5 #137970
151 - epatch "${WORKDIR}/${P}-java5.patch"
152 -}
153 -
154 -# 0 - Requires X11.
155 -# 1 - Fails with JDK 1.7.
156 -# 2 - Fails with JDK 1.6.
157 -JAVA_RM_FILES=(
158 - src/test/org/dom4j/bean/BeansTest.java
159 - src/test/org/dom4j/io/StaxTest.java
160 - src/test/org/dom4j/rule/RuleTest.java
161 -)
162 -
163 -JAVA_ANT_REWRITE_CLASSPATH="yes"
164 -JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
165 -
166 -JAVA_ANT_ENCODING="ISO-8859-1"
167 -
168 -EANT_BUILD_TARGET="clean package"
169 -EANT_GENTOO_CLASSPATH="relaxng-datatype,xpp2,xpp3,xsdlib"
170 -EANT_GENTOO_CLASSPATH_EXTRA="lib/jaxen-1.1-beta-6.jar"
171 -EANT_EXTRA_ARGS="-Dbuild.javadocs=build/doc/api"
172 -
173 -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junitperf"
174 -
175 -src_test() {
176 - java-pkg-2_src_test
177 -}
178 -
179 -src_install() {
180 - java-pkg_dojar "build/${PN}.jar"
181 - java-pkg_register-dependency jaxen-1.1
182 - use doc && java-pkg_dojavadoc build/doc/api
183 - use source && java-pkg_dosrc src/java/*
184 -}