Fix build with liborcus, bug 527242

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

diff --git a/dev-libs/liborcus/ChangeLog b/dev-libs/liborcus/ChangeLog
index 2bb59f5bb04586719d7591d0f03ae939f11a276a..07c203fa69b28f6e3d25fe95806f3a2d86cda6c8 100644 (file)
--- a/dev-libs/liborcus/ChangeLog
+++ b/dev-libs/liborcus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/liborcus
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/ChangeLog,v 1.35 2015/02/15 14:59:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/ChangeLog,v 1.36 2015/03/08 15:38:13 dilfridge Exp $
+
+  08 Mar 2015; Andreas K. Huettel <dilfridge@gentoo.org> liborcus-0.7.0.ebuild,
+  +files/liborcus-0.7.0-boost-1.56.patch:
+  Fix build with liborcus, bug 527242
 
   15 Feb 2015; Agostino Sarubbo <ago@gentoo.org> liborcus-0.7.0.ebuild:
   Stable for x86, wrt bug #534684

diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index 13c430dec0ba05b182e2db9adc98b37493993b39..3961621567f8067fa3c27905a740b00b6fcecc94 100644 (file)
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -4,27 +4,30 @@ Hash: SHA256
 AUX liborcus-0.5.1-linking.patch 490 SHA256 a8b9f4fd8c2f257746da63c883224149b9ad2ed20479e3973096e8ece4aad908 SHA512 0fe499baf446f0223e98cbceff68d4602037775a1385cb2452059d53cfe90acaa2fc5fd014cda837db24ea3715b73193b8ac4d8d08b76c825b90963781e2b103 WHIRLPOOL 5c12ffda8db3d222c8cbf30b7e1ea7aa6a05e611355dbc51d51c077169b18861bc83ae3470276c8c651f9598e76fabe06846a659acf01b718993f967cc4ba6a1
 AUX liborcus-0.5.1-mdds.patch 455 SHA256 ac1c2ffbbda229bd56c29ee2ec4a4676a71aff3afe37c2fd3e082ef6af79171b SHA512 1f656caf4847a9de7fb65bb82be5eb02b15c07a7a474ec7a82ffff2e1912b43c3e74241f8a1cfdf46db7a2d3cea59dfb424ea0efb05d4cff39928c3f51cde686 WHIRLPOOL f3016753ec74cce322c551195b13bedad24f85b39d68e1ca13406365f6594055dd5903212597429a53e7aa0792ee3b25dcef09a73ea68c53fb56df5276aed298
 AUX liborcus-0.5.1-oldnamespace.patch 377 SHA256 c4cf81d2e93e9ec6da2b847e73fe4aba3cec37be95315b22e5b83157ec5ac07a SHA512 8482b4f41743c2e8e175bfded6e81c8fb5ff1bb1fabfdd34795c26be002548497cef5d1b2babb3bb4e2082a702eb66798b8618820b4f01a7429b89e86b77919a WHIRLPOOL 6b165f50540dba9446488c1f6b178fa82fae888e7b3f72d66796e85021fec436a992009c285919d43ab9520d1fef0ddfe0e0c8dc47c50189afcb8fcb3bc7369d
+AUX liborcus-0.7.0-boost-1.56.patch 664 SHA256 a042a9a76716d79ed4841f43a61edfab3443d0e9defeea588d786f9e79348c6a SHA512 7c86296fd1a470588b7b1e5ceb2da384141cfc7610be27da499c193f7049124130e4cf98ab4b5da7bdc99576e85b4e611a2f4463692294cc53a18e648e14db28 WHIRLPOOL d20ca24d7dbabde397fa1bc5f46e9598a05c502f88e7bcfa2acc01c4715e685ddd8afda1431b9e500370ebed7b40a63f5bdea7ce61383d64a1b2e45780989a33
 DIST liborcus-0.5.1.tar.bz2 1445106 SHA256 e632373149c0b29a971aa74c079f8825bc6bc7b09c0899c8de004ee7e72ad765 SHA512 ca69c89d09a514285b119d1cda67e20856ee6897ca5e33223cc5f8163a488fc367dec10a6e2a33a7b09b337dbab2c461e9dcf1b2c72bafebd6861a1eb03683d7 WHIRLPOOL 32c8f0f50b239ae164a4ac04ee79c2bee22391cf01cbb875ca92451dbf2d26f2a24db22e5f0b2ab82e2da4c5ff04663c16ceed305da145542855ec0645bf24e4
 DIST liborcus-0.7.0.tar.bz2 1665988 SHA256 7773a8f5f0b810e0f146dbcf3dbb42e89dd8af0868235e01d9f0cdefde41a8a9 SHA512 63aad5154e25d7d7bfd10f07e614e4c1ed2691a31c61c2b1e7ec029fa4d9168eba5b4303f5164ab29ef92843ce8f8afa9682772515c8b5e8ae65f4561b331db8 WHIRLPOOL b555b005b41fb41571ac7dbc63e32541decd0b79d61435a6730de9438761afe363d063905b671e1b724c02f2846e65e2af7fffca40282d08d35e1c4ff787fc63
 EBUILD liborcus-0.5.1.ebuild 1203 SHA256 bd29121494400247b2895750fafbe439b596873ee41927b4c4d6f40714d44a82 SHA512 aa67ef77404baaa246615c921eba446801e82d0a4bf314460ddf832f4e62f39628aa3c7c41b008e2a8cf4191590e825925ed353a60a265bc433d513d1c299c09 WHIRLPOOL e72224fc43bdef8d2d9b7bd771d8c5032547f2552083dd425b9e5a6b18e2ddc9c2048d5b07a46d3deb3e4b893aacea8070411f96616d8b7492a21f7f13e2bca3
-EBUILD liborcus-0.7.0.ebuild 1003 SHA256 a0cc0554acc4ebdfc96cefde590e1a4f97eaf0d255225b91c08c31fb8ff1e9b2 SHA512 a22933393fbc0c852a2fe62d48a96d451a8a6f255e8914729d30f334399f677b390cc98b3e96a4b6c327cd0a58c57eed1901c747672b0056fb487d4bdf93de83 WHIRLPOOL a0365da34b84d2561bf3cd0f742891aa79d5e390097e06af5cff45ebee596740cf87d7e156b6455d1d91a8b93feafabc7675d86b4082ca3f1d48e2f7f4eff9ea
+EBUILD liborcus-0.7.0.ebuild 1074 SHA256 6d92f06492826b76a3da09bba5dc18e4987e758aed2eeca6480a5f05bdedd227 SHA512 47d2a5a50aa44b39dc4be8c0f14a80d277200d837de4e6eda5a98f3d08a52f7486692eb7c3eea99b1aeea793b7904bbf6e51e8b05338c39140f0f7121925deba WHIRLPOOL cc2e0f1434cbf4eed8bb0b954408c4fb30a2fe7d6f532eedf644766552278309ff2f9617aab7b45892235e266f95251f431d3b6852820eb51c0b8edca50fc64b
 EBUILD liborcus-9999.ebuild 1067 SHA256 e1f4ed416cd258962b56130ef60ab23fa491a583e6b4c569ebf050649c685513 SHA512 5e73676bed96280071ab47aa92f00602476fb65dc2aa56274059af5a041a42d27cc63004dd8dcdff29b76aa3a9329bf2f6e6b82fd90d7514613d6791ccc1e545 WHIRLPOOL 21fc30973e71fbb8983514664160549b0f41da533dbed9ac717db100100907f449722f168c3dfd01c5f93ec1c0b51b15936490a88b4fa0127c2b8667e04b2d63
-MISC ChangeLog 5250 SHA256 cb9f021cf4487a84eaaa9ad1a11a5a41ed69eb905eecf32c65b3f5f7340b775c SHA512 77d0c5a5ad9f89520789c699b60441ffa0af044f1c70a3948442a2b97459cbb5fd6df25427d6888be0cddb5d1764eaf8c6a193b7facecba9075c1cceff9cefb3 WHIRLPOOL e1c15dffc23b876ddca57ce088ae2225cd504652cc27b086c94c4f424df1a035a12fee6f28aaf504fc7458a351a3e7b08f7043c79b22014a38a9095dbfe04200
+MISC ChangeLog 5417 SHA256 3b07d31595765a5b5ccb3548d876f46f5d30004711ee7af327dbdc0fcd8eb1c8 SHA512 f4ad0fe55e951b22350acbf11ed3079e23d40200a27c433f25bfdea28950bb13e9bf3389ac6fcce7c19d7704a918d2bb5407e8fab45d3615ce61031ae62e2c66 WHIRLPOOL a3fe02be37584980e54f6a33a1b28b9b7558ae6575f703fb21d8c13ff90b03d094e41591bc13ad0ecd2d333fb946686fe9781b748ff00b863fb34786ec57d536
 MISC metadata.xml 164 SHA256 6dd077e0a4bddf8cac0a6d7fb01d5f992a81c85d77d55787d19c6d4ae4c5aeeb SHA512 acd8ec5158c34fd738af175dda4c270a884c80e76dd10d9252e2513846ae1cb69ed8b1afe328a69ced10974ca3c60366394990b98a0d9b9815527f262afd9937 WHIRLPOOL 43b43d99d3c96c6da7006df219d57a4ff853353940dbd597bbbd2be00af7b38f0e6c3e33024b1e964ef1fedb12f788ea78693b7e3527011d8bbb9757ec0b88a2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU4LQ2AAoJELp701BxlEWfUuAQAMW2iwQ6utl+X9l/wNEavuA6
-ycyIGGvk/rGw2m/QyuyYBX3LwzZYl4mI2UHzoEwfHjkbxh9Y2qfrY1/LF6mla3q2
-YUmA1/PJCL5H12t6IuCuc51a9EWwfCBNEM2UWkTBqPBDIiIy7d4RXQwZFuMhAsXL
-WXrTuVkOVQSrTUVc0d7A8vyEAYbvrmFwjGwCXsErZm5vdxDdPqvrU+ObM56ZBlmd
-2bp391bokhMIP+GmcWcUUe2BlUULJQymsYWwvqyhpSFHyecWYp3x1ZmzjlzHYVK+
-NGIC3w1WRSLBkL3XOufW9oDY9Q0vrqYmSa712LPF947ayX0l6sMir6TiD7k9knwf
-tnFDp+tOt/BeVWwQuNtqLIT+5FMDdN3Rp87dZ4plmGloFYtEHYCw4ePoSvBwFMX2
-ixhoEUHJ7EqgcJzS1KeSjjWZcSKi9OB3P2+jKTWXOsPSPcS36iP9AgCWUizQQGYQ
-/rZ85aPDZLS5JrLgvgKJw9kdaz1huPG48lk5iItQSrpO86DvT3uq17ijL5i/ANh9
-T3WRry9JiEk2bf/EvT3FLkBhCrSVtJsG4WLYdXirc3vhT6J/l865t8pau2a4fhCE
-RR/GoWgjW4Op1eMVbjPHgdDoWI4YZidspLCyf92DS9fSRigBhd++yGIiiwvj8F7J
-TiLRVnNh9TqINcT6aYZS
-=ieqL
+iQJ8BAEBCABmBQJU/GzsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcg1UQAKZtAcA6ymYKI+Lbq65rJh6v
+ZJK4UxIkH6t7U4U9/oZUbMLxarQOpVv/wv+uoSHJnxAxlNhWdd1u838XutPXQkwA
+qJNeh5lyB7oBl6+AYcWCjFBtd7+ouccW1uOmL2Va0MnFAYOyp9cJBk1BpXNL4BNV
+YZLnb8YlKUwxLQaZT6+pDGp+1LOX1cFGJFbB81nM2tNsX7GANecdJPptCLvDSuI7
+Gu3JVxjEhtAz/9GCSB28isKsIXqwibR/qGUgpWbx8apbcRqI6MCsTKljY6IzNHBx
+egRaGwkJ/eg2phb8NfdDhjbk+/RaAQRb4xFLfLlvRP/CAAxWPXKIozMjyb442Xfq
+pe0xgFiqmvliX4YaERbuOgnCFBBRVcFgZBCQHLY+pHg3+61HbRHqGUSSx7zaey8v
+Xw2qdzjbDQF2x2BAV9vY0yueQLUpeZkbZixV6FK36kFL21iCZ3Ia5kPmlHTUONP6
+fJ7NdsLKmzEGf1mlvpPMOr+N+7+fivl6LVXfNZ61Gs+qBaAjWEl5c6c1tot/JWES
+geIih+ihrJTbNKXHHkNeYWC85fFkoMjYyHBXvUyB3imPiHnCZ06tMS2yH3vzeKbE
+NQMqAe4olwUNd8bm+O9ssh8742XEnTtgBUZ8uQAMzCLDOkP9SmIjDwOhVR21dCTp
+zS/HIDreZJ2+eVBYnikK
+=oiBC
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/liborcus/files/liborcus-0.7.0-boost-1.56.patch b/dev-libs/liborcus/files/liborcus-0.7.0-boost-1.56.patch
new file mode 100644 (file)
index 0000000..f72d66b
--- /dev/null
+++ b/dev-libs/liborcus/files/liborcus-0.7.0-boost-1.56.patch
@@ -0,0 +1,25 @@
+From c01874c7770f4f56c031d7463156e03f2945e015 Mon Sep 17 00:00:00 2001
+From: Dmitry Roshchin <dmitry@roshchin.org>
+Date: Mon, 27 Oct 2014 16:19:32 +0300
+Subject: [PATCH] Fix build with boost 1.56
+
+---
+ src/parser/string_pool_test.cpp |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/parser/string_pool_test.cpp b/src/parser/string_pool_test.cpp
+index ad7d7c8..0d32c62 100644
+--- a/src/parser/string_pool_test.cpp
++++ b/src/parser/string_pool_test.cpp
+@@ -5,6 +5,8 @@
+  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  */
+ 
++#include <iostream>
++
+ #include "orcus/string_pool.hpp"
+ #include "orcus/pstring.hpp"
+ 
+-- 
+1.7.1
+

diff --git a/dev-libs/liborcus/liborcus-0.7.0.ebuild b/dev-libs/liborcus/liborcus-0.7.0.ebuild
index 4286ca065be80619fc9c347cead313243da00d30..0b2ae897f7cf1c814428d66aef9a7132b13d0bf4 100644 (file)
--- a/dev-libs/liborcus/liborcus-0.7.0.ebuild
+++ b/dev-libs/liborcus/liborcus-0.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/liborcus-0.7.0.ebuild,v 1.7 2015/02/15 14:59:01 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/liborcus-0.7.0.ebuild,v 1.8 2015/03/08 15:38:13 dilfridge Exp $
 
 EAPI=5
 
@@ -30,6 +30,8 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+       epatch "${FILESDIR}/${PN}-0.7.0-boost-1.56.patch" # bug 527242
+
        [[ ${PV} == 9999 ]] && eautoreconf
 }