renamed boost useflag and removed old

Package-Manager: portage-2.1.10.3/cvs/Linux i686

6 files changed, 23 insertions, 176 deletions

diff --git a/sci-libs/votca-tools/ChangeLog b/sci-libs/votca-tools/ChangeLog
index c050d9adc552..e69168c2154e 100644
--- a/sci-libs/votca-tools/ChangeLog
+++ b/sci-libs/votca-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/votca-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/votca-tools/ChangeLog,v 1.6 2011/07/06 14:43:39 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/votca-tools/ChangeLog,v 1.7 2011/08/14 15:16:00 ottxor Exp $
+
+  14 Aug 2011; Christoph Junghans <ottxor@gentoo.org>
+  -votca-tools-1.1.1.ebuild, -votca-tools-1.1.2.ebuild, votca-tools-1.2.ebuild,
+  metadata.xml:
+  renamed boost useflag to system-boost and removed old
 
   06 Jul 2011; Christoph Junghans <ottxor@gentoo.org> votca-tools-1.2.ebuild:
   pristine tarball has wrong ${S} (bug #374165)
diff --git a/sci-libs/votca-tools/Manifest b/sci-libs/votca-tools/Manifest
index 59cecb423651..a1fe04aa4698 100644
--- a/sci-libs/votca-tools/Manifest
+++ b/sci-libs/votca-tools/Manifest
@@ -1,24 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST votca-tools-1.1.1.tar.gz 1636961 RMD160 172a8a03203275229e866ffa02a90ba5fbf064f5 SHA1 fa1c0ae6eab5a95405cfd91710697c19b4b47ff0 SHA256 acf2a990e45733df760378b71090254efa0a25972bb1cc7aabdad7c3e00139ce
-DIST votca-tools-1.1.1_pristine.tar.gz 407090 RMD160 62ab4effc54f88cb2b532e1b756c03cf6927c322 SHA1 90f94064bfc65923332617f566b1787d11aa93c0 SHA256 28f112cd8248cc4d27f839659a433db0145d74905fd913163f1cb6c119965f59
-DIST votca-tools-1.1.2.tar.gz 1636948 RMD160 bfbf59abf12c0cc3c52abde822797dc1224b1bdf SHA1 e2bfd120e31ca19336666d26171479c5b28d46d4 SHA256 dbf5faadb46bd4663509fce1cf92a2fba99e48a26aed06b01419515d7e17c2ab
-DIST votca-tools-1.1.2_pristine.tar.gz 407147 RMD160 a9fd8c92d644461ffa4eb1a8c71b33fa62e5031e SHA1 35ead8d36fff8f7a141080b20bd4788103d389ab SHA256 938a77e09539f0ee1a6436eb72776a008433b13790239043f9aefd94236daf64
 DIST votca-tools-1.2.tar.gz 960904 RMD160 96bace75cb4555b748aaf4b216a0eea0b9d1d358 SHA1 0d47d7e1abf464e7a2c0d5c7e174a3e5e75176f0 SHA256 2489b3a430e01f5fe6da35201c9d449c49c8e347ae4cbc70c4449d8bfda6e6a2
-EBUILD votca-tools-1.1.1.ebuild 1940 RMD160 7b546254dfc2b6ded4afcb2e2b3aa992b5bf4103 SHA1 bda76227b3cc7d71403033c83e1c0aaf6b588a5f SHA256 8d19f0670f5103976c6017d1cc892a6760443f7ba5c8a5bdf7a846f2200dfddb
-EBUILD votca-tools-1.1.2.ebuild 1940 RMD160 7bb54972eb0ada7853362829dcd5f0461d7fc7c7 SHA1 63b2d3457c15a242dfc024cb6033319233b0fed9 SHA256 7a435b4326bedf6a1a117d3d60e2946a8688cb223adac3f0a2a821741f89f265
-EBUILD votca-tools-1.2.ebuild 1611 RMD160 f2dbf1af8c61cdea654ae1141a10cb43f3f11475 SHA1 9aec3eda88b3b250df1f10f40da34134550b7b97 SHA256 e0d02b8694a75df0e5ad2ee15dfb51965388405ce90d83db147adc3eb9bd1450
-MISC ChangeLog 1034 RMD160 feebe17d9c7ad2ce24a086ba66599fd159338f66 SHA1 1d195a6c44c246be146aac6307112449ad81f9d8 SHA256 41480eef31398568bd1788fccf80292378c9b193b94f41948375dfb6162cdf14
-MISC metadata.xml 364 RMD160 f5b24d257b77c1729805134ab10a0220746adabd SHA1 9d96df2a755efaf921cccf34456b8e5fc3e964e9 SHA256 0d446730e41f7ace28e9f7d974483b906f1eabadaed42b4b34bc8756ffff50fb
+EBUILD votca-tools-1.2.ebuild 1639 RMD160 8d12babec181b361c4515214542f6dc9447c2e16 SHA1 a9a1fa7ddc1016e79daec270ece81b604eccfda5 SHA256 2046ff6773732e02fd431e38c03414a79188bdc8cbe7a5e5006f049b08fa8fd4
+MISC ChangeLog 1241 RMD160 e161771b79c58b677ae839f940c4227cc1d7baeb SHA1 760384174adb692bdb07e3415fc71ab445876e79 SHA256 6423b4b35bebf08e6b29fe312c5b0221aa6d3fcd33ca7d74b056016463772f61
+MISC metadata.xml 383 RMD160 8767f93217531b7cb1b96560985dd76572b9a1a2 SHA1 948cb7b06acf9e89cd7810dec08e20fddd14c9bb SHA256 d1448ce3393b6092cc8753edd4cdca52ff1c8451e58859ee2f520381b325bf82
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOFHShAAoJEOeBhlrCAAWGauIH/3tfpyjPY4aUc7akS9Dtzdyi
-8PQ/lcTRHs/hOujumvmJ0HAOgqSm15xco7KQdN6JCFty+XYcUW55soFrzmQWvBR7
-O+4y+VyY2bflr9yhR+qWg1nLC2DaJP0cvsYhzJfN+KJBnj6byPtUihTllZJyOPwv
-+L48WU7B74wpPQ7VdPJy8KwAbHVMWPL/OvWFXobxipBPyFO+zQVUgfvV5l2GkcvU
-+I2ZOxpemLAywaDrzqzAt4PImIfXmmHfgYZPv3XKtAeJE1wmkMZ9s4wZWnWd5fJw
-WY9edt3kepdsaz7nADyXhLfjxlyqQBIakrvbYb1/LwEHxe3n0rKdSdQkUq0GHo0=
-=HeGu
+iQEcBAEBAgAGBQJOR+a2AAoJEOeBhlrCAAWG5lAH/1woRcWLh9J73IGZZFr2L2kS
+EvOUnOEX+on0I4ZJMaQlo3u0fwXF/J1jZwqoq6aAyMjhzuvG4M6y8f/1gSLznLsM
+5/OExaPjRJvR/nvDDW4Z+lXV8qQoXqS2UfUWpr4Bbk3gd4g/VH0j0QRSPW61cNNq
+7c9RyHLt/dZVsLENDh1V6vlimpz/0TshM7bB0ZnxiIGumqnBaqYpHFYuT3zGQhW4
+gH2Nyh7tOuOKJA2SKtSwIgXuD86dbR8+h8FEezkWpjHbva/QBeAtPC6ZeiH4KevH
+IRfDE6AtGLFpI9sbLrwNqZksE9AmjjcZWvg9a5gdQSdiBBV3Lvefvm1qjhAbAuU=
+=d1a3
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/votca-tools/metadata.xml b/sci-libs/votca-tools/metadata.xml
index 046b8b5f07de..378b4127eb93 100644
--- a/sci-libs/votca-tools/metadata.xml
+++ b/sci-libs/votca-tools/metadata.xml
@@ -7,6 +7,6 @@
 		<name>Christoph Junghans</name>
 	</maintainer>
 	<use>
-		<flag name='boost'>Compile against external boost headers (dev-libs/boost)</flag>
+		<flag name='system-boost'>Use system boost (<pkg>dev-libs/boost</pkg>) instead of bundled one</flag>
 	</use>
 </pkgmetadata>
diff --git a/sci-libs/votca-tools/votca-tools-1.1.1.ebuild b/sci-libs/votca-tools/votca-tools-1.1.1.ebuild
deleted file mode 100644
index 2808dbc32272..000000000000
--- a/sci-libs/votca-tools/votca-tools-1.1.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2011 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.1.1.ebuild,v 1.2 2011/03/09 22:10:05 ottxor Exp $
-
-EAPI="3"
-
-inherit eutils autotools-utils
-
-if [ "${PV}" != "9999" ]; then
-	SRC_URI="boost? ( http://votca.googlecode.com/files/${PF}_pristine.tar.gz )
-		!boost? ( http://votca.googlecode.com/files/${PF}.tar.gz )"
-	RESTRICT="primaryuri"
-else
-	SRC_URI=""
-	inherit mercurial
-	EHG_REPO_URI="https://tools.votca.googlecode.com/hg"
-	S="${WORKDIR}/${EHG_REPO_URI##*/}"
-fi
-
-DESCRIPTION="Votca tools library"
-HOMEPAGE="http://www.votca.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="-boost doc +fftw +gsl static-libs"
-
-RDEPEND="fftw? ( sci-libs/fftw:3.0 )
-	dev-libs/expat
-	gsl? ( sci-libs/gsl )
-	boost? ( dev-libs/boost )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[-nodot] )
-	>=app-text/txt2tags-2.5
-	dev-util/pkgconfig"
-
-src_prepare() {
-	use gsl || ewarn "Disabling gsl will lead to reduced functionality"
-	use fftw || ewarn "Disabling fftw will lead to reduced functionality"
-
-	#remove bundled libs
-	rm -rf src/libexpat
-	if use boost; then
-		rm -rf src/libboost
-	else
-		#fix a qa issue ../../config is not support as m4 dir
-		mkdir -p src/libboost/config || die
-		sed -i 's@\.\./\.\./config@config@' \
-			src/libboost/configure.ac \
-			src/libboost/Makefile.am || \
-			die "sed of libboost configure.ac and Makefile.am failed"
-	fi
-	eautoreconf || die "eautoreconf failed"
-}
-
-src_configure() {
-	local myconf
-	use boost && myconf="--disable-votca-boost" || myconf="--enable-votca-boost"
-
-	myeconfargs=( ${myconf} --disable-rc-files
-		$(use_with gsl)
-		$(use_with fftw)
-	)
-	autotools-utils_src_configure || die
-}
-
-src_install() {
-	DOCS=(${AUTOTOOLS_BUILD_DIR}/CHANGELOG NOTICE)
-	autotools-utils_src_install || die
-	if use doc; then
-		cd share/doc || die
-		doxygen || die
-		dohtml -r html/* || die
-	fi
-}
diff --git a/sci-libs/votca-tools/votca-tools-1.1.2.ebuild b/sci-libs/votca-tools/votca-tools-1.1.2.ebuild
deleted file mode 100644
index 22a9be4cfbe0..000000000000
--- a/sci-libs/votca-tools/votca-tools-1.1.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2011 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.1.2.ebuild,v 1.1 2011/04/04 19:56:40 ottxor Exp $
-
-EAPI="3"
-
-inherit eutils autotools-utils
-
-if [ "${PV}" != "9999" ]; then
-	SRC_URI="boost? ( http://votca.googlecode.com/files/${PF}_pristine.tar.gz )
-		!boost? ( http://votca.googlecode.com/files/${PF}.tar.gz )"
-	RESTRICT="primaryuri"
-else
-	SRC_URI=""
-	inherit mercurial
-	EHG_REPO_URI="https://tools.votca.googlecode.com/hg"
-	S="${WORKDIR}/${EHG_REPO_URI##*/}"
-fi
-
-DESCRIPTION="Votca tools library"
-HOMEPAGE="http://www.votca.org"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="-boost doc +fftw +gsl static-libs"
-
-RDEPEND="fftw? ( sci-libs/fftw:3.0 )
-	dev-libs/expat
-	gsl? ( sci-libs/gsl )
-	boost? ( dev-libs/boost )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[-nodot] )
-	>=app-text/txt2tags-2.5
-	dev-util/pkgconfig"
-
-src_prepare() {
-	use gsl || ewarn "Disabling gsl will lead to reduced functionality"
-	use fftw || ewarn "Disabling fftw will lead to reduced functionality"
-
-	#remove bundled libs
-	rm -rf src/libexpat
-	if use boost; then
-		rm -rf src/libboost
-	else
-		#fix a qa issue ../../config is not support as m4 dir
-		mkdir -p src/libboost/config || die
-		sed -i 's@\.\./\.\./config@config@' \
-			src/libboost/configure.ac \
-			src/libboost/Makefile.am || \
-			die "sed of libboost configure.ac and Makefile.am failed"
-	fi
-	eautoreconf || die "eautoreconf failed"
-}
-
-src_configure() {
-	local myconf
-	use boost && myconf="--disable-votca-boost" || myconf="--enable-votca-boost"
-
-	myeconfargs=( ${myconf} --disable-rc-files
-		$(use_with gsl)
-		$(use_with fftw)
-	)
-	autotools-utils_src_configure || die
-}
-
-src_install() {
-	DOCS=(${AUTOTOOLS_BUILD_DIR}/CHANGELOG NOTICE)
-	autotools-utils_src_install || die
-	if use doc; then
-		cd share/doc || die
-		doxygen || die
-		dohtml -r html/* || die
-	fi
-}
diff --git a/sci-libs/votca-tools/votca-tools-1.2.ebuild b/sci-libs/votca-tools/votca-tools-1.2.ebuild
index 7cd599b5d764..d4d8334390e9 100644
--- a/sci-libs/votca-tools/votca-tools-1.2.ebuild
+++ b/sci-libs/votca-tools/votca-tools-1.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 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.ebuild,v 1.2 2011/07/06 14:43:39 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/votca-tools/votca-tools-1.2.ebuild,v 1.3 2011/08/14 15:16:00 ottxor Exp $
 
 EAPI="3"
 
-inherit eutils cmake-utils
+inherit cmake-utils eutils
 
 if [ "${PV}" != "9999" ]; then
 	SRC_URI="http://votca.googlecode.com/files/${PF}.tar.gz"
@@ -23,12 +23,12 @@ HOMEPAGE="http://www.votca.org"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="-boost doc +fftw +gsl sqlite"
+IUSE="doc +fftw +gsl sqlite +system-boost"
 
 RDEPEND="fftw? ( sci-libs/fftw:3.0 )
 	dev-libs/expat
 	gsl? ( sci-libs/gsl )
-	boost? ( dev-libs/boost )
+	system-boost? ( dev-libs/boost )
 	sqlite? ( dev-db/sqlite:3 )"
 
 DEPEND="${RDEPEND}
@@ -41,14 +41,14 @@ src_prepare() {
 	use fftw || ewarn "Disabling fftw will lead to reduced functionality"
 
 	#remove bundled libs
-	if use boost; then
+	if use system-boost; then
 		rm -rf src/libboost
 	fi
 }
 
 src_configure() {
 	mycmakeargs=(
-		$(cmake-utils_use boost EXTERNAL_BOOST)
+		$(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)