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 9812013835A for ; Sun, 7 Mar 2021 18:53:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BEB38E0907; Sun, 7 Mar 2021 18:53:33 +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 A840DE0907 for ; Sun, 7 Mar 2021 18:53:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 16A8634058A for ; Sun, 7 Mar 2021 18:53:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 91C8E586 for ; Sun, 7 Mar 2021 18:53:30 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1615143200.132247f2a76e16d49fa38bfc3933ca61f4db78e6.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-biology/uchime/, sci-biology/uchime/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-biology/uchime/files/CMakeLists.txt sci-biology/uchime/uchime-4.2.40.ebuild X-VCS-Directories: sci-biology/uchime/files/ sci-biology/uchime/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 132247f2a76e16d49fa38bfc3933ca61f4db78e6 X-VCS-Branch: master Date: Sun, 7 Mar 2021 18:53:30 +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: ae8d84d3-3cbe-48a0-9ef5-227d5c880597 X-Archives-Hash: bf02b49a4d51a3309d736180851bc2e3 commit: 132247f2a76e16d49fa38bfc3933ca61f4db78e6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 7 16:51:50 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 7 18:53:20 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=132247f2 sci-biology/uchime: EAPI-7 bump, use cmake.eclass, https, fix HOMEPAGE Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-biology/uchime/files/CMakeLists.txt | 7 ++++--- sci-biology/uchime/uchime-4.2.40.ebuild | 16 +++++++--------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/sci-biology/uchime/files/CMakeLists.txt b/sci-biology/uchime/files/CMakeLists.txt index 54b0a3ba0d3..a9319293e10 100644 --- a/sci-biology/uchime/files/CMakeLists.txt +++ b/sci-biology/uchime/files/CMakeLists.txt @@ -1,11 +1,12 @@ -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.12) project(UCHIME) +include(GNUInstallDirs) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FILE_OFFSET_BITS=64 -DUCHIMES=1") # Simply copy the source files from the mk script add_executable(uchime addtargets2.cpp alignchime.cpp alignchimel.cpp alnparams.cpp alpha.cpp alpha2.cpp fractid.cpp getparents.cpp globalalign2.cpp make3way.cpp mx.cpp myutils.cpp path.cpp searchchime.cpp seqdb.cpp setnucmx.cpp sfasta.cpp tracebackbit.cpp uchime_main.cpp usort.cpp viterbifast.cpp writechhit.cpp) -INSTALL(TARGETS uchime - DESTINATION bin) +INSTALL(TARGETS uchime DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/sci-biology/uchime/uchime-4.2.40.ebuild b/sci-biology/uchime/uchime-4.2.40.ebuild index dd2201547ae..75827ab3a30 100644 --- a/sci-biology/uchime/uchime-4.2.40.ebuild +++ b/sci-biology/uchime/uchime-4.2.40.ebuild @@ -1,18 +1,17 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 - -inherit cmake-utils +EAPI=7 MY_P="${PN}${PV}_src" +inherit cmake DESCRIPTION="Fast, accurate chimera detection" -HOMEPAGE="http://www.drive5.com/uchime/" -SRC_URI="http://drive5.com/${PN}/${MY_P}.tar.gz" +HOMEPAGE="https://www.drive5.com/usearch/manual/uchime_algo.html" +SRC_URI="https://www.drive5.com/${PN}/${MY_P}.tar.gz" -SLOT="0" LICENSE="public-domain" +SLOT="0" KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" IUSE="debug" @@ -20,6 +19,5 @@ S="${WORKDIR}"/${MY_P} src_prepare() { cp "${FILESDIR}"/CMakeLists.txt . || die - - cmake-utils_src_prepare + cmake_src_prepare }