summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalph Sennhauser <sera@gentoo.org>2012-05-27 21:26:45 +0000
committerRalph Sennhauser <sera@gentoo.org>2012-05-27 21:26:45 +0000
commit3682001a6a5ca3c310999c2114e6233f3431d9bf (patch)
treeb46a6eb2256cd6576be82a95dc994a32c91d8e6e
parentadd patch to work around libpcre changes submitted by Robert Varga via bug #4... (diff)
downloadhistorical-3682001a6a5ca3c310999c2114e6233f3431d9bf.tar.gz
historical-3682001a6a5ca3c310999c2114e6233f3431d9bf.tar.bz2
historical-3682001a6a5ca3c310999c2114e6233f3431d9bf.zip
Add missing jdk dep for jar command.
Package-Manager: portage-2.1.10.62/cvs/Linux x86_64
-rw-r--r--dev-java/ant-nodeps/ChangeLog5
-rw-r--r--dev-java/ant-nodeps/Manifest20
-rw-r--r--dev-java/ant-nodeps/ant-nodeps-1.8.2.ebuild6
3 files changed, 17 insertions, 14 deletions
diff --git a/dev-java/ant-nodeps/ChangeLog b/dev-java/ant-nodeps/ChangeLog
index b6b8af32944b..75f9ac82299a 100644
--- a/dev-java/ant-nodeps/ChangeLog
+++ b/dev-java/ant-nodeps/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/ant-nodeps
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-nodeps/ChangeLog,v 1.33 2012/05/25 11:21:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-nodeps/ChangeLog,v 1.34 2012/05/27 21:26:45 sera Exp $
+
+ 27 May 2012; Ralph Sennhauser <sera@gentoo.org> ant-nodeps-1.8.2.ebuild:
+ Add missing jdk dep for jar command.
25 May 2012; Agostino Sarubbo <ago@gentoo.org> ant-nodeps-1.8.2.ebuild:
Stable for amd64, wrt bug #417403
diff --git a/dev-java/ant-nodeps/Manifest b/dev-java/ant-nodeps/Manifest
index 29a183bb0233..358ab3f7c32a 100644
--- a/dev-java/ant-nodeps/Manifest
+++ b/dev-java/ant-nodeps/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
DIST ant-1.7.1-gentoo.tar.bz2 11836 RMD160 9194996b5b04113d2a6542221890e1ef3f7953d0 SHA1 ef848268ec2b7ecd9aca2f8a3d6705ec8386a621 SHA256 4bacd711cc4981272b8377335dafcb8841dd1fac177c0c349f3faf78b0354fe5
DIST ant-1.8.0-gentoo.tar.bz2 13993 RMD160 7cb9e22b7d6a5648e00ba8954fb8ffe61a02f0f4 SHA1 85b3187e80ee8e96aaf3bfb756ce00c2da6eaaba SHA256 12edd6ccfe9f4add90024e82ba1fc6dda141a04d97d800b860347c3d21007acb
@@ -12,17 +12,17 @@ DIST apache-ant-1.8.2-src.tar.bz2 5894278 RMD160 8115770a940415637fc41aceb91dd29
EBUILD ant-nodeps-1.7.1.ebuild 649 RMD160 baaf02f3e767d192f1d4ee7ecf4a922a13bb7184 SHA1 d8bfd3efe67a60e07758e97d9e3c5e93cf27eec6 SHA256 66a8d521d12c6cfa1c4505fbcbc09c4225052f9db43a5213dfae0dd1470b8e5d
EBUILD ant-nodeps-1.8.0.ebuild 805 RMD160 30e701ca12605fecfda32e0789ab07736fce8296 SHA1 7cbdbf5e007883d29954edb19ba6f5e1f9a836c3 SHA256 ccf6121cf7bc2b1328c741466d95632e538bd776d79bff4acf7dfab365e8dd28
EBUILD ant-nodeps-1.8.1.ebuild 825 RMD160 a2d38346f8df762f1bb626484cc5b7e1ab435457 SHA1 6c15c3b02624ae960962921837eb56cca3234936 SHA256 7770a2221e4dda686395e5bf1f14c5bde526d6153c05b9ee01680b7a7125087c
-EBUILD ant-nodeps-1.8.2.ebuild 1166 RMD160 a6629d41e19522662c8b06489a657658b156cd90 SHA1 2b7b83da4c882d501bdc6d11cb4d855b4d41097e SHA256 5a24965ad7ece83511dfe6cd5f1cd6f3e4c22a43400a4e266ed12ecd2a967046
-MISC ChangeLog 3883 RMD160 38a8df7362bde326b6aa8c979140f5b406260ee9 SHA1 0779c6f958bba931d91d20a0370df041fa7e7ec3 SHA256 adecbb5e5b817c1a8d9222d36508f70af5bbb6be6dd062f9799c660aa9c03b94
+EBUILD ant-nodeps-1.8.2.ebuild 1196 RMD160 15c99739cdee28df678a6e41d210237bb0d0bb4b SHA1 42d9efae4fcf6ed41109484f2cd01c0cc41105a6 SHA256 387429234b457d804030e42711addb41982723f998c16a0decc78a8431313444
+MISC ChangeLog 3999 RMD160 5c346deacfe23851f3f8aff87a35403507a930af SHA1 86b4c5bd5606bea9fb2800bbeafcb3847079206d SHA256 e8dc11ae47d6810d2c55469832cdc88a929229060baae49d72f5b6e1f4f4d51a
MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQEcBAEBCgAGBQJPv2sxAAoJEOTDgjZ80txdc7cH/jpdEhzxvu8I9N82MqcBnurb
-Y4EhmMcvRfOgPgac92y1xKLyULjptUZIlevzwqZFcZa1LCSHAQynV9z042LNBl6W
-kn+Ow73ggN8OWJmVfxk10+Nnnn/c1PyjYzN/4GahBdwXenx43MPENppX+3fLpUtL
-vyELNQxIFw2nriTIRw4iCGvsnqogdNcis7UrzE2cRb7qoRiJhOVqO0tvIkvKbprC
-cEP+wtx+ZUshj9sh0OB2+BAdZCNe6NSGohrnh/uNC/vvFeIFIWpYjI6uduS0KYWy
-W/QWPF7Mur7nt/wJh1ByPK2i2LGRZMPc4Gx1KcRSfLx/GFFiRB6r7pGdtY8oSxA=
-=j4RJ
+iQEcBAEBAgAGBQJPwpwkAAoJEIUJ+svaV163zGEH/02vPFEcfAknuiJjLQSz7PNP
+cCtgt/+qpLt+H3OM+nk0pC/M6DTE/grwcr0z5dy538VdYqbGHdQDALvFD/c/RYoT
+IgsbonUBEkWNuGQ83DLKoMzzJ4VTBBR8Kol3W+sGWnwu9XN8o7HspXqZ1KhmfLF7
+G+pZ+Na59cp2NOlH38WkX2LCvQSNpwfr4jJ3kj6k6I18MB3FbRHRlZmAc8UIMAlr
+EAVmnmMbN3dNogme8O/b7pg7gJd+E5uTWtMc8KVCQeUYBNvEVakG0PwAmJjA1lYF
+Iv1M0Kwkl1gkl101IkFkLjerxXbb4+rVJafqewuhomuXM95itGZonJgpNITAT80=
+=uS1v
-----END PGP SIGNATURE-----
diff --git a/dev-java/ant-nodeps/ant-nodeps-1.8.2.ebuild b/dev-java/ant-nodeps/ant-nodeps-1.8.2.ebuild
index a39ca41f266e..0a02654d04f1 100644
--- a/dev-java/ant-nodeps/ant-nodeps-1.8.2.ebuild
+++ b/dev-java/ant-nodeps/ant-nodeps-1.8.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-nodeps/ant-nodeps-1.8.2.ebuild,v 1.7 2012/05/25 11:21:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-nodeps/ant-nodeps-1.8.2.ebuild,v 1.8 2012/05/27 21:26:45 sera Exp $
EAPI="4"
@@ -19,13 +19,13 @@ DESCRIPTION="Formerly Ant's optional tasks w/o external deps, now compat empty j
KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
-DEPEND=""
+DEPEND=">=virtual/jdk-1.4" #jar
RDEPEND=""
src_compile() {
# the classes were moved to ant-core in 1.8.2, this is just for compatibility
mkdir -p build/lib/empty && cd build/lib/empty || die
- jar -cf ../${PN}.jar .
+ jar -cf ../${PN}.jar . || die
}
src_postinst() {