Added app-misc/beagle as blocker to DEPEND since there are file collisions (see bug #141137).

Package-Manager: portage-2.1.3.7

4 files changed, 25 insertions, 18 deletions

diff --git a/sci-libs/beagle/ChangeLog b/sci-libs/beagle/ChangeLog
index daf11ba7bc55..09b3bd195fc0 100644
--- a/sci-libs/beagle/ChangeLog
+++ b/sci-libs/beagle/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/beagle
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/beagle/ChangeLog,v 1.6 2007/02/07 20:59:20 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/beagle/ChangeLog,v 1.7 2007/09/06 02:48:40 markusle Exp $
+
+  06 Sep 2007; Markus Dittrich <markusle@gentoo.org> beagle-2.2.0.ebuild,
+  beagle-3.0.1.ebuild:
+  Added app-misc/beagle as blocker to DEPEND since there are file 
+  collisions (see bug #141137).
 
 *beagle-3.0.1 (07 Feb 2007)
 
diff --git a/sci-libs/beagle/Manifest b/sci-libs/beagle/Manifest
index cae532541577..28d975ee00b3 100644
--- a/sci-libs/beagle/Manifest
+++ b/sci-libs/beagle/Manifest
@@ -1,17 +1,17 @@
 DIST beagle-2.2.0.tar.gz 4049878 RMD160 5b995356180baa806a6227a5947370449f1d6e43 SHA1 30c3c1a88518812210a58899e03ab6c37a1af255 SHA256 9790556fe353c77e496ba2cd59f77f56f1c08f33cb4a49ad64beb01a67c059d3
 DIST beagle-3.0.1.tar.gz 4838478 RMD160 7870db60d27b7d7fc30ee1374fa142ae4cdfd4f5 SHA1 e71b81d1e205a0336f25cf497ca31051264c283a SHA256 a0f5dd1f1041cbf44858e89795790ef1d2634564a93a410885fb566d341e5814
-EBUILD beagle-2.2.0.ebuild 855 RMD160 b2e66281507755c760a89fa540b44bc64f81d8ad SHA1 2d9993342a48f5aa6d1f2095a0730062e5d2aa93 SHA256 52a60c8f927094925abfeda7e492f0e4c5c381acb2f9fd40d57ea4c585ef7c00
-MD5 739bda597b27858fe69e3b20cc7c2e85 beagle-2.2.0.ebuild 855
-RMD160 b2e66281507755c760a89fa540b44bc64f81d8ad beagle-2.2.0.ebuild 855
-SHA256 52a60c8f927094925abfeda7e492f0e4c5c381acb2f9fd40d57ea4c585ef7c00 beagle-2.2.0.ebuild 855
-EBUILD beagle-3.0.1.ebuild 1087 RMD160 5cb578ddf71c895f45834f725b78e7473953bad5 SHA1 a508e7ade7a1b830d258ad0065857856285a1b33 SHA256 f50e00ce7cd82d41cae723dc1f9671019728159f045d32630b59b5b07ff301ff
-MD5 520404e4bd77a89315326c144958654c beagle-3.0.1.ebuild 1087
-RMD160 5cb578ddf71c895f45834f725b78e7473953bad5 beagle-3.0.1.ebuild 1087
-SHA256 f50e00ce7cd82d41cae723dc1f9671019728159f045d32630b59b5b07ff301ff beagle-3.0.1.ebuild 1087
-MISC ChangeLog 1028 RMD160 7afae3f0d66a729990d263b140781f8677b7dd29 SHA1 6afa6514634fb0f5282e0bb8e53f8871fa686880 SHA256 35a7b039ee2f104084ee0b0d55d6b10e1bcc221e34a6277854d858526620b274
-MD5 3b175df09c2813c13bb501ed037e9d45 ChangeLog 1028
-RMD160 7afae3f0d66a729990d263b140781f8677b7dd29 ChangeLog 1028
-SHA256 35a7b039ee2f104084ee0b0d55d6b10e1bcc221e34a6277854d858526620b274 ChangeLog 1028
+EBUILD beagle-2.2.0.ebuild 873 RMD160 caa786ed04087381289a75137458ff45c1de872b SHA1 bd7ac59d124403618ac841414ba62c0c9137ecaf SHA256 479665b34b7f3dd91dfa972ddacbaa6e469fdfd05425ec751a5682b3157dde10
+MD5 c9500ac921c21978420a3a679b2e415b beagle-2.2.0.ebuild 873
+RMD160 caa786ed04087381289a75137458ff45c1de872b beagle-2.2.0.ebuild 873
+SHA256 479665b34b7f3dd91dfa972ddacbaa6e469fdfd05425ec751a5682b3157dde10 beagle-2.2.0.ebuild 873
+EBUILD beagle-3.0.1.ebuild 1105 RMD160 1b46be4e7c40bcfb493d8dc13253fcbf2d8acaf1 SHA1 288739ef15467cc26ba3cafda9ef0999b15d3c54 SHA256 5d8faf619f03168699fbb27fc4af71d948d4b7744baa9bf2d2550bc38ae3b39f
+MD5 efe290b4fe57baa100c1c4470270289f beagle-3.0.1.ebuild 1105
+RMD160 1b46be4e7c40bcfb493d8dc13253fcbf2d8acaf1 beagle-3.0.1.ebuild 1105
+SHA256 5d8faf619f03168699fbb27fc4af71d948d4b7744baa9bf2d2550bc38ae3b39f beagle-3.0.1.ebuild 1105
+MISC ChangeLog 1225 RMD160 135a16c7a612b71b6d20adff47db948d2dd845d7 SHA1 b2bde12ca3a62658da0f34507c7c3abbb6cbe679 SHA256 81da4547ebbe17c0a577146e5bf7e320255f13ba2ed472a778d0d214efdc552a
+MD5 e5bb4ed0d4fd4100082d685d9c3eb40a ChangeLog 1225
+RMD160 135a16c7a612b71b6d20adff47db948d2dd845d7 ChangeLog 1225
+SHA256 81da4547ebbe17c0a577146e5bf7e320255f13ba2ed472a778d0d214efdc552a ChangeLog 1225
 MISC metadata.xml 454 RMD160 f49cbf5c3fc0d4e2421361636bbe67ca600b7b4f SHA1 cc208ac1bd4ef8cecab6f6f830e6ef45834f5fb0 SHA256 b850a52bc86b8ed205bd7464d1d3b85290ebf39ddad1403cbf3f54acd48f82d1
 MD5 119f11b0ae59d474384abde7a5d7b823 metadata.xml 454
 RMD160 f49cbf5c3fc0d4e2421361636bbe67ca600b7b4f metadata.xml 454
diff --git a/sci-libs/beagle/beagle-2.2.0.ebuild b/sci-libs/beagle/beagle-2.2.0.ebuild
index 3cc08a7a87ac..e46fd9ea6f82 100644
--- a/sci-libs/beagle/beagle-2.2.0.ebuild
+++ b/sci-libs/beagle/beagle-2.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/beagle/beagle-2.2.0.ebuild,v 1.3 2005/08/24 16:30:29 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/beagle/beagle-2.2.0.ebuild,v 1.4 2007/09/06 02:48:40 markusle Exp $
 
 inherit libtool
 
@@ -15,7 +15,8 @@ KEYWORDS="x86"
 
 DEPEND=">=sys-devel/gcc-2.96
 	sys-libs/zlib
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen )
+	!app-misc/beagle"
 
 src_compile() {
 	elibtoolize
diff --git a/sci-libs/beagle/beagle-3.0.1.ebuild b/sci-libs/beagle/beagle-3.0.1.ebuild
index 88d5d97c0b73..a0f6f2718f9b 100644
--- a/sci-libs/beagle/beagle-3.0.1.ebuild
+++ b/sci-libs/beagle/beagle-3.0.1.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/sci-libs/beagle/beagle-3.0.1.ebuild,v 1.1 2007/02/07 20:59:20 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/beagle/beagle-3.0.1.ebuild,v 1.2 2007/09/06 02:48:40 markusle Exp $
 
 IUSE="doc"
 
@@ -12,7 +12,8 @@ LICENSE="LGPL-2.1"
 KEYWORDS="~x86"
 
 DEPEND="sys-libs/zlib
-	doc? ( app-doc/doxygen )"
+	doc? ( app-doc/doxygen )
+	!app-misc/beagle"
 
 src_unpack() {
 	unpack ${A}