tomwij 14/05/30 11:46:09 Modified: jdbc-mysql-5.1.18.ebuild jdbc-mysql-5.1.14.ebuild jdbc-mysql-5.1.26.ebuild jdbc-mysql-5.1.23.ebuild ChangeLog Log: 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)
Revision Changes Path 1.4 dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild?r1=1.3&r2=1.4 Index: jdbc-mysql-5.1.18.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jdbc-mysql-5.1.18.ebuild 28 Sep 2012 13:14:09 -0000 1.3 +++ jdbc-mysql-5.1.18.ebuild 30 May 2014 11:46:09 -0000 1.4 @@ -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 @@ 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}" 1.6 dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild?r1=1.5&r2=1.6 Index: jdbc-mysql-5.1.14.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- jdbc-mysql-5.1.14.ebuild 25 Dec 2011 20:27:28 -0000 1.5 +++ jdbc-mysql-5.1.14.ebuild 30 May 2014 11:46:09 -0000 1.6 @@ -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 @@ 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}" 1.2 dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild?r1=1.1&r2=1.2 Index: jdbc-mysql-5.1.26.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jdbc-mysql-5.1.26.ebuild 14 Sep 2013 13:38:22 -0000 1.1 +++ jdbc-mysql-5.1.26.ebuild 30 May 2014 11:46:09 -0000 1.2 @@ -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 @@ RDEPEND=">=virtual/jre-1.6 ${COMMON_DEP}" -DEPEND="virtual/jdk:1.6 +DEPEND=">=virtual/jdk-1.6 ${COMMON_DEP}" S="${WORKDIR}/${MY_P}" 1.3 dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild?r1=1.2&r2=1.3 Index: jdbc-mysql-5.1.23.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.23.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jdbc-mysql-5.1.23.ebuild 14 Aug 2013 11:18:10 -0000 1.2 +++ jdbc-mysql-5.1.23.ebuild 30 May 2014 11:46:09 -0000 1.3 @@ -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 @@ RDEPEND=">=virtual/jre-1.6 ${COMMON_DEP}" -DEPEND="virtual/jdk:1.6 +DEPEND=">=virtual/jdk-1.6 ${COMMON_DEP}" S="${WORKDIR}/${MY_P}" 1.86 dev-java/jdbc-mysql/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-mysql/ChangeLog?rev=1.86&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-mysql/ChangeLog?rev=1.86&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-mysql/ChangeLog?r1=1.85&r2=1.86 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- ChangeLog 14 Sep 2013 13:38:22 -0000 1.85 +++ ChangeLog 30 May 2014 11:46:09 -0000 1.86 @@ -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 <tom...@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)