| 1 |
commit: e0985403769b114a858cc6de03eb472b9cc822d7 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 26 19:37:36 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 26 19:53:30 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0985403 |
| 7 |
|
| 8 |
dev-util/kcov: add 40 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/765880 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-util/kcov/Manifest | 1 + |
| 14 |
dev-util/kcov/{kcov-9999.ebuild => kcov-40.ebuild} | 36 ++++++++++++++-------- |
| 15 |
dev-util/kcov/kcov-9999.ebuild | 34 ++++++++++++-------- |
| 16 |
dev-util/kcov/metadata.xml | 3 ++ |
| 17 |
4 files changed, 50 insertions(+), 24 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-util/kcov/Manifest b/dev-util/kcov/Manifest |
| 20 |
index 45a732133947..c9affb64ab11 100644 |
| 21 |
--- a/dev-util/kcov/Manifest |
| 22 |
+++ b/dev-util/kcov/Manifest |
| 23 |
@@ -1 +1,2 @@ |
| 24 |
DIST kcov-34.tar.gz 296345 BLAKE2B de6acbecd35b1d85a4a0f9f43fdf5dcb09331f88622a236fee672a8624c77baf4a8589d61aaecfb51220b83d28d98426ed32bfb345b717bb13fb180f479cc371 SHA512 63ea8e47f00e53b55be4c37697a7f0b78c15f887a40fc0679d7e92f1561bd379a526a82179ee243838fe6f6bd5b89c9eb76716cdb5add7bfb0f312176422a346 |
| 25 |
+DIST kcov-40.tar.gz 311012 BLAKE2B 19b3cf681fe3c722fde116f454e1760ddd1e54db6fcecc05eca3ec585524fa7d1f7af3ea237943c8a68a81384567205ea443d1542ec380621d35a6f3e3dc667e SHA512 5abe1dd94fbe93fe73d658840593781216b8562a87d010a94d4520e29dd4d537e167de64b7f535347f894c68d5d8b9974ee4b9fd2cebf9291bac4ddbb9ac7cff |
| 26 |
|
| 27 |
diff --git a/dev-util/kcov/kcov-9999.ebuild b/dev-util/kcov/kcov-40.ebuild |
| 28 |
similarity index 52% |
| 29 |
copy from dev-util/kcov/kcov-9999.ebuild |
| 30 |
copy to dev-util/kcov/kcov-40.ebuild |
| 31 |
index bfac1caa27c4..963a9c930a5e 100644 |
| 32 |
--- a/dev-util/kcov/kcov-9999.ebuild |
| 33 |
+++ b/dev-util/kcov/kcov-40.ebuild |
| 34 |
@@ -1,26 +1,38 @@ |
| 35 |
-# Copyright 1999-2021 Gentoo Authors |
| 36 |
+# Copyright 1999-2022 Gentoo Authors |
| 37 |
# Distributed under the terms of the GNU General Public License v2 |
| 38 |
|
| 39 |
-EAPI=6 |
| 40 |
+EAPI=8 |
| 41 |
|
| 42 |
-inherit cmake-utils |
| 43 |
+PYTHON_COMPAT=( python3_{8,9,10} ) |
| 44 |
+inherit cmake python-any-r1 |
| 45 |
|
| 46 |
DESCRIPTION="Kcov is a code coverage tester for compiled languages, Python and Bash" |
| 47 |
HOMEPAGE="https://github.com/SimonKagstrom/kcov" |
| 48 |
-LICENSE="GPL-2" |
| 49 |
-SLOT="0" |
| 50 |
- |
| 51 |
-if [ "${PV}" -eq 9999 ]; then |
| 52 |
- inherit git-r3 |
| 53 |
+if [[ ${PV} == 9999 ]] ; then |
| 54 |
EGIT_REPO_URI="https://github.com/SimonKagstrom/${PN}.git" |
| 55 |
+ inherit git-r3 |
| 56 |
else |
| 57 |
SRC_URI="https://github.com/SimonKagstrom/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 58 |
KEYWORDS="~amd64 ~x86" |
| 59 |
fi |
| 60 |
|
| 61 |
-RDEPEND=" |
| 62 |
- dev-libs/elfutils |
| 63 |
+LICENSE="GPL-2" |
| 64 |
+SLOT="0" |
| 65 |
+IUSE="+binutils" |
| 66 |
+ |
| 67 |
+RDEPEND="dev-libs/elfutils |
| 68 |
net-misc/curl |
| 69 |
- sys-devel/binutils:* |
| 70 |
- sys-libs/zlib" |
| 71 |
+ sys-libs/zlib |
| 72 |
+ binutils? ( sys-libs/binutils-libs:= )" |
| 73 |
DEPEND="${RDEPEND}" |
| 74 |
+BDEPEND="${PYTHON_DEPS}" |
| 75 |
+ |
| 76 |
+src_configure() { |
| 77 |
+ local mycmakeargs=( |
| 78 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_Bfd=$(usex !binutils) |
| 79 |
+ |
| 80 |
+ -DKCOV_INSTALL_DOCDIR=share/doc/${PF} |
| 81 |
+ ) |
| 82 |
+ |
| 83 |
+ cmake_src_configure |
| 84 |
+} |
| 85 |
|
| 86 |
diff --git a/dev-util/kcov/kcov-9999.ebuild b/dev-util/kcov/kcov-9999.ebuild |
| 87 |
index bfac1caa27c4..201ab239e41c 100644 |
| 88 |
--- a/dev-util/kcov/kcov-9999.ebuild |
| 89 |
+++ b/dev-util/kcov/kcov-9999.ebuild |
| 90 |
@@ -1,26 +1,36 @@ |
| 91 |
-# Copyright 1999-2021 Gentoo Authors |
| 92 |
+# Copyright 1999-2022 Gentoo Authors |
| 93 |
# Distributed under the terms of the GNU General Public License v2 |
| 94 |
|
| 95 |
-EAPI=6 |
| 96 |
+EAPI=8 |
| 97 |
|
| 98 |
-inherit cmake-utils |
| 99 |
+inherit cmake |
| 100 |
|
| 101 |
DESCRIPTION="Kcov is a code coverage tester for compiled languages, Python and Bash" |
| 102 |
HOMEPAGE="https://github.com/SimonKagstrom/kcov" |
| 103 |
-LICENSE="GPL-2" |
| 104 |
-SLOT="0" |
| 105 |
- |
| 106 |
-if [ "${PV}" -eq 9999 ]; then |
| 107 |
- inherit git-r3 |
| 108 |
+if [[ ${PV} == 9999 ]] ; then |
| 109 |
EGIT_REPO_URI="https://github.com/SimonKagstrom/${PN}.git" |
| 110 |
+ inherit git-r3 |
| 111 |
else |
| 112 |
SRC_URI="https://github.com/SimonKagstrom/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 113 |
KEYWORDS="~amd64 ~x86" |
| 114 |
fi |
| 115 |
|
| 116 |
-RDEPEND=" |
| 117 |
- dev-libs/elfutils |
| 118 |
+LICENSE="GPL-2" |
| 119 |
+SLOT="0" |
| 120 |
+IUSE="+binutils" |
| 121 |
+ |
| 122 |
+RDEPEND="dev-libs/elfutils |
| 123 |
net-misc/curl |
| 124 |
- sys-devel/binutils:* |
| 125 |
- sys-libs/zlib" |
| 126 |
+ sys-libs/zlib |
| 127 |
+ binutils? ( sys-libs/binutils-libs:= )" |
| 128 |
DEPEND="${RDEPEND}" |
| 129 |
+ |
| 130 |
+src_configure() { |
| 131 |
+ local mycmakeargs=( |
| 132 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_Bfd=$(usex !binutils) |
| 133 |
+ |
| 134 |
+ -DKCOV_INSTALL_DOCDIR=share/doc/${PF} |
| 135 |
+ ) |
| 136 |
+ |
| 137 |
+ cmake_src_configure |
| 138 |
+} |
| 139 |
|
| 140 |
diff --git a/dev-util/kcov/metadata.xml b/dev-util/kcov/metadata.xml |
| 141 |
index 965d272c218d..5a02da613ff9 100644 |
| 142 |
--- a/dev-util/kcov/metadata.xml |
| 143 |
+++ b/dev-util/kcov/metadata.xml |
| 144 |
@@ -2,6 +2,9 @@ |
| 145 |
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
| 146 |
<pkgmetadata> |
| 147 |
<!-- maintainer-needed --> |
| 148 |
+ <use> |
| 149 |
+ <flag name="binutils">Use <pkg>sys-libs/binutils-libs</pkg> for --verify support</flag> |
| 150 |
+ </use> |
| 151 |
<upstream> |
| 152 |
<remote-id type="github">SimonKagstrom/kcov</remote-id> |
| 153 |
</upstream> |
Archives