From 09390ad49488dd3a8ad309a763b5ed8058bb71e4 Mon Sep 17 00:00:00 2001
From: Patrice Clement <monsieurp@gentoo.org>
Date: Thu, 13 Aug 2015 14:21:55 +0000
Subject: dev-java/slf4j-nop: Remove old versions.

Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
---
 dev-java/slf4j-nop/Manifest                |  4 +-
 dev-java/slf4j-nop/files/1.6.6-build.xml   | 19 ------
 dev-java/slf4j-nop/files/1.7.5-build.xml   | 93 ------------------------------
 dev-java/slf4j-nop/files/1.7.7-build.xml   | 93 ++++++++++++++++++++++++++++++
 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 ---------------
 dev-java/slf4j-nop/slf4j-nop-1.7.5.ebuild  | 49 ----------------
 dev-java/slf4j-nop/slf4j-nop-1.7.7.ebuild  | 52 +++++++++++++++++
 9 files changed, 146 insertions(+), 264 deletions(-)
 delete mode 100644 dev-java/slf4j-nop/files/1.6.6-build.xml
 delete mode 100644 dev-java/slf4j-nop/files/1.7.5-build.xml
 create mode 100644 dev-java/slf4j-nop/files/1.7.7-build.xml
 delete mode 100644 dev-java/slf4j-nop/files/build.xml
 delete mode 100644 dev-java/slf4j-nop/slf4j-nop-1.5.11.ebuild
 delete mode 100644 dev-java/slf4j-nop/slf4j-nop-1.6.6.ebuild
 delete mode 100644 dev-java/slf4j-nop/slf4j-nop-1.7.5.ebuild
 create mode 100644 dev-java/slf4j-nop/slf4j-nop-1.7.7.ebuild

(limited to 'dev-java/slf4j-nop')

diff --git a/dev-java/slf4j-nop/Manifest b/dev-java/slf4j-nop/Manifest
index 6ecd81552e79..9857cc1aac43 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 331523ffdfcf..000000000000
--- 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.5-build.xml
deleted file mode 100644
index 9d898d340d34..000000000000
--- a/dev-java/slf4j-nop/files/1.7.5-build.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="slf4j-nop-from-maven" default="jar" basedir=".">
-	<property file="${user.home}/.m2/maven.properties" />
-	<property file="maven-build.properties" />
-
-	<property name="maven.build.finalName" value="slf4j-nop" />
-	<property name="maven.build.dir" value="target" />
-	<property name="maven.build.outputDir" value="${maven.build.dir}/classes" />
-	<property name="maven.build.srcDir.0" value="src/main/java" />
-	<property name="maven.build.resourceDir.0" value="src/main/resources" />
-	<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes" />
-	<property name="maven.build.testDir.0" value="src/test/java" />
-	<property name="maven.build.testResourceDir.0" value="src/test/resources" />
-	<property name="maven.test.reports" value="${maven.build.dir}/test-reports" />
-	<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site" />
-
-	<property name="maven.repo.local" value="${user.home}/.m2/repository" />
-	<property name="maven.settings.offline" value="false" />
-	<property name="maven.settings.interactiveMode" value="true" />
-
-	<path id="build.classpath"/>
-	<path id="build.test.classpath" />
-
-	<target name="clean" description="Clean the output directory">
-		<delete dir="${maven.build.dir}" />
-	</target>
-
-	<target name="compile" description="Compile the code">
-		<mkdir dir="${maven.build.outputDir}" />
-		<javac destdir="${maven.build.outputDir}" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.5" verbose="false" fork="false" source="1.5">
-			<src>
-				<pathelement location="${maven.build.srcDir.0}" />
-			</src>
-			<classpath refid="build.classpath" />
-		</javac>
-		<copy todir="${maven.build.outputDir}">
-			<fileset dir="${maven.build.resourceDir.0}" />
-		</copy>
-	</target>
-
-	<target name="compile-tests" depends="compile" description="Compile the test code" unless="maven.test.skip">
-		<mkdir dir="${maven.build.testOutputDir}" />
-		<javac destdir="${maven.build.testOutputDir}" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.5" verbose="false" fork="false" source="1.5">
-			<src>
-				<pathelement location="${maven.build.testDir.0}" />
-			</src>
-			<classpath>
-				<path refid="build.test.classpath" />
-				<pathelement location="${maven.build.outputDir}" />
-			</classpath>
-		</javac>
-	</target>
-
-	<target name="test" depends="compile-tests" description="Run the test cases">
-		<mkdir dir="${maven.test.reports}" />
-		<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-			<sysproperty key="basedir" value="." />
-			<formatter type="xml" />
-			<formatter type="plain" usefile="false" />
-			<classpath>
-				<path refid="build.test.classpath" />
-				<pathelement location="${maven.build.outputDir}" />
-				<pathelement location="${maven.build.testOutputDir}" />
-			</classpath>
-			<batchtest todir="${maven.test.reports}" unless="test">
-				<fileset dir="${maven.build.testDir.0}">
-					<include name="**/Test*.java" />
-					<include name="**/*Test.java" />
-					<include name="**/*TestCase.java" />
-					<exclude name="**/AllTest.java" />
-					<exclude name="**/PackageTest.java" />
-				</fileset>
-			</batchtest>
-			<batchtest todir="${maven.test.reports}" if="test">
-				<fileset dir="${maven.build.testDir.0}">
-					<include name="**/${test}.java" />
-					<exclude name="**/AllTest.java" />
-					<exclude name="**/PackageTest.java" />
-				</fileset>
-			</batchtest>
-		</junit>
-	</target>
-
-
-	<target name="javadoc" description="Generates the Javadoc of the application">
-		<javadoc sourcepath="${maven.build.srcDir.0}" packagenames="*" destdir="${maven.reporting.outputDirectory}/apidocs" access="protected" old="false" verbose="false" version="true" use="true" author="true" splitindex="false" nodeprecated="false" nodeprecatedlist="false" notree="false" noindex="false" nohelp="false" nonavbar="false" serialwarn="false" charset="ISO-8859-1" linksource="false" breakiterator="false" />
-	</target>
-
-	<target name="jar" depends="compile" description="Package the application">
-		<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" compress="true" index="false" basedir="${maven.build.outputDir}" excludes="**/package.html" />
-	</target>
-</project>
diff --git a/dev-java/slf4j-nop/files/1.7.7-build.xml b/dev-java/slf4j-nop/files/1.7.7-build.xml
new file mode 100644
index 000000000000..9d898d340d34
--- /dev/null
+++ b/dev-java/slf4j-nop/files/1.7.7-build.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="slf4j-nop-from-maven" default="jar" basedir=".">
+	<property file="${user.home}/.m2/maven.properties" />
+	<property file="maven-build.properties" />
+
+	<property name="maven.build.finalName" value="slf4j-nop" />
+	<property name="maven.build.dir" value="target" />
+	<property name="maven.build.outputDir" value="${maven.build.dir}/classes" />
+	<property name="maven.build.srcDir.0" value="src/main/java" />
+	<property name="maven.build.resourceDir.0" value="src/main/resources" />
+	<property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes" />
+	<property name="maven.build.testDir.0" value="src/test/java" />
+	<property name="maven.build.testResourceDir.0" value="src/test/resources" />
+	<property name="maven.test.reports" value="${maven.build.dir}/test-reports" />
+	<property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site" />
+
+	<property name="maven.repo.local" value="${user.home}/.m2/repository" />
+	<property name="maven.settings.offline" value="false" />
+	<property name="maven.settings.interactiveMode" value="true" />
+
+	<path id="build.classpath"/>
+	<path id="build.test.classpath" />
+
+	<target name="clean" description="Clean the output directory">
+		<delete dir="${maven.build.dir}" />
+	</target>
+
+	<target name="compile" description="Compile the code">
+		<mkdir dir="${maven.build.outputDir}" />
+		<javac destdir="${maven.build.outputDir}" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.5" verbose="false" fork="false" source="1.5">
+			<src>
+				<pathelement location="${maven.build.srcDir.0}" />
+			</src>
+			<classpath refid="build.classpath" />
+		</javac>
+		<copy todir="${maven.build.outputDir}">
+			<fileset dir="${maven.build.resourceDir.0}" />
+		</copy>
+	</target>
+
+	<target name="compile-tests" depends="compile" description="Compile the test code" unless="maven.test.skip">
+		<mkdir dir="${maven.build.testOutputDir}" />
+		<javac destdir="${maven.build.testOutputDir}" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.5" verbose="false" fork="false" source="1.5">
+			<src>
+				<pathelement location="${maven.build.testDir.0}" />
+			</src>
+			<classpath>
+				<path refid="build.test.classpath" />
+				<pathelement location="${maven.build.outputDir}" />
+			</classpath>
+		</javac>
+	</target>
+
+	<target name="test" depends="compile-tests" description="Run the test cases">
+		<mkdir dir="${maven.test.reports}" />
+		<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+			<sysproperty key="basedir" value="." />
+			<formatter type="xml" />
+			<formatter type="plain" usefile="false" />
+			<classpath>
+				<path refid="build.test.classpath" />
+				<pathelement location="${maven.build.outputDir}" />
+				<pathelement location="${maven.build.testOutputDir}" />
+			</classpath>
+			<batchtest todir="${maven.test.reports}" unless="test">
+				<fileset dir="${maven.build.testDir.0}">
+					<include name="**/Test*.java" />
+					<include name="**/*Test.java" />
+					<include name="**/*TestCase.java" />
+					<exclude name="**/AllTest.java" />
+					<exclude name="**/PackageTest.java" />
+				</fileset>
+			</batchtest>
+			<batchtest todir="${maven.test.reports}" if="test">
+				<fileset dir="${maven.build.testDir.0}">
+					<include name="**/${test}.java" />
+					<exclude name="**/AllTest.java" />
+					<exclude name="**/PackageTest.java" />
+				</fileset>
+			</batchtest>
+		</junit>
+	</target>
+
+
+	<target name="javadoc" description="Generates the Javadoc of the application">
+		<javadoc sourcepath="${maven.build.srcDir.0}" packagenames="*" destdir="${maven.reporting.outputDirectory}/apidocs" access="protected" old="false" verbose="false" version="true" use="true" author="true" splitindex="false" nodeprecated="false" nodeprecatedlist="false" notree="false" noindex="false" nohelp="false" nonavbar="false" serialwarn="false" charset="ISO-8859-1" linksource="false" breakiterator="false" />
+	</target>
+
+	<target name="jar" depends="compile" description="Package the application">
+		<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" compress="true" index="false" basedir="${maven.build.outputDir}" excludes="**/package.html" />
+	</target>
+</project>
diff --git a/dev-java/slf4j-nop/files/build.xml b/dev-java/slf4j-nop/files/build.xml
deleted file mode 100644
index e45340800a0b..000000000000
--- 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 32656bf450b6..000000000000
--- 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 9a9bf15cc327..000000000000
--- 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.5.ebuild
deleted file mode 100644
index 4eb6a900a64b..000000000000
--- a/dev-java/slf4j-nop/slf4j-nop-1.7.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit 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:0"
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip
-	${COMMON_DEP}
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${P/-nop/}/${PN}"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="slf4j-api"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-EANT_TEST_ANT_TASKS="ant-junit"
-
-java_prepare() {
-	cp -v "${FILESDIR}"/${PV}-build.xml "${S}"/build.xml || die
-	find "${S}" -name "*.jar" -delete || die
-}
-
-src_install() {
-	java-pkg_dojar "${S}"/target/${PN}.jar
-
-	use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs
-	use source && java-pkg_dosrc "${S}"/src/main/java/org
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
diff --git a/dev-java/slf4j-nop/slf4j-nop-1.7.7.ebuild b/dev-java/slf4j-nop/slf4j-nop-1.7.7.ebuild
new file mode 100644
index 000000000000..d7492d734b76
--- /dev/null
+++ b/dev-java/slf4j-nop/slf4j-nop-1.7.7.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit 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=""
+
+CDEPEND="dev-java/slf4j-api:0"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:4
+	)
+	${CDEPEND}"
+
+S="${WORKDIR}/${P/-nop/}/${PN}"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="slf4j-api"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+EANT_TEST_ANT_TASKS="ant-junit"
+
+java_prepare() {
+	cp -v "${FILESDIR}"/${PV}-build.xml "${S}"/build.xml || die
+	find "${S}" -name "*.jar" -delete || die
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/target/${PN}.jar
+
+	use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs
+	use source && java-pkg_dosrc "${S}"/src/main/java/org
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
-- 
cgit v1.2.3-65-gdbad