From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7282513838B for ; Tue, 29 Sep 2015 21:20:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B209921C05D; Tue, 29 Sep 2015 21:20:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 92DB521C04F for ; Tue, 29 Sep 2015 21:20:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E4E16340AFF for ; Tue, 29 Sep 2015 21:20:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3720125E for ; Tue, 29 Sep 2015 21:20:14 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1443561596.1accda51407e2aa29ec11fbc3b8ec4f796e9f2cb.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/junit-addons/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/junit-addons/junit-addons-1.4-r1.ebuild X-VCS-Directories: dev-java/junit-addons/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 1accda51407e2aa29ec11fbc3b8ec4f796e9f2cb X-VCS-Branch: master Date: Tue, 29 Sep 2015 21:20:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3010be0d-c088-45e0-ac83-3e32a3f9ad0e X-Archives-Hash: 866f176332c7b7a13e4584b45f4abab9 commit: 1accda51407e2aa29ec11fbc3b8ec4f796e9f2cb Author: James Le Cuirot gentoo org> AuthorDate: Tue Sep 29 21:02:05 2015 +0000 Commit: James Le Cuirot gentoo 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)" \ "${@}" }