3 files changed, 19 insertions, 112 deletions
diff --git a/sys-libs/freeipmi/Manifest b/sys-libs/freeipmi/Manifest
index 8ece7c06b3c6..27338195037e 100644
--- a/sys-libs/freeipmi/Manifest
+++ b/sys-libs/freeipmi/Manifest
@@ -8,8 +8,7 @@ AUX freeipmi.icinga 117 BLAKE2B 12409a509d0b06d54196961f703fbe91034e1f68cfc19e5c
 AUX ipmidetectd.confd 185 BLAKE2B ea7164e6b126cc684482557cafae3ac0c39611484243e95a3e8946488cc234f4d3100f931549f08c917d454768845e276d83fa3f9e2d7a57c4454a55090bfa38 SHA512 f10e908a451c646b2c61338d79e69663c05216a54093745bd2b659041e0b91adb9be4077c92d63f6f3d62cb5510168b6a57e5e86375533e235fd3abb2b72a49c
 AUX ipmiseld.confd 192 BLAKE2B 52b125e63ca3e13fcb24f5b304f73c78269fc58b2c3e40cb185b28697c409ccf5ecd4b95599c38119bfe8c97977c3cc87e3633989e2b9d4095cded4b2b248dc4 SHA512 0a031f29a4692085054d5fc2dfe6d0ad7fb762f7ee96849ce2d562a90d6e3b0f3ae8328ab852dc22bee6221bc5cd8b588bd02075222038fa0f0e2f64ac185799
 DIST freeipmi-1.6.10.tar.gz 3431062 BLAKE2B e217570d8fcf78ca9d04aad4d5bd46b4120beb21f2dcfb083bc9779a4541856e08ec6e87549651ee3c9b62fe54521585e192c784254dd9482bf9da09935853ae SHA512 90b6b78cdd119c2a1f332f007333aa6df70c6e3de0fd81ab007025392ee7cb7a01ab4a7a174d1f2e760c55d78f21ebbbe9667af661ccdd669e4b54edb1346937
-DIST freeipmi-1.6.9.tar.gz 3429566 BLAKE2B 68ee7bd27d459a25464e17d9c98370252d33961d10e69675505f046db26a95d780c114b4f90eeab43a39d0fca3d98b1f108c6d3ca9550fd9d3c455d2e9a79c6b SHA512 536add8dc01aa4d9df45e3499f8be1318185b19beb579c8f991a11ca973626d7e0aabe1d8760a9addadc418ea5c1e2b5432053e46ba94fd9078fb6dcabf48280
+DIST freeipmi-1.6.11.tar.gz 3429533 BLAKE2B abc803341db4e48fe1a81da1d9cce2e7a808e51f41fb5b18019fa25bec41b443275f737553fe8b7bfd1dd9ad06d08b2097ca9f8e78a431e20d1a0e89d0e8cda6 SHA512 db37bb1ec559f88764ac08491b616d24e49c9a8ba070717e940fea4886d877819064cb00221aac703d0d149dc38e562924e192e992222e18b0e8b548248487a4
 EBUILD freeipmi-1.6.10-r1.ebuild 2988 BLAKE2B 93ef70d463f5953d4767d77dc0b5c86608e35467b88d82dc117f9d8c3fc2125e7a50b09af894d9dd05be191e5098f9aad0d55cafda4d674404360b61e1da01c0 SHA512 4ba941a27940b9c595dcc0e254afe4506987626def549610c188b806c2cbdce63820e0c47129c2f1e25862abd3ae6e9e33816560c54347697cbf12cd669bd872
-EBUILD freeipmi-1.6.10.ebuild 2600 BLAKE2B ff5893435ab4ea77d407d608194cee08ae23d3eb478b9f43cdff67a342c9cf79b3fc37a5a6b8e059606e5a39409f83a2e997d9c9e6d360484022839f224afa19 SHA512 f7d4686b8ab6b8a770c2d90e315dfa52b67a9d0acdf9e73e95abee33f5e8f615dbfeb1778b47c512c08cb65a6750a993c1947bbafbdd8457b845f41d10cc23e2
-EBUILD freeipmi-1.6.9.ebuild 2455 BLAKE2B 925c3025b4b87099a9a1c0c3c66504e18adbdddddd828b9c96171f59169c074e6f748961fa961a59aab3285da14a7f6883ee71bc022747ab97e328274602f4d3 SHA512 6086561f0620730d2c09ab4bfe8867bd2dc552891d69abef519da2d5ac8fdb8bea505adbfa85e3f3a369ac3d21b2fb7ea4a0419bcfb9194f6401860bc08602ab
+EBUILD freeipmi-1.6.11.ebuild 2574 BLAKE2B 2c2efc5ce5c78229294a490460d083b7c20b23fdf565db9c7c17eea2e5f870e83605c0d5c466a0771a3b0e19a6686f0c774dfa716d9d277364a9e368852f56c4 SHA512 1406dc513f8bd314b220cd39a6024f0af06892bae00db3f6d4561368e60af191c3a93085c5856f14030d32378a907c79b00857f869f343441547ac2032fd1e3b
 MISC metadata.xml 569 BLAKE2B 80068547ab42d075842e19f6ca65c9aa4b7c25aeddffc01a179e02fd6364804eefe3b7aa26434756de638f22a19da815d8b930a7d5bc81048e228ee72c81cd3a SHA512 f910ad6c63c49a2f2ddadc82c202cc9cf414eda5babdbe675048c6a5c2df4f093663ff8cf99da69563d4c67fa8bc0c18bfb9a8b8a752f8ce63bd1de8feed52e1
diff --git a/sys-libs/freeipmi/freeipmi-1.6.10.ebuild b/sys-libs/freeipmi/freeipmi-1.6.11.ebuild
index 2b1cc92c5ba9..0494945c26a4 100644
--- a/sys-libs/freeipmi/freeipmi-1.6.10.ebuild
+++ b/sys-libs/freeipmi/freeipmi-1.6.11.ebuild
@@ -1,39 +1,43 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit toolchain-funcs
 
-AT_M4DIR="config"
-
+MY_P="${P/_/.}"
 DESCRIPTION="Provides Remote-Console and System Management Software as per IPMI v1.5/2.0"
 HOMEPAGE="https://www.gnu.org/software/freeipmi/"
-
-MY_P="${P/_/.}"
-[[ ${MY_P} == *.beta* ]] && ALPHA="-alpha"
-SRC_URI="mirror://gnu${ALPHA}/${PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
-IUSE="debug nagios without-root"
+IUSE="debug doc nagios without-root"
 
-RDEPEND="dev-libs/libgcrypt:0="
-DEPEND="${RDEPEND}
-	virtual/os-headers"
-RDEPEND="${RDEPEND}
+RDEPEND="dev-libs/libgcrypt:="
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+"
+RDEPEND="
+	${RDEPEND}
 	nagios? (
 		|| ( net-analyzer/icinga net-analyzer/nagios )
 		dev-lang/perl
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.10-header-fixes.patch
+)
+
 src_configure() {
 	local myeconfargs=(
 		$(use_enable debug)
-		$(usex without-root --with-dont-check-for-root "")
+		$(use_enable doc)
+		$(usev without-root --with-dont-check-for-root)
 		--disable-static
 		--disable-init-scripts
 		--localstatedir="${EPREFIX}"/var
@@ -43,9 +47,6 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
-# There are no tests
-src_test() { :; }
-
 src_install() {
 	default
 
diff --git a/sys-libs/freeipmi/freeipmi-1.6.9.ebuild b/sys-libs/freeipmi/freeipmi-1.6.9.ebuild
deleted file mode 100644
index b84a6b5775e5..000000000000
--- a/sys-libs/freeipmi/freeipmi-1.6.9.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-AT_M4DIR="config"
-
-DESCRIPTION="Provides Remote-Console and System Management Software as per IPMI v1.5/2.0"
-HOMEPAGE="https://www.gnu.org/software/freeipmi/"
-
-MY_P="${P/_/.}"
-S="${WORKDIR}/${MY_P}"
-[[ ${MY_P} == *.beta* ]] && ALPHA="-alpha"
-SRC_URI="mirror://gnu${ALPHA}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ppc64 x86"
-IUSE="debug nagios"
-
-RDEPEND="dev-libs/libgcrypt:0="
-DEPEND="${RDEPEND}
-	virtual/os-headers"
-RDEPEND="${RDEPEND}
-	nagios? (
-		|| ( net-analyzer/icinga net-analyzer/nagios )
-		dev-lang/perl
-	)
-"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		--disable-static
-		--disable-init-scripts
-		--localstatedir="${EPREFIX}"/var
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-# There are no tests
-src_test() { :; }
-
-src_install() {
-	default
-
-	# freeipmi by defaults install _all_ commands to /usr/sbin, but
-	# quite a few can be run remotely as standard user, so move them
-	# in /usr/bin afterwards.
-	dodir /usr/bin
-	local prog
-	for prog in ipmi{detect,ping,power,console}; do
-		mv "${ED}"/usr/{s,}bin/${prog} || die
-
-		# The default install symlinks these commands to add a dash
-		# after the ipmi prefix; we repeat those after move for
-		# consistency.
-		rm "${ED}"/usr/sbin/${prog/ipmi/ipmi-}
-		dosym ${prog} /usr/bin/${prog/ipmi/ipmi-}
-	done
-
-	# Install the nagios plugin in its proper place, if desired
-	if use nagios; then
-		dodir /usr/$(get_libdir)/nagios/plugins
-		mv "${ED}"/usr/share/doc/${PF}/contrib/nagios/nagios_ipmi_sensors.pl \
-			"${ED}"/usr/$(get_libdir)/nagios/plugins/ || die
-		fperms 0755 /usr/$(get_libdir)/nagios/plugins/nagios_ipmi_sensors.pl
-
-		insinto /etc/icinga/conf.d
-		newins "${FILESDIR}"/freeipmi.icinga freeipmi-command.cfg
-	fi
-
-	dodoc AUTHORS ChangeLog* DISCLAIMER* NEWS README* TODO doc/*.txt
-
-	keepdir \
-		/var/cache/ipmiseld \
-		/var/cache/ipmimonitoringsdrcache \
-		/var/lib/freeipmi \
-		/var/log/ipmiconsole
-
-	# starting from version 1.2.0 the two daemons are similar enough
-	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 ipmidetectd
-	newconfd "${FILESDIR}"/ipmidetectd.confd ipmidetectd
-
-	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 bmc-watchdog
-	newconfd "${FILESDIR}"/bmc-watchdog.confd bmc-watchdog
-
-	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 ipmiseld
-	newconfd "${FILESDIR}"/ipmiseld.confd ipmiseld
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}