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/kxml/
Date: Sat, 31 Oct 2015 17:45:49
Message-Id: 1446313397.13f4654b49c6c5490ca3f82d105fd191300a371b.monsieurp@gentoo
1 commit: 13f4654b49c6c5490ca3f82d105fd191300a371b
2 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 31 16:44:10 2015 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 31 17:43:17 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13f4654b
7
8 dev-java/kxml: Housekeeping.
9
10 Package-Manager: portage-2.2.20.1
11 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
12
13 dev-java/kxml/kxml-2.3.0.ebuild | 17 ++++++++---------
14 1 file changed, 8 insertions(+), 9 deletions(-)
15
16 diff --git a/dev-java/kxml/kxml-2.3.0.ebuild b/dev-java/kxml/kxml-2.3.0.ebuild
17 index cc0c327..584e2d9 100644
18 --- a/dev-java/kxml/kxml-2.3.0.ebuild
19 +++ b/dev-java/kxml/kxml-2.3.0.ebuild
20 @@ -6,7 +6,7 @@ EAPI="5"
21
22 JAVA_PKG_IUSE="doc examples source"
23
24 -inherit eutils java-pkg-2 java-ant-2
25 +inherit java-pkg-2 java-ant-2
26
27 DESCRIPTION="Small XML pull parser for constrained environments such as Applets, Personal Java or MIDP devices"
28 HOMEPAGE="http://kxml.org/"
29 @@ -18,25 +18,24 @@ KEYWORDS="amd64"
30
31 CDEPEND="dev-java/xpp3:0"
32
33 -DEPEND=">=virtual/jdk-1.6
34 +DEPEND="
35 ${CDEPEND}
36 + >=virtual/jdk-1.6
37 app-arch/unzip"
38
39 -RDEPEND=">=virtual/jre-1.6
40 - ${CDEPEND}"
41 +RDEPEND="
42 + ${CDEPEND}
43 + >=virtual/jre-1.6"
44
45 S="${WORKDIR}"
46
47 java_prepare() {
48 + java-pkg_clean
49 cp "${FILESDIR}"/${P}-build.xml build.xml || die
50 -
51 - find . -name '*.class' -print -delete || die
52 - find . -name '*.jar' -print -delete || die
53 }
54
55 -EANT_BUILD_TARGET="build_jar"
56 -
57 JAVA_ANT_REWRITE_CLASSPATH="true"
58 +EANT_BUILD_TARGET="build_jar"
59 EANT_GENTOO_CLASSPATH="xpp3"
60
61 src_install() {