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 A9FAC1382C5 for ; Tue, 19 Jan 2021 15:49:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C83FCE088C; Tue, 19 Jan 2021 15:49:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 B06F6E088C for ; Tue, 19 Jan 2021 15:49:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 A025D340E02 for ; Tue, 19 Jan 2021 15:49:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 28D40487 for ; Tue, 19 Jan 2021 15:49:48 +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: <1611071383.49636de7c3453c0a6bcae067996f02aa7097dede.andrewammerlaan@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/genepop/ X-VCS-Repository: proj/sci X-VCS-Files: sci-biology/genepop/genepop-4.2.1.ebuild sci-biology/genepop/genepop-4.7.ebuild X-VCS-Directories: sci-biology/genepop/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 49636de7c3453c0a6bcae067996f02aa7097dede X-VCS-Branch: master Date: Tue, 19 Jan 2021 15:49:48 +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: f70cb744-afb1-4c05-9b67-c6aedcfa6eec X-Archives-Hash: 362071f893cc6cf6421051d11defea40 commit: 49636de7c3453c0a6bcae067996f02aa7097dede Author: Andrew Ammerlaan riseup net> AuthorDate: Tue Jan 19 15:49:43 2021 +0000 Commit: Andrew Ammerlaan riseup 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 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}"