From a4134af48ab83a2b4a05beab1afcaafe4751c85d Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Tue, 17 Jul 2012 20:41:53 -0600 Subject: live ebuild update (Portage version: 2.2.0_alpha118/git/Linux i686, unsigned Manifest commit) --- sci-libs/votca-tools/votca-tools-9999.ebuild | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'sci-libs/votca-tools/votca-tools-9999.ebuild') diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votca-tools/votca-tools-9999.ebuild index 4004aee78..d02f699e4 100644 --- a/sci-libs/votca-tools/votca-tools-9999.ebuild +++ b/sci-libs/votca-tools/votca-tools-9999.ebuild @@ -7,8 +7,7 @@ EAPI=4 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="http://votca.googlecode.com/files/${PF}.tar.gz" RESTRICT="primaryuri" else SRC_URI="" @@ -24,34 +23,23 @@ HOMEPAGE="http://www.votca.org" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~x86 ~amd64" -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} doc? ( || ( =app-doc/doxygen-1.7.6.1[dot] ) ) >=app-text/txt2tags-2.5 - dev-util/pkgconfig" + virtual/pkgconfig" DOCS=( NOTICE ) -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 - 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) -- cgit v1.2.3-65-gdbad