6 files changed, 11 insertions, 131 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index b21f9d3d4032..23281fd76a70 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/flawfinder/Manifest b/dev-util/flawfinder/Manifest
index e637e823507b..4ad0bedeeff7 100644
--- a/dev-util/flawfinder/Manifest
+++ b/dev-util/flawfinder/Manifest
@@ -1,5 +1,4 @@
 AUX flawfinder-2.0.18-setup.patch 222 BLAKE2B 63f0537ac54629d6ab8019dfa6ac8ec65f477264a3ded51541bd8b0722370166d8a99958bb5c9b0d390c6c58cf49f87129f032badf349d5da607e37a6849309a SHA512 5faaf686df8829523e0f6aa620fdcd6944cebdf661780002c5492cf2ae7e85e10848e00a380c929a6cfa104e7f402e494184b0f0f278d3bec8d7492243f87fb1
 DIST flawfinder-2.0.19.tar.gz 260817 BLAKE2B d9b74d1882a363fa37aabd4ea6c53a5c18e15d27ee755ce2a2ea7421cb052505ef45290b5dfe7df0c3f92de1f561d274624986291d297dad8d8bf0b3550d5cdd SHA512 7ac8684f157f30cb7cc0e2d9c270f92bb26e9207d9879530c499cc93af10070c2558f3794cc8b1a0a51b52ae771a4aa47157b467d0e6578cab96360cb0c6d90b
 EBUILD flawfinder-2.0.19-r1.ebuild 751 BLAKE2B ddcac08cf1f85771ef7d5283bbfcabc1bbb1056e4fae06ab6197812799a8a7ea0821cd13ac87c2c899ea5ef99733ab293e9dbb81373f80db55a9a5cdea91739a SHA512 1a3be3cdc383fbc035269d5059e847679c7441e0178cce889adaf2b4e98e6a86850f6ceccaf78943a1f334e23ed720de4a3ea86dfa8fb468bcff2393f7ec26f5
-EBUILD flawfinder-2.0.19.ebuild 722 BLAKE2B 6752de31a2e1f72bcf4dea143d903c7f98729bbbfa6109f5ed333bfc9fa96aaef835acf8d0aaa99cf886860775e02110dcad18280401b0dfcf0c8cc6cb7ff3d2 SHA512 97fe477f2c893beb62ccdfb0688443335c36070e644294711ce6e0803482ce002e002003577b054aab0cb817d5d76504e71866e953737960fc9f993ca40321b8
 MISC metadata.xml 508 BLAKE2B 2726c8927a00acfc6da8afc57be2af6aae401d1ff1c52e9d38c6e7bffbdd2736bd6779c3259f2ebb952fe741c68288e9d9bcadb2bf8f5b787163124aee85ef0d SHA512 bd9657744b80992f00db875462ee3acaa9b92e4829da29fb8881a7253d35787d0778ebf3e11cba19b6175bd686f882c83adf15a6f0019a903b965c60c9839499
diff --git a/dev-util/flawfinder/flawfinder-2.0.19.ebuild b/dev-util/flawfinder/flawfinder-2.0.19.ebuild
deleted file mode 100644
index acd76dab1d7f..000000000000
--- a/dev-util/flawfinder/flawfinder-2.0.19.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Examines C/C++ source code for security flaws"
-HOMEPAGE="https://www.dwheeler.com/flawfinder/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0.18-setup.patch )
-
-src_prepare() {
-	sed -e "s/${PN}.1.gz/${PN}.1/g" -i setup.py || die 'sed failed'
-	default
-}
-
-python_test() {
-	emake test
-}
-
-python_install_all() {
-	local DOCS=( announcement ChangeLog README.md ${PN}.pdf )
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 93f0b7df3245..c1e2c2df78c5 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,7 +1,6 @@
 AUX 50pkgcheck-gentoo.el 125 BLAKE2B db546b7f4e1517fb4f3bc46eff6a3294c8d677be031ecb33987daa84c355c3628ab7f24bbab90afb24b0bcec6c0ebebb56339374fa35a345481aa9808bd538be SHA512 31bad085867ebecedf0c9c3ed1223e7512238892d69b5224e850d744c5965bf7a2d7cb90978d9cce6da8dc554dba36803d604b8c6ac2b7cc9f2718ef7d6fc644
-DIST pkgcheck-0.10.26.tar.gz 800332 BLAKE2B 01bfb0168fa7bb27660d4d82dca673834e761913aa4ab12a93a78936da9af3ad9d4330bc276c1c14687d0e0bed1f0748ed72ec871ee1af0c47bbdf724aa02e02 SHA512 8b668db52e1a28a664f06d7d4c590830a3f55c8f400b1dd61f8e721ecc04cd0b8d4e8124d07740d47c40fd9c4f3e9189a2c9a27c371109b76edcdfbad86e52fa
+DIST pkgcheck-0.10.27-git-2.43.2.patch 1193 BLAKE2B a91d51e939e524682eccaedc4489c44661f5ed28e76c7074c16f001bf8a968c0ec4485e2a71504e86e081334ee0de02d70573f6ee910c52d636cda1955747686 SHA512 26c81364f7ef875fe3fb1ff77ccde6bd0892160b0ad8ac929f146950473596be1967883ffc5c25fb05ee4fd19870b470fdcfc536667530b89983ce1035b0007f
 DIST pkgcheck-0.10.27.tar.gz 806381 BLAKE2B f4acf72e85003f4dfa244c843464ab40a93df64a7bec68682cf39413552a51989a3214cab9c340318cebb39a8cf33c497fd72335cd37772f8e4d6e87838e413b SHA512 581109fdc565852d0407d770634864f809c2860ccfa03675afc8273199bc00af1c632c0fca27904c3262b1e851f3b8939cbda466cb3876ac228cddf74016fb32
-EBUILD pkgcheck-0.10.26.ebuild 2171 BLAKE2B db98882758501d6978686ef42e219a0fabfa65e461b7e68a7dedb9126f2877638291fb23bc1912244d4b86a7255b6228d8f3ae19cdca256da776226f58b4ecd1 SHA512 159ac0b29737f07c1873e3f709bddb79cea7a3168c83e14f1c4b296f8b3d91b9691ae3ab55ae433f2e9fc5e458a289aeb9d260e562c4a5784964ed8b9f1e76a1
-EBUILD pkgcheck-0.10.27.ebuild 2179 BLAKE2B 1ad7c2cc0778f82663afb755d0654012a5b981effd3e8d82f89af3c3fe663829e83cf99e86a1012d1f0f53a40f4cbd9373c32b48153dfc36b45e33c50a45852e SHA512 1eb392d8d6d2261156593214d9169911ed026c9e0df79ac0bd375fbdcdc51606641afd00c676b426d99d5ce53a20fcc305e1c73eeac13dd516dd3ea51d008460
+EBUILD pkgcheck-0.10.27-r1.ebuild 2364 BLAKE2B 44f9dfd973779b7274f3fc533505e0b2bc07e1a1324f467e4aa1cfb7f59904fe4e43c4b9a9cc30d857231604f84875069a7e355abff37e90143a271d9d37b052 SHA512 4303ba0fee8233a2b7d777fbe75b4051868fe61e884865949d9e2eb4eb1c0decb7527d312407c01a4e667a3040c755a23b0abc479539930f738fcce9e3abdaa2
 EBUILD pkgcheck-9999.ebuild 2179 BLAKE2B 9ce0b3efa33fbbb03b4e915a119a0ec5d7e58ca02065438c4afc32c8676fd7bdbc361cf11ef5fdab301cf00821f5564c7b2fd8413bfbf3c727c9984aa13cbfe9 SHA512 61149e34aac2d0db663dbff6da37e7f0d4be87913b1478bfe3650880c941b94690455f9c0c1e54ea51175f5ef8a16c49690e42b65277c82969af278275677eec
 MISC metadata.xml 455 BLAKE2B b544db3532ef1da966833d5edbc79988cc1fd85b6d6276476684b49d4485814d6e2d969e742d3633c8176e7f37cae6614dae1654fd1424d71475f022166f6e6a SHA512 5abd1584f486e88992bab8c51c191b4915a5854752130f8a591147ff4b2af2102fdc8ab182e7358c3e4bbb3fdc8400563a250e2dba1793d365f0edc7c5f7c33a
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.26.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.27-r1.ebuild
index 708a4ac0df6f..813c851ee5f3 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.26.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.27-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,6 +14,10 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 	inherit pypi
+	SRC_URI+="
+		https://gitlab.gentoo.org/pkgcore/pkgcheck/-/commit/9103513e26f9f2aeade5b563a49697c0e2665e3e.patch
+			-> ${P}-git-2.43.2.patch
+	"
 fi
 
 DESCRIPTION="pkgcore-based QA utility for ebuild repos"
@@ -55,6 +59,10 @@ BDEPEND="${RDEPEND}
 	)
 "
 
+PATCHES=(
+	"${DISTDIR}"/${P}-git-2.43.2.patch
+)
+
 SITEFILE="50${PN}-gentoo.el"
 
 distutils_enable_tests pytest
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.27.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.27.ebuild
deleted file mode 100644
index 0bfd64093b98..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.10.27.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-inherit elisp-common distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcheck.git
-		https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-	inherit pypi
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="emacs"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.21[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-libs/tree-sitter
-	>=dev-libs/tree-sitter-bash-0.20.4
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
-	emacs? (
-		>=app-editors/emacs-24.1:*
-		app-emacs/ebuild-mode
-		app-emacs/flycheck
-	)
-"
-BDEPEND="${RDEPEND}
-	dev-python/wheel
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-distutils_enable_tests pytest
-
-export USE_SYSTEM_TREE_SITTER_BASH=1
-
-src_compile() {
-	distutils-r1_src_compile
-
-	if use emacs ; then
-	   pushd "${S}"/contrib/emacs >/dev/null || die
-	   elisp-compile *.el
-	   popd >/dev/null || die
-	fi
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-
-	if use emacs ; then
-		elisp-install ${PN} "${S}"/contrib/emacs/*.el{,c}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}