From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 3D2531381F3 for ; Wed, 9 Oct 2013 14:09:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ADA7FE08A6; Wed, 9 Oct 2013 14:09:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 42BB9E08A6 for ; Wed, 9 Oct 2013 14:09:01 +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 5B80D33EFBE for ; Wed, 9 Oct 2013 14:09:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C95CFE5460 for ; Wed, 9 Oct 2013 14:08:58 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <1381327726.16e5aef3c63fa28cb2655e38cbda022b2f0cb40b.ottxor@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-physics/espresso++/ X-VCS-Repository: proj/sci X-VCS-Files: sci-physics/espresso++/ChangeLog sci-physics/espresso++/espresso++-9999.ebuild X-VCS-Directories: sci-physics/espresso++/ X-VCS-Committer: ottxor X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: 16e5aef3c63fa28cb2655e38cbda022b2f0cb40b X-VCS-Branch: master Date: Wed, 9 Oct 2013 14:08: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 X-Archives-Salt: 3a1950dc-3e6c-41e2-80ab-4d7dec15d264 X-Archives-Hash: 27dddd51bb4fa5c38baffe91f7e8c168 commit: 16e5aef3c63fa28cb2655e38cbda022b2f0cb40b Author: Christoph Junghans gentoo org> AuthorDate: Wed Oct 9 14:08:46 2013 +0000 Commit: Christoph Junghans gentoo org> CommitDate: Wed Oct 9 14:08:46 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=16e5aef3 sync with gx86 Package-Manager: portage-2.2.1 --- sci-physics/espresso++/ChangeLog | 3 +++ sci-physics/espresso++/espresso++-9999.ebuild | 14 +++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/sci-physics/espresso++/ChangeLog b/sci-physics/espresso++/ChangeLog index 922a676..6374982 100644 --- a/sci-physics/espresso++/ChangeLog +++ b/sci-physics/espresso++/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 09 Oct 2013; Christoph Junghans espresso++-9999.ebuild: + sync with gx86 + 02 Aug 2013; Christoph Junghans espresso++-9999.ebuild: added hostfingerprint diff --git a/sci-physics/espresso++/espresso++-9999.ebuild b/sci-physics/espresso++/espresso++-9999.ebuild index 983a8c5..215714d 100644 --- a/sci-physics/espresso++/espresso++-9999.ebuild +++ b/sci-physics/espresso++/espresso++-9999.ebuild @@ -6,7 +6,7 @@ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) -inherit cmake-utils python-single-r1 +inherit cmake-utils multilib python-single-r1 DESCRIPTION="extensible, flexible, fast and parallel simulation software for soft matter research" HOMEPAGE="https://www.espresso-pp.de" @@ -15,9 +15,12 @@ if [[ ${PV} = 9999 ]]; then EHG_REPO_URI="https://hg.berlios.de/repos/espressopp" EHG_REVISION="default" inherit mercurial + KEYWORDS= else SRC_URI="https://espressopp.mpip-mainz.mpg.de/Download/${PN//+/p}-${PV}.tgz" S="${WORKDIR}/${PN//+/p}-${PV}" + KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-macos" + PATCHES=( "${FILESDIR}/${P}-multilib.patch" ) fi CMAKE_REMOVE_MODULES_LIST="FindBoost" @@ -27,7 +30,6 @@ EHG_CLONE_CMD="hg clone ${EHG_QUIET_CMD_OPT} ${EHP_OPTS} --pull --noupdate" EHG_PULL_CMD="hg pull ${EHG_QUIET_CMD_OPT} ${EHP_OPTS}" LICENSE="GPL-3 !system-boost? ( Boost-1.0 )" SLOT="0" -KEYWORDS="" IUSE="-system-boost" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -40,6 +42,12 @@ DEPEND="${RDEPEND}" DOCS=( AUTHORS NEWS README ) src_configure() { - mycmakeargs=( $(cmake-utils_use system-boost EXTERNAL_BOOST) ) + mycmakeargs=( $(cmake-utils_use system-boost EXTERNAL_BOOST) -DLIB="$(get_libdir)" ) cmake-utils_src_configure } + +src_install() { + cmake-utils_src_install + rm "${ED}/usr/bin/ESPRC" || die + rmdir "${ED}/usr/bin" || die +}