| 1 |
caster 09/11/03 20:14:34 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: jdbc-mysql-5.1.10.ebuild |
| 5 |
Removed: jdbc-mysql-5.0.6.ebuild jdbc-mysql-3.1.13-r5.ebuild |
| 6 |
Log: |
| 7 |
Version bump, bug #290456. Remove old. |
| 8 |
(Portage version: 2.2_rc48/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.64 dev-java/jdbc-mysql/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jdbc-mysql/ChangeLog?rev=1.64&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jdbc-mysql/ChangeLog?rev=1.64&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jdbc-mysql/ChangeLog?r1=1.63&r2=1.64 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v |
| 20 |
retrieving revision 1.63 |
| 21 |
retrieving revision 1.64 |
| 22 |
diff -u -r1.63 -r1.64 |
| 23 |
--- ChangeLog 11 Sep 2009 22:07:27 -0000 1.63 |
| 24 |
+++ ChangeLog 3 Nov 2009 20:14:33 -0000 1.64 |
| 25 |
@@ -1,6 +1,14 @@ |
| 26 |
# ChangeLog for dev-java/jdbc-mysql |
| 27 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.63 2009/09/11 22:07:27 maekke Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.64 2009/11/03 20:14:33 caster Exp $ |
| 30 |
+ |
| 31 |
+*jdbc-mysql-5.1.10 (03 Nov 2009) |
| 32 |
+ |
| 33 |
+ 03 Nov 2009; Vlastimil Babka <caster@g.o> |
| 34 |
+ -files/compile-without-log4j.patch, -jdbc-mysql-3.1.13-r5.ebuild, |
| 35 |
+ -jdbc-mysql-5.0.6.ebuild, +jdbc-mysql-5.1.10.ebuild, |
| 36 |
+ -files/no-testsuite.diff: |
| 37 |
+ Version bump, bug #290456. Remove old. |
| 38 |
|
| 39 |
11 Sep 2009; Markus Meier <maekke@g.o> jdbc-mysql-5.1.6.ebuild: |
| 40 |
amd64/x86 stable, bug #284299 |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.1 dev-java/jdbc-mysql/jdbc-mysql-5.1.10.ebuild |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.10.ebuild?rev=1.1&view=markup |
| 47 |
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 |
| 48 |
|
| 49 |
Index: jdbc-mysql-5.1.10.ebuild |
| 50 |
=================================================================== |
| 51 |
# Copyright 1999-2009 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
# $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 $ |
| 54 |
|
| 55 |
JAVA_PKG_IUSE="source" |
| 56 |
WANT_ANT_TASKS="ant-contrib" |
| 57 |
|
| 58 |
inherit eutils java-pkg-2 java-ant-2 |
| 59 |
|
| 60 |
MY_PN="mysql-connector-java" |
| 61 |
MY_P="${MY_PN}-${PV}" |
| 62 |
|
| 63 |
DESCRIPTION="MySQL JDBC driver" |
| 64 |
HOMEPAGE="http://www.mysql.com/products/connector/j/" |
| 65 |
SRC_URI="mirror://mysql/Downloads/Connector-J/${MY_P}.tar.gz" |
| 66 |
LICENSE="GPL-2-with-MySQL-FLOSS-exception" |
| 67 |
SLOT="0" |
| 68 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
| 69 |
IUSE="c3p0 log4j" |
| 70 |
COMMON_DEP=" |
| 71 |
log4j? ( dev-java/log4j ) |
| 72 |
c3p0? ( dev-java/c3p0 ) |
| 73 |
dev-java/commons-logging" |
| 74 |
RDEPEND=">=virtual/jre-1.4 |
| 75 |
${COMMON_DEP}" |
| 76 |
|
| 77 |
JAVA_PKG_NV_DEPEND=" |
| 78 |
|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )" |
| 79 |
|
| 80 |
DEPEND="${JAVA_PKG_NV_DEPEND} |
| 81 |
>=virtual/jdk-1.6 |
| 82 |
${COMMON_DEP}" |
| 83 |
|
| 84 |
S="${WORKDIR}/${MY_P}" |
| 85 |
|
| 86 |
src_unpack() { |
| 87 |
unpack ${A} |
| 88 |
cd "${S}" |
| 89 |
|
| 90 |
epatch "${FILESDIR}/5.0.5-remove-jboss-dependency-from-tests.patch" |
| 91 |
# http://bugs.mysql.com/bug.php?id=28286 |
| 92 |
epatch "${FILESDIR}/5.0.5-dist-target-depends.patch" |
| 93 |
epatch "${FILESDIR}/5.1.6-java6-detection.patch" |
| 94 |
|
| 95 |
rm -v *.jar || die |
| 96 |
|
| 97 |
# use test && mkdir src/lib-nodist # needed, or ant will fail |
| 98 |
|
| 99 |
cd src/lib |
| 100 |
rm -v *.jar || die |
| 101 |
java-pkg_jar-from commons-logging |
| 102 |
use log4j && java-pkg_jar-from log4j |
| 103 |
use c3p0 && java-pkg_jar-from c3p0 |
| 104 |
} |
| 105 |
|
| 106 |
# Needs two different source/targets |
| 107 |
JAVA_PKG_BSFIX="off" |
| 108 |
JAVA_ANT_IGNORE_SYSTEM_CLASSES="true" |
| 109 |
EANT_BUILD_TARGET="dist" |
| 110 |
|
| 111 |
src_compile() { |
| 112 |
local vm=$(depend-java-query -v ">=virtual/jdk-1.6") |
| 113 |
local javac=$(GENTOO_VM="${vm}" java-config --javac) |
| 114 |
local rt=$(GENTOO_VM="${vm}" java-config --jdk-home)/jre/lib/rt.jar |
| 115 |
einfo "Using ${vm} to compile the JDBC4 driver" |
| 116 |
einfo "javac: ${javac}" |
| 117 |
einfo "rt.jar: ${rt}" |
| 118 |
java-pkg-2_src_compile \ |
| 119 |
-Dcom.mysql.jdbc.java6.javac="${javac}" \ |
| 120 |
-Dcom.mysql.jdbc.java6.rtjar="${rt}" |
| 121 |
} |
| 122 |
|
| 123 |
# Tests need a mysql DB to exist |
| 124 |
RESTRICT="test" |
| 125 |
src_test() { |
| 126 |
cd src/lib |
| 127 |
java-pkg_jar-from junit |
| 128 |
cd "${S}" |
| 129 |
ANT_TASKS="ant-junit" eant test -Dcom.mysql.jdbc.noCleanBetweenCompiles=true |
| 130 |
} |
| 131 |
|
| 132 |
src_install() { |
| 133 |
# Skip bytecode check because we want two versions there |
| 134 |
JAVA_PKG_STRICT= java-pkg_newjar build/${MY_P}/${MY_P}-bin.jar ${PN}.jar |
| 135 |
dodoc README CHANGES || die |
| 136 |
dohtml docs/*.html || die |
| 137 |
use source && java-pkg_dosrc src/com src/org |
| 138 |
} |
Archives