version bump

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

4 files changed, 25 insertions, 61 deletions

diff --git a/sci-libs/votca-tools/ChangeLog b/sci-libs/votca-tools/ChangeLog
index 608db6733e3c..629e9a41cffd 100644
--- a/sci-libs/votca-tools/ChangeLog
+++ b/sci-libs/votca-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/votca-tools
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/votca-tools/ChangeLog,v 1.23 2013/07/02 14:15:12 ottxor Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/votca-tools/ChangeLog,v 1.24 2014/08/31 23:37:54 ottxor Exp $
+
+*votca-tools-1.2.4 (31 Aug 2014)
+
+  31 Aug 2014; Christoph Junghans <ottxor@gentoo.org> +votca-tools-1.2.4.ebuild,
+  -files/votca-tools-1.2.3-boost-1.53.patch, -votca-tools-1.2.3-r3.ebuild:
+  version bump
 
   02 Jul 2013; Christoph Junghans <ottxor@gentoo.org>
   votca-tools-1.2.3-r3.ebuild:
diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest
index 2eaade6e86d5..78cf63dbf1de 100644
--- a/sci-libs/votca-tools/Manifest
+++ b/sci-libs/votca-tools/Manifest
@@ -1,23 +1,21 @@
 -----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
+DIST votca-tools-1.2.4_pristine.tar.gz 84836 SHA256 acb5545c7cbdf8f8dbad6645f553e90e5dfa979e5f662f56696f73fc5a957c55 SHA512 65e780cbedf9b9001f3d704d7d45a8272cd995f21cea7a31a446a0e040c803994ff9aea2a884a2c5c972cef9b980434cb8e2bbcef8b96cfb31e178d95ddb0f45 WHIRLPOOL a8a341349ac3d36b9f331c57cfcc62c1995ca71fcec035dab098438cbbc1a2c6a80ed50d048e8673333af352723352a2af9aed41411e43e4d9e40cfbedf362ca
 EBUILD votca-tools-1.2.2.ebuild 1775 SHA256 7542fe372174d1e27da0a3a542a222e62494328c8947a14f05695f5ebb512942 SHA512 ec6b810f7ba79f8c7e8af99f604fab75fe897133304a6ff1274914810c60eb5169946ce187e0b5e7b111a754e9d3ead3cdca6f24d5933e0276a4d1c59a2f4019 WHIRLPOOL 48eb9409061dc472da2e97197eec8807082092032d5bb0fa697b1589f05de98681d92decd67ec2ba0f5b0d14d1ea136829001111c14bef8175a573373cadb066
-EBUILD votca-tools-1.2.3-r3.ebuild 1807 SHA256 085cdba363b26f910c5f0be80bcf64fd509072ae4e7ad73842bc1ee152c87bae SHA512 ed4941b4d968607cee04b0746d8195bec4f410430289c23b9a00b07552bcfc69b238e8024c54b22e822dba1dde307813d5faed3eab02104d5b1d14588e90ab9a WHIRLPOOL 28b649e77ef55830c7368842d1350ff9739a6119260c4bac1a5b258406c2fdd020cdeea81b876edc80cc01708bde7740407c38a367569734f85456faf01f6c32
-MISC ChangeLog 3466 SHA256 caa442385c7cbbd1b74233fb772ad632a72bc24f8735339ff2057f005a14bc14 SHA512 094f9f00897fcbbc37fc076fdd9c8c172c2649f03af4711d1a1c65b61ba04e80c8748fff26ed71b70fcc1660eb2ecb1ccb1523ac2a79497ef7145f8539dfa77b WHIRLPOOL 9e54b4f5fa4a596717cc4bd795383954207a7d848e167bef0489bfb891d04f8a72d69232d5fefd39b6c3b4fb7f336e20e244742937e48d8a64924027d0108fc3
+EBUILD votca-tools-1.2.4.ebuild 1334 SHA256 49ff954837e7a33d2c1c6d13ccb2a131c06213db743461783571c8ada369124e SHA512 30cf20a393cf0e06b5c426af2c4049326f9b79a1ba9161deb3480f78ad20fe5afdd159faaf7acdc0bc181a1acdd72770575d481c9b2eebddf41ae899d50df0ee WHIRLPOOL bc59156d295cbfbdb33554ace6594d9bd7dc20cfe9fa2dc8293d879df0d1073433123ad79054c409d8f523704fdfc0187c0aa77d431345c4f5da5529853ce73d
+MISC ChangeLog 3672 SHA256 cff6fd82883329102731c2ddccd5128b24aada4a5a5b2b6edf523fec065d098f SHA512 0c408b89992bfa2e4f57c587a3a6afad0efcf11a55a9cca98a075a152c629a0593c6270b346b0678317a4e2f951c28b6750d691164f0fc3cb73a09ef2b5f6ac3 WHIRLPOOL ad8df45544211aaf79df2a8cf307d08c75c61704c061302259a51ce5c62d32c1b6ff7e64ca7a7bf01a1f35b4972c90e324127fbf3c04b2e5b453f910252f67fe
 MISC metadata.xml 458 SHA256 37518bd45105eef114841f0c1a19383bd48ba96852c28fe33729097e8c607922 SHA512 c2014d78f6c741c7ad6e418f9df2d97f2870f0346fb8c91f6437e0d17cf31751af02622d5cdf7900a6012bc413a3bce3d1057a4a4c0383274ecdcd723fc8a843 WHIRLPOOL 05feaf37c6a76eee898e6efa000d6104c66e654b9a51f8f9f506f11df1cbc5da094e5dc7c4563312faef4ac5c8ac012c7a6b907666bb6121746211508bd84a17
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJR0uB1AAoJEOeBhlrCAAWG1RMH/ip6d1S3fpVt407cKadb6zlv
-Y3Vu56JldS9reO1SgTQ1gpcUTH49um3g9IzcTnCHbh1NBO96HMu4vdIMwo4lu5mZ
-+5PkihRcDOwU2mFmYD8cxofb2exThjnSb5EDPvgtQDWRBZ8oFp6qQpK2lX7vE/Qy
-GA1YWOSM0M93I2hUUy91VaS68B6i9/R0x4cn5bRN1TVf0NoHT6XvXdvN4vYb4TJy
-dMykwVNKFYcEjc5ge8RpDMRCS3WuXUxSwiJLnnW3XCALXbnfmGyiRrjAW9KS9BZg
-1XehVnoOJOeY3PBNkwK3GEXbX1URx9sm+VBvijfZpM7iBaYHwkHcfD/LS+7bftc=
-=YIzZ
+iQEcBAEBCAAGBQJUA7HaAAoJEOeBhlrCAAWGFawIAIkm5YVK7M+/l++pa0+FY0Z0
+QKubJTO6L23FZnYfk48zdk321IGWE1VAb2e6e4ZCG5VtfRHe7Fu3UCi8ZSbcI/IT
+ObJX23PnUFWquCK9Q9g41xl6N4+/D5H+2TW5fGlrL1mtEog+fXth/yb5DmGnO15e
+QOmJxTeR55ts0+plNICJCQKHGCT0bw7xJjoDwKVC5i9GHgJ0H7L5QUncSbuvHr4k
+Mjd3p8mSCRB1v4Q57q9mMu32Rn/yvfI2kRPNZ0uC64bE4J9NY5t5V3ds7lUzX16o
+0ztqFK0yqK9X9O/6CljHAzrF9H0v4TmQtOlzT1Ps9wS1xG16OvZ3xpklYeFZdbk=
+=T+40
 -----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
deleted file mode 100644
index 4aa7adbf5641..000000000000
--- a/sci-libs/votca-tools/files/votca-tools-1.2.3-boost-1.53.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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-r3.ebuild b/sci-libs/votca-tools/votca-tools-1.2.4.ebuild
index 0c1e50fe55e4..6866aee6d415 100644
--- a/sci-libs/votca-tools/votca-tools-1.2.3-r3.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.2.4.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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-r3.ebuild,v 1.2 2013/07/02 14:15:12 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/votca-tools/votca-tools-1.2.4.ebuild,v 1.1 2014/08/31 23:37:54 ottxor Exp $
 
 EAPI="5"
 
 inherit cmake-utils eutils multilib
 
 if [ "${PV}" != "9999" ]; then
-	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"
+	SRC_URI="http://downloads.votca.googlecode.com/hg/${P}_pristine.tar.gz"
 else
 	SRC_URI=""
 	inherit mercurial
@@ -22,12 +20,12 @@ HOMEPAGE="http://www.votca.org"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos"
-IUSE="doc +fftw +gsl sqlite +system-boost"
+IUSE="doc +fftw +gsl sqlite"
 
 RDEPEND="fftw? ( sci-libs/fftw:3.0 )
 	dev-libs/expat
 	gsl? ( sci-libs/gsl )
-	system-boost? ( dev-libs/boost:= )
+	dev-libs/boost:=
 	sqlite? ( dev-db/sqlite:3 )"
 
 DEPEND="${RDEPEND}
@@ -37,26 +35,12 @@ 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"
-
-	cmake-utils_src_prepare
-
-	#remove bundled libs
-	if use system-boost; then
-		rm -rf src/libboost
-	fi
-}
-
 src_configure() {
 	mycmakeargs=(
-		$(cmake-utils_use system-boost EXTERNAL_BOOST)
 		$(cmake-utils_use_with gsl GSL)
 		$(cmake-utils_use_with fftw FFTW)
 		$(cmake-utils_use_with sqlite SQLITE3)
+		-DEXTERNAL_BOOST=ON
 		-DWITH_RC_FILES=OFF
 		-DLIB=$(get_libdir)
 	)