From: | "Miroslav Sulc (fordfrog)" <fordfrog@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in dev-java/jdbc-mysql: ChangeLog jdbc-mysql-5.1.18.ebuild |
Date: | Sun, 25 Dec 2011 20:46:54 |
Message-Id: | 20111225204635.3DC092004B@flycatcher.gentoo.org |
1 | fordfrog 11/12/25 20:46:35 |
2 | |
3 | Modified: ChangeLog |
4 | Added: jdbc-mysql-5.1.18.ebuild |
5 | Log: |
6 | dev-java/jdbc-mysql: version bump |
7 | |
8 | (Portage version: 2.1.10.43/cvs/Linux x86_64) |
9 | |
10 | Revision Changes Path |
11 | 1.80 dev-java/jdbc-mysql/ChangeLog |
12 | |
13 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-mysql/ChangeLog?rev=1.80&view=markup |
14 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-mysql/ChangeLog?rev=1.80&content-type=text/plain |
15 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-mysql/ChangeLog?r1=1.79&r2=1.80 |
16 | |
17 | Index: ChangeLog |
18 | =================================================================== |
19 | RCS file: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v |
20 | retrieving revision 1.79 |
21 | retrieving revision 1.80 |
22 | diff -u -r1.79 -r1.80 |
23 | --- ChangeLog 25 Dec 2011 20:27:28 -0000 1.79 |
24 | +++ ChangeLog 25 Dec 2011 20:46:35 -0000 1.80 |
25 | @@ -1,6 +1,11 @@ |
26 | # ChangeLog for dev-java/jdbc-mysql |
27 | # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
28 | -# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.79 2011/12/25 20:27:28 fordfrog Exp $ |
29 | +# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/ChangeLog,v 1.80 2011/12/25 20:46:35 fordfrog Exp $ |
30 | + |
31 | +*jdbc-mysql-5.1.18 (25 Dec 2011) |
32 | + |
33 | + 25 Dec 2011; Miroslav Šulc <fordfrog@g.o> +jdbc-mysql-5.1.18.ebuild: |
34 | + Version bump |
35 | |
36 | 25 Dec 2011; Miroslav Šulc <fordfrog@g.o> -jdbc-mysql-5.1.11.ebuild, |
37 | jdbc-mysql-5.1.14.ebuild: |
38 | |
39 | |
40 | |
41 | 1.1 dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild |
42 | |
43 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild?rev=1.1&view=markup |
44 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.18.ebuild?rev=1.1&content-type=text/plain |
45 | |
46 | Index: jdbc-mysql-5.1.18.ebuild |
47 | =================================================================== |
48 | # Copyright 1999-2011 Gentoo Foundation |
49 | # Distributed under the terms of the GNU General Public License v2 |
50 | # $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 $ |
51 | |
52 | EAPI="2" |
53 | |
54 | JAVA_PKG_IUSE="source" |
55 | JAVA_PKG_WANT_BOOTCLASSPATH="1.5" |
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 | dev-java/slf4j-api:0 |
72 | log4j? ( dev-java/log4j ) |
73 | c3p0? ( dev-java/c3p0 )" |
74 | RDEPEND=">=virtual/jre-1.6 |
75 | ${COMMON_DEP}" |
76 | DEPEND="virtual/jdk:1.6 |
77 | ${COMMON_DEP}" |
78 | |
79 | S="${WORKDIR}/${MY_P}" |
80 | |
81 | java_prepare() { |
82 | epatch "${FILESDIR}/5.0.5-remove-jboss-dependency-from-tests.patch" |
83 | # http://bugs.mysql.com/bug.php?id=28286 |
84 | epatch "${FILESDIR}/5.0.5-dist-target-depends.patch" |
85 | # use java6 for everything except jdbc3 - #283848 |
86 | epatch "${FILESDIR}/5.1.14-java6.patch" |
87 | |
88 | rm -v *.jar || die |
89 | |
90 | # use test && mkdir src/lib-nodist # needed, or ant will fail |
91 | |
92 | cd src/lib |
93 | rm -v *.jar || die |
94 | java-pkg_jar-from slf4j-api |
95 | use log4j && java-pkg_jar-from log4j |
96 | use c3p0 && java-pkg_jar-from c3p0 |
97 | } |
98 | |
99 | JAVA_ANT_IGNORE_SYSTEM_CLASSES="true" |
100 | EANT_BUILD_TARGET="dist" |
101 | |
102 | src_compile() { |
103 | # cannot use rewrite-bootclasspath because of the jdbc4 part |
104 | local bcp="$(java-pkg_get-bootclasspath 1.5)" |
105 | java-pkg-2_src_compile -Dgentoo.bootclasspath="${bcp}" |
106 | } |
107 | |
108 | # Tests need a mysql DB to exist |
109 | RESTRICT="test" |
110 | src_test() { |
111 | cd src/lib |
112 | java-pkg_jar-from junit |
113 | cd "${S}" |
114 | ANT_TASKS="ant-junit" eant test -Dcom.mysql.jdbc.noCleanBetweenCompiles=true |
115 | } |
116 | |
117 | src_install() { |
118 | # Skip bytecode check because we want two versions there |
119 | JAVA_PKG_STRICT= java-pkg_newjar build/${MY_P}-SNAPSHOT/${MY_P}-SNAPSHOT-bin.jar ${PN}.jar |
120 | dodoc README CHANGES || die |
121 | dohtml docs/*.html || die |
122 | use source && java-pkg_dosrc src/com src/org |
123 | } |