Fixed dependency to qdox (bug #515972); minor qa things

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x77C501ED

3 files changed, 22 insertions, 19 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/Manifest b/dev-java/annogen/Manifest
index 4129ec7c7034..f91ac2e68055 100644
--- a/dev-java/annogen/Manifest
+++ b/dev-java/annogen/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 DIST annogen-0.1.0.zip 1008931 SHA256 60cf2bed2bc90d366b2c8ad9f83cc4f4a8b205298bdf55c85fadcc4cd4e05246 SHA512 f5c4eeb92ef8c87874df6619ef701b99dace01bd3ebc87f201ee3ab523fe612b6d143da2646c280d4831bc8e3051887514aa06b8bad6928b68ddd6cd6357fa16 WHIRLPOOL 02c7bae1a7f06d6348bcf060c1e81896cc6e2861c2066323dd4a0716f8413321d8a4248040ab2b9924ca383022f06d66af79c408596ef19c002becbd9992e802
-EBUILD annogen-0.1.0.ebuild 1400 SHA256 107a08f88c7adf4adf09ae05ac50841fc1553fc9fce60475ae870e9cd4f42e7f SHA512 8beccb2aa88458c7457f4c7b19df6844703fdc29004214fae5da10949e2cd1a452e250fd09e17e92ca6783570d3301e32715d3164c2719b527e909d32096c06d WHIRLPOOL dab408f3db503b333e08b694d1a20dfe78da0a10ebfba12442baff50b238f4376b53e322ee0dd5b6e75cfcf2a734b2914c40f5ebe2ba3a0f3c65adcf3a249df9
-MISC ChangeLog 457 SHA256 455bcf40854db561137d69a7e3bc84bbe1f39c87e74c172b659dab5b7e27349d SHA512 723a44ea4fef5eded3df3c648c3705f018d7e6338e6300cb60381586eb441daf8b511fdb37ed47bf9d9c2b75efdc54f22a9f97427e53159820391820bd592345 WHIRLPOOL c6104e5605cbbf760f5458d38e72c02630eab756b7c0719289835236b5f11684a912d0cf4b9ff84382cb9f82141bf4372f4d2f061212bda3aef49e8926f62195
+EBUILD annogen-0.1.0.ebuild 1431 SHA256 70e14fe9c803c46f173736dbed55d8b9ef079df475bdd59ae88ed589b1cdc5b2 SHA512 a11958aa395b5b1be90c43325ada4bb0587bf15a61879c7f115b37c7ab355a407a824d1919576650c526c30562538d8e8edb9f2008cf4b503ab9271a566b1c87 WHIRLPOOL 8a90112927127e3e60a48d5a9b24b9b927de5f04138b61b08948770319195f221440f213339123a83188479a6cb3b5c0f9f66a4290c20138c4ab538e02da42aa
+MISC ChangeLog 586 SHA256 7a2c9b34edac39d354a16463b78ff15661366ec77d039dae43ca3f8025037049 SHA512 5ac99163ada954eca5ed7ab7a52f9ed613c5d73fa34c63c11f12688e34db3ed88613e6191a05d0c155058df5668b55b929f7bba16dfe4fc4f0e4ec8ae982050f WHIRLPOOL d27ac410b2545b43317e1f742f504a2ae63956fcd74852739080e1d32c97f70d17823f496d34ff1214ddc132eea033acf30a5c389daf5975da31ee53b8c829e4
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJSOH50AAoJEJWyH81tNOV9tO4H/0+Op2jFm5atLngECsAUL+HQ
-/wqqEGsXmAoeQpjURYKiycO0mS5F0Kbtur5BKqwclSnV0Vpfgdg3WMpcSu/eiy8T
-2IKWPgDhjZWDeORlASeVdlouOyCIcjyFHl1VnJuiysxSycg18W1HaQB0dwy++PiD
-rqWZtnNVXxD9/ewyWkkfKnW1zmFGeC/3jKbjoCv3iDSSwVRKAssEDXemmwSxkUQz
-EPsGLyHSKksGWqi1nRlVYM6UhDrzLXNfaIF+RxYfVseDtmDcmfjS6iROv6wMLOEs
-l6Lzro5O2JvVPQcGROVuuTK/FPu9jNWdacDYr3bBSsBwA7K7pQ7QGhpli1XIVOY=
-=V0RY
+iQEcBAEBCAAGBQJTu6oGAAoJEKCEBkJ3xQHt/8MIAIvduvALzBmLo4wWppfpGiBK
+w9+XHfKDUEpph1dR5hUzyL/k5bWisVK8zVCUWMB7eO3IWVQOw/uIh+/TYQ8/Q/U1
+swxNhmERYlEtYe8IjG2rfSvSOWO0fGMEwiYLEFbQRSubDiOrvd6GxnbI13n+V15G
+2DToS+AaGQGW/o/I1by+1RKVVpzP6MxZcbwtSm3K2IyRpOoY4D0RNXYSYBVFVbnA
+YKKpYkiawdGkPNslipUfgUhS9vtpG7Yq9oBAbiZG4D1PVo8uXoY4gupIWCHZ6tj6
+iIlqmm1lHZjThdMCwWFyaBFz6OKOefnw9jOcE6X6rbWry/oKh9bCN/VkgP93sU0=
+=qWCQ
 -----END PGP SIGNATURE-----
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"
 }