summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2010-01-10 10:12:42 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2010-01-10 10:12:42 +0000
commit5798d0536fce25cd57a5f4d487f3378efc315e7b (patch)
treeb1d88264bb48e29d21284acd988cf730a8d96d46 /dev-java/jdbc-jaybird
parentstable x86 (diff)
downloadhistorical-5798d0536fce25cd57a5f4d487f3378efc315e7b.tar.gz
historical-5798d0536fce25cd57a5f4d487f3378efc315e7b.tar.bz2
historical-5798d0536fce25cd57a5f4d487f3378efc315e7b.zip
Fix compiling with java6 and non ISO-8859-1 locales.
Package-Manager: portage-2.2_rc61/cvs/Linux i686
Diffstat (limited to 'dev-java/jdbc-jaybird')
-rw-r--r--dev-java/jdbc-jaybird/ChangeLog8
-rw-r--r--dev-java/jdbc-jaybird/Manifest14
-rw-r--r--dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild7
3 files changed, 23 insertions, 6 deletions
diff --git a/dev-java/jdbc-jaybird/ChangeLog b/dev-java/jdbc-jaybird/ChangeLog
index c277b559b83e..87684531c429 100644
--- a/dev-java/jdbc-jaybird/ChangeLog
+++ b/dev-java/jdbc-jaybird/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/jdbc-jaybird
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.30 2009/11/10 19:53:37 caster Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/ChangeLog,v 1.31 2010/01/10 10:12:42 betelgeuse Exp $
+
+ 10 Jan 2010; Petteri Räty <betelgeuse@gentoo.org>
+ jdbc-jaybird-2.1.5-r2.ebuild:
+ Fix compiling with java6 and non ISO-8859-1 locales.
10 Nov 2009; Vlastimil Babka <caster@gentoo.org>
-jdbc-jaybird-2.0.1.ebuild, -files/archive-xml-2.0.1.patch,
diff --git a/dev-java/jdbc-jaybird/Manifest b/dev-java/jdbc-jaybird/Manifest
index 7108f7bf2824..c88d5784f2fa 100644
--- a/dev-java/jdbc-jaybird/Manifest
+++ b/dev-java/jdbc-jaybird/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX archive-xml-2.1.0.patch 399 RMD160 b84c5992739ce8db698dbe6562e3cae2f8099d3c SHA1 5bdf1fef96ce163cc90a8c6836ac3c9fc9f33f14 SHA256 3e3e1f0d3bce0b6582a1ed7a5d14d55f8d51a6ef6a68a9ac4532d96323c6917a
AUX compile_xml-2.1.2.patch 892 RMD160 82f69ec15d1b1b13a9fc01ef14a956a368738f49 SHA1 2340cafff9e86bc6827a2749dcd367d5b16652d6 SHA256 dcf1f38895dbe194532ee4f10f47aa1736db50d9689bea6625328339cda24a97
DIST Jaybird-2.1.5-src.zip 6047595 RMD160 08cce25d28a265c04a040dda22f9a1da25fd68c4 SHA1 6ef99462fb9ee8a2820418875e360b0c2282b951 SHA256 3b475bca2cc5c3cbf6032c75ff2ea47d2e77abad18df36e149c1eaccfc15a868
EBUILD jdbc-jaybird-2.1.5-r1.ebuild 2664 RMD160 51b0ac14b2ef4906434838c5849332ac146e48f9 SHA1 67d67007b0cb67398a09b48da375aa67c5c1562b SHA256 49c406ec6f56c9effadb1c7a63eea577405cac282836afe3a410626860f0ff51
-EBUILD jdbc-jaybird-2.1.5-r2.ebuild 2933 RMD160 80c0a7cba5e7bf989f768e843c04b58738bc882c SHA1 2612c1243a8327db3c01022972fef896961c26fd SHA256 32945cc8b5d1cf24693d0f5b9bbb410abbe6d0f02d4cfbc266bacc1c68d0a97b
-MISC ChangeLog 6134 RMD160 913e033b6a4ded88f4d26a66059f34b50297a7e4 SHA1 f35c164eb06c68a323d387afcc0bf0207f63b171 SHA256 5ac902123c59a58c46aa099a354c99cb397bfb6dda15b2546389d5bcafd584cc
+EBUILD jdbc-jaybird-2.1.5-r2.ebuild 3078 RMD160 003f2c04d5c577ff7681a062d13157672b8786c3 SHA1 387bf0e8ed40a06babb3785b3d34c7ae1f43a6e3 SHA256 d6eec4f5af35e0d112af110803708359f0249f8c435ff91cccacdbf5b5be73e8
+MISC ChangeLog 6279 RMD160 419edbbeda435238ee63ce97ab0e916ec5476147 SHA1 a417a7c0abe2704915e8fbd61f1140ba849c04f8 SHA256 2cea5c1fad5a8fc6e08ebc8996dd5fcb93cddfdf0fc140947426fdaa6605b9c1
MISC metadata.xml 414 RMD160 a7cdce874ba139f5314bcb45cf8393cc3fc01eb6 SHA1 162a57f24ec42e9204e70841d1a20a24ab8cdfc1 SHA256 d3635c61fd3bc2e887561ab219c5cf0ab20a8e9a6ca0f27d104585f1db3319a4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktJqCQACgkQcxLzpIGCsLQDzACeI2w9EGb6iTbijWbjmcys7bAY
+4ygAnjqEH5FSTaOVHll2GmlTE106+9Fh
+=86zN
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild
index c3a58c7f1262..68c6616bcd3d 100644
--- a/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild
+++ b/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild,v 1.1 2009/11/01 20:35:22 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-jaybird/jdbc-jaybird-2.1.5-r2.ebuild,v 1.2 2010/01/10 10:12:42 betelgeuse Exp $
JAVA_PKG_IUSE="doc source examples test"
@@ -41,6 +41,9 @@ src_unpack() {
epatch "${FILESDIR}/archive-xml-2.1.0.patch"
epatch "${FILESDIR}/compile_xml-2.1.2.patch"
+ # JAVA_ANT_ENCODING doesn't work because it doesn't like entities
+ java-ant_xml-rewrite -f build.xml -c -e javac -a encoding -v ISO-8859-1
+
cd "${S}/lib/"
rm -v *.jar
use test && java-pkg_jar-from --build-only junit junit.jar