commit: e0985403769b114a858cc6de03eb472b9cc822d7 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Feb 26 19:37:36 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Feb 26 19:53:30 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0985403
dev-util/kcov: add 40 Closes: https://bugs.gentoo.org/765880 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/kcov/Manifest | 1 + dev-util/kcov/{kcov-9999.ebuild => kcov-40.ebuild} | 36 ++++++++++++++-------- dev-util/kcov/kcov-9999.ebuild | 34 ++++++++++++-------- dev-util/kcov/metadata.xml | 3 ++ 4 files changed, 50 insertions(+), 24 deletions(-) diff --git a/dev-util/kcov/Manifest b/dev-util/kcov/Manifest index 45a732133947..c9affb64ab11 100644 --- a/dev-util/kcov/Manifest +++ b/dev-util/kcov/Manifest @@ -1 +1,2 @@ DIST kcov-34.tar.gz 296345 BLAKE2B de6acbecd35b1d85a4a0f9f43fdf5dcb09331f88622a236fee672a8624c77baf4a8589d61aaecfb51220b83d28d98426ed32bfb345b717bb13fb180f479cc371 SHA512 63ea8e47f00e53b55be4c37697a7f0b78c15f887a40fc0679d7e92f1561bd379a526a82179ee243838fe6f6bd5b89c9eb76716cdb5add7bfb0f312176422a346 +DIST kcov-40.tar.gz 311012 BLAKE2B 19b3cf681fe3c722fde116f454e1760ddd1e54db6fcecc05eca3ec585524fa7d1f7af3ea237943c8a68a81384567205ea443d1542ec380621d35a6f3e3dc667e SHA512 5abe1dd94fbe93fe73d658840593781216b8562a87d010a94d4520e29dd4d537e167de64b7f535347f894c68d5d8b9974ee4b9fd2cebf9291bac4ddbb9ac7cff diff --git a/dev-util/kcov/kcov-9999.ebuild b/dev-util/kcov/kcov-40.ebuild similarity index 52% copy from dev-util/kcov/kcov-9999.ebuild copy to dev-util/kcov/kcov-40.ebuild index bfac1caa27c4..963a9c930a5e 100644 --- a/dev-util/kcov/kcov-9999.ebuild +++ b/dev-util/kcov/kcov-40.ebuild @@ -1,26 +1,38 @@ -# 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 +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"; -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}" +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>
