summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-06-07 15:24:31 +0000
committerJustin Lecher <jlec@gentoo.org>2012-06-07 15:24:31 +0000
commit610ddf124edced591a933356f1e1a95a09ccd139 (patch)
tree01453ef64f3eb333cc55ccf928961ca0b0387b23 /media-gfx/graphviz
parentVersion bump (bug 410783 reported by bdouxx) (diff)
downloadgentoo-2-610ddf124edced591a933356f1e1a95a09ccd139.tar.gz
gentoo-2-610ddf124edced591a933356f1e1a95a09ccd139.tar.bz2
gentoo-2-610ddf124edced591a933356f1e1a95a09ccd139.zip
Block sci-chemistry/cluster version which triger file collision, #419999
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/graphviz')
-rw-r--r--media-gfx/graphviz/ChangeLog6
-rw-r--r--media-gfx/graphviz/graphviz-2.28.0.ebuild3
-rw-r--r--media-gfx/graphviz/metadata.xml22
3 files changed, 18 insertions, 13 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/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>