Fix guile DEPEND, #135625

Package-Manager: portage-2.1.2-r9

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index fce1404721639814698f417c70ccc8a1eaf87c38..4e97e102c7ce91b6a5d310fd7544f170e99bc89c 100644 (file)
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/graphviz
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.103 2007/02/15 18:24:37 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.104 2007/02/16 16:26:02 chrb Exp $
+
+  16 Feb 2007; Chris Bainbridge <chrb@gentoo.org> graphviz-2.8-r2.ebuild,
+  graphviz-2.12.ebuild:
+  Fix guile DEPEND, #135625
 
   15 Feb 2007; Christian Faulhammer <opfer@gentoo.org> graphviz-2.12.ebuild:
   stable x86; bug 165460

diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 86e534de68fb932e3c53e36a9b3c2ae6eb6bba6d..f1c569c4cbff114aa3b94cfafb1a31ce66d2bf42 100644 (file)
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX graphviz-1.16-build.patch 6200 RMD160 63a72f5776f55321a677524cc9be59e278578366 SHA1 362a7f013a8aea313b0745b65689de43d351d447 SHA256 30e792d61416121692fd7cd1baa856ba2ab724dfe00bd56ff676bead07274e2d
 MD5 280fc858f990639d5d8fb7102b2636ac files/graphviz-1.16-build.patch 6200
 RMD160 63a72f5776f55321a677524cc9be59e278578366 files/graphviz-1.16-build.patch 6200
@@ -38,10 +35,10 @@ EBUILD graphviz-1.16-r1.ebuild 2157 RMD160 e06c2d755bff2dcda514cbd03e7b57ce165c2
 MD5 6404113200e946d8d5e9a0d219483cf5 graphviz-1.16-r1.ebuild 2157
 RMD160 e06c2d755bff2dcda514cbd03e7b57ce165c274b graphviz-1.16-r1.ebuild 2157
 SHA256 85a4911173f864e918f0c4ec66b4eb0d63a699393295c2dd91ddb66f9210f772 graphviz-1.16-r1.ebuild 2157
-EBUILD graphviz-2.12.ebuild 2923 RMD160 015be75c38c4b194a1d380ae8e009e54f882089e SHA1 6d0ec390d8a7567eedf47edaf2da9a30b2c9107b SHA256 49fa51f3a049aea28c292dfe3e42da9e2acb2b12aa861838800ee886c60eb818
-MD5 e3d09948c22b32610101c142f55e1872 graphviz-2.12.ebuild 2923
-RMD160 015be75c38c4b194a1d380ae8e009e54f882089e graphviz-2.12.ebuild 2923
-SHA256 49fa51f3a049aea28c292dfe3e42da9e2acb2b12aa861838800ee886c60eb818 graphviz-2.12.ebuild 2923
+EBUILD graphviz-2.12.ebuild 3111 RMD160 5ddbd17ad27f3a6d6e107a50428f4aa9ae2b71b9 SHA1 176c1fa7c0a3a54ce3688e030b27492e59055cce SHA256 d4744dc29051f4f25601e9f7074f3d031d1db376a599936cfce60fc212d4e5cb
+MD5 801e35af421c40b916dae2e8468623c4 graphviz-2.12.ebuild 3111
+RMD160 5ddbd17ad27f3a6d6e107a50428f4aa9ae2b71b9 graphviz-2.12.ebuild 3111
+SHA256 d4744dc29051f4f25601e9f7074f3d031d1db376a599936cfce60fc212d4e5cb graphviz-2.12.ebuild 3111
 EBUILD graphviz-2.6-r1.ebuild 1638 RMD160 1382f4a7e7ac3654b0b71c3e36fd87e57c911f84 SHA1 e1f0b5296e700d5974ce136d73c740b4d287f38c SHA256 37a43a33bd0a53d4053634066f3c99183d665c343d3601d733b25dcac7bc25da
 MD5 308666689ed931d9984235894a7e5319 graphviz-2.6-r1.ebuild 1638
 RMD160 1382f4a7e7ac3654b0b71c3e36fd87e57c911f84 graphviz-2.6-r1.ebuild 1638
@@ -50,14 +47,14 @@ EBUILD graphviz-2.8-r1.ebuild 1935 RMD160 ca6a6df66c565ddbbf9b04ad67573052fbfd35
 MD5 06913aaafcfec211c400d76ab9e5c41b graphviz-2.8-r1.ebuild 1935
 RMD160 ca6a6df66c565ddbbf9b04ad67573052fbfd350b graphviz-2.8-r1.ebuild 1935
 SHA256 aa371b3e5c48b9816e670f0dc3f15ff3acce156da8325d3810f399db41aa9c54 graphviz-2.8-r1.ebuild 1935
-EBUILD graphviz-2.8-r2.ebuild 2675 RMD160 1a163c80d12004ce8a421638d8a7d44455246716 SHA1 6acd829345c43d19514ba5ebfb5f15c6487039a0 SHA256 dedf81ff15dafec5b9ff9b82dbe08b16d0c88d84905b5d4b78f6dcf70cc86610
-MD5 a470c111441267b205b15f10bb20b82a graphviz-2.8-r2.ebuild 2675
-RMD160 1a163c80d12004ce8a421638d8a7d44455246716 graphviz-2.8-r2.ebuild 2675
-SHA256 dedf81ff15dafec5b9ff9b82dbe08b16d0c88d84905b5d4b78f6dcf70cc86610 graphviz-2.8-r2.ebuild 2675
-MISC ChangeLog 15754 RMD160 a64e273f37e841d9a6671220a1407492d808ef6f SHA1 d21e986631abcbfb1afb1b01bf613f79973c8e57 SHA256 64bd1b99d79ec6fb925a0911113cfc8d56df6aa5028afc719b4dad6636e24446
-MD5 f74d9a45f4be135b8b7f8d1aaceccf01 ChangeLog 15754
-RMD160 a64e273f37e841d9a6671220a1407492d808ef6f ChangeLog 15754
-SHA256 64bd1b99d79ec6fb925a0911113cfc8d56df6aa5028afc719b4dad6636e24446 ChangeLog 15754
+EBUILD graphviz-2.8-r2.ebuild 2680 RMD160 e47ad3f2966c7af400df8551ef749fefbdd3b0eb SHA1 b11bbef51ed9c412e7748ba9ce39d4f4fae35638 SHA256 8b354fde8899261445df4443521294c4c9798d55f0db5362d74d30a416a61449
+MD5 8f1d07ec6d4f12c65f910fb0f1703723 graphviz-2.8-r2.ebuild 2680
+RMD160 e47ad3f2966c7af400df8551ef749fefbdd3b0eb graphviz-2.8-r2.ebuild 2680
+SHA256 8b354fde8899261445df4443521294c4c9798d55f0db5362d74d30a416a61449 graphviz-2.8-r2.ebuild 2680
+MISC ChangeLog 15880 RMD160 a24390deefa75119f6ab616b06e4fc9202525e53 SHA1 8b64d6ca592b93c659d616462660bbcce9dec26c SHA256 7d66270a1e548f7172e76e9d697f586bd9b7cbca1eb7e340a7b411c9a869d1b2
+MD5 7a5a0919bf28fbd7e676d30bd8985d50 ChangeLog 15880
+RMD160 a24390deefa75119f6ab616b06e4fc9202525e53 ChangeLog 15880
+SHA256 7d66270a1e548f7172e76e9d697f586bd9b7cbca1eb7e340a7b411c9a869d1b2 ChangeLog 15880
 MISC metadata.xml 1540 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 SHA1 b493bbaade7ae395c87ada0bbef0b0f0e7f7fb08 SHA256 c2a220f962a3048cc026e4c376b6555bfd0be7b401206d0ae3d265d628f231a1
 MD5 e98595ce89ff0da26058b1e6e0ce3d31 metadata.xml 1540
 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 metadata.xml 1540
@@ -77,10 +74,3 @@ SHA256 46c7992c928f975cf353d76bf16f2c1f95442c40aa8d95f9a6914d69f567e802 files/di
 MD5 e3e4ae371fc2d864bfc0abf37ed6a8e7 files/digest-graphviz-2.8-r2 241
 RMD160 5fb21035102566ae43b15e15cfa41c26e5d1a195 files/digest-graphviz-2.8-r2 241
 SHA256 46c7992c928f975cf353d76bf16f2c1f95442c40aa8d95f9a6914d69f567e802 files/digest-graphviz-2.8-r2 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFF1KU7NQqtfCuFneMRAhqiAJ9l7degJuTB4AlvhHpPsa3Vj6qhoACgjkgB
-TQtGVF2faEASgrIaH7+Hh5Q=
-=bw4Y
------END PGP SIGNATURE-----

diff --git a/media-gfx/graphviz/graphviz-2.12.ebuild b/media-gfx/graphviz/graphviz-2.12.ebuild
index 00cdc8202a69ef7fbd36bfa810e08d5bf7257af8..981b9b9a6f6d9fae8fc21492c4531cc13657dfdb 100644 (file)
--- a/media-gfx/graphviz/graphviz-2.12.ebuild
+++ b/media-gfx/graphviz/graphviz-2.12.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/media-gfx/graphviz/graphviz-2.12.ebuild,v 1.2 2007/02/15 18:24:37 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.12.ebuild,v 1.3 2007/02/16 16:26:02 chrb Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
@@ -53,6 +53,13 @@ DEPEND="${RDEPEND}
        python? ( dev-lang/swig )
        ruby? ( dev-lang/swig )"
 
+pkg_setup() {
+       if use guile && has_version '>=dev-scheme/guile-1.8' && \
+               ! built_with_use dev-scheme/guile deprecated; then
+                die "dev-scheme/guile must be built with deprecated"
+       fi
+}
+
 src_unpack() {
        unpack ${A}
        cd "${S}"

diff --git a/media-gfx/graphviz/graphviz-2.8-r2.ebuild b/media-gfx/graphviz/graphviz-2.8-r2.ebuild
index b2bcef403628545f413110a7bf8150987ebc5160..52e0538ccb64e39c80d9b76e86fc2adfce33b65f 100644 (file)
--- a/media-gfx/graphviz/graphviz-2.8-r2.ebuild
+++ b/media-gfx/graphviz/graphviz-2.8-r2.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/media-gfx/graphviz/graphviz-2.8-r2.ebuild,v 1.11 2007/02/15 17:14:19 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.8-r2.ebuild,v 1.12 2007/02/16 16:26:02 chrb Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
@@ -27,7 +27,7 @@ RDEPEND=">=sys-libs/zlib-1.1.3
        cairo? ( >=x11-libs/libsvg-cairo-0.1.3 )
        tk? ( >=dev-lang/tk-8.3 )
        tcl? ( >=dev-lang/tcl-8.3 )
-       guile? ( dev-scheme/guile )
+       guile? ( <dev-scheme/guile-1.8 )
        java? ( virtual/jdk )
        perl? ( dev-lang/perl )
        ocaml? ( dev-lang/ocaml )