From: "James Le Cuirot" <chewi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/junit-addons/
Date: Tue, 29 Sep 2015 21:20:14 +0000 (UTC) [thread overview]
Message-ID: <1443561596.1accda51407e2aa29ec11fbc3b8ec4f796e9f2cb.chewi@gentoo> (raw)
commit: 1accda51407e2aa29ec11fbc3b8ec4f796e9f2cb
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 29 21:02:05 2015 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Sep 29 21:19:56 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1accda51
dev-java/junit-addons: Fix the jdom-1.0 reference that wltjr missed
Also apply proper SLOT dependencies and change the src_unpack to
java_prepare.
Package-Manager: portage-2.2.20.1
dev-java/junit-addons/junit-addons-1.4-r1.ebuild | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/dev-java/junit-addons/junit-addons-1.4-r1.ebuild b/dev-java/junit-addons/junit-addons-1.4-r1.ebuild
index e657b2b..4df5fa1 100644
--- a/dev-java/junit-addons/junit-addons-1.4-r1.ebuild
+++ b/dev-java/junit-addons/junit-addons-1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,10 +17,10 @@ SLOT="0"
KEYWORDS="~amd64 ~x86 ~x86-linux ~x86-macos"
COMMON_DEP="
- =dev-java/junit-3.8*
- dev-java/ant-core
+ dev-java/junit:0
+ dev-java/ant-core:0
dev-java/jdom:0
- =dev-java/jaxen-1.1*
+ dev-java/jaxen:1.1
"
RDEPEND=">=virtual/jre-1.4
@@ -29,9 +29,7 @@ DEPEND=">=virtual/jdk-1.4
app-arch/unzip
${COMMON_DEP}"
-src_unpack() {
- unpack ${A}
- cd "${S}"
+java_prepare() {
unpack ./src.jar
rm -v *.jar || die
# Not included so taken from cvs
@@ -43,7 +41,7 @@ _eant() {
eant \
-Djunit.jar="$(java-pkg_getjar junit junit.jar)" \
-Dant.jar="$(java-pkg_getjar ant-core ant.jar)" \
- -Djdom.jar="$(java-pkg_getjar jdom-1.0 jdom.jar)" \
+ -Djdom.jar="$(java-pkg_getjar jdom jdom.jar)" \
-Djaxen.jar="$(java-pkg_getjar jaxen-1.1 jaxen.jar)" \
"${@}"
}
next reply other threads:[~2015-09-29 21:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-29 21:20 James Le Cuirot [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-09-29 21:20 [gentoo-commits] repo/gentoo:master commit in: dev-java/junit-addons/ 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=1443561596.1accda51407e2aa29ec11fbc3b8ec4f796e9f2cb.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