1 |
commit: 78f0c8d0b376e555257a58c1c8efc8900ec7424e |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 21 15:34:00 2022 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 21 15:34:29 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78f0c8d0 |
7 |
|
8 |
dev-java/joda-convert: removed obsolete 1.3.1-r1 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/736882 |
11 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
12 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
13 |
|
14 |
dev-java/joda-convert/Manifest | 1 - |
15 |
.../files/joda-convert-1.3.1-build.xml | 248 --------------------- |
16 |
dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild | 43 ---- |
17 |
3 files changed, 292 deletions(-) |
18 |
|
19 |
diff --git a/dev-java/joda-convert/Manifest b/dev-java/joda-convert/Manifest |
20 |
index 7e0f02a32075..aa51e39d0cff 100644 |
21 |
--- a/dev-java/joda-convert/Manifest |
22 |
+++ b/dev-java/joda-convert/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST joda-convert-1.3.1-dist.tar.gz 131288 BLAKE2B 0b7b6cebb7e13e89d838ec10c4edd54b52bf3449b3003cd41ea2628719b8ea52bc00a8681a96fad0de79b4acd56fc4a8d4a31d558841fa268d9ffbeb97ca1ed0 SHA512 ee3f7264e9ee445dd8cf088c862809faceb012d317c4974d2312e1ce9b580193096259978a79cdefc2217818600ff38569348625986e19bdb753edb03ba58451 |
25 |
DIST joda-convert-2.2.2.tar.gz 65476 BLAKE2B 9ef8e3b172d31f4e3b748ba5aae807b1d344c3b6bedeb0bf0b84b93009171495f271d03cd9f7b29147a256ddd1081b3fc9640c1df6b45425080ce1d44e2c0f37 SHA512 9660491373d5f7d415ab47cec7164922fc8901803e759bbf8cf7d0cc58040c2c8b245271f33d641a563ffb25b8e42f8197e297da7d1fe68a5c50ebb61536f3ae |
26 |
|
27 |
diff --git a/dev-java/joda-convert/files/joda-convert-1.3.1-build.xml b/dev-java/joda-convert/files/joda-convert-1.3.1-build.xml |
28 |
deleted file mode 100644 |
29 |
index c66dfec9c1d7..000000000000 |
30 |
--- a/dev-java/joda-convert/files/joda-convert-1.3.1-build.xml |
31 |
+++ /dev/null |
32 |
@@ -1,248 +0,0 @@ |
33 |
-<?xml version="1.0" encoding="UTF-8"?> |
34 |
- |
35 |
-<!-- ====================================================================== --> |
36 |
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. --> |
37 |
-<!-- ====================================================================== --> |
38 |
- |
39 |
-<!-- ====================================================================== --> |
40 |
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== --> |
41 |
-<!-- ====================================================================== --> |
42 |
-<!-- --> |
43 |
-<!-- Any modifications will be overwritten. --> |
44 |
-<!-- --> |
45 |
-<!-- Generated by Maven Ant Plugin on 5/9/13 4:18 PM --> |
46 |
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ --> |
47 |
-<!-- --> |
48 |
-<!-- ====================================================================== --> |
49 |
- |
50 |
-<project name="joda-convert-from-maven" default="package" basedir="."> |
51 |
- |
52 |
- <!-- ====================================================================== --> |
53 |
- <!-- Build environment properties --> |
54 |
- <!-- ====================================================================== --> |
55 |
- |
56 |
- <property file="${user.home}/.m2/maven.properties"/> |
57 |
- <property file="maven-build.properties"/> |
58 |
- |
59 |
- <property name="maven.build.finalName" value="joda-convert-1.3.1"/> |
60 |
- <property name="maven.build.dir" value="target"/> |
61 |
- <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> |
62 |
- <property name="maven.build.srcDir.0" value="src/main/java"/> |
63 |
- <property name="maven.build.resourceDir.0" value="."/> |
64 |
- <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/> |
65 |
- <property name="maven.build.testDir.0" value="src/test/java"/> |
66 |
- <property name="maven.build.testResourceDir.0" value="src/test/resources"/> |
67 |
- <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/> |
68 |
- <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/> |
69 |
- |
70 |
- <property name="maven.repo.local" value="${user.home}/.m2/repository"/> |
71 |
- <property name="maven.settings.offline" value="false"/> |
72 |
- <property name="maven.settings.interactiveMode" value="true"/> |
73 |
- |
74 |
- <!-- ====================================================================== --> |
75 |
- <!-- Defining classpaths --> |
76 |
- <!-- ====================================================================== --> |
77 |
- |
78 |
- <path id="build.classpath"/> |
79 |
- <path id="build.test.classpath"> |
80 |
- <pathelement location="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar"/> |
81 |
- </path> |
82 |
- |
83 |
- <!-- ====================================================================== --> |
84 |
- <!-- Cleaning up target --> |
85 |
- <!-- ====================================================================== --> |
86 |
- |
87 |
- <target name="clean" description="Clean the output directory"> |
88 |
- <delete dir="${maven.build.dir}"/> |
89 |
- </target> |
90 |
- |
91 |
- <!-- ====================================================================== --> |
92 |
- <!-- Compilation target --> |
93 |
- <!-- ====================================================================== --> |
94 |
- |
95 |
- <target name="compile" depends="get-deps" description="Compile the code"> |
96 |
- <mkdir dir="${maven.build.outputDir}"/> |
97 |
- <javac destdir="${maven.build.outputDir}" |
98 |
- nowarn="false" |
99 |
- debug="true" |
100 |
- optimize="true" |
101 |
- deprecation="false" |
102 |
- target="1.6" |
103 |
- verbose="true" |
104 |
- fork="true" |
105 |
- source="1.6"> |
106 |
- <src> |
107 |
- <pathelement location="${maven.build.srcDir.0}"/> |
108 |
- </src> |
109 |
- <classpath refid="build.classpath"/> |
110 |
- </javac> |
111 |
- <mkdir dir="${maven.build.outputDir}/META-INF"/> |
112 |
- <copy todir="${maven.build.outputDir}/META-INF"> |
113 |
- <fileset dir="${maven.build.resourceDir.0}"> |
114 |
- <include name="LICENSE.txt"/> |
115 |
- <include name="NOTICE.txt"/> |
116 |
- </fileset> |
117 |
- </copy> |
118 |
- </target> |
119 |
- |
120 |
- <!-- ====================================================================== --> |
121 |
- <!-- Test-compilation target --> |
122 |
- <!-- ====================================================================== --> |
123 |
- |
124 |
- <target name="compile-tests" |
125 |
- depends="compile" |
126 |
- description="Compile the test code" |
127 |
- unless="maven.test.skip"> |
128 |
- <mkdir dir="${maven.build.testOutputDir}"/> |
129 |
- <javac destdir="${maven.build.testOutputDir}" |
130 |
- nowarn="false" |
131 |
- debug="true" |
132 |
- optimize="true" |
133 |
- deprecation="false" |
134 |
- target="1.6" |
135 |
- verbose="true" |
136 |
- fork="true" |
137 |
- source="1.6"> |
138 |
- <src> |
139 |
- <pathelement location="${maven.build.testDir.0}"/> |
140 |
- </src> |
141 |
- <classpath> |
142 |
- <path refid="build.test.classpath"/> |
143 |
- <pathelement location="${maven.build.outputDir}"/> |
144 |
- </classpath> |
145 |
- </javac> |
146 |
- </target> |
147 |
- |
148 |
- <!-- ====================================================================== --> |
149 |
- <!-- Run all tests --> |
150 |
- <!-- ====================================================================== --> |
151 |
- |
152 |
- <target name="test" |
153 |
- depends="compile-tests, junit-missing" |
154 |
- unless="junit.skipped" |
155 |
- description="Run the test cases"> |
156 |
- <mkdir dir="${maven.test.reports}"/> |
157 |
- <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> |
158 |
- <sysproperty key="basedir" value="."/> |
159 |
- <formatter type="xml"/> |
160 |
- <formatter type="plain" usefile="false"/> |
161 |
- <classpath> |
162 |
- <path refid="build.test.classpath"/> |
163 |
- <pathelement location="${maven.build.outputDir}"/> |
164 |
- <pathelement location="${maven.build.testOutputDir}"/> |
165 |
- </classpath> |
166 |
- <batchtest todir="${maven.test.reports}" unless="test"> |
167 |
- <fileset dir="${maven.build.testDir.0}"> |
168 |
- <include name="**/Test*.java"/> |
169 |
- <exclude name="**/*Abstract*Test.java"/> |
170 |
- </fileset> |
171 |
- </batchtest> |
172 |
- <batchtest todir="${maven.test.reports}" if="test"> |
173 |
- <fileset dir="${maven.build.testDir.0}"> |
174 |
- <include name="**/${test}.java"/> |
175 |
- <exclude name="**/*Abstract*Test.java"/> |
176 |
- </fileset> |
177 |
- </batchtest> |
178 |
- </junit> |
179 |
- </target> |
180 |
- |
181 |
- <target name="test-junit-present"> |
182 |
- <available classname="junit.framework.Test" property="junit.present"/> |
183 |
- </target> |
184 |
- |
185 |
- <target name="test-junit-status" |
186 |
- depends="test-junit-present"> |
187 |
- <condition property="junit.missing"> |
188 |
- <and> |
189 |
- <isfalse value="${junit.present}"/> |
190 |
- <isfalse value="${maven.test.skip}"/> |
191 |
- </and> |
192 |
- </condition> |
193 |
- <condition property="junit.skipped"> |
194 |
- <or> |
195 |
- <isfalse value="${junit.present}"/> |
196 |
- <istrue value="${maven.test.skip}"/> |
197 |
- </or> |
198 |
- </condition> |
199 |
- </target> |
200 |
- |
201 |
- <target name="junit-missing" |
202 |
- depends="test-junit-status" |
203 |
- if="junit.missing"> |
204 |
- <echo>=================================== WARNING ===================================</echo> |
205 |
- <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo> |
206 |
- <echo>===============================================================================</echo> |
207 |
- </target> |
208 |
- |
209 |
- <!-- ====================================================================== --> |
210 |
- <!-- Javadoc target --> |
211 |
- <!-- ====================================================================== --> |
212 |
- |
213 |
- <target name="javadoc" description="Generates the Javadoc of the application"> |
214 |
- <javadoc sourcepath="${maven.build.srcDir.0}" |
215 |
- packagenames="*" |
216 |
- destdir="${maven.reporting.outputDirectory}/apidocs" |
217 |
- access="protected" |
218 |
- old="false" |
219 |
- verbose="false" |
220 |
- encoding="UTF-8" |
221 |
- version="true" |
222 |
- use="true" |
223 |
- author="true" |
224 |
- splitindex="false" |
225 |
- nodeprecated="false" |
226 |
- nodeprecatedlist="false" |
227 |
- notree="false" |
228 |
- noindex="false" |
229 |
- nohelp="false" |
230 |
- nonavbar="false" |
231 |
- serialwarn="false" |
232 |
- charset="ISO-8859-1" |
233 |
- linksource="true" |
234 |
- breakiterator="false"> |
235 |
- <link href="http://download.oracle.com/javase/6/docs/api/"/> |
236 |
- </javadoc> |
237 |
- </target> |
238 |
- |
239 |
- <!-- ====================================================================== --> |
240 |
- <!-- Package target --> |
241 |
- <!-- ====================================================================== --> |
242 |
- |
243 |
- <target name="package" depends="compile,test" description="Package the application"> |
244 |
- <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" |
245 |
- compress="true" |
246 |
- index="false" |
247 |
- manifest="src/conf/MANIFEST.MF" |
248 |
- basedir="${maven.build.outputDir}" |
249 |
- excludes="**/package.html"/> |
250 |
- </target> |
251 |
- |
252 |
- <!-- ====================================================================== --> |
253 |
- <!-- A dummy target for the package named after the type it creates --> |
254 |
- <!-- ====================================================================== --> |
255 |
- |
256 |
- <target name="jar" depends="package" description="Builds the jar for the application"/> |
257 |
- |
258 |
- <!-- ====================================================================== --> |
259 |
- <!-- Download dependencies target --> |
260 |
- <!-- ====================================================================== --> |
261 |
- |
262 |
- <target name="test-offline"> |
263 |
- <condition property="maven.mode.offline"> |
264 |
- <equals arg1="${maven.settings.offline}" arg2="true"/> |
265 |
- </condition> |
266 |
- </target> |
267 |
- |
268 |
- <target name="get-deps" |
269 |
- depends="test-offline" |
270 |
- description="Download all dependencies" |
271 |
- unless="maven.mode.offline"> |
272 |
- <mkdir dir="${maven.repo.local}"/> |
273 |
- <mkdir dir="${maven.repo.local}/junit/junit/4.5"/> |
274 |
- <get src="http://repo.maven.apache.org/maven2/junit/junit/4.5/junit-4.5.jar" |
275 |
- dest="${maven.repo.local}/junit/junit/4.5/junit-4.5.jar" |
276 |
- usetimestamp="false" |
277 |
- ignoreerrors="true"/> |
278 |
- </target> |
279 |
- |
280 |
-</project> |
281 |
|
282 |
diff --git a/dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild b/dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild |
283 |
deleted file mode 100644 |
284 |
index 97c617bf57a4..000000000000 |
285 |
--- a/dev-java/joda-convert/joda-convert-1.3.1-r1.ebuild |
286 |
+++ /dev/null |
287 |
@@ -1,43 +0,0 @@ |
288 |
-# Copyright 1999-2021 Gentoo Authors |
289 |
-# Distributed under the terms of the GNU General Public License v2 |
290 |
- |
291 |
-EAPI=7 |
292 |
-JAVA_PKG_IUSE="doc source test" |
293 |
- |
294 |
-inherit java-pkg-2 java-ant-2 |
295 |
- |
296 |
-DESCRIPTION="Java library for conversion between Object and String" |
297 |
-HOMEPAGE="https://www.joda.org/joda-convert/" |
298 |
-SRC_URI="mirror://sourceforge/${PN}/${P}-dist.tar.gz" |
299 |
- |
300 |
-LICENSE="Apache-2.0" |
301 |
-SLOT="0" |
302 |
-KEYWORDS="amd64 ~arm arm64 ppc64 x86" |
303 |
- |
304 |
-DEPEND="virtual/jdk:1.8 |
305 |
- test? ( |
306 |
- dev-java/junit:4 |
307 |
- dev-java/ant-junit:0 |
308 |
- )" |
309 |
-RDEPEND=">=virtual/jre-1.8" |
310 |
- |
311 |
-JAVA_ANT_REWRITE_CLASSPATH="true" |
312 |
-EANT_TEST_GENTOO_CLASSPATH="junit-4" |
313 |
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}" |
314 |
- |
315 |
-src_prepare() { |
316 |
- default |
317 |
- cp "${FILESDIR}"/${P}-build.xml build.xml || die |
318 |
-} |
319 |
- |
320 |
-src_test() { |
321 |
- java-pkg-2_src_test |
322 |
-} |
323 |
- |
324 |
-src_install() { |
325 |
- java-pkg_dojar target/${PN}.jar |
326 |
- dodoc NOTICE.txt RELEASE-NOTES.txt |
327 |
- |
328 |
- use doc && java-pkg_dojavadoc target/site/apidocs |
329 |
- use source && java-pkg_dosrc src/main/java/* |
330 |
-} |