10 files changed, 109 insertions, 136 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 61fe7621305a..fcdc55c38e3b 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/icmake/Manifest b/dev-util/icmake/Manifest
deleted file mode 100644
index fcac74be5a2b..000000000000
--- a/dev-util/icmake/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX icmake-9.00.00-ar.patch 600 BLAKE2B f549bcaff7aee31d22a452df5db16695ab75d4b9202067696cfd9aab95c2b044ff8bb47b21e820646525944436b45e88b3592497d1e074d69f02675b60df223e SHA512 ef09e8a356cf8a56285282dd793230eaa0de3d959f1e9e4bb0905d402906f159625645d6e9cf080f1b94b89da7024e1a118ebea8f686713d2872ee20d2102325
-AUX icmake-9.02.02-verbose-build.patch 141 BLAKE2B 14c498f1825bd605f70f409fe0d72f6f494009e6d90e8762305556377671f4d2d11104217888b8300a9fc67e5821c440bb08d444bfec63b987ff8ad67ddc1088 SHA512 7199f34f8b48962e44306e9102d674b8970e03f99f2e2db29b9d813f2c4631f9768582be3423f528f2585106806afff0c2c7430c9125911a1eaca5e77902d546
-AUX icmake-9.03.01-compressed-docs.patch 939 BLAKE2B ff832857fab6d78ef37a1193f9c98c5fd0b2a6de1dbd1421833aad6580e56158c8d3e190f358fa2b95fb2bbcccd3edb62521f5737dbaf3aede1dc3ca965ad4b0 SHA512 1dabb57f30b0d7d07c9a9b6cc1c2723d89e8e7538a35ff2a3c17bda167becc92ad4bceecbfafa5304728a6c687f5da10e7055dcb62df17bc134923a91bd996f1
-DIST icmake-9.03.01.tar.gz 393488 BLAKE2B 43bac6944aa816e077a55264064abcb55ff3525842ab923712997248ef198a934fa434352fef3484a8ed0f887a89d9151b8e56ef7c601435d26d1644438b2b55 SHA512 2e6228c3bffa7fa145fd3743b1220d96b5730350718b91be96600cb24317e17aa5138282fe2f603d00dadd57d7a832ecff21a570eab0c21426f94d3208a61184
-EBUILD icmake-9.03.01.ebuild 1037 BLAKE2B b0ee8774d022d01adc6baa73af683113d7dc25f8499a9d7d8b6761e4a4985e39ec534dc504557518796e5d9209bffa5d84d473b29960679b2ef0cb93cbe6be0a SHA512 e8471fd45895dfec78623a48d41bed4a856ac84fc8597315b22d713015e8ab8d47d4e2636ac027d881c61cd17605a7273df909ff17bcad42293ac61d0ff40c57
-MISC metadata.xml 247 BLAKE2B 62302b7ed84c33da3e3661c9ffca0482d9ccfb1fd3bf08db2f0a6b346779b5b2614118643b59fbe7d96e296a79b0c8eb91a9c7132443d35fbda0bd13dd2a6bc0 SHA512 3fe1987c9e3fdb05752ff68438efa407d9c97d2d70cc690697d1f8dd0a5e2fbc7615f8138ba1744e2323316ed14931ded496fd23f2afc504eae4fb8232b34453
diff --git a/dev-util/icmake/files/icmake-9.00.00-ar.patch b/dev-util/icmake/files/icmake-9.00.00-ar.patch
deleted file mode 100644
index 0eff669f8e39..000000000000
--- a/dev-util/icmake/files/icmake-9.00.00-ar.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- icmake/bootstrap/flags
-+++ icmake/bootstrap/flags
-@@ -14,3 +14,7 @@
- if [ "${CC}" == "" ] ; then 
-     CC="gcc"
- fi
-+
-+if [ "${AR}" == "" ] ; then 
-+    CC="ar"
-+fi
---- icmake/bootstrap/functions
-+++ icmake/bootstrap/functions
-@@ -35,7 +35,7 @@
- 
-     echo -n .
- 
--    try ar crs ../tmp/lib${program}.a */*.o
-+    try ${AR} crs ../tmp/lib${program}.a */*.o
- 
-     echo -n .
- 
---- icmake/rss/icm_bootstrap
-+++ icmake/rss/icm_bootstrap
-@@ -8,7 +8,7 @@
- echo -n .
- try ${CC} -c ${CFLAGS} *.c
- echo -n .
--try ar rs ../tmp/libicrss.a *.o
-+try ${AR} rs ../tmp/libicrss.a *.o
- echo -n .
- rm *.o
- echo .
diff --git a/dev-util/icmake/files/icmake-9.02.02-verbose-build.patch b/dev-util/icmake/files/icmake-9.02.02-verbose-build.patch
deleted file mode 100644
index dde1af395152..000000000000
--- a/dev-util/icmake/files/icmake-9.02.02-verbose-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- icmake/bootstrap/functions
-+++ icmake/bootstrap/functions
-@@ -2,7 +2,7 @@
- 
- try()
- {
--    # echo $*
-+    echo $*
-     $* || exit 1
- }
- 
diff --git a/dev-util/icmake/files/icmake-9.03.01-compressed-docs.patch b/dev-util/icmake/files/icmake-9.03.01-compressed-docs.patch
deleted file mode 100644
index a8bb04e3102e..000000000000
--- a/dev-util/icmake/files/icmake-9.03.01-compressed-docs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/icm_bootstrap b/icm_bootstrap
-index 9a80252..78ece4f 100755
---- a/icm_bootstrap
-+++ b/icm_bootstrap
-@@ -45,11 +45,11 @@ cd doc
- 
- echo man-pages to tmp/${MANDIR}/man1 and .../man7
- for x in *.1 ; do
--    gzip -9cn $x > ../tmp/${MANDIR}/man1/$x.gz || exit 1
-+    cp $x ../tmp/${MANDIR}/man1/$x || exit 1
- done
- 
- for x in *.7 ; do
--    gzip -9cn $x > ../tmp/${MANDIR}/man7/$x.gz  || exit 1
-+    cp $x ../tmp/${MANDIR}/man7/$x || exit 1
- done
- 
- echo documentation to tmp/${DOCDIR} and tmp/${DOCDOCDIR}
-@@ -58,11 +58,11 @@ echo documentation to tmp/${DOCDIR} and tmp/${DOCDOCDIR}
- #    gzip -9cn $x > ../tmp/${DOCDOCDIR}/$x.gz  || exit 1
- #done
- 
--gzip -9cn icmake.ps > ../tmp/${DOCDOCDIR}/icmake.ps.gz  || exit 1
-+cp icmake.ps ../tmp/${DOCDOCDIR}/icmake.ps || exit 1
- 
- cd ..
- 
--gzip -9cn changelog > tmp/${DOCDIR}/changelog.gz || exit 1
-+cp changelog tmp/${DOCDIR}/changelog || exit 1
- 
- try cp -r examples tmp/${DOCDOCDIR}
- 
diff --git a/dev-util/icmake/icmake-9.03.01.ebuild b/dev-util/icmake/icmake-9.03.01.ebuild
deleted file mode 100644
index 864297a798f1..000000000000
--- a/dev-util/icmake/icmake-9.03.01.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Hybrid between a make utility and a shell scripting language"
-HOMEPAGE="https://fbb-git.gitlab.io/icmake/ https://gitlab.com/fbb-git/icmake"
-SRC_URI="https://gitlab.com/fbb-git/${PN}/-/archive/${PV}/${P}.tar.gz"
-S="${WORKDIR}/${P}/${PN}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.00.00-ar.patch
-	"${FILESDIR}"/${PN}-9.02.02-verbose-build.patch
-	"${FILESDIR}"/${PN}-9.03.01-compressed-docs.patch
-)
-
-src_prepare() {
-	default
-
-	sed -e "/^#define LIBDIR/s/lib/$(get_libdir)/" \
-		-e "/^#define DOCDIR/s/${PN}/${PF}/" \
-		-e "/^#define DOCDOCDIR/s/${PN}-doc/${PF}/" \
-		-i INSTALL.im || die
-
-	# fix build issues (bug #589896)
-	append-cflags -std=gnu99
-
-	tc-export AR CC
-}
-
-src_configure() {
-	./icm_prepare "${EPREFIX}" || die
-}
-
-src_compile() {
-	./icm_bootstrap "${EPREFIX}" || die
-}
-
-src_install() {
-	./icm_install all "${ED}" || die
-}
diff --git a/dev-util/icmake/metadata.xml b/dev-util/icmake/metadata.xml
deleted file mode 100644
index cb2d5608ccb6..000000000000
--- a/dev-util/icmake/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="gitlab">fbb-git/icmake</remote-id>
-	</upstream>
-</pkgmetadata>
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
+}