gentoo auto-resync : 25:01:2024 - 16:43:49

3 files changed, 109 insertions, 0 deletions

diff --git a/dev-util/lcov/Manifest b/dev-util/lcov/Manifest
index 0a68ac28ab51..a87083d54bdd 100644
--- a/dev-util/lcov/Manifest
+++ b/dev-util/lcov/Manifest
@@ -1,8 +1,10 @@
+AUX lcov-2.0-wrong-error-code.patch 803 BLAKE2B e03d41690c291ca2aae191726a026b3a613e4f8625d6444ed4e8af26ed8ddcf090f285424dccced196520384baef0c59780ce59aaba772758d543caba7a87108 SHA512 c54f3613cae504d510e4582d75b0fef7d19438aa6709773f64e167f4c3c15f207054103f4779d8f5face274c22d1231f1c78ed35a3fd52d84bafb09e2904afb1
 DIST lcov-1.15.tar.gz 190487 BLAKE2B 2d6478caae488b84c74a3f7b489013b065b3e8fb106a6e8c5f413ffe87be7f4530aade8d2b5df5b8193949d60f49d5255b4eddb0cd5f1cab6f450ba2f97426ab SHA512 dda0eadbd0ea2093f17cba039309ccda3dbcb7266d083b46bda61e02cd7f049d66de49be1e005157c3e5af910d2703ffbc9cfe7f1242bd67b9787f8508e4d052
 DIST lcov-1.16.tar.gz 196813 BLAKE2B 2a0a2d3ff6291eb3e9cc290006a3723451ab276891f9b63f8dcce82a305caa5558b5bb7bc72fa11620130824df4f9c4312edc23eb86f98eab4a8879e1212a3d5 SHA512 f9fdc5348a97e4262a22d1594df7847165c93447fd5d264d194029f86bf751f18bf91badaf0172d406bca98e4bb3997f133a3ca144105f5acfabeec82f369a37
 DIST lcov-2.0.tar.gz 391695 BLAKE2B 737d6104ebedf90ba2c3bf0c439dd7e2d18724d7267c3bd79897140785246d9ed6334eec9eabc888e361f5e22515da9756e946e1097777fb88c140398b0b078a SHA512 b19b6debc93c0de0e7e5b2aaffa6c74d20a1313ea4d20d8731c6a5ea7f4cc40933316d28ef791c91fdc12ca77c9449a388405f3dc0793588e366b72f596ab49b
 EBUILD lcov-1.15.ebuild 950 BLAKE2B 1afd76f57a98b8c9d50d9370dd51687c7a9b91792fe8e221eb1aa3ef38b497032327423fa3857cfba0b1a22f8504a5bb21a6db12e2233ddb636476aba6e2fafe SHA512 92d833830f514dd654b1cc12ee1549dc9e7f9cad61084be4102e997a65f00e1ba524679f3a4116841ef6c94a186acce43ecac5a55f0b4e483f829af7fca330a4
 EBUILD lcov-1.16-r1.ebuild 1065 BLAKE2B 26fc0c2c39f1deea34120c0c1236d5f1a74409393ab2ade8541cad87af8b3de1a54231577583f878d3d6477e3ae251660aae2790801f9f1fc41b0e53dd842b46 SHA512 1c20dfa1d895b8b7e6a5f80ce3a4587ff7ad29a5964ff8fd64fce0393de1e14a5c17e2e4b24534f5d2e9407b73c3dc2ee50ffd6c9d8e62399a02b37d3aa296cc
 EBUILD lcov-2.0-r1.ebuild 1857 BLAKE2B 666b7e5a536f18c5eadb8fc248abfd72210a6ce34b435dc0dacacf9b00e63cb4881606b703f0cf0ff4458572e67d3188bb8cf5557aebfd2f4eee620c7d2f0a0e SHA512 069a9e394cf97540bef5dab04ac01af316080d68b77659f1f807c0f792c2fc038d6b927463a437f5d12b5c6cf6870be63b8b91178c7fcd35dc9f24eaadf4a518
+EBUILD lcov-2.0-r2.ebuild 1913 BLAKE2B 52cd5cf3e683aae9185b681d2ead19aa7d3507176d257a24d9d755262fb868af0fccd8dc8c1a8047cae2866f34819c9cf3a11335e6466d18d25bc25e39554342 SHA512 07c96d63f534fed8293aa8a6239a1528cf19386001301af206975924bc139cd55ab5c462c86b34e65c486ca41763adc768b2eeba0c12e724f21166ac9f6110bf
 EBUILD lcov-9999.ebuild 1857 BLAKE2B 666b7e5a536f18c5eadb8fc248abfd72210a6ce34b435dc0dacacf9b00e63cb4881606b703f0cf0ff4458572e67d3188bb8cf5557aebfd2f4eee620c7d2f0a0e SHA512 069a9e394cf97540bef5dab04ac01af316080d68b77659f1f807c0f792c2fc038d6b927463a437f5d12b5c6cf6870be63b8b91178c7fcd35dc9f24eaadf4a518
 MISC metadata.xml 528 BLAKE2B f7438b2b210f628a41f30efdeabf33b43bd0fd2317355597ae2256aa79528a033fdfc8bae51bc386cbad8eb590900c8088c3cfff9166b46e8eea2b75f010dfbc SHA512 b38a99ccdf799f89af9dae3c437f0f524148ad66e4ff263e03cf97e3329ed7e179721352ad52bcbbc21a72ea2d347e4d4d453ffc0f3687dca8c6c1814d90cb02
diff --git a/dev-util/lcov/files/lcov-2.0-wrong-error-code.patch b/dev-util/lcov/files/lcov-2.0-wrong-error-code.patch
new file mode 100644
index 000000000000..669308d157d3
--- /dev/null
+++ b/dev-util/lcov/files/lcov-2.0-wrong-error-code.patch
@@ -0,0 +1,18 @@
+From: Jeremy Bettis <jbettis@google.com>
+
+Fix incorrect error code usage.
+
+Bug: https://github.com/linux-test-project/lcov/issues/259
+Signed-off-by: Jeremy Bettis <jbettis@google.com>
+
+--- lcov-2.0/lib/lcovutil.pm
++++ lcov-2.0-fixed/lib/lcovutil.pm
+@@ -4219,7 +4219,7 @@
+                         } else {
+                             if ($f->end_line() != $func->end_line()) {
+                                 lcovutil::ignorable_error(
+-                                       $lcovutil::ERROR_INCONSISTENT,
++                                       $lcovutil::ERROR_INCONSISTENT_DATA,
+                                        '"' . $func->file() .
+                                            '":' . $first . ': function \'' .
+                                            $func->name() . ' last line is ' .
diff --git a/dev-util/lcov/lcov-2.0-r2.ebuild b/dev-util/lcov/lcov-2.0-r2.ebuild
new file mode 100644
index 000000000000..4e0abd69f53e
--- /dev/null
+++ b/dev-util/lcov/lcov-2.0-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit optfeature prefix python-any-r1
+
+DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
+HOMEPAGE="https://github.com/linux-test-project/lcov"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/linux-test-project/lcov.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/linux-test-project/lcov/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux ~x64-macos"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Python is used for spreadsheet.py
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Capture-Tiny
+	dev-perl/DateTime
+	|| (
+		dev-perl/JSON-XS
+		dev-perl/Cpanel-JSON-XS
+		virtual/perl-JSON-PP
+		dev-perl/JSON
+	)
+	dev-perl/PerlIO-gzip
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-perl/GD
+		$(python_gen_any_dep '
+			dev-python/xlsxwriter[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-wrong-error-code.patch
+)
+
+python_check_deps() {
+	python_has_version "dev-python/xlsxwriter[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	if use prefix; then
+		hprefixify bin/*.{pl,sh}
+	fi
+}
+
+src_compile() { :; }
+
+src_test() {
+	emake -j1 check
+}
+
+src_install() {
+	emake -j1 \
+		DESTDIR="${D}" \
+		CFG_DIR="${EPREFIX}/etc" \
+		PREFIX="${EPREFIX}/usr" \
+		LCOV_PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		install
+}
+
+pkg_postinst() {
+	optfeature_header "Optional outuput support:"
+	optfeature "png output support" dev-perl/GD[png]
+	optfeature "spreadsheet output support" dev-python/xlsxwriter
+	optfeature_header "Optional language support:"
+	optfeature "Python code coverage support" dev-python/coverage
+	optfeature "Perl code coverage support" dev-perl/Devel-Cover
+}