Drop <media-libs/gd-2.0.34 in favor of tweaking the gd header file on the fly #165460.

Package-Manager: portage-2.1.2-r14

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 4b3ed44fc2fe12a2c7dc13039f077b58c59bb4ff..9423ee1bb1497f5e1345386830eee19cd244d2bf 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.112 2007/03/05 08:04:45 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.113 2007/03/06 20:13:24 vapier Exp $
+
+  06 Mar 2007; Mike Frysinger <vapier@gentoo.org> graphviz-2.8-r2.ebuild:
+  Drop <media-libs/gd-2.0.34 in favor of tweaking the gd header file on the
+  fly #165460.
 
   05 Mar 2007; Tiziano Müller <dev-zero@gentoo.org>
   +files/graphviz-2.12-bindings.patch, graphviz-2.12.ebuild:

diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 870bcd7b42726bcc909249abc19322316c0d55fd..7dc61715937bb848ae1f6c5add975057c659a871 100644 (file)
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -58,14 +58,14 @@ EBUILD graphviz-2.8-r1.ebuild 1952 RMD160 eb5d91c71ada1879790f8ba11745fcbf29f7a2
 MD5 fb4aa461c5703ed3b53252d4d9d638d9 graphviz-2.8-r1.ebuild 1952
 RMD160 eb5d91c71ada1879790f8ba11745fcbf29f7a287 graphviz-2.8-r1.ebuild 1952
 SHA256 2125666c4c2f81e6de3bca305d638fed7c788237752c8f342261ee8ea15572ca graphviz-2.8-r1.ebuild 1952
-EBUILD graphviz-2.8-r2.ebuild 2715 RMD160 3b893a3bf91d1d8ce2588f996d7a5b7788b2c984 SHA1 acbb3652fb5e837488b61c3890cb16a943461875 SHA256 eb3b2d4721e562c7e9df547beac64400f6bc1de2dc8a04a777cb621deccc3bec
-MD5 46e9a9ef05dcef5fcd74e2ff86b0e284 graphviz-2.8-r2.ebuild 2715
-RMD160 3b893a3bf91d1d8ce2588f996d7a5b7788b2c984 graphviz-2.8-r2.ebuild 2715
-SHA256 eb3b2d4721e562c7e9df547beac64400f6bc1de2dc8a04a777cb621deccc3bec graphviz-2.8-r2.ebuild 2715
-MISC ChangeLog 17022 RMD160 28acdd4a464e8b6b13e1c85fba16b667e56d2d1c SHA1 3cdbd24dd5a062f7b34ba401e411ea13743b6430 SHA256 12adc7bbed7e958e9488c61f63940f50a47ccd3cee312955f01e09b5431b6f4b
-MD5 dc64571912a9aca8d59ce5cef5c8861d ChangeLog 17022
-RMD160 28acdd4a464e8b6b13e1c85fba16b667e56d2d1c ChangeLog 17022
-SHA256 12adc7bbed7e958e9488c61f63940f50a47ccd3cee312955f01e09b5431b6f4b ChangeLog 17022
+EBUILD graphviz-2.8-r2.ebuild 2822 RMD160 1c5158f1fde723e8ef9384a25773bae6218fc7c8 SHA1 626fd13452355324a8d772dd886905ff22572104 SHA256 6d58806739d78bf9044c64206d5d4f6c6b7575f3ef1ae7cdb7e06ee367131c3b
+MD5 b3f597c70b9070538971c491490bd6be graphviz-2.8-r2.ebuild 2822
+RMD160 1c5158f1fde723e8ef9384a25773bae6218fc7c8 graphviz-2.8-r2.ebuild 2822
+SHA256 6d58806739d78bf9044c64206d5d4f6c6b7575f3ef1ae7cdb7e06ee367131c3b graphviz-2.8-r2.ebuild 2822
+MISC ChangeLog 17186 RMD160 04e836af9f1554f785e6d4e0c9eb750e66c18de4 SHA1 6c40111a9f6af9dea51b2f1ad93100ed61cc5c93 SHA256 74c10b73e6d8c8a83408ebdb7b8fe3c609f8b5ad1c1bccc8bc8c45626a4afe80
+MD5 36344ca1f49802f0e8b228f15dd17da1 ChangeLog 17186
+RMD160 04e836af9f1554f785e6d4e0c9eb750e66c18de4 ChangeLog 17186
+SHA256 74c10b73e6d8c8a83408ebdb7b8fe3c609f8b5ad1c1bccc8bc8c45626a4afe80 ChangeLog 17186
 MISC metadata.xml 1540 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 SHA1 b493bbaade7ae395c87ada0bbef0b0f0e7f7fb08 SHA256 c2a220f962a3048cc026e4c376b6555bfd0be7b401206d0ae3d265d628f231a1
 MD5 e98595ce89ff0da26058b1e6e0ce3d31 metadata.xml 1540
 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 metadata.xml 1540
@@ -88,7 +88,7 @@ SHA256 46c7992c928f975cf353d76bf16f2c1f95442c40aa8d95f9a6914d69f567e802 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF7cBK8bi6rjpTunYRAlo/AKDT8oTeZcRsFPBUmX2HxyhN+pG7eQCfbInL
-3M2ny9LikiqEsJojBlv31KE=
-=vzeU
+iD8DBQFF7ct38bi6rjpTunYRApk+AJ9jbPZQaHOafFzfldgBLdw7dyU9twCgohmu
+OPlVM9YDIkYwQ9IKWMrnIKg=
+=j9cb
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/graphviz/graphviz-2.8-r2.ebuild b/media-gfx/graphviz/graphviz-2.8-r2.ebuild
index 5d32ba9b64df4a3342ee34916b604e4e5ae02561..34f9ce749c2547e38cad253ec48a56538ea94623 100644 (file)
--- a/media-gfx/graphviz/graphviz-2.8-r2.ebuild
+++ b/media-gfx/graphviz/graphviz-2.8-r2.ebuild
@@ -1,9 +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.14 2007/02/20 16:17:51 vapier Exp $
-
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.8-r2.ebuild,v 1.15 2007/03/06 20:13:24 vapier Exp $
 
 inherit eutils libtool autotools
 
@@ -37,9 +34,7 @@ RDEPEND=">=sys-libs/zlib-1.1.3
        ruby? ( dev-lang/ruby )
        X? ( x11-libs/libXaw x11-libs/libXpm )
        sys-devel/libtool"
-
 DEPEND="${RDEPEND}
-       <media-libs/gd-2.0.34
        dev-util/pkgconfig
        tcl? ( dev-lang/swig )
        tk? ( dev-lang/swig )
@@ -61,6 +56,10 @@ src_unpack() {
        # Make sure SWIG interface is rebuilt
        touch tclpkg/gv/gv.i
 
+       # Hack around gd issues #165460 ... this is fixed properly in newer graphviz
+       echo '#include <entities.h>' | $(tc-getCPP) -P -dD > entities.h
+       sed -i '1istatic' entities.h
+
        eautoreconf
 }