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

["Andrew Ammerlaan" <andrewammerlaan@riseup.net>]

commit:     49636de7c3453c0a6bcae067996f02aa7097dede
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Tue Jan 19 15:49:43 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Tue Jan 19 15:49:43 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=49636de7

sci-biology/genepop: fix fetch, cmake-utils --> cmake

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 sci-biology/genepop/genepop-4.2.1.ebuild | 30 ------------------------------
 sci-biology/genepop/genepop-4.7.ebuild   | 11 +++++------
 2 files changed, 5 insertions(+), 36 deletions(-)

diff --git a/sci-biology/genepop/genepop-4.2.1.ebuild b/sci-biology/genepop/genepop-4.2.1.ebuild
deleted file mode 100644
index 2e1d48a45..000000000
--- a/sci-biology/genepop/genepop-4.2.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Population genetics analysis"
-HOMEPAGE="https://genepop.curtin.edu.au/ https://kimura.univ-montp2.fr/~rousset/Genepop.htm"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.gz"
-
-LICENSE="CeCILL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	cat >> CMakeLists.txt <<- EOF
-	cmake_minimum_required (VERSION 2.6)
-	project (${PN} CXX)
-
-	set(CMAKE_CXX_FLAGS "\${CMAKE_CXX_FLAGS} -DNO_MODULES")
-
-	add_executable(Genepop GenepopS.cpp)
-	install(TARGETS Genepop DESTINATION bin)
-	EOF
-	cmake-utils_src_prepare
-}

diff --git a/sci-biology/genepop/genepop-4.7.ebuild b/sci-biology/genepop/genepop-4.7.ebuild
index 9430e7987..b3ed5bfc3 100644
--- a/sci-biology/genepop/genepop-4.7.ebuild
+++ b/sci-biology/genepop/genepop-4.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Population genetics analysis"
 HOMEPAGE="https://genepop.curtin.edu.au/ https://kimura.univ-montp2.fr/~rousset/Genepop.htm"
@@ -28,12 +28,11 @@ src_prepare() {
 	add_executable(Genepop GenepopS.cpp)
 	install(TARGETS Genepop DESTINATION bin)
 	EOF
-	cmake-utils_src_prepare
-	default
+	cmake_src_prepare
 }
 
 src_install(){
-	cmake-utils_src_install
+	cmake_src_install
 	mv "${ED}"/usr/bin/Genepop "${ED}"/usr/bin/genepop || die
 	newdoc Genepop.pdf genepop.pdf
 	insinto /usr/share/"${PN}"