[gentoo-commits] repo/gentoo:master commit in: sci-biology/uchime/, sci-biology/uchime/files/

[gentoo-commits] repo/gentoo:master commit in: sci-biology/uchime/, sci-biology/uchime/files/

[Andreas Sturmlechner]

commit:     132247f2a76e16d49fa38bfc3933ca61f4db78e6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  7 16:51:50 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> 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 <asturm <AT> 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
 }

[gentoo-commits] repo/gentoo:master commit in: sci-biology/uchime/, sci-biology/uchime/files/

[Andreas Sturmlechner]

commit:     f527c122d42327668756e73ea831ca0345410e75
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  5 14:12:29 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct  5 17:44:06 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f527c122

sci-biology/uchime: Fix build w/ cmake-4

Raise cmake_minimum_required to 3.31

Closes: https://bugs.gentoo.org/957440
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-biology/uchime/files/CMakeLists.patch  | 2 +-
 sci-biology/uchime/uchime-4.2.40-r1.ebuild | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sci-biology/uchime/files/CMakeLists.patch b/sci-biology/uchime/files/CMakeLists.patch
index c33af8c7e827..36b2b39ca5c6 100644
--- a/sci-biology/uchime/files/CMakeLists.patch
+++ b/sci-biology/uchime/files/CMakeLists.patch
@@ -1,7 +1,7 @@
 --- /dev/null
 +++ b/CMakeLists.txt
 @@ -0,0 +1,18 @@
-+cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.31)
 +project(UCHIME LANGUAGES CXX)
 +
 +include(GNUInstallDirs)

diff --git a/sci-biology/uchime/uchime-4.2.40-r1.ebuild b/sci-biology/uchime/uchime-4.2.40-r1.ebuild
index 9742ee2575fc..348d8106d270 100644
--- a/sci-biology/uchime/uchime-4.2.40-r1.ebuild
+++ b/sci-biology/uchime/uchime-4.2.40-r1.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake
-
 MY_P="${PN}${PV}_src"
+inherit cmake
 
 DESCRIPTION="Fast, accurate chimera detection"
 HOMEPAGE="https://www.drive5.com/usearch/manual/uchime_algo.html"
@@ -16,4 +15,6 @@ LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 
+BDEPEND=">=dev-build/cmake-3.31"
+
 PATCHES=( "${FILESDIR}"/CMakeLists.patch )