1 |
commit: d179ea4a5d7f3caf353fdae6186bf77d46c9494e |
2 |
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> |
3 |
AuthorDate: Tue Jun 8 08:10:15 2021 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 9 07:15:57 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d179ea4a |
7 |
|
8 |
dev-java/jdbc-mysql: remove old |
9 |
|
10 |
Bug: https://bugs.gentoo.org/786093 |
11 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
12 |
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> |
13 |
Closes: https://github.com/gentoo/gentoo/pull/21157 |
14 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
15 |
|
16 |
dev-java/jdbc-mysql/Manifest | 1 - |
17 |
.../files/5.0.5-dist-target-depends.patch | 11 --- |
18 |
.../5.0.5-remove-jboss-dependency-from-tests.patch | 39 ---------- |
19 |
dev-java/jdbc-mysql/files/5.1.14-java6.patch | 34 --------- |
20 |
dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild | 83 ---------------------- |
21 |
dev-java/jdbc-mysql/metadata.xml | 12 ++-- |
22 |
6 files changed, 4 insertions(+), 176 deletions(-) |
23 |
|
24 |
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest |
25 |
index 6e4b900fedb..d137555a18f 100644 |
26 |
--- a/dev-java/jdbc-mysql/Manifest |
27 |
+++ b/dev-java/jdbc-mysql/Manifest |
28 |
@@ -1,2 +1 @@ |
29 |
DIST jdbc-mysql-8.0.25-sources.jar 1556319 BLAKE2B 75eb4837f6916247650a925f87d52e49848e3bc52cfa683a149624e4b749c3c4b3a7336a5659dd0c894f0285254c915364d9ffd7b4779c87e0894053a2854a5c SHA512 c4384213845c43a494360131dcb7b9b424473237b65504d5ed4a7929cb8bb7b4b3c7cce6fde2c20a7026891751e76c78ea64af746a053ca42567a7e68782280e |
30 |
-DIST mysql-connector-java-5.1.26.tar.gz 3724076 BLAKE2B b5477e0f86a04b2135a47e3551cc89fa5f63f46faaccbf1e4473eb59e6d266d22d76a5c256d125feeeccd4625c22bcedaa9e21e613bf9759459e106b7d30db5f SHA512 93b882f5262dc991aa885ed9ae7fead02b9d28431022c86c6724272b508e78eee3df7310e9964e60f68953ed56f4fcdf9159a90f463eb39aea65af2453371879 |
31 |
|
32 |
diff --git a/dev-java/jdbc-mysql/files/5.0.5-dist-target-depends.patch b/dev-java/jdbc-mysql/files/5.0.5-dist-target-depends.patch |
33 |
deleted file mode 100644 |
34 |
index 28ffc7ad0da..00000000000 |
35 |
--- a/dev-java/jdbc-mysql/files/5.0.5-dist-target-depends.patch |
36 |
+++ /dev/null |
37 |
@@ -1,11 +0,0 @@ |
38 |
---- build.xml.orig 2007-05-07 19:59:49.000000000 +0300 |
39 |
-+++ build.xml 2007-05-07 20:01:21.000000000 +0300 |
40 |
-@@ -291,7 +291,7 @@ |
41 |
- </if> |
42 |
- </target> |
43 |
- |
44 |
-- <target name="dist" depends="init, compile"> |
45 |
-+ <target name="dist" depends="init, compile-driver,compile.integration"> |
46 |
- |
47 |
- <delete file="${buildDir}/${fullProdName}-bin.jar" /> |
48 |
- <delete file="${distDir}/${fullProdName}.jar" /> |
49 |
|
50 |
diff --git a/dev-java/jdbc-mysql/files/5.0.5-remove-jboss-dependency-from-tests.patch b/dev-java/jdbc-mysql/files/5.0.5-remove-jboss-dependency-from-tests.patch |
51 |
deleted file mode 100644 |
52 |
index 394830701fe..00000000000 |
53 |
--- a/dev-java/jdbc-mysql/files/5.0.5-remove-jboss-dependency-from-tests.patch |
54 |
+++ /dev/null |
55 |
@@ -1,39 +0,0 @@ |
56 |
---- mysql-connector-java-5.0.5/src/testsuite/regression/DataSourceRegressionTest.java 2007-03-01 17:48:47.000000000 +0100 |
57 |
-+++ mysql-connector-java-5.0.5-no-jboss-test/src/testsuite/regression/DataSourceRegressionTest.java 2007-04-12 09:53:05.000000000 +0200 |
58 |
-@@ -52,7 +52,6 @@ |
59 |
- import testsuite.simple.DataSourceTest; |
60 |
- |
61 |
- import com.mysql.jdbc.NonRegisteringDriver; |
62 |
--import com.mysql.jdbc.integration.jboss.MysqlValidConnectionChecker; |
63 |
- import com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource; |
64 |
- import com.mysql.jdbc.jdbc2.optional.MysqlDataSource; |
65 |
- import com.mysql.jdbc.jdbc2.optional.MysqlDataSourceFactory; |
66 |
-@@ -315,28 +314,6 @@ |
67 |
- assertEquals(testIntFlag, thawedDs.getBlobSendChunkSize()); |
68 |
- } |
69 |
- |
70 |
-- /** |
71 |
-- * Tests fix for BUG#20242 - MysqlValidConnectionChecker for JBoss doesn't |
72 |
-- * work with MySQLXADataSources. |
73 |
-- * |
74 |
-- * @throws Exception if the test fails. |
75 |
-- */ |
76 |
-- public void testBug20242() throws Exception { |
77 |
-- if (versionMeetsMinimum(5, 0)) { |
78 |
-- try { |
79 |
-- Class.forName("org.jboss.resource.adapter.jdbc.ValidConnectionChecker"); |
80 |
-- } catch (Exception ex) { |
81 |
-- return; // class not available for testing |
82 |
-- } |
83 |
-- |
84 |
-- MysqlXADataSource xaDs = new MysqlXADataSource(); |
85 |
-- xaDs.setUrl(dbUrl); |
86 |
-- |
87 |
-- MysqlValidConnectionChecker checker = new MysqlValidConnectionChecker(); |
88 |
-- assertNull(checker.isValidConnection(xaDs.getXAConnection().getConnection())); |
89 |
-- } |
90 |
-- } |
91 |
-- |
92 |
- private void bindDataSource(String name, DataSource ds) throws Exception { |
93 |
- this.ctx.bind(this.tempDir.getAbsolutePath() + name, ds); |
94 |
- } |
95 |
|
96 |
diff --git a/dev-java/jdbc-mysql/files/5.1.14-java6.patch b/dev-java/jdbc-mysql/files/5.1.14-java6.patch |
97 |
deleted file mode 100644 |
98 |
index 49343706ad8..00000000000 |
99 |
--- a/dev-java/jdbc-mysql/files/5.1.14-java6.patch |
100 |
+++ /dev/null |
101 |
@@ -1,34 +0,0 @@ |
102 |
---- build.xml.orig 2010-01-20 19:45:30.000000000 +0100 |
103 |
-+++ build.xml 2010-02-13 00:34:30.000000000 +0100 |
104 |
-@@ -131,7 +131,7 @@ |
105 |
- </if> |
106 |
- </target> |
107 |
- |
108 |
-- <target name="init" depends="-compiler-check, -init-copy, -init-no-crypto"> |
109 |
-+ <target name="init" depends="-init-copy, -init-no-crypto"> |
110 |
- <!-- We need the following for source distributions as there we |
111 |
- can't dynamically alter the classpath, and not having this |
112 |
- directory present causes the build to fail --> |
113 |
-@@ -746,7 +746,8 @@ |
114 |
- <javac sourcepath="" srcdir="${buildDir}/${fullProdName}" |
115 |
- destdir="${compiler.output}" |
116 |
- deprecation="off" |
117 |
-- debug="${debug.enable}"> |
118 |
-+ debug="${debug.enable}" |
119 |
-+ bootclasspath="${gentoo.bootclasspath}"> |
120 |
- <include name="**/*.java" /> |
121 |
- <exclude name="testsuite/**" /> |
122 |
- <exclude name="com/mysql/jdbc/integration/**" /> |
123 |
-@@ -763,11 +764,7 @@ |
124 |
- <javac destdir="${compiler.output}" |
125 |
- deprecation="off" |
126 |
- debug="${debug.enable}" |
127 |
-- fork="yes" |
128 |
-- executable="${com.mysql.jdbc.java6.javac}" |
129 |
-- compiler="modern" |
130 |
-- sourcepath="" srcdir="${buildDir}/${fullProdName}" |
131 |
-- bootclasspath="${com.mysql.jdbc.java6.rtjar}"> |
132 |
-+ sourcepath="" srcdir="${buildDir}/${fullProdName}"> |
133 |
- <include name="**/JDBC4*.java" /> |
134 |
- <include name="com/mysql/jdbc/exceptions/jdbc4/*" /> |
135 |
- |
136 |
|
137 |
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild |
138 |
deleted file mode 100644 |
139 |
index 0080138b8de..00000000000 |
140 |
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild |
141 |
+++ /dev/null |
142 |
@@ -1,83 +0,0 @@ |
143 |
-# Copyright 1999-2021 Gentoo Authors |
144 |
-# Distributed under the terms of the GNU General Public License v2 |
145 |
- |
146 |
-EAPI="5" |
147 |
- |
148 |
-JAVA_PKG_IUSE="source" |
149 |
-JAVA_PKG_WANT_BOOTCLASSPATH="1.5" |
150 |
-WANT_ANT_TASKS="ant-contrib" |
151 |
- |
152 |
-inherit epatch java-pkg-2 java-ant-2 |
153 |
- |
154 |
-MY_PN="mysql-connector-java" |
155 |
-MY_P="${MY_PN}-${PV}" |
156 |
- |
157 |
-DESCRIPTION="MySQL JDBC driver" |
158 |
-HOMEPAGE="https://www.mysql.com/products/connector/j/" |
159 |
-SRC_URI="https://dev.mysql.com/get/Downloads/Connector-J/${MY_P}.tar.gz" |
160 |
- |
161 |
-LICENSE="GPL-2-with-MySQL-FLOSS-exception" |
162 |
-SLOT="0" |
163 |
-KEYWORDS="amd64 ppc64 x86" |
164 |
- |
165 |
-IUSE="c3p0 log4j" |
166 |
- |
167 |
-COMMON_DEP=" |
168 |
- dev-java/slf4j-api:0 |
169 |
- log4j? ( dev-java/log4j:0 ) |
170 |
- c3p0? ( dev-java/c3p0:0 )" |
171 |
- |
172 |
-RDEPEND=">=virtual/jre-1.6 |
173 |
- ${COMMON_DEP}" |
174 |
- |
175 |
-DEPEND=">=virtual/jdk-1.6 |
176 |
- ${COMMON_DEP}" |
177 |
- |
178 |
-S="${WORKDIR}/${MY_P}" |
179 |
- |
180 |
-java_prepare() { |
181 |
- epatch "${FILESDIR}/5.0.5-remove-jboss-dependency-from-tests.patch" |
182 |
- |
183 |
- # http://bugs.mysql.com/bug.php?id=28286 |
184 |
- epatch "${FILESDIR}/5.0.5-dist-target-depends.patch" |
185 |
- |
186 |
- # Use java6 for everything except jdbc3 - #283848 |
187 |
- epatch "${FILESDIR}/5.1.14-java6.patch" |
188 |
- |
189 |
- find . -name '*.jar' -print -delete || die |
190 |
- |
191 |
- cd src/lib |
192 |
- java-pkg_jar-from slf4j-api |
193 |
- use log4j && java-pkg_jar-from log4j |
194 |
- use c3p0 && java-pkg_jar-from c3p0 |
195 |
-} |
196 |
- |
197 |
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true" |
198 |
-EANT_BUILD_TARGET="dist" |
199 |
- |
200 |
-src_compile() { |
201 |
- # Cannot use rewrite-bootclasspath because of the jdbc4 part. |
202 |
- java-pkg-2_src_compile \ |
203 |
- -Dgentoo.bootclasspath="$(java-pkg_get-bootclasspath 1.5)" |
204 |
-} |
205 |
- |
206 |
-# Tests need a mysql DB to exist. |
207 |
-RESTRICT="test" |
208 |
- |
209 |
-src_test() { |
210 |
- cd src/lib |
211 |
- java-pkg_jar-from junit |
212 |
- |
213 |
- cd "${S}" |
214 |
- ANT_TASKS="ant-junit" eant test -Dcom.mysql.jdbc.noCleanBetweenCompiles=true |
215 |
-} |
216 |
- |
217 |
-src_install() { |
218 |
- # Skip bytecode check because we want two versions there |
219 |
- JAVA_PKG_STRICT= java-pkg_newjar build/${MY_P}-SNAPSHOT/${MY_P}-SNAPSHOT-bin.jar ${PN}.jar |
220 |
- |
221 |
- dodoc README CHANGES |
222 |
- dohtml docs/*.html |
223 |
- |
224 |
- use source && java-pkg_dosrc src/com src/org |
225 |
-} |
226 |
|
227 |
diff --git a/dev-java/jdbc-mysql/metadata.xml b/dev-java/jdbc-mysql/metadata.xml |
228 |
index a285c6ded94..952a4b9b605 100644 |
229 |
--- a/dev-java/jdbc-mysql/metadata.xml |
230 |
+++ b/dev-java/jdbc-mysql/metadata.xml |
231 |
@@ -1,12 +1,8 @@ |
232 |
<?xml version="1.0" encoding="UTF-8"?> |
233 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
234 |
<pkgmetadata> |
235 |
- <maintainer type="project"> |
236 |
- <email>java@g.o</email> |
237 |
- <name>Java</name> |
238 |
- </maintainer> |
239 |
- <use> |
240 |
- <flag name="c3p0">Enable c3p0 support</flag> |
241 |
- <flag name="log4j">Enable log4 support</flag> |
242 |
- </use> |
243 |
+ <maintainer type="project"> |
244 |
+ <email>java@g.o</email> |
245 |
+ <name>Java</name> |
246 |
+ </maintainer> |
247 |
</pkgmetadata> |