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
commit79cd4791d2a45e73b5d75089468600ad190af270 (patch)
tree133d881d5ed3281b035818f9bcbc74643b58b4fa /dev-java/jdbc-jaybird
parentstable x86 (diff)
downloadgentoo-2-79cd4791d2a45e73b5d75089468600ad190af270.tar.gz
gentoo-2-79cd4791d2a45e73b5d75089468600ad190af270.tar.bz2
gentoo-2-79cd4791d2a45e73b5d75089468600ad190af270.zip
Fix compiling with java6 and non ISO-8859-1 locales.
(Portage version: 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/jdbc-jaybird-2.1.5-r2.ebuild7
2 files changed, 11 insertions, 4 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/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