gentoo resync : 25.08.2020

4 files changed, 50 insertions, 1 deletions

diff --git a/sys-fabric/Manifest.gz b/sys-fabric/Manifest.gz
index f3a04cb390e8..deb2d9fda8f7 100644
--- a/sys-fabric/Manifest.gz
+++ b/sys-fabric/Manifest.gz
diff --git a/sys-fabric/mstflint/Manifest b/sys-fabric/mstflint/Manifest
index 4080664dd440..6edb4a908f9e 100644
--- a/sys-fabric/mstflint/Manifest
+++ b/sys-fabric/mstflint/Manifest
@@ -1,7 +1,9 @@
 DIST mstflint-4.10.0_p3.tar.gz 3208065 BLAKE2B 9d27bc41f3af4af2d430814a892bc26b302f4a57b2287cca4d5a64a37d7dd1b47e3f167b671be9ef1fadaf5dc51dff6094db811951ef1b5c6ad3ce746eb78546 SHA512 72077557f032bfa9c2c0b94f485b58c2d9efa955281997fed605e6351b1cfe73c46d8e4f293f93b58ebc4315d47b3dc3a4e8d72c8938647d34d291a2db89198f
 DIST mstflint-4.11.0_p5.tar.gz 3622665 BLAKE2B 119d1ca04eaf3ebc2e4b8175525fdc87079b27742013f210f8c38d2ac0e83b46c555e4b8b49d7f1562180473c0873456932939e942b1050e9c952a2e3172185a SHA512 c98f24acda519e62fd8db8e170c39c8ffe69b980bc2c9a167f20cfcb2575038648e463de0c7dfad3ddebe098b8a466640b7a125901c033f193a42ef1bfef00d8
 DIST mstflint-4.13.3_p2.tar.gz 3809937 BLAKE2B bfe0d5a531a26547779f2e9377c4c6f393c28623d56c87a1f0210a0fbb767a43f5186c481609722ef2e5066bcdf0110009468b047ca0a8b25c096f4802b43229 SHA512 bd7e937eaed30c4b4479c3bc184d9bd8edff9aba23824fdd6a82f0e62d319854aa74954c783eb483074e322eec94f9a0cd5bd6a0ff4de2422f9b011680324706
+DIST mstflint-4.14.0_p3.tar.gz 4012564 BLAKE2B 4203c398665cbc7a0e9f86158e58270c903f546372aecf697c09b75f7fc44944304a4c5f1524362d442ed8e16f5dd9f35fe08ec638c5c556ed182cbac9f1c27b SHA512 c27872e34443df24fb152f2837d2fa31a7a459eff859654d00c815fc942182dc48d18991e83b79cc99bbd5fafe5b721b69e9bee9c927e2d54581eb78d7a5548e
 EBUILD mstflint-4.10.0_p3.ebuild 997 BLAKE2B e2013ba6af2b98e72999042c5e4f1830f85927bfca2044107f672ec13402c8110d7f5055cfc10fdaa86a6ac604d4410980195534e2c1a1a37ab6b44452fce15c SHA512 eb2d409bc81e6c59ba17dbaa829008c399d19e6781ab9583d458e5a90dda0418849f9a27fa1a90e4c4b967f40c6fc21c2ca05c55e70d3832969cd94e5ad7fecf
 EBUILD mstflint-4.11.0_p5.ebuild 1074 BLAKE2B d2743e9f6d5287ea20c01854d0dbf5cbc30939673cae16041cdbf1319d964f2651fae78b369311858b25faa2e34993fc05526b29a948957d8727556a7d6affec SHA512 55ddd549d95152de28efda4178b0bb680020e485be65e7ddf37bf93f70386c981aa40baffc2bae1a1de15446a0fbb91b912d45ef65f0734d63c4a552cae4cb92
 EBUILD mstflint-4.13.3_p2.ebuild 859 BLAKE2B dc8604d3602011fc8169b130a008d341a0d887397afadaf75e56f2cffd00217e0ceb0d0519c41d2fc4c8445462ca819e3a0ccbf68b8d3cfd0365d1b2434b977b SHA512 2fe30b0f94c17871d2c610dcacd5b7e3aa266c641f41dddf3b3edc1c243eb46862cf0be11051ab5cbc8d5292e9f3e4db27c2e2faabd79b5f5a2fe77873f4538e
-MISC metadata.xml 437 BLAKE2B 9e79b5f45579cac7d482a277442a842edac62a78abfb7a53261b74ffb3bd8eae6844121c5afd5fc1a7ec419eb163bc641e95de0f0cbf25deb8850c3010f1abbb SHA512 f8cfef91c9df010f5eaec9406e2440810b1ad8c89f66a869cc36541e615885373dec3cbfaeb9d0087bcaafe410cbe91659162047d67f712c4bb0d7c2046ee97a
+EBUILD mstflint-4.14.0_p3.ebuild 1144 BLAKE2B c95abfe2e04f37e741ae6fedbd3a503b451233e576de49e78fefe421b0cf2685ad2937123efcdb4ceb9de4810bb133959ce114cd727190be26c8d484118d3e51 SHA512 084b01fb39de7e767c748583dde67a0470fe0f3a57030740ffde195b2c72373ffa9944765f72cacf7101937e5cdcd46cf14130cc06b0ebf30850baf6f39ce24d
+MISC metadata.xml 534 BLAKE2B 2fb988fdcf5a458e45a2caff00d5dfd398fb6588c233434ba82008a5189291119ae93db76d2b6b10f4254d07c099774c9076f4dd989267a5fc11202a75a2664d SHA512 13f5ebf138bfe34cebd1bb672bf1ce89416ff68aaecec2c47d195a329dfb2ffd6425707389786e8498260fe095988a402046b72453a45de6a78c33193bdf94c1
diff --git a/sys-fabric/mstflint/metadata.xml b/sys-fabric/mstflint/metadata.xml
index 3a04694a94c0..0f7655bbf7bf 100644
--- a/sys-fabric/mstflint/metadata.xml
+++ b/sys-fabric/mstflint/metadata.xml
@@ -5,6 +5,7 @@
 		<remote-id type="github">Mellanox/mstflint</remote-id>
 	</upstream>
 	<use>
+		<flag name="adb-generic-tools">Enable compiling the following tools: mstreg and mstlink</flag>
 		<flag name="inband">Enable firmware updates for Mellanox SwitchX and ConnectIB devices</flag>
 	</use>
 	<maintainer type="person">
diff --git a/sys-fabric/mstflint/mstflint-4.14.0_p3.ebuild b/sys-fabric/mstflint/mstflint-4.14.0_p3.ebuild
new file mode 100644
index 000000000000..0beaafa4fa00
--- /dev/null
+++ b/sys-fabric/mstflint/mstflint-4.14.0_p3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Mstflint - an open source version of MFT (Mellanox Firmware Tools)"
+HOMEPAGE="https://github.com/Mellanox/mstflint"
+LICENSE="|| ( GPL-2 BSD-2 )"
+KEYWORDS="~amd64 ~x86"
+EGIT_COMMIT="f8056f78a64debbdbb2522db7181848b9203e428"
+MY_PV=${PV/_p/-}
+MY_P=""
+SRC_URI="https://github.com/Mellanox/mstflint/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+IUSE="adb-generic-tools inband ssl"
+SLOT="0"
+RDEPEND="dev-db/sqlite:3=
+	sys-libs/zlib:=
+	inband? ( sys-fabric/libibmad )
+	adb-generic-tools? (
+		dev-libs/boost:=
+		dev-libs/expat:=
+	)
+	ssl? ( dev-libs/openssl:= )"
+DEPEND="${RDEPEND}"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	default
+	echo '#define TOOLS_GIT_SHA "'${EGIT_COMMIT}'"' > ./common/gitversion.h || die
+}
+
+src_configure() {
+	eautoreconf
+	econf $(use_enable inband) $(use_enable ssl openssl) $(use adb-generic-tools && printf -- '--enable-adb-generic-tools')
+}
+
+src_compile() {
+	if use adb-generic-tools; then
+		pushd ext_libs/json >/dev/null || die
+		emake
+		popd >/dev/null || die
+	fi
+	default
+}