gentoo resync : 12.03.2021

3 files changed, 13 insertions, 14 deletions

diff --git a/sci-biology/uchime/Manifest b/sci-biology/uchime/Manifest
index 7aaf4944f6af..b64b2369ba21 100644
--- a/sci-biology/uchime/Manifest
+++ b/sci-biology/uchime/Manifest
@@ -1,4 +1,4 @@
-AUX CMakeLists.txt 549 BLAKE2B 7c71a80c53bfa1e1c6a1726668866baf4e2b53b29abee4ef3f3c825cadaf8ceac0499c6a702054e9e9698a463ad04668b2a043b17d9cf587c61d8abf5c04076d SHA512 02b43fbfa0a8fd9e5389033e5a8b97d356dfc2d29d076539eea5830b30526745014bc1eab302ccb8fd27b65a1afd92537b94c3c266a4b285de1b7a287fa8a867
+AUX CMakeLists.txt 589 BLAKE2B 183caf5f107482c410296eee8136271e261696a3c11255960b840bd4db16cf461c386fa7374b3a2afb3fd38e97593ad98f9efc621104106cfe4463939c6d0d31 SHA512 06e9f9c8806c27b268968b28fb6059fc6d52295a5d38635612728ac577656fcfae5eb6b15c63e3e9de57e1c8cac832cd4dff70d8a6f3182358a5eb06eb354642
 DIST uchime4.2.40_src.tar.gz 66772 BLAKE2B 9133853d616ab6e1e6a397da78fc846ba00fc70c2c375eb16a98fbdec25ba6034bd1c876b7ec4a99305e76e47cf7984c1aa30b64bdc96e125f661a0150bae060 SHA512 c3afecb23d164d9c3db6229f54faa13120ac4d88132d9aef707f8d043091099db4205ac80f60242920af6efc23813b3e7e4966d562bdb75ff53244fd525e656b
-EBUILD uchime-4.2.40.ebuild 500 BLAKE2B b971e082e7e03cacdc9f178ead195d4b2ae340eafd856cff2081faa0e6879522f1d1058f46bd330ea144394c4552860568d6cb7833c2b1c525b5b457b292fc40 SHA512 5e5757f0fb4de458662828805fc8b2d63573a450c7b6f5249f05103061f6f577ea91d7ec1fdea6889c3690647c536f79b35894e9d99040e12e111c2436b4c258
+EBUILD uchime-4.2.40.ebuild 513 BLAKE2B 85980c9a60fbfd3d155e371b9638606bc4a0e54ca670a12e5f0f8bfa647c6d27b27879aaa1d5c7f724c2f0135d384b54fa61ab334c9a6382140004261334b7e1 SHA512 0c1a1f0f78d1b8da99153a601f5012ae7b74d05a672dc649cdcdfe62b4231474801165bdb70b4be17182ff8da0c77395638e465997715d94fbdd7b745a942210
 MISC metadata.xml 896 BLAKE2B 1041ed416b2ba4670f85856ed2bfe1508d3bea0a310a29a9265b04372df51ee39090d76fa6a282c908e26541986bd10dd47ea73260d5180fe382fc97de556509 SHA512 641d91bff3651a49a3b7e15260cf2a758199ae49ece16643d3104f0f4e202938935edeb3bef18f7afc40a4eb1b1b3e469b07fec95d30a5e686e4b66535ff3e7e
diff --git a/sci-biology/uchime/files/CMakeLists.txt b/sci-biology/uchime/files/CMakeLists.txt
index 54b0a3ba0d30..a9319293e10b 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 dd2201547ae0..75827ab3a304 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
 }