[gentoo-commits] gentoo-x86 commit in dev-java/jdbc-mysql: ChangeLog jdbc-mysql-5.1.14.ebuild

[Miroslav Sulc (fordfrog)]

fordfrog    11/01/28 14:45:49

  Modified:             ChangeLog
  Added:                jdbc-mysql-5.1.14.ebuild
  Log:
  dev-java/jdbc-mysql
  
  (Portage version: 2.1.9.35/cvs/Linux x86_64)

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

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-mysql/ChangeLog?rev=1.75&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-mysql/ChangeLog?rev=1.75&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-mysql/ChangeLog?r1=1.74&r2=1.75

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- ChangeLog	17 Oct 2010 12:21:19 -0000	1.74
+++ ChangeLog	28 Jan 2011 14:45:49 -0000	1.75
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/jdbc-mysql
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.74 2010/10/17 12:21:19 caster Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.75 2011/01/28 14:45:49 fordfrog Exp $
+
+*jdbc-mysql-5.1.14 (28 Jan 2011)
+
+  28 Jan 2011; Miroslav Šulc <fordfrog@g.o> +files/5.1.14-java6.patch,
+  +jdbc-mysql-5.1.14.ebuild:
+  Version bump
 
   17 Oct 2010; Vlastimil Babka <caster@g.o> -jdbc-mysql-5.1.6.ebuild:
   Remove old.



1.1                  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.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.14.ebuild?rev=1.1&content-type=text/plain

Index: jdbc-mysql-5.1.14.ebuild
===================================================================
# Copyright 1999-2011 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.1 2011/01/28 14:45:49 fordfrog Exp $

EAPI="2"

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="
	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}"

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"

	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
}

JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
EANT_BUILD_TARGET="dist"

src_compile() {
	# cannot use rewrite-bootclasspath because of the jdbc4 part
	local bcp="$(java-pkg_get-bootclasspath 1.5)"
	java-pkg-2_src_compile -Dgentoo.bootclasspath="${bcp}"
}

# 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 || die
	dohtml docs/*.html || die
	use source && java-pkg_dosrc src/com src/org
}