diff options
| author |   James Le Cuirot <chewi@gentoo.org> | 2015-07-25 14:45:41 +0000 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2015-07-25 14:45:41 +0000 |
| commit | 3c01e54075a70881663e30fd4dc1e910cf6f0d61 (patch) | |
| tree | dafaae5b594350e3877b7be076d9ea331a352f64 /dev-java/batik | |
| parent | Version bump. Fixes bug #555366. (diff) | |
| download | gentoo-2-3c01e54075a70881663e30fd4dc1e910cf6f0d61.tar.gz gentoo-2-3c01e54075a70881663e30fd4dc1e910cf6f0d61.tar.bz2 gentoo-2-3c01e54075a70881663e30fd4dc1e910cf6f0d61.zip | |
Add some missing dies. Closes bug #555870.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 9C6D7DE4)
Diffstat (limited to 'dev-java/batik')
| -rw-r--r-- | dev-java/batik/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/batik/batik-1.8-r1.ebuild | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/dev-java/batik/ChangeLog b/dev-java/batik/ChangeLog index 5a1d6d1a704f..9227631a6590 100644 --- a/dev-java/batik/ChangeLog +++ b/dev-java/batik/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/batik # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.86 2015/07/24 09:46:03 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.87 2015/07/25 14:45:41 chewi Exp $ + + 25 Jul 2015; James Le Cuirot <chewi@gentoo.org> batik-1.8-r1.ebuild: + Add some missing dies. Closes bug #555870. 24 Jul 2015; Patrice Clement <monsieurp@gentoo.org> batik-1.8-r1.ebuild: Suppress QA warning wrt a trailing whitespace. diff --git a/dev-java/batik/batik-1.8-r1.ebuild b/dev-java/batik/batik-1.8-r1.ebuild index fc9967f63ae4..071d94522005 100644 --- a/dev-java/batik/batik-1.8-r1.ebuild +++ b/dev-java/batik/batik-1.8-r1.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/batik/batik-1.8-r1.ebuild,v 1.5 2015/07/24 09:46:03 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8-r1.ebuild,v 1.6 2015/07/25 14:45:41 chewi Exp $ EAPI=5 JAVA_PKG_IUSE="doc" @@ -50,11 +50,11 @@ java_prepare() { imports+=(sources/org/apache/batik/script/jacl/JaclInterpreterFactory.java) for import in ${imports[@]}; do einfo "Fixing missing import in ${import}" - sed -i '23i import org.apache.batik.script.ImportInfo;' ${import} + sed -i '23i import org.apache.batik.script.ImportInfo;' ${import} || die eend $? done - cd lib + cd lib || die rm -v *.jar build/*.jar || die use python && java-pkg_jar-from jython use tcl && java-pkg_jar-from jacl @@ -76,7 +76,7 @@ src_compile() { # batik-all-1.8.jar is a all-in-one jar that contains all other jars. # We don't want to package it. - rm -v ${PN}-all-${PV}.jar + rm -v ${PN}-all-${PV}.jar || die } src_install() { |