From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1SrKOv-0005zP-6k for garchives@archives.gentoo.org; Wed, 18 Jul 2012 02:54:09 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 172ACE0752; Wed, 18 Jul 2012 02:54:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CE33BE0752 for ; Wed, 18 Jul 2012 02:54:00 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9D3221B4035 for ; Wed, 18 Jul 2012 02:53:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 49D76E543C for ; Wed, 18 Jul 2012 02:53:58 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <1342579313.a4134af48ab83a2b4a05beab1afcaafe4751c85d.kleiner_otti@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/votca-tools/ChangeLog sci-libs/votca-tools/metadata.xml sci-libs/votca-tools/votca-tools-9999.ebuild X-VCS-Directories: sci-libs/votca-tools/ X-VCS-Committer: kleiner_otti X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: a4134af48ab83a2b4a05beab1afcaafe4751c85d X-VCS-Branch: master Date: Wed, 18 Jul 2012 02:53:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 4b8dc201-5f5d-4b35-b74f-d918bb9181f8 X-Archives-Hash: defc3372d2f6bc98e792ad72ec66e88f commit: a4134af48ab83a2b4a05beab1afcaafe4751c85d Author: Christoph Junghans gentoo org> AuthorDate: Wed Jul 18 02:41:53 2012 +0000 Commit: Christoph Junghans gmx de> CommitDate: Wed Jul 18 02:41:53 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Da4134af4 live ebuild update (Portage version: 2.2.0_alpha118/git/Linux i686, unsigned Manifest commit= ) --- sci-libs/votca-tools/ChangeLog | 5 ++++- sci-libs/votca-tools/metadata.xml | 3 --- sci-libs/votca-tools/votca-tools-9999.ebuild | 20 ++++---------------- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/sci-libs/votca-tools/ChangeLog b/sci-libs/votca-tools/Change= Log index 2b6ae69..69bcc00 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: $ =20 + 18 Jul 2012; Christoph Junghans metadata.xml, + votca-tools-9999.ebuild: + live ebuild update + 24 Mar 2012; Christoph Junghans votca-tools-9999.e= build: Fixes bug #405455, again =20 @@ -119,4 +123,3 @@ 13 Dec 2009; Christoph Junghans +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/met= adata.xml index 378b412..266f600 100644 --- a/sci-libs/votca-tools/metadata.xml +++ b/sci-libs/votca-tools/metadata.xml @@ -6,7 +6,4 @@ ottxor@gentoo.org Christoph Junghans - - Use system boost (dev-libs/boost) instead of bundled one - diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votc= a-tools/votca-tools-9999.ebuild index 4004aee..d02f699 100644 --- a/sci-libs/votca-tools/votca-tools-9999.ebuild +++ b/sci-libs/votca-tools/votca-tools-9999.ebuild @@ -7,8 +7,7 @@ EAPI=3D4 inherit cmake-utils eutils multilib =20 if [ "${PV}" !=3D "9999" ]; then - SRC_URI=3D"system-boost? ( http://votca.googlecode.com/files/${PF}_pris= tine.tar.gz ) - !system-boost? ( http://votca.googlecode.com/files/${PF}.tar.gz )" + SRC_URI=3D"http://votca.googlecode.com/files/${PF}.tar.gz" RESTRICT=3D"primaryuri" else SRC_URI=3D"" @@ -24,34 +23,23 @@ HOMEPAGE=3D"http://www.votca.org" LICENSE=3D"Apache-2.0" SLOT=3D"0" KEYWORDS=3D"~x86 ~amd64" -IUSE=3D"doc +fftw +gsl sqlite +system-boost" +IUSE=3D"doc +fftw +gsl sqlite" =20 RDEPEND=3D"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 )" =20 DEPEND=3D"${RDEPEND} doc? ( || ( =3Dapp-doc/doxygen-1.7.6.= 1[dot] ) ) >=3Dapp-text/txt2tags-2.5 - dev-util/pkgconfig" + virtual/pkgconfig" =20 DOCS=3D( NOTICE ) =20 -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=3D( - $(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)