diff options
| author |   Patrice Clement <monsieurp@gentoo.org> | 2015-06-29 12:33:34 +0000 |
|---|---|---|
| committer | Patrice Clement <monsieurp@gentoo.org> | 2015-06-29 12:33:34 +0000 |
| commit | ddd992d271f4fdc7c68e9b6df6bbc0b4a621c4ff (patch) | |
| tree | 99bad731c539e745f60a13d7d64f32817be065ac /dev-java/fop | |
| parent | Fix compilation with gcc 5.1, bug #550716 (3.6 and later include the fix) (diff) | |
| download | gentoo-2-ddd992d271f4fdc7c68e9b6df6bbc0b4a621c4ff.tar.gz gentoo-2-ddd992d271f4fdc7c68e9b6df6bbc0b4a621c4ff.tar.bz2 gentoo-2-ddd992d271f4fdc7c68e9b6df6bbc0b4a621c4ff.zip | |
Set JAVA_ANT_ENCODING to ISO-8859-1. Fix bug 553494.
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)
Diffstat (limited to 'dev-java/fop')
| -rw-r--r-- | dev-java/fop/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/fop/fop-2.0.ebuild | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/dev-java/fop/ChangeLog b/dev-java/fop/ChangeLog index bdece72730bf..07c468fcece3 100644 --- a/dev-java/fop/ChangeLog +++ b/dev-java/fop/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/fop # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.81 2015/06/28 15:01:28 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.82 2015/06/29 12:33:34 monsieurp Exp $ + + 29 Jun 2015; Patrice Clement <monsieurp@gentoo.org> fop-2.0.ebuild: + Set JAVA_ANT_ENCODING to ISO-8859-1. Fix bug 553494. 28 Jun 2015; Patrice Clement <monsieurp@gentoo.org> fop-2.0.ebuild: Stable for ppc+ppc64 with ALLARCHES. diff --git a/dev-java/fop/fop-2.0.ebuild b/dev-java/fop/fop-2.0.ebuild index 668a501a54d5..065841f7d800 100644 --- a/dev-java/fop/fop-2.0.ebuild +++ b/dev-java/fop/fop-2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v 1.8 2015/06/28 15:01:28 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v 1.9 2015/06/29 12:33:34 monsieurp Exp $ # TODO: if 'doc' use flag is used then should build also extra docs ('docs' ant target), currently it cannot # be built as it needs forrest which we do not have @@ -23,7 +23,7 @@ SLOT="2" MY_P="${PN}-${SLOT}" -# Doesn't work with java.awt.headless, requires Mockito. +# Tests are broken even in 2.0 RESTRICT="test" CDEPEND=" @@ -36,13 +36,13 @@ CDEPEND=" dev-java/avalon-framework:4.2 dev-java/xmlgraphics-commons:2 dev-java/xml-commons-external:1.3 + dev-java/qdox:1.12 jai? ( dev-java/sun-jai-bin:0 )" RDEPEND=">=virtual/jre-1.6 ${CDEPEND}" DEPEND=">=virtual/jdk-1.6 - dev-java/qdox:1.12 hyphenation? ( dev-java/offo-hyphenation:0 ) app-arch/unzip ${CDEPEND} @@ -57,6 +57,7 @@ java_prepare() { find "${S}" -name '*.jar' -print -delete || die } +JAVA_ANT_ENCODING="ISO-8859-1" JAVA_ANT_REWRITE_CLASSPATH="true" EANT_DOC_TARGET="javadocs" EANT_BUILD_TARGET="package" @@ -105,10 +106,10 @@ src_test() { } src_install() { - java-pkg_dojar build/fop.jar build/fop-sandbox.jar + java-pkg_dojar build/${PN} build/${PN}-sandbox.jar if use hyphenation; then - java-pkg_dojar build/fop-hyph.jar + java-pkg_dojar build/${PN}-hyph.jar insinto /usr/share/${MY_P}/ doins -r hyph fi |