From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D865B1386BB for ; Fri, 21 Oct 2016 18:58:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B5FEBE0944; Fri, 21 Oct 2016 18:58:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8D488E0944 for ; Fri, 21 Oct 2016 18:58:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 12509341692 for ; Fri, 21 Oct 2016 18:58:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AAAD17D9 for ; Fri, 21 Oct 2016 18:58:16 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1477076295.15221a5c5639027b2bc5eef34f55ecff1abebe1a.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ekopath/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/ekopath/ekopath-6.0.967_p20161020-r1.ebuild dev-lang/ekopath/ekopath-6.0.967_p20161020-r100.ebuild dev-lang/ekopath/metadata.xml X-VCS-Directories: dev-lang/ekopath/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 15221a5c5639027b2bc5eef34f55ecff1abebe1a X-VCS-Branch: master Date: Fri, 21 Oct 2016 18:58:16 +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: 244ef1d1-d684-4715-99d4-afe88877d0ec X-Archives-Hash: 11e92c4ab87146f975456ed30e077b1e commit: 15221a5c5639027b2bc5eef34f55ecff1abebe1a Author: Michał Górny gentoo org> AuthorDate: Fri Oct 21 18:53:59 2016 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Oct 21 18:58:15 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15221a5c dev-lang/ekopath: Make MPI libs optional dev-lang/ekopath/ekopath-6.0.967_p20161020-r1.ebuild | 13 ++++++++++++- dev-lang/ekopath/ekopath-6.0.967_p20161020-r100.ebuild | 13 ++++++++++++- dev-lang/ekopath/metadata.xml | 5 +++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dev-lang/ekopath/ekopath-6.0.967_p20161020-r1.ebuild b/dev-lang/ekopath/ekopath-6.0.967_p20161020-r1.ebuild index f71706c..546dd4e 100644 --- a/dev-lang/ekopath/ekopath-6.0.967_p20161020-r1.ebuild +++ b/dev-lang/ekopath/ekopath-6.0.967_p20161020-r1.ebuild @@ -20,7 +20,7 @@ SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}" LICENSE="all-rights-reserved" SLOT="${MY_PV}" KEYWORDS="~amd64" -IUSE="" +IUSE="mpich openmpi openmpi2" DEPEND="!!app-arch/rpm" RDEPEND="!dev-lang/ekopath:0/${MY_PV}" @@ -60,4 +60,15 @@ src_install() { [[ -x ${ED%}/opt/${MY_P}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely" rm -r "${ED}/opt/${MY_P}"/uninstall* || die + + # cleanup + if ! use mpich; then + rm -r "${ED}/opt/${MY_P}/mpi/mpich" || die + fi + if ! use openmpi; then + rm -r "${ED}/opt/${MY_P}/mpi"/openmpi-1.* || die + fi + if ! use openmpi2; then + rm -r "${ED}/opt/${MY_P}/mpi"/openmpi-2.* || die + fi } diff --git a/dev-lang/ekopath/ekopath-6.0.967_p20161020-r100.ebuild b/dev-lang/ekopath/ekopath-6.0.967_p20161020-r100.ebuild index 6a39c10..e5c6baf 100644 --- a/dev-lang/ekopath/ekopath-6.0.967_p20161020-r100.ebuild +++ b/dev-lang/ekopath/ekopath-6.0.967_p20161020-r100.ebuild @@ -20,7 +20,7 @@ SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}" LICENSE="all-rights-reserved" SLOT="0/${MY_PV}" KEYWORDS="~amd64" -IUSE="" +IUSE="mpich openmpi openmpi2" DEPEND="!!app-arch/rpm" RDEPEND="!dev-lang/ekopath:${MY_PV}" @@ -71,4 +71,15 @@ src_install() { rm -r "${ED}/opt/${MY_P}"/uninstall* || die dosym ${MY_P} /opt/${PN} doenvd 99${PN} + + # cleanup + if ! use mpich; then + rm -r "${ED}/opt/${MY_P}/mpi/mpich" || die + fi + if ! use openmpi; then + rm -r "${ED}/opt/${MY_P}/mpi"/openmpi-1.* || die + fi + if ! use openmpi2; then + rm -r "${ED}/opt/${MY_P}/mpi"/openmpi-2.* || die + fi } diff --git a/dev-lang/ekopath/metadata.xml b/dev-lang/ekopath/metadata.xml index 699de24..6e99353 100644 --- a/dev-lang/ekopath/metadata.xml +++ b/dev-lang/ekopath/metadata.xml @@ -10,6 +10,11 @@ sci@gentoo.org Gentoo Science Project + + Include pre-built OpenMPI 1.x libraries + Include pre-built OpenMPI 2.x libraries + Include pre-built MPICH libraries + The PathScale EKOPath Compiler Suite offers programmers a rich set of tools and one of the world's most sophisticated optimization infrastructures to maximize