fix building with tcl/tk-8.5, bug #181526

Package-Manager: portage-2.1.4_rc11

4 files changed, 43 insertions, 10 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 16c8f857882a..46a98f157f92 100644
--- 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.132 2007/12/21 04:08:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.133 2007/12/29 00:28:42 maekke Exp $
+
+  29 Dec 2007; Markus Meier <maekke@gentoo.org>
+  +files/graphviz-2.16.1-tcltk.patch, graphviz-2.16.1-r2.ebuild:
+  fix building with tcl/tk-8.5, bug #181526
 
 *graphviz-2.16.1-r2 (21 Dec 2007)
 
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index bb2ea30e4750..cbf0e83812c6 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
@@ -34,6 +37,10 @@ AUX graphviz-2.16.1-python-buildfix.patch 642 RMD160 4379fcaea7296e4d550477462a3
 MD5 de46464a139d4ae42f457457a037fe23 files/graphviz-2.16.1-python-buildfix.patch 642
 RMD160 4379fcaea7296e4d550477462a3d54f5229569c2 files/graphviz-2.16.1-python-buildfix.patch 642
 SHA256 fc441375a916bf6f68a6ad4aaaadb6ad8a24b2d801499f7e01ace8ac702552c8 files/graphviz-2.16.1-python-buildfix.patch 642
+AUX graphviz-2.16.1-tcltk.patch 623 RMD160 13c3764098a6229cef869962f9604737c97d7bae SHA1 905e2890106d7d8d9356f3346a06bfc403247838 SHA256 d455e80fcf948298d6aa78c84e54f954c031cae506925719c7d9cc8efeaeaa49
+MD5 0903dfe6f568c83912ab4414da0e2558 files/graphviz-2.16.1-tcltk.patch 623
+RMD160 13c3764098a6229cef869962f9604737c97d7bae files/graphviz-2.16.1-tcltk.patch 623
+SHA256 d455e80fcf948298d6aa78c84e54f954c031cae506925719c7d9cc8efeaeaa49 files/graphviz-2.16.1-tcltk.patch 623
 DIST graphviz-2.12.tar.gz 4607023 RMD160 68d55176cd5ce0e6a25c90b443529747e738d5c6 SHA1 aa48a926395a57c6c7e1e755b9432a29461538e3 SHA256 5191892d7950c28754659f703234f7888f132440a049f0d396f287b202f9e37f
 DIST graphviz-2.16.1.tar.gz 8076271 RMD160 6d0f23fa176a1bef7ee0ca48cf1b700fe6cbfb42 SHA1 46b704bd9b81922bcd17167c88f3278a9645e894 SHA256 32c1a185ba39961935f104cc47d2bceea327c0de8c5636edc6ab83ac3c0c56d1
 EBUILD graphviz-2.12.ebuild 5492 RMD160 2275c892debf98404e89a7464b3c791d3a72a917 SHA1 96c11ccd0c252454c44a1394c90b07c678f37d72 SHA256 36f79329c293572af6902af5d2283fda6856784f5048203787e3ead9b306ee5c
@@ -44,18 +51,18 @@ EBUILD graphviz-2.16.1-r1.ebuild 6015 RMD160 6d5e2b87d9e9cd0bafbca8d07f0179f2290
 MD5 5d8b58185f72567675d657c0e8fbe29b graphviz-2.16.1-r1.ebuild 6015
 RMD160 6d5e2b87d9e9cd0bafbca8d07f0179f2290346e5 graphviz-2.16.1-r1.ebuild 6015
 SHA256 fb8b699b05865d7edf1450f37b9c2157e173e770b0e6520eae7164d299277abd graphviz-2.16.1-r1.ebuild 6015
-EBUILD graphviz-2.16.1-r2.ebuild 6124 RMD160 965d2fc50e9813a7d9e318fd6858456da631f3ff SHA1 09d36dac877a7d9bc1950827e62c40e0dcd30dcf SHA256 a20a18846a7c8d2ba150e607e0ed1ddbc03d38636d8498b4fbfa55586f8cbb23
-MD5 c0287b29d5a8dec550fcb54e75176904 graphviz-2.16.1-r2.ebuild 6124
-RMD160 965d2fc50e9813a7d9e318fd6858456da631f3ff graphviz-2.16.1-r2.ebuild 6124
-SHA256 a20a18846a7c8d2ba150e607e0ed1ddbc03d38636d8498b4fbfa55586f8cbb23 graphviz-2.16.1-r2.ebuild 6124
+EBUILD graphviz-2.16.1-r2.ebuild 6160 RMD160 74d783d9ebf257cf719588f918b42f84b316ad7c SHA1 60b6b43de4af32ef381455e1d72800f642c36a60 SHA256 814d469b7d305e603ddc919d0404eacb8cd50017ca842b2b2ddbd00cbf735678
+MD5 c0216476d8b5e1c13d580f9bf8df1ead graphviz-2.16.1-r2.ebuild 6160
+RMD160 74d783d9ebf257cf719588f918b42f84b316ad7c graphviz-2.16.1-r2.ebuild 6160
+SHA256 814d469b7d305e603ddc919d0404eacb8cd50017ca842b2b2ddbd00cbf735678 graphviz-2.16.1-r2.ebuild 6160
 EBUILD graphviz-2.16.1.ebuild 5978 RMD160 01fe950a684fb11e79b5386e3c9c4b34b3179f71 SHA1 5b3039c8765ad367c4479907ddca14f72b6b3057 SHA256 21bb381d34054f500f023798e00a4f739fce67bba326469e2e6babef31b22c68
 MD5 cfa85a52a1e4f78fdab83cbfce9a756a graphviz-2.16.1.ebuild 5978
 RMD160 01fe950a684fb11e79b5386e3c9c4b34b3179f71 graphviz-2.16.1.ebuild 5978
 SHA256 21bb381d34054f500f023798e00a4f739fce67bba326469e2e6babef31b22c68 graphviz-2.16.1.ebuild 5978
-MISC ChangeLog 20521 RMD160 58e206128e24294513b14e37a3136c7cc5fad661 SHA1 e85f947e884523dc2934f848cd156a447647c295 SHA256 4711932566f1f621d942cd82414fda2c5d1cafd0ae3d81d67f0c0ef8d4802bb3
-MD5 609452af1b642d5d9f44287f514ef744 ChangeLog 20521
-RMD160 58e206128e24294513b14e37a3136c7cc5fad661 ChangeLog 20521
-SHA256 4711932566f1f621d942cd82414fda2c5d1cafd0ae3d81d67f0c0ef8d4802bb3 ChangeLog 20521
+MISC ChangeLog 20678 RMD160 4024d86599e8e529e113e99a3a7799190baec1bf SHA1 7ce2941d74aa2be6f8c51ec53d9a83c574beba96 SHA256 a54e83842c496cb7630c5a866adf1e89ce613349b81a08961c1f7bcbe9bbb1c8
+MD5 34c042851068c9ef640c2623a4d66577 ChangeLog 20678
+RMD160 4024d86599e8e529e113e99a3a7799190baec1bf ChangeLog 20678
+SHA256 a54e83842c496cb7630c5a866adf1e89ce613349b81a08961c1f7bcbe9bbb1c8 ChangeLog 20678
 MISC metadata.xml 1540 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 SHA1 b493bbaade7ae395c87ada0bbef0b0f0e7f7fb08 SHA256 c2a220f962a3048cc026e4c376b6555bfd0be7b401206d0ae3d265d628f231a1
 MD5 e98595ce89ff0da26058b1e6e0ce3d31 metadata.xml 1540
 RMD160 4652a8cc1044e37e34e06be5480a9ee6f842c333 metadata.xml 1540
@@ -72,3 +79,10 @@ SHA256 474d5692610481a65602801a914c2e589dd2fbcbc277519f7c4660bc7e157aa2 files/di
 MD5 11f1df4a73b8d8caad925943ec44a9c4 files/digest-graphviz-2.16.1-r2 250
 RMD160 1867fd95a4b06aac54076fd43dabc55210e8c80f files/digest-graphviz-2.16.1-r2 250
 SHA256 474d5692610481a65602801a914c2e589dd2fbcbc277519f7c4660bc7e157aa2 files/digest-graphviz-2.16.1-r2 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkd1lQcACgkQkKaRLQcq0GJ1KACfYOvd72Oe9BQykFgsnrMB9RYZ
+CrAAoIuIgcSMIEd4snRrtkaOew1S9eA2
+=1v2o
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/graphviz/files/graphviz-2.16.1-tcltk.patch b/media-gfx/graphviz/files/graphviz-2.16.1-tcltk.patch
new file mode 100644
index 000000000000..9e587e02dc18
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-2.16.1-tcltk.patch
@@ -0,0 +1,14 @@
+fix tcl/tc building for 8.5 - bug 181526
+
+diff -ur graphviz-2.16.1.orig/tclpkg/tkspline/Makefile.am graphviz-2.16.1/tclpkg/tkspline/Makefile.am
+--- graphviz-2.16.1.orig/tclpkg/tkspline/Makefile.am	2007-12-29 01:13:37.000000000 +0100
++++ graphviz-2.16.1/tclpkg/tkspline/Makefile.am	2007-12-29 01:13:58.000000000 +0100
+@@ -11,7 +11,7 @@
+ 
+ # If all else fails there is a local copy of tkInt.h in tkstubs/
+ AM_CPPFLAGS = \
+-	-I@TK_SRC_DIR@/generic \
++	-I@TK_SRC_DIR@/generic -I@TK_SRC_DIR@/unix \
+ 	-I@TCL_SRC_DIR@/generic \
+ 	@TCL_INCLUDES@ @TCLINT_INCLUDES@ \
+ 	@TK_INCLUDES@ @TKINT_INCLUDES@ -I$(top_srcdir)/tclpkg/tkstubs
diff --git a/media-gfx/graphviz/graphviz-2.16.1-r2.ebuild b/media-gfx/graphviz/graphviz-2.16.1-r2.ebuild
index 273edac87d58..e991a938dba3 100644
--- a/media-gfx/graphviz/graphviz-2.16.1-r2.ebuild
+++ b/media-gfx/graphviz/graphviz-2.16.1-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.16.1-r2.ebuild,v 1.3 2007/12/21 10:23:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/graphviz-2.16.1-r2.ebuild,v 1.4 2007/12/29 00:28:42 maekke Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
@@ -119,6 +119,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-gcc43-missing-includes.patch
 	epatch "${FILESDIR}"/${P}-python-buildfix.patch
 	epatch "${FILESDIR}"/${P}-pango-optional.patch
+	epatch "${FILESDIR}"/${P}-tcltk.patch
 
 	# ToDo: Do the same thing for examples and/or
 	#       write a patch for a configuration-option