Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/jdom-jaxen/
Date: Tue, 29 Sep 2015 21:20:46
Message-Id: 1443561603.d60fe8603d215863739ca87c26ef00880b715152.chewi@gentoo
1 commit: d60fe8603d215863739ca87c26ef00880b715152
2 Author: William L. Thomson Jr <wlt <AT> o-sinc <DOT> com>
3 AuthorDate: Fri Sep 18 02:22:26 2015 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 29 21:20:03 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d60fe860
7
8 dev-java/jdom-jaxen: Removed older beta versions
9
10 Fixes QA issues for jdom. Eventually will remove this package entirely
11 in place of dev-java/jaxen.
12
13 dev-java/jdom-jaxen/Manifest | 2 -
14 .../jdom-jaxen/jdom-jaxen-1.0_beta10-r1.ebuild | 52 ---------------------
15 dev-java/jdom-jaxen/jdom-jaxen-1.0_beta9-r2.ebuild | 54 ----------------------
16 3 files changed, 108 deletions(-)
17
18 diff --git a/dev-java/jdom-jaxen/Manifest b/dev-java/jdom-jaxen/Manifest
19 index 248ee9d..7b695ad 100644
20 --- a/dev-java/jdom-jaxen/Manifest
21 +++ b/dev-java/jdom-jaxen/Manifest
22 @@ -1,3 +1 @@
23 DIST jdom-1.0.tar.gz 3571788 SHA256 fdb77a2c9f8f91a9bd898a0d99b941b79137b5ab692e35ca17dcb73a58b15f77 SHA512 0bf1df21cdacdddb1df8bdfc2c4aa307bb6516a7614eb7382e99a60d03d9fcf77333e84f37ed653f264e7e9cdecb91fb9e2e11fcf76d70b3068bf238be4d0b24 WHIRLPOOL 329163b0a6838322be5174e7a6eddcafeddecc54e541cbdb28748f99da88c79349f67bd79c88bda6944d142440df8d21b21cb0fbb2b1497a6fc84f30a531f8f3
24 -DIST jdom-b10.tar.gz 3565663 SHA256 be6771052ec6d33a192416a9acd0694f1ee2bb5a8eaf506f927a74f56d648a66 SHA512 afea09b55815d021691b682e0a2e006ebbee699e0fa879ffb17712896eea6453016ec49fd6eee8758565eae68f236d5dddcc7fc940dca76c0e580e69bb544f52 WHIRLPOOL 69e555bb7edbf6fd107f58e0f06954683e25f9be46bc9668cce2570ed1d20f285e09b19372288b8a7cd3c4de955f4d16ca54c9cb6c20c1f5966865f439f0b8d3
25 -DIST jdom-b9.tar.gz 3417274 SHA256 00c4ddf640b17768582bba0e8b8a2584fe42b2540a98d1bfa276fa43bef1a676 SHA512 b210938c2ec539a59664586ef979d834817fba08c96d30fd9696a72ce3961693faa3ea3718687cd208cb35c4227c2e908b2ea9f981ba97b1991414f6347e0963 WHIRLPOOL f5059bb062986ace5ae4872afbf59333c8d9fbf676066135d5fe79806c28bea4c5e3ec8071e2c3fd546c6b4e4c4adafdbae187cc2c340cd78912f6b5d6a4b356
26
27 diff --git a/dev-java/jdom-jaxen/jdom-jaxen-1.0_beta10-r1.ebuild b/dev-java/jdom-jaxen/jdom-jaxen-1.0_beta10-r1.ebuild
28 deleted file mode 100644
29 index 313769e..0000000
30 --- a/dev-java/jdom-jaxen/jdom-jaxen-1.0_beta10-r1.ebuild
31 +++ /dev/null
32 @@ -1,52 +0,0 @@
33 -# Copyright 1999-2014 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -# $Id$
36 -
37 -JAVA_PKG_IUSE=""
38 -
39 -inherit base java-pkg-2
40 -
41 -MY_PN="jdom"
42 -MY_PV="b10"
43 -MY_P="${MY_PN}-${MY_PV}"
44 -
45 -DESCRIPTION="Jaxen binding for jdom"
46 -HOMEPAGE="http://www.jdom.org"
47 -SRC_URI="http://www.jdom.org/dist/source/${MY_P}.tar.gz"
48 -
49 -LICENSE="JDOM"
50 -SLOT="${PV}"
51 -KEYWORDS="amd64 ppc ppc64 ~x86"
52 -
53 -IUSE=""
54 -
55 -COMMON_DEP="~dev-java/jdom-${SLOT}
56 - =dev-java/jaxen-1.1*
57 - dev-java/saxpath"
58 -
59 -RDEPEND=">=virtual/jre-1.4
60 - ${COMMON_DEP}"
61 -DEPEND=">=virtual/jdk-1.4
62 - app-arch/unzip
63 - ${COMMON_DEP}"
64 -
65 -S="${WORKDIR}/${MY_P}"
66 -
67 -src_compile() {
68 - cd "${S}/src/java/org/jdom/xpath/"
69 - mv JaxenXPath.java JaxenXPath.java.bak
70 - sed 's/SAXPathException/Exception/g' JaxenXPath.java.bak > JaxenXPath.java
71 -
72 - cd "${S}"
73 -
74 - mkdir -p "${S}/build/org/jdom/xpath" || die "Unable to create dir."
75 - ejavac -d "${S}/build/" \
76 - -classpath $(java-config -p jdom-${SLOT},jaxen-1.1,saxpath) \
77 - src/java/org/jdom/xpath/JaxenXPath.java
78 -
79 - jar cf jdom-jaxen.jar -C build org || die "Failed to create jar."
80 -}
81 -
82 -src_install() {
83 - java-pkg_dojar "${PN}.jar"
84 -}
85
86 diff --git a/dev-java/jdom-jaxen/jdom-jaxen-1.0_beta9-r2.ebuild b/dev-java/jdom-jaxen/jdom-jaxen-1.0_beta9-r2.ebuild
87 deleted file mode 100644
88 index a81b3fd..0000000
89 --- a/dev-java/jdom-jaxen/jdom-jaxen-1.0_beta9-r2.ebuild
90 +++ /dev/null
91 @@ -1,54 +0,0 @@
92 -# Copyright 1999-2014 Gentoo Foundation
93 -# Distributed under the terms of the GNU General Public License v2
94 -# $Id$
95 -
96 -JAVA_PKG_IUSE=""
97 -
98 -inherit base java-pkg-2
99 -
100 -MY_PN="jdom"
101 -MY_PV="b9"
102 -MY_P="${MY_PN}-${MY_PV}"
103 -
104 -DESCRIPTION="Jaxen binding for jdom"
105 -HOMEPAGE="http://www.jdom.org"
106 -SRC_URI="http://www.jdom.org/dist/source/archive/${MY_P}.tar.gz"
107 -
108 -LICENSE="JDOM"
109 -SLOT="${PV}"
110 -KEYWORDS="amd64 ppc ppc64 ~x86"
111 -
112 -IUSE=""
113 -
114 -COMMON_DEP="~dev-java/jdom-1.0_beta9
115 - =dev-java/jaxen-1.1*
116 - dev-java/saxpath"
117 -
118 -RDEPEND=">=virtual/jre-1.4
119 - ${COMMON_DEP}"
120 -DEPEND=">=virtual/jdk-1.4
121 - app-arch/unzip
122 - ${COMMON_DEP}"
123 -
124 -S="${WORKDIR}/${MY_P}"
125 -
126 -src_compile() {
127 - cd "${S}/src/java/org/jdom/xpath/"
128 - mv JaxenXPath.java JaxenXPath.java.bak
129 - sed 's/SAXPathException/Exception/g' JaxenXPath.java.bak > JaxenXPath.java
130 -
131 - cd "${S}"
132 -
133 - mkdir -p "${S}/build/org/jdom/xpath" || die "Unable to create dir."
134 - ejavac -d "${S}/build/" \
135 - -classpath $(java-config -p jdom-1.0_beta9,jaxen-1.1,saxpath) \
136 - src/java/org/jdom/xpath/JaxenXPath.java
137 -
138 - jar cf jdom-jaxen.jar -C build org || die "Failed to create jar."
139 -}
140 -
141 -src_install() {
142 - java-pkg_dojar "${PN}.jar"
143 - #use doc && java-pkg_dojavadoc build/javadoc
144 - #use source && java-pkg_dosrc src
145 -}