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.60) (envelope-from ) id 1PvGJY-0005HI-3r for garchives@archives.gentoo.org; Thu, 03 Mar 2011 21:44:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8651AE0529; Thu, 3 Mar 2011 21:43:52 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 534D4E0539 for ; Thu, 3 Mar 2011 21:43:52 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CA84B1B414F for ; Thu, 3 Mar 2011 21:43:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9312780073 for ; Thu, 3 Mar 2011 21:43:50 +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: Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/votca-tools/ X-VCS-Repository: proj/sci X-VCS-Files: 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: dbaf344447b7e7cd37add120d394eff57cc4c099 Date: Thu, 3 Mar 2011 21:43:50 +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: X-Archives-Hash: aa2479b616f5331ca95687c7f441f3a7 commit: dbaf344447b7e7cd37add120d394eff57cc4c099 Author: Christoph Junghans gentoo org> AuthorDate: Thu Mar 3 21:26:08 2011 +0000 Commit: Christoph Junghans gmx de> CommitDate: Thu Mar 3 21:54:47 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3Ddbaf3444 [sci-libs/votca-tools] switched to cmake (Portage version: 2.1.9.25/git/Linux i686, signed Manifest commit with ke= y C2000586) --- sci-libs/votca-tools/votca-tools-9999.ebuild | 31 +++++++++-----------= ----- 1 files changed, 11 insertions(+), 20 deletions(-) diff --git a/sci-libs/votca-tools/votca-tools-9999.ebuild b/sci-libs/votc= a-tools/votca-tools-9999.ebuild index 55d421c..283d825 100644 --- a/sci-libs/votca-tools/votca-tools-9999.ebuild +++ b/sci-libs/votca-tools/votca-tools-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D"3" =20 -inherit eutils autotools-utils +inherit eutils cmake-utils =20 if [ "${PV}" !=3D "9999" ]; then SRC_URI=3D"boost? ( http://votca.googlecode.com/files/${PF}_pristine.ta= r.gz ) @@ -23,7 +23,7 @@ HOMEPAGE=3D"http://www.votca.org" LICENSE=3D"Apache-2.0" SLOT=3D"0" KEYWORDS=3D"~x86 ~amd64" -IUSE=3D"-boost doc +fftw +gsl static-libs" +IUSE=3D"-boost doc +fftw +gsl" =20 RDEPEND=3D"fftw? ( sci-libs/fftw:3.0 ) dev-libs/expat @@ -40,35 +40,26 @@ src_prepare() { use fftw || ewarn "Disabling fftw will lead to reduced functionality" =20 #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" } =20 src_configure() { - local myconf - use boost && myconf=3D"--disable-votca-boost" || myconf=3D"--enable-vot= ca-boost" - - myeconfargs=3D( ${myconf} --disable-rc-files - $(use_with gsl) - $(use_with fftw) + mycmakeargs=3D( + $(cmake-utils_use boost EXTERNAL_BOOST) + $(cmake-utils_use_with gsl GSL) + $(cmake-utils_use_with fftw FFTW) + -DWITH_RC_FILES=3DOFF ) - autotools-utils_src_configure || die + cmake-utils_src_configure || die } =20 src_install() { - DOCS=3D(${AUTOTOOLS_BUILD_DIR}/CHANGELOG NOTICE) - autotools-utils_src_install || die + DOCS=3D(${CMAKE_BUILD_DIR}/CHANGELOG NOTICE) + cmake-utils_src_install || die if use doc; then + cd "${CMAKE_BUILD_DIR}" || die cd share/doc || die doxygen || die dohtml -r html/* || die