summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohann Schmitz <ercpe@gentoo.org>2014-07-08 08:21:21 +0000
committerJohann Schmitz <ercpe@gentoo.org>2014-07-08 08:21:21 +0000
commite3165dfd64cb144097bfda9bc87dffb5cbacb160 (patch)
tree8dabf66bde3e3b564b78bc0f5a3892edbdc742c7 /dev-java/annogen
parentFixed bug #514618, bumped 1.0 to EAPI=5 (diff)
downloadgentoo-2-e3165dfd64cb144097bfda9bc87dffb5cbacb160.tar.gz
gentoo-2-e3165dfd64cb144097bfda9bc87dffb5cbacb160.tar.bz2
gentoo-2-e3165dfd64cb144097bfda9bc87dffb5cbacb160.zip
Fixed dependency to qdox (bug #515972); minor qa things
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)
Diffstat (limited to 'dev-java/annogen')
-rw-r--r--dev-java/annogen/ChangeLog7
-rw-r--r--dev-java/annogen/annogen-0.1.0.ebuild14
2 files changed, 12 insertions, 9 deletions
diff --git a/dev-java/annogen/ChangeLog b/dev-java/annogen/ChangeLog
index c5ea042a05b9..c58b62db3c2a 100644
--- a/dev-java/annogen/ChangeLog
+++ b/dev-java/annogen/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/annogen
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/annogen/ChangeLog,v 1.1 2013/09/17 16:13:20 tomwij Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/annogen/ChangeLog,v 1.2 2014/07/08 08:21:21 ercpe Exp $
+
+ 08 Jul 2014; Johann Schmitz <ercpe@gentoo.org> annogen-0.1.0.ebuild:
+ Fixed dependency to qdox (bug #515972); minor qa things
*annogen-0.1.0 (17 Sep 2013)
diff --git a/dev-java/annogen/annogen-0.1.0.ebuild b/dev-java/annogen/annogen-0.1.0.ebuild
index 5f477935b98e..38f1def7d59c 100644
--- a/dev-java/annogen/annogen-0.1.0.ebuild
+++ b/dev-java/annogen/annogen-0.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/annogen/annogen-0.1.0.ebuild,v 1.1 2013/09/17 16:13:20 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/annogen/annogen-0.1.0.ebuild,v 1.2 2014/07/08 08:21:21 ercpe Exp $
EAPI="5"
@@ -19,7 +19,7 @@ KEYWORDS="~amd64"
CDEPEND="java-virtuals/stax-api:0
dev-java/ant-core:0
java-virtuals/jdk-with-com-sun:0
- >=dev-java/qdox-1.6"
+ >=dev-java/qdox-1.6:1.6"
RDEPEND=">=virtual/jdk-1.5
${CDEPEND}"
@@ -33,23 +33,23 @@ S="${WORKDIR}"
src_unpack() {
default
- unzip -o -q "${S}/${PN}-src-${PV}.zip"
+ unzip -o -q "${S}/${PN}-src-${PV}.zip" || die
}
java_prepare() {
- find -name '*.jar' -exec rm -v {} +
+ find -name '*.jar' -exec rm -v {} + || die
mkdir "${S}"/classes || die
}
src_compile() {
- find org -name "*.java" > "${T}/src.list"
+ find org -name "*.java" > "${T}/src.list" || die
ejavac -d "${S}"/classes \
-classpath $(java-pkg_getjars stax-api,qdox-1.6,ant-core):$(java-config --tools) \
"@${T}/src.list"
- cd "${S}"/classes
+ cd "${S}"/classes || die
jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
}