Version bump.

Package-Manager: portage-2.1.2.7

4 files changed, 99 insertions, 8 deletions

diff --git a/dev-java/jdbc-mysql/ChangeLog b/dev-java/jdbc-mysql/ChangeLog
index f72c331fa6f3..32e5a9667621 100644
--- a/dev-java/jdbc-mysql/ChangeLog
+++ b/dev-java/jdbc-mysql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jdbc-mysql
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.43 2007/05/09 16:07:56 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.44 2007/05/18 09:16:26 betelgeuse Exp $
+
+*jdbc-mysql-5.0.6 (18 May 2007)
+
+  18 May 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +jdbc-mysql-5.0.6.ebuild:
+  Version bump.
 
   09 May 2007; Petteri Räty <betelgeuse@gentoo.org>
   jdbc-mysql-5.0.5.ebuild:
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index 8d9374deb32d..ff7603074410 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -24,6 +24,7 @@ SHA256 7b99f9dfc9a4fc62edaded34ca0603f830c30dd752d1ffb7b804b3f8b6af207d files/no
 DIST mysql-connector-java-3.1.10.tar.gz 6892037 RMD160 30b54059ad0b5301a8fc4836d9ae1fb0a04fb6c4 SHA1 d9e573e5c2e9f1344e7765c4085ef426c4fcf09c SHA256 41ae162e8dd5a66b20cf3283d9a6d8d638acce0529783c99713e40d6bf7e8a87
 DIST mysql-connector-java-3.1.13.tar.gz 10454933 RMD160 2316969d32ce5944e4a6dc682fc29a2cf9129cf2 SHA1 09a0da29bc28b3cf0b1a78d0b3720ffdbb63073d SHA256 afa911e3999d10777fd4fb8b19c7af1330c04c927bd6fda859cd7623eb05713f
 DIST mysql-connector-java-5.0.5.tar.gz 8465846 RMD160 f96925af13a04cb82970f9a7b779bbde6ead64e2 SHA1 6feeb52816978db678cb31b6079e465584d00d23 SHA256 39ebd9423db4fa20bb7165acaf02c745f9d93ec1c5c7b693ebc26c3445f6a692
+DIST mysql-connector-java-5.0.6.tar.gz 8555883 RMD160 13aa2c228f0ffe9a44dc7089f43e128f34179f3c SHA1 336b4e86fc8d4a58d44270f400506dd03f6a4d85 SHA256 96d8dc7d0081f09a4e2c70886114acffad5aafdd3f00acb80cec36475abc91b3
 EBUILD jdbc-mysql-3.1.10.ebuild 1225 RMD160 89013894bdc54460147cec148505d2a12c06dbf1 SHA1 212461f42849e22f793ed89e3fd2d7f19f45ef0f SHA256 30eb116dd8a8da4a0a5bf135b3f1c5a40b51f080ef5ea2f9a10b22925b5f6818
 MD5 ca4ddc0de46174a7b16011720bed22d6 jdbc-mysql-3.1.10.ebuild 1225
 RMD160 89013894bdc54460147cec148505d2a12c06dbf1 jdbc-mysql-3.1.10.ebuild 1225
@@ -40,10 +41,14 @@ EBUILD jdbc-mysql-5.0.5.ebuild 1856 RMD160 0052fa30100656382cf6d68e658b9a72d22ac
 MD5 979ae13d53e42b0f17555b9f67417ceb jdbc-mysql-5.0.5.ebuild 1856
 RMD160 0052fa30100656382cf6d68e658b9a72d22acb13 jdbc-mysql-5.0.5.ebuild 1856
 SHA256 9be7f82f6758908a39176ffe196d6dc8a0744c719c94a33e2cca3e2f926fda29 jdbc-mysql-5.0.5.ebuild 1856
-MISC ChangeLog 9617 RMD160 26864a0587f49247e689136d4fbffece276bd29f SHA1 de972619a241bb3955252e2f0813fe90ec4da3ea SHA256 f7edce6db9ecb55f6f33755f395819afb82d08ebcbcf0518d9b68b69216a6791
-MD5 de52a376a7a74b2cadf106097261281b ChangeLog 9617
-RMD160 26864a0587f49247e689136d4fbffece276bd29f ChangeLog 9617
-SHA256 f7edce6db9ecb55f6f33755f395819afb82d08ebcbcf0518d9b68b69216a6791 ChangeLog 9617
+EBUILD jdbc-mysql-5.0.6.ebuild 1883 RMD160 3f22efa49c410b7f99be815461f76d3a68d5c3cc SHA1 e5776d08f7d762f475e69c833f8a84d4b5e66771 SHA256 9b166153df0f0e3dba28b380fe2fde7b153ec6bd92cb03f897d5300806702ee7
+MD5 8e12ed4f821b00b643d12c66ad906c01 jdbc-mysql-5.0.6.ebuild 1883
+RMD160 3f22efa49c410b7f99be815461f76d3a68d5c3cc jdbc-mysql-5.0.6.ebuild 1883
+SHA256 9b166153df0f0e3dba28b380fe2fde7b153ec6bd92cb03f897d5300806702ee7 jdbc-mysql-5.0.6.ebuild 1883
+MISC ChangeLog 9748 RMD160 68e64b6687725bf015e5c1a9f4ced4afbde0ac23 SHA1 876cba19356da1a5ea0c6247286536f0a58919ef SHA256 22e5d747372e8cf10430f6a0bda5723214221dc8e2f81384dbe3f51ab422764f
+MD5 4b0a79651369ad274acf0dbe81e0fad0 ChangeLog 9748
+RMD160 68e64b6687725bf015e5c1a9f4ced4afbde0ac23 ChangeLog 9748
+SHA256 22e5d747372e8cf10430f6a0bda5723214221dc8e2f81384dbe3f51ab422764f ChangeLog 9748
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -60,10 +65,13 @@ SHA256 850860f6a1f74e05c1555e65c965457866701d83ecfa9a0733f7b1041769ccb2 files/di
 MD5 d12ac900da33cef0d279dd93b07f6604 files/digest-jdbc-mysql-5.0.5 283
 RMD160 06404292bfcd915b05975c6dcec83c0ebe923561 files/digest-jdbc-mysql-5.0.5 283
 SHA256 694ff597b2fe0c1065c0f2063df10bdbf2823db29236a597af07ce069c1a4ba4 files/digest-jdbc-mysql-5.0.5 283
+MD5 d2ff5b12e0e51eab4f41ae0a09b46d62 files/digest-jdbc-mysql-5.0.6 283
+RMD160 21f105efc5963b17a07c36ab0a8298eba1e756bc files/digest-jdbc-mysql-5.0.6 283
+SHA256 03e0d5790732169f67d565df1beeff7d8d1353a2e7b2ce261754999b610c5c38 files/digest-jdbc-mysql-5.0.6 283
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGQfHfcxLzpIGCsLQRAnYyAJwM5rynbvWYW1wFS8J5BtsZVCRl3QCgkmgF
-21sjIQNiWvgwN9OYnYdlQJw=
-=IZ4G
+iD8DBQFGTW7zcxLzpIGCsLQRAgagAJ9CDIUEYz7wsnDxnfS2LqMeSyZhCwCfckmV
+Pr7anOSgP9sNzis+djGHXxc=
+=WFfA
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jdbc-mysql/files/digest-jdbc-mysql-5.0.6 b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-5.0.6
new file mode 100644
index 000000000000..c6fbf0b646d5
--- /dev/null
+++ b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-5.0.6
@@ -0,0 +1,3 @@
+MD5 060cd1ac485d9cc544dd7334d47ff67d mysql-connector-java-5.0.6.tar.gz 8555883
+RMD160 13aa2c228f0ffe9a44dc7089f43e128f34179f3c mysql-connector-java-5.0.6.tar.gz 8555883
+SHA256 96d8dc7d0081f09a4e2c70886114acffad5aafdd3f00acb80cec36475abc91b3 mysql-connector-java-5.0.6.tar.gz 8555883
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.0.6.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.0.6.ebuild
new file mode 100644
index 000000000000..3e0d50e1885c
--- /dev/null
+++ b/dev-java/jdbc-mysql/jdbc-mysql-5.0.6.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2007 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.0.6.ebuild,v 1.1 2007/05/18 09:16:26 betelgeuse Exp $
+
+JAVA_PKG_IUSE="source"
+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.4
+	${COMMON_DEP}"
+# FIXME doesn't like Java 1.6's JDBC API
+DEPEND="|| (
+		=virtual/jdk-1.5*
+		=virtual/jdk-1.4*
+	)
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# gcj hangs, but works for others -> why regexp over pictures?!
+	epatch "${FILESDIR}/do-not-filter-png.diff"
+	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"
+
+	rm -v *.jar debug/*.jar || die
+
+	java-ant_ignore-system-classes
+
+	# 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
+}
+
+EANT_BUILD_TARGET="dist"
+
+# 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() {
+	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
+}