Version bump to 5.1.23.

Package-Manager: portage-2.1.12.13/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 104 insertions, 11 deletions

diff --git a/dev-java/jdbc-mysql/ChangeLog b/dev-java/jdbc-mysql/ChangeLog
index 9a4dfcedc5f5..c4b3a3f97539 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.82 2012/09/28 13:14:09 johu Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.83 2013/07/16 14:17:32 tomwij Exp $
+
+*jdbc-mysql-5.1.23 (16 Jul 2013)
+
+  16 Jul 2013; Tom Wijsman <TomWij@gentoo.org> +jdbc-mysql-5.1.23.ebuild:
+  Version bump to 5.1.23.
 
   28 Sep 2012; Johannes Huber <johu@gentoo.org> jdbc-mysql-5.1.18.ebuild:
   Stable for x86, wrt bug #418713
diff --git a/dev-java/jdbc-mysql/Manifest b/dev-java/jdbc-mysql/Manifest
index d8e950b5bfdf..9127b0276f3a 100644
--- a/dev-java/jdbc-mysql/Manifest
+++ b/dev-java/jdbc-mysql/Manifest
@@ -7,18 +7,20 @@ AUX 5.1.11-java6.patch 1188 SHA256 69f6d028a489d5dda58286aa4488a24827f998300a04a
 AUX 5.1.14-java6.patch 1301 SHA256 ec8a6063e3bd9c6e37dc5be646b47dfe86c0bc819411d280b19645951f7b3376 SHA512 1b630781201478dee6da3d2322755ff87b2e2c9c1cd49a127bbcd56a0cc25e7bed06ed5f0758709c2e120fc85273755ee28c7ba21ac7b75e97ac6043216413a1 WHIRLPOOL 4f54f083bf388320eceeb5eaae0358b938804589aa20571f4741e3eaea59cc9f63000848616828603e6b234321d73f72627c09b8cdb8f315c751239a9d06957b
 DIST mysql-connector-java-5.1.14.tar.gz 3272153 SHA256 ca6f873a4da59cfe1f464ccee29672dc3bc56ef79cc6a1e9aefba2449c7a32d0 SHA512 42568335dce2e1dbce3e885dfbaafcba8456bf0bcdd9bcc3ec23f3c36af65d05b62968b56c0cda89f803e4d52f15effec8ae7ef40d16993ac542ae981991b6c6 WHIRLPOOL a9f4bb2ed433eb078208f0780ca4a1d76d4b0e83c0c8f46e73fb80a1a00789266904dc4121dab7d227c3fe5752032cbee14e3cd0502cfac9a6ad2e10071dc4d3
 DIST mysql-connector-java-5.1.18.tar.gz 3834947 SHA256 e67216a40fba486dbba9d93fca8e2d5bd6e434edb08f4b47b07e08f27555f414 SHA512 ec6ac3892c9df1abe26a93b5b60f0ca6350dc4e35f3ba9862754d30c1e4a2a5ecb51eda3b2d8cb32a1b1503a472de0ccedc579144de30cbc12a40264f4e8b90d WHIRLPOOL 3efcf5227ab8ce5d802f44458764d35a0705c89ff946902402c5e3e64a31bddd244f382622d9cecab18092df13e4da251894fc12a391f4cb53eddca29706e116
+DIST mysql-connector-java-5.1.23.tar.gz 3683852 SHA256 133e74bd7cd0cd5f20dd8d2a365f5fc0274693517b323a6faa960ff46e2c68dc SHA512 adeb464b52b4df717a81ceb0677901ce52e11d04b13f47c1f5312e1f4c45ab1be1a149acbbe147f73875330a0d5ed50265a1e5430657571d9223b39b34de6061 WHIRLPOOL 501b1558a4c6e1d07cc68e3d4764c4aba057436a46b075e30e852bca37db12570b8243744e58e81caaf02ac6ffed85d35cfa3b56823483ad6743037928dbdaad
 EBUILD jdbc-mysql-5.1.14.ebuild 2078 SHA256 9de6dbbbcba474218839d6ee9b019d7347f65a3cb0d04f9909a8e988633cdb91 SHA512 cd5d6e1ea1b10d03425d7a0f688efe20c5406411e114c07f42594eed46f7038258bead4a42f1f780cbbeb20fe13f83720044fe0e03a8f830e04bd0ae6f5d22ca WHIRLPOOL 100c10a8d6133289dc20a7547f2531d8c684aef6f4a70277c02db642590e03d36a8c24bcc101db847753797f193c808b713d6b5204db5a6a01cd03d20c21d90c
 EBUILD jdbc-mysql-5.1.18.ebuild 2066 SHA256 7a7f9f90c2ef9520a6f1dd227d47cef609d0e45eca4165581d2024ea8dbd38f0 SHA512 238f706bfe06567b42a1c114b84690bd74cce6350277cf4b6fd241e0cd064698237278931a3836e9e2e1f344a840f1646f95c011ccce0a043e1c97df8f58d88e WHIRLPOOL 5eadcbf7a462b3b291d5efd2b80f369e2b16e725173ee1c5f4fee65191d8366dcbb425a1878af67e3614940a9dc41324a90aedc5b54611414a86c819ab6e5c0d
-MISC ChangeLog 14956 SHA256 3ca5f5ee1c51a4dbc229bcb8ef1040d9807989d0423328c257225c82c70f1557 SHA512 955bd02a038b6bba5ca9f4bfb4620a9f43808f43a69bb010043aa0c1930ca0850fdd4bda1b5489f4f6f0067e1184a59f6ee08c8a56446a0693a22c73e74c72b2 WHIRLPOOL 02f904d10b20c52bc070b4cfcb467b204390f4a15b5b7937b440a531a7c2fdfadd43572a2b78f766dd4adf0c9f944d2f99ba8588b13945a0ba5bb89135c7a6d7
+EBUILD jdbc-mysql-5.1.23.ebuild 2058 SHA256 c474c823daa73b8cfe05fcb37ed5d823247adfcd5e59356847fb5fd925e35f27 SHA512 33017a7f1d52087137f82acd8f8ef2a41b203791f51de0a58dd04ec606945a9bc17679c039058557b6cdc4477bf4092df023f1a6a950b745f498d83cf64e0abf WHIRLPOOL 1b22df462521624500f443993958cb9f8a6b2c3d8ebf5d4d9f1bf74ac1606da0029156ccae82177d6b5f5b18900209adecebf659d45b1909f51147fa8ed12335
+MISC ChangeLog 15093 SHA256 9028160fe3d1ba741ffda0888bef936a4f1a942b41024e10251aad6233b1b1bf SHA512 f8ec361e8012407020da8b646181a39d8977b94fa987238359f491f251f710c591f016c41bdf0644c5719f4975519f7bd41e49f50364f44f34c118adcdfd8380 WHIRLPOOL 2a3d7ced43f9d3db5ad411e8018e726aa685466d14c0bff79a94d451ef12b4e6e51927be6b14c93b09cae11cd69bb4d21b6a1c0d5bf125761d8b5c8344ede030
 MISC metadata.xml 275 SHA256 66f7ef9181218b25bd6152f27a5e0e6699cfad8967bbf535da17c0caff9591d4 SHA512 6cfe64455de2349845f69e33129056d17e3598cc57947055043fe526554a6f5660cc2d28e28eea372d58a8db0fe5cb7520697dafc8f8be0ddca55ece474b9704 WHIRLPOOL 28b171077b7f315805c52bdd43771053fa493c4cff1d5affeb3505fd540c6a74296d5e061f681ee257b6c78d8f2406df3d15fdff42dd5ae53cf39d0db859fe40
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQZaRlAAoJEO+t9ga+3I3aCGIIAM9QxzuDycTuzxyrJLzdQu0y
-yRTf0NGkAptNi81boedOCGS5VTfhQbMDDpsW8pvUjnwLIXPmJx7j8Fm9AbS4vA5o
-EoGt/R4Qpw7V8LBTG2kZWMISMQSFZvtLhNmn/9i4iI/q1mRrhDGwHP387hEOG+Gq
-U+duRvZldPnojJBJOP5GXZCYJCnwlDx0OIa/0+/NZtMYmY6xiBRAVA2mEs64RArV
-qKJArVlfMHY3nw3uEyZ0MbInRvjke5eyYZxOBQLcvqzLtFR3aQWIT9Vjl2OQEcdZ
-vkw4q1xrlXGU6+LW52Rhw/AUgznBfgD+xOhHVHEEqVZaNv0IBjOFw5WfjDMVF64=
-=HiZW
+iQEcBAEBCAAGBQJR5VU4AAoJEJWyH81tNOV9vA0H/RZicli0WCh0wfru2X2HFUAI
+vQbbXj3z4yXjVvYiaahkrcqfCn4haSmbdMxze7XnGWaOczxee0TB7UgWNejKtO3f
+RFKA/KYFHWSMaWLHjsy5sy8sMLELGYbwuExDpecUg/uVfhy15dKmMFZSlN9hqh9I
+y5EWK8tWxYwDDZUbc4lWi2KCzZoOq93AY7k19lKy0HJgz552DTqauqvv8u1uDVgj
+j2yyshppp9dYHMJ2BanRtBs/29RYXuoMADAuJgLBgPNkNgX+HBdOUz84t2LzUlGL
+GJWBM3J9VNvTkgOLQho5IgyKDI5gtSYAoreE1YHFvbnQ/WinxXGy4SNix91RK4E=
+=JBBR
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild
new file mode 100644
index 000000000000..422a61804dd0
--- /dev/null
+++ b/dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2013 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.23.ebuild,v 1.1 2013/07/16 14:17:32 tomwij Exp $
+
+EAPI="5"
+
+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="
+	dev-java/slf4j-api:0
+	log4j? ( dev-java/log4j )
+	c3p0? ( dev-java/c3p0 )"
+
+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.14-java6.patch"
+
+	find . -name '*.jar' -print -delete || die
+
+	# use test && mkdir src/lib-nodist # needed, or ant will fail
+
+	cd src/lib
+	java-pkg_jar-from slf4j-api
+	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.
+	java-pkg-2_src_compile \
+		-Dgentoo.bootclasspath="$(java-pkg_get-bootclasspath 1.5)"
+}
+
+# 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}-SNAPSHOT/${MY_P}-SNAPSHOT-bin.jar ${PN}.jar
+
+	dodoc README CHANGES
+	dohtml docs/*.html
+	
+	use source && java-pkg_dosrc src/com src/org
+}