diff options
| author |   Patrice Clement <monsieurp@gentoo.org> | 2015-09-30 07:38:16 +0000 |
|---|---|---|
| committer | Patrice Clement <monsieurp@gentoo.org> | 2015-09-30 07:38:16 +0000 |
| commit | f42d61f83982e8665b8142e783ede9087fc60639 (patch) | |
| tree | 2784e0111d3b64bf5365251addd97be43a57830d /dev-java | |
| parent | dev-java/slf4j-simple: Clean up old. (diff) | |
| download | gentoo-f42d61f83982e8665b8142e783ede9087fc60639.tar.gz gentoo-f42d61f83982e8665b8142e783ede9087fc60639.tar.bz2 gentoo-f42d61f83982e8665b8142e783ede9087fc60639.zip | |
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@gentoo.org>
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/slf4j-simple/files/1.7.7-build.xml (renamed from dev-java/slf4j-simple/files/1.7.6-build.xml) | 0 | ||||
| -rw-r--r-- | 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 index f91d565e170a..f91d565e170a 100644 --- a/dev-java/slf4j-simple/files/1.7.6-build.xml +++ b/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 9b41e7364c12..deb4203c4699 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 } |