Change DEPEND to >=virtual/jdk-1.6 for version 5.1.23 and 5.1.26; fixes bug #488268, reported by Dmitry Pak and a fix contributed by David Heidelberger (okias).

(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

5 files changed, 28 insertions, 12 deletions

diff --git a/dev-java/jdbc-mysql/ChangeLog b/dev-java/jdbc-mysql/ChangeLog
index 9d56f373db4b..aa3dfdca308f 100644
--- a/dev-java/jdbc-mysql/ChangeLog
+++ b/dev-java/jdbc-mysql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jdbc-mysql
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.85 2013/09/14 13:38:22 tomwij Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.86 2014/05/30 11:46:09 tomwij Exp $
+
+  30 May 2014; Tom Wijsman <TomWij@gentoo.org> jdbc-mysql-5.1.14.ebuild,
+  jdbc-mysql-5.1.18.ebuild, jdbc-mysql-5.1.23.ebuild, jdbc-mysql-5.1.26.ebuild:
+  Change DEPEND to >=virtual/jdk-1.6 for version 5.1.23 and 5.1.26; fixes bug
+  #488268, reported by Dmitry Pak and a fix contributed by David Heidelberger
+  (okias).
 
 *jdbc-mysql-5.1.26 (14 Sep 2013)
 
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 389ff13bd17b..155f5cc2e46e 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
+# Copyright 1999-2014 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.5 2011/12/25 20:27:28 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild,v 1.6 2014/05/30 11:46:09 tomwij Exp $
 
 EAPI="2"
 
@@ -16,16 +16,21 @@ 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}"
 
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild
index 175aaaaa6aec..2488dbe24fe0 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 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.18.ebuild,v 1.3 2012/09/28 13:14:09 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild,v 1.4 2014/05/30 11:46:09 tomwij Exp $
 
 EAPI="2"
 
@@ -16,16 +16,21 @@ 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}"
 
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild
index 494d83cbaa34..09e2baee81cf 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.2 2013/08/14 11:18:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild,v 1.3 2014/05/30 11:46:09 tomwij Exp $
 
 EAPI="5"
 
@@ -31,7 +31,7 @@ COMMON_DEP="
 RDEPEND=">=virtual/jre-1.6
 	${COMMON_DEP}"
 
-DEPEND="virtual/jdk:1.6
+DEPEND=">=virtual/jdk-1.6
 	${COMMON_DEP}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
index 2c10a6adbe70..2038aef46d7c 100644
--- a/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
+++ b/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.26.ebuild,v 1.1 2013/09/14 13:38:22 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild,v 1.2 2014/05/30 11:46:09 tomwij Exp $
 
 EAPI="5"
 
@@ -31,7 +31,7 @@ COMMON_DEP="
 RDEPEND=">=virtual/jre-1.6
 	${COMMON_DEP}"
 
-DEPEND="virtual/jdk:1.6
+DEPEND=">=virtual/jdk-1.6
 	${COMMON_DEP}"
 
 S="${WORKDIR}/${MY_P}"