dev-java/jdbc-mysql: fixed bug #395321

Package-Manager: portage-2.1.10.43/cvs/Linux x86_64

4 files changed, 10 insertions, 95 deletions

diff --git a/dev-java/jdbc-mysql/ChangeLog b/dev-java/jdbc-mysql/ChangeLog
index 4e8d7245838b..d225f20aee5e 100644
--- a/dev-java/jdbc-mysql/ChangeLog
+++ b/dev-java/jdbc-mysql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jdbc-mysql
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.78 2011/03/24 19:25:42 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.79 2011/12/25 20:27:28 fordfrog Exp $
+
+  25 Dec 2011; Miroslav Šulc <fordfrog@gentoo.org> -jdbc-mysql-5.1.11.ebuild,
+  jdbc-mysql-5.1.14.ebuild:
+  Restricted compilation to JDK 1.6 because of JDBC incompatibility with JDK
+  1.7 (bug #395321). Also removed old version.
 
   24 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> jdbc-mysql-5.1.14.ebuild:
   ppc/ppc64 stable wrt #356803
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index 0c0a888a3d5c..bb174ae116e8 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -1,22 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 5.0.5-dist-target-depends.patch 380 RMD160 bfa3729e0797815cbcf5cd21617857b9e07212ef SHA1 30c4ac01f51b4af5f3d2e080ce227aa04771778b SHA256 42d4e0a8ac2217045116403bc34642aed78eb99210aa259a8dfd8663a2e5cc84
 AUX 5.0.5-remove-jboss-dependency-from-tests.patch 1541 RMD160 4e611f9b47fb4f1b9aa4617dcac6a9f1e05b6d46 SHA1 444af4911e25fce4207119b9dcd3c9cd627da404 SHA256 8c7cfb3116baafda7c708c8cad05b63e15ea5027ce7804b268f8b245e1e1a199
 AUX 5.1.11-java6.patch 1188 RMD160 15fedbb3e7737a3a7b0da8ffd90cec88cc908a16 SHA1 f698393ea828c57b0e906b7e8f86decbf836d7fe SHA256 69f6d028a489d5dda58286aa4488a24827f998300a04a8126fe78ec7ae163ada
 AUX 5.1.14-java6.patch 1301 RMD160 75a88ccd44f534bf7f945da714f4a2e4fc9b1f14 SHA1 07f24ea31d049bff73d511b63002e1bb05de07fa SHA256 ec8a6063e3bd9c6e37dc5be646b47dfe86c0bc819411d280b19645951f7b3376
-DIST mysql-connector-java-5.1.11.tar.gz 3735062 RMD160 53c048d215bee69f35d3f8335bd61328d734ff21 SHA1 0183a6b52cfdb935826590f667e5272f6fffe943 SHA256 ad1522b5d35cd3c599008c3e5f5297797def115c310c3b66b4a07eed8ace14a7
 DIST mysql-connector-java-5.1.14.tar.gz 3272153 RMD160 d0e39c7513868de82d0bc1d31324356900bf9583 SHA1 dce1a36d81996890e6e5551b459189c585335e2f SHA256 ca6f873a4da59cfe1f464ccee29672dc3bc56ef79cc6a1e9aefba2449c7a32d0
-EBUILD jdbc-mysql-5.1.11.ebuild 2060 RMD160 52616f702b8b1983064111bfbfad8c13831667b0 SHA1 a08b0489f7ff17c83acbf797131f392f95fba231 SHA256 7a12cd942beae28f39b7cb9b60b00216432652108d80f6b89d1c52a5481cae05
-EBUILD jdbc-mysql-5.1.14.ebuild 2082 RMD160 9b7fd0da173e242167b672d152134652e26d7b49 SHA1 1dd261ac3eeda8dd080e3c7ddeb2ee64aa65cfa8 SHA256 99c4c5449c582762ad343f8a06e961c205094c443617e235a9b497b1aecc2726
-MISC ChangeLog 14380 RMD160 7b8bdbfaa485d9ad06eeabff0f77ee046d787eb5 SHA1 e23a33fd3017b5815d27a0e8c93232f6a6bd7b73 SHA256 22d0445728a145427710fb5d676809fe5a400b532b8d806c88e496bb8cd4bd6a
+EBUILD jdbc-mysql-5.1.14.ebuild 2078 RMD160 3ffa77ad838820f8f9634ad12d233acd77189d89 SHA1 d3d0c64b86dda20707602ac90f1511dff38c6836 SHA256 9de6dbbbcba474218839d6ee9b019d7347f65a3cb0d04f9909a8e988633cdb91
+MISC ChangeLog 14610 RMD160 b82750194635b1799b27e01de12e4347f5298b4a SHA1 d812d55e15da60082a33aa63e18c639ea1ad21ef SHA256 5076c23f5a2f92e2f8a30dfbff996289dae6a97c163a509bdb20c7193b87c4a3
 MISC metadata.xml 275 RMD160 5f7d304e228469061c6cf78501f5dc993a3f8a06 SHA1 9ac7f996334ebfc5a6c4acfbaae8b3b28e69618e SHA256 66f7ef9181218b25bd6152f27a5e0e6699cfad8967bbf535da17c0caff9591d4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iJwEAQECAAYFAk2LmsAACgkQIiMqcbOVdxTbtQP/XYParj3i57A8AOTK0xtGZK/G
-+NqLHXXczXcDpNS/hoQFKEMaLjut9I1HLDN+beDqC55h3wvkMWk8Ejy8JX5eewn8
-mUmnXQ9euh2cspHtRSbBdM6bAwGrBA/Jgw8lbvdq7Kx+bKzea3UxV6/ovOyFiK29
-VuaIj9qSnP/wRWJah00=
-=REgM
------END PGP SIGNATURE-----
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.11.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.11.ebuild
deleted file mode 100644
index 4e1d4627cbb0..000000000000
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.11.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.11.ebuild,v 1.5 2010/10/14 16:49:04 ranger Exp $
-
-EAPI="2"
-
-JAVA_PKG_IUSE="source"
-JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
-WANT_ANT_TASKS="ant-contrib"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_PN="mysql-connector-java"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="MySQL JDBC driver"
-HOMEPAGE="http://www.mysql.com/products/connector/j/"
-SRC_URI="mirror://mysql/Downloads/Connector-J/${MY_P}.tar.gz"
-LICENSE="GPL-2-with-MySQL-FLOSS-exception"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="c3p0 log4j"
-COMMON_DEP="
-	log4j? ( dev-java/log4j )
-	c3p0? ( dev-java/c3p0 )
-	dev-java/commons-logging"
-RDEPEND=">=virtual/jre-1.6
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.6
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-	epatch "${FILESDIR}/5.0.5-remove-jboss-dependency-from-tests.patch"
-	# http://bugs.mysql.com/bug.php?id=28286
-	epatch "${FILESDIR}/5.0.5-dist-target-depends.patch"
-	# use java6 for everything except jdbc3 - #283848
-	epatch "${FILESDIR}/5.1.11-java6.patch"
-
-	rm -v *.jar || die
-
-	# use test && mkdir src/lib-nodist # needed, or ant will fail
-
-	cd src/lib
-	rm -v *.jar || die
-	java-pkg_jar-from commons-logging
-	use log4j && java-pkg_jar-from log4j
-	use c3p0 && java-pkg_jar-from c3p0
-}
-
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-EANT_BUILD_TARGET="dist"
-
-src_compile() {
-	# cannot use rewrite-bootclasspath because of the jdbc4 part
-	local bcp="$(java-pkg_get-bootclasspath 1.5)"
-	java-pkg-2_src_compile -Dgentoo.bootclasspath="${bcp}"
-}
-
-# Tests need a mysql DB to exist
-RESTRICT="test"
-src_test() {
-	cd src/lib
-	java-pkg_jar-from junit
-	cd "${S}"
-	ANT_TASKS="ant-junit" eant test -Dcom.mysql.jdbc.noCleanBetweenCompiles=true
-}
-
-src_install() {
-	# Skip bytecode check because we want two versions there
-	JAVA_PKG_STRICT= java-pkg_newjar build/${MY_P}/${MY_P}-bin.jar ${PN}.jar
-	dodoc README CHANGES || die
-	dohtml docs/*.html || die
-	use source && java-pkg_dosrc src/com src/org
-}
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild
index c8224dfec368..389ff13bd17b 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild,v 1.4 2011/03/24 19:25:42 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild,v 1.5 2011/12/25 20:27:28 fordfrog Exp $
 
 EAPI="2"
 
@@ -26,7 +26,7 @@ COMMON_DEP="
 	dev-java/commons-logging"
 RDEPEND=">=virtual/jre-1.6
 	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.6
+DEPEND="virtual/jdk:1.6
 	${COMMON_DEP}"
 
 S="${WORKDIR}/${MY_P}"