fix build with boost-1.53 (bug #454104)

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

4 files changed, 49 insertions, 15 deletions

diff --git a/sci-libs/votca-tools/ChangeLog b/sci-libs/votca-tools/ChangeLog
index 4c1360d74d49..c3f996278d4e 100644
--- a/sci-libs/votca-tools/ChangeLog
+++ b/sci-libs/votca-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/votca-tools
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/votca-tools/ChangeLog,v 1.19 2012/12/26 23:22:22 ottxor Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/votca-tools/ChangeLog,v 1.20 2013/01/27 04:03:19 ottxor Exp $
+
+*votca-tools-1.2.3-r1 (27 Jan 2013)
+
+  27 Jan 2013; Christoph Junghans <ottxor@gentoo.org>
+  +files/votca-tools-1.2.3-boost-1.53.patch, +votca-tools-1.2.3-r1.ebuild,
+  -votca-tools-1.2.3.ebuild:
+  fix build with boost-1.53 (bug #454104)
 
   26 Dec 2012; Christoph Junghans <ottxor@gentoo.org> votca-tools-1.2.2.ebuild,
   votca-tools-1.2.3.ebuild:
diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest
index 3b3f60540c4f..f25a4390cc45 100644
--- a/sci-libs/votca-tools/Manifest
+++ b/sci-libs/votca-tools/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX votca-tools-1.2.3-boost-1.53.patch 950 SHA256 01d33c7532429608c838322672947bce76d341fdd5f85c4940a72d21e835a330 SHA512 1eccdc6f104c84290f8d7edcf931e5728ae186919147db12c413e1fc0d55d5221ab9ff845dbe843ae9be2b6d0f4c78f3957a4900ff7f1978198d9f08700f7526 WHIRLPOOL 6132e429ec8cce9822b069964151b1dfc791fcccf02443d687fa9ada5e39bf5d63b8b39796ca0f2f12dadf2d16e1693a4009511ee8a39e91fac3690e666a595e
 DIST votca-tools-1.2.2.tar.gz 987104 SHA256 26eb8b97944844cecbfeb4609091af223c5b912696492bda8347b8f98ad543be
 DIST votca-tools-1.2.2_pristine.tar.gz 85442 SHA256 23e53ea7d462ced18dde8a5795c4e1dc8c05084c18deb50663023c270314eb28 SHA512 5245e9fdeaedc28fca211378f088636720c83511592a6e34b92f07d465692c7d2305a40ee111726a9ddf2d11e82a8f34ee9c3345e151780276d7679149857e7d WHIRLPOOL b792be3c2e2dc935b7ecbb40740fdba33afafe22ae0249b18eda36826c98f38345c7cc6513fe72db31ba53f61e7b93fbc1459ceec76b2959f774ba035cf63c60
 DIST votca-tools-1.2.3.tar.gz 986326 SHA256 134beda26291904f0a4b86ef8c5b7e7264c6ea53b73c18cf6e93fafca80e0e25 SHA512 aa8161d46e96071184158364acf75746d8df09f3aabbc518488c492f4853ad09350c62fdd9aed9ad03ff9d72cd3fb5872a9f7bea577d3e24f225fbe69f075fa2 WHIRLPOOL d16745499075645f2136b2450f810ec4f7bffee672211f10172f31368e5b7dc380995ec932ce5aad500b347e1ab6ae73174aca6e4bb31969ad9e7a08903d4264
 DIST votca-tools-1.2.3_pristine.tar.gz 84532 SHA256 4012147bd2522032e86e181982c21245d669bfe6c5b4a77bd1d082e29d9fb145 SHA512 092ce6fc692a38b9e76afc06baf6f9d7cc942b8de1c0bce710c20ddd0b54c2df29871214c912c9f0bee41ae06d3512df9da5b144a10234674c96e46d847eefb2 WHIRLPOOL 336645b551fa5190c40c6915ac5cd9a4ad01929808d822337d8ed80224334e1d4a796939249e3418d38d33df0dd5995482369b9607ed3332731989a7d30c9b74
 EBUILD votca-tools-1.2.2.ebuild 1775 SHA256 7542fe372174d1e27da0a3a542a222e62494328c8947a14f05695f5ebb512942 SHA512 ec6b810f7ba79f8c7e8af99f604fab75fe897133304a6ff1274914810c60eb5169946ce187e0b5e7b111a754e9d3ead3cdca6f24d5933e0276a4d1c59a2f4019 WHIRLPOOL 48eb9409061dc472da2e97197eec8807082092032d5bb0fa697b1589f05de98681d92decd67ec2ba0f5b0d14d1ea136829001111c14bef8175a573373cadb066
-EBUILD votca-tools-1.2.3.ebuild 1750 SHA256 f2caf98d0d10806ac2eec30e02535489735b61142f54c318f0a64c4358acd71f SHA512 540429924a284cf3084f6b8a2ee282b295655f1d73fb4711fb7f550b40496743093a449eaf5e38c672a63335ac7794750fbde67ac0f4f4bc8c916f6cded07a50 WHIRLPOOL 80899731f29f684939a69223d3cbeeb9d5330c9655c15c6db18e156a363994c742a5eeb83cc87878fe9bf83be1c32d090b16b2806abebf1f845b5b8bbed33135
-MISC ChangeLog 2722 SHA256 9eac4f0c7e6c5f4cccd7c9f3337a0b773cb191ec720519bbf40f224dcace462d SHA512 957de7f3d70937023793ba720f297b0adb792c35f5bd647d642dc420a8914d91cfe62f8c116ac0187fd2910e95f8eb2f434cd926729b4e8246269e8f6db16c2e WHIRLPOOL 6bb5b68aa0fe5bdee4df2562b43f4761a90df8d788f80d3f5760d40e0513a180dfb34eaa961e6d16ab6cf03f4ab20a51bbcb00b835086ed212052c096aafe3eb
+EBUILD votca-tools-1.2.3-r1.ebuild 1800 SHA256 9ae9115403be989f64a159b9d64633493e3a6955931331e64543f2b258c5670a SHA512 533452b24fac5b9b32ba2106711bd9e76770cca067ec5bedf620b65d84650a68bcb37acbb51d2c63d445d626ee88b7e3015796030c9fe14e4237aafd8a8fbf8a WHIRLPOOL a40ec1b0cbd314d7e382379249e7a48687e73e2dc77796e8f88b00c7901662e03eb3f6711904dc38ccdbc14d270a932e8a8a69c77fde891c49afd0e4964eb6b9
+MISC ChangeLog 2960 SHA256 2cdb3b887fa94fd3c2c1114f76755a11a03d955cfd9f289be0455506589de348 SHA512 6bb8ab9afcd438a3f2e8ed889b04cbad40f5f9f38328a7706a933d2c0ba465898408985143c0fe9515f717784e5880b18700d68442d66e3258d77f6b4ed47c11 WHIRLPOOL b4f66a6bebe933316989de177776ff9e08e6933bdd69b1f262bd9d60fee6172cf6b3352de2c84d9c37cf5f37fcdbb12b777c0de6e06af84982c0f18bcd883671
 MISC metadata.xml 458 SHA256 37518bd45105eef114841f0c1a19383bd48ba96852c28fe33729097e8c607922 SHA512 c2014d78f6c741c7ad6e418f9df2d97f2870f0346fb8c91f6437e0d17cf31751af02622d5cdf7900a6012bc413a3bce3d1057a4a4c0383274ecdcd723fc8a843 WHIRLPOOL 05feaf37c6a76eee898e6efa000d6104c66e654b9a51f8f9f506f11df1cbc5da094e5dc7c4563312faef4ac5c8ac012c7a6b907666bb6121746211508bd84a17
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ24avAAoJEOeBhlrCAAWGWesIAIzaBxrmnHSJ3hG+k21wLedm
-djJ8Lwxj3Tjq5PdmaIWCUo3DzS2Kc0Wc3Xvn2TGrNVw3cGc5RdSB07qvgjoRyXGF
-o9GGygRlSj7heyvKe4thunr5HjwNarFNN7ihfjCfTyvTAbZ9J00HBiizdLhl8heQ
-/v4r+TiRiayTnwcpL2J/MVZ4bLkMN8F4lwMG7pOZmWqhcDno25M7xQFBxkNkbtjf
-nPpxYRgfUFQ2dUgeJqdMtke54qJVepzk+Fk64IFNqN4Mmy7kkwIZsW6okfGBwt+W
-yuGaJD7Ir+Ze0xIIqO6eDDH8VaD3ohhCWs30vIg6Dole7SfyM/TIylhU4s+eCWY=
-=fKPs
+iQEcBAEBCAAGBQJRBKcIAAoJEOeBhlrCAAWGMBwH/A7MzyySUHdXB4YgHqZIEUWD
+TjEbgsSRUyrBXWIRvL/hS89yfoft5wOTf4lFL01LLuBxzmxeXz+GA8z6+uGQyrSA
+CShkxoOVmtccigE6b2OAsg0xIRm8ajSzyR/+vWAMaGNn1jgMU6A8mAAwxYEO/C3o
+vHBcpqNvGhHifcPUSxw47oBRCp98FX4FMWc5WckRWFm7pP4xl8jt8ST+BT6N5TRZ
+bIw2db5v3yiV5XmVQWnQOukC651oX/FjFok61EVHomplb9zhI+bce+4iBwQBALtt
+dkl+dhDsTCxMF5TChgMOwmSV0THpWkd6fNzUpMtkg8xd+oYtspSHipwOz/Pjl6k=
+=BIkK
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/votca-tools/files/votca-tools-1.2.3-boost-1.53.patch b/sci-libs/votca-tools/files/votca-tools-1.2.3-boost-1.53.patch
new file mode 100644
index 000000000000..4aa7adbf5641
--- /dev/null
+++ b/sci-libs/votca-tools/files/votca-tools-1.2.3-boost-1.53.patch
@@ -0,0 +1,24 @@
+# HG changeset patch
+# User Victor Ruehle <ruehle@votca.org>
+# Date 1359258783 25200
+# Branch stable
+# Node ID f26d7ee778d666babe7f58ae3770b4f3d997aa99
+# Parent  d10dec78492a78ad6709e686416615fc8b43c896
+fix build with boost-1.53 (fixes issue 131)
+
+diff -r d10dec78492a -r f26d7ee778d6 include/votca/tools/tokenizer.h
+--- a/include/votca/tools/tokenizer.h	Sun Dec 02 21:09:27 2012 -0700
++++ b/include/votca/tools/tokenizer.h	Sat Jan 26 20:53:03 2013 -0700
+@@ -93,8 +93,10 @@
+         std::vector<std::string> tmp;
+         ToVector(tmp);
+         v.resize(tmp.size());
+-        transform(tmp.begin(), tmp.end(), v.begin(),
+-            boost::lexical_cast<T, std::string>);
++        typename std::vector<T>::iterator viter = v.begin();
++        typename std::vector<std::string>::iterator iter;
++        for(iter = tmp.begin(); iter!=tmp.end(); ++iter, ++viter)
++            *viter = boost::lexical_cast<T, std::string>(*iter);
+     }
+     
+ private:
diff --git a/sci-libs/votca-tools/votca-tools-1.2.3.ebuild b/sci-libs/votca-tools/votca-tools-1.2.3-r1.ebuild
index 550d5b85f2f4..4677a238af8c 100644
--- a/sci-libs/votca-tools/votca-tools-1.2.3.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.2.3-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/votca-tools/votca-tools-1.2.3.ebuild,v 1.2 2012/12/26 23:22:22 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/votca-tools/votca-tools-1.2.3-r1.ebuild,v 1.1 2013/01/27 04:03:19 ottxor Exp $
 
 EAPI="3"
 
 inherit cmake-utils eutils multilib
 
 if [ "${PV}" != "9999" ]; then
-	SRC_URI="system-boost? ( http://votca.googlecode.com/files/${PF}_pristine.tar.gz )
-		!system-boost? ( http://votca.googlecode.com/files/${PF}.tar.gz )"
+	SRC_URI="system-boost? ( http://votca.googlecode.com/files/${P}_pristine.tar.gz )
+		!system-boost? ( http://votca.googlecode.com/files/${P}.tar.gz )"
 	RESTRICT="primaryuri"
 else
 	SRC_URI=""
@@ -37,6 +37,8 @@ DEPEND="${RDEPEND}
 
 DOCS=( NOTICE )
 
+PATCHES=( "${FILESDIR}/${P}-boost-1.53.patch" )
+
 src_prepare() {
 	use gsl || ewarn "Disabling gsl will lead to reduced functionality"
 	use fftw || ewarn "Disabling fftw will lead to reduced functionality"