Fix build with boost-1.50, wrt bug #425478.

Package-Manager: portage-2.1.11.5/cvs/Linux x86_64

4 files changed, 56 insertions, 24 deletions

diff --git a/media-gfx/kgraphviewer/ChangeLog b/media-gfx/kgraphviewer/ChangeLog
index 918e9f4f636d..de4a67e24897 100644
--- a/media-gfx/kgraphviewer/ChangeLog
+++ b/media-gfx/kgraphviewer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/kgraphviewer
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kgraphviewer/ChangeLog,v 1.7 2011/10/28 23:59:28 abcd Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kgraphviewer/ChangeLog,v 1.8 2012/07/10 16:32:16 kensington Exp $
+
+  10 Jul 2012; Michael Palimaka <kensington@gentoo.org>
+  +files/kgraphviewer-2.1.1-boost-1.50.patch, kgraphviewer-2.1.1.ebuild:
+  Fix build with boost-1.50, wrt bug #425478.
 
   28 Oct 2011; Jonathan Callen <abcd@gentoo.org> kgraphviewer-2.1.1.ebuild:
   Bump to EAPI=4; set KDE_HANDBOOK
@@ -37,4 +41,3 @@
   28 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
   +kgraphviewer-2.0.2.ebuild:
   Initial commit wrt #135245.
-
diff --git a/media-gfx/kgraphviewer/Manifest b/media-gfx/kgraphviewer/Manifest
index 02d6fb222d45..bd6ee2d638d8 100644
--- a/media-gfx/kgraphviewer/Manifest
+++ b/media-gfx/kgraphviewer/Manifest
@@ -1,24 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
-DIST kgraphviewer-2.1.1.tar.gz 1409604 RMD160 edbe95f9c67976fe5a443c55d71ecf3d4b07b59e SHA1 e2dfadbd319cc7cbc1e4de7565974c2c6b7de9cb SHA256 5840e9dc0cc813c18c0b64aaf4346aeb95eefcc95d2c5068ff81a8f39c81f4b8
-EBUILD kgraphviewer-2.1.1.ebuild 823 RMD160 8dba69ca0a5f7edcfc33ab3f29a69c9f0a43058d SHA1 fbbe0f621d167d25090f3d55cce4e17ff68a358b SHA256 02db40c5bc08e785f68d934995b9b651d8d55f57a7997304e58680056a9b728f
-MISC ChangeLog 1245 RMD160 3884fa604b49522ab9e910b1be35e1b990925dd0 SHA1 27055a518a72fb0f289bdba364f7769effd471a1 SHA256 7d1530a6170ba15f7e860c8685f25a3e7280fdeabc75b5bdc25282155c89881d
-MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+AUX kgraphviewer-2.1.1-boost-1.50.patch 1012 SHA256 5db8dcb4cbaa06b8415ae0f4cf4ff8adfb8c1d0ab9d0c18da3554650e73d7a11 SHA512 d2638b0848ebfb047ef817987273c2fc2b64d78192c991a8b8461457be7d8b0d91dd8837e3c1be120b0d66cdeba50f21198ca7d16cc0d96516cbfbd73bd38dd4 WHIRLPOOL 9aeb0c027f44b7cb31dfc4216dfb335839375e8cde0a05fca05782abed26ff9bccef29fb6d738a20d7357ca3436cc4bcc3c3e275dd8730e49ed0c5845aa51c51
+DIST kgraphviewer-2.1.1.tar.gz 1409604 SHA256 5840e9dc0cc813c18c0b64aaf4346aeb95eefcc95d2c5068ff81a8f39c81f4b8 SHA512 b1d3b493351ebbc0875861e9ba764e7e8157a37bf1500cacd51fc15605f8ff202ecc07325c2fef89dfc92ccbdcf82c826962879e547cc32db01bf8af208827e8 WHIRLPOOL 7c5fea85bd499c9cd6535d6735c6ad99fba577b9d81a32bbe4166ddeb5328204e1328f459da2138434b874584c8f3f292082b95840732874781a625d67b44f77
+EBUILD kgraphviewer-2.1.1.ebuild 878 SHA256 ad77eb9039b886bfb6d57f8a36b2a522d39cfa041f5efa8a520e31148489262c SHA512 f9a682f2122486e58e7cbfc0a89ee7c934a7ef11a101a7f2485b4103478b554135aa8cd35d2375109c6051fa5ef01992a5336a4a6ca27422969fd7873e83d487 WHIRLPOOL a7dd893eff75a23df6d6345fcc23bb384a71e13a638128f5d50cffedf74d61729371789dd074ca63d5805249280fa651514f6585a7f9b38ecc67bf612c1360b7
+MISC ChangeLog 1426 SHA256 99554ad27aff9ad98f4491bd619cc5f9425cbc20617647c9947b7e433465c1b8 SHA512 4ad4dbe11d7b5eecabecce0d9be1f8cc501072ba34b6b6cf4be0684d982f90a6b70968d2228b1ebbcff20a1a15041d9f174d830e2794e65d4c3894921bc81b81 WHIRLPOOL a8ec0a84f8fc55f66d7ddac0f8bab3cacd0b4fac207fea8c538f9aa2782a43cb9c6d1bd185c265584c52245a679b8c4fab7f089202ae4123a13d4f416fb8a37b
+MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOq0HlAAoJELHSF2kinlg4fqMQAIPN0NpXkTKEwPRd9qlEjKpR
-vhRiZZjDomBR16mY9xKfJB4bufCPiPhy21oM4SknETqF7NoxxDtdBNHTzJWyJU/j
-Bszvp+mVBXWHRkultTt2GXubrWkwcvhBRy2nzrbDqO7bSJTK7SXFn3IW/QFwk13C
-E9SjAGakAlTo4CuhcD2k0Z7F44ZgogBdPpR2K65mk7MggGo5tHlYjXbTMRFnQ+ce
-ElZajilqZXlY7Bk55npV+/L/J6Evg29d5ISoc9S0VqZhUIIsW83N6myyUurz/Z8/
-vd57kafWTX8X9LuFFZnBx6nt+4AfaG1JeWhbPfq6OKC+Qpn4cWRP2WGrDNhopT0I
-XpN3GtUbaBExdZ4HOpO2oZbGUma2eO+O+9h365T9aU/g6MJJKPmZXXACIB0ViVxo
-fZLgwdcpcwprEhQsIm9IKZb55jv0xJSDDNzjECuqb0eAeO3FP0ROZXI+y6gQXahq
-9bqrAKqqQiHiwQyVgAKqTlK5L+i3+keR8NuKENWnGxAkLr92PNVeED4+3WjtQGrQ
-QyXFwVGTVR2W5lEd15VvWfQNIdqZk/R0dHaJ7UpH5TBA1IPuuAplOUS3Om2wyY81
-UQNL9x8lpOZBVcINbLZzHEfrFTVoVLHYlD9YTikR9rZyeCIXaUQaBGeFCIvc2TRE
-l0wnL2Z/koT2jrSOzMw+
-=5eaw
+iQEcBAEBAgAGBQJP/FkPAAoJEMbwO6tnXQ0suVIH/10GIkdkHSNzqM9VAHYJ3AeU
+S/KqiFl6szDoFR7tlaI15sh6F+G6vdh8ObrYiUtWx0QDQ1HGOsIR6ExiFQA6sLrL
+PK+OXl9hu/YgmTuWIda6zYMuX6oTZllYRDa7MGTm/6yIE/BxlLd4/JwjSI/u7HR+
+fOdjUDy06nOG9QK6X3hxGzfY/iYS/FheET9tkx85M13T2d0dRTrAS7jObPCYiCsS
+hVPd0vjb9eEt0W/KzEpvaJnd2GPEnGKIijx97oXJ2k8Mn1cIivvLSztSIJPkPqmu
+qXDW9bk9S/8WLcqnQvFXI4wTlBKvl420EXEVKYeAfb+fnxurqDT42ktGo8k0DQU=
+=F+JA
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/kgraphviewer/files/kgraphviewer-2.1.1-boost-1.50.patch b/media-gfx/kgraphviewer/files/kgraphviewer-2.1.1-boost-1.50.patch
new file mode 100644
index 000000000000..46c9490629cf
--- /dev/null
+++ b/media-gfx/kgraphviewer/files/kgraphviewer-2.1.1-boost-1.50.patch
@@ -0,0 +1,32 @@
+From 470bf0a4774a600dbd958b781342589a337d8898 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Wed, 11 Jul 2012 01:58:00 +1000
+Subject: [PATCH] Fix build with boost-1.50
+
+REVIEW: 105494
+---
+ src/part/DotGraphParsingHelper.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/part/DotGraphParsingHelper.cpp b/src/part/DotGraphParsingHelper.cpp
+index 69cac49..7d46837 100644
+--- a/src/part/DotGraphParsingHelper.cpp
++++ b/src/part/DotGraphParsingHelper.cpp
+@@ -26,10 +26,10 @@
+ #include "graphedge.h"
+ 
+ #include <boost/throw_exception.hpp>
+-#include <boost/spirit/core.hpp>
+-#include <boost/spirit/utility/distinct.hpp>
+-#include <boost/spirit/utility/loops.hpp>
+-#include <boost/spirit/utility/confix.hpp>
++#include <boost/spirit/include/classic_core.hpp>
++#include <boost/spirit/include/classic_distinct.hpp>
++#include <boost/spirit/include/classic_loops.hpp>
++#include <boost/spirit/include/classic_confix.hpp>
+ 
+ 
+ #include <iostream>
+-- 
+1.7.11.1
+
diff --git a/media-gfx/kgraphviewer/kgraphviewer-2.1.1.ebuild b/media-gfx/kgraphviewer/kgraphviewer-2.1.1.ebuild
index 1966cc22659e..4e13a25555ff 100644
--- a/media-gfx/kgraphviewer/kgraphviewer-2.1.1.ebuild
+++ b/media-gfx/kgraphviewer/kgraphviewer-2.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kgraphviewer/kgraphviewer-2.1.1.ebuild,v 1.2 2011/10/28 23:59:28 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kgraphviewer/kgraphviewer-2.1.1.ebuild,v 1.3 2012/07/10 16:32:16 kensington Exp $
 
 EAPI=4
 
@@ -26,3 +26,5 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.38
 "
+
+PATCHES=( "${FILESDIR}/${P}-boost-1.50.patch" )