Fix building with latest boost. Wrt bug#442262.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

4 files changed, 34 insertions, 21 deletions

diff --git a/dev-libs/liborcus/ChangeLog b/dev-libs/liborcus/ChangeLog
index c8ef0b2b616c..477b4c47c6e2 100644
--- a/dev-libs/liborcus/ChangeLog
+++ b/dev-libs/liborcus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/liborcus
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/ChangeLog,v 1.4 2012/09/27 16:44:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/ChangeLog,v 1.5 2012/11/09 19:19:44 scarabeus Exp $
+
+  09 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> liborcus-0.1.0.ebuild,
+  liborcus-9999.ebuild:
+  Fix building with latest boost. Wrt bug#442262.
 
   27 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> liborcus-0.1.0.ebuild:
   Disable spreadsheet model on 0.1 as it aint working there.
diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest
index e46b88198aac..c5d92a473ebd 100644
--- a/dev-libs/liborcus/Manifest
+++ b/dev-libs/liborcus/Manifest
@@ -2,24 +2,24 @@
 Hash: SHA256
 
 DIST liborcus_0.1.0.tar.bz2 1328973 SHA256 e37c72d1cdb9f5aab2b8b075c5dcc5b7ece2fd2646d93a1c6128d13bedc91754 SHA512 8547d529633d08efacfdc987a83bdbe25cedeb4d0864aebbf24189b82c084fc1c3240c9d250dd6c759d381309b5b14db6e918b6ec3a05ee6750b6fca3747e7a4 WHIRLPOOL 0b41b61c3cd657a5acd1d973d84f6df8aab057219fe508a4d1675890fa6e8488f5b2fb17eb0bffa8453f0db1639379127a249b79fbfe0b0a555e16bc0b7b818e
-EBUILD liborcus-0.1.0.ebuild 999 SHA256 4537ed58645d97bdaf65de94ae1389f06a660fcf5739eb5dd087ad8bcbfda413 SHA512 fe2aa1a8f562bf75b4a35a785414c739c25aed786dc84c83d491b630a7675681e21cef9c751cd3651974e4ddc443fe5272fb4286710dde3f21f79a7d0a8f82bb WHIRLPOOL c389faad7add2ee673cffc609fdb265cb47d0daa460286183e18aeb9fbc20c8addd614b6d96955776ca264df4da11909eab10819c228042bca4912a58c0960b0
-EBUILD liborcus-9999.ebuild 991 SHA256 e2f29181a4bedafb0da972c857e0d5d699e74566eb650ae2ad9c8ba89e461992 SHA512 0a628cc827becc1e1fdf280811ccb45963aae0f819ec70b5886831192713ae483c83c4f2bd43f9759ade4c08e7a29f634690321a802504f5bb26e6dcdd4dd9a6 WHIRLPOOL e4c50d067515a1f8fe1e973d676a130f31fdbe0d992fed321950bf83530d1ad2413cc37a69bba088d21c82da1c5aaa74398c489fa5346fe598eab39d504dfdfe
-MISC ChangeLog 841 SHA256 2180719e42b9e5cb9b44030a698130d436ace875268587b3637052c1f329f95a SHA512 b65003006111b784b602312cd99adf7d72bb95ee021fd707c2d25f46940ad700b66de161dc0a21686e49e3497830586dbd7fa9e9a7c4e6685a9156a700851f81 WHIRLPOOL 0db56d0f013dd77a412aa95f7186e2e64d029e8940fc9f25bc1141041ad153773973c1fe6a0bb9b5726bb2f0da8c0d43a09b3fd794965f4a8dbd89cc5c894bf5
+EBUILD liborcus-0.1.0.ebuild 1239 SHA256 3bcc4ceef4a5095fb27d0ea331f202c2b909affa77d7d407ee6c91d60cddba57 SHA512 fb52f7f2963913902f14267955ff505c1288f3fcf97afd50847f1b37a861aab932e53820357916091a34eb2afdc1c037a0baebb1f33d6d68567dc8cf5b1379b4 WHIRLPOOL 76402be7adbde278d5d20caf04c44be6b20ff356768a19188e114bb556f5c82a22bcbe32851f6a9c56895226800487661437b4a8cb4764789cd1d44973bd86ab
+EBUILD liborcus-9999.ebuild 991 SHA256 edd0744e31be6c27e51ab68260ec9d865ad4a7428e597b029dddf544e810ae1d SHA512 791d4aeb7089daa087e74fded066742f570637343c840e90af14d65ac3c40c48fb5a42ec6af61e0af3679f405626cac0c033998b98c75ca11b781cda8ce931f1 WHIRLPOOL 8d3ada4229ed67e673fcbf6f97f2641da727f47bae212a610f0705a07aab4a9bef926b5874325755d08135115bb1fb9751f0d4997e81538a4655df38ac4e498e
+MISC ChangeLog 994 SHA256 4cb10f258ba086e57e6021fbfc29f17155e183c9dafa2c29af7250b8c5c31e45 SHA512 1778ee45767aef2bf7822a1635200bfe67625ad730172660d18c44c633d6e4075f5d08df73b4996c4d6f2e63962b3bc824b73647b6d5d628080335b47872d57d WHIRLPOOL 15c87125dacf08947c7c830aaa4f99f9adc9bff68b2c5a0d003aaef24baefecf0c3c7236257f7d84e753488c5888cbfe419739413512f24138373ab38013267b
 MISC metadata.xml 164 SHA256 6dd077e0a4bddf8cac0a6d7fb01d5f992a81c85d77d55787d19c6d4ae4c5aeeb SHA512 acd8ec5158c34fd738af175dda4c270a884c80e76dd10d9252e2513846ae1cb69ed8b1afe328a69ced10974ca3c60366394990b98a0d9b9815527f262afd9937 WHIRLPOOL 43b43d99d3c96c6da7006df219d57a4ff853353940dbd597bbbd2be00af7b38f0e6c3e33024b1e964ef1fedb12f788ea78693b7e3527011d8bbb9757ec0b88a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQZIKPAAoJEOSiRoyO7jvozKYP/3OqGEG4iioZ1AMPWFHYxaxk
-n76c1L19trqeeKZDdjeqytk3xm/wxwi4TO+vh69oyLpfvA0JxORQV+wYMwBH4UXv
-E6kgpPaXVQFxFk1ktpRubMjb7iHbgyK82CWhSQXvLCygPVvskH7kQ2fhTCSeVkfK
-puTSSbp/tWTJhPO+aCbkGnSBo6Tygf23W1MdvbjBaNnv3NFh6cyW3ScRmFgtI9hJ
-T8JlrLdo1Qf676w2fah1t2/XgEXoCY1jHyOwcS92GkgN00hzWkWN/CkeMtCd7asg
-7SI/p3/X3pG8GcQpxNrGvMK+QNx8gNgCY8x+6CZONK28MPAvWFg7hWUD8ob6NjWv
-NPg6KfIjO4sq5fzsRlzmhMalMKQvrBjf6fdVaVrp1AJ+I7BxcWeSwehT5G6edLWt
-l8vnFDa3eVWXD3xdQacpL4SeWvhOzKwkp62xJ0idb4c1usyRE4WBAFnX5Yn+zfuO
-DaLonJAqhe4Uh36eMqWh09/46F2HsmqI2po9HFhkPPEGBBJ2h/zFrMbZGuQyWksl
-HIPklMnyCqVYFrOSPtSQwx79mCBsbEeY6oKYuOSpMCdPPAly9XYJCEcdL4FUwOy6
-5+KITb3n9wCWRk/58UldwNoS6QyT5rYLkJ/rRnUIDJQQ917OizV8FaxrCWlI5Ca8
-3dcws9VuZf6WG33tIswc
-=OyxL
+iQIcBAEBCAAGBQJQnVdVAAoJEOSiRoyO7jvovaoP/33tRmvbYgPElq1JSnUQXsup
+18anqx491wGfrgp7VIgUFmUjFafPvN1dHs/uuUhIab8d1BaLlH0kyuMtk5cbSv32
+/pQkfUa5uQm1ffvH0TtnI6Ev1DEXRz4aJS+wSKf5hKl+JqqbUxt8ptdDmSU1Jur1
+v+9tlicbkrMFvgjvm7END7zST20BdDr4OFM2056Rcbx+y/WpbemHK5kRnQYliH3k
+xR4kFnT8fnMI3+VJHxZ65FEUtxJ9DssbNTWtcUOZZ7ZGK+vFKtVS9tlnix4r3+GC
+E+AtmeD5VH0Gi+cUzkxSOitq9y+wNaCDpehGHw4u8oJPwlhtAAIzIYQIVP62pupt
+HnA5U9otZRe5EgyPJ/dc9iSNBBqZrx9egeUFbDNkOIWuJXLVFl8l0r858mHBfjtG
+O88olPdEdtbwNCS2QJUWHAQpomqrR/Sby5Uq05sI7SRdbtSDsCFj+1sB0EHWaZz5
+CRoa22/ZdJ0bPkbL+5T4znooGCoMhrBIVD57Hyu69N9DdAXoLNLIfGpCbDKiwYQk
+c5vOP/zB57fwdGGLxRuEQSKFxLb9M0YyLM0b0+Godsoibts1fqcwWzvPu3ESU7n8
+zuqqxrifcUCxu7YHmJwL7/KfOG9ABwKsCeOdq5rA1h5myB8RLNLr0FxQBRk10qVE
+ygmpOfZcGwA9tRpRKOn1
+=24Io
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/liborcus/liborcus-0.1.0.ebuild b/dev-libs/liborcus/liborcus-0.1.0.ebuild
index 0beaa47a7cc1..5d4c185c0822 100644
--- a/dev-libs/liborcus/liborcus-0.1.0.ebuild
+++ b/dev-libs/liborcus/liborcus-0.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/liborcus-0.1.0.ebuild,v 1.2 2012/09/27 16:44:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/liborcus-0.1.0.ebuild,v 1.3 2012/11/09 19:19:44 scarabeus Exp $
 
 EAPI=4
 
@@ -20,16 +20,25 @@ SLOT="0"
 IUSE="static-libs"
 
 RDEPEND="
+	>=dev-libs/boost-1.51.0
 	dev-libs/libzip
 "
 DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.48.0
 	>=dev-util/mdds-0.6.0
 "
 
 S="${WORKDIR}/${P/-/_}"
 
 src_prepare() {
+	# this is fixed in git
+	sed -i \
+		-e 's:<ostream>:<ostream>\n#include <boost/utility.hpp>:' \
+		include/orcus/dom_tree.hpp || die
+
+	sed -i \
+		-e 's:$(LIBIXION_LIBS):$(LIBIXION_LIBS) -lboost_system:g' \
+		src/liborcus/Makefile.am || die
+
 	eautoreconf
 }
 
diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-9999.ebuild
index 2a156e18513e..34addb5cdfe1 100644
--- a/dev-libs/liborcus/liborcus-9999.ebuild
+++ b/dev-libs/liborcus/liborcus-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/liborcus-9999.ebuild,v 1.2 2012/09/17 11:51:11 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liborcus/liborcus-9999.ebuild,v 1.3 2012/11/09 19:19:44 scarabeus Exp $
 
 EAPI=4
 
@@ -20,11 +20,11 @@ SLOT="0"
 IUSE="static-libs"
 
 RDEPEND="
+	>=dev-libs/boost-1.51.0
 	>=dev-libs/libixion-0.4
 	dev-libs/libzip
 "
 DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.48.0
 	>=dev-util/mdds-0.6.0
 "