4 files changed, 3 insertions, 74 deletions
diff --git a/dev-util/flawfinder/Manifest b/dev-util/flawfinder/Manifest
index a2e00ef4de2d..ca565e4cd91f 100644
--- a/dev-util/flawfinder/Manifest
+++ b/dev-util/flawfinder/Manifest
@@ -1,8 +1,4 @@
 AUX flawfinder-2.0.18-setup.patch 222 BLAKE2B 63f0537ac54629d6ab8019dfa6ac8ec65f477264a3ded51541bd8b0722370166d8a99958bb5c9b0d390c6c58cf49f87129f032badf349d5da607e37a6849309a SHA512 5faaf686df8829523e0f6aa620fdcd6944cebdf661780002c5492cf2ae7e85e10848e00a380c929a6cfa104e7f402e494184b0f0f278d3bec8d7492243f87fb1
-DIST flawfinder-2.0.15.tar.gz 253677 BLAKE2B 5c4a0e21e0a7f144382c6ca25f713aef9bdb413d4bb5a73f66632ef365f55c75e755ab59cf92fb54dc2d043c8b88be8c28d5f5fca36df6795dabc00313b839f2 SHA512 12b637bae789ee86710c7d6ee203b811e78414ad5d173730bfffe3ea783a76ce999878c57ddaa8019744cac6bf94967663fd9fd80769d7a24b0a79d23c0b0d9d
-DIST flawfinder-2.0.18.tar.gz 259960 BLAKE2B 8ddc04d7cef5946d574db499c9d3bd61f9bf8c556d58d649b50544d8c70e76c7dab15391464f5dac3dc229602a6988ddbfaa194dab579cc1b56112af519d6102 SHA512 630be03190f1a8900c001143a9cbb98d2bbd4cc1134097070b39b34a51ff8ee98ff060f082dd7fb5c6773ce1e751926a1b95faac6c307facdba445d919547940
 DIST flawfinder-2.0.19.tar.gz 260817 BLAKE2B d9b74d1882a363fa37aabd4ea6c53a5c18e15d27ee755ce2a2ea7421cb052505ef45290b5dfe7df0c3f92de1f561d274624986291d297dad8d8bf0b3550d5cdd SHA512 7ac8684f157f30cb7cc0e2d9c270f92bb26e9207d9879530c499cc93af10070c2558f3794cc8b1a0a51b52ae771a4aa47157b467d0e6578cab96360cb0c6d90b
-EBUILD flawfinder-2.0.15.ebuild 779 BLAKE2B 49f2d5e6085500ce54f59da74fb11c3024cb92dfc9fac2ef0204fef38491559cdf6fe8cca01928ed08f8b22e21b093ae74fca7555a2d43054b7e039837f6782e SHA512 16c48a4a0220dbf91d53565e312b253cb4b6d0bb5249191058459add21e302eab6b002246514d9c7a717abb79064f3dbae6126c287fd1e3136146821cf43f04f
-EBUILD flawfinder-2.0.18.ebuild 744 BLAKE2B 5aee6ec06d49cfd9a7cdbc13419e7a9daef8972f156e1dc8621e959d922ead2f3d23e25c1f29c60e7b07bd4234a48cfa055d09cf0a835666f07c8c49d01eb0e7 SHA512 dbebe46547b156c790d3b9be03366e698f8a7d489f4468a97f66d61ddda7cecd9f5b76cee1ea99d05b4e5dbc5c42349d711ce54dd0d412e30f2e597b55ec427f
-EBUILD flawfinder-2.0.19.ebuild 752 BLAKE2B f727b50f18d1109ff75174c39d16aef456fa720b349d43e458e07e6bcbf60fb1b10a323e95e67cace1788582c647a675ccdd2ce25897af6ad3206c206070c691 SHA512 98b281a35d68a5537eec1f54d71903535bff12cbb125304eaf086591a8080806e8261bdb6b4df92abccb447dba33b4fbdfca91a206e02e674890cd59669d1d22
+EBUILD flawfinder-2.0.19.ebuild 750 BLAKE2B e0c718b5cc2fca1ff9b86a0e7f074de221e3b7b5deaa1ed58bf730e34b70cce226dc08184a395b57dc69aa989d77acf67be6600c5e8a51d730d661f21ba3eac8 SHA512 e7c11b2c78890bc018571d90c71406765451c6d9e9c9154a3025d325c6325f746d539d1b44c8032a653b16a8f8db8de8f512c8bf7405c2641aeb91346244eaab
 MISC metadata.xml 508 BLAKE2B 2726c8927a00acfc6da8afc57be2af6aae401d1ff1c52e9d38c6e7bffbdd2736bd6779c3259f2ebb952fe741c68288e9d9bcadb2bf8f5b787163124aee85ef0d SHA512 bd9657744b80992f00db875462ee3acaa9b92e4829da29fb8881a7253d35787d0778ebf3e11cba19b6175bd686f882c83adf15a6f0019a903b965c60c9839499
diff --git a/dev-util/flawfinder/flawfinder-2.0.15.ebuild b/dev-util/flawfinder/flawfinder-2.0.15.ebuild
deleted file mode 100644
index b05accd76765..000000000000
--- a/dev-util/flawfinder/flawfinder-2.0.15.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-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 ~sparc-solaris ~x86-solaris"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i "s/${PN}.1.gz/${PN}.1/g" 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/flawfinder/flawfinder-2.0.18.ebuild b/dev-util/flawfinder/flawfinder-2.0.18.ebuild
deleted file mode 100644
index ae56037d4dfa..000000000000
--- a/dev-util/flawfinder/flawfinder-2.0.18.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-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 ~sparc-solaris ~x86-solaris"
-
-PATCHES=( "${FILESDIR}"/${P}-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/flawfinder/flawfinder-2.0.19.ebuild b/dev-util/flawfinder/flawfinder-2.0.19.ebuild
index a188bbd52941..99f71eb662c3 100644
--- a/dev-util/flawfinder/flawfinder-2.0.19.ebuild
+++ b/dev-util/flawfinder/flawfinder-2.0.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ 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 ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.0.18-setup.patch )