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-0005HJ-71 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 88252E0539; 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 51803E0529 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 CD42A1B4155 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 C58F280075 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-chemistry/votca-csg/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/votca-csg/votca-csg-9999.ebuild X-VCS-Directories: sci-chemistry/votca-csg/ X-VCS-Committer: kleiner_otti X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: c92b47630ac73f2c69ef9f99ede7fcc89b2ac9cd 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: c7301f7a5b6bc6266b05c2cb410050d7 commit: c92b47630ac73f2c69ef9f99ede7fcc89b2ac9cd Author: Christoph Junghans gentoo org> AuthorDate: Thu Mar 3 21:54:30 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=3Dc92b4763 [sci-chemistry/votca-csg] switched to cmake (Portage version: 2.1.9.25/git/Linux i686, signed Manifest commit with ke= y C2000586) --- sci-chemistry/votca-csg/votca-csg-9999.ebuild | 30 ++++++++-----------= ----- 1 files changed, 10 insertions(+), 20 deletions(-) diff --git a/sci-chemistry/votca-csg/votca-csg-9999.ebuild b/sci-chemistr= y/votca-csg/votca-csg-9999.ebuild index d1b7e59..87b656e 100644 --- a/sci-chemistry/votca-csg/votca-csg-9999.ebuild +++ b/sci-chemistry/votca-csg/votca-csg-9999.ebuild @@ -4,7 +4,7 @@ =20 EAPI=3D"3" =20 -inherit autotools-utils bash-completion +inherit cmake-utils bash-completion =20 MANUAL_PV=3D1.1 if [ "${PV}" !=3D "9999" ]; then @@ -25,7 +25,7 @@ HOMEPAGE=3D"http://www.votca.org" LICENSE=3D"Apache-2.0" SLOT=3D"0" KEYWORDS=3D"~x86 ~amd64" -IUSE=3D"doc +gromacs static-libs" +IUSE=3D"doc +gromacs" =20 RDEPEND=3D"=3Dsci-libs/votca-tools-${PV} gromacs? ( >=3Dsci-chemistry/gromacs-4.0.7-r5 ) @@ -37,35 +37,25 @@ DEPEND=3D"${RDEPEND} >=3Dapp-text/txt2tags-2.5 dev-util/pkgconfig" =20 -src_prepare() { - #from bootstrap.sh - if [ -z "${PV##*9999}" ]; then - emake -C share/scripts/inverse -f Makefile.am.in Makefile.am || die - fi - - eautoreconf || die "eautoreconf failed" -} - src_configure() { - local libgmx + local extra=3D"-DWITH_GMX_DEVEL=3DOFF" =20 - #in >gromacs-4.5 libgmx was renamed to libgromacs - has_version =3Dsci-chemistry/gromacs-9999 && libgmx=3D"libgromacs" || l= ibgmx=3D"libgmx" - #prefer gromacs double-precision if it is there - has_version sci-chemistry/gromacs[double-precision] && libgmx=3D"${libg= mx}_d" + use gromacs && has_version =3Dsci-chemistry/gromacs-9999 && \ + extra=3D"-DWITH_GMX_DEVEL=3DON" =20 - myeconfargs=3D( ${myconf} --disable-rc-files $(use_with gromacs libgmx= $libgmx) ) - autotools-utils_src_configure || die + mycmakeargs=3D( $(cmake-utils_use_with gromacs GMX) ${extra} -DWITH_RC_= FILES=3DOFF ) + cmake-utils_src_configure || die } =20 src_install() { - DOCS=3D(README NOTICE ${AUTOTOOLS_BUILD_DIR}/CHANGELOG) + DOCS=3D(README NOTICE ${CMAKE_BUILD_DIR}/CHANGELOG) dobashcompletion scripts/csg-completion.bash ${PN} || die - autotools-utils_src_install || die + cmake-utils_src_install || die if use doc; then if [ -n "${PV##*9999}" ]; then dodoc "${DISTDIR}/votca-manual-${MANUAL_PV}.pdf" || die fi + cd "${CMAKE_BUILD_DIR}" || die cd share/doc || die doxygen || die dohtml -r html/* || die