commit: 09390ad49488dd3a8ad309a763b5ed8058bb71e4
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 13 14:21:55 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Aug 13 15:46:55 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09390ad4
dev-java/slf4j-nop: Remove old versions.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/slf4j-nop/Manifest | 4 +-
dev-java/slf4j-nop/files/1.6.6-build.xml | 19 ---------
.../files/{1.7.5-build.xml => 1.7.7-build.xml} | 0
dev-java/slf4j-nop/files/build.xml | 17 --------
dev-java/slf4j-nop/slf4j-nop-1.5.11.ebuild | 38 ------------------
dev-java/slf4j-nop/slf4j-nop-1.6.6.ebuild | 45 ----------------------
...f4j-nop-1.7.5.ebuild => slf4j-nop-1.7.7.ebuild} | 15 +++++---
7 files changed, 10 insertions(+), 128 deletions(-)
diff --git a/dev-java/slf4j-nop/Manifest b/dev-java/slf4j-nop/Manifest
index 6ecd815..9857cc1 100644
--- a/dev-java/slf4j-nop/Manifest
+++ b/dev-java/slf4j-nop/Manifest
@@ -1,3 +1 @@
-DIST slf4j-1.6.6.tar.gz 2703160 SHA256
d169a50fd535417bde88e342a21c1674fef0a560cbe249ff05e56b8178589b55 SHA512
bb22e3c38d451893b79f382d790eb1058465208a1ab462999894c12375ed6b38daced6389d2a8e6015cc718479bfbc50b2b58a354e99a2aadec7c9decd59423f
WHIRLPOOL
1903a6513c1b7e133240c19bcf3e6c506ba3c080be66d000c7d3f382c750a8a4ad47faffe9352937bbf77e814152c58e1163b76b012d7d65ad4c3cc9bd9e290d
-DIST slf4j-1.7.5.tar.gz 2862186 SHA256
e83f1f22f22dabce0a78bd8191fb2d6fab71dc9dc4c8bfbd7939a87b1237c92e SHA512
2ef078f505b626273bd22fe683b4a2527ce2d97b345ffb8cd9f23e7375cb11588623e67e15de90ceacfa02689e40c59749f22e5e0b44b8a9fd7492d3f120d9d7
WHIRLPOOL
4a396c81b50b186d8e582f30331f7d0a21c85bb2cc293bdc8eff8a8bc49ae7382b6b37e1b3f585d0f14e716b1b889ac17ae1acdc03799b93180539e488170820
-DIST slf4j-nop-1.5.11-sources.jar 5372 SHA256
2cdf4de025c5e564de45599aeaf6c28ab0dfb77e8e9fd139f4fd070f1926a549 SHA512
012dac709c70c3bf514f767fd26efbf46d795440aea206353b8988112992a024b1a916a6c62d9a6b9cd8c75febf93b0dc5a0df0050b71bd038c1d50cba13217d
WHIRLPOOL
70e32cc0f5d755ee5dad0cd654d37a990a9570a21ac6bc384dad8733f2cbd6a61bc6a46c5558ee103ff79428d4b881111382894cc785093fa481d9283c8b54b3
+DIST slf4j-1.7.7.tar.gz 3031017 SHA256
97717f30f263dfbfe853a00b218e3f929acb022d9b13a4723c75c31846351cf1 SHA512
aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418
WHIRLPOOL
a20cbc94b940f23bf61645b7ab09600651df17fedc103660996dc800af4dd7b0d82e25c7eac65aa2d7981bf4acbfdd14a8bf2885270d2b06627889129d23373f
diff --git a/dev-java/slf4j-nop/files/1.6.6-build.xml
b/dev-java/slf4j-nop/files/1.6.6-build.xml
deleted file mode 100644
index 331523f..0000000
--- a/dev-java/slf4j-nop/files/1.6.6-build.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<project name="slf4j-api" default="jar">
- <target name="compile">
- <mkdir dir="build"/>
- <javac srcdir="slf4j-nop/src/main/java/" destdir="build"
classpath="${gentoo.classpath}">
- </javac>
- </target>
-
- <target name="jar" depends="compile">
- <jar destfile="slf4j-nop.jar" basedir="build">
- <exclude name="org/slf4j/impl/**"/>
- </jar>
- </target>
-
- <target name="javadoc" depends="compile">
- <mkdir dir="docs"/>
- <javadoc sourcepath="slf4j-nop/src/main/java/" destdir="docs"
classpath="${gentoo.classpath}"/>
- </target>
-
-</project>
diff --git a/dev-java/slf4j-nop/files/1.7.5-build.xml
b/dev-java/slf4j-nop/files/1.7.7-build.xml
similarity index 100%
rename from dev-java/slf4j-nop/files/1.7.5-build.xml
rename to dev-java/slf4j-nop/files/1.7.7-build.xml
diff --git a/dev-java/slf4j-nop/files/build.xml
b/dev-java/slf4j-nop/files/build.xml
deleted file mode 100644
index e453408..0000000
--- a/dev-java/slf4j-nop/files/build.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<project name="slf4j-api" default="jar">
- <target name="compile">
- <mkdir dir="build"/>
- <javac srcdir="." destdir="build"
classpath="${gentoo.classpath}">
- </javac>
- </target>
-
- <target name="jar" depends="compile">
- <jar destfile="slf4j-nop.jar" basedir="build"/>
- </target>
-
- <target name="javadoc" depends="compile">
- <mkdir dir="docs"/>
- <javadoc sourcepath="." destdir="docs"
classpath="${gentoo.classpath}"/>
- </target>
-
-</project>
diff --git a/dev-java/slf4j-nop/slf4j-nop-1.5.11.ebuild
b/dev-java/slf4j-nop/slf4j-nop-1.5.11.ebuild
deleted file mode 100644
index 32656bf..0000000
--- a/dev-java/slf4j-nop/slf4j-nop-1.5.11.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Simple Logging Facade for Java"
-HOMEPAGE="http://www.slf4j.org/";
-# Get from http://www.slf4j.org/dist/${P/-nop/}.tar.gz
-SRC_URI="mirror://gentoo/${P}-sources.jar"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-COMMON_DEP="~dev-java/slf4j-api-${PV}:0"
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
- ${COMMON_DEP}
- app-arch/unzip"
-
-S="${WORKDIR}"
-
-EANT_GENTOO_CLASSPATH="slf4j-api"
-
-java_prepare() {
- cp -v "${FILESDIR}"/build.xml . || die
-}
-
-src_install() {
- java-pkg_dojar ${PN}.jar
- use doc && java-pkg_dojavadoc docs
- use source && java-pkg_dosrc org
-}
diff --git a/dev-java/slf4j-nop/slf4j-nop-1.6.6.ebuild
b/dev-java/slf4j-nop/slf4j-nop-1.6.6.ebuild
deleted file mode 100644
index 9a9bf15..0000000
--- a/dev-java/slf4j-nop/slf4j-nop-1.6.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Simple Logging Facade for Java"
-HOMEPAGE="http://www.slf4j.org/";
-SRC_URI="http://www.slf4j.org/dist/${P/-nop/}.tar.gz";
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-COMMON_DEP="~dev-java/slf4j-api-${PV}:0"
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
- app-arch/unzip
- ${COMMON_DEP}"
-
-S="${WORKDIR}/${P/-api/}"
-
-EANT_GENTOO_CLASSPATH="slf4j-api"
-
-S="${WORKDIR}/${P/-nop/}"
-
-java_prepare() {
- cp -v "${FILESDIR}"/${PV}-build.xml build.xml || die
-
- # for ecj-3.5
- java-ant_rewrite-bootclasspath auto
-
- cd "${S}"
- rm *.jar integration/lib/*.jar
-}
-
-src_install() {
- java-pkg_dojar ${PN}.jar
- use doc && java-pkg_dojavadoc docs
- use source && java-pkg_dosrc org
-}
diff --git a/dev-java/slf4j-nop/slf4j-nop-1.7.5.ebuild
b/dev-java/slf4j-nop/slf4j-nop-1.7.7.ebuild
similarity index 85%
rename from dev-java/slf4j-nop/slf4j-nop-1.7.5.ebuild
rename to dev-java/slf4j-nop/slf4j-nop-1.7.7.ebuild
index 4eb6a90..d7492d7 100644
--- a/dev-java/slf4j-nop/slf4j-nop-1.7.5.ebuild
+++ b/dev-java/slf4j-nop/slf4j-nop-1.7.7.ebuild
@@ -17,13 +17,16 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE=""
-COMMON_DEP="dev-java/slf4j-api:0"
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
+CDEPEND="dev-java/slf4j-api:0"
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
app-arch/unzip
- ${COMMON_DEP}
- test? ( dev-java/junit:4 )"
+ test? (
+ dev-java/ant-junit:0
+ dev-java/junit:4
+ )
+ ${CDEPEND}"
S="${WORKDIR}/${P/-nop/}/${PN}"
