Block sci-chemistry/cluster version which triger file collision, #419999

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

4 files changed, 27 insertions, 21 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 685f861e0831..498e17143e7d 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/graphviz
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.258 2012/06/05 20:00:58 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.259 2012/06/07 15:24:31 jlec Exp $
+
+  07 Jun 2012; Justin Lecher <jlec@gentoo.org> graphviz-2.28.0.ebuild,
+  metadata.xml:
+  Block sci-chemistry/cluster version which triger file collision, #419999
 
   05 Jun 2012; Ian Stakenvicius <axs@gentoo.org> graphviz-2.28.0.ebuild:
   added most of the original keywords back, some keywords dropped temporarily
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index d6a61f784703..c339387ce48b 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX graphviz-2.26.3-automake-1.11.2.patch 1207 RMD160 e0d11e4bfdc940b51e3a913b2c1178d84336f8c5 SHA1 4c43de8d197ac02a5373614f14269e45b4597b44 SHA256 859e59ad317fdca86ee4fc85001f9988c28a88d5becc472e7174f91d51b084d3
 AUX graphviz-2.26.3-libtool.patch 557 RMD160 72ea3b515777ec31d9ead7095a02e09f8d040d89 SHA1 bb5f091cba06fc821f6cc0ad543a4344c2300832 SHA256 a1d5f1ee6e181b78d1bd3daa36d49103ff1f2d90c85b58c1b5f3cfc7941f4b46
@@ -11,13 +11,14 @@ DIST graphviz-2.28.0.tar.gz 19620087 RMD160 5a5fae7cb1128d4e863b954bee5f2491ff23
 EBUILD graphviz-2.26.3-r2.ebuild 6042 RMD160 be5fd321509b6235439aa12c96bff9da73592321 SHA1 8a2afa62e52c160009a9f7ffe95a96efbdaca80d SHA256 ec0fed34881cceb9fe5c8c6bf8f3829e7976cb6ac5704269d7ed2deafa2e0156
 EBUILD graphviz-2.26.3-r3.ebuild 6129 RMD160 f5ef4cfc60ba769f054a301f0ee0ce421742941a SHA1 ba7e36973a7e017e1adfd1e78d9351f9393d0c53 SHA256 201e7768c7e39b912c7efa93a0fb216b381ee2cc401d30392b5feafddd8e13fb
 EBUILD graphviz-2.26.3-r4.ebuild 6360 RMD160 e2b7f201f9c1869feae8949909edbf238abf44d7 SHA1 427fcc76685a43e95abc5c459c2006ec46026d53 SHA256 bcd6d933ac7aab4b0f73ee5c626f1a733eaf87bca96dcf2e7aa268b4cdd49240
-EBUILD graphviz-2.28.0.ebuild 7315 RMD160 024538e62757a21f7aa98763b0be87d4d3598e63 SHA1 a58ec5ca93f4b4cba3077581c8c304e0a8b93e22 SHA256 07ea86aa07fa96a55ab07100384fe13a3e8d7c8522834789cfd0a8d302f642a5
-MISC ChangeLog 38708 RMD160 8a794c2916702b9e3ca8b74aa41beba4a2fdf5d6 SHA1 3640a3c1b6c4622de47c90776f1a329b92546ae4 SHA256 05a08c4c459160829bb89acf9c696d9fcb29a37a4024aad9f710e95540ed49e4
-MISC metadata.xml 2158 RMD160 2305e4f794f2ad67f5599bcec98b38526dd15d98 SHA1 45d5dd5c0f2c4fb3431d41ea695691d29419dc34 SHA256 5e7e65c30a0323366851bbf4d8ac3978ae613b07f9b2c5a25570aa576ea141b4
+EBUILD graphviz-2.28.0.ebuild 7353 RMD160 6b0c7cbb3d3ef108f8eb9b3fdc1409f2112d119f SHA1 152c07de3dcafeaf22f37cecacc9799f73a86180 SHA256 a9de86b938c4be67404e7ba0d58e2d825b3afec786c58a05eaa2e7f068590672
+MISC ChangeLog 38872 RMD160 bdc1dea0cc280863b66c374a65188fb984165a6a SHA1 5fa1d5b41c6e01dac7172253986492c5d1295a88 SHA256 ab47318b79b365957ee07786f1169771a4c688445a69bf8e14fa39cb6854691e
+MISC metadata.xml 2169 RMD160 ac924eb31cace49fa0e0da5508da3bee4b63195e SHA1 707e0cecfdf5505b2628777b168343e9727232e4 SHA256 0d9f0d34dd6e4250cbee005ff3eaa365d3df8368d0ae8a38afa23ed95d687802
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iF4EAREIAAYFAk/OZZUACgkQ2ugaI38ACPCq8wD/SE0ZU0EaUX6sHCLkMoJUq6jU
-x+zW6RfO5nC8wsLBOFgBALn8cd6Dzpe593vUQF4xlTSRX8g8o/nmH7jnogH2Tt1g
-=/+cH
+iEYEAREKAAYFAk/Qx7QACgkQgAnW8HDreRYIPgCeJYEN08z/fuq/0oWzrP3ydroG
+cq4An1oUcJwbu7SQE2qO7X7bon1VD48y
+=AvsI
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphviz/graphviz-2.28.0.ebuild b/media-gfx/graphviz/graphviz-2.28.0.ebuild
index fe7ef2d84c2b..30c8bb2e5554 100644
--- a/media-gfx/graphviz/graphviz-2.28.0.ebuild
+++ b/media-gfx/graphviz/graphviz-2.28.0.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/media-gfx/graphviz/graphviz-2.28.0.ebuild,v 1.7 2012/06/05 20:00:58 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.28.0.ebuild,v 1.8 2012/06/07 15:24:31 jlec Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2"
@@ -28,6 +28,7 @@ RDEPEND="
 	>=media-libs/freetype-2.1.10
 	>=media-libs/gd-2.0.34[fontconfig,jpeg,png,truetype]
 	>=media-libs/libpng-1.2:0
+	!<=sci-chemistry/cluster-1.3.081231
 	virtual/jpeg
 	virtual/libiconv
 	X? (
diff --git a/media-gfx/graphviz/metadata.xml b/media-gfx/graphviz/metadata.xml
index ff55a617856c..874551f457f2 100644
--- a/media-gfx/graphviz/metadata.xml
+++ b/media-gfx/graphviz/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>graphics</herd>
-<longdescription>
+	<herd>graphics</herd>
+	<longdescription>
 graphviz  is a set of graph drawing tools for Unix or MS-Windows 
 (win32), including a web service interface (webdot). Source code and 
 binary executables for common platforms are available. Graph drawing 
@@ -28,22 +28,22 @@ documents
     * you would like to discover patterns and communities of interest in 
 a database of telephone calls or e-mail messages
 </longdescription>
-<use>
-	<flag name='devil'>Enables DevIL output plugin -Tdevil</flag>
-	<flag name='gs'>
+	<use>
+		<flag name="devil">Enables DevIL output plugin -Tdevil</flag>
+		<flag name="gs">
 		Enables PostScript output via ghostscript, for 
 		plugin -Tgs (needs cairo)
 	</flag>
-	<flag name='gtk'>Enables gtk+ output plugin -Tgtk (needs cairo)</flag>
-	<flag name='gts'>Enables support for gts</flag>
-	<flag name='lasi'>
+		<flag name="gtk">Enables gtk+ output plugin -Tgtk (needs cairo)</flag>
+		<flag name="gts">Enables support for gts</flag>
+		<flag name="lasi">
 		Enables PostScript output via <pkg>media-libs/lasi</pkg>, for 
 		plugin -Tlasi (needs cairo)
 	</flag>
-	<flag name='qt4'>Builds gvedit front-end</flag>
-	<flag name='X'>
+		<flag name="qt4">Builds gvedit front-end</flag>
+		<flag name="X">
 		Builds lefty front-end, builds plugin -Txlib, and enables support
 		for x11 in various other modules (needs cairo)
 	</flag>
-</use>
+	</use>
 </pkgmetadata>