[gentoo-commits] proj/sci:master commit in: sci-biology/merlin/

[gentoo-commits] proj/sci:master commit in: sci-biology/merlin/

[Justin Lecher]

commit:     d41327215feee1d9c245f03381de5487365ae3e8
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sat Jan 10 15:58:56 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jan 10 15:58:56 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d4132721

sci-biology/merlin: Drop unnecessary dies

---
 sci-biology/merlin/merlin-1.1.2.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-biology/merlin/merlin-1.1.2.ebuild b/sci-biology/merlin/merlin-1.1.2.ebuild
index 90363b5..2bb6c1a 100644
--- a/sci-biology/merlin/merlin-1.1.2.ebuild
+++ b/sci-biology/merlin/merlin-1.1.2.ebuild
@@ -20,12 +20,12 @@ src_prepare() {
 }
 
 src_compile() {
-	emake INSTALLDIR="${S}/bin" install || die
+	emake INSTALLDIR="${S}/bin" install
 }
 
 src_install() {
-	dobin "${S}"/bin/* || die
+	dobin "${S}"/bin/*
 	insinto /usr/share/${PN}
-	doins -r examples || die
+	doins -r examples
 	dodoc README
 }

[gentoo-commits] proj/sci:master commit in: sci-biology/merlin/

[Justin Lecher]

commit:     3dda4223938da985600b21f8a5d30414f181ba08
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sat Jan 10 15:46:14 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jan 10 15:46:14 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3dda4223

sci-biology/merlin: Move to EAPI=5

---
 sci-biology/merlin/ChangeLog           | 6 +++++-
 sci-biology/merlin/merlin-1.1.2.ebuild | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/sci-biology/merlin/ChangeLog b/sci-biology/merlin/ChangeLog
index 08b262e..9f340ed 100644
--- a/sci-biology/merlin/ChangeLog
+++ b/sci-biology/merlin/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-biology/merlin
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Jan 2015; Marius Brehler <marbre@linux.sungazer.de>
+  merlin-1.1.2.ebuild:
+  Move to EAPI=5.
+
   21 Apr 2009; Andrey Kislyuk <weaver@gentoo.org> ChangeLog:
   New package, bug 121921, thanks to Neil <nshephard@gmail.com>
 

diff --git a/sci-biology/merlin/merlin-1.1.2.ebuild b/sci-biology/merlin/merlin-1.1.2.ebuild
index 759154d..90363b5 100644
--- a/sci-biology/merlin/merlin-1.1.2.ebuild
+++ b/sci-biology/merlin/merlin-1.1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=5
 
 inherit toolchain-funcs
 

[gentoo-commits] proj/sci:master commit in: sci-biology/merlin/

[Andrew Ammerlaan]

commit:     6a7851636ed49eb548b59708fe28eb6c24ef68db
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sat Mar  6 12:25:54 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> 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 <andrewammerlaan <AT> 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
 }