gentoo resync : 20.03.2022

2 files changed, 33 insertions, 27 deletions

diff --git a/sci-libs/lemon/Manifest b/sci-libs/lemon/Manifest
index 5abfb97e1165..b57de67700a8 100644
--- a/sci-libs/lemon/Manifest
+++ b/sci-libs/lemon/Manifest
@@ -1,5 +1,5 @@
 AUX lemon-1.3-as-needed.patch 1346 BLAKE2B 9c198c0062a47f2da724149a147bd2ab1b798df60ec5a8945249b9d8c09ab94094458ba6df7fc9d17b7e51f57f1268432e2ec3086013b3cd0f174af0ffe1c896 SHA512 20aef0cfc1b6884604a3cf1f4a60feb688ab4d1a958314c242e965195d6cc950062f67f7ef273fc096fe5fcd7a7ee9acb76215c1a6a173587da3b5e76b163468
 AUX lemon-1.3.1-multilib.patch 841 BLAKE2B 416a2cff88fd4cb1f07a10a9bfe1ca1861c82c70055a30a900bcd622c307b2bd34f87eb1731b6dbe19e1b6e68148cb9d020082cc13ddd24ae375e0db9d0909f6 SHA512 4e31feda5672bcc02bad95d2b794aa2df9d028c655f157f2f95ba0d75679dce68a2cd54e5aa7c6e61f8eec71b7801e57456ca1def3c50d67c17e16a195b9efed
 DIST lemon-1.3.1.tar.gz 5142826 BLAKE2B 23d3b637b4dd32d73bb053b4f5d032e16be787ba162eed6df793f65b81efef6d7ca66d6e5a483b75ac7b1ddb7c8a2698b3b13eb16fcd44e0b726052290082bee SHA512 715eb45e790c908e41de4c13e68b7880e1d86c54eca53f896c95b6bc411ded504f3f768bed9d63562ed4adad53167fb3a7828c67456fdea645a5d0a94ae2e038
-EBUILD lemon-1.3.1.ebuild 1949 BLAKE2B 8dbbcc46af1aa905b8c61de98d5dc3996325060aebaeea964cd323130ef1dfb3534c2779e531d80fad12446696ffab5f55728052a64360690ecd3fe5db5dc996 SHA512 880ee871d596de7e3c54428a50b57612a2eee28106e8f6b640347d4717c2ade244d15c45ba1b06062835fc1fd81bd9c85850ff18f05af89c24a72819ae48ec71
+EBUILD lemon-1.3.1-r1.ebuild 2002 BLAKE2B 5d83932c614848e097551dcaf9b48c237dc94e7778d06908f1c572391dc1657fce05d2bda7efd301465a03f40d4a8701716fa0d6a65d7bf3a640c356ffae40b0 SHA512 c7a34b16a2db965837c1f2dc9289c1c684b648567934ffd5fa068310847cd288714795d6ad2197e472d557ed67f50d39df68893d2b3152fac747d8bed8c81baf
 MISC metadata.xml 814 BLAKE2B 968d6c63894abb5db1caa3d8b21ed0227005d3d1478a230a1e0e71f29205e8856fa2417929afd8ded2770f3b380c44446c197480732402ac9094a5fd6bb67cdd SHA512 55ece04221de59f2f9361f44959618a6f33fa68b58306686be355ff765f991d206f19aa619ede508ca594a40e8c0377fd1af797bf3831dc18df34a5d8766fc71
diff --git a/sci-libs/lemon/lemon-1.3.1.ebuild b/sci-libs/lemon/lemon-1.3.1-r1.ebuild
index cb3bee35083d..902d5e27521e 100644
--- a/sci-libs/lemon/lemon-1.3.1.ebuild
+++ b/sci-libs/lemon/lemon-1.3.1-r1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit cmake-utils
+# Needed to build tests for now
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake
 
 DESCRIPTION="C++ template static library of common data structures and algorithms"
 HOMEPAGE="https://lemon.cs.elte.hu/trac/lemon/"
@@ -17,20 +19,17 @@ RESTRICT="!test? ( test )"
 
 REQUIRED_USE="|| ( coin glpk )"
 
-RDEPEND="
-	coin? (
+RDEPEND="coin? (
 		sci-libs/coinor-cbc:=
 		sci-libs/coinor-clp:=
 	)
-	glpk? ( sci-mathematics/glpk:= )
-"
-DEPEND="${RDEPEND}
-	doc? (
+	glpk? ( sci-mathematics/glpk:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? (
 		app-doc/doxygen
 		app-text/ghostscript-gpl
 		dev-libs/mathjax
-	)
-"
+	)"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-multilib.patch
@@ -38,12 +37,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
-	cmake_comment_add_subdirectory demo
-
-	use doc || cmake_comment_add_subdirectory doc
-	use test || cmake_comment_add_subdirectory test
-
+	local t
 	for t in \
 		max_clique \
 		max_flow \
@@ -53,19 +47,28 @@ src_prepare() {
 		tsp; do
 		sed -i -e "/${t}_test/d" test/CMakeLists.txt || die
 	done
+
 	sed -i \
 		-e '/ADD_TEST(lp_test lp_test)/d' \
 		-e '/ADD_DEPENDENCIES(check lp_test)/d' \
 		test/CMakeLists.txt || die
+
+	cmake_comment_add_subdirectory demo
+
+	use doc || cmake_comment_add_subdirectory doc
+	use test || cmake_comment_add_subdirectory test
+
+	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=TRUE
 		-DLEMON_ENABLE_COIN=$(usex coin)
 		-DLEMON_ENABLE_GLPK=$(usex glpk)
 	)
+
 	use coin && mycmakeargs+=( -DCOIN_ROOT_DIR="${EPREFIX}/usr" )
+
 	if use doc; then
 		mycmakeargs+=(
 			-DLEMON_DOC_MATHJAX_RELPATH="${EPREFIX}/usr/share/mathjax"
@@ -73,18 +76,21 @@ src_configure() {
 			-DLEMON_DOC_USE_MATHJAX=$(usex doc)
 		)
 	fi
-	cmake-utils_src_configure
+
+	cmake_src_configure
+}
+
+src_test() {
+	cd "${S}" || die
+	emake -C "${BUILD_DIR}" check
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
+
 	# TODO: Upstream needs to see the light of GNUInstallDirs
 	if use doc; then
-		mv "${D}"/usr/share/doc/lemon/html "${D}"/usr/share/doc/${PF} || die
-		rmdir "${D}"/usr/share/doc/lemon || die
+		mv "${ED}"/usr/share/doc/lemon/html "${ED}"/usr/share/doc/${PF} || die
+		rmdir "${ED}"/usr/share/doc/lemon || die
 	fi
 }
-
-src_test() {
-	emake -C "${BUILD_DIR}" check
-}