1 |
commit: 342c4043a44d8412a4331c0513e9c2db17054add |
2 |
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 24 14:01:38 2015 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 24 14:03:20 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=342c4043 |
7 |
|
8 |
dev-java/jdbc-mysql: Clean up old. |
9 |
|
10 |
Package-Manager: portage-2.2.20.1 |
11 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
12 |
|
13 |
dev-java/jdbc-mysql/Manifest | 3 - |
14 |
dev-java/jdbc-mysql/files/5.1.11-java6.patch | 34 ----------- |
15 |
dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild | 81 -------------------------- |
16 |
dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild | 81 -------------------------- |
17 |
dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild | 86 ---------------------------- |
18 |
5 files changed, 285 deletions(-) |
19 |
|
20 |
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest |
21 |
index 67a2686..ad40d81 100644 |
22 |
--- a/dev-java/jdbc-mysql/Manifest |
23 |
+++ b/dev-java/jdbc-mysql/Manifest |
24 |
@@ -1,4 +1 @@ |
25 |
-DIST mysql-connector-java-5.1.14.tar.gz 3272153 SHA256 ca6f873a4da59cfe1f464ccee29672dc3bc56ef79cc6a1e9aefba2449c7a32d0 SHA512 42568335dce2e1dbce3e885dfbaafcba8456bf0bcdd9bcc3ec23f3c36af65d05b62968b56c0cda89f803e4d52f15effec8ae7ef40d16993ac542ae981991b6c6 WHIRLPOOL a9f4bb2ed433eb078208f0780ca4a1d76d4b0e83c0c8f46e73fb80a1a00789266904dc4121dab7d227c3fe5752032cbee14e3cd0502cfac9a6ad2e10071dc4d3 |
26 |
-DIST mysql-connector-java-5.1.18.tar.gz 3834947 SHA256 e67216a40fba486dbba9d93fca8e2d5bd6e434edb08f4b47b07e08f27555f414 SHA512 ec6ac3892c9df1abe26a93b5b60f0ca6350dc4e35f3ba9862754d30c1e4a2a5ecb51eda3b2d8cb32a1b1503a472de0ccedc579144de30cbc12a40264f4e8b90d WHIRLPOOL 3efcf5227ab8ce5d802f44458764d35a0705c89ff946902402c5e3e64a31bddd244f382622d9cecab18092df13e4da251894fc12a391f4cb53eddca29706e116 |
27 |
-DIST mysql-connector-java-5.1.23.tar.gz 3683852 SHA256 133e74bd7cd0cd5f20dd8d2a365f5fc0274693517b323a6faa960ff46e2c68dc SHA512 adeb464b52b4df717a81ceb0677901ce52e11d04b13f47c1f5312e1f4c45ab1be1a149acbbe147f73875330a0d5ed50265a1e5430657571d9223b39b34de6061 WHIRLPOOL 501b1558a4c6e1d07cc68e3d4764c4aba057436a46b075e30e852bca37db12570b8243744e58e81caaf02ac6ffed85d35cfa3b56823483ad6743037928dbdaad |
28 |
DIST mysql-connector-java-5.1.26.tar.gz 3724076 SHA256 fade4caa398c41f537d9b7bcaf83aabaa1eab1ef23c81de49979b5b04ba395bd SHA512 93b882f5262dc991aa885ed9ae7fead02b9d28431022c86c6724272b508e78eee3df7310e9964e60f68953ed56f4fcdf9159a90f463eb39aea65af2453371879 WHIRLPOOL 9ecf39094c1a07f5658a24574f7852aadf51c024495572bedf38ee74f83f6380159e60ce8b6a415480d8e9ec923174a0f6ba2209cdcb96167bcf8ed4e1e3a9b9 |
29 |
|
30 |
diff --git a/dev-java/jdbc-mysql/files/5.1.11-java6.patch b/dev-java/jdbc-mysql/files/5.1.11-java6.patch |
31 |
deleted file mode 100644 |
32 |
index 1e3c21d..0000000 |
33 |
--- a/dev-java/jdbc-mysql/files/5.1.11-java6.patch |
34 |
+++ /dev/null |
35 |
@@ -1,34 +0,0 @@ |
36 |
---- build.xml.orig 2010-01-20 19:45:30.000000000 +0100 |
37 |
-+++ build.xml 2010-02-13 00:34:30.000000000 +0100 |
38 |
-@@ -124,7 +124,7 @@ |
39 |
- </if> |
40 |
- </target> |
41 |
- |
42 |
-- <target name="init" depends="-compiler-check, -init-copy, -init-no-crypto"> |
43 |
-+ <target name="init" depends="-init-copy, -init-no-crypto"> |
44 |
- <!-- If we're building under cruise control, update ourself --> |
45 |
- |
46 |
- <if> |
47 |
-@@ -746,7 +746,8 @@ |
48 |
- <javac sourcepath="" srcdir="${buildDir}/${fullProdName}" |
49 |
- destdir="${compiler.output}" |
50 |
- deprecation="off" |
51 |
-- debug="${debug.enable}"> |
52 |
-+ debug="${debug.enable}" |
53 |
-+ bootclasspath="${gentoo.bootclasspath}"> |
54 |
- <include name="**/*.java" /> |
55 |
- <exclude name="testsuite/**" /> |
56 |
- <exclude name="com/mysql/jdbc/integration/**" /> |
57 |
-@@ -763,11 +764,7 @@ |
58 |
- <javac destdir="${compiler.output}" |
59 |
- deprecation="off" |
60 |
- debug="${debug.enable}" |
61 |
-- fork="yes" |
62 |
-- executable="${com.mysql.jdbc.java6.javac}" |
63 |
-- compiler="modern" |
64 |
-- sourcepath="" srcdir="${buildDir}/${fullProdName}" |
65 |
-- bootclasspath="${com.mysql.jdbc.java6.rtjar}"> |
66 |
-+ sourcepath="" srcdir="${buildDir}/${fullProdName}"> |
67 |
- <include name="**/JDBC4*.java" /> |
68 |
- <include name="com/mysql/jdbc/exceptions/jdbc4/*" /> |
69 |
- |
70 |
|
71 |
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild |
72 |
deleted file mode 100644 |
73 |
index 5e4cb51..0000000 |
74 |
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild |
75 |
+++ /dev/null |
76 |
@@ -1,81 +0,0 @@ |
77 |
-# Copyright 1999-2014 Gentoo Foundation |
78 |
-# Distributed under the terms of the GNU General Public License v2 |
79 |
-# $Id$ |
80 |
- |
81 |
-EAPI="2" |
82 |
- |
83 |
-JAVA_PKG_IUSE="source" |
84 |
-JAVA_PKG_WANT_BOOTCLASSPATH="1.5" |
85 |
-WANT_ANT_TASKS="ant-contrib" |
86 |
- |
87 |
-inherit eutils java-pkg-2 java-ant-2 |
88 |
- |
89 |
-MY_PN="mysql-connector-java" |
90 |
-MY_P="${MY_PN}-${PV}" |
91 |
- |
92 |
-DESCRIPTION="MySQL JDBC driver" |
93 |
-HOMEPAGE="http://www.mysql.com/products/connector/j/" |
94 |
-SRC_URI="mirror://mysql/Downloads/Connector-J/${MY_P}.tar.gz" |
95 |
- |
96 |
-LICENSE="GPL-2-with-MySQL-FLOSS-exception" |
97 |
-SLOT="0" |
98 |
-KEYWORDS="amd64 ppc ppc64 x86" |
99 |
- |
100 |
-IUSE="c3p0 log4j" |
101 |
- |
102 |
-COMMON_DEP=" |
103 |
- log4j? ( dev-java/log4j ) |
104 |
- c3p0? ( dev-java/c3p0 ) |
105 |
- dev-java/commons-logging" |
106 |
- |
107 |
-RDEPEND=">=virtual/jre-1.6 |
108 |
- ${COMMON_DEP}" |
109 |
- |
110 |
-DEPEND="virtual/jdk:1.6 |
111 |
- ${COMMON_DEP}" |
112 |
- |
113 |
-S="${WORKDIR}/${MY_P}" |
114 |
- |
115 |
-java_prepare() { |
116 |
- epatch "${FILESDIR}/5.0.5-remove-jboss-dependency-from-tests.patch" |
117 |
- # http://bugs.mysql.com/bug.php?id=28286 |
118 |
- epatch "${FILESDIR}/5.0.5-dist-target-depends.patch" |
119 |
- # use java6 for everything except jdbc3 - #283848 |
120 |
- epatch "${FILESDIR}/5.1.14-java6.patch" |
121 |
- |
122 |
- rm -v *.jar || die |
123 |
- |
124 |
- # use test && mkdir src/lib-nodist # needed, or ant will fail |
125 |
- |
126 |
- cd src/lib |
127 |
- rm -v *.jar || die |
128 |
- java-pkg_jar-from commons-logging |
129 |
- use log4j && java-pkg_jar-from log4j |
130 |
- use c3p0 && java-pkg_jar-from c3p0 |
131 |
-} |
132 |
- |
133 |
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true" |
134 |
-EANT_BUILD_TARGET="dist" |
135 |
- |
136 |
-src_compile() { |
137 |
- # cannot use rewrite-bootclasspath because of the jdbc4 part |
138 |
- local bcp="$(java-pkg_get-bootclasspath 1.5)" |
139 |
- java-pkg-2_src_compile -Dgentoo.bootclasspath="${bcp}" |
140 |
-} |
141 |
- |
142 |
-# Tests need a mysql DB to exist |
143 |
-RESTRICT="test" |
144 |
-src_test() { |
145 |
- cd src/lib |
146 |
- java-pkg_jar-from junit |
147 |
- cd "${S}" |
148 |
- ANT_TASKS="ant-junit" eant test -Dcom.mysql.jdbc.noCleanBetweenCompiles=true |
149 |
-} |
150 |
- |
151 |
-src_install() { |
152 |
- # Skip bytecode check because we want two versions there |
153 |
- JAVA_PKG_STRICT= java-pkg_newjar build/${MY_P}-SNAPSHOT/${MY_P}-SNAPSHOT-bin.jar ${PN}.jar |
154 |
- dodoc README CHANGES || die |
155 |
- dohtml docs/*.html || die |
156 |
- use source && java-pkg_dosrc src/com src/org |
157 |
-} |
158 |
|
159 |
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild |
160 |
deleted file mode 100644 |
161 |
index d3aee26..0000000 |
162 |
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild |
163 |
+++ /dev/null |
164 |
@@ -1,81 +0,0 @@ |
165 |
-# Copyright 1999-2014 Gentoo Foundation |
166 |
-# Distributed under the terms of the GNU General Public License v2 |
167 |
-# $Id$ |
168 |
- |
169 |
-EAPI="2" |
170 |
- |
171 |
-JAVA_PKG_IUSE="source" |
172 |
-JAVA_PKG_WANT_BOOTCLASSPATH="1.5" |
173 |
-WANT_ANT_TASKS="ant-contrib" |
174 |
- |
175 |
-inherit eutils java-pkg-2 java-ant-2 |
176 |
- |
177 |
-MY_PN="mysql-connector-java" |
178 |
-MY_P="${MY_PN}-${PV}" |
179 |
- |
180 |
-DESCRIPTION="MySQL JDBC driver" |
181 |
-HOMEPAGE="http://www.mysql.com/products/connector/j/" |
182 |
-SRC_URI="mirror://mysql/Downloads/Connector-J/${MY_P}.tar.gz" |
183 |
- |
184 |
-LICENSE="GPL-2-with-MySQL-FLOSS-exception" |
185 |
-SLOT="0" |
186 |
-KEYWORDS="amd64 ~ppc ~ppc64 x86" |
187 |
- |
188 |
-IUSE="c3p0 log4j" |
189 |
- |
190 |
-COMMON_DEP=" |
191 |
- dev-java/slf4j-api:0 |
192 |
- log4j? ( dev-java/log4j ) |
193 |
- c3p0? ( dev-java/c3p0 )" |
194 |
- |
195 |
-RDEPEND=">=virtual/jre-1.6 |
196 |
- ${COMMON_DEP}" |
197 |
- |
198 |
-DEPEND="virtual/jdk:1.6 |
199 |
- ${COMMON_DEP}" |
200 |
- |
201 |
-S="${WORKDIR}/${MY_P}" |
202 |
- |
203 |
-java_prepare() { |
204 |
- epatch "${FILESDIR}/5.0.5-remove-jboss-dependency-from-tests.patch" |
205 |
- # http://bugs.mysql.com/bug.php?id=28286 |
206 |
- epatch "${FILESDIR}/5.0.5-dist-target-depends.patch" |
207 |
- # use java6 for everything except jdbc3 - #283848 |
208 |
- epatch "${FILESDIR}/5.1.14-java6.patch" |
209 |
- |
210 |
- rm -v *.jar || die |
211 |
- |
212 |
- # use test && mkdir src/lib-nodist # needed, or ant will fail |
213 |
- |
214 |
- cd src/lib |
215 |
- rm -v *.jar || die |
216 |
- java-pkg_jar-from slf4j-api |
217 |
- use log4j && java-pkg_jar-from log4j |
218 |
- use c3p0 && java-pkg_jar-from c3p0 |
219 |
-} |
220 |
- |
221 |
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true" |
222 |
-EANT_BUILD_TARGET="dist" |
223 |
- |
224 |
-src_compile() { |
225 |
- # cannot use rewrite-bootclasspath because of the jdbc4 part |
226 |
- local bcp="$(java-pkg_get-bootclasspath 1.5)" |
227 |
- java-pkg-2_src_compile -Dgentoo.bootclasspath="${bcp}" |
228 |
-} |
229 |
- |
230 |
-# Tests need a mysql DB to exist |
231 |
-RESTRICT="test" |
232 |
-src_test() { |
233 |
- cd src/lib |
234 |
- java-pkg_jar-from junit |
235 |
- cd "${S}" |
236 |
- ANT_TASKS="ant-junit" eant test -Dcom.mysql.jdbc.noCleanBetweenCompiles=true |
237 |
-} |
238 |
- |
239 |
-src_install() { |
240 |
- # Skip bytecode check because we want two versions there |
241 |
- JAVA_PKG_STRICT= java-pkg_newjar build/${MY_P}-SNAPSHOT/${MY_P}-SNAPSHOT-bin.jar ${PN}.jar |
242 |
- dodoc README CHANGES || die |
243 |
- dohtml docs/*.html || die |
244 |
- use source && java-pkg_dosrc src/com src/org |
245 |
-} |
246 |
|
247 |
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild |
248 |
deleted file mode 100644 |
249 |
index f3b8557..0000000 |
250 |
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild |
251 |
+++ /dev/null |
252 |
@@ -1,86 +0,0 @@ |
253 |
-# Copyright 1999-2014 Gentoo Foundation |
254 |
-# Distributed under the terms of the GNU General Public License v2 |
255 |
-# $Id$ |
256 |
- |
257 |
-EAPI="5" |
258 |
- |
259 |
-JAVA_PKG_IUSE="source" |
260 |
-JAVA_PKG_WANT_BOOTCLASSPATH="1.5" |
261 |
-WANT_ANT_TASKS="ant-contrib" |
262 |
- |
263 |
-inherit eutils java-pkg-2 java-ant-2 |
264 |
- |
265 |
-MY_PN="mysql-connector-java" |
266 |
-MY_P="${MY_PN}-${PV}" |
267 |
- |
268 |
-DESCRIPTION="MySQL JDBC driver" |
269 |
-HOMEPAGE="http://www.mysql.com/products/connector/j/" |
270 |
-SRC_URI="mirror://mysql/Downloads/Connector-J/${MY_P}.tar.gz" |
271 |
- |
272 |
-LICENSE="GPL-2-with-MySQL-FLOSS-exception" |
273 |
-SLOT="0" |
274 |
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
275 |
- |
276 |
-IUSE="c3p0 log4j" |
277 |
- |
278 |
-COMMON_DEP=" |
279 |
- dev-java/slf4j-api:0 |
280 |
- log4j? ( dev-java/log4j ) |
281 |
- c3p0? ( dev-java/c3p0 )" |
282 |
- |
283 |
-RDEPEND=">=virtual/jre-1.6 |
284 |
- ${COMMON_DEP}" |
285 |
- |
286 |
-DEPEND=">=virtual/jdk-1.6 |
287 |
- ${COMMON_DEP}" |
288 |
- |
289 |
-S="${WORKDIR}/${MY_P}" |
290 |
- |
291 |
-java_prepare() { |
292 |
- epatch "${FILESDIR}/5.0.5-remove-jboss-dependency-from-tests.patch" |
293 |
- |
294 |
- # http://bugs.mysql.com/bug.php?id=28286 |
295 |
- epatch "${FILESDIR}/5.0.5-dist-target-depends.patch" |
296 |
- |
297 |
- # Use java6 for everything except jdbc3 - #283848 |
298 |
- epatch "${FILESDIR}/5.1.14-java6.patch" |
299 |
- |
300 |
- find . -name '*.jar' -print -delete || die |
301 |
- |
302 |
- # use test && mkdir src/lib-nodist # needed, or ant will fail |
303 |
- |
304 |
- cd src/lib |
305 |
- java-pkg_jar-from slf4j-api |
306 |
- use log4j && java-pkg_jar-from log4j |
307 |
- use c3p0 && java-pkg_jar-from c3p0 |
308 |
-} |
309 |
- |
310 |
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true" |
311 |
-EANT_BUILD_TARGET="dist" |
312 |
- |
313 |
-src_compile() { |
314 |
- # Cannot use rewrite-bootclasspath because of the jdbc4 part. |
315 |
- java-pkg-2_src_compile \ |
316 |
- -Dgentoo.bootclasspath="$(java-pkg_get-bootclasspath 1.5)" |
317 |
-} |
318 |
- |
319 |
-# Tests need a mysql DB to exist. |
320 |
-RESTRICT="test" |
321 |
- |
322 |
-src_test() { |
323 |
- cd src/lib |
324 |
- java-pkg_jar-from junit |
325 |
- |
326 |
- cd "${S}" |
327 |
- ANT_TASKS="ant-junit" eant test -Dcom.mysql.jdbc.noCleanBetweenCompiles=true |
328 |
-} |
329 |
- |
330 |
-src_install() { |
331 |
- # Skip bytecode check because we want two versions there |
332 |
- JAVA_PKG_STRICT= java-pkg_newjar build/${MY_P}-SNAPSHOT/${MY_P}-SNAPSHOT-bin.jar ${PN}.jar |
333 |
- |
334 |
- dodoc README CHANGES |
335 |
- dohtml docs/*.html |
336 |
- |
337 |
- use source && java-pkg_dosrc src/com src/org |
338 |
-} |