5 files changed, 8 insertions, 80 deletions
diff --git a/dev-util/boost-build/boost-build-1.78.0-r1.ebuild b/dev-util/boost-build/boost-build-1.78.0-r1.ebuild
index 861a37607a08..334acbcf9d5c 100644
--- a/dev-util/boost-build/boost-build-1.78.0-r1.ebuild
+++ b/dev-util/boost-build/boost-build-1.78.0-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 RESTRICT="test"
 
diff --git a/dev-util/ddd/ddd-3.3.12-r5.ebuild b/dev-util/ddd/ddd-3.3.12-r5.ebuild
index fe17fd18d911..0174afbfd0e7 100644
--- a/dev-util/ddd/ddd-3.3.12-r5.ebuild
+++ b/dev-util/ddd/ddd-3.3.12-r5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=8
 
 inherit autotools desktop optfeature
 
@@ -10,10 +10,12 @@ HOMEPAGE="https://www.gnu.org/software/ddd"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3 FDL-1.1"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="readline"
 
+RESTRICT="test"
+
 COMMON_DEPEND="
 	sys-devel/gdb
 	sys-libs/ncurses:=
@@ -34,8 +36,6 @@ RDEPEND="${COMMON_DEPEND}
 	x11-apps/xfontsel
 "
 
-RESTRICT="test"
-
 PATCHES=(
 	"${FILESDIR}/${P}-gcc44.patch"
 	"${FILESDIR}/${P}-gdb-disassembler-bug.patch"
@@ -58,13 +58,12 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--disable-static \
 		$(use_with readline)
 }
 
 src_install() {
 	# Remove app defaults
-	rm -f "${S}"/ddd/Ddd
+	rm -f "${S}"/ddd/Ddd || die
 
 	# Install ddd distribution
 	default
@@ -79,10 +78,8 @@ pkg_postinst() {
 	optfeature "Bash debugging" app-shells/bashdb
 	optfeature "Perl debugging" dev-lang/perl
 	optfeature "Python debugging" dev-python/pydb
-
-	echo
+	elog
 	elog "Important notice: if you encounter DDD crashes during visualization, you might"
 	elog "have hit bug #459324. Try switching to plotting in external window:"
 	elog "Select Edit|Preferences|Helpers and switch 'plot window' to 'external'"
-	echo
 }
diff --git a/dev-util/flawfinder/Manifest b/dev-util/flawfinder/Manifest
index 02ffdca4ea98..760a73f374f2 100644
--- a/dev-util/flawfinder/Manifest
+++ b/dev-util/flawfinder/Manifest
@@ -1,3 +1 @@
-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
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 b2a63e8291f7..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_{6,7,8,9,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"
-
-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 8fb0da7b1d1f..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_{6,7,8,9,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
-}