gentoo resync : 20.03.2022

5 files changed, 67 insertions, 37 deletions

diff --git a/dev-util/kcov/Manifest b/dev-util/kcov/Manifest
index a7ce289b731a..a508f672d8c3 100644
--- a/dev-util/kcov/Manifest
+++ b/dev-util/kcov/Manifest
@@ -1,4 +1,4 @@
-DIST kcov-34.tar.gz 296345 BLAKE2B de6acbecd35b1d85a4a0f9f43fdf5dcb09331f88622a236fee672a8624c77baf4a8589d61aaecfb51220b83d28d98426ed32bfb345b717bb13fb180f479cc371 SHA512 63ea8e47f00e53b55be4c37697a7f0b78c15f887a40fc0679d7e92f1561bd379a526a82179ee243838fe6f6bd5b89c9eb76716cdb5add7bfb0f312176422a346
-EBUILD kcov-34.ebuild 509 BLAKE2B 8e9bb470e023a442d4aeedc2ba564d8ad8c9a2c40c2619b28b130a14b225ab49ec619aa161444ef31d078dd49226c159be28a11833a8dbbebc92dd7ef748f2ef SHA512 7cbdaf21d0b35a72f994c05b1aff180b9f805d7bfb05f1af89e7d5d33db9543bd1cd468813c8c5518305fa0de3926ec1b3d8b093badfabf11df53811086a7a58
-EBUILD kcov-9999.ebuild 622 BLAKE2B ea0b26b8f99d3cf6274611ebcf0992b8ebff8694ad2eba1fb13ad6f68e36bdad5e9aee581df2d2082c2be96de24d356bff3b0b2831bae502f70ac6223ff928bf SHA512 5e0063bd35d39a228b56b796a1c7e5c769e68fd156bb933d96dd79113c9ab2e831a3c595efa305a6e18639d06c1ed76d07e64245afcedfb17584e00c78043a14
-MISC metadata.xml 251 BLAKE2B f462c0fb3a4db0bca6aa54e4a6c274a0472f794ee1495f34287f6268a13b9480234add9760f982822c6302388f930d068ce9b6659c886f9ead9fc36957e10913 SHA512 20f02b515abe5a4c0fee927908a981171ad11c14964e7778472ab3d6aca3593942475365177a88f7312ca03ae672a810fd18305370a9c80a0afeeb0c43480698
+DIST kcov-40.tar.gz 311012 BLAKE2B 19b3cf681fe3c722fde116f454e1760ddd1e54db6fcecc05eca3ec585524fa7d1f7af3ea237943c8a68a81384567205ea443d1542ec380621d35a6f3e3dc667e SHA512 5abe1dd94fbe93fe73d658840593781216b8562a87d010a94d4520e29dd4d537e167de64b7f535347f894c68d5d8b9974ee4b9fd2cebf9291bac4ddbb9ac7cff
+EBUILD kcov-40.ebuild 884 BLAKE2B 2a643de4724d600089bdf702a3381deda85746d29474281acc960da7d63bef0acac555585b68566a42107afbbc00f2eeb0710b7be5d7a7c5a1de96bd3ee8063a SHA512 25204e7a3aef29a44a6fdc340f19d468252d3995259fd42c31d16a8c321db10eaafb1fc4698bfb5d599bdb0119d23d88bbd4f322cfdc706ac31d11cf6f980a41
+EBUILD kcov-9999.ebuild 810 BLAKE2B 909304207d86faefa228d004256f4ad2cd377a997bb9f8fe2c5efd7a8ea4fb9d67cfee54daa1caa860fb5d612edd6feb1ed8763f6b5e38f93afc4827e6510f39 SHA512 a8a00d4cbec51b1365f19b0acc2b7827bbcca9055899072962cabb4a3711f60e322c12cbcef2245299cc918a70d52a59c5553d20124d32a5e41bc9d2904dca60
+MISC metadata.xml 356 BLAKE2B 515935715197c175b5b3a465d58b4eaf433ae23f4d884f3d6e2796662d1f9e0eb507955ff591844b18df76f3422f01ebc73163d17f67d500f8d8560ec862b8fd SHA512 7bcd02ba7e6b3da5207d72f3985fb0ac1fdfe4a8dfc93c74d970137e603dc2626398fc2e145c8c250e28eaa0678ff671cb4f3b3ee4b74807935c19d76d0b5d9d
diff --git a/dev-util/kcov/kcov-34.ebuild b/dev-util/kcov/kcov-34.ebuild
deleted file mode 100644
index 7f1e7488e3b2..000000000000
--- a/dev-util/kcov/kcov-34.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Kcov is a code coverage tester for compiled languages, Python and Bash"
-HOMEPAGE="https://github.com/SimonKagstrom/kcov"
-SRC_URI="https://github.com/SimonKagstrom/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-libs/elfutils
-	net-misc/curl
-	sys-devel/binutils:*
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
diff --git a/dev-util/kcov/kcov-40.ebuild b/dev-util/kcov/kcov-40.ebuild
new file mode 100644
index 000000000000..963a9c930a5e
--- /dev/null
+++ b/dev-util/kcov/kcov-40.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit cmake python-any-r1
+
+DESCRIPTION="Kcov is a code coverage tester for compiled languages, Python and Bash"
+HOMEPAGE="https://github.com/SimonKagstrom/kcov"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/SimonKagstrom/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/SimonKagstrom/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+binutils"
+
+RDEPEND="dev-libs/elfutils
+	net-misc/curl
+	sys-libs/zlib
+	binutils? ( sys-libs/binutils-libs:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Bfd=$(usex !binutils)
+
+		-DKCOV_INSTALL_DOCDIR=share/doc/${PF}
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/kcov/kcov-9999.ebuild b/dev-util/kcov/kcov-9999.ebuild
index bfac1caa27c4..201ab239e41c 100644
--- a/dev-util/kcov/kcov-9999.ebuild
+++ b/dev-util/kcov/kcov-9999.ebuild
@@ -1,26 +1,36 @@
-# Copyright 1999-2021 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
+inherit cmake
 
 DESCRIPTION="Kcov is a code coverage tester for compiled languages, Python and Bash"
 HOMEPAGE="https://github.com/SimonKagstrom/kcov"
-LICENSE="GPL-2"
-SLOT="0"
-
-if [ "${PV}" -eq 9999 ]; then
-	inherit git-r3
+if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/SimonKagstrom/${PN}.git"
+	inherit git-r3
 else
 	SRC_URI="https://github.com/SimonKagstrom/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
-RDEPEND="
-	dev-libs/elfutils
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+binutils"
+
+RDEPEND="dev-libs/elfutils
 	net-misc/curl
-	sys-devel/binutils:*
-	sys-libs/zlib"
+	sys-libs/zlib
+	binutils? ( sys-libs/binutils-libs:= )"
 DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Bfd=$(usex !binutils)
+
+		-DKCOV_INSTALL_DOCDIR=share/doc/${PF}
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/kcov/metadata.xml b/dev-util/kcov/metadata.xml
index 965d272c218d..5a02da613ff9 100644
--- a/dev-util/kcov/metadata.xml
+++ b/dev-util/kcov/metadata.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<use>
+		<flag name="binutils">Use <pkg>sys-libs/binutils-libs</pkg> for --verify support</flag>
+	</use>
 	<upstream>
 		<remote-id type="github">SimonKagstrom/kcov</remote-id>
 	</upstream>