summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-java/commons-cli/ChangeLog5
-rw-r--r--dev-java/commons-cli/Manifest12
-rw-r--r--dev-java/commons-cli/commons-cli-1.1.ebuild4
3 files changed, 13 insertions, 8 deletions
diff --git a/dev-java/commons-cli/ChangeLog b/dev-java/commons-cli/ChangeLog
index 953162fd8290..268fa76196c4 100644
--- a/dev-java/commons-cli/ChangeLog
+++ b/dev-java/commons-cli/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/commons-cli
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/ChangeLog,v 1.35 2008/03/31 23:38:14 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/ChangeLog,v 1.36 2008/05/23 19:57:10 betelgeuse Exp $
+
+ 23 May 2008; Petteri Räty <betelgeuse@gentoo.org> commons-cli-1.1.ebuild:
+ Add junit blocker for bug 215659.
*commons-cli-1.1 (31 Mar 2008)
diff --git a/dev-java/commons-cli/Manifest b/dev-java/commons-cli/Manifest
index 8fd51a88c6eb..42fff40d09fa 100644
--- a/dev-java/commons-cli/Manifest
+++ b/dev-java/commons-cli/Manifest
@@ -6,13 +6,13 @@ AUX commons-cli-1.0-gentoo.diff 4407 RMD160 c6db9a74f8f0c1f3649f2c64bdfd9fb0f368
DIST cli-1.0-src.tar.gz 37046 RMD160 85404f803751f50e980c4cd976cd930f6be0ef9f SHA1 83966ccd4f7cb2e23ef746bd2cf8b0e0b585fa87 SHA256 fa4bf0850c896a9d5679f30d9921a98b3d262678019433f36ef810235ae58ec8
DIST commons-cli-1.1-src.tar.gz 63320 RMD160 c778f9b084185e601662b554630465213b66824f SHA1 b548c469e10c2a611553a26b822fda37d6de5c6a SHA256 929eb140c136673e7f5029cd206c81b3c1f5e66bba0dfdcd021b9dd5596356d2
EBUILD commons-cli-1.0-r5.ebuild 1260 RMD160 9253f3bcc25137e24c355ee93121dfc6d521bb16 SHA1 5f29e64babce0b8c0f35f234bfd912597c910693 SHA256 d58e8fec80af922139f344fbc2c7887a660ffb1cbff5a8b59ead8e2d9c289772
-EBUILD commons-cli-1.1.ebuild 914 RMD160 6addf02c05854158fbb5dfb52dd80c20be1fb203 SHA1 e804d4aaff6d2a74e56098ea6d99fd260a924143 SHA256 3cb38f6a9d2f14dd810adbdf6da81868f7c6e3f2501421c0e79784a7422c543d
-MISC ChangeLog 5161 RMD160 8492124b5d34a233a9907b344d97b87255cdc698 SHA1 7c6e83839d537dcdc0b820b640dc990bc1621413 SHA256 cd9eae22a27149f48ea461aa44974b550fd0bc00c2ce375d08d1e955e225477a
+EBUILD commons-cli-1.1.ebuild 1006 RMD160 f7b31afc412620cd9b4941c35f1e17265cf1ff41 SHA1 2fd8dd2aa7af2eed2424ef7729544f1d159390ee SHA256 06dd5f30b2c3a0b3cd33bc04ca6b2d7e95b10a1fc63be4ba38ee7f70c0da20c4
+MISC ChangeLog 5275 RMD160 206111c7dc9c4508e12d53f92837c4414d190195 SHA1 1bd786f694450cf950476097bffc81d1bb4349ea SHA256 72b6c26b3408de680992a669613f4aa0b966dbbf8c1ca7a4e24b8ff4136a2c0f
MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
-iD8DBQFH8XXrcxLzpIGCsLQRAodkAJ9Tw0iXOFW70ymqbyJ9s+B5WvraqQCgjVqQ
-WML32Lha6v7Zpk76NAwVP90=
-=K9EK
+iEYEARECAAYFAkg3IZ8ACgkQcxLzpIGCsLSN9gCgiHA8Wpl3BzPewxZBo6/tlJQ9
+OWcAoJ25svQYri9WyDTGqFlb3RK2F0uE
+=At1f
-----END PGP SIGNATURE-----
diff --git a/dev-java/commons-cli/commons-cli-1.1.ebuild b/dev-java/commons-cli/commons-cli-1.1.ebuild
index ba79edf4aaea..4453739342ec 100644
--- a/dev-java/commons-cli/commons-cli-1.1.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/commons-cli-1.1.ebuild,v 1.1 2008/03/31 23:38:14 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/commons-cli-1.1.ebuild,v 1.2 2008/05/23 19:57:10 betelgeuse Exp $
JAVA_PKG_IUSE="doc source test"
@@ -17,7 +17,9 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
IUSE=""
RDEPEND=">=virtual/jre-1.4"
+# Blocking junit for https://bugs.gentoo.org/show_bug.cgi?id=215659
DEPEND=">=virtual/jdk-1.4
+ !<dev-java/junit-3.8.2
test? ( dev-java/ant-junit )"
S=${WORKDIR}/${MY_P}