summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2007-11-14 23:02:08 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2007-11-14 23:02:08 +0000
commitbccc8d62a485df3e24474ddb11a1d7300f7a6515 (patch)
tree0f02381c1e460223474239ca4af5a70ccfb5d451 /media-gfx
parentupstream fix for using https sites (diff)
downloadhistorical-bccc8d62a485df3e24474ddb11a1d7300f7a6515.tar.gz
historical-bccc8d62a485df3e24474ddb11a1d7300f7a6515.tar.bz2
historical-bccc8d62a485df3e24474ddb11a1d7300f7a6515.zip
Remove old versions.
Package-Manager: portage-2.1.3.19
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/graphviz/ChangeLog9
-rw-r--r--media-gfx/graphviz/Manifest61
-rw-r--r--media-gfx/graphviz/files/digest-graphviz-1.16-r16
-rw-r--r--media-gfx/graphviz/files/digest-graphviz-2.6-r13
-rw-r--r--media-gfx/graphviz/files/digest-graphviz-2.8-r23
-rw-r--r--media-gfx/graphviz/files/graphviz-1.16-build.patch171
-rw-r--r--media-gfx/graphviz/files/graphviz-1.16-common_h.patch11
-rw-r--r--media-gfx/graphviz/files/graphviz-1.16-tempdir.patch22
-rw-r--r--media-gfx/graphviz/files/graphviz-2.6-macos.patch64
-rw-r--r--media-gfx/graphviz/files/graphviz-2.8-notcl.patch15
-rw-r--r--media-gfx/graphviz/graphviz-1.16-r1.ebuild72
-rw-r--r--media-gfx/graphviz/graphviz-2.6-r1.ebuild63
-rw-r--r--media-gfx/graphviz/graphviz-2.8-r2.ebuild105
13 files changed, 16 insertions, 589 deletions
diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 82b2b7137250..a91eaeb26e4d 100644
--- a/media-gfx/graphviz/ChangeLog
+++ b/media-gfx/graphviz/ChangeLog
@@ -1,6 +1,13 @@
# 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.124 2007/07/24 22:05:22 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.125 2007/11/14 23:02:08 betelgeuse Exp $
+
+ 14 Nov 2007; Petteri Räty <betelgeuse@gentoo.org>
+ -files/graphviz-1.16-build.patch, -files/graphviz-1.16-common_h.patch,
+ -files/graphviz-1.16-tempdir.patch, -files/graphviz-2.6-macos.patch,
+ -files/graphviz-2.8-notcl.patch, -graphviz-1.16-r1.ebuild,
+ -graphviz-2.6-r1.ebuild, -graphviz-2.8-r2.ebuild:
+ Remove old versions.
24 Jul 2007; Markus Ullmann <jokey@gentoo.org>
+files/graphviz-2.12-parallel-build.patch, graphviz-2.12.ebuild:
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index f9e9bb86267a..231d20980e41 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,18 +1,6 @@
-----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
-SHA256 30e792d61416121692fd7cd1baa856ba2ab724dfe00bd56ff676bead07274e2d files/graphviz-1.16-build.patch 6200
-AUX graphviz-1.16-common_h.patch 292 RMD160 3fc05be6d1f8c00bb309d3979148c21d2245a067 SHA1 00492a6ca838bfe70fac5f2a9dfacfe3d025e81d SHA256 adb6dbbba58b389e38572bf69bb8658b0cd466f2ddfaa9d14f21b6d3f96e4650
-MD5 5c7f01258da58810d0175461e0c1d14b files/graphviz-1.16-common_h.patch 292
-RMD160 3fc05be6d1f8c00bb309d3979148c21d2245a067 files/graphviz-1.16-common_h.patch 292
-SHA256 adb6dbbba58b389e38572bf69bb8658b0cd466f2ddfaa9d14f21b6d3f96e4650 files/graphviz-1.16-common_h.patch 292
-AUX graphviz-1.16-tempdir.patch 1091 RMD160 0c36178e3eca92e7dc6737a4ef646b57e21e57d8 SHA1 4702ac4b785568074ae1823bbad20f7c4ffae3c8 SHA256 a1d25ed0a81a88f912b6d9614b98154e1379cf7f8182fb566ec45e71e3bf3592
-MD5 3dcab6b1ffd0469fd6614a8ea4458366 files/graphviz-1.16-tempdir.patch 1091
-RMD160 0c36178e3eca92e7dc6737a4ef646b57e21e57d8 files/graphviz-1.16-tempdir.patch 1091
-SHA256 a1d25ed0a81a88f912b6d9614b98154e1379cf7f8182fb566ec45e71e3bf3592 files/graphviz-1.16-tempdir.patch 1091
AUX graphviz-2.12-bindings.patch 4589 RMD160 129ec88bc42df0555ac96abfa9bf8d4e48378b6c SHA1 1f591d4a9e884fdc6181aad822eab9f06832901b SHA256 75120e3c7d9636fc35e2802d7c1b9902faa5e901a17ab88f939a020970776820
MD5 863e7117b07645eecc9254de4d774df8 files/graphviz-2.12-bindings.patch 4589
RMD160 129ec88bc42df0555ac96abfa9bf8d4e48378b6c files/graphviz-2.12-bindings.patch 4589
@@ -33,59 +21,26 @@ AUX graphviz-2.12-parallel-build.patch 3050 RMD160 61e104de3f8a7823b6c9669a9e70c
MD5 d28226e3e7a6a84a260ae7bf8ad607ad files/graphviz-2.12-parallel-build.patch 3050
RMD160 61e104de3f8a7823b6c9669a9e70c3f61b81ba2b files/graphviz-2.12-parallel-build.patch 3050
SHA256 8a5bba5cd9f158b3db962d0198e6138560dcc8ce198fdbfade8765d9a162fa9c files/graphviz-2.12-parallel-build.patch 3050
-AUX graphviz-2.6-macos.patch 2074 RMD160 fe3f407fb45c00957dfa838ada2d8f9e54d6be63 SHA1 be35a5edd118bef2c9c54ac3d81e2a5871c32316 SHA256 038b4f20837661519f84eccfe7e6e66f8b5bb2afa48403347fa9ae7067933281
-MD5 ef70bc2df3a59b497609b809787e6ea3 files/graphviz-2.6-macos.patch 2074
-RMD160 fe3f407fb45c00957dfa838ada2d8f9e54d6be63 files/graphviz-2.6-macos.patch 2074
-SHA256 038b4f20837661519f84eccfe7e6e66f8b5bb2afa48403347fa9ae7067933281 files/graphviz-2.6-macos.patch 2074
-AUX graphviz-2.8-notcl.patch 597 RMD160 33b38d5e1fb72dbe0e9b60cd5c58617dd6a9eb9a SHA1 1e4d7f8d7f4637162e033ffc74c30de66774c48a SHA256 9158e2ee37b537d58e7325f76e677dcfab640c43554cbf35d22d1b618cef12a8
-MD5 65a1e6939d49ecf72fb450be96465fde files/graphviz-2.8-notcl.patch 597
-RMD160 33b38d5e1fb72dbe0e9b60cd5c58617dd6a9eb9a files/graphviz-2.8-notcl.patch 597
-SHA256 9158e2ee37b537d58e7325f76e677dcfab640c43554cbf35d22d1b618cef12a8 files/graphviz-2.8-notcl.patch 597
-DIST graphviz-1.16-panic.patch.tar.bz2 201 RMD160 99c11a90d912e05040aa08b8765a37da99a64745 SHA1 7bc8a2a51fa7554b8d91cf2876bb1cacb38bc5f9 SHA256 96a2b2a1f84116b4ca10b46a554cad2845742dd3b294e0affde431c9d1e30fa1
-DIST graphviz-1.16.tar.gz 4387670 RMD160 c21988105cc1fe29b65abe5c26977c0a0083092f SHA1 f613884100c62fb409ec5a2571df46d9caafe5e0 SHA256 5efa714f0634b42da99696db8610f82d734cb94d06efb5deae5b7c8e755b08df
DIST graphviz-2.12.tar.gz 4607023 RMD160 68d55176cd5ce0e6a25c90b443529747e738d5c6 SHA1 aa48a926395a57c6c7e1e755b9432a29461538e3 SHA256 5191892d7950c28754659f703234f7888f132440a049f0d396f287b202f9e37f
-DIST graphviz-2.6.tar.gz 4109848 RMD160 555c6c635b5271b09ffb7ee142192a1b4ec07919 SHA1 062897f364c905f33852caff93899df97c817def SHA256 5208949dd8702205a5d65dfee4439870e36681aa076220cb159d28536fa2cca9
-DIST graphviz-2.8.tar.gz 4243130 RMD160 d3b46e9777e9db5ead4fdf5274c6bd10823fe4cd SHA1 fca24335689de909d1f2af09d408ae4a9c41dbca SHA256 be0c4b7e49f7c226c68d54bb47018f3b3bfb51bb992f5ad71da875cad13367ca
-EBUILD graphviz-1.16-r1.ebuild 2132 RMD160 08a7f89728e5e305fa702792faeb7fa47255f103 SHA1 eacdd90b1f83e9d28f5e7c8a1f3e7f4840de26e0 SHA256 617218762e255884a60f1f3c5ba2d66c928783639ae0eab3e32a78120d2c0d05
-MD5 f614fb57220fecfe100867a8ee3266a6 graphviz-1.16-r1.ebuild 2132
-RMD160 08a7f89728e5e305fa702792faeb7fa47255f103 graphviz-1.16-r1.ebuild 2132
-SHA256 617218762e255884a60f1f3c5ba2d66c928783639ae0eab3e32a78120d2c0d05 graphviz-1.16-r1.ebuild 2132
EBUILD graphviz-2.12.ebuild 5501 RMD160 2042dcaf8e193e9e35cf63a083e5fedc79a937e6 SHA1 8e7e7a251d79445cacba55eee46f09bb9563027b SHA256 6cb3ccac26eee173c2c6830f1db4c2eec3cbd5a59b6d8af9fc947ff105eb5da9
MD5 16a46f7ee1a3035cee7928367f736288 graphviz-2.12.ebuild 5501
RMD160 2042dcaf8e193e9e35cf63a083e5fedc79a937e6 graphviz-2.12.ebuild 5501
SHA256 6cb3ccac26eee173c2c6830f1db4c2eec3cbd5a59b6d8af9fc947ff105eb5da9 graphviz-2.12.ebuild 5501
-EBUILD graphviz-2.6-r1.ebuild 1610 RMD160 8754f0492209dfe3ff78af099e39e5163b9df82a SHA1 0b8293a27416e06badb32a5dd0f534aeee99434a SHA256 23d0ee6c77f5ba7223ed2901151802261d8d7902d10e242cf0f93e6dd252cb9e
-MD5 e67442e3bf0b6786c463b0c5defe9b29 graphviz-2.6-r1.ebuild 1610
-RMD160 8754f0492209dfe3ff78af099e39e5163b9df82a graphviz-2.6-r1.ebuild 1610
-SHA256 23d0ee6c77f5ba7223ed2901151802261d8d7902d10e242cf0f93e6dd252cb9e graphviz-2.6-r1.ebuild 1610
-EBUILD graphviz-2.8-r2.ebuild 2838 RMD160 2ae161ce0c1e4e235a1036ee41727e352ae047cf SHA1 da5897f3fe7ff1891915aec14b721d68d260db49 SHA256 0c3dab4e083f839086daca2cc5e3493c4b3b689eb255c1071a0365870c4a7583
-MD5 01387a6214d7bc28ec4d4e20676ccab3 graphviz-2.8-r2.ebuild 2838
-RMD160 2ae161ce0c1e4e235a1036ee41727e352ae047cf graphviz-2.8-r2.ebuild 2838
-SHA256 0c3dab4e083f839086daca2cc5e3493c4b3b689eb255c1071a0365870c4a7583 graphviz-2.8-r2.ebuild 2838
-MISC ChangeLog 18511 RMD160 dd59c6b63032f5edad29661f0ddd96f7ccfa114c SHA1 6b0ab557c62d3dfe7c1ba9ab6a625efd02022bbe SHA256 9a9c582314ab379f3b74b264e9a470883a52aa6b8c7414cac61fc0f06f04414f
-MD5 0b02c5409211cda684a4ab2a75bf7617 ChangeLog 18511
-RMD160 dd59c6b63032f5edad29661f0ddd96f7ccfa114c ChangeLog 18511
-SHA256 9a9c582314ab379f3b74b264e9a470883a52aa6b8c7414cac61fc0f06f04414f ChangeLog 18511
+MISC ChangeLog 18850 RMD160 ca643ce59b7f1ad073de37f85a7077dcb1857e9d SHA1 c03c6a74739ce30cb56e0745d0efcbfcdccb7d52 SHA256 dda2e3c2e2654e61509b790586a0aba75dc0b1846c0e05d8140111ad80e3a2fa
+MD5 052269cf6c4ddc747386d02f2171efd4 ChangeLog 18850
+RMD160 ca643ce59b7f1ad073de37f85a7077dcb1857e9d ChangeLog 18850
+SHA256 dda2e3c2e2654e61509b790586a0aba75dc0b1846c0e05d8140111ad80e3a2fa ChangeLog 18850
MISC metadata.xml 1540 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 SHA1 b493bbaade7ae395c87ada0bbef0b0f0e7f7fb08 SHA256 c2a220f962a3048cc026e4c376b6555bfd0be7b401206d0ae3d265d628f231a1
MD5 e98595ce89ff0da26058b1e6e0ce3d31 metadata.xml 1540
RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 metadata.xml 1540
SHA256 c2a220f962a3048cc026e4c376b6555bfd0be7b401206d0ae3d265d628f231a1 metadata.xml 1540
-MD5 33a91302be8fcff63bad321235b04ea1 files/digest-graphviz-1.16-r1 515
-RMD160 57523d4e5d9aecf5a799c612a4a8f7c6b5322014 files/digest-graphviz-1.16-r1 515
-SHA256 057e43026a8b2d262ab548143caead56aca94dc9f47a8c0a7e3113fb4abaa8f1 files/digest-graphviz-1.16-r1 515
MD5 d204a34ace86880478f5a33991557cb2 files/digest-graphviz-2.12 244
RMD160 1e9930b618ed6910ace95264981c8685a64fba2b files/digest-graphviz-2.12 244
SHA256 9a0abc504a064e221e65eb90551cc2e5d87056ae2809ebee51420b038f5dabff files/digest-graphviz-2.12 244
-MD5 6c2cea84c578d35daed5c751084d3c29 files/digest-graphviz-2.6-r1 241
-RMD160 b175ffd15be723416baa210d70ec90922c7cac0f files/digest-graphviz-2.6-r1 241
-SHA256 9302285aa30bde290629f8252cfa2a3a0f738c675d45c27182dbbcde12093ff8 files/digest-graphviz-2.6-r1 241
-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 v2.0.5 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
-iD8DBQFGpnetz974XjDVpbkRAqJ9AJ0S6bfTpZW6y9rwy/iVqwQyea5l9gCfTuPr
-+oRZ3DsMTBLIH8jY4K+u3Xw=
-=mfCH
+iD8DBQFHO35rcxLzpIGCsLQRAiF/AJ0bymhFvMiPaG1PReDSHluY4tyVbgCfUlvh
+mweO/mKk4iwnhy087tkvyMM=
+=ugTr
-----END PGP SIGNATURE-----
diff --git a/media-gfx/graphviz/files/digest-graphviz-1.16-r1 b/media-gfx/graphviz/files/digest-graphviz-1.16-r1
deleted file mode 100644
index 993e724aee25..000000000000
--- a/media-gfx/graphviz/files/digest-graphviz-1.16-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 4bb340f3154679f952a1a45fdf11ffc1 graphviz-1.16-panic.patch.tar.bz2 201
-RMD160 99c11a90d912e05040aa08b8765a37da99a64745 graphviz-1.16-panic.patch.tar.bz2 201
-SHA256 96a2b2a1f84116b4ca10b46a554cad2845742dd3b294e0affde431c9d1e30fa1 graphviz-1.16-panic.patch.tar.bz2 201
-MD5 a2a3bd1b9fe807c46e676fb9a3f0ba22 graphviz-1.16.tar.gz 4387670
-RMD160 c21988105cc1fe29b65abe5c26977c0a0083092f graphviz-1.16.tar.gz 4387670
-SHA256 5efa714f0634b42da99696db8610f82d734cb94d06efb5deae5b7c8e755b08df graphviz-1.16.tar.gz 4387670
diff --git a/media-gfx/graphviz/files/digest-graphviz-2.6-r1 b/media-gfx/graphviz/files/digest-graphviz-2.6-r1
deleted file mode 100644
index 775cb0fc8ae5..000000000000
--- a/media-gfx/graphviz/files/digest-graphviz-2.6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0d61fc4f8660be31503d4f9ab6f26bf0 graphviz-2.6.tar.gz 4109848
-RMD160 555c6c635b5271b09ffb7ee142192a1b4ec07919 graphviz-2.6.tar.gz 4109848
-SHA256 5208949dd8702205a5d65dfee4439870e36681aa076220cb159d28536fa2cca9 graphviz-2.6.tar.gz 4109848
diff --git a/media-gfx/graphviz/files/digest-graphviz-2.8-r2 b/media-gfx/graphviz/files/digest-graphviz-2.8-r2
deleted file mode 100644
index 7b7f660f37dd..000000000000
--- a/media-gfx/graphviz/files/digest-graphviz-2.8-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ca921b4a9bcd86da4a1092bb17a57d83 graphviz-2.8.tar.gz 4243130
-RMD160 d3b46e9777e9db5ead4fdf5274c6bd10823fe4cd graphviz-2.8.tar.gz 4243130
-SHA256 be0c4b7e49f7c226c68d54bb47018f3b3bfb51bb992f5ad71da875cad13367ca graphviz-2.8.tar.gz 4243130
diff --git a/media-gfx/graphviz/files/graphviz-1.16-build.patch b/media-gfx/graphviz/files/graphviz-1.16-build.patch
deleted file mode 100644
index 774ecdd6d354..000000000000
--- a/media-gfx/graphviz/files/graphviz-1.16-build.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-diff -Naur graphviz-1.16.orig/dynagraph/common/emitGraph.h graphviz-1.16/dynagraph/common/emitGraph.h
---- graphviz-1.16.orig/dynagraph/common/emitGraph.h 2004-12-15 10:33:13.782250240 +0100
-+++ graphviz-1.16/dynagraph/common/emitGraph.h 2004-12-15 10:37:57.826069016 +0100
-@@ -18,7 +18,7 @@
- template<typename G>
- void emitGraph(std::ostream &os,G *g) {
- os << "digraph " << mquote(gd<Name>(g));
-- os << " {" << endl << "\tgraph ";
-+ os << " {" << std::endl << "\tgraph ";
- emitAttrs(os,gd<StrAttrs>(g));
- for(typename G::node_iter ni = g->nodes().begin(); ni!=g->nodes().end(); ++ni) {
- os << '\t' << mquote(gd<Name>(*ni)) << ' ';
-@@ -44,7 +44,7 @@
- Name &gname = (ati!=gd<StrAttrs>(g).end())?ati->second:gd<Name>(g);
-
- os << "digraph " << mquote(gname);
-- os << " {" << endl << "\tgraph ";
-+ os << " {" << std::endl << "\tgraph ";
- emitAttrs(os,gd<StrAttrs>(g));
- for(typename G::node_iter ni = g->nodes().begin(); ni!=g->nodes().end(); ++ni) {
- StrAttrs::iterator ati = gd<StrAttrs>(*ni).find("label");
-diff -Naur graphviz-1.16.orig/dynagraph/common/LGraph-cdt.h graphviz-1.16/dynagraph/common/LGraph-cdt.h
---- graphviz-1.16.orig/dynagraph/common/LGraph-cdt.h 2004-12-15 10:33:13.704262096 +0100
-+++ graphviz-1.16/dynagraph/common/LGraph-cdt.h 2004-12-15 10:37:37.368179088 +0100
-@@ -232,10 +232,10 @@
- return !(*this==other);
- }
- inedge_iter inIter() {
-- return head()->inIter(this);
-+ return this->head()->inIter(this);
- }
- outedge_iter outIter() {
-- return tail()->outIter(this);
-+ return this->tail()->outIter(this);
- }
- };
- // workaround for circular typing problems w/ friend decl: do not call!
-diff -Naur graphviz-1.16.orig/dynagraph/common/traversal.h graphviz-1.16/dynagraph/common/traversal.h
---- graphviz-1.16.orig/dynagraph/common/traversal.h 2004-12-15 10:33:13.783250088 +0100
-+++ graphviz-1.16/dynagraph/common/traversal.h 2004-12-15 10:38:10.825092864 +0100
-@@ -78,10 +78,10 @@
- }
- DFS &operator++() {
- if(m_curr.e)
-- gd<Hit>(m_curr.e)[m_hitpos] = true;
-+ gd<Hit>(m_curr.e)[this->m_hitpos] = true;
- else {
- assert(m_curr.n);
-- gd<Hit>(m_curr.n)[m_hitpos] = true;
-+ gd<Hit>(m_curr.n)[this->m_hitpos] = true;
- }
- // try edges
- if(m_curr.n && follow())
-@@ -143,10 +143,10 @@
- }
- bool outs(typename G::outedge_iter start) {
- for(typename G::outedge_iter ei = start; ei!=m_curr.n->outs().end(); ++ei)
-- if(!gd<Hit>(*ei)[m_hitpos]) {
-+ if(!gd<Hit>(*ei)[this->m_hitpos]) {
- m_stack.push(m_curr);
- m_curr.e = *ei;
-- if(!gd<Hit>(m_curr.e->head)[m_hitpos])
-+ if(!gd<Hit>(m_curr.e->head)[this->m_hitpos])
- m_curr.n = m_curr.e->head;
- else
- m_curr.n = 0;
-@@ -156,10 +156,10 @@
- }
- bool ins(typename G::inedge_iter start) {
- for(typename G::inedge_iter ei = start; ei!=m_curr.n->ins().end(); ++ei)
-- if(!gd<Hit>(*ei)[m_hitpos]) {
-+ if(!gd<Hit>(*ei)[this->m_hitpos]) {
- m_stack.push(m_curr);
- m_curr.e = *ei;
-- if(!gd<Hit>(m_curr.e->tail)[m_hitpos])
-+ if(!gd<Hit>(m_curr.e->tail)[this->m_hitpos])
- m_curr.n = m_curr.e->tail;
- else
- m_curr.n = 0;
-@@ -180,8 +180,8 @@
- return true;
- }
- bool next() {
-- for(;m_nodeiter!=m_g->parent->nodes().end();++m_nodeiter)
-- if(!gd<Hit>(*m_nodeiter)[m_hitpos]) {
-+ for(;m_nodeiter!=this->m_g->parent->nodes().end();++m_nodeiter)
-+ if(!gd<Hit>(*m_nodeiter)[this->m_hitpos]) {
- m_curr.e = 0;
- m_curr.n = *m_nodeiter;
- m_nodeiter++;
-@@ -205,31 +205,31 @@
- if(last.n) {
- if(m_inwards)
- for(typename G::inedge_iter ei = last.n->ins().begin(); ei!=last.n->ins().end(); ++ei)
-- if(!gd<Hit>(*ei)[m_hitpos]) {
-+ if(!gd<Hit>(*ei)[this->m_hitpos]) {
- Node *t = (*ei)->tail;
-- if(gd<Hit>(t)[m_hitpos])
-+ if(gd<Hit>(t)[this->m_hitpos])
- t = 0;
- else
-- gd<Hit>(t)[m_hitpos] = true;
-+ gd<Hit>(t)[this->m_hitpos] = true;
- m_queue.push(V(*ei,t));
-- gd<Hit>(*ei)[m_hitpos] = true;
-+ gd<Hit>(*ei)[this->m_hitpos] = true;
- }
- if(m_outwards)
- for(typename G::outedge_iter ei = last.n->outs().begin(); ei!=last.n->outs().end(); ++ei)
-- if(!gd<Hit>(*ei)[m_hitpos]) {
-+ if(!gd<Hit>(*ei)[this->m_hitpos]) {
- Node *h = (*ei)->head;
-- if(gd<Hit>(h)[m_hitpos])
-+ if(gd<Hit>(h)[this->m_hitpos])
- h = 0;
- else
-- gd<Hit>(h)[m_hitpos] = true;
-+ gd<Hit>(h)[this->m_hitpos] = true;
- m_queue.push(V(*ei,h));
-- gd<Hit>(*ei)[m_hitpos] = true;
-+ gd<Hit>(*ei)[this->m_hitpos] = true;
- }
- }
- if(m_queue.empty())
-- for(;m_nodeiter!=m_g->nodes().end(); ++m_nodeiter)
-- if(!gd<Hit>(*m_nodeiter)[m_hitpos]) {
-- gd<Hit>(*m_nodeiter)[m_hitpos] = true;
-+ for(;m_nodeiter!=this->m_g->nodes().end(); ++m_nodeiter)
-+ if(!gd<Hit>(*m_nodeiter)[this->m_hitpos]) {
-+ gd<Hit>(*m_nodeiter)[this->m_hitpos] = true;
- m_queue.push(V(0,*m_nodeiter++));
- break;
- }
-@@ -241,7 +241,7 @@
- BFS(G *g,typename G::Node *start = 0,bool inwards=true,bool outwards=true) : Traversal<G>(g),m_inwards(inwards),m_outwards(outwards) {
- m_nodeiter = start?g->iter(start):g->nodes().begin();
- if(m_nodeiter!=g->nodes().end()) {
-- gd<Hit>(*m_nodeiter)[m_hitpos] = true;
-+ gd<Hit>(*m_nodeiter)[this->m_hitpos] = true;
- m_queue.push(V(0,*m_nodeiter++));
- }
- }
-diff -Naur graphviz-1.16.orig/dynagraph/dynadag/DynaDAG.h graphviz-1.16/dynagraph/dynadag/DynaDAG.h
---- graphviz-1.16.orig/dynagraph/dynadag/DynaDAG.h 2004-12-15 10:33:13.784249936 +0100
-+++ graphviz-1.16/dynagraph/dynadag/DynaDAG.h 2004-12-15 10:36:44.968145104 +0100
-@@ -209,10 +209,10 @@
- typename Chain<N,E>::edge_iter ei;
- };
- node_iter nBegin() {
-- return node_iter(eBegin(),false);
-+ return node_iter(this->eBegin(),false);
- }
- node_iter nEnd() {
-- return node_iter(eEnd(),true);
-+ return node_iter(this->eEnd(),true);
- }
- Position pos() {
- if(!top() || !DDd(top()).cur.valid)
-@@ -220,10 +220,10 @@
- return Position(DDd(top()).cur.x,(DDd(top()).cur.y+DDd(bottom()).cur.y)/2.0);
- }
- N *top() {
-- return node?node:first->tail;
-+ return node?node:this->first->tail;
- }
- N *bottom() {
-- return node?node:last->head;
-+ return node?node:this->last->head;
- }
- int len() {
- int n=0;
diff --git a/media-gfx/graphviz/files/graphviz-1.16-common_h.patch b/media-gfx/graphviz/files/graphviz-1.16-common_h.patch
deleted file mode 100644
index e4c6f53dc004..000000000000
--- a/media-gfx/graphviz/files/graphviz-1.16-common_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lefty/common.h.sav Thu Sep 16 09:15:07 2004
-+++ lefty/common.h Thu Sep 16 09:15:42 2004
-@@ -17,6 +17,8 @@
- #ifndef _COMMON_H
- #define _COMMON_H
-
-+#include <sys/types.h>
-+
- /* some config and conversion definitions from graphviz distribution */
- #ifdef HAVE_CONFIG_H
- #include "config.h"
diff --git a/media-gfx/graphviz/files/graphviz-1.16-tempdir.patch b/media-gfx/graphviz/files/graphviz-1.16-tempdir.patch
deleted file mode 100644
index d7c1ee154652..000000000000
--- a/media-gfx/graphviz/files/graphviz-1.16-tempdir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -u graphviz-1.16/dotty.old/dotty.lefty graphviz-1.16/dotty/dotty.lefty
---- graphviz-1.16/dotty.old/dotty.lefty 2005-11-11 11:11:07.000000000 +0100
-+++ graphviz-1.16/dotty/dotty.lefty 2005-11-11 11:13:12.000000000 +0100
-@@ -668,8 +668,8 @@
- if (~(otype = ask ('print to', 'choice', 'file|printer')))
- return;
- if (otype == 'printer') {
-- name = '/tmp/dottyout.ps';
-- if (getenv ('LEFTYWINSYS') ~= 'mswin' & ~pr)
-+ name = concat (getenv ('HOME'), '/.dottyout.ps');
-+ if (getenv ('LEFTYWINSYS') ~= 'mswin' & ~pr)
- if (~(pr = ask ('printer command', 'string', 'lpr')))
- return;
- }
-@@ -768,5 +768,5 @@
- vt.canvas = canvas;
- destroywidget (pscanvas);
- if (otype == 'printer' & getenv ('LEFTYWINSYS') ~= 'mswin')
-- system (concat (pr, ' /tmp/dottyout.ps; rm /tmp/dottyout.ps'));
-+ system (concat (pr, ' ', name, '; rm ',name));
- };
-Common subdirectories: /var/tmp/portage/graphviz-1.16-r1/work/graphviz-1.16/dotty.old/mswin32 and /var/tmp/portage/graphviz-1.16-r1/work/graphviz-1.16/dotty/mswin32
diff --git a/media-gfx/graphviz/files/graphviz-2.6-macos.patch b/media-gfx/graphviz/files/graphviz-2.6-macos.patch
deleted file mode 100644
index ad95dd9ba7f4..000000000000
--- a/media-gfx/graphviz/files/graphviz-2.6-macos.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- lib/ast/pathpath.c
-+++ lib/ast/pathpath.c
-@@ -33,7 +33,12 @@
- #include <unistd.h>
-
- /* #include <option.h> */
-+#ifdef __APPLE__
-+#include <crt_externs.h>
-+#define environ (*_NSGetEnviron())
-+#else
- extern char **environ;
-+#endif
- char **opt_info_argv;
-
- char *pathpath(register char *path, const char *p, const char *a, int mode)
---- lib/expr/Makefile.in
-+++ lib/expr/Makefile.in
-@@ -362,7 +362,11 @@
- pkglib_LTLIBRARIES = libexpr.la
- man_MANS = expr.3
- pdf_DATA = expr.pdf
-+ifeq ($(host_os),darwin)
-+libexpr_la_LDFLAGS = -version-info @VERSION_INFO@
-+else
- libexpr_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
-+endif
- libexpr_la_SOURCES = excc.c excontext.c exdata.c exerror.c \
- exeval.c exexpr.c exlexname.c exopen.c exrewind.c extoken.c \
- extype.c exzero.c exparse.y
---- lib/plugin/Makefile.in
-+++ lib/plugin/Makefile.in
-@@ -370,7 +370,13 @@
- libgvplugin_dot_layout.la \
- libgvplugin_usershape_gd.la
-
--libgvplugin_neato_layout_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
-+ifneq ($(host_os),darwin)
-+EXTRALDFLAGS="-no_undefined"
-+else
-+EXTRALDFLAGS=""
-+endif
-+
-+libgvplugin_neato_layout_la_LDFLAGS = -version-info @VERSION_INFO@ $(EXTRALDFLAGS)
- libgvplugin_neato_layout_la_SOURCES = \
- gvplugin_neato_layout.c \
- gvlayout_neato_layout.c
-@@ -384,7 +390,7 @@
- $(top_builddir)/lib/pack/libpack.la \
- $(top_builddir)/lib/gvc/libgvc.la
-
--libgvplugin_dot_layout_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
-+libgvplugin_dot_layout_la_LDFLAGS = -version-info @VERSION_INFO@ $(EXTRALDFLAGS)
- libgvplugin_dot_layout_la_SOURCES = \
- gvplugin_dot_layout.c \
- gvlayout_dot_layout.c
-@@ -394,7 +400,7 @@
- $(top_builddir)/lib/pathplan/libpathplan.la \
- $(top_builddir)/lib/gvc/libgvc.la
-
--libgvplugin_usershape_gd_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
-+libgvplugin_usershape_gd_la_LDFLAGS = -version-info @VERSION_INFO@ $(EXTRALDFLAGS)
- libgvplugin_usershape_gd_la_SOURCES = \
- gvplugin_usershape_gd.c \
- gvusershape_gd.c
diff --git a/media-gfx/graphviz/files/graphviz-2.8-notcl.patch b/media-gfx/graphviz/files/graphviz-2.8-notcl.patch
deleted file mode 100644
index 9937bcefa8e4..000000000000
--- a/media-gfx/graphviz/files/graphviz-2.8-notcl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- graphviz-2.8-old/tclpkg/gv/Makefile.am 2006-05-28 20:02:32.000000000 +0300
-+++ graphviz-2.8/tclpkg/gv/Makefile.am 2006-05-28 20:17:05.000000000 +0300
-@@ -170,7 +170,12 @@
- gv_sharp.man gv_guile.man gv_io.man gv_java.man gv_lua.man \
- gv_ocaml.man gv_perl.man gv_php.man gv_python.man gv_ruby.man \
- gv_tcl.man: gv.i gv_doc_writer.tcl gv_doc_template.tcl gv_doc_langs.tcl
-+if WITH_TCL
- tclsh ./gv_doc_writer.tcl
-+else
-+ echo "Not building man pages as they would require tcl"
-+ touch $@
-+endif
-
- install-data-hook:
- (cd $(DESTDIR)$(pkgluadir); rm -f gv.so; $(LN_S) libgv_lua.so gv.so;)
diff --git a/media-gfx/graphviz/graphviz-1.16-r1.ebuild b/media-gfx/graphviz/graphviz-1.16-r1.ebuild
deleted file mode 100644
index 3182730d2962..000000000000
--- a/media-gfx/graphviz/graphviz-1.16-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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-1.16-r1.ebuild,v 1.8 2007/07/12 04:08:47 mr_bones_ Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="open source graph drawing software"
-HOMEPAGE="http://www.research.att.com/sw/tools/graphviz/"
-SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz
- ppc-macos? ( mirror://gentoo/${P}-panic.patch.tar.bz2 )"
-
-LICENSE="as-is ATT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc-macos ppc64 s390 sh sparc x86"
-IUSE="tk"
-
-#Can use freetype-1.3 or 2.0, but not both
-DEPEND=">=sys-libs/zlib-1.1.3
- >=media-libs/libpng-1.2
- >=media-libs/jpeg-6b
- media-libs/freetype
- dev-util/pkgconfig
- sys-devel/gettext
- >=media-libs/gd-2.0.29
- media-libs/fontconfig
- tk? ( >=dev-lang/tk-8.3 )"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- epatch ${FILESDIR}/${P}-build.patch
- epatch ${FILESDIR}/${P}-tempdir.patch
-
- if use ppc-macos; then
- # fixes weird make issue
- epatch ${WORKDIR}/${P}-panic.patch
- epatch ${FILESDIR}/${P}-common_h.patch
- fi
-
- if ! use ppc-macos; then
- #EPATCH_OPTS="-p1 -d${S}" epatch ${FILESDIR}/${P}-fontconfig-externalgd.diff || die "Failed to patch"
- einfo "Running aclocal/automake/autoconf"
- aclocal && libtoolize --copy --force && automake -a && autoconf || die "Failed to aclocal/libtoolize/automake/autoconf"
- fi
-}
-
-src_compile() {
- local myconf
-
- # if no tk, this will generate configure warnings, but will
- # compile without tcl and tk support
- use tk || myconf="${myconf} --without-tcl --without-tk"
-
- myconf="${myconf} --enable-dynagraph --with-mylibgd"
- use ppc-macos && myconf="${myconf} --with-expatincludedir=/usr/X11R6/include --with-expatlibdir=/usr/X11R6/lib --with-fontconfigincludedir=/usr/X11R6/include --with-fontconfiglibdir=/usr/X11R6/lib"
- econf ${myconf} || die "econf failed"
-
- emake || die
-}
-
-src_install() {
- make DESTDIR=${D} install || die
-
- dodoc AUTHORS ChangeLog FAQ.txt INSTALL* MINTERMS.txt \
- NEWS README*
-
- insinto /usr/share/doc/${PF}/
- doins doc/*.pdf
-
- dohtml -r .
- dodoc doc/*.pdf doc/Dot.ref
-}
diff --git a/media-gfx/graphviz/graphviz-2.6-r1.ebuild b/media-gfx/graphviz/graphviz-2.6-r1.ebuild
deleted file mode 100644
index 82b3b2e6eb37..000000000000
--- a/media-gfx/graphviz/graphviz-2.6-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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.6-r1.ebuild,v 1.9 2007/07/22 09:57:04 dberkholz Exp $
-
-inherit eutils libtool
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="http://www.graphviz.org/"
-SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="cairo tcl tk X static"
-
-RDEPEND=">=sys-libs/zlib-1.1.3
- >=media-libs/libpng-1.2
- >=media-libs/jpeg-6b
- media-libs/freetype
- media-libs/fontconfig
- dev-libs/expat
- sys-libs/zlib
- tk? ( >=dev-lang/tk-8.3 )
- tcl? ( >=dev-lang/tcl-8.3 )
- cairo? ( >=x11-libs/libsvg-cairo-0.1.3 )
- X? ( x11-libs/libXaw x11-libs/libXpm )"
-
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}/${P}"-macos.patch || die "epatch failed"
-
- elibtoolize
-}
-
-src_compile() {
- econf --with-mylibgd \
- --disable-dependency-tracking \
- --without-ruby \
- $(use_enable static) \
- $(use_with tcl) \
- $(use_with tk) \
- $(use_with X x) || die "Configure Failed!"
- emake || die "Compile Failed!"
-}
-
-src_install() {
- sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile
- make DESTDIR="${D}" \
- txtdir=/usr/share/doc/${PF} \
- htmldir=/usr/share/doc/${PF}/html \
- htmlinfodir=/usr/share/doc/${PF}/html/info \
- pdfdir=/usr/share/doc/${PF}/pdf \
- pkgconfigdir=/usr/$(get_libdir)/pkgconfig \
- install || die "Install Failed!"
-}
-
-pkg_postinst() {
- dot -c
-}
diff --git a/media-gfx/graphviz/graphviz-2.8-r2.ebuild b/media-gfx/graphviz/graphviz-2.8-r2.ebuild
deleted file mode 100644
index cee47086dc50..000000000000
--- a/media-gfx/graphviz/graphviz-2.8-r2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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.16 2007/03/10 22:22:14 vapier Exp $
-
-inherit eutils libtool autotools toolchain-funcs
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="http://www.graphviz.org/"
-SRC_URI="http://www.graphviz.org/pub/graphviz/ARCHIVE/${P}.tar.gz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="cairo tcl tk X static guile java lua perl php python ruby ocaml minimal"
-
-RDEPEND=">=sys-libs/zlib-1.1.3
- >=media-libs/libpng-1.2
- >=media-libs/jpeg-6b
- media-libs/gd
- media-libs/freetype
- media-libs/fontconfig
- dev-libs/expat
- sys-libs/zlib
- cairo? ( >=x11-libs/libsvg-cairo-0.1.3 )
- tk? ( >=dev-lang/tk-8.3 )
- tcl? ( >=dev-lang/tcl-8.3 )
- guile? ( <dev-scheme/guile-1.8 )
- java? ( virtual/jdk )
- perl? ( dev-lang/perl )
- ocaml? ( dev-lang/ocaml )
- lua? ( dev-lang/lua )
- php? ( dev-lang/php )
- python? ( dev-lang/python )
- ruby? ( dev-lang/ruby )
- X? ( x11-libs/libXaw x11-libs/libXpm )
- sys-devel/libtool"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- tcl? ( dev-lang/swig )
- tk? ( dev-lang/swig )
- guile? ( dev-lang/swig )
- java? ( dev-lang/swig )
- perl? ( dev-lang/swig )
- ocaml? ( >=dev-lang/swig-1.3.31 )
- lua? ( >=dev-lang/swig-1.3.31 )
- php? ( dev-lang/swig )
- python? ( dev-lang/swig )
- ruby? ( dev-lang/swig )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-notcl.patch
- sed -i 's:LC_COLLATE=C:LC_ALL=C:g' lib/common/Makefile.* #134834
-
- # 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
-}
-
-src_compile() {
- local my_conf
- econf ${my_conf} \
- --disable-dependency-tracking \
- $(use_enable static) \
- $(use_with tcl) \
- $(use_with tk) \
- $(use_enable guile) \
- $(use_enable java) \
- $(use_enable lua) \
- $(use_enable ocaml) \
- $(use_enable perl) \
- $(use_enable php) \
- $(use_enable python) \
- $(use_enable ruby) \
- --disable-{sharp,io} \
- $(use_with X x) \
- || die "Configure Failed!"
- emake || die "Compile Failed!"
-}
-
-src_install() {
- sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile
- make DESTDIR="${D}" \
- txtdir=/usr/share/doc/${PF} \
- htmldir=/usr/share/doc/${PF}/html \
- htmlinfodir=/usr/share/doc/${PF}/html/info \
- pdfdir=/usr/share/doc/${PF}/pdf \
- pkgconfigdir=/usr/$(get_libdir)/pkgconfig \
- install || die "Install Failed!"
- if use minimal ; then
- rm -rf "${D}"/usr/share/doc/${PF}/{pdf,html}
- rm -rf "${D}"/usr/$(get_libdir)/${PN}/{tcl,lua,perl,python,ruby}
- fi
- dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
- dot -c
-}