| 1 |
commit: ca13ddfdbd29d3927a9f65f2052be25bbd95fe02 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 30 17:18:26 2016 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 30 20:29:27 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca13ddfd |
| 7 |
|
| 8 |
dev-java/swingx-ws: Fix jdom dependency (bug #597890), EAPI bump |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.2 |
| 11 |
|
| 12 |
dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild | 17 ++++++++++------- |
| 13 |
1 file changed, 10 insertions(+), 7 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild b/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild |
| 16 |
index 8eeda25..784dd52 100644 |
| 17 |
--- a/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild |
| 18 |
+++ b/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild |
| 19 |
@@ -2,7 +2,7 @@ |
| 20 |
# Distributed under the terms of the GNU General Public License v2 |
| 21 |
# $Id$ |
| 22 |
|
| 23 |
-EAPI="5" |
| 24 |
+EAPI=6 |
| 25 |
|
| 26 |
MY_P="${PN}-2011_05_15-src" |
| 27 |
JAVA_PKG_IUSE="doc source" |
| 28 |
@@ -16,7 +16,7 @@ LICENSE="LGPL-2.1" |
| 29 |
SLOT="bt747" |
| 30 |
KEYWORDS="~amd64 ~x86" |
| 31 |
|
| 32 |
-CDEPEND=" |
| 33 |
+CP_DEPEND=" |
| 34 |
dev-java/jdom:0 |
| 35 |
dev-java/json:0 |
| 36 |
dev-java/rome:0 |
| 37 |
@@ -29,18 +29,19 @@ CDEPEND=" |
| 38 |
dev-java/xml-commons-external:1.4" |
| 39 |
|
| 40 |
RDEPEND=" |
| 41 |
- ${CDEPEND} |
| 42 |
+ ${CP_DEPEND} |
| 43 |
>=virtual/jre-1.6" |
| 44 |
|
| 45 |
DEPEND=" |
| 46 |
- ${CDEPEND} |
| 47 |
- >=virtual/jdk-1.6" |
| 48 |
+ ${CP_DEPEND} |
| 49 |
+ >=virtual/jdk-1.6 |
| 50 |
+ app-arch/unzip" |
| 51 |
|
| 52 |
S="${WORKDIR}/${MY_P}/src" |
| 53 |
JAVA_SRC_DIR="beaninfo java" |
| 54 |
-JAVA_GENTOO_CLASSPATH="commons-httpclient-3,jdom-1.0,json,jtidy,rome,swing-layout-1,swingx-1.6,swingx-beaninfo,xerces-2,xml-commons-external-1.4" |
| 55 |
|
| 56 |
-java_prepare() { |
| 57 |
+src_prepare() { |
| 58 |
+ default |
| 59 |
java-pkg_clean "${WORKDIR}" |
| 60 |
|
| 61 |
# SwingWorker has been built-in since Java 6. |
| 62 |
@@ -53,6 +54,8 @@ java_prepare() { |
| 63 |
# GraphicsUtilities moved in later SwingX versions. |
| 64 |
sed -i "s:org\.jdesktop\.swingx\.graphics\.GraphicsUtilities:org.jdesktop.swingx.util.GraphicsUtilities:g" \ |
| 65 |
java/org/jdesktop/swingx/mapviewer/AbstractTileFactory.java || die |
| 66 |
+ |
| 67 |
+ java-pkg-2_src_prepare |
| 68 |
} |
| 69 |
|
| 70 |
src_compile() { |
Archives