caster      09/11/03 20:14:34

  Modified:             ChangeLog
  Added:                jdbc-mysql-5.1.10.ebuild
  Removed:              jdbc-mysql-5.0.6.ebuild jdbc-mysql-3.1.13-r5.ebuild
  Log:
  Version bump, bug #290456. Remove old.
  (Portage version: 2.2_rc48/cvs/Linux x86_64)

Revision  Changes    Path
1.64                 dev-java/jdbc-mysql/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jdbc-mysql/ChangeLog?rev=1.64&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jdbc-mysql/ChangeLog?rev=1.64&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jdbc-mysql/ChangeLog?r1=1.63&r2=1.64

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ChangeLog	11 Sep 2009 22:07:27 -0000	1.63
+++ ChangeLog	3 Nov 2009 20:14:33 -0000	1.64
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/jdbc-mysql
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.63 2009/09/11 22:07:27 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.64 2009/11/03 20:14:33 caster Exp $
+
+*jdbc-mysql-5.1.10 (03 Nov 2009)
+
+  03 Nov 2009; Vlastimil Babka <caster@g.o>
+  -files/compile-without-log4j.patch, -jdbc-mysql-3.1.13-r5.ebuild,
+  -jdbc-mysql-5.0.6.ebuild, +jdbc-mysql-5.1.10.ebuild,
+  -files/no-testsuite.diff:
+  Version bump, bug #290456. Remove old.
 
   11 Sep 2009; Markus Meier <maekke@g.o> jdbc-mysql-5.1.6.ebuild:
   amd64/x86 stable, bug #284299



1.1                  dev-java/jdbc-mysql/jdbc-mysql-5.1.10.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.10.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.10.ebuild?rev=1.1&content-type=text/plain

Index: jdbc-mysql-5.1.10.ebuild
===================================================================
# Copyright 1999-2009 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.10.ebuild,v 1.1 2009/11/03 20:14:33 caster 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}"

JAVA_PKG_NV_DEPEND="
	|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )"

DEPEND="${JAVA_PKG_NV_DEPEND}
	>=virtual/jdk-1.6
	${COMMON_DEP}"

S="${WORKDIR}/${MY_P}"

src_unpack() {
	unpack ${A}
	cd "${S}"

	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"
	epatch "${FILESDIR}/5.1.6-java6-detection.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
}

# Needs two different source/targets
JAVA_PKG_BSFIX="off"
JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
EANT_BUILD_TARGET="dist"

src_compile() {
	local vm=$(depend-java-query -v ">=virtual/jdk-1.6")
	local javac=$(GENTOO_VM="${vm}" java-config --javac)
	local rt=$(GENTOO_VM="${vm}" java-config --jdk-home)/jre/lib/rt.jar
	einfo "Using ${vm} to compile the JDBC4 driver"
	einfo "javac: ${javac}"
	einfo "rt.jar: ${rt}"
	java-pkg-2_src_compile \
		-Dcom.mysql.jdbc.java6.javac="${javac}" \
		-Dcom.mysql.jdbc.java6.rtjar="${rt}"
}

# 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
}