diff options
author | Miroslav Šulc <fordfrog@gentoo.org> | 2011-12-25 20:46:35 +0000 |
---|---|---|
committer | Miroslav Šulc <fordfrog@gentoo.org> | 2011-12-25 20:46:35 +0000 |
commit | e4d61b1ca68d180e1ad8b5822e61afab1197f0e6 (patch) | |
tree | e58bb3d883dac5107e72a27f496263f51650afb8 /dev-java/jdbc-mysql | |
parent | dev-java/jdbc-mysql: fixed bug #395321 (diff) | |
download | gentoo-2-e4d61b1ca68d180e1ad8b5822e61afab1197f0e6.tar.gz gentoo-2-e4d61b1ca68d180e1ad8b5822e61afab1197f0e6.tar.bz2 gentoo-2-e4d61b1ca68d180e1ad8b5822e61afab1197f0e6.zip |
dev-java/jdbc-mysql: version bump
(Portage version: 2.1.10.43/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/jdbc-mysql')
-rw-r--r-- | dev-java/jdbc-mysql/ChangeLog | 7 | ||||
-rw-r--r-- | dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild | 76 |
2 files changed, 82 insertions, 1 deletions
diff --git a/dev-java/jdbc-mysql/ChangeLog b/dev-java/jdbc-mysql/ChangeLog index d225f20aee5e..ec0c3cc899c5 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-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.79 2011/12/25 20:27:28 fordfrog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.80 2011/12/25 20:46:35 fordfrog Exp $ + +*jdbc-mysql-5.1.18 (25 Dec 2011) + + 25 Dec 2011; Miroslav Šulc <fordfrog@gentoo.org> +jdbc-mysql-5.1.18.ebuild: + Version bump 25 Dec 2011; Miroslav Šulc <fordfrog@gentoo.org> -jdbc-mysql-5.1.11.ebuild, jdbc-mysql-5.1.14.ebuild: diff --git a/dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild b/dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild new file mode 100644 index 000000000000..25b85fc38e68 --- /dev/null +++ b/dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild @@ -0,0 +1,76 @@ +# 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.18.ebuild,v 1.1 2011/12/25 20:46:35 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=" + 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" + + 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 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 + 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 +} |