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 F3E96139083 for ; Wed, 22 Nov 2017 23:29:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DFEBBE0E90; Wed, 22 Nov 2017 23:29:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B095CE0E90 for ; Wed, 22 Nov 2017 23:29:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9170B33BE18 for ; Wed, 22 Nov 2017 23:29:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 26B15A425 for ; Wed, 22 Nov 2017 23:29:14 +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: <1511393204.efd9349ac15ae636f7848ef331d57d6fefb42e56.junghans@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/mpibash/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-shells/mpibash/Manifest app-shells/mpibash/mpibash-1.3.ebuild app-shells/mpibash/mpibash-9999.ebuild X-VCS-Directories: app-shells/mpibash/ X-VCS-Committer: junghans X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: efd9349ac15ae636f7848ef331d57d6fefb42e56 X-VCS-Branch: master Date: Wed, 22 Nov 2017 23:29:14 +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: 0c0eb540-17a3-4fad-849b-b27502296ef3 X-Archives-Hash: 5cc7560ff4bac2880ef4c546924b5322 commit: efd9349ac15ae636f7848ef331d57d6fefb42e56 Author: Christoph Junghans gentoo org> AuthorDate: Wed Nov 22 23:26:28 2017 +0000 Commit: Christoph Junghans gentoo org> CommitDate: Wed Nov 22 23:26:44 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efd9349a app-shells/mpibash: version bump Package-Manager: Portage-2.3.13, Repoman-2.3.3 app-shells/mpibash/Manifest | 1 + .../mpibash/{mpibash-9999.ebuild => mpibash-1.3.ebuild} | 15 ++++++++------- app-shells/mpibash/mpibash-9999.ebuild | 15 ++++++++------- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/app-shells/mpibash/Manifest b/app-shells/mpibash/Manifest index 4d8ea88158d..3bdc4e71f6a 100644 --- a/app-shells/mpibash/Manifest +++ b/app-shells/mpibash/Manifest @@ -1 +1,2 @@ DIST mpibash-1.2.tar.gz 347083 SHA256 5c2faaa74464111205dbae4799bd89c2425810ec3708d004237b42d620c8be57 SHA512 db755dd2c6212a8d7dfd6cbff17d5dffcbc3b6a0286abdad4d2e21790453d2356e88c566abe4648da138d6964098fad581b8fd5beae1335f5787de92f4659104 WHIRLPOOL 94fcf50d89250a6478a2ed56a0c1769dd678869884e1e80066ebdb479dd0c6d64048ade7829020fdad050b1e77a2315ab7e325a97aa472291d3e9a4888c915e3 +DIST mpibash-1.3.tar.gz 369803 BLAKE2B b1959deaa2d5b3bce1a66e5ef0ff41ad156093aec9cc1efcd12873b6d5814ad1586ff951d6fd7f37dab6a55040378774b435edc4e2c8892952480539864f91fa SHA512 4728565239aae80013322231a928fd1e9a59484614a92cf7e314d0cd5c090d3a47de395507ce52f71a6900245855089d659c6509f8c4df3bfd88e46fc2187749 diff --git a/app-shells/mpibash/mpibash-9999.ebuild b/app-shells/mpibash/mpibash-1.3.ebuild similarity index 80% copy from app-shells/mpibash/mpibash-9999.ebuild copy to app-shells/mpibash/mpibash-1.3.ebuild index 594ac6bc88c..76bbce43cda 100644 --- a/app-shells/mpibash/mpibash-9999.ebuild +++ b/app-shells/mpibash/mpibash-1.3.ebuild @@ -3,13 +3,12 @@ EAPI=5 -inherit autotools-utils multilib +inherit autotools multilib if [[ ${PV} = 9999 ]]; then EGIT_REPO_URI="https://github.com/lanl/MPI-Bash.git" inherit git-r3 KEYWORDS="" - AUTOTOOLS_AUTORECONF=1 else SRC_URI="https://github.com/lanl/MPI-Bash/releases/download/v${PV}/${P}.tar.gz" KEYWORDS="~amd64" @@ -27,16 +26,18 @@ DEPEND="virtual/mpi sys-cluster/libcircle" RDEPEND="${DEPEND}" +src_prepare() { + default + [[ ${PV} != 9999 ]] || eautoreconf +} + src_configure() { - local myeconfargs=( + econf --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/bash \ --with-bashdir="${EPREFIX}"/usr/include/bash-plugins - --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/bash - ) - autotools-utils_src_configure } src_install() { - autotools-utils_src_install + default sed -i '/^export LD_LIBRARY_PATH/d' "${ED}/usr/bin/${PN}" || die use examples || rm -r "${ED}/usr/share/doc/${PF}/examples" || die } diff --git a/app-shells/mpibash/mpibash-9999.ebuild b/app-shells/mpibash/mpibash-9999.ebuild index 594ac6bc88c..76bbce43cda 100644 --- a/app-shells/mpibash/mpibash-9999.ebuild +++ b/app-shells/mpibash/mpibash-9999.ebuild @@ -3,13 +3,12 @@ EAPI=5 -inherit autotools-utils multilib +inherit autotools multilib if [[ ${PV} = 9999 ]]; then EGIT_REPO_URI="https://github.com/lanl/MPI-Bash.git" inherit git-r3 KEYWORDS="" - AUTOTOOLS_AUTORECONF=1 else SRC_URI="https://github.com/lanl/MPI-Bash/releases/download/v${PV}/${P}.tar.gz" KEYWORDS="~amd64" @@ -27,16 +26,18 @@ DEPEND="virtual/mpi sys-cluster/libcircle" RDEPEND="${DEPEND}" +src_prepare() { + default + [[ ${PV} != 9999 ]] || eautoreconf +} + src_configure() { - local myeconfargs=( + econf --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/bash \ --with-bashdir="${EPREFIX}"/usr/include/bash-plugins - --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/bash - ) - autotools-utils_src_configure } src_install() { - autotools-utils_src_install + default sed -i '/^export LD_LIBRARY_PATH/d' "${ED}/usr/bin/${PN}" || die use examples || rm -r "${ED}/usr/share/doc/${PF}/examples" || die }