From: "James Le Cuirot" <chewi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/swingx-ws/
Date: Sun, 30 Oct 2016 20:29:48 +0000 (UTC) [thread overview]
Message-ID: <1477859367.ca13ddfdbd29d3927a9f65f2052be25bbd95fe02.chewi@gentoo> (raw)
commit: ca13ddfdbd29d3927a9f65f2052be25bbd95fe02
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 17:18:26 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 20:29:27 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca13ddfd
dev-java/swingx-ws: Fix jdom dependency (bug #597890), EAPI bump
Package-Manager: portage-2.3.2
dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
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
index 8eeda25..784dd52 100644
--- a/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild
+++ b/dev-java/swingx-ws/swingx-ws-1.0_p20110515-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
+EAPI=6
MY_P="${PN}-2011_05_15-src"
JAVA_PKG_IUSE="doc source"
@@ -16,7 +16,7 @@ LICENSE="LGPL-2.1"
SLOT="bt747"
KEYWORDS="~amd64 ~x86"
-CDEPEND="
+CP_DEPEND="
dev-java/jdom:0
dev-java/json:0
dev-java/rome:0
@@ -29,18 +29,19 @@ CDEPEND="
dev-java/xml-commons-external:1.4"
RDEPEND="
- ${CDEPEND}
+ ${CP_DEPEND}
>=virtual/jre-1.6"
DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6"
+ ${CP_DEPEND}
+ >=virtual/jdk-1.6
+ app-arch/unzip"
S="${WORKDIR}/${MY_P}/src"
JAVA_SRC_DIR="beaninfo java"
-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"
-java_prepare() {
+src_prepare() {
+ default
java-pkg_clean "${WORKDIR}"
# SwingWorker has been built-in since Java 6.
@@ -53,6 +54,8 @@ java_prepare() {
# GraphicsUtilities moved in later SwingX versions.
sed -i "s:org\.jdesktop\.swingx\.graphics\.GraphicsUtilities:org.jdesktop.swingx.util.GraphicsUtilities:g" \
java/org/jdesktop/swingx/mapviewer/AbstractTileFactory.java || die
+
+ java-pkg-2_src_prepare
}
src_compile() {
next reply other threads:[~2016-10-30 20:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-30 20:29 James Le Cuirot [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-07-29 15:15 [gentoo-commits] repo/gentoo:master commit in: dev-java/swingx-ws/ Arthur Zamarin
2022-02-22 12:03 Florian Schmaus
2021-12-07 7:50 Miroslav Šulc
2016-10-30 20:29 James Le Cuirot
2016-10-09 9:36 Patrice Clement
2016-10-09 9:36 Patrice Clement
2016-02-14 11:57 James Le Cuirot
2016-02-13 13:09 James Le Cuirot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1477859367.ca13ddfdbd29d3927a9f65f2052be25bbd95fe02.chewi@gentoo \
--to=chewi@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox