gentoo new year resync : 01.01.2021

4 files changed, 2 insertions, 192 deletions

diff --git a/sys-apps/ipmitool/Manifest b/sys-apps/ipmitool/Manifest
index 2ec3ca104e1d..49bc0041bf9e 100644
--- a/sys-apps/ipmitool/Manifest
+++ b/sys-apps/ipmitool/Manifest
@@ -8,14 +8,9 @@ AUX ipmitool-1.8.9-ipmievd.confd 518 BLAKE2B 98d9a8e5de576242e81aa7dbfcfde7063b2
 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.tar.gz 995313 BLAKE2B 4aee2b1488a8a97348954dd1555baf3d576d70f22fd17f11ba6147595b07ef52059ac8ab6775afa0ad956355eefbf3e2b0300cf87bb373d2f82b585de807412d SHA512 274d424fff079f7628c0f9fe06580937cb9717c809a71b2f5ef97266c6b6c89983b662fbb1f090e2f94861f1799677c8fc6536013828a8a5e6cb239af53e45ab
 DIST ipmitool-1.8.18_p20201004.tar.gz 638493 BLAKE2B 52f4ec8c82336b88640d1b91fc17af8f2fe0948a5c48c16067867dcad0852168d48bb21fdd99bde7ed957b66df888fd369c909079d1f81c861acd8c7f8dfa6f2 SHA512 8d72eef3584f4d2c86bfe43f70b5d687f3b7bbdf75b8979f7132c5c98b01baae22c336e540c197652187749fc9bb221a92e546b56e5cf2eb5650fad5094e9433
-DIST ipmitool_1.8.18-1.debian.tar.xz 19140 BLAKE2B 255c4da005946f3b118a127f96fc5daad02a170ea079d7a765a0c7650e1eb7e50ad49b31fca95312b49e5a524e04a8a21215cafb1a8451e5b2af2aaec22cda75 SHA512 8aede337d07987decfd032898f194d32730eced443630ac3956676533d693fb2d17a175ef14218cbcd55da44f6b17714f676a912a1d5124a15a995e01d2828ef
 DIST ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz 3208 BLAKE2B b37a127eff361039b3b810e19dd97f0c395462b658803f56f10f2dd1abbbe92743dc409ce6b83560db15621b7fa7a3c0f989100077893993df18108a082e49d2 SHA512 0f7646a2307ac98425e99dece9d3e3b23026136a97524151efdecc910fb537af41a91702782989046e44163da98610fa05792878473e228b45c16351f6015a45
-DIST ipmitool_1.8.18-9.debian.tar.xz 18508 BLAKE2B 09e37fd2f6fad8f847bae87aa51f44293e5640b4c8ebc05e52ebd751542d7865024835fe728c14e3a44f48d54fedff9e7693653bd2288db27d21a5bae16268b6 SHA512 af2b4aa855125e1beb62ffd2931b5d4c0aa8cc4edbde27ea1b4be172e6a4351f574c32b2437b354d11b7f1c739161d850c47839d7a7d9f522b52e24f47a9ea8d
-EBUILD ipmitool-1.8.18-r1.ebuild 2624 BLAKE2B 9baa3c566fe553602f3c5e53e165d1fa6a0adc93943cbb61a292e8ca5d6993b9f4f343105faebd126b8bc2808af0c9ac76b6ed992798908b68374f7b9fc767f4 SHA512 2b6f7dc4f51ba3a523a929481f4e6e72cc444687385a7588bcd59e22f39ba63ef79b9a33e39e96d8b89f129bc91a40a55673f9346e6cbeb0724da3c7eb6ea63c
-EBUILD ipmitool-1.8.18-r2.ebuild 2804 BLAKE2B 4101357ee54285291f2b0bfaf30317bf1703c13a81ef47a1f5b6c6d3bf3f843ca096018b8e54f50fb10ac0fd20df2e12ad8dc86e3fd5176579e4f59b097dbf16 SHA512 b11087e861933f61addc4291083483b9fc234df92b1741d427798b88fb851d172f1746ce49ede3b140cf1718debb74dd6f9f4cd5cfa8d6d62b370c972e4b6ee0
-EBUILD ipmitool-1.8.18_p20201004-r1.ebuild 4494 BLAKE2B 7710f593d7c8056c69ef695d3d3714b00666a777b4379333877ee8ed82cd7c588048dd8b29155d414ca8e533c67719761014fbb72ae81b68a0b041353694a157 SHA512 20c271cbeca471a720976d3d54087383c4cd817a0a748e657449c8e2f2c1077ed122990d2a778865af60d663d61b398443f370ae9ee33b108c62f844697d724b
+EBUILD ipmitool-1.8.18_p20201004-r1.ebuild 4495 BLAKE2B fdf837eab3a1076a83e47b8df62bae3df3e89ac7721bd9acdd18220b51cb1de8da85206dd7072046b4d54ce25b827920ffe50ecf920a965fd29d8a5e8ab0f67e SHA512 17d83c2b8bbfb8970fdb3033a1d721dedf89cf276615f20d2c4ed188d7ebbc2c5d979c73ed996de399b4d837d01861948a48ec0f549ac29033be7709fb3a7d6d
 EBUILD ipmitool-1.8.18_p20201004-r2.ebuild 6220 BLAKE2B 9608fa55683cdbcb0b0afabdc0044256be88ac8492a04b845ecfd1e2da0a8267c031cafba11b12d7815dc2611e41c14da2456f3be7e0348c498e70c7a689c875 SHA512 4858ff4eef24c6bdee3b24dbb1944cd6208fd3f08d495a97be5497a1d51107a7b3ad18d4fcd9953f642cc240d4a4d139d77be2be3056b32ee41bd59207aa54b8
 EBUILD ipmitool-1.8.18_p20201004-r3.ebuild 6312 BLAKE2B cfa1b6d13f738a9f2b2227e816f784ec89667db41cd134779a227158df77fa4ca5355dbcab2c3c42504af551e9ac899d63fb2b1c03602011988921d96ab505f7 SHA512 ec03196f6f4745aa7d37d3939e7877462dae6ef20bcef3639f1008c36b416f0a085b5b70c34c86aada78090819b79e44ff169f25abd2a600df6f42ee97daaf0c
 MISC metadata.xml 633 BLAKE2B e7fd815396d39f0d1c4aac50925382df6c245fbf3499f67b8d3a7448821aed48894725e468d6c2b724ad7a706ee12b4126f0b6f7c4c32388de6e34e05333b782 SHA512 53ffd0f2970d1d128e9d12247b5ed502bac4b9550029d57b221f2c2fd84d316831bbb8ddb890a1344b171612f890170847a3de02d52857d75c75f1a593cdebb8
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild
deleted file mode 100644
index 314005e456a4..000000000000
--- a/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-DESCRIPTION="Utility for controlling IPMI enabled devices."
-HOMEPAGE="http://ipmitool.sf.net/"
-DEBIAN_PR="1.debian"
-DEBIAN_P="${P/-/_}"
-DEBIAN_PF="${DEBIAN_P}-${DEBIAN_PR}"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	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="libressl openipmi static"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 hppa ~ia64 ppc ~ppc64 x86"
-LICENSE="BSD"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl: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
-	"${FILESDIR}/ipmitool-1.8.18-fno-common.patch"
-)
-
-src_prepare() {
-	default
-	[ -d "${S}"/debian ] && mv "${S}"/debian{,.package}
-	ln -s "${WORKDIR}"/debian "${S}"
-	for p in $(grep -v "^#" debian/patches/series) ; do
-		eapply debian/patches/$p
-	done
-
-	eautoreconf
-}
-
-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
-	econf \
-		$(use_enable static) \
-		--enable-ipmishell \
-		--enable-intf-lan \
-		--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-r2.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18-r2.ebuild
deleted file mode 100644
index eb3cdab7d446..000000000000
--- a/sys-apps/ipmitool/ipmitool-1.8.18-r2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-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=
-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
-SRC_URI+="
-	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="libressl openipmi static"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-LICENSE="BSD"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl: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
-)
-
-src_prepare() {
-	default
-	[ -d "${S}"/debian ] && mv "${S}"/debian{,.package}
-	ln -s "${WORKDIR}"/debian "${S}"
-	for p in $(grep -v "^#" debian/patches/series) ; do
-		eapply debian/patches/$p
-	done
-
-	eautoreconf
-}
-
-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
-	econf \
-		$(use_enable static) \
-		--enable-ipmishell \
-		--enable-intf-lan \
-		--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-r1.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild
index aa2af512c5fa..2bf4240201b7 100644
--- a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild
+++ b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild
@@ -28,7 +28,7 @@ SRC_URI+="
 #IUSE="freeipmi openipmi status"
 IUSE="libressl openbmc openipmi static"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 hppa ~ia64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ppc ~ppc64 x86"
 LICENSE="BSD"
 
 RDEPEND="