1 |
commit: fe8f1aa8e615d6002bf400e3ce09eb24a3fbe789 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 28 12:12:33 2018 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 28 12:15:41 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe8f1aa8 |
7 |
|
8 |
dev-java/jdom-jaxen: Remove last-rited pkg |
9 |
|
10 |
Closes: https://bugs.gentoo.org/559994 |
11 |
|
12 |
dev-java/jdom-jaxen/Manifest | 1 - |
13 |
dev-java/jdom-jaxen/jdom-jaxen-1.0-r1.ebuild | 51 ---------------------------- |
14 |
dev-java/jdom-jaxen/metadata.xml | 11 ------ |
15 |
profiles/package.mask | 5 --- |
16 |
4 files changed, 68 deletions(-) |
17 |
|
18 |
diff --git a/dev-java/jdom-jaxen/Manifest b/dev-java/jdom-jaxen/Manifest |
19 |
deleted file mode 100644 |
20 |
index 9d9c46516db..00000000000 |
21 |
--- a/dev-java/jdom-jaxen/Manifest |
22 |
+++ /dev/null |
23 |
@@ -1 +0,0 @@ |
24 |
-DIST jdom-1.0.tar.gz 3571788 BLAKE2B f411941b333cb0876a2a88828a8938a346d1a008764638f58723634f24c48a843b71db1c8ddbbc62bc07bba825d5d3f24ae438668ce99389d10415ac5d1a64a8 SHA512 0bf1df21cdacdddb1df8bdfc2c4aa307bb6516a7614eb7382e99a60d03d9fcf77333e84f37ed653f264e7e9cdecb91fb9e2e11fcf76d70b3068bf238be4d0b24 |
25 |
|
26 |
diff --git a/dev-java/jdom-jaxen/jdom-jaxen-1.0-r1.ebuild b/dev-java/jdom-jaxen/jdom-jaxen-1.0-r1.ebuild |
27 |
deleted file mode 100644 |
28 |
index 23aa620ab07..00000000000 |
29 |
--- a/dev-java/jdom-jaxen/jdom-jaxen-1.0-r1.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,51 +0,0 @@ |
32 |
-# Copyright 1999-2018 Gentoo Foundation |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=0 |
36 |
- |
37 |
-JAVA_PKG_IUSE="" |
38 |
- |
39 |
-inherit base java-pkg-2 |
40 |
- |
41 |
-MY_PN="jdom" |
42 |
- |
43 |
-DESCRIPTION="Jaxen binding for jdom" |
44 |
-HOMEPAGE="http://www.jdom.org" |
45 |
-SRC_URI="http://www.jdom.org/dist/source/${MY_PN}-${PV}.tar.gz" |
46 |
- |
47 |
-LICENSE="JDOM" |
48 |
-SLOT="${PV}" |
49 |
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" |
50 |
- |
51 |
-IUSE="" |
52 |
- |
53 |
-COMMON_DEP="~dev-java/jdom-${SLOT} |
54 |
- =dev-java/jaxen-1.1* |
55 |
- dev-java/saxpath" |
56 |
- |
57 |
-RDEPEND=">=virtual/jre-1.4 |
58 |
- ${COMMON_DEP}" |
59 |
-DEPEND=">=virtual/jdk-1.4 |
60 |
- app-arch/unzip |
61 |
- ${COMMON_DEP}" |
62 |
- |
63 |
-S="${WORKDIR}/${MY_PN}-${PV}" |
64 |
- |
65 |
-src_compile() { |
66 |
- cd "${S}/src/java/org/jdom/xpath/" |
67 |
- mv JaxenXPath.java JaxenXPath.java.bak |
68 |
- sed 's/SAXPathException/Exception/g' JaxenXPath.java.bak > JaxenXPath.java |
69 |
- |
70 |
- cd "${S}" |
71 |
- |
72 |
- mkdir -p "${S}/build/org/jdom/xpath" || die "Unable to create dir." |
73 |
- ejavac -d "${S}/build/" \ |
74 |
- -classpath $(java-config -p jdom-${SLOT},jaxen-1.1,saxpath) \ |
75 |
- src/java/org/jdom/xpath/JaxenXPath.java |
76 |
- |
77 |
- jar cf jdom-jaxen.jar -C build org || die "Failed to create jar." |
78 |
-} |
79 |
- |
80 |
-src_install() { |
81 |
- java-pkg_dojar "${PN}.jar" |
82 |
-} |
83 |
|
84 |
diff --git a/dev-java/jdom-jaxen/metadata.xml b/dev-java/jdom-jaxen/metadata.xml |
85 |
deleted file mode 100644 |
86 |
index 393226d80ad..00000000000 |
87 |
--- a/dev-java/jdom-jaxen/metadata.xml |
88 |
+++ /dev/null |
89 |
@@ -1,11 +0,0 @@ |
90 |
-<?xml version="1.0" encoding="UTF-8"?> |
91 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
92 |
-<pkgmetadata> |
93 |
-<maintainer type="project"> |
94 |
- <email>java@g.o</email> |
95 |
- <name>Java</name> |
96 |
-</maintainer> |
97 |
-<longdescription lang="en"> |
98 |
-Jaxen binding for jdom. Split from jdom to resolve circular dependencies. |
99 |
-</longdescription> |
100 |
-</pkgmetadata> |
101 |
|
102 |
diff --git a/profiles/package.mask b/profiles/package.mask |
103 |
index eddffc55f0e..359d07e5b1f 100644 |
104 |
--- a/profiles/package.mask |
105 |
+++ b/profiles/package.mask |
106 |
@@ -221,11 +221,6 @@ games-arcade/xevil |
107 |
dev-java/servletapi |
108 |
dev-java/sun-jacc-api |
109 |
|
110 |
-# Pacho Ramos <pacho@g.o> (17 Jun 2018) |
111 |
-# Obsolete package not needed for a long time, bug #559994. Removal in a |
112 |
-# month. |
113 |
-dev-java/jdom-jaxen |
114 |
- |
115 |
# Pacho Ramos <pacho@g.o> (17 Jun 2018) |
116 |
# Dead since 2013, not compatible with latest profiles (#642568). Removal in |
117 |
# a month |