Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/slf4j-simple/files/, dev-java/slf4j-simple/
Date: Wed, 30 Sep 2015 07:40:26
Message-Id: 1443598622.dbf3155db09607a39e69cfe19d0ab140a915f8ac.monsieurp@gentoo
1 commit: dbf3155db09607a39e69cfe19d0ab140a915f8ac
2 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 30 07:37:02 2015 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 30 07:37:02 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbf3155d
7
8 dev-java/slf4j-simple: Clean up old.
9
10 Package-Manager: portage-2.2.18
11 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
12
13 dev-java/slf4j-simple/Manifest | 2 -
14 dev-java/slf4j-simple/files/1.7.5-build.xml | 93 -------------------------
15 dev-java/slf4j-simple/slf4j-simple-1.7.5.ebuild | 48 -------------
16 dev-java/slf4j-simple/slf4j-simple-1.7.6.ebuild | 47 -------------
17 4 files changed, 190 deletions(-)
18
19 diff --git a/dev-java/slf4j-simple/Manifest b/dev-java/slf4j-simple/Manifest
20 index c9f3c66..9857cc1 100644
21 --- a/dev-java/slf4j-simple/Manifest
22 +++ b/dev-java/slf4j-simple/Manifest
23 @@ -1,3 +1 @@
24 -DIST slf4j-1.7.5.tar.gz 2862186 SHA256 e83f1f22f22dabce0a78bd8191fb2d6fab71dc9dc4c8bfbd7939a87b1237c92e SHA512 2ef078f505b626273bd22fe683b4a2527ce2d97b345ffb8cd9f23e7375cb11588623e67e15de90ceacfa02689e40c59749f22e5e0b44b8a9fd7492d3f120d9d7 WHIRLPOOL 4a396c81b50b186d8e582f30331f7d0a21c85bb2cc293bdc8eff8a8bc49ae7382b6b37e1b3f585d0f14e716b1b889ac17ae1acdc03799b93180539e488170820
25 -DIST slf4j-1.7.6.tar.gz 3051903 SHA256 9abf25b99f7c4dfc52a85b79a67b4d878831dfd79c1734b0124ad73615372323 SHA512 c274c0f1700df6b4801fa25d71127c0a35d0f30e421e8661fdaf8074ddfb84c94167bd6ff016cfceae0d062f4cf26a13426c3a9a9dd6b4fc471b18028ae37c4c WHIRLPOOL ee8a3b84a1a1809a893957d52f7a139f3b743796ca934fca0c85aad386f81182f54666000727e7582874ce6ff7a095cce39af5caaa8c415bcad13fe43661c2d4
26 DIST slf4j-1.7.7.tar.gz 3031017 SHA256 97717f30f263dfbfe853a00b218e3f929acb022d9b13a4723c75c31846351cf1 SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418 WHIRLPOOL a20cbc94b940f23bf61645b7ab09600651df17fedc103660996dc800af4dd7b0d82e25c7eac65aa2d7981bf4acbfdd14a8bf2885270d2b06627889129d23373f
27
28 diff --git a/dev-java/slf4j-simple/files/1.7.5-build.xml b/dev-java/slf4j-simple/files/1.7.5-build.xml
29 deleted file mode 100644
30 index 5bf3a09..0000000
31 --- a/dev-java/slf4j-simple/files/1.7.5-build.xml
32 +++ /dev/null
33 @@ -1,93 +0,0 @@
34 -<?xml version="1.0" encoding="UTF-8"?>
35 -
36 -<project name="slf4j-simpl-from-maven" default="jar" basedir=".">
37 - <property file="${user.home}/.m2/maven.properties" />
38 - <property file="maven-build.properties" />
39 -
40 - <property name="maven.build.finalName" value="slf4j-simple" />
41 - <property name="maven.build.dir" value="target" />
42 - <property name="maven.build.outputDir" value="${maven.build.dir}/classes" />
43 - <property name="maven.build.srcDir.0" value="src/main/java" />
44 - <property name="maven.build.resourceDir.0" value="src/main/resources" />
45 - <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes" />
46 - <property name="maven.build.testDir.0" value="src/test/java" />
47 - <property name="maven.build.testResourceDir.0" value="src/test/resources" />
48 - <property name="maven.test.reports" value="${maven.build.dir}/test-reports" />
49 - <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site" />
50 -
51 - <property name="maven.repo.local" value="${user.home}/.m2/repository" />
52 - <property name="maven.settings.offline" value="false" />
53 - <property name="maven.settings.interactiveMode" value="true" />
54 -
55 - <path id="build.classpath"/>
56 - <path id="build.test.classpath" />
57 -
58 - <target name="clean" description="Clean the output directory">
59 - <delete dir="${maven.build.dir}" />
60 - </target>
61 -
62 - <target name="compile" description="Compile the code">
63 - <mkdir dir="${maven.build.outputDir}" />
64 - <javac destdir="${maven.build.outputDir}" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.5" verbose="false" fork="false" source="1.5">
65 - <src>
66 - <pathelement location="${maven.build.srcDir.0}" />
67 - </src>
68 - <classpath refid="build.classpath" />
69 - </javac>
70 - <copy todir="${maven.build.outputDir}">
71 - <fileset dir="${maven.build.resourceDir.0}" />
72 - </copy>
73 - </target>
74 -
75 - <target name="compile-tests" depends="compile" description="Compile the test code" unless="maven.test.skip">
76 - <mkdir dir="${maven.build.testOutputDir}" />
77 - <javac destdir="${maven.build.testOutputDir}" nowarn="false" debug="true" optimize="false" deprecation="true" target="1.5" verbose="false" fork="false" source="1.5">
78 - <src>
79 - <pathelement location="${maven.build.testDir.0}" />
80 - </src>
81 - <classpath>
82 - <path refid="build.test.classpath" />
83 - <pathelement location="${maven.build.outputDir}" />
84 - </classpath>
85 - </javac>
86 - </target>
87 -
88 - <target name="test" depends="compile-tests" description="Run the test cases">
89 - <mkdir dir="${maven.test.reports}" />
90 - <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
91 - <sysproperty key="basedir" value="." />
92 - <formatter type="xml" />
93 - <formatter type="plain" usefile="false" />
94 - <classpath>
95 - <path refid="build.test.classpath" />
96 - <pathelement location="${maven.build.outputDir}" />
97 - <pathelement location="${maven.build.testOutputDir}" />
98 - </classpath>
99 - <batchtest todir="${maven.test.reports}" unless="test">
100 - <fileset dir="${maven.build.testDir.0}">
101 - <include name="**/Test*.java" />
102 - <include name="**/*Test.java" />
103 - <include name="**/*TestCase.java" />
104 - <exclude name="**/AllTest.java" />
105 - <exclude name="**/PackageTest.java" />
106 - </fileset>
107 - </batchtest>
108 - <batchtest todir="${maven.test.reports}" if="test">
109 - <fileset dir="${maven.build.testDir.0}">
110 - <include name="**/${test}.java" />
111 - <exclude name="**/AllTest.java" />
112 - <exclude name="**/PackageTest.java" />
113 - </fileset>
114 - </batchtest>
115 - </junit>
116 - </target>
117 -
118 -
119 - <target name="javadoc" description="Generates the Javadoc of the application">
120 - <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" />
121 - </target>
122 -
123 - <target name="jar" depends="compile" description="Package the application">
124 - <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" compress="true" index="false" basedir="${maven.build.outputDir}" excludes="**/package.html" />
125 - </target>
126 -</project>
127
128 diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.5.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.5.ebuild
129 deleted file mode 100644
130 index f51f7c7..0000000
131 --- a/dev-java/slf4j-simple/slf4j-simple-1.7.5.ebuild
132 +++ /dev/null
133 @@ -1,48 +0,0 @@
134 -# Copyright 1999-2013 Gentoo Foundation
135 -# Distributed under the terms of the GNU General Public License v2
136 -# $Id$
137 -
138 -EAPI=5
139 -
140 -JAVA_PKG_IUSE="doc source test"
141 -
142 -inherit java-pkg-2 java-ant-2
143 -
144 -DESCRIPTION="Simple Logging Facade for Java"
145 -HOMEPAGE="http://www.slf4j.org/"
146 -SRC_URI="http://www.slf4j.org/dist/${P/-simple/}.tar.gz"
147 -
148 -LICENSE="MIT"
149 -SLOT="0"
150 -KEYWORDS="~amd64 ~x86"
151 -IUSE=""
152 -
153 -COMMON_DEP="dev-java/slf4j-api:0"
154 -RDEPEND=">=virtual/jre-1.5
155 - ${COMMON_DEP}"
156 -DEPEND=">=virtual/jdk-1.5
157 - app-arch/unzip
158 - ${COMMON_DEP}
159 - test? ( dev-java/junit )"
160 -
161 -S="${WORKDIR}/${P/-simple/}/${PN}"
162 -
163 -JAVA_ANT_REWRITE_CLASSPATH="yes"
164 -EANT_GENTOO_CLASSPATH="slf4j-api"
165 -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
166 -EANT_TEST_ANT_TASKS="ant-junit"
167 -
168 -java_prepare() {
169 - cp -v "${FILESDIR}"/${PV}-build.xml build.xml || die
170 - find "${S}" -name "*.jar" -delete || die
171 -}
172 -
173 -src_install() {
174 - java-pkg_dojar "${S}"/target/${PN}.jar
175 - use doc && java-pkg_dojavadoc "${S}"/target/site/apidocs
176 - use source && java-pkg_dosrc "${S}"/src/main/java/org
177 -}
178 -
179 -src_test() {
180 - java-pkg-2_src_test
181 -}
182
183 diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.6.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.6.ebuild
184 deleted file mode 100644
185 index 1ab3653..0000000
186 --- a/dev-java/slf4j-simple/slf4j-simple-1.7.6.ebuild
187 +++ /dev/null
188 @@ -1,47 +0,0 @@
189 -# Copyright 1999-2014 Gentoo Foundation
190 -# Distributed under the terms of the GNU General Public License v2
191 -# $Id$
192 -
193 -EAPI=5
194 -JAVA_PKG_IUSE="doc source"
195 -
196 -inherit java-pkg-2 java-ant-2
197 -
198 -DESCRIPTION="Simple Logging Facade for Java"
199 -HOMEPAGE="http://www.slf4j.org/"
200 -SRC_URI="http://www.slf4j.org/dist/${P/-simple/}.tar.gz"
201 -
202 -LICENSE="MIT"
203 -SLOT="0"
204 -KEYWORDS="~amd64 ~x86"
205 -IUSE="test"
206 -
207 -COMMON_DEP="dev-java/slf4j-api:0"
208 -RDEPEND=">=virtual/jre-1.5
209 - ${COMMON_DEP}"
210 -DEPEND=">=virtual/jdk-1.5
211 - ${COMMON_DEP}
212 - test? ( dev-java/junit )"
213 -
214 -S="${WORKDIR}/${P/-simple/}/${PN}"
215 -
216 -JAVA_ANT_REWRITE_CLASSPATH="yes"
217 -EANT_GENTOO_CLASSPATH="slf4j-api"
218 -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
219 -EANT_TEST_ANT_TASKS="ant-junit"
220 -EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
221 -
222 -java_prepare() {
223 - cp "${FILESDIR}"/${PV}-build.xml build.xml || die
224 - find "${S}" -name "*.jar" -delete || die
225 -}
226 -
227 -src_test() {
228 - java-pkg-2_src_test
229 -}
230 -
231 -src_install() {
232 - java-pkg_dojar target/${PN}.jar
233 - use doc && java-pkg_dojavadoc target/site/apidocs
234 - use source && java-pkg_dosrc src/main/java/org
235 -}