[gentoo-commits] repo/gentoo:master commit in: dev-java/slf4j-simple/, dev-java/slf4j-simple/files/

[Patrice Clement]

commit:     f42d61f83982e8665b8142e783ede9087fc60639
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 30 07:38:16 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Sep 30 07:38:16 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f42d61f8

dev-java/slf4j-simple: Rename build.xml in files directory and copy build.xml file accordingly to . Add missing test dependencies to DEPEND.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 .../files/{1.7.6-build.xml => 1.7.7-build.xml}      |  0
 dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild     | 21 +++++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/dev-java/slf4j-simple/files/1.7.6-build.xml b/dev-java/slf4j-simple/files/1.7.7-build.xml
similarity index 100%
rename from dev-java/slf4j-simple/files/1.7.6-build.xml
rename to dev-java/slf4j-simple/files/1.7.7-build.xml

diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild
index 9b41e73..deb4203 100644
--- a/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild
+++ b/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
+
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
@@ -16,12 +17,16 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"
 
-COMMON_DEP="dev-java/slf4j-api:0"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	${COMMON_DEP}
-	test? ( dev-java/junit )"
+CDEPEND="
+	dev-java/slf4j-api:0"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	test? (
+		dev-java/junit:4
+		dev-java/ant-junit:0
+	)"
 
 S="${WORKDIR}/${P/-simple/}/${PN}"
 
@@ -32,7 +37,7 @@ EANT_TEST_ANT_TASKS="ant-junit"
 EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
 
 java_prepare() {
-	cp "${FILESDIR}"/1.7.6-build.xml build.xml || die
+	cp "${FILESDIR}"/"${PV}"-build.xml build.xml || die
 	find "${S}" -name "*.jar" -delete || die
 }