Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: dev-java/joda-convert/, dev-java/joda-convert/files/
Date: Sun, 29 Dec 2013 00:31:30
Message-Id: 1388275020.501f6353c6d0803e0feb5f1fe023e0eede96684c.jlec@gentoo
1 commit: 501f6353c6d0803e0feb5f1fe023e0eede96684c
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 28 23:57:00 2013 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 28 23:57:00 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=501f6353
7
8 More up to date version in tree
9
10 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
11
12 ---
13 dev-java/joda-convert/ChangeLog | 10 ---
14 dev-java/joda-convert/files/1.2-build.xml | 99 ---------------------------
15 dev-java/joda-convert/joda-convert-1.2.ebuild | 45 ------------
16 dev-java/joda-convert/metadata.xml | 5 --
17 4 files changed, 159 deletions(-)
18
19 diff --git a/dev-java/joda-convert/ChangeLog b/dev-java/joda-convert/ChangeLog
20 deleted file mode 100644
21 index 2c2bbe4..0000000
22 --- a/dev-java/joda-convert/ChangeLog
23 +++ /dev/null
24 @@ -1,10 +0,0 @@
25 -# ChangeLog for dev-java/joda-convert
26 -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: $
28 -
29 -*joda-convert-1.2 (14 May 2012)
30 -
31 - 14 May 2012; Sébastien Fabbro <bicatali@g.o> +files/1.2-build.xml,
32 - +joda-convert-1.2.ebuild, +metadata.xml:
33 - dev-java/joda-convert: import from the java overlay
34 -
35
36 diff --git a/dev-java/joda-convert/files/1.2-build.xml b/dev-java/joda-convert/files/1.2-build.xml
37 deleted file mode 100644
38 index 07fe6e0..0000000
39 --- a/dev-java/joda-convert/files/1.2-build.xml
40 +++ /dev/null
41 @@ -1,99 +0,0 @@
42 -<?xml version="1.0"?>
43 -<project name="Joda convert" default="all" basedir=".">
44 - <target name="init" description="Sets build properties">
45 - <!-- package configuration -->
46 - <property name="package.version" value="devel"/>
47 - <!-- directory locations -->
48 - <property name="src" value="${basedir}/src"/>
49 - <property name="src.lib" value="${src}/main/java"/>
50 - <property name="src.test" value="${src}/test/java"/>
51 - <property name="build" value="${basedir}/build"/>
52 - <property name="build.lib" value="${build}/lib"/>
53 - <property name="build.test" value="${build}/test"/>
54 - <property name="doc" value="${basedir}/doc"/>
55 - <property name="doc.api" value="${doc}/api"/>
56 - <!-- external dependencies -->
57 - <property name="junit.jar" value="junit.jar"/>
58 - <!-- classpaths -->
59 - <path id="project.class.path">
60 - </path>
61 - <path id="test.class.path">
62 - <!--pathelement location="${junit.jar}"/--> <!-- handled by Gentoo's ANT_TASKS -->
63 - </path>
64 - <path id="build.lib.class.path">
65 - <pathelement location="${build.lib}"/>
66 - </path>
67 - <path id="build.test.class.path">
68 - <pathelement location="${build.test}"/>
69 - </path>
70 - </target>
71 - <target name="all" depends="jar,javadoc"
72 - description="Pseudo-target that builds JAR and Javadoc"/>
73 - <target name="build-lib" depends="init"
74 - description="Compiles the library classes">
75 - <mkdir dir="${build.lib}"/>
76 - <javac destdir="${build.lib}" srcdir="${src.lib}" debug="true"
77 - deprecation="true" includeantruntime="false">
78 - <classpath refid="project.class.path"/>
79 - <classpath refid="build.lib.class.path"/>
80 - <!--compilerarg line="-Xlint:unchecked"/-->
81 - </javac>
82 - <!--copy todir="${build}">
83 - <mappedresources>
84 - <fileset dir="${src}" includes="**/test/test.fits*"/>
85 - <globmapper from="*" to="*"/>
86 - </mappedresources>
87 - </copy-->
88 - </target>
89 - <target name="build-tests" depends="build-lib"
90 - description="Compiles the test classes">
91 - <mkdir dir="${build.test}"/>
92 - <javac destdir="${build.test}" srcdir="${src.test}" debug="true"
93 - deprecation="true" includeantruntime="false">
94 - <classpath refid="project.class.path"/>
95 - <classpath refid="test.class.path"/>
96 - <classpath refid="build.lib.class.path"/>
97 - </javac>
98 - </target>
99 - <target name="build" depends="build-lib"
100 - description="Alias for build-lib"/>
101 - <target name="test" depends="build-tests">
102 - <junit>
103 - <classpath refid="project.class.path"/>
104 - <classpath refid="test.class.path"/>
105 - <classpath refid="build.lib.class.path"/>
106 - <classpath refid="build.test.class.path"/>
107 - <formatter type="brief" usefile="false" />
108 - <batchtest>
109 - <fileset dir="${build.test}">
110 - <include name="**/*.class" />
111 - <exclude name="**/*$*.class" />
112 - </fileset>
113 - </batchtest>
114 - </junit>
115 - </target>
116 - <target name="javadoc" depends="init"
117 - description="Generates Javadoc API documentation">
118 - <mkdir dir="${doc.api}"/>
119 - <javadoc packagenames="*"
120 - sourcepath="${src.lib}" destdir="${doc.api}"
121 - author="true" version="true"
122 - use="true" private="true"/>
123 - </target>
124 - <target name="jar" depends="build-lib"
125 - description="Builds a project JAR file">
126 - <jar basedir="${build.lib}" jarfile="${build}/joda-convert.jar">
127 - <manifest>
128 - <attribute name="Version" value="${package.version}"/>
129 - </manifest>
130 - </jar>
131 - </target>
132 - <target name="clean" depends="init"
133 - description="Erase all generated files and dirs">
134 - <delete dir="${build}" verbose="true"/>
135 - <delete dir="${doc}" verbose="true"/>
136 - <delete verbose="true">
137 - <fileset dir="${basedir}" includes="*.jar"/>
138 - </delete>
139 - </target>
140 -</project>
141
142 diff --git a/dev-java/joda-convert/joda-convert-1.2.ebuild b/dev-java/joda-convert/joda-convert-1.2.ebuild
143 deleted file mode 100644
144 index 303b052..0000000
145 --- a/dev-java/joda-convert/joda-convert-1.2.ebuild
146 +++ /dev/null
147 @@ -1,45 +0,0 @@
148 -# Copyright 1999-2012 Gentoo Foundation
149 -# Distributed under the terms of the GNU General Public License v2
150 -# $Header: $
151 -
152 -EAPI=4
153 -JAVA_PKG_IUSE="doc source test"
154 -
155 -inherit java-pkg-2 java-ant-2
156 -
157 -DESCRIPTION="Java library for conversion between Object and String"
158 -HOMEPAGE="http://joda-convert.sourceforge.net/"
159 -SRC_URI="mirror://sourceforge/${PN}/${P}-dist.tar.gz"
160 -
161 -LICENSE="Apache-2.0"
162 -SLOT="0"
163 -KEYWORDS="~amd64 ~x86"
164 -IUSE=""
165 -
166 -DEPEND=">=virtual/jdk-1.5
167 - dev-java/junit:4
168 - test? (
169 - dev-java/ant-junit4
170 - dev-java/hamcrest-core
171 - )"
172 -RDEPEND=">=virtual/jre-1.5"
173 -
174 -JAVA_PKG_WANT_SOURCE="5"
175 -EANT_EXTRA_ARGS="-Dpacakge.version=${PV}"
176 -EANT_GENTOO_CLASSPATH="junit-4"
177 -JAVA_ANT_REWRITE_CLASSPATH="true"
178 -
179 -src_prepare() {
180 - cp "${FILESDIR}"/${PV}-build.xml build.xml
181 -}
182 -
183 -src_test() {
184 - ANT_TASKS="ant-junit4" eant test
185 -}
186 -
187 -src_install() {
188 - java-pkg_newjar build/${PN}.jar ${PN}.jar
189 - dodoc NOTICE.txt RELEASE-NOTES.txt
190 - use doc && java-pkg_dojavadoc doc/api
191 - use source && java-pkg_dosrc src/main/java/*
192 -}
193
194 diff --git a/dev-java/joda-convert/metadata.xml b/dev-java/joda-convert/metadata.xml
195 deleted file mode 100644
196 index b229aec..0000000
197 --- a/dev-java/joda-convert/metadata.xml
198 +++ /dev/null
199 @@ -1,5 +0,0 @@
200 -<?xml version="1.0" encoding="UTF-8"?>
201 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
202 -<pkgmetadata>
203 -<herd>sci</herd>
204 -</pkgmetadata>