gentoo resync : 13.11.2021

3 files changed, 3 insertions, 99 deletions

diff --git a/sys-apps/opal-utils/Manifest b/sys-apps/opal-utils/Manifest
index 0de4e36d7dd6..5367956f605e 100644
--- a/sys-apps/opal-utils/Manifest
+++ b/sys-apps/opal-utils/Manifest
@@ -1,8 +1,6 @@
 AUX flags.patch 1057 BLAKE2B 4b601dff49cfe1d82cc32b2fbb0c32922e9f049e010d1403b8986ed5d6e2d8d7c6550c1f08d184327518b71b461aa181b1b4230704dfaa993828c7a2be5d8ce5 SHA512 fd17023c238598472d8e590f2bdff75019c1c6cf76215fa54a15de7089e4f0c89259bdc99fa34147d3dbe2e1572989b6d0814ff99a859635975f627575bc1075
 AUX opal-prd.confd 99 BLAKE2B 105ccd9e2d6d7d51ffc1a82b3fa174ae61ea4e945f679f82460f84bbf2036f4f7f3da2f8d9c66807a275aa98778d824f8ba5d50d1e5349fd17adbee032816290 SHA512 387ec1d00afeaf7c44e4ee5c7e6a3959e1465b7a8a9a121bf470105c23df1f906f23cedbd1006bed250f50a3c3a77f9f40ea62bafa6d6397dda2152c9dedda06
 AUX opal-prd.initd 480 BLAKE2B 895440e30d5a136a717462f8890b3123ca4e31b75f1443f95020e98bf92b0a82f7c0536f828956ea5705c090bb598ab7d48f60653da0eab9bd904e234264ee9e SHA512 9a850a840697bcfeb272dffdabc80be321768fee91808562650d4162555212ce4c6639fd58832979fb710c2f2c78e7835dd99b435b22a64cae9810085d93f459
-DIST opal-utils-6.7.tar.gz 5320182 BLAKE2B e2fa86a7d5d96afda8f8266875687fb3c2e61ca2932ea5585921b2e5cffe30cb3554d85d078448cda032cbc0438d188ea40b5aad6e7f4c923e77fa4e42e6f364 SHA512 1626d64554c608cd823dc27b58f35206cf6d011afde124746e06fd5f1e8c714c199d9f2b60417415daf01cfbc46208d08d49eef29538a515b539a551b8c5e5c3
 DIST opal-utils-6.8.tar.gz 5321377 BLAKE2B 3be812618dcbd3d877576e1dec0b6a74ad9091b59760bd8f1f67ba9a8efbce79cba4130464dcb6f2b8e61dedca3a1a60103f36d04fcd234b5a4c577c6e07635b SHA512 a799112c14abdcdb37e1a4c63e48e12bb7a67b6c90476d4e60597f06fd6050a58ffd25859cf6bb12c393522e4b4771ce3aa25a1277bac35855d599e9eb357814
-EBUILD opal-utils-6.7.ebuild 2475 BLAKE2B de4715513ac5bf263634fd468ba762855ace15e63f678e6bc3b0a8faea353f12a76c1132fc85d29a33834fb1fbec4a2d6eada7299b3499fb82f6d7d4706f040d SHA512 9b22701b32998c75742714ecec9d6860463740ba4c0ff1252ac2b1b8c5b99f087304220302f2cc319c03d49ad459eb4ab3051547d852161e1e8df56b59f04aa1
-EBUILD opal-utils-6.8.ebuild 2480 BLAKE2B abbe19d2ff7cfb7701603efe72b2559931b469c1ef9d9348b7159390fe3e16b7bfc167ebf9783cdc5f027789bab10050bffd9dd0e57ca47c96401ec46cf01829 SHA512 3095b4aab7ee76985ec922517a2c1a6e36212997ef668668f992d4cf9f619a960ce0892446bdaf4e927a44c486a059b9b46134c0a86052e8b37445d0aec7ee31
+EBUILD opal-utils-6.8.ebuild 2479 BLAKE2B 4ffa2f22532e19ed4669651cc945653208042341b025dffdc3618b36a6246a38b410a4bd9d556426e1314f0d1cfedd3b68239add8929cb2bd674112df9dd8e30 SHA512 5ff7b665abe48acd0515ff41152e956c60a76fca0d5e76196f167a2afe890c1eb996412f4af22155bef933f56866d535cbb61b1d6b355ec0b166ebbfae6c4471
 MISC metadata.xml 1100 BLAKE2B 1e8e44dd35f5ced685c12c0ac30fb2b9c466103b75df166e53344c60c4c58d70be0bd42f4fcc59c37199ea770f40cedc4577c099dc6cd2f03b66606758f40247 SHA512 0e1b9cd39bdfa603a8e11a550d59877fe88d095332b500e470ac40fd3f3cfc84952a97b376cbff8037cd729ba8a2164a6aef390cb0cd13798909a2e1bda14ecd
diff --git a/sys-apps/opal-utils/opal-utils-6.7.ebuild b/sys-apps/opal-utils/opal-utils-6.7.ebuild
deleted file mode 100644
index fdaa7271922d..000000000000
--- a/sys-apps/opal-utils/opal-utils-6.7.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit linux-info python-any-r1 systemd toolchain-funcs
-
-DESCRIPTION="OPAL firmware utilities"
-HOMEPAGE="https://github.com/open-power/skiboot"
-SRC_URI="https://github.com/open-power/skiboot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2+"
-SLOT="0"
-KEYWORDS="ppc64"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="doc? (
-	$(python_gen_any_dep '
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-	')
-)"
-
-CONFIG_CHECK="~MTD_POWERNV_FLASH ~OPAL_PRD ~PPC_DT_CPU_FTRS ~SCOM_DEBUGFS"
-ERROR_MTD_POWERND_FLASH="CONFIG_MTD_POWERND_FLASH is required to use pflash and opal-gard"
-ERROR_OPAL_PRD="CONFIG_OPAL_PRD is required to run opal-prd daemon"
-ERROR_SCOM_DEBUGFS="CONFIG_SCOM_DEBUGFS is required to use xscom-utils"
-
-S="${WORKDIR}/skiboot-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/flags.patch"
-)
-
-python_check_deps() {
-	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	use doc && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	tc-export CC LD
-	export OPAL_PRD_VERSION="${PV}"
-	export GARD_VERSION="${PV}"
-	export PFLASH_VERSION="${PV}"
-	export XSCOM_VERSION="${PV}"
-	export FFSPART_VERSION="${PV}"
-}
-
-src_compile() {
-	emake V=1 -C external/opal-prd
-	emake V=1 -C external/gard
-	emake V=1 -C external/pflash
-	emake V=1 -C external/xscom-utils
-	emake V=1 -C external/ffspart
-
-	use doc && emake V=1 -C doc html
-}
-
-src_install() {
-	emake -C external/opal-prd DESTDIR="${D}" prefix="${EPREFIX}/usr" install
-	emake -C external/gard DESTDIR="${D}" prefix="${EPREFIX}/usr" install
-	emake -C external/pflash DESTDIR="${D}" prefix="${EPREFIX}/usr" install
-	emake -C external/xscom-utils DESTDIR="${D}" prefix="${EPREFIX}/usr" install
-	dosbin external/ffspart/ffspart
-
-	newinitd "${FILESDIR}"/opal-prd.initd opal-prd
-	newconfd "${FILESDIR}"/opal-prd.confd opal-prd
-
-	systemd_dounit external/opal-prd/opal-prd.service
-
-	if use doc; then
-		rm -r doc/_build/html/_sources || die
-		local HTML_DOCS=( doc/_build/html/. )
-	fi
-	einstalldocs
-}
-
-src_test() {
-	emake V=1 -C external/opal-prd test
-	emake V=1 -C external/gard check
-	# this test is fragile and fails because of filename path
-	rm external/pflash/test/tests/01-info || die
-	emake V=1 -C external/pflash check
-	emake V=1 -C external/ffspart check
-}
diff --git a/sys-apps/opal-utils/opal-utils-6.8.ebuild b/sys-apps/opal-utils/opal-utils-6.8.ebuild
index ccb349721b3d..458c60157ef3 100644
--- a/sys-apps/opal-utils/opal-utils-6.8.ebuild
+++ b/sys-apps/opal-utils/opal-utils-6.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit linux-info python-single-r1 systemd toolchain-funcs
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/open-power/skiboot/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0 GPL-2+"
 SLOT="0"
-KEYWORDS="~ppc64"
+KEYWORDS="ppc64"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"