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 C2C031382C5 for ; Sat, 6 Mar 2021 12:28:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F089E0876; Sat, 6 Mar 2021 12:28:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 04E3EE0876 for ; Sat, 6 Mar 2021 12:28:24 +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 2C00C33D7E3 for ; Sat, 6 Mar 2021 12:28:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D56BA2A9 for ; Sat, 6 Mar 2021 12:28:22 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1615033554.6a7851636ed49eb548b59708fe28eb6c24ef68db.andrewammerlaan@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/merlin/ X-VCS-Repository: proj/sci X-VCS-Files: sci-biology/merlin/merlin-1.1.2.ebuild X-VCS-Directories: sci-biology/merlin/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 6a7851636ed49eb548b59708fe28eb6c24ef68db X-VCS-Branch: master Date: Sat, 6 Mar 2021 12:28:22 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9675ace7-a975-4cb3-9c99-67c29edbac6a X-Archives-Hash: f6f8ff00d3baacfeab80db7a4df5328a commit: 6a7851636ed49eb548b59708fe28eb6c24ef68db Author: Andrew Ammerlaan riseup net> AuthorDate: Sat Mar 6 12:25:54 2021 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Sat Mar 6 12:25:54 2021 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=6a785163 sci-biology/merlin: EAPI bump Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan riseup.net> sci-biology/merlin/merlin-1.1.2.ebuild | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sci-biology/merlin/merlin-1.1.2.ebuild b/sci-biology/merlin/merlin-1.1.2.ebuild index 63ab49359..678745a24 100644 --- a/sci-biology/merlin/merlin-1.1.2.ebuild +++ b/sci-biology/merlin/merlin-1.1.2.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit toolchain-funcs +inherit toolchain-funcs flag-o-matic DESCRIPTION="Statistical analysis of gene flow in pedigrees" -HOMEPAGE="http://www.sph.umich.edu/csg/abecasis/Merlin/" -SRC_URI="http://www.sph.umich.edu/csg/abecasis/Merlin/download/${P}.tar.gz" +HOMEPAGE="https://csg.sph.umich.edu/abecasis/Merlin/" +SRC_URI="https://www.sph.umich.edu/csg/abecasis/Merlin/download/${P}.tar.gz" LICENSE="merlin" SLOT="0" -IUSE="" KEYWORDS="~amd64 ~x86" src_prepare() { + default sed -i -e 's/CXX=g++/CXX='$(tc-getCXX)'/' -e 's/CFLAGS=/CFLAGS+= /' "${S}/Makefile" || die }