1 |
commit: d28992553cff0bdd8104dd52293d37240c527a83 |
2 |
Author: Ralph Sennhauser <sera <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 3 14:15:54 2014 +0000 |
4 |
Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> |
5 |
CommitDate: Sun Aug 3 14:15:54 2014 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=d2899255 |
7 |
|
8 |
Remove jackson, more recent version in main tree |
9 |
|
10 |
--- |
11 |
dev-java/jackson/ChangeLog | 27 -------- |
12 |
dev-java/jackson/Manifest | 22 ------- |
13 |
dev-java/jackson/files/jackson-0.9.4-minimal.patch | 12 ---- |
14 |
dev-java/jackson/files/jackson-1.0.1-minimal.patch | 21 ------ |
15 |
dev-java/jackson/jackson-0.9.4.ebuild | 74 ---------------------- |
16 |
dev-java/jackson/jackson-1.0.1.ebuild | 72 --------------------- |
17 |
dev-java/jackson/metadata.xml | 5 -- |
18 |
7 files changed, 233 deletions(-) |
19 |
|
20 |
diff --git a/dev-java/jackson/ChangeLog b/dev-java/jackson/ChangeLog |
21 |
deleted file mode 100644 |
22 |
index 6f8825b..0000000 |
23 |
--- a/dev-java/jackson/ChangeLog |
24 |
+++ /dev/null |
25 |
@@ -1,27 +0,0 @@ |
26 |
-# ChangeLog for dev-java/jackson |
27 |
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: $ |
29 |
- |
30 |
- 07 Jun 2012; Ralph Sennhauser <sera@g.o> jackson-0.9.4.ebuild, |
31 |
- jackson-1.0.1.ebuild: |
32 |
- EAPI declaration must be first. #402167 |
33 |
- |
34 |
- 01 Feb 2010; Robin H. Johnson <robbat2@g.o> metadata.xml: |
35 |
- Jersey was a failure for me, I do not need this package anymore. Free to |
36 |
- evict or anybody take it over. |
37 |
- |
38 |
-*jackson-0.9.4 (21 Jun 2009) |
39 |
- |
40 |
- 21 Jun 2009; Robin H. Johnson <robbat2@g.o> +jackson-0.9.4.ebuild, |
41 |
- +files/jackson-0.9.4-minimal.patch: |
42 |
- Add SLOT=0 of older jackson for jersey. |
43 |
- |
44 |
- 21 Jun 2009; Robin H. Johnson <robbat2@g.o> jackson-1.0.1.ebuild: |
45 |
- Move slot to 1 so we can add jackson-0.9.4 for jersey as well. |
46 |
- |
47 |
-*jackson-1.0.1 (21 Jun 2009) |
48 |
- |
49 |
- 21 Jun 2009; Robin H. Johnson <robbat2@g.o> +jackson-1.0.1.ebuild, |
50 |
- +files/jackson-1.0.1-minimal.patch, +metadata.xml: |
51 |
- Initial commit. Ebuild by Robin H. Johnson <robbat2@g.o>. |
52 |
- |
53 |
|
54 |
diff --git a/dev-java/jackson/Manifest b/dev-java/jackson/Manifest |
55 |
deleted file mode 100644 |
56 |
index 9db8874..0000000 |
57 |
--- a/dev-java/jackson/Manifest |
58 |
+++ /dev/null |
59 |
@@ -1,22 +0,0 @@ |
60 |
------BEGIN PGP SIGNED MESSAGE----- |
61 |
-Hash: SHA1 |
62 |
- |
63 |
-AUX jackson-0.9.4-minimal.patch 535 RMD160 45af566e60fd95db148a70ec932082cb95087a7f SHA1 0c8939db3980c275dd5f94e7a69ac02b109e328b SHA256 a55847c7f96e9328ce03b088b486423d7f173f23bd4224b981e474d3094682a5 |
64 |
-AUX jackson-1.0.1-minimal.patch 914 RMD160 f82962ef76c07f44883c93988d363f0a8810bf19 SHA1 86a413ea8b14c4f53f0449619aeb66850ff0a9de SHA256 d6935cc60201b533271eb75ae0a8022fbb44780a57b3dcbd814512e8cdfe19ae |
65 |
-DIST jackson-src-0.9.4.tar.gz 1747869 RMD160 5dea90845c7fe4d26bea34b8e485beba0846ed3d SHA1 f98374ffcfbe746e6da93b5269d150f5bcc385a8 SHA256 cbfde938656287c8252df32aeaab93f3dbc983e370d83386ab59869fe9d8bb90 |
66 |
-DIST jackson-src-1.0.1.tar.gz 3274597 RMD160 138d35db2da8a9272ebbb600322b8ee0217c6590 SHA1 e446cb099a9af084a6bc83d443a862f670d28aa3 SHA256 b7c5b9c68af3a96235ac06cc2024a273f794fbb33f333dbc1058cef9ed87a8dc |
67 |
-EBUILD jackson-0.9.4.ebuild 1854 RMD160 73f76848290fb0e211789e51d5524c56e9cc595a SHA1 bbfbab35d6a79b85d35caa8efe7bdaf9c1fb37f2 SHA256 29b45f7503a01127cd47e2f10d79031f54ca2b484ac62f816d4ad54b5c0d6eee |
68 |
-EBUILD jackson-1.0.1.ebuild 1989 RMD160 24591885e4e5d2dacef5bc2de35a0bd75b2a01dd SHA1 8215b6bb733ec38bbfc2affde6ddcbcaa405ed14 SHA256 303f929e9fa65b2d522c6ba06461588fd91f68886523dbb43e14b596c393d68c |
69 |
-MISC ChangeLog 987 RMD160 6916b350a91a0d49db30fe43e1ed8cb85afd483b SHA1 0ca6716f32f880dd39433588e7ffc518784b360a SHA256 25a0f348c7a16ad6a95e028655b896254230b1e19e924a68013059c8011a4801 |
70 |
-MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 |
71 |
------BEGIN PGP SIGNATURE----- |
72 |
-Version: GnuPG v2.0.17 (GNU/Linux) |
73 |
- |
74 |
-iQEcBAEBAgAGBQJP0GDeAAoJEIUJ+svaV163cGwH/A4DxqXkRcGPK12Augam3pEL |
75 |
-tCf//278SU3oZHjrl4up1FyoH54DLCw7hkUjYxVDpYdegbn8NkejCtNqtD/zfuf4 |
76 |
-QwtLEwjdh+CCU4TwR8QGO/e2ijoYVf5th0b/u24wgQtXhG23uGNV3mfWHJiZRR/U |
77 |
-2oGZiWvtJsJ0qVMBDQS7faHUMcwhW/Nqf+I3fWrIfVXx9BzWNHltRMLyyuEoeoh4 |
78 |
-uHyhmjSBgB4vYIuVcDgU1f/vbnjTM+xC9hUkVrzgqu5+7c3h63X7OeQ+HKmFZFr9 |
79 |
-ed8wrdHli9MSt81PIhTdTRMcOtMMtd6dqTeJJm8XQ9ciCHCgjwz8eG7nxeEJW0o= |
80 |
-=DNH2 |
81 |
------END PGP SIGNATURE----- |
82 |
|
83 |
diff --git a/dev-java/jackson/files/jackson-0.9.4-minimal.patch b/dev-java/jackson/files/jackson-0.9.4-minimal.patch |
84 |
deleted file mode 100644 |
85 |
index 091d334..0000000 |
86 |
--- a/dev-java/jackson/files/jackson-0.9.4-minimal.patch |
87 |
+++ /dev/null |
88 |
@@ -1,12 +0,0 @@ |
89 |
-diff -Nuar jackson-src-0.9.4.orig/build.xml jackson-src-0.9.4/build.xml |
90 |
---- jackson-src-0.9.4.orig/build.xml 2009-06-04 18:55:02.000000000 -0700 |
91 |
-+++ jackson-src-0.9.4/build.xml 2009-06-21 12:52:02.344787940 -0700 |
92 |
-@@ -243,6 +243,8 @@ |
93 |
- version="true"> |
94 |
- <packageset dir="${dir.src.java}" defaultexcludes="yes"> |
95 |
- <include name="org/codehaus/**" /> |
96 |
-+ <exclude name="perf/**" /> |
97 |
-+ <exclude name="test/**" /> |
98 |
- </packageset> |
99 |
- </javadoc> |
100 |
- </target> |
101 |
|
102 |
diff --git a/dev-java/jackson/files/jackson-1.0.1-minimal.patch b/dev-java/jackson/files/jackson-1.0.1-minimal.patch |
103 |
deleted file mode 100644 |
104 |
index 107f32d..0000000 |
105 |
--- a/dev-java/jackson/files/jackson-1.0.1-minimal.patch |
106 |
+++ /dev/null |
107 |
@@ -1,21 +0,0 @@ |
108 |
-diff -Nuar jackson-src-1.0.1.orig/build.xml jackson-src-1.0.1/build.xml |
109 |
---- jackson-src-1.0.1.orig/build.xml 2009-06-04 18:55:02.000000000 -0700 |
110 |
-+++ jackson-src-1.0.1/build.xml 2009-06-21 12:52:02.344787940 -0700 |
111 |
-@@ -235,7 +235,7 @@ |
112 |
- depends="jars.asl, jars.lgpl, jars.other" |
113 |
- /> |
114 |
- |
115 |
-- <target name="javadoc" depends="compile.all"> |
116 |
-+ <target name="javadoc" depends="compile.mapper, compile.core, compile.jaxrs"> |
117 |
- <!-- Build a dirpath that contains just the "source" tree --> |
118 |
- <javadoc windowtitle="Jackson JSON Processor" |
119 |
- destdir="${dir.javadoc}" |
120 |
-@@ -243,6 +243,8 @@ |
121 |
- version="true"> |
122 |
- <packageset dir="${dir.src.java}" defaultexcludes="yes"> |
123 |
- <include name="org/codehaus/**" /> |
124 |
-+ <exclude name="perf/**" /> |
125 |
-+ <exclude name="test/**" /> |
126 |
- </packageset> |
127 |
- </javadoc> |
128 |
- </target> |
129 |
|
130 |
diff --git a/dev-java/jackson/jackson-0.9.4.ebuild b/dev-java/jackson/jackson-0.9.4.ebuild |
131 |
deleted file mode 100644 |
132 |
index cdcf3cf..0000000 |
133 |
--- a/dev-java/jackson/jackson-0.9.4.ebuild |
134 |
+++ /dev/null |
135 |
@@ -1,74 +0,0 @@ |
136 |
-# Copyright 1999-2012 Gentoo Foundation |
137 |
-# Distributed under the terms of the GNU General Public License v2 |
138 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.4.0.ebuild,v 1.3 2008/11/01 09:39:23 robbat2 Exp $ |
139 |
- |
140 |
-EAPI=2 |
141 |
- |
142 |
-JAVA_PKG_IUSE="doc source test" |
143 |
-EANT_BUILD_TARGET=jars |
144 |
- |
145 |
-inherit java-pkg-2 java-ant-2 |
146 |
- |
147 |
-DESCRIPTION="High-performance JSON processor" |
148 |
-HOMEPAGE="http://jackson.codehaus.org" |
149 |
-SRC_DIR="${PN}-src-${PV}" |
150 |
-SRC_URI="http://jackson.codehaus.org/${PV}/${SRC_DIR}.tar.gz" |
151 |
-LICENSE="|| ( Apache-2.0 LGPL-2.1 )" |
152 |
-SLOT="0" |
153 |
-KEYWORDS="~amd64 ~ppc ~x86" |
154 |
-IUSE="" |
155 |
-RDEPEND=">=virtual/jre-1.5" |
156 |
-DEPEND="${RDEPEND} |
157 |
- >=virtual/jdk-1.5 |
158 |
- dev-java/ant-nodeps |
159 |
- test? ( |
160 |
- dev-java/ant-junit |
161 |
- dev-java/junit:0 |
162 |
- )" |
163 |
-S="${WORKDIR}/${SRC_DIR}" |
164 |
- |
165 |
-src_unpack() { |
166 |
- mkdir "${S}" || die |
167 |
- cd "${S}" |
168 |
- unpack ${A} |
169 |
-} |
170 |
- |
171 |
-java_prepare() { |
172 |
- cd "${S}" |
173 |
- epatch "${FILESDIR}"/${P}-minimal.patch |
174 |
- # Cleanup |
175 |
- # bndtask-0.2.0.jar is needed for osgiJar in the ant process |
176 |
- # It's findable here: |
177 |
- # https://opensource.luminis.net/wiki/display/SITE/OSGi+Bundle+Ant+Task |
178 |
- # But I can't find the 'bnd' that it requires AND which works |
179 |
- find "${S}" -iname '*.jar' ! -name bndtask-0.2.0.jar -exec rm \{\} \; |
180 |
- if use test; then |
181 |
- java-pkg_jar-from --build-only --into lib/junit junit |
182 |
- fi |
183 |
- |
184 |
-# - These are needed for coverage tests only: |
185 |
-# lib/cobertura/log4j-1.2.13.jar |
186 |
-# lib/cobertura/jakarta-oro-2.0.8.jar |
187 |
-# lib/cobertura/cobertura-1.9.jar |
188 |
-# lib/cobertura/asm-tree-2.2.1.jar |
189 |
-# lib/cobertura/asm-2.2.1.jar |
190 |
- |
191 |
-# - Might not even be needed |
192 |
-# lib/ant/maven-ant-tasks-2.0.9.jar |
193 |
-# lib/ant/bndtask-0.2.0.jar |
194 |
- |
195 |
-} |
196 |
- |
197 |
-src_install() { |
198 |
- dodoc release-notes/{VERSION,TODO,CREDITS} || die |
199 |
- for i in {asl,lgpl} ; do |
200 |
- java-pkg_newjar build/${PN}-${i}-${PV}.jar ${PN}-${i}.jar |
201 |
- done |
202 |
- |
203 |
- use doc && java-pkg_dohtml -r build/javadoc |
204 |
- use source && java-pkg_dosrc src/java/org |
205 |
-} |
206 |
- |
207 |
-src_test() { |
208 |
- java-pkg-2_src_test |
209 |
-} |
210 |
|
211 |
diff --git a/dev-java/jackson/jackson-1.0.1.ebuild b/dev-java/jackson/jackson-1.0.1.ebuild |
212 |
deleted file mode 100644 |
213 |
index 553e65a..0000000 |
214 |
--- a/dev-java/jackson/jackson-1.0.1.ebuild |
215 |
+++ /dev/null |
216 |
@@ -1,72 +0,0 @@ |
217 |
-# Copyright 1999-2012 Gentoo Foundation |
218 |
-# Distributed under the terms of the GNU General Public License v2 |
219 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.4.0.ebuild,v 1.3 2008/11/01 09:39:23 robbat2 Exp $ |
220 |
- |
221 |
-EAPI=2 |
222 |
- |
223 |
-JAVA_PKG_IUSE="doc source test" |
224 |
-EANT_BUILD_TARGET=jars |
225 |
- |
226 |
-inherit java-pkg-2 java-ant-2 |
227 |
- |
228 |
-DESCRIPTION="High-performance JSON processor" |
229 |
-HOMEPAGE="http://jackson.codehaus.org" |
230 |
-SRC_DIR="${PN}-src-${PV}" |
231 |
-SRC_URI="http://jackson.codehaus.org/${PV}/${SRC_DIR}.tar.gz" |
232 |
-LICENSE="|| ( Apache-2.0 LGPL-2.1 )" |
233 |
-SLOT="1" |
234 |
-KEYWORDS="~amd64 ~ppc ~x86" |
235 |
-IUSE="" |
236 |
-RDEPEND=">=virtual/jre-1.5 |
237 |
- dev-java/jsr311-api" |
238 |
-DEPEND="${RDEPEND} |
239 |
- >=virtual/jdk-1.5 |
240 |
- dev-java/ant-nodeps |
241 |
- test? ( |
242 |
- dev-java/ant-junit |
243 |
- dev-java/junit:4 |
244 |
- dev-java/cglib:2.2 |
245 |
- )" |
246 |
-S="${WORKDIR}/${SRC_DIR}" |
247 |
- |
248 |
-java_prepare() { |
249 |
- cd "${S}" |
250 |
- epatch "${FILESDIR}"/${P}-minimal.patch |
251 |
- # Cleanup |
252 |
- # bndtask-0.2.0.jar is needed for osgiJar in the ant process |
253 |
- # It's findable here: |
254 |
- # https://opensource.luminis.net/wiki/display/SITE/OSGi+Bundle+Ant+Task |
255 |
- # But I can't find the 'bnd' that it requires AND which works |
256 |
- find "${S}" -iname '*.jar' ! -name bndtask-0.2.0.jar -exec rm \{\} \; |
257 |
- if use test; then |
258 |
- java-pkg_jar-from --build-only --into lib/cglib cglib-2.2 |
259 |
- java-pkg_jar-from --build-only --into lib/junit junit-4 |
260 |
- fi |
261 |
- java-pkg_jar-from --into lib/jaxrs jsr311-api |
262 |
- |
263 |
-# - These are needed for coverage tests only: |
264 |
-# lib/cobertura/log4j-1.2.13.jar |
265 |
-# lib/cobertura/jakarta-oro-2.0.8.jar |
266 |
-# lib/cobertura/cobertura-1.9.jar |
267 |
-# lib/cobertura/asm-tree-2.2.1.jar |
268 |
-# lib/cobertura/asm-2.2.1.jar |
269 |
- |
270 |
-# - Might not even be needed |
271 |
-# lib/ant/maven-ant-tasks-2.0.9.jar |
272 |
-# lib/ant/bndtask-0.2.0.jar |
273 |
- |
274 |
-} |
275 |
- |
276 |
-src_install() { |
277 |
- dodoc README.txt release-notes/{VERSION,TODO,CREDITS} || die |
278 |
- for i in jaxrs {mapper,core}-{asl,lgpl} ; do |
279 |
- java-pkg_newjar build/${PN}-${i}-${PV}.jar ${PN}-${i}.jar |
280 |
- done |
281 |
- |
282 |
- use doc && java-pkg_dohtml -r build/javadoc |
283 |
- use source && java-pkg_dosrc src/java/org src/jaxrs/java |
284 |
-} |
285 |
- |
286 |
-src_test() { |
287 |
- java-pkg-2_src_test |
288 |
-} |
289 |
|
290 |
diff --git a/dev-java/jackson/metadata.xml b/dev-java/jackson/metadata.xml |
291 |
deleted file mode 100644 |
292 |
index 838c00a..0000000 |
293 |
--- a/dev-java/jackson/metadata.xml |
294 |
+++ /dev/null |
295 |
@@ -1,5 +0,0 @@ |
296 |
-<?xml version="1.0" encoding="UTF-8"?> |
297 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
298 |
-<pkgmetadata> |
299 |
-<herd>java</herd> |
300 |
-</pkgmetadata> |