aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Junghans <ottxor@gentoo.org>2012-07-17 20:41:53 -0600
committerChristoph Junghans <ottxor@gentoo.org>2012-07-17 20:41:53 -0600
commita4134af48ab83a2b4a05beab1afcaafe4751c85d (patch)
treedb5435c28bf7905b1c940393990ad6e4b3d39959
parentsci-chemistry/votca-{ctp,kmc,moo}: removed never realy used (diff)
downloadsci-a4134af48ab83a2b4a05beab1afcaafe4751c85d.tar.gz
sci-a4134af48ab83a2b4a05beab1afcaafe4751c85d.tar.bz2
sci-a4134af48ab83a2b4a05beab1afcaafe4751c85d.zip
live ebuild update
(Portage version: 2.2.0_alpha118/git/Linux i686, unsigned Manifest commit)
-rw-r--r--sci-libs/votca-tools/ChangeLog5
-rw-r--r--sci-libs/votca-tools/metadata.xml3
-rw-r--r--sci-libs/votca-tools/votca-tools-9999.ebuild20
3 files changed, 8 insertions, 20 deletions
diff --git a/sci-libs/votca-tools/ChangeLog b/sci-libs/votca-tools/ChangeLog
index 2b6ae691e..69bcc00db 100644
--- a/sci-libs/votca-tools/ChangeLog
+++ b/sci-libs/votca-tools/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 18 Jul 2012; Christoph Junghans <ottxor@gentoo.org> metadata.xml,
+ votca-tools-9999.ebuild:
+ live ebuild update
+
24 Mar 2012; Christoph Junghans <ottxor@gentoo.org> votca-tools-9999.ebuild:
Fixes bug #405455, again
@@ -119,4 +123,3 @@
13 Dec 2009; Christoph Junghans <kleiner_otti@gmx.de>
+votca-tools-1.0_rc1.ebuild, +metadata.xml:
initial add bug #296707
-
diff --git a/sci-libs/votca-tools/metadata.xml b/sci-libs/votca-tools/metadata.xml
index 378b4127e..266f600c9 100644
--- a/sci-libs/votca-tools/metadata.xml
+++ b/sci-libs/votca-tools/metadata.xml
@@ -6,7 +6,4 @@
<email>ottxor@gentoo.org</email>
<name>Christoph Junghans</name>
</maintainer>
- <use>
- <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-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[-nodot] >=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)