Fix building with newer automake.

Package-Manager: portage-2.2.0_alpha107_p3/cvs/Linux x86_64

3 files changed, 33 insertions, 9 deletions

diff --git a/media-gfx/graphviz/ChangeLog b/media-gfx/graphviz/ChangeLog
index 66b3739f8142..152467061eec 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.245 2012/05/23 19:20:08 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphviz/ChangeLog,v 1.246 2012/05/24 01:58:45 vapier Exp $
+
+  24 May 2012; Mike Frysinger <vapier@gentoo.org>
+  files/graphviz-2.28.0-automake-1.11.2.patch:
+  Fix building with newer automake.
 
 *graphviz-2.28.0 (23 May 2012)
 
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index a1688de0f6ed..3b76fa2aef8c 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,22 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX graphviz-2.26.3-automake-1.11.2.patch 1207 RMD160 e0d11e4bfdc940b51e3a913b2c1178d84336f8c5 SHA1 4c43de8d197ac02a5373614f14269e45b4597b44 SHA256 859e59ad317fdca86ee4fc85001f9988c28a88d5becc472e7174f91d51b084d3
 AUX graphviz-2.26.3-libtool.patch 557 RMD160 72ea3b515777ec31d9ead7095a02e09f8d040d89 SHA1 bb5f091cba06fc821f6cc0ad543a4344c2300832 SHA256 a1d5f1ee6e181b78d1bd3daa36d49103ff1f2d90c85b58c1b5f3cfc7941f4b46
 AUX graphviz-2.28.0-Xaw-configure.patch 2129 RMD160 c7916c0c763b803d12678ce46fb6b51a1b9b500a SHA1 f0302b38f55d5e1eccf08a0074b4f8c4b76b1599 SHA256 7c5c37aa637031aee0001ec57f80229a697ba184540366204fe99d2bc8ae878a
-AUX graphviz-2.28.0-automake-1.11.2.patch 838 RMD160 50b48a2ae4bf76373fd378e2e537ae2aa050efb6 SHA1 794f831ea82d4c358607c5b275b267fdcfdc352f SHA256 a1bebbee3dbe7bbf7cf62ecaf85f8e0fe529ea72e060d879006e509cf4752ed4
+AUX graphviz-2.28.0-automake-1.11.2.patch 1066 RMD160 5c4d642bb6a1944aa781771a00e72a6f4fefab07 SHA1 52fdc02d803c7b634f714271f1bc3418ff7e84a2 SHA256 3ce1b8b4cfc1ea5c34bcd41149216f0ae9792ee692bebca3fdd7483a3f6b88ad
 DIST graphviz-2.26.3.tar.gz 17092429 RMD160 b2fbaf03b2006b43ed70e2a710363d7efbcfda77 SHA1 04503ac5a9eaa579859f0d017811fa245717edec SHA256 f410996e69b1095237c2128deae5fc7b6ce99055b095271abb14447bc2f37fa1
 DIST graphviz-2.28.0.tar.gz 19620087 RMD160 5a5fae7cb1128d4e863b954bee5f2491ff23ada0 SHA1 4725d88a13e071ee22e632de551d4a55ca08ee7d SHA256 d3aa7973c578cae4cc26d9d6498c57ed06680cab9a4e940d0357a3c6527afc76
 EBUILD graphviz-2.26.3-r2.ebuild 6042 RMD160 be5fd321509b6235439aa12c96bff9da73592321 SHA1 8a2afa62e52c160009a9f7ffe95a96efbdaca80d SHA256 ec0fed34881cceb9fe5c8c6bf8f3829e7976cb6ac5704269d7ed2deafa2e0156
 EBUILD graphviz-2.26.3-r3.ebuild 6129 RMD160 f5ef4cfc60ba769f054a301f0ee0ce421742941a SHA1 ba7e36973a7e017e1adfd1e78d9351f9393d0c53 SHA256 201e7768c7e39b912c7efa93a0fb216b381ee2cc401d30392b5feafddd8e13fb
 EBUILD graphviz-2.26.3-r4.ebuild 6367 RMD160 5d8d146a55c29cf6026c78e8f1847382ad13dae1 SHA1 144c267811698f3f5dad4fce524fee2eb6597c86 SHA256 606cac67d99dfcb95b4954c6fcdd7af608e1eefd8387e2c88973e012e2b80f24
 EBUILD graphviz-2.28.0.ebuild 6795 RMD160 4a54268f7202e69c4de3a800aee962701fdf8f03 SHA1 350595035397a986196746b90b63003c3b04d468 SHA256 31254808c32ef90e107d2e104896123b5d18ae399eef5d25ed60c31c2d0c4c2d
-MISC ChangeLog 35906 RMD160 45337bb6935dcd25d227797100f61ca603e1d889 SHA1 f3b2776f8540082034b19417df24d4581229485e SHA256 4cd8f99812b5bb26022d614ed3fa553604c8578a684b3eb6ead0f900d33228a6
+MISC ChangeLog 36043 RMD160 5a09d0bc512a8a752fe50974a58d3d4f16c697ad SHA1 e56d338bfbeb13c3a6c1745626b55339d77029ec SHA256 75c2f5c2b0d83811276f12a687c3fffb362ead41b7511118f4bab0a9205c1797
 MISC metadata.xml 1811 RMD160 b5169cbeb7e0a7cfb47de44e4f72ab6c10d42726 SHA1 48027b996e89ab227afe11a587483a51c842aa61 SHA256 995e4cbbcb197713ea64e93943cad2ee005671baaa30da15fa1a2b78dcca103d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk+9OH0ACgkQ2ugaI38ACPAgmwD6A1Gcf+uuvxaQRXvWdaam0krF
-QJM1a8jOwcM5xOlKHLMA/Ak3ONUWM9RO9EzVmQk6FaJ+To+f0B2/714fxvbsV6Rh
-=+5b5
+iQIcBAEBAgAGBQJPvZYmAAoJELEHsLL7fEFWga8QAKDdWj1u/CqW6Urm3FbyT9sH
+z4SU4asd8Lv9LEQkZQKMff3uAgUdFH3ZGAoHumF76mPrEwRW1A2XzIbPiU8sBkTo
+8LBYL8sBngj06q4Yyf0W3t2IcYSTBMpgSFZj32sEtNMEVypnOuwK/st/q1kB5Cal
+hP19DVWLxDV9+ediFUBc/vOKKc1ayHbdH0oilJ9cyq2vBzUE8uSdt7P9tfFEw82D
+j4UTxLiBxR41+BD2uCo7fRGAp8EZOm7bjwr47bVZAoHfW2yfJgYBun4Q9ylbud/A
+nk6JmsDDV5uR6xnulLyjInQZEiD2cZbDBeEOQJmtfkvxyJ4qv4OXcyej0Gy5TQnH
+Eiqp4xeLifGF/Hx904X/muGUMTpk/L2xWblSiDZb3/uhF4oveyziEyhnZo6n61rD
+9B90WXSq3Asqt4EYHgsaHT4v47R43yyoLqhNqsRvzOJkHTlJtMCZQDNwbfgGzKMs
+at4HnyxRAgG7Bf0glRKO4byURJqvShYLvlSHdCRDqQSNEdrRp0JdMoadx1TRSPkk
+o+WTNiwyrYDRyJDTwa8ZHoq9vRUPkocz0Oln4+TGlZ9wkWpPw05H2Wmnh22GMs/V
+SrzWKCP2urgHCMVQ5ePuq/TRvhPuI56+imbtmg8U/b6JhtzHmQddnLXbtWGaadn3
+mzmSeZ88ISzwDuyTat4n
+=PX60
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphviz/files/graphviz-2.28.0-automake-1.11.2.patch b/media-gfx/graphviz/files/graphviz-2.28.0-automake-1.11.2.patch
index 2800623888d5..7b279fccc145 100644
--- a/media-gfx/graphviz/files/graphviz-2.28.0-automake-1.11.2.patch
+++ b/media-gfx/graphviz/files/graphviz-2.28.0-automake-1.11.2.patch
@@ -8,7 +8,6 @@ Due to the following change, {pkglib,pkginclude}_DATA is invalid:
     http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf
 
 ---
-diff --git a/plugin/ming/Makefile.am b/plugin/ming/Makefile.am
 --- a/plugin/ming/Makefile.am
 +++ b/plugin/ming/Makefile.am
 @@ -17,7 +17,8 @@ lib_LTLIBRARIES = libgvplugin_ming.la
@@ -21,3 +20,14 @@ diff --git a/plugin/ming/Makefile.am b/plugin/ming/Makefile.am
  endif
  
  libgvplugin_ming_C_la_SOURCES = \
+--- a/tclpkg/gv/Makefile.am
++++ b/tclpkg/gv/Makefile.am
+@@ -257,7 +257,7 @@ $(TCL_data): gv_tcl.cpp
+ gv_tcl.cpp: gv.i
+ 	$(SWIG) -c++ -tcl -namespace -o gv_tcl.cpp $(srcdir)/gv.i
+ 
+-pkginclude_DATA = gv.i gv.cpp
++pkginclude_HEADERS = gv.i gv.cpp
+ pkglib_LTLIBRARIES = 
+ man_MANS =
+ DEVTSTS =