gentoo auto-resync : 17:08:2022 - 20:33:10

16 files changed, 0 insertions, 1103 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 36b4156aaa39..6b5066ef251b 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/bubblewrap/Manifest b/sys-apps/bubblewrap/Manifest
index de35205670fd..5a9fbdc38208 100644
--- a/sys-apps/bubblewrap/Manifest
+++ b/sys-apps/bubblewrap/Manifest
@@ -1,4 +1,3 @@
 DIST bubblewrap-0.6.2.tar.xz 146312 BLAKE2B bf02e9095cd1e80b84e0439d14ce57fc9bb08f9f0d3596a19eb34a55bd03b9d371368eda75f2b2106d47db29d1c2d9845fe2a12f5d0c554bbb532c9e0e53d368 SHA512 235da019cb370ea6d9328352acb38e6ff368f02f71db1ae85f2dd37655757975bd5b57bbe15f7b419b53a26b8ec3edd81b55893b420d5f42d6a9dab3471d0096
 EBUILD bubblewrap-0.6.2-r1.ebuild 1158 BLAKE2B ba210fc5efe3f6a0cbdad8cf7202d76df25577c6af271393bad36ca1b681d4666855ffca984b43e9c054f08f90ba27bd3af338df2a73c43d92542449d39b4b45 SHA512 3f794436afcc7627d218a0543b8444b9b0df3d9dcea880e3efd35c73b4e108e1f847f56b5480e39335fb78c935d1f121b905f4f51b943948f12e7cf740e14cb6
-EBUILD bubblewrap-0.6.2.ebuild 1159 BLAKE2B 9e9398a70f4c6b17d185d8ac5cf6ca1ac93a46495f6578914ce468cd4d5aaafaeff8b9c97a60a0baf80b7b109d09919ef5d6318a7c72b2020470491e6e6a7d5e SHA512 154c5f59f1fe12bbedeecc0f10b7794c332c3a909415c591279827aed2a4c6268a765e67a9759e15e4f25e8a15594ac69f8bc53121886afc6239f1843a92efd6
 MISC metadata.xml 453 BLAKE2B 69f1ca03c4b84f4adc2db8bbed8bf57852719c136778747e2679517afe63b1a0621ab486121b71d78c8ae235c2cd7e3077e85ed8d3ad51cc16f1838eb94bd448 SHA512 486775a479174ad72dbcd7f6a89c8001af1a8a4c5b73620153fed4da28b15fb1c481003ffd96ef68d2b49569ed0c1a9d445bc03a9901056cd29b77b3cf13a1ef
diff --git a/sys-apps/bubblewrap/bubblewrap-0.6.2.ebuild b/sys-apps/bubblewrap/bubblewrap-0.6.2.ebuild
deleted file mode 100644
index a9f2860b3fd1..000000000000
--- a/sys-apps/bubblewrap/bubblewrap-0.6.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info meson
-
-DESCRIPTION="Unprivileged sandboxing tool, namespaces-powered chroot-like solution"
-HOMEPAGE="https://github.com/containers/bubblewrap/"
-SRC_URI="https://github.com/containers/${PN}/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-IUSE="selinux +suid"
-
-RDEPEND="
-	sys-libs/libseccomp
-	sys-libs/libcap
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.3
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-# tests require root privileges
-RESTRICT="test"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		CONFIG_CHECK="~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dbash_completion=enabled
-		-Dman=enabled
-		-Dtests=false
-		-Dzsh_completion=enabled
-		$(meson_feature selinux)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if use suid; then
-		chmod u+s "${ED}"/usr/bin/bwrap
-	fi
-}
diff --git a/sys-apps/ipmitool/Manifest b/sys-apps/ipmitool/Manifest
index a95ec01268af..a9f96e263063 100644
--- a/sys-apps/ipmitool/Manifest
+++ b/sys-apps/ipmitool/Manifest
@@ -2,13 +2,9 @@ AUX exchange-bmc-os-info-1.8.18.initd 512 BLAKE2B 43307b959b3a2df518bc667e696f9e
 AUX ipmievd.service 158 BLAKE2B 5d02e8647670086bd46160417de32cd199ba1fe731386fce04c2b56183fe6d7885b59199f30a7bfdfc764d7eb021d82554154766fbd23407af950d4e274033ab SHA512 8e1c3ee301bc002d9fe8146d224b9e4d4d054503c118e713c48763eb6352b6e6efe947380d1ab9fa0205ef556683e29ead321360f00bf8e093eb2b48eaa5dfb9
 AUX ipmitool-1.8.18-ipmievd.confd 677 BLAKE2B 7656944c3a9e1f8c9ce2a5923da7dda420386020c14449fb182ce9247122564cf6e5179e97bf5396e81e3c5ded8a6791b2e5804327697149e6be097f82e105d6 SHA512 0e494de95d7a193293005b3d93e0ea0c7ada44e54f48259b197e1eb9846f78d986cefba59ebd70484c26e4ac5d3ae38abfc5a6cd1f74785cb3806c0ba35ee572
 AUX ipmitool-1.8.18-ipmievd.initd 898 BLAKE2B f768c90e913d0036113f39716a04b5c28052cb1be78b27221549f871b392df26e989edea20ff8eeffba38150d2b5687ca189d0e471b43e85ae2e4af3a7abb72c SHA512 2f46f3ad1f3d224a3f12fe1feaf7a2cee84dab6f93f788f4e9e82baf42ccbd3e22aa2b51c76646e1bd2a812bf8c673c780a48dfd2c5ec116f9fda944cb1d48cb
-AUX ipmitool-1.8.9-ipmievd.confd 518 BLAKE2B 98d9a8e5de576242e81aa7dbfcfde7063b25448c5a50780d4e70410c1fba4adcca81abfcd48ea1a5cf5a55006c59678bc112bb86422571b82a0fb8c517f3292f SHA512 6253f218b22fc98768d3a26aec60da8b80229f3f4e2137cf6b34cefb465a420400e451fb07e6f3f626d88904644e4e2bddd280e01bf6d6cacd06cf6b59f20fe4
-AUX ipmitool-1.8.9-ipmievd.initd 584 BLAKE2B 6632466d88006f6623ae81722b2f2726ede5b99141f794829c1cff5808bbb2851e29858beb96b40061de019be08f8179d90f8008b74221cd058a34586b3f5680 SHA512 5d42774486a0edaf1dcece16fbad0cca531a91559ba8dd4259f05787e1964fbfec4d11c9427dbe8cb46ba0cc1a447120bfa82254aac4850d9acc632834daa669
 AUX log_bmc-1.8.18.initd 570 BLAKE2B 7b21b7888f386953c001a635fa4d1fd3b79a1eb9920fc6cefe6770231d67989d47f172e783416d12feb399e882e2fe74b26fdef162fafb85cd686ec83d414d01 SHA512 2d5b62ee5f694629e8f5c4c2d1fcdf7a3d42078f488e43cd1b34193619918ea7429da2bcb236b9216cfabaf94d8c5224b99194023a8db626884c4c766f15136a
 DIST enterprise-numbers.2020-10-21.xz 1426932 BLAKE2B bfe39ceea321ba47cd40eafa67862eb4dfd6dc29b192afb20ad0c908cd93a16b4103c5de64d042df012417c8cadc03000f2b2a00779bcc582a430603cad5f3cf SHA512 4a854a56e8ed51997c320cbfba041d43cb98b14743ef80b67e701942068d3729604abaedb617655a83ca21a7e20ea5a622ede4de317ca492cefd46da784d28f3
 DIST ipmitool-1.8.18_p20201004.tar.gz 638493 BLAKE2B 52f4ec8c82336b88640d1b91fc17af8f2fe0948a5c48c16067867dcad0852168d48bb21fdd99bde7ed957b66df888fd369c909079d1f81c861acd8c7f8dfa6f2 SHA512 8d72eef3584f4d2c86bfe43f70b5d687f3b7bbdf75b8979f7132c5c98b01baae22c336e540c197652187749fc9bb221a92e546b56e5cf2eb5650fad5094e9433
 DIST ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz 3208 BLAKE2B b37a127eff361039b3b810e19dd97f0c395462b658803f56f10f2dd1abbbe92743dc409ce6b83560db15621b7fa7a3c0f989100077893993df18108a082e49d2 SHA512 0f7646a2307ac98425e99dece9d3e3b23026136a97524151efdecc910fb537af41a91702782989046e44163da98610fa05792878473e228b45c16351f6015a45
-EBUILD ipmitool-1.8.18_p20201004-r1.ebuild 4435 BLAKE2B 77a8db74628e550e535339166858f479648094d35f649e433992fe07de2089e1e0b48b99a7b8c5a29c9fe33a78bc113d7397e0a091380581ee4c3f00a62c8129 SHA512 eb1e6f5d26fbd3958cfca2d2c7cdc4cd8f3e553d0c793aa5ea6efb56740db3c6c04dc32c36f8e356ad4a79288dd2e4725a15cf93dc870e90ea6068bc374e6f0f
-EBUILD ipmitool-1.8.18_p20201004-r2.ebuild 6163 BLAKE2B 64167cd15bf34dd321f613c4036d33f3aa122e039ad39ec5e51643e11a6be99fd318da1f9d9ced88fe27f40078cb0010241e0c3e1f36c891bed530c33314c4de SHA512 debaa9a8d1a01b1f07273cb7828a27090001721268c7292c800ad4eb04a97e0112638897287e3066263dbcc16835134e6c5f44786ac9ffe97b46cf288ca3727f
 EBUILD ipmitool-1.8.18_p20201004-r3.ebuild 6249 BLAKE2B 3d5060e5488181de705843c4845ac1c1ff50fb9f2096ab2876b111db2312079cb6111682f34faaa9edb3b2e30fb86db1a2d7359c47f7289d70b2087a3827526d SHA512 ebfc290090a08042a469ed30705c0f16f9b6e6ab15d8a0bf18f244037017b76a0d3299a15eb9ea22abf116d31b1bb74f6ec441b2199ea2fd7ee2694bd3ff3037
 MISC metadata.xml 634 BLAKE2B 8f56c8e88bb4147ce99d881ccc9f3f9fba657be1bd9abdb9d646456e2f7deedd3f7ab484b5db339288021cf692e21ca9a0030cb884869676346dbd22cf60c41f SHA512 b2eb0b961fb7cedb0f293db8974e093a03d8b312123c36ce1d451b8a0b34508ad12a2c8ee0704649c30dfd6a8b1a03c7a021d55cb9da6983648747399982e801
diff --git a/sys-apps/ipmitool/files/ipmitool-1.8.9-ipmievd.confd b/sys-apps/ipmitool/files/ipmitool-1.8.9-ipmievd.confd
deleted file mode 100644
index 42b194a771b0..000000000000
--- a/sys-apps/ipmitool/files/ipmitool-1.8.9-ipmievd.confd
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# /etc/conf.d/ipmievd
-
-# Interfaces:
-#   open      Linux OpenIPMI Interface
-#   imb       Intel IMB Interface
-#   bmc       IPMI v2.0 BMC interface
-#   lan       IPMI v1.5 LAN Interface
-#   lanplus   IPMI v2.0 RMCP+ LAN Interface
-
-INTERFACE="open"
-
-# Commands:
-#   open   Use OpenIPMI for asyncronous notification of events
-#   sel    Poll SEL for notification of events
-
-COMMAND="open"
-
-# Options.
-
-OPTIONS=""
diff --git a/sys-apps/ipmitool/files/ipmitool-1.8.9-ipmievd.initd b/sys-apps/ipmitool/files/ipmitool-1.8.9-ipmievd.initd
deleted file mode 100644
index 256238ef5e2c..000000000000
--- a/sys-apps/ipmitool/files/ipmitool-1.8.9-ipmievd.initd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# /etc/init.d/ipmievd
-
-depend() {
-    use logger
-}
-PN="ipmievd"
-
-start() {
-    /sbin/modprobe -sq ipmi_msghandler
-    /sbin/modprobe -sq ipmi_devintf
-    /sbin/modprobe -sq ipmi_si
-    ebegin "Starting ${PN}"
-    start-stop-daemon --start --pidfile /var/run/${PN}.pid0 --exec /usr/sbin/${PN} -- -I ${INTERFACE} ${OPTIONS} ${COMMAND}
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping ${PN}"
-    start-stop-daemon --stop --pidfile /var/run/${PN}.pid0
-    eend $?
-}
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild
deleted file mode 100644
index afe6d33c7255..000000000000
--- a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Utility for controlling IPMI enabled devices"
-HOMEPAGE="http://ipmitool.sf.net/"
-DEBIAN_PR="9.debian"
-DEBIAN_PV="${PV/_p*}"
-DEBIAN_P="${PN}_${DEBIAN_PV}"
-DEBIAN_PF="${DEBIAN_P}-${DEBIAN_PR}"
-COMMIT_ID=7fd7c0f2ba39e223868a8d83d81d4074f057d6fc
-if [[ -n "${COMMIT_ID}" ]]; then
-	S="${WORKDIR}/${PN}-${COMMIT_ID}"
-	SRC_URI="https://github.com/ipmitool/ipmitool/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-fi
-# https://www.iana.org/assignments/enterprise-numbers/enterprise-numbers
-# is not available with version numbers or dates!
-SRC_URI+="
-	https://dev.gentoo.org/~robbat2/distfiles/ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz
-	https://dev.gentoo.org/~robbat2/distfiles/enterprise-numbers.2020-10-21.xz
-	"
-	#http://http.debian.net/debian/pool/main/i/${PN}/${DEBIAN_PF}.tar.xz
-	# https://launchpad.net/ubuntu/+archive/primary/+files/${DEBIAN_PF}.tar.xz
-#IUSE="freeipmi openipmi status"
-IUSE="openbmc openipmi static"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ppc ppc64 x86"
-LICENSE="BSD"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	openbmc? ( sys-apps/systemd:0= )
-	sys-libs/readline:0="
-DEPEND="${RDEPEND}
-		openipmi? ( sys-libs/openipmi )
-		virtual/os-headers"
-		#freeipmi? ( sys-libs/freeipmi )
-# ipmitool CAN build against || ( sys-libs/openipmi sys-libs/freeipmi )
-# but it doesn't actually need either.
-
-PATCHES=(
-	#"${FILESDIR}"/${P}-openssl-1.1.patch
-)
-
-# I hope all of this will get MUCH cleaner if upstream will just make a new
-# release! - robbat2 2020/10/21
-src_prepare() {
-	default
-	if [ -d "${S}"/debian ] ; then
-		mv "${S}"/debian{,.package}
-		ln -s "${WORKDIR}"/debian "${S}"
-		eautoreconf
-		# Upstream commit includes SOME of the debian changes, but not all of them
-		sed -i \
-			-e '/^#/d' \
-			-e '/0120-openssl1.1.patch/d' \
-			debian/patches/series
-		for p in $(cat debian/patches/series) ; do
-			echo ${p}
-			if ! nonfatal eapply -p1 debian/patches/$p ; then
-				echo "failed ${p}"
-				fail=1
-			fi
-		done
-		[[ $fail -eq 1 ]] && die "fail"
-	fi
-	pd="${WORKDIR}"/ipmitool_1.8.18-9.debian-ported-gentoo/
-	PATCHES=(
-		#"${pd}"/0000.0120-openssl1.1.patch
-		"${pd}"/0001.0100-fix_buf_overflow.patch
-		"${pd}"/0002.0500-fix_CVE-2011-4339.patch
-		"${pd}"/0003.0600-manpage_longlines.patch
-		#"${pd}"/0004.0110-getpass-prototype.patch
-		#"${pd}"/0005.0115-typo.patch
-		"${pd}"/0006.0125-nvidia-iana.patch
-		"${pd}"/0007.0615-manpage_typo.patch
-		#"${pd}"/0008.0130-Correct_lanplus_segment_violation.patch
-		"${pd}"/0009.0005-gcc10.patch
-		#"${pd}"/0010.0010-utf8.patch
-	)
-	for p in "${PATCHES[@]}" ; do
-		eapply -p1 ${p} || die "failed ${p}"
-	done
-
-	eautoreconf
-
-	# If this file is not present, then ipmitool will try to download it during make install!
-	cp -al \
-		"${WORKDIR}/enterprise-numbers.2020-10-21" \
-		"${S}"/enterprise-numbers \
-		|| die "Could not place IANA enterprise-numbers"
-}
-
-src_configure() {
-	# - LIPMI and BMC are the Solaris libs
-	# - OpenIPMI is unconditionally enabled in the configure as there is compat
-	# code that is used if the library itself is not available
-	# FreeIPMI does build now, but is disabled until the other arches keyword it
-	#	`use_enable freeipmi intf-free` \
-	# --enable-ipmievd is now unconditional
-	WGET=/bin/true \
-	CURL=/bin/true \
-	econf \
-		$(use_enable static) \
-		--enable-ipmishell \
-		--enable-intf-lan \
-		--enable-intf-usb \
-		$(use_enable openbmc intf-dbus) \
-		--enable-intf-lanplus \
-		--enable-intf-open \
-		--enable-intf-serial \
-		--disable-intf-bmc \
-		--disable-intf-dummy \
-		--disable-intf-free \
-		--disable-intf-imb \
-		--disable-intf-lipmi \
-		--disable-internal-md5 \
-		--with-kerneldir=/usr \
-		--bindir=/usr/sbin
-
-	# Fix linux/ipmi.h to compile properly. This is a hack since it doesn't
-	# include the below file to define some things.
-	echo "#include <asm/byteorder.h>" >>config.h
-}
-
-src_install() {
-	emake DESTDIR="${D}" PACKAGE="${PF}" install
-
-	into /usr
-	dosbin contrib/bmclanconf
-	rm -f "${D}"/usr/share/doc/${PF}/COPYING
-	docinto contrib
-	cd "${S}"/contrib
-	dodoc collect_data.sh create_rrds.sh create_webpage_compact.sh create_webpage.sh README
-
-	newinitd "${FILESDIR}"/${PN}-1.8.9-ipmievd.initd ipmievd
-	newconfd "${FILESDIR}"/${PN}-1.8.9-ipmievd.confd ipmievd
-	# TODO: init script for contrib/bmc-snmp-proxy
-	# TODO: contrib/exchange-bmc-os-info
-}
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild
deleted file mode 100644
index 8b34a72624bb..000000000000
--- a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Utility for controlling IPMI enabled devices"
-HOMEPAGE="http://ipmitool.sf.net/"
-DEBIAN_PR="9.debian"
-DEBIAN_PV="${PV/_p*}"
-DEBIAN_P="${PN}_${DEBIAN_PV}"
-DEBIAN_PF="${DEBIAN_P}-${DEBIAN_PR}"
-COMMIT_ID=7fd7c0f2ba39e223868a8d83d81d4074f057d6fc
-if [[ -n "${COMMIT_ID}" ]]; then
-	S="${WORKDIR}/${PN}-${COMMIT_ID}"
-	SRC_URI="https://github.com/ipmitool/ipmitool/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-fi
-# https://www.iana.org/assignments/enterprise-numbers/enterprise-numbers
-# is not available with version numbers or dates!
-SRC_URI+="
-	https://dev.gentoo.org/~robbat2/distfiles/ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz
-	https://dev.gentoo.org/~robbat2/distfiles/enterprise-numbers.2020-10-21.xz
-	"
-	#http://http.debian.net/debian/pool/main/i/${PN}/${DEBIAN_PF}.tar.xz
-	# https://launchpad.net/ubuntu/+archive/primary/+files/${DEBIAN_PF}.tar.xz
-#IUSE="freeipmi openipmi status"
-IUSE="openbmc openipmi static"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-LICENSE="BSD"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	openbmc? ( sys-apps/systemd:0= )
-	sys-libs/readline:0="
-DEPEND="${RDEPEND}
-		>=sys-devel/autoconf-2.69-r5
-		openipmi? ( sys-libs/openipmi )
-		virtual/os-headers"
-		#freeipmi? ( sys-libs/freeipmi )
-# ipmitool CAN build against || ( sys-libs/openipmi sys-libs/freeipmi )
-# but it doesn't actually need either.
-
-PATCHES=(
-	#"${FILESDIR}"/${P}-openssl-1.1.patch
-)
-
-# I hope all of this will get MUCH cleaner if upstream will just make a new
-# release! - robbat2 2020/10/21
-src_prepare() {
-	default
-	if [ -d "${S}"/debian ] ; then
-		mv "${S}"/debian{,.package}
-		ln -s "${WORKDIR}"/debian "${S}"
-		eautoreconf
-		# Upstream commit includes SOME of the debian changes, but not all of them
-		sed -i \
-			-e '/^#/d' \
-			-e '/0120-openssl1.1.patch/d' \
-			debian/patches/series
-		for p in $(cat debian/patches/series) ; do
-			echo ${p}
-			if ! nonfatal eapply -p1 debian/patches/${p} ; then
-				echo "failed ${p}"
-				fail=1
-			fi
-		done
-		[[ $fail -eq 1 ]] && die "fail"
-	fi
-	pd="${WORKDIR}"/ipmitool_1.8.18-9.debian-ported-gentoo/
-	PATCHES=(
-		#"${pd}"/0000.0120-openssl1.1.patch
-		"${pd}"/0001.0100-fix_buf_overflow.patch
-		"${pd}"/0002.0500-fix_CVE-2011-4339.patch
-		"${pd}"/0003.0600-manpage_longlines.patch
-		#"${pd}"/0004.0110-getpass-prototype.patch
-		#"${pd}"/0005.0115-typo.patch
-		"${pd}"/0006.0125-nvidia-iana.patch
-		"${pd}"/0007.0615-manpage_typo.patch
-		#"${pd}"/0008.0130-Correct_lanplus_segment_violation.patch
-		"${pd}"/0009.0005-gcc10.patch
-		#"${pd}"/0010.0010-utf8.patch
-	)
-	for p in "${PATCHES[@]}" ; do
-		eapply -p1 ${p} || die "failed ${p}"
-	done
-
-	# Gentoo chooses to install ipmitool in /usr/sbin
-	# Where RedHat chooses /usr/bin
-	sed -i -e \
-		's,/usr/bin/ipmitool,/usr/sbin/ipmitool,g' \
-		"${S}"/contrib/* \
-		|| die "sed bindir failed"
-
-	# Consistent RUNSTATEDIR
-	sed -i -e \
-		's,/var/run,/run,g' \
-		"${S}/doc/ipmievd.8.in" \
-		"${S}"/contrib/* \
-		"${S}"/lib/helper.c \
-		"${S}"/src/ipmievd.c \
-		|| die "sed /var/run failed"
-
-	eautoreconf
-
-	# If this file is not present, then ipmitool will try to download it during make install!
-	cp -al \
-		"${WORKDIR}/enterprise-numbers.2020-10-21" \
-		"${S}"/enterprise-numbers \
-		|| die "Could not place IANA enterprise-numbers"
-}
-
-src_configure() {
-	# - LIPMI and BMC are the Solaris libs
-	# - OpenIPMI is unconditionally enabled in the configure as there is compat
-	# code that is used if the library itself is not available
-	# FreeIPMI does build now, but is disabled until the other arches keyword it
-	#	`use_enable freeipmi intf-free` \
-	# --enable-ipmievd is now unconditional
-
-	# for pidfiles, runstatedir not respected in all parts of code
-	append-cppflags -D_PATH_VARRUN=/run/
-
-	# WGET & CURL are set to avoid network interaction, we manually inject the
-	# IANA enterprise-numbers file instead.
-	#
-	# DEFAULT_INTF=open # default to OpenIPMI, do not take external input
-	WGET=/bin/true \
-	CURL=/bin/true \
-	DEFAULT_INTF=open \
-	econf \
-		$(use_enable static) \
-		--enable-ipmishell \
-		--enable-intf-lan \
-		--enable-intf-usb \
-		$(use_enable openbmc intf-dbus) \
-		--enable-intf-lanplus \
-		--enable-intf-open \
-		--enable-intf-serial \
-		--disable-intf-bmc \
-		--disable-intf-dummy \
-		--disable-intf-free \
-		--disable-intf-imb \
-		--disable-intf-lipmi \
-		--disable-internal-md5 \
-		--with-kerneldir=/usr \
-		--bindir=/usr/sbin \
-		--runstatedir=/run \
-		CFLAGS="${CFLAGS}"
-
-	# Fix linux/ipmi.h to compile properly. This is a hack since it doesn't
-	# include the below file to define some things.
-	echo "#include <asm/byteorder.h>" >>config.h
-
-}
-
-src_install() {
-	emake DESTDIR="${D}" PACKAGE="${PF}" install
-	rm -f "${D}"/usr/share/doc/${PF}/COPYING
-	into /usr
-
-	newinitd "${FILESDIR}"/${PN}-1.8.18-ipmievd.initd ipmievd
-	newconfd "${FILESDIR}"/${PN}-1.8.18-ipmievd.confd ipmievd
-
-	# Everything past this point is installing contrib/
-	dosbin contrib/bmclanconf
-
-	exeinto /usr/libexec
-	doexe contrib/log_bmc.sh
-	newinitd "${FILESDIR}/log_bmc-1.8.18.initd" log_bmc
-
-	# contrib/exchange-bmc-os-info.init.redhat
-	# contrib/exchange-bmc-os-info.service.redhat
-	# contrib/exchange-bmc-os-info.sysconf
-	exeinto /usr/libexec
-	newexe contrib/exchange-bmc-os-info.init.redhat exchange-bmc-os-info
-	insinto /etc/sysconfig
-	newins contrib/exchange-bmc-os-info.sysconf exchange-bmc-os-info
-	systemd_newunit contrib/exchange-bmc-os-info.service.redhat exchange-bmc-os-info.service
-	newinitd "${FILESDIR}/exchange-bmc-os-info-1.8.18.initd" exchange-bmc-os-info
-
-	# contrib/bmc-snmp-proxy
-	# contrib/bmc-snmp-proxy.service
-	# contrib/bmc-snmp-proxy.sysconf
-	exeinto /usr/libexec
-	doexe contrib/bmc-snmp-proxy
-	insinto /etc/sysconfig
-	newins contrib/bmc-snmp-proxy.sysconf bmc-snmp-proxy
-	systemd_dounit contrib/bmc-snmp-proxy.service
-	# TODO: initd for bmc-snmp-proxy
-
-	insinto /usr/share/${PN}
-	doins contrib/oem_ibm_sel_map
-
-	docinto contrib
-	cd "${S}"/contrib
-	dodoc collect_data.sh create_rrds.sh create_webpage_compact.sh create_webpage.sh README
-}
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index 5ef4de92b320..1b3c374bae32 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -1,17 +1,6 @@
-AUX ipmiutil-2.9.8-flags.patch 712 BLAKE2B d084480396ee8e546c2027e95ce9c95940d1d844a0aaec7448d6eb4c750d3a4a964fa53118a2cc92897733ab99b9b1064ecf2f05cdd30282b803ea511386f1e8 SHA512 3caf226020e1fffc6c45cb549a066a034a58165415d5e325445f949042c1ac756b61949c78c30d0172983d95264a0ee2c9f829f1f5c8395e8fa1a48025f87dc2
 AUX ipmiutil-2.9.9-lib_symlink.patch 468 BLAKE2B d24e4e0183f46a3a97b9a9db754b4948446eda7504d81b3854cf8ae65eebdc2f279272ecf09736ff2966dfd477219e19a900cce8665f865bc22a8674ea863f2b SHA512 35912b578b3e61e899f97d2fc6cd6352ac04da638c64c252aa71138d9b7fd1b1de474f2702febfb85ab3f5371971be7a1922a1c6bbe5960c04be2b9171f0e75e
-AUX ipmiutil-3.1.5-fix-configure.patch 5817 BLAKE2B 3a953a03d495a453d99dae70ea29ed95e03ee5d4da6a1a2aab42bda289f43725fff9a5721d7a08538f9a5f35b36ae956e5da493a50301fdaf487a8aef05ca0ba SHA512 c1f2c13f1aafc4244b1a3cdf2da23d4ff9e982613063b2e8995c0003db6cb31e1facce9d590725f5e02789fcd62c3b334ce20e1b8815b99c002bc2f90d9fa065
-AUX ipmiutil-3.1.7-fix-configure.patch 5872 BLAKE2B 6058c5f3cd3d389dec152649098925d8fd4aa4dab22f11924cc006dba44eeb5254b7b5a10eaf202d496e7da4e71b69c984553fda730708ffdc0b7bacf0a46dfa SHA512 0d47df5c1599f16228819325c666b2ed9f0c85617af8ce6a0be5496403ae0ce8d5548302ad8b9315105ec8a1a54cd4b46636e5ee21539b813b35ed4fd78f86a2
 AUX ipmiutil-3.1.7-flags.patch 708 BLAKE2B 70b96d8de3221d11757ff54957be2153540da78edef549a627983e745064d503d38cd3b95c5640445c1c6ca8cf208d43781e486e1df481a409636dc8d6c4c9f4 SHA512 f0f34b10c65e3ddab56ef757085dcfbaceb1a8b745d8be72e0630fdf7b6da3fadd37f08a9eee814c140419b1e9dda9937690dac67b3f506f36f622076c8119bf
 AUX ipmiutil-3.1.8-fix-configure.patch 5520 BLAKE2B 62a2f71824c37015e9b5999acaa06780a9e398b4ba74461cb963375c497c0c18e5cbb4b5188aaa5d34521ac0a2153835fda38ffe80a1414d85ecc96da49d114e SHA512 13e58b8516ade13d907462b0eca9ce639ea486740992e1d2f348f17a9ed8deadd1ca7ab0fb2c725e5721f7840119fc5e9b134a8eb842d661d81041f39dd1f6cc
-DIST ipmiutil-3.0.6.tar.gz 1692679 BLAKE2B dcc02dbb5467b824005dbc95c8f5231b2e2758e7600231c1c3fc31c1207cff0540400857dd1bfa83fc8b033fe0277ab23c6013f110744bff57fe4bc7b89174f9 SHA512 0c47246b7aa6a060091745d36e33aae07e7907dcad5fefb1759aac62adf48316915ce5818d2f9241e24b73be13e54fbb57046234a69c60ce56f41a933915580f
-DIST ipmiutil-3.0.9.tar.gz 1697688 BLAKE2B 93ed8865cae1cea0ea4f7de4683f4698e3f75e9190cc7e0af1832ca44a08f52aa149393761f1ede3994827db78841061d54058bbe4178b5930accd3a4c225ba7 SHA512 c2c0a516216a46a52621159e665a77d96cf81f385fc9cf19877e72283be3e1a4dad5a4826454727b71576c22cc4de3c73ff428d26f35bf496c7dc1511305cda3
-DIST ipmiutil-3.1.6.tar.gz 1693461 BLAKE2B efc2b283d7655b8afb9d3d8da2e5458deea1c1b939f3ccdf2be0cdf3792ea60229099cce1b8e32f087972385feb01d604f1c63bddbfd031210d5acf8a6b1b9d7 SHA512 9bccfa2e0bba7f30e422d67f93ee6cff50c08cc8bceab5ba5bfd1b0a91e1af8a4a98a2eaa81364e8a1f38e0bd1ce6b99717d86957c6f689aa7329e7013f5b0ef
-DIST ipmiutil-3.1.7.tar.gz 1726396 BLAKE2B 7fa31f8aca61462fc08dd4fe420e27eecce2ee9fa5fb2676eb944e2ae6c09598aec5f06d59e4ed02faab077003b14085f944b6cf0b63f90b10f2660f363e997b SHA512 7522808e4a94c8627de0a95dde0e3eb463ba05948159b5181129b573ce8f9feba3543ef603c14e7cdcafcbd58ca5319536cc5534ea8191cce0ef9d33cc548274
 DIST ipmiutil-3.1.8.tar.gz 1841037 BLAKE2B 69139fc2b82a701657c5fec6aa928a0ee2d7874a8ebc26631eca438f298e8bddd3afb578462979eb24cd51bd816263f13e9f38fec8b5d6fa4fcefb2519a652c9 SHA512 77a01be420d8362ddce2b2b2bd44ee53a70812b29b3dd7bc5add6429f0e43a48905ca0401e1855f2cca5e69086605eb7b84e2f4bf9cf33251934acc0fe51346f
-EBUILD ipmiutil-3.0.6.ebuild 1304 BLAKE2B a1ce20853a9c2e29fe289bba096bbfb74beac4009630e9e7a36af13c69b98a0a48a0c86db4516fb179e5b8887576e832d1a81a921fde56c559906dbdfbfccea7 SHA512 a13dc0bd8546e321c84e942c9137d6e8f64e5df99c7a3aa41b090c116ad352aa631d51c7078e2c063004e20e10e86b3b26473ab209a81b9fca99776226812cbb
-EBUILD ipmiutil-3.0.9.ebuild 1401 BLAKE2B dd45a5580ccc8aad7f329985bf3fe6e3d68a95a54bf345cadfec84cf77fc6b65c073b8a31ececa88d7caa0dba94cf0bbeb882aee6cb13e56c496818a291d5074 SHA512 a8dec8237051be08002fa96517a8a322e213e08bd04f18249d2ee174d892cb4bd49d290d3f4f9b8e3ff5b73a1f3b05d4b1129699de8443b3834278e301a855f9
-EBUILD ipmiutil-3.1.6.ebuild 1575 BLAKE2B 16cb959c4a276eaaeefa96584c1915c3c182a9f03ea8c2269e1b6221f7bab84cb9433db59a3c293350ae9f473f48544008b52f569b9cc67170eebbdefee1d898 SHA512 6cca689fd814b1fb3f4939f1b8a34902c9ff4c41834053ded5cf7f051b134e0ce5c946b51da6b855ff8bcd828c9e7d55d1c79fd9eb32e50544db22037344c63c
-EBUILD ipmiutil-3.1.7.ebuild 1657 BLAKE2B d40ba9d2aa612b8ef9c9e52c8d4c702bda5800f8f6042afd6b7f08e862ffc51247a41cff79c43b3595adb887b5ffc809cdb78536b5eda0d030acab1e4efc6099 SHA512 d5fe935fd756afbfda7af92cb84349693bc9f75855b2030d4218ed6336375459e9a3e70cf6320915f05fa694b55d3c3fa1495b965089d03b68e9815ce632f15b
 EBUILD ipmiutil-3.1.8.ebuild 1959 BLAKE2B af7c0b6e8ba708259118543d4656da5315dec288915a514e971f8fafa1039b18e1663ccaa520411a68f79090b51a7f102762254a2787b66cb4c036ad3af27d7f SHA512 d0e29b3f3193b3fda36baeb9f5c48dceed26dccc49fcd5cfc377e61ca6890d5dadc07a4015e88027e5d727c36cb280c23f4851d5dcb390f998ee95001182f991
 MISC metadata.xml 395 BLAKE2B bbc505300e1bb4a974b8c5f19c43fe9cbfe4300c31a5174adad799cac0d2507e231845ab8f586ca427538b67ad45012aec660692f1a4a134af4e7615467b0ee0 SHA512 170e9a7718037935d373ad84c37f7c87764e30fdb1c2860fa3021021f91dd94adb2d3acb4adfc5cea8d64a7e612340a2286c5a4748f91ed32d603b9c306f3513
diff --git a/sys-apps/ipmiutil/files/ipmiutil-2.9.8-flags.patch b/sys-apps/ipmiutil/files/ipmiutil-2.9.8-flags.patch
deleted file mode 100644
index ee9917406207..000000000000
--- a/sys-apps/ipmiutil/files/ipmiutil-2.9.8-flags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ipmiutil-2.9.8/configure.ac
-+++ ipmiutil-2.9.8/configure.ac
-@@ -162,7 +162,7 @@
- 	LANPLUS_CRYPTO=""
- 	LANPLUS_SAM="no"
- 	LD_SAMX=""
--	CFLAGS="-O2"
-+	#CFLAGS="-O2"
-         SUBDIR_S="doc scripts util"
- 	if test "x$cross_compiling" = "xyes"; then
- 	   # cross-compiling, so link with -static (e.g. Android ARM)
-@@ -334,7 +334,7 @@
- 	fi
- 	rm -f $tmpc $tmpo >/dev/null 2>&1
- 	echo $ECHO_N "checking compile fortify flags ... $ECHO_C"
--	cfhard="-fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
-+	#cfhard="-fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
- 	echo "int main() { alloca(100); return(1); }" >$tmpc
- 	$CC -o $tmpo $cfhard $tmpc  >/dev/null 2>&1
- 	if test $? -ne 0 ; then
diff --git a/sys-apps/ipmiutil/files/ipmiutil-3.1.5-fix-configure.patch b/sys-apps/ipmiutil/files/ipmiutil-3.1.5-fix-configure.patch
deleted file mode 100644
index 8748256be5f6..000000000000
--- a/sys-apps/ipmiutil/files/ipmiutil-3.1.5-fix-configure.patch
+++ /dev/null
@@ -1,180 +0,0 @@
---- ipmiutil-3.1.5.orig/configure.ac	2019-11-25 06:53:08.000000000 -0800
-+++ ipmiutil-3.1.5/configure.ac	2020-01-25 22:55:20.577345441 -0800
-@@ -80,40 +80,46 @@
- #  fi]
- 
- drv_landesk=0
-+LANDESK_CFLAGS=""
-+LANDESK_LDADD=""
- dnl configure for LANDESK libipmiapi or not
- AC_ARG_ENABLE([landesk],
--    [  --enable-landesk       adds landesk library support [[default=no]]],
--    [if test "x$enableval" = "xyes"; then
--	    drv_landesk=1
--            LANDESK_CFLAGS="-DLINK_LANDESK"
--            LANDESK_LDADD="-lipmiapi -L../lib"
--            AC_SUBST(LANDESK_CFLAGS)
--            AC_SUBST(LANDESK_LDADD)
--    fi]
--    )
-+	AS_HELP_STRING([--enable-landesk], [enable landesk support (default=no)]),
-+	[],
-+	[enable_landesk=no])
-+
-+AS_IF([test "x$enable_landesk" = "xyes"], [
-+	drv_landesk=1
-+	LANDESK_CFLAGS="-DLINK_LANDESK"
-+	LANDESK_LDADD="-lipmiapi -L../lib"
-+	AC_SUBST(LANDESK_CFLAGS)
-+	AC_SUBST(LANDESK_LDADD)
-+    ])
- 
- dnl Configure ipmiutil for lanplus (libipmi_lanplus.a) or not (default yes)
- AC_ARG_ENABLE([lanplus],
--    [  --enable-lanplus      enable lanplus support (default=yes)],[default=yes],
--[if test "x$enableval" = "xno"; then
--	drv_lanplus=""
--	LANPLUS_CFLAGS=""
--	LANPLUS_LDADD=""
--        LANPLUS_LIB="" 
--	LANPLUS_CRYPTO=""
--	LANPLUS_SAM="no"
--	LD_SAMX=""
--else
-+	AS_HELP_STRING([--disable-lanplus], [enable lanplus support (default=yes)]),
-+	[],
-+	[enable_lanplus=yes])
-+
-+drv_lanplus=""
-+LANPLUS_CFLAGS=""
-+LANPLUS_LDADD=""
-+LANPLUS_LIB="" 
-+LANPLUS_CRYPTO=""
-+LANPLUS_SAM="no"
-+LD_SAMX=""
-+AS_IF([test "x$enable_lanplus" = "xyes"], [
- 	drv_lanplus="lanplus"
- 	LANPLUS_CFLAGS="-DHAVE_LANPLUS"
- 	# LANPLUS_CFLAGS="-DHAVE_LANPLUS -I${projdir}/lib/lanplus/inc"
- 	# LANPLUS_LDADD="-L../lib -lintf_lanplus -L/usr/local/lib -lcrypto"
- 	LANPLUS_LDADD="-L../lib -lipmi_lanplus -L/usr/local/lib -lcrypto"
--        LANPLUS_LIB="../lib/libipmi_lanplus.a" 
-+	LANPLUS_LIB="../lib/libipmi_lanplus.a" 
- 	LANPLUS_CRYPTO="-lcrypto"
- 	LANPLUS_SAM="yes"
- 	LD_SAMX="../lib/libipmi_lanplus.a -lcrypto"
--fi ])
-+])
- 
- dnl Configure libipmiutil.a for lanplus or not
- dnl Only SOL requires lanplus, so usually build libipmiutil.a without lanplus
-@@ -128,21 +134,28 @@
- #fi
- 
- # strings /lib/libssl.so* |grep EVP_sha256 
--dnl configure for SHA256, build lanplus with SHA256 support, uses later openssl.
-+dnl configure for SHA256, build lanplus with SHA256 support
-+dnl requires openssl-1.0.1 which was released in 2012/03
- AC_ARG_ENABLE([sha256],
--    [  --enable-sha256        build with SHA256 support, requires later openssl.],
--    [if test "x$enableval" = "xyes"; then
--	LANPLUS_CFLAGS="$LANPLUS_CFLAGS -DHAVE_SHA256"
--    fi]
--    )
-+    AS_HELP_STRING([--disable-sha256], [build with SHA256 support (default=yes)]),
-+	dnl action if passed
-+	[],
-+	dnl action if not passed
-+	[enable_sha256=yes]
-+	)
-+AS_IF([test "x$enable_sha256" = "xyes"], [
-+  LANPLUS_CFLAGS="$LANPLUS_CFLAGS -DHAVE_SHA256"
-+])
- 
- dnl configure for EKANALYZER, build with ekanalyzer function enabled
- AC_ARG_ENABLE([ekanalyzer],
--    [  --enable-ekanalyzer        build with ekanalyzer function enabled.],
--    [if test "x$enableval" = "xyes"; then
-+	AS_HELP_STRING([--enable-ekanalyzer], [build with ekanalyzer function enabled.]),
-+	[],
-+	[enable_ekanalyzer=no]
-+	)
-+AS_IF([test "x$enable_ekanalyzer" = "xyes"], [
- 	OS_CFLAGS="$OS_CFLAGS -DHAVE_EKANAL"
--    fi]
--    )
-+    ])
- 
- GPL_CFLAGS=""
- CROSS_LFLAGS=""
-@@ -152,17 +165,20 @@
- SYSTEMD_DIR=/usr/share/ipmiutil
- 
- AC_ARG_ENABLE([useflags],
--    [  --enable-useflags    include environment CFLAGS and LDFLAGS.],
--    [if test "x$enableval" = "xyes"; then
-+	AS_HELP_STRING([--enable-useflags], [include environment CFLAGS and LDFLAGS.]),
-+	[],
-+	[enable_useflags=no])
-+AS_IF([test "x$enable_useflags" = "xyes"], [
- 	   CROSS_CFLAGS="$CFLAGS"
- 	   CROSS_LFLAGS="$LDFLAGS"
--    fi]
--    )
-+])
- 
- dnl configure for standalone, with no lanplus or GPL libs 
- AC_ARG_ENABLE([standalone],
--    [  --enable-standalone    build standalone, with no GPL or LanPlus libs.],
--    [if test "x$enableval" = "xyes"; then
-+	AS_HELP_STRING([--enable-standalone], [build standalone, with no GPL or LanPlus libs.]),
-+	[],
-+	[enable_standalone=no])
-+AS_IF([test "x$enable_standalone" = "xyes"], [
-         GPL_CFLAGS=""
- 	LANPLUS_CFLAGS=""
- 	LANPLUS_LDADD=""
-@@ -176,27 +192,30 @@
- 	   # cross-compiling, so link with -static (e.g. Android ARM)
- 	   CROSS_LFLAGS="-static"
- 	   CROSS_CFLAGS="-DCROSS_COMPILE"
-+	   # TODO: how can this be effective? Configure only converts Makefile.in -> Makefile
-+	   # Configure does not convert Makefile.am->Makefile.in
- 	   sed -i -e 's/^# ipmiutil:	$(METASOURCE:.c=.o)/ipmiutil:\t$(METASOURCE:.c=.o)\n\t$(CC) $(CFLAGS) $(LDFLAGS) -o ipmiutil $(METASOURCE:.c=.o) $(LDADD)/'  util/Makefile.am
- 	fi
--    fi]
--    )
-+    ])
- 
- dnl build libipmiutil with sensor modules
- AC_ARG_ENABLE([libsensors],
--    [  --enable-libsensors	 build libipmiutil with sensor modules [[default=no]]],
--    [if test "x$enableval" = "xyes"; then
--        LIBSENSORS="isensor2.o ievents2.o"
--        SAM2OBJ=""
--    fi]
--    )
-+	AS_HELP_STRING([--enable-libsensors], [build libipmiutil with sensor modules (default=no)]),
-+	[],
-+	[enable_libsensors=no])
-+AS_IF([test "x$enable_libsensors" = "xyes"], [
-+	   LIBSENSORS="isensor2.o ievents2.o"
-+	   SAM2OBJ=""
-+    ])
- 
- dnl configure for GPL build or not (GPL files: md2.h, ipmi_ioctl.h)
- AC_ARG_ENABLE([gpl],
--    [  --enable-gpl           build with some GPL code [[default=no]]],
--    [if test "x$enableval" = "xyes"; then
--        GPL_CFLAGS="-DALLOW_GPL"
--    fi]
--    )
-+	AS_HELP_STRING([--enable-gpl], [build with some GPL code (default=no)]),
-+	[],
-+	[enable_gpl=no])
-+AS_IF([test "x$enable_gpl" = "xyes"], [
-+	   GPL_CFLAGS="-DALLOW_GPL"
-+	])
- 
- dnl Does this Linux have systemd enabled?  Otherwise use sysv init.
- AC_ARG_ENABLE([systemd],
diff --git a/sys-apps/ipmiutil/files/ipmiutil-3.1.7-fix-configure.patch b/sys-apps/ipmiutil/files/ipmiutil-3.1.7-fix-configure.patch
deleted file mode 100644
index 16435dacd6b7..000000000000
--- a/sys-apps/ipmiutil/files/ipmiutil-3.1.7-fix-configure.patch
+++ /dev/null
@@ -1,184 +0,0 @@
---- ipmiutil-3.1.7/configure.ac
-+++ ipmiutil-3.1.7/configure.ac
-@@ -80,40 +80,46 @@
- #  fi]
- 
- drv_landesk=0
-+LANDESK_CFLAGS=""
-+LANDESK_LDADD=""
- dnl configure for LANDESK libipmiapi or not
- AC_ARG_ENABLE([landesk],
--    [  --enable-landesk       adds landesk library support [[default=no]]],
--    [if test "x$enableval" = "xyes"; then
--	    drv_landesk=1
--            LANDESK_CFLAGS="-DLINK_LANDESK"
--            LANDESK_LDADD="-lipmiapi -L../lib"
--            AC_SUBST(LANDESK_CFLAGS)
--            AC_SUBST(LANDESK_LDADD)
--    fi]
--    )
-+	AS_HELP_STRING([--enable-landesk], [enable landesk support (default=no)]),
-+	[],
-+	[enable_landesk=no])
-+
-+AS_IF([test "x$enable_landesk" = "xyes"], [
-+	drv_landesk=1
-+	LANDESK_CFLAGS="-DLINK_LANDESK"
-+	LANDESK_LDADD="-lipmiapi -L../lib"
-+	AC_SUBST(LANDESK_CFLAGS)
-+	AC_SUBST(LANDESK_LDADD)
-+    ])
- 
- dnl Configure ipmiutil for lanplus (libipmi_lanplus.a) or not (default yes)
- AC_ARG_ENABLE([lanplus],
--    [  --enable-lanplus      enable lanplus support (default=yes)],[default=yes],
--[if test "x$enableval" = "xno"; then
--	drv_lanplus=""
--	LANPLUS_CFLAGS=""
--	LANPLUS_LDADD=""
--        LANPLUS_LIB="" 
--	LANPLUS_CRYPTO=""
--	LANPLUS_SAM="no"
--	LD_SAMX=""
--else
-+	AS_HELP_STRING([--disable-lanplus], [enable lanplus support (default=yes)]),
-+	[],
-+	[enable_lanplus=yes])
-+
-+drv_lanplus=""
-+LANPLUS_CFLAGS=""
-+LANPLUS_LDADD=""
-+LANPLUS_LIB="" 
-+LANPLUS_CRYPTO=""
-+LANPLUS_SAM="no"
-+LD_SAMX=""
-+AS_IF([test "x$enable_lanplus" = "xyes"], [
- 	drv_lanplus="lanplus"
- 	LANPLUS_CFLAGS="-DHAVE_LANPLUS"
- 	# LANPLUS_CFLAGS="-DHAVE_LANPLUS -I${projdir}/lib/lanplus/inc"
- 	# LANPLUS_LDADD="-L../lib -lintf_lanplus -L/usr/local/lib -lcrypto"
- 	LANPLUS_LDADD="-L../lib -lipmi_lanplus -L/usr/local/lib -lcrypto"
--        LANPLUS_LIB="../lib/libipmi_lanplus.a" 
-+	LANPLUS_LIB="../lib/libipmi_lanplus.a" 
- 	LANPLUS_CRYPTO="-lcrypto"
- 	LANPLUS_SAM="yes"
- 	LD_SAMX="../lib/libipmi_lanplus.a -lcrypto"
--fi ])
-+])
- 
- dnl Configure libipmiutil.a for lanplus or not
- dnl Only SOL requires lanplus, so usually build libipmiutil.a without lanplus
-@@ -128,21 +134,28 @@
- #fi
- 
- # strings /lib/libssl.so* |grep EVP_sha256 
--dnl configure for SHA256, build lanplus with SHA256 support, uses later openssl.
-+dnl configure for SHA256, build lanplus with SHA256 support
-+dnl requires openssl-1.0.1 which was released in 2012/03
- AC_ARG_ENABLE([sha256],
--    [  --enable-sha256        build with SHA256 support, requires later openssl.],
--    [if test "x$enableval" = "xyes"; then
--	LANPLUS_CFLAGS="$LANPLUS_CFLAGS -DHAVE_SHA256"
--    fi]
--    )
-+    AS_HELP_STRING([--disable-sha256], [build with SHA256 support (default=yes)]),
-+	dnl action if passed
-+	[],
-+	dnl action if not passed
-+	[enable_sha256=yes]
-+	)
-+AS_IF([test "x$enable_sha256" = "xyes"], [
-+  LANPLUS_CFLAGS="$LANPLUS_CFLAGS -DHAVE_SHA256"
-+])
- 
- dnl configure for EKANALYZER, build with ekanalyzer function enabled
- AC_ARG_ENABLE([ekanalyzer],
--    [  --enable-ekanalyzer        build with ekanalyzer function enabled.],
--    [if test "x$enableval" = "xyes"; then
-+	AS_HELP_STRING([--enable-ekanalyzer], [build with ekanalyzer function enabled.]),
-+	[],
-+	[enable_ekanalyzer=no]
-+	)
-+AS_IF([test "x$enable_ekanalyzer" = "xyes"], [
- 	OS_CFLAGS="$OS_CFLAGS -DHAVE_EKANAL"
--    fi]
--    )
-+    ])
- 
- GPL_CFLAGS=""
- CROSS_LFLAGS=""
-@@ -152,17 +165,20 @@
- SYSTEMD_DIR=/usr/share/ipmiutil
- 
- AC_ARG_ENABLE([useflags],
--    [  --enable-useflags    include environment CFLAGS and LDFLAGS.],
--    [if test "x$enableval" = "xyes"; then
-+	AS_HELP_STRING([--enable-useflags], [include environment CFLAGS and LDFLAGS.]),
-+	[],
-+	[enable_useflags=no])
-+AS_IF([test "x$enable_useflags" = "xyes"], [
- 	   CROSS_CFLAGS="$CFLAGS"
- 	   CROSS_LFLAGS="$LDFLAGS"
--    fi]
--    )
-+])
- 
- dnl configure for standalone, with no lanplus or GPL libs 
- AC_ARG_ENABLE([standalone],
--    [  --enable-standalone    build standalone, with no GPL or LanPlus libs.],
--    [if test "x$enableval" = "xyes"; then
-+	AS_HELP_STRING([--enable-standalone], [build standalone, with no GPL or LanPlus libs.]),
-+	[],
-+	[enable_standalone=no])
-+AS_IF([test "x$enable_standalone" = "xyes"], [
-         GPL_CFLAGS=""
- 	LANPLUS_CFLAGS=""
- 	LANPLUS_LDADD=""
-@@ -176,10 +192,11 @@
- 	   # cross-compiling, so link with -static (e.g. Android ARM)
- 	   CROSS_LFLAGS="-static"
- 	   CROSS_CFLAGS="-DCROSS_COMPILE"
-+	   # TODO: how can this be effective? Configure only converts Makefile.in -> Makefile
-+	   # Configure does not convert Makefile.am->Makefile.in
- 	   sed -i -e 's/^# ipmiutil:	$(METASOURCE:.c=.o)/ipmiutil:\t$(METASOURCE:.c=.o)\n\t$(CC) $(CFLAGS) $(LDFLAGS) -o ipmiutil $(METASOURCE:.c=.o) $(LDADD)/'  util/Makefile.am
- 	fi
--    fi]
--    )
-+    ])
- 
- AC_ARG_ENABLE([doc],
-     [  --enable-doc           build with documentation [[default=yes]]],
-@@ -192,20 +209,22 @@
- 
- dnl build libipmiutil with sensor modules
- AC_ARG_ENABLE([libsensors],
--    [  --enable-libsensors	 build libipmiutil with sensor modules [[default=no]]],
--    [if test "x$enableval" = "xyes"; then
--        LIBSENSORS="isensor2.o ievents2.o"
--        SAM2OBJ=""
--    fi]
--    )
-+    AS_HELP_STRING([--enable-libsensors], [build libipmiutil with sensor modules (default=no)]),
-+    [],
-+    [enable_libsensors=no])
-+AS_IF([test "x$enable_libsensors" = "xyes"], [
-+	LIBSENSORS="isensor2.o ievents2.o"
-+	SAM2OBJ=""
-+    ])
- 
- dnl configure for GPL build or not (GPL files: md2.h, ipmi_ioctl.h)
- AC_ARG_ENABLE([gpl],
--    [  --enable-gpl           build with some GPL code [[default=no]]],
--    [if test "x$enableval" = "xyes"; then
--        GPL_CFLAGS="-DALLOW_GPL"
--    fi]
--    )
-+    AS_HELP_STRING([--enable-gpl], [build with some GPL code (default=no)]),
-+    [],
-+    [enable_gpl=no])
-+AS_IF([test "x$enable_gpl" = "xyes"], [
-+	GPL_CFLAGS="-DALLOW_GPL"
-+    ])
- 
- dnl Does this Linux have systemd enabled?  Otherwise use sysv init.
- AC_ARG_ENABLE([systemd],
diff --git a/sys-apps/ipmiutil/ipmiutil-3.0.6.ebuild b/sys-apps/ipmiutil/ipmiutil-3.0.6.ebuild
deleted file mode 100644
index 7f746df64c56..000000000000
--- a/sys-apps/ipmiutil/ipmiutil-3.0.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools systemd
-
-DESCRIPTION="IPMI Management Utilities"
-HOMEPAGE="http://ipmiutil.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-
-RDEPEND=">=dev-libs/openssl-1:0="
-DEPEND="${RDEPEND}
-	virtual/os-headers"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.8-flags.patch
-	"${FILESDIR}"/${PN}-2.9.9-lib_symlink.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's|-O2 -g|$(CFLAGS)|g;s|-g -O2|$(CFLAGS)|g' util/Makefile.am* || die
-	sed -i -e 's|which rpm |which we_are_gentoo_rpm_is_a_guest |' configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-systemd --enable-sha256
-}
-
-src_compile() {
-	# Ulgy workaround. Upstream is misusing the make system here
-	# and it doesn't even work.
-	# Please check on each bump if this workaround is still required.
-	pushd lib/lanplus &>/dev/null || die
-	emake
-	cp libipmi_lanplus.a .. || die
-	popd &>/dev/null || die
-
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" sysdto="${D}/$(systemd_get_systemunitdir)" install
-	dodoc -r AUTHORS ChangeLog NEWS README TODO doc/UserGuide
-
-	# Init scripts are only for Fedora
-	rm -r "${ED%/}"/etc/init.d || die 'remove initscripts failed'
-}
diff --git a/sys-apps/ipmiutil/ipmiutil-3.0.9.ebuild b/sys-apps/ipmiutil/ipmiutil-3.0.9.ebuild
deleted file mode 100644
index 670520a6b9cd..000000000000
--- a/sys-apps/ipmiutil/ipmiutil-3.0.9.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools systemd
-
-DESCRIPTION="IPMI Management Utilities"
-HOMEPAGE="http://ipmiutil.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/openssl-1:0="
-DEPEND="${RDEPEND}
-	virtual/os-headers"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.8-flags.patch
-	"${FILESDIR}"/${PN}-2.9.9-lib_symlink.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's|-O2 -g|$(CFLAGS)|g;s|-g -O2|$(CFLAGS)|g' util/Makefile.am* || die
-	sed -i -e 's|which rpm |which we_are_gentoo_rpm_is_a_guest |' configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-systemd --enable-sha256
-}
-
-src_compile() {
-	# Ulgy workaround. Upstream is misusing the make system here
-	# and it doesn't even work.
-	# Please check on each bump if this workaround is still required.
-	pushd lib/lanplus &>/dev/null || die
-	emake
-	cp libipmi_lanplus.a .. || die
-	popd &>/dev/null || die
-
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" sysdto="${D}/$(systemd_get_systemunitdir)" install
-	dodoc -r AUTHORS ChangeLog NEWS README TODO doc/UserGuide
-
-	# Init scripts are only for Fedora
-	rm -r "${ED%/}"/etc/init.d || die 'remove initscripts failed'
-
-	if ! use static-libs ; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-}
diff --git a/sys-apps/ipmiutil/ipmiutil-3.1.6.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.6.ebuild
deleted file mode 100644
index 491bd22b5c9d..000000000000
--- a/sys-apps/ipmiutil/ipmiutil-3.1.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools systemd
-
-DESCRIPTION="IPMI Management Utilities"
-HOMEPAGE="http://ipmiutil.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/openssl-1:0="
-DEPEND="${RDEPEND}
-	virtual/os-headers"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.8-flags.patch
-	"${FILESDIR}"/${PN}-2.9.9-lib_symlink.patch
-	"${FILESDIR}"/${PN}-3.1.5-fix-configure.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's|-O2 -g|$(CFLAGS)|g;s|-g -O2|$(CFLAGS)|g' util/Makefile.am* || die
-	sed -i -e 's|which rpm |which we_are_gentoo_rpm_is_a_guest |' configure.ac || die
-
-	# Don't compress man pages
-	sed '/gzip -nf/d' -i doc/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-systemd --enable-sha256 --enable-lanplus
-}
-
-src_compile() {
-	# Ulgy workaround. Upstream is misusing the make system here
-	# and it doesn't even work.
-	# Please check on each bump if this workaround is still required.
-	pushd lib/lanplus &>/dev/null || die
-	emake
-	cp libipmi_lanplus.a .. || die
-	popd &>/dev/null || die
-
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" sysdto="${D}/$(systemd_get_systemunitdir)" install
-	dodoc -r AUTHORS ChangeLog NEWS README TODO doc/UserGuide
-
-	# Init scripts are only for Fedora
-	rm -r "${ED}"/etc/init.d || die 'remove initscripts failed'
-
-	if ! use static-libs ; then
-		find "${ED}" -type f -name '*.a' -delete || die
-	fi
-
-	keepdir /var/lib/ipmiutil
-}
diff --git a/sys-apps/ipmiutil/ipmiutil-3.1.7.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.7.ebuild
deleted file mode 100644
index 7403e510c6c4..000000000000
--- a/sys-apps/ipmiutil/ipmiutil-3.1.7.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools systemd
-
-DESCRIPTION="IPMI Management Utilities"
-HOMEPAGE="http://ipmiutil.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/openssl-1:0="
-DEPEND="${RDEPEND}
-	virtual/os-headers"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.7-flags.patch
-	"${FILESDIR}"/${PN}-2.9.9-lib_symlink.patch
-	"${FILESDIR}"/${PN}-3.1.7-fix-configure.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's|-O2 -g|$(CFLAGS)|g;s|-g -O2|$(CFLAGS)|g' util/Makefile.am* || die
-	sed -i -e 's|which rpm |which we_are_gentoo_rpm_is_a_guest |' configure.ac || die
-
-	# Don't compress man pages
-	sed '/gzip -nf/d' -i doc/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-systemd
-		--enable-sha256
-		--enable-lanplus
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Ulgy workaround. Upstream is misusing the make system here
-	# and it doesn't even work.
-	# Please check on each bump if this workaround is still required.
-	pushd lib/lanplus &>/dev/null || die
-	emake
-	cp libipmi_lanplus.a .. || die
-	popd &>/dev/null || die
-
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" sysdto="${D}/$(systemd_get_systemunitdir)" install
-	dodoc -r AUTHORS ChangeLog NEWS README TODO doc/UserGuide
-
-	# Init scripts are only for Fedora
-	rm -r "${ED}"/etc/init.d || die 'remove initscripts failed'
-
-	# --disable-static has no effect
-	if ! use static-libs ; then
-		find "${ED}" -type f -name '*.a' -delete || die
-	fi
-
-	keepdir /var/lib/ipmiutil
-}