[gentoo-commits] repo/gentoo:master commit in: sci-biology/tree-puzzle/

[gentoo-commits] repo/gentoo:master commit in: sci-biology/tree-puzzle/

[David Seifert]

commit:     b0b40d543fca146fa2907f8d8ca63970403a74f1
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 10 23:48:25 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Dec 10 23:48:25 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0b40d54

sci-biology/tree-puzzle: Port to EAPI 7

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild | 39 ++++++++++++--------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild b/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild
index 27dd0bc2212..8e2a07f8183 100644
--- a/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild
+++ b/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Maximum likelihood analysis for nucleotide, amino acid, and two-state data"
 HOMEPAGE="http://www.tree-puzzle.de"
@@ -13,44 +13,41 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="mpi"
+RESTRICT="test"
 
 DEPEND="mpi? ( virtual/mpi )"
 RDEPEND="${DEPEND}"
 
-RESTRICT="test"
-
-pkg_setup () {
-	use mpi && [ $(tc-getCC) = icc ] && die "The parallelized version of tree-puzzle cannot be compiled using icc.
-	Either disable the \"mpi\" USE flag to compile only the non-parallelized
-	version of the program, or use gcc as your compiler (CC=\"gcc\")."
-}
+PATCHES=( "${FILESDIR}"/${PN}-impl-dec.patch )
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-impl-dec.patch
+pkg_setup() {
+	use mpi && [[ $(tc-getCC) == icc* ]] &&
+		die "The parallelized version of tree-puzzle cannot be compiled using icc.
+			Either disable the \"mpi\" USE flag to compile only the non-parallelized
+			version of the program, or use gcc as your compiler (CC=\"gcc\")."
 }
 
 src_configure() {
 	default
 
 	if ! use mpi; then
-			sed \
-				-e 's:bin_PROGRAMS = puzzle$(EXEEXT) ppuzzle:bin_PROGRAMS = puzzle :' \
-				-e 's:DIST_SOURCES = $(ppuzzle_SOURCES) $(puzzle_SOURCES):DIST_SOURCES = $(puzzle_SOURCES):' \
-				-i "${S}"/src/Makefile || die
+		sed \
+			-e 's:bin_PROGRAMS = puzzle$(EXEEXT) ppuzzle:bin_PROGRAMS = puzzle :' \
+			-e 's:DIST_SOURCES = $(ppuzzle_SOURCES) $(puzzle_SOURCES):DIST_SOURCES = $(puzzle_SOURCES):' \
+			-i src/Makefile || die
 	fi
 }
 
 src_install() {
 	dobin src/puzzle
 	use mpi && dobin src/ppuzzle
-	dodoc AUTHORS ChangeLog README
+	einstalldocs
 
 	# User manual
-	insinto /usr/share/doc/${PF}
-	doins doc/tree-puzzle.pdf
+	dodoc doc/tree-puzzle.pdf
 
 	# Example data files
 	insinto /usr/share/${PN}/data
-	rm data/Makefile*
-	doins data/*
+	rm data/Makefile* || die
+	doins -r data/.
 }

[gentoo-commits] repo/gentoo:master commit in: sci-biology/tree-puzzle/

[Sam James]

commit:     9903e675f0c8a3017a51954e1f239bf4d4842b13
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 26 05:33:34 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 05:33:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9903e675

sci-biology/tree-puzzle: drop unused toolchain-funcs

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild b/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild
index 06fc28376ff5..e5093420d6a8 100644
--- a/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild
+++ b/sci-biology/tree-puzzle/tree-puzzle-5.2.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=8
 
-inherit toolchain-funcs
-
 DESCRIPTION="Maximum likelihood analysis for nucleotide, amino acid, and two-state data"
 HOMEPAGE="http://www.tree-puzzle.de"
 SRC_URI="http://www.tree-puzzle.de/${P}.tar.gz"