Add blockers to >=app-arch/fastjar-0.95 because of file collisions, bug #188542.

Package-Manager: portage-2.1.3.5

4 files changed, 27 insertions, 29 deletions

diff --git a/dev-java/kaffe/ChangeLog b/dev-java/kaffe/ChangeLog
index 1061d29d732a..131094ecb6b7 100644
--- a/dev-java/kaffe/ChangeLog
+++ b/dev-java/kaffe/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/kaffe
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.72 2007/08/12 09:18:41 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/ChangeLog,v 1.73 2007/08/15 09:20:59 caster Exp $
+
+  15 Aug 2007; Vlastimil Babka <caster@gentoo.org> kaffe-1.1.7-r4.ebuild,
+  kaffe-1.1.7-r5.ebuild:
+  Add blockers to >=app-arch/fastjar-0.95 because of file collisions, bug
+  #188542.
 
 *kaffe-1.1.7-r6 (12 Aug 2007)
 
diff --git a/dev-java/kaffe/Manifest b/dev-java/kaffe/Manifest
index e11c2f49520d..de00bc4d463a 100644
--- a/dev-java/kaffe/Manifest
+++ b/dev-java/kaffe/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kaffe-1.1.6-alsa.patch 1132 RMD160 1fd34e881a4a533f8de66ba8a59b6ecc2a922681 SHA1 69b287b079f91d7eb31100c57ef28fd4d9d66768 SHA256 915cfafe78460c5ab55e02d9c93a139a24cc132dbfd8e070f58a6e7275388fd7
 MD5 eddf093a0ea65d4d6f9bc7799250660c files/kaffe-1.1.6-alsa.patch 1132
 RMD160 1fd34e881a4a533f8de66ba8a59b6ecc2a922681 files/kaffe-1.1.6-alsa.patch 1132
@@ -10,22 +7,22 @@ MD5 fd3b5d2c60b80250bd2c8ddb168fd369 files/kaffe.env 633
 RMD160 cbd43938225ef62844bb8351e0fa22aefd34def8 files/kaffe.env 633
 SHA256 ef69564ce3802f21355a09f2d9b4af8fb5e1af838abd36ee45d9f9304c8f5b2d files/kaffe.env 633
 DIST kaffe-1.1.7.tar.bz2 10976055 RMD160 8f58ee1b9389f5a562f152dabeeeeb6072eb1d57 SHA1 b922d70419cc6bc0489912f9b826a40a9c8d5a91 SHA256 827f861c2d404a0fefed286f3691da61928b0d84e7d13eda8620d4fe47fa244c
-EBUILD kaffe-1.1.7-r4.ebuild 3752 RMD160 9525f623dff2657f447e8f306761c4505e6bd64b SHA1 8afcae8c0078cce369b5d5073d8b74551b9f25a9 SHA256 2462a2817965b418be1824299b5646cca878883b8c4621a47a6bff3793278cbc
-MD5 097cc0663955ad739b7b118c83c0c3eb kaffe-1.1.7-r4.ebuild 3752
-RMD160 9525f623dff2657f447e8f306761c4505e6bd64b kaffe-1.1.7-r4.ebuild 3752
-SHA256 2462a2817965b418be1824299b5646cca878883b8c4621a47a6bff3793278cbc kaffe-1.1.7-r4.ebuild 3752
-EBUILD kaffe-1.1.7-r5.ebuild 3983 RMD160 e1323b4075aa0103e76783e2b67f3558bb9c945e SHA1 1e2d0ce89a12a00f38cc763d6f82afa9f428eab1 SHA256 c2564f4fb89abe5234b38616224f219763057c749305b6d5076203a51520d7b9
-MD5 ba28ad279b708cd2f923c5d3cb17384a kaffe-1.1.7-r5.ebuild 3983
-RMD160 e1323b4075aa0103e76783e2b67f3558bb9c945e kaffe-1.1.7-r5.ebuild 3983
-SHA256 c2564f4fb89abe5234b38616224f219763057c749305b6d5076203a51520d7b9 kaffe-1.1.7-r5.ebuild 3983
+EBUILD kaffe-1.1.7-r4.ebuild 3809 RMD160 3aeee89e1d5a1f62b0e65ed1b8ae1243ec344dd2 SHA1 7d4421ec041865bb90074674bd0dde0b16e0e6ea SHA256 35350ce22e97b198ddb5e72fdd67e8606a043baba60a2073554b41d0c093cc73
+MD5 70e5d1eedf7fc287f6f8e41cd46b6e87 kaffe-1.1.7-r4.ebuild 3809
+RMD160 3aeee89e1d5a1f62b0e65ed1b8ae1243ec344dd2 kaffe-1.1.7-r4.ebuild 3809
+SHA256 35350ce22e97b198ddb5e72fdd67e8606a043baba60a2073554b41d0c093cc73 kaffe-1.1.7-r4.ebuild 3809
+EBUILD kaffe-1.1.7-r5.ebuild 4023 RMD160 1790f55e8adbb5a8d60c8f203ff048ac4ed54943 SHA1 c284094bf7c1f3987f7b64f3f1a8b4cd4323cd5a SHA256 31bf7f9f8248c77c6997f3d4144e48b99380449aeaa725192feb7a456fc7f7e8
+MD5 712becbeeccbe2b09fd5cf6bacc05cb2 kaffe-1.1.7-r5.ebuild 4023
+RMD160 1790f55e8adbb5a8d60c8f203ff048ac4ed54943 kaffe-1.1.7-r5.ebuild 4023
+SHA256 31bf7f9f8248c77c6997f3d4144e48b99380449aeaa725192feb7a456fc7f7e8 kaffe-1.1.7-r5.ebuild 4023
 EBUILD kaffe-1.1.7-r6.ebuild 4142 RMD160 97253639d849077c64a17c1b9d7805e2282eff5d SHA1 6d780b240b739b490aeca7255ce7e0a54f440a65 SHA256 a689b2b45cc0a7a286bc09bee8438fae02ab6916d7ced46c61cd689b4b5c4230
 MD5 0e5312b4da18b227cf6a87ae642668ea kaffe-1.1.7-r6.ebuild 4142
 RMD160 97253639d849077c64a17c1b9d7805e2282eff5d kaffe-1.1.7-r6.ebuild 4142
 SHA256 a689b2b45cc0a7a286bc09bee8438fae02ab6916d7ced46c61cd689b4b5c4230 kaffe-1.1.7-r6.ebuild 4142
-MISC ChangeLog 11657 RMD160 5cbba57d07ddf931b71e5e48ad7d422b7b20ec14 SHA1 56261f4197ad975abc2c3096bf442a0ff1d74cf0 SHA256 ca6680fdafd6ca96db95440d73d9d1bdfa33846041950e4ee1dc6e262117838d
-MD5 0d63f9f1fecf73959912e658c8ad03d6 ChangeLog 11657
-RMD160 5cbba57d07ddf931b71e5e48ad7d422b7b20ec14 ChangeLog 11657
-SHA256 ca6680fdafd6ca96db95440d73d9d1bdfa33846041950e4ee1dc6e262117838d ChangeLog 11657
+MISC ChangeLog 11838 RMD160 d2dfa34ef3338ad6a24ee1b4ce9b6a96bfde84fe SHA1 8fc153af5226ebef94a5e28c37e74cd1f988f733 SHA256 adf02934b03b7fb7e6d0590f91b0d7e86cfe44682689e680d4c9e6dfeb2d8651
+MD5 e58c2f183d5e73ff1a8f2e5da67d6c2a ChangeLog 11838
+RMD160 d2dfa34ef3338ad6a24ee1b4ce9b6a96bfde84fe ChangeLog 11838
+SHA256 adf02934b03b7fb7e6d0590f91b0d7e86cfe44682689e680d4c9e6dfeb2d8651 ChangeLog 11838
 MISC metadata.xml 539 RMD160 ebed312bca45b48f276fef682112676a7db60291 SHA1 7ea3b80e47be90dbc1ee37581186a5b59483a3d8 SHA256 df08b5714a84814335206b660a04b3bba211d3d8fd3b7e9d9afba1be375754b6
 MD5 6e04f926f281bd16bb09b7ae372fbaff metadata.xml 539
 RMD160 ebed312bca45b48f276fef682112676a7db60291 metadata.xml 539
@@ -39,10 +36,3 @@ SHA256 105a9ee7995a77eeaabc82a9ca3264f9f7e61395c42e9dc76f9545ba44a35789 files/di
 MD5 e336d26d231eefe5244cf5ed40f0a316 files/digest-kaffe-1.1.7-r6 244
 RMD160 d22fe2ab8898f1e7f76b92e40825db8d3903c771 files/digest-kaffe-1.1.7-r6 244
 SHA256 105a9ee7995a77eeaabc82a9ca3264f9f7e61395c42e9dc76f9545ba44a35789 files/digest-kaffe-1.1.7-r6 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGvtB2cxLzpIGCsLQRAvjWAJ9Z2C7t2+XKKg5hce3ek+aq1pLs3gCggdN4
-XddBUJp7aSQbpyIexHB1908=
-=xn0Y
------END PGP SIGNATURE-----
diff --git a/dev-java/kaffe/kaffe-1.1.7-r4.ebuild b/dev-java/kaffe/kaffe-1.1.7-r4.ebuild
index 001d3f9c1a0e..add5d31e3bb0 100644
--- a/dev-java/kaffe/kaffe-1.1.7-r4.ebuild
+++ b/dev-java/kaffe/kaffe-1.1.7-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.7-r4.ebuild,v 1.5 2007/07/24 02:12:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.7-r4.ebuild,v 1.6 2007/08/15 09:20:59 caster Exp $
 
 JAVA_SUPPORTS_GENERATION_1="true"
 inherit base eutils java-vm-2 flag-o-matic
@@ -29,7 +29,9 @@ DEPEND="
 	esd? ( >=media-sound/esound-0.2.1 )
 	alsa? ( >=media-libs/alsa-lib-1.0.1 )
 	gmp? ( >=dev-libs/gmp-3.1 )"
-RDEPEND=${DEPEND}
+# fastjar block for bug #188542
+RDEPEND="${DEPEND}
+	!>=app-arch/fastjar-0.95"
 
 # We need to build this after kaffe because it is implemented in java
 PDEPEND="dev-java/gjdoc"
diff --git a/dev-java/kaffe/kaffe-1.1.7-r5.ebuild b/dev-java/kaffe/kaffe-1.1.7-r5.ebuild
index db97ebc89dbe..7b32d5173841 100644
--- a/dev-java/kaffe/kaffe-1.1.7-r5.ebuild
+++ b/dev-java/kaffe/kaffe-1.1.7-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.7-r5.ebuild,v 1.5 2007/07/22 09:18:27 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/kaffe/kaffe-1.1.7-r5.ebuild,v 1.6 2007/08/15 09:20:59 caster Exp $
 
 JAVA_SUPPORTS_GENERATION_1="true"
 inherit base eutils java-vm-2 flag-o-matic
@@ -32,10 +32,11 @@ COMMON_DEP="
 
 # kaffe builds it's own copy of fastjar so we don't need fastjar at
 # runtime. Hopefully next upstream release uses the system one.
-DEPEND="${COMMON_DEP}
-	app-arch/fastjar"
+DEPEND="${COMMON_DEP}"
 
-RDEPEND="${COMMON_DEP}"
+# fastjar block for bug #188542
+RDEPEND="${COMMON_DEP}
+	!>=app-arch/fastjar-0.95"
 
 # We need to build this after kaffe because it is implemented in java
 PDEPEND="dev-java/gjdoc"