aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Ammerlaan <andrewammerlaan@riseup.net>2021-01-19 16:49:43 +0100
committerAndrew Ammerlaan <andrewammerlaan@riseup.net>2021-01-19 16:49:43 +0100
commit49636de7c3453c0a6bcae067996f02aa7097dede (patch)
tree097c4210c3b22050ed0e4f4b3a4c58237b2bd923
parentdev-python/regions: use https (diff)
downloadsci-49636de7c3453c0a6bcae067996f02aa7097dede.tar.gz
sci-49636de7c3453c0a6bcae067996f02aa7097dede.tar.bz2
sci-49636de7c3453c0a6bcae067996f02aa7097dede.zip
sci-biology/genepop: fix fetch, cmake-utils --> cmake
Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan <andrewammerlaan@riseup.net>
-rw-r--r--sci-biology/genepop/Manifest3
-rw-r--r--sci-biology/genepop/genepop-4.2.1.ebuild30
-rw-r--r--sci-biology/genepop/genepop-4.7.ebuild11
3 files changed, 6 insertions, 38 deletions
diff --git a/sci-biology/genepop/Manifest b/sci-biology/genepop/Manifest
index f78004fea..eb43f768f 100644
--- a/sci-biology/genepop/Manifest
+++ b/sci-biology/genepop/Manifest
@@ -1,2 +1 @@
-DIST genepop-4.2.1.tar.gz 136675 BLAKE2B 9ffc4e24bda4c739762c4790145c099455c65700ac51f6f8890fa57ac71a99f0f87e5b4d432cd5aa4d27ec73b2738605f5522309fc69e49b383310730de5d4ff SHA512 f658f6ab82c1ef21bf15a9bd03335ea792e670ce7cf8f2eb3e1c4d75ae24ff099bde5580b310fdcd552dfb1dbb6df55352a8c06fedeeb7d46434a58767233882
-DIST genepop-4.7.tar.gz 2034202 BLAKE2B caee5a069ad31ae7975fa6508e118983a5efcde4ccd2879d126815d72ce6da455e0440e3d8be2d48890d6fc6ed191c989e1e8579136c1c8bb08d392f0e9257d6 SHA512 95eb7e36d59d5278a77c420216f65e44475c98f93ec166dfb13f01c5f4ad93c80caff9f62d549f8ccb8a0af1a0196a257a5825681e5f27e3c1c26aa8d699d593
+DIST genepop-4.7.tar.gz 2038733 BLAKE2B b71139709a6a6f34fcf4e216178420f6deaeb0dc2c984a9f8f440706d213afa0819f7a8382b470270c9d125dfc9a37fb6038d4f142b2790cc7c42ba1ea0a7add SHA512 176ba767ab1d3d4be0c86a69b33efaa88c5e3940d92a819eda3be295398ce91781c283864c4507b90b857b6011cf1253cf9ec5ae193b20e6a9aea330d5b09ca5
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}"