gentoo resync : 16.09.2020

4 files changed, 6 insertions, 104 deletions

diff --git a/sys-apps/opal-utils/Manifest b/sys-apps/opal-utils/Manifest
index 647637d49278..b2204e2f8f9f 100644
--- a/sys-apps/opal-utils/Manifest
+++ b/sys-apps/opal-utils/Manifest
@@ -1,11 +1,9 @@
 AUX opal-prd.confd 99 BLAKE2B 105ccd9e2d6d7d51ffc1a82b3fa174ae61ea4e945f679f82460f84bbf2036f4f7f3da2f8d9c66807a275aa98778d824f8ba5d50d1e5349fd17adbee032816290 SHA512 387ec1d00afeaf7c44e4ee5c7e6a3959e1465b7a8a9a121bf470105c23df1f906f23cedbd1006bed250f50a3c3a77f9f40ea62bafa6d6397dda2152c9dedda06
 AUX opal-prd.initd 480 BLAKE2B 895440e30d5a136a717462f8890b3123ca4e31b75f1443f95020e98bf92b0a82f7c0536f828956ea5705c090bb598ab7d48f60653da0eab9bd904e234264ee9e SHA512 9a850a840697bcfeb272dffdabc80be321768fee91808562650d4162555212ce4c6639fd58832979fb710c2f2c78e7835dd99b435b22a64cae9810085d93f459
 DIST opal-utils-6.5.2.tar.gz 2082426 BLAKE2B 20256f13f95da73bcccae670627c9786229e756183fad33ff45ecf2d91f1039c73a0f881b3ac794abad35d51b7bef0b780bd0f8260818c84a262ce7bb0c45b2e SHA512 765e568ad60f5cd7df8868eb3faea841d37c75cb14f33ab30f9419550ea146aeec0d02d622752af1e09a36e744f93be3a56fe6cbc8ac91a94effba9754a24091
-DIST opal-utils-6.6.1.tar.gz 2121660 BLAKE2B 29ee388e75d86cba346d48834840bde22e6c38404b1dc3544fe7a2c64d584fed95aff8755bcadfba7f3753a764a120d31daa2d8f32e4a4298b65babc44a08193 SHA512 b460de30aa76b1c2bc66b636b995e32abc8554b3a7d8ac5b71401d7f07d999d5b4ca4328a6bbaa9c7c82c237b0e6be5557c9d13f4bbba5c7f625888aaf9cb65e
 DIST opal-utils-6.6.2.tar.gz 2121790 BLAKE2B 3f1ec80baa112ba0d01fcb9a64b45592da03addd067484ef237204fd712359c04796353f47a32ac943e0e135a580c3c5ad7a5843ee4d5259cde3cbaf1bbefcc4 SHA512 a864e4120ffac4065b89d5da7c959ac20643be42e83f4186a778355f3ea0b36cbd1e02c91b1460b6fa6550fceec9034cce096b89f840b4051d65c7f0ab70dc27
-DIST opal-utils-6.6.tar.gz 2119590 BLAKE2B 3c2b0b77fdaa22f075afe1d7205865b76e45e865c8799372ab61dbd272015ecb1343a32c185d6bd5fb323723a2c5aded1fead2ae0fb34ae6e97e17f5e15af6a6 SHA512 23ae61266253a5382f4d873492e89523cc26a32dfb43438e5becece88f5af4f0bc4ec756208603653f430b3382c42980a8c92dc0c1ba3e2b13831ade1eb14a27
+DIST opal-utils-6.6.3.tar.gz 2121842 BLAKE2B 06ecd73dea54cd8455da32fdd88163c283554e49b380c371705fdba4fef169a1e3022ed4845f33594c0188e11e60f49af1ee0d5062a2e483f0b874e62a567245 SHA512 94af7a389e05627b26a3f79ebdeb55a6bf9e99f530667724c3112df25bc113c9520944a1d8e3847fe7210efa9eed0b8facab95f1f16757ff92038aa7812ce79e
 EBUILD opal-utils-6.5.2.ebuild 2164 BLAKE2B e92b21eeaff806652eda903b2d27c0cdfffcb4a0dfb5ea78d24d4ea92ca1dd0cacd82b8eb2dc864c3e8a6911e60a9ba1a85cf448a83bacee44c6a1fd4b20debc SHA512 2c3bc02aa6fc4b37cf1e27316dec41c8ebf7ae452e6c2a0e6b5450f03e3862d4e8b317ae2d675f5a38fa1d7df4ef3bf59930609c9e09110fab0b30ccc3e4f5d7
-EBUILD opal-utils-6.6.1.ebuild 2610 BLAKE2B 6662187f678423fffcfa419ee5841ba8e9c77ac4c7e59660e1f3b025c0abaf7a8d95b66b7ad5951866cf9df0b29da8564c5a38c7805c1ccf8f16c508524a592a SHA512 d249a5cad199badb58f705c83d12d28e3834f7622d3cdf650637efdbc6a03bf4278fc0e9c10043e4c5f8b6aef5bddb2fcd61eccdaa58c093411b9800523c33df
-EBUILD opal-utils-6.6.2.ebuild 2609 BLAKE2B 7cf2daad9b0665af219f5dbb965f54f9a87b2a1a7cc5a3c0a38bf9ea4376e945f0a2e6fcc56e55c960e66f2be428b0988dc2b9443bad692ff852036cd2e66201 SHA512 36e0b7ad0a114781c972f3826b838b155a7789060f265441d0029337c533e24ed68e06c0f9151766923d2f09f9a25243d5ac70172c1b0266d3dd9a311cb88455
-EBUILD opal-utils-6.6.ebuild 2610 BLAKE2B 6662187f678423fffcfa419ee5841ba8e9c77ac4c7e59660e1f3b025c0abaf7a8d95b66b7ad5951866cf9df0b29da8564c5a38c7805c1ccf8f16c508524a592a SHA512 d249a5cad199badb58f705c83d12d28e3834f7622d3cdf650637efdbc6a03bf4278fc0e9c10043e4c5f8b6aef5bddb2fcd61eccdaa58c093411b9800523c33df
+EBUILD opal-utils-6.6.2.ebuild 2607 BLAKE2B b33bc1f76c5401bcb2dfc8cc33daaeea923e54396a8a1cc0ae2b067a7e845b25d16390fc809ff65390d9f46d6f9fd6395adab6aa2c85767beab51d6eff4719ca SHA512 546ac0837649ff8e1e2498adb28ec393cebbf9038ef4bb7280cf74459379db6daf296d22c6d64ff55a8f589b910e280a4e821d487b8c52047e25528008a0e4c7
+EBUILD opal-utils-6.6.3.ebuild 2608 BLAKE2B 518cf78319f1f14f54d74251123c2350887078c1b38b7fad72fb946948c222f3c44b75327df8322f47703c3dd87a45f9ee7b6b1419ae7ea2c982b2fefdd78eed SHA512 0b6ec21cc3596910251160e33f2dedb7e6e5a9c8224c13fd09258279fa174707fc8d40b247d37804c89ccd6befd75637029a947eb0d75ea8a78b19c3586330eb
 MISC metadata.xml 1099 BLAKE2B 8715aef2781f806a58a094125d7c3ca6189a27a4d4c52ff6286905975a6b688921e09519f9968bb243c216611bab2da6507775c86e5e7293b9412d46ee7713da SHA512 d159348f48be29e96a84845474b1c6286ca29df1d62bec79a1a3385e89be0ac0b84a3465c41e769e447ac5598a189564f5e3e638668ea8c876b6899a1cb33666
diff --git a/sys-apps/opal-utils/opal-utils-6.6.2.ebuild b/sys-apps/opal-utils/opal-utils-6.6.2.ebuild
index dc2a1f85fa2d..867857095da6 100644
--- a/sys-apps/opal-utils/opal-utils-6.6.2.ebuild
+++ b/sys-apps/opal-utils/opal-utils-6.6.2.ebuild
@@ -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"
 
 DEPEND=""
@@ -89,7 +89,7 @@ src_install() {
 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 
+	# 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.6.1.ebuild b/sys-apps/opal-utils/opal-utils-6.6.3.ebuild
index d447870f81eb..6f824f28e385 100644
--- a/sys-apps/opal-utils/opal-utils-6.6.1.ebuild
+++ b/sys-apps/opal-utils/opal-utils-6.6.3.ebuild
@@ -89,7 +89,7 @@ src_install() {
 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 unstable output
+	# 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.6.ebuild b/sys-apps/opal-utils/opal-utils-6.6.ebuild
deleted file mode 100644
index d447870f81eb..000000000000
--- a/sys-apps/opal-utils/opal-utils-6.6.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-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}"
-
-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_prepare() {
-	default
-	sed -i '/^CFLAGS +=/ s/-g2 -ggdb//' external/opal-prd/Makefile || die
-	sed -i 's/-lrt -o/-lrt $(LDFLAGS) -o/' external/ffspart/rules.mk || die
-}
-
-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 unstable output
-	rm external/pflash/test/tests/01-info || die
-	emake V=1 -C external/pflash check
-	emake V=1 -C external/ffspart check
-}