gentoo resync : 25.04.2020

3 files changed, 19 insertions, 6 deletions

diff --git a/sys-apps/opal-utils/Manifest b/sys-apps/opal-utils/Manifest
index bfd85748d1e2..fda9943da826 100644
--- a/sys-apps/opal-utils/Manifest
+++ b/sys-apps/opal-utils/Manifest
@@ -1,7 +1,7 @@
 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.5.tar.gz 2080841 BLAKE2B cd8bda3b7f3bcbc620f922a6baa69f452a95c60a96eb9adf67d781dc5d1a75fc43cba7aa3ed82105de7a04041cfb61f43e909794702564819cda6f11afd23815 SHA512 f756307403ec49f24e5dbc06dbe8fe52898da27f2a0fa761164b1d85efd33dae8a8f96de3859eb7b11f85f43a790c9c213f9ebf0c7f4a859b590dcfb35e38571
-EBUILD opal-utils-6.5.2.ebuild 2165 BLAKE2B 2a82591928c387009bd4b8e0b2ed4ea4a40346339a34fcbc14c86ac6d7fd9382a7979a6fd8a173d5f0226a3a487a9c49fac8e94aebfa80445795ec4d31f35124 SHA512 7e478f1340df9a537753a8c152a2d337c6fca60b557032609d3d925d9f92b78c8f79869f6a5ed9438c1455d338bb1e37588143ddbf380cf3537d8301603f8c5b
-EBUILD opal-utils-6.5.ebuild 2165 BLAKE2B 2a82591928c387009bd4b8e0b2ed4ea4a40346339a34fcbc14c86ac6d7fd9382a7979a6fd8a173d5f0226a3a487a9c49fac8e94aebfa80445795ec4d31f35124 SHA512 7e478f1340df9a537753a8c152a2d337c6fca60b557032609d3d925d9f92b78c8f79869f6a5ed9438c1455d338bb1e37588143ddbf380cf3537d8301603f8c5b
+DIST opal-utils-6.6.tar.gz 2119590 BLAKE2B 3c2b0b77fdaa22f075afe1d7205865b76e45e865c8799372ab61dbd272015ecb1343a32c185d6bd5fb323723a2c5aded1fead2ae0fb34ae6e97e17f5e15af6a6 SHA512 23ae61266253a5382f4d873492e89523cc26a32dfb43438e5becece88f5af4f0bc4ec756208603653f430b3382c42980a8c92dc0c1ba3e2b13831ade1eb14a27
+EBUILD opal-utils-6.5.2.ebuild 2164 BLAKE2B e92b21eeaff806652eda903b2d27c0cdfffcb4a0dfb5ea78d24d4ea92ca1dd0cacd82b8eb2dc864c3e8a6911e60a9ba1a85cf448a83bacee44c6a1fd4b20debc SHA512 2c3bc02aa6fc4b37cf1e27316dec41c8ebf7ae452e6c2a0e6b5450f03e3862d4e8b317ae2d675f5a38fa1d7df4ef3bf59930609c9e09110fab0b30ccc3e4f5d7
+EBUILD opal-utils-6.6.ebuild 2610 BLAKE2B 6662187f678423fffcfa419ee5841ba8e9c77ac4c7e59660e1f3b025c0abaf7a8d95b66b7ad5951866cf9df0b29da8564c5a38c7805c1ccf8f16c508524a592a SHA512 d249a5cad199badb58f705c83d12d28e3834f7622d3cdf650637efdbc6a03bf4278fc0e9c10043e4c5f8b6aef5bddb2fcd61eccdaa58c093411b9800523c33df
 MISC metadata.xml 975 BLAKE2B e3185490ec22ed5c776c9df2a627e698e6a3d35085694d397df52c965d3c23dd57f628289ea660a24f2623d5821fba838e504bf15a77d86e3a55b42bfc7ffd8b SHA512 0fe842a12d4c5f34b6042b91b5c63fc7354e17f8228841809305006f84613dd6d894d2780725f1046beb7fbec04a17e1e08d54db37ab027f275f3543c5bb5b56
diff --git a/sys-apps/opal-utils/opal-utils-6.5.2.ebuild b/sys-apps/opal-utils/opal-utils-6.5.2.ebuild
index 12cc0995a254..9e12d9fc8b8a 100644
--- a/sys-apps/opal-utils/opal-utils-6.5.2.ebuild
+++ b/sys-apps/opal-utils/opal-utils-6.5.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"
 SLOT="0"
-KEYWORDS="~ppc64"
+KEYWORDS="ppc64"
 IUSE="doc"
 
 DEPEND=""
diff --git a/sys-apps/opal-utils/opal-utils-6.5.ebuild b/sys-apps/opal-utils/opal-utils-6.6.ebuild
index 12cc0995a254..d447870f81eb 100644
--- a/sys-apps/opal-utils/opal-utils-6.5.ebuild
+++ b/sys-apps/opal-utils/opal-utils-6.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit linux-info python-any-r1 systemd toolchain-funcs
 
@@ -11,7 +11,7 @@ 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"
+LICENSE="Apache-2.0 GPL-2+"
 SLOT="0"
 KEYWORDS="~ppc64"
 IUSE="doc"
@@ -45,6 +45,7 @@ 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() {
@@ -53,6 +54,7 @@ src_configure() {
 	export GARD_VERSION="${PV}"
 	export PFLASH_VERSION="${PV}"
 	export XSCOM_VERSION="${PV}"
+	export FFSPART_VERSION="${PV}"
 }
 
 src_compile() {
@@ -60,6 +62,7 @@ src_compile() {
 	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
 }
@@ -69,6 +72,7 @@ src_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
@@ -81,3 +85,12 @@ src_install() {
 	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
+}