gentoo resync : 15.01.2020

3 files changed, 88 insertions, 3 deletions

diff --git a/sys-apps/opal-utils/Manifest b/sys-apps/opal-utils/Manifest
index d38af50046d8..cfe9af0dc50e 100644
--- a/sys-apps/opal-utils/Manifest
+++ b/sys-apps/opal-utils/Manifest
@@ -1,5 +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.ebuild 2172 BLAKE2B 08a34fecb2957b97edd28259f8d3a4749c184a5a1be06840621c73b902563f1e7c8b565973d4eb919747f392cfe8b84e860afa61d8afe4252c444545093b1892 SHA512 01f37623ff3b6d00c098017676bf9cfcee0cb898be9700682136d0c4352e5b60669aa4e1b64bd61033ed8bb07a8424114cc8e390d5f5426f9b98237de97fbc61
+EBUILD opal-utils-6.5.2.ebuild 2175 BLAKE2B d2579a82d24007ef3badb10577141ec418867583c672f4e0662fef55e889ee54ab7d1c2d0488ca6a9131162634044212d8bce3a23c0c6f36f10ca33073905ef1 SHA512 1e4915168e022f25cf18350317e3c861a034abbd15a06d8fd36eb6f197a6721d8edec927213abd2ccf13d0c6a30a30b998516248553ebcf14a51f15e33060a06
+EBUILD opal-utils-6.5.ebuild 2175 BLAKE2B d2579a82d24007ef3badb10577141ec418867583c672f4e0662fef55e889ee54ab7d1c2d0488ca6a9131162634044212d8bce3a23c0c6f36f10ca33073905ef1 SHA512 1e4915168e022f25cf18350317e3c861a034abbd15a06d8fd36eb6f197a6721d8edec927213abd2ccf13d0c6a30a30b998516248553ebcf14a51f15e33060a06
 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
new file mode 100644
index 000000000000..a5c514c95a77
--- /dev/null
+++ b/sys-apps/opal-utils/opal-utils-6.5.2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+
+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"
+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
+}
+
+src_configure() {
+	tc-export CC LD
+	export OPAL_PRD_VERSION="${PV}"
+	export GARD_VERSION="${PV}"
+	export PFLASH_VERSION="${PV}"
+	export XSCOM_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
+
+	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
+
+	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
+}
diff --git a/sys-apps/opal-utils/opal-utils-6.5.ebuild b/sys-apps/opal-utils/opal-utils-6.5.ebuild
index bbde6d6db522..a5c514c95a77 100644
--- a/sys-apps/opal-utils/opal-utils-6.5.ebuild
+++ b/sys-apps/opal-utils/opal-utils-6.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit linux-info python-any-r1 systemd toolchain-funcs