gentoo resync : 28.04.2021

13 files changed, 71 insertions, 21 deletions

diff --git a/sys-fabric/Manifest.gz b/sys-fabric/Manifest.gz
index 1794c9c26570..7ea2502ac864 100644
--- a/sys-fabric/Manifest.gz
+++ b/sys-fabric/Manifest.gz
diff --git a/sys-fabric/libibverbs/Manifest b/sys-fabric/libibverbs/Manifest
index deb94f5a6fc9..4fbe124722e7 100644
--- a/sys-fabric/libibverbs/Manifest
+++ b/sys-fabric/libibverbs/Manifest
@@ -1,4 +1,4 @@
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
 EBUILD libibverbs-1.1.7-r1.ebuild 691 BLAKE2B c7e098706c2947662f4d82c94b3a830511cf40dc64af023769b3ea2fe77c286b3c3b9ea601f7d559bc6c85d35b99666b1f34b8f40c1a552542157e22667fec16 SHA512 a72421f2acd3b10fce40d467d3baec33493533d5e3515b73391b67a81279b5a7c5d912234d91171138814e963f5b9d302951248ffa5232d3a15aab439a01337e
-EBUILD libibverbs-1.1.7.ebuild 423 BLAKE2B 4bf52e0c1e27b40f63a3312f0b397ad11ddcacf8457b26342ddf85b27f0ee260159938e2680f4e16da4cb5e13b405886905ed5b2b84b122a9575984b9817c962 SHA512 b7248eba080976a0396444ae78567a74d3b4854922cb073e3fbeded685e45f6e0fe3fa6d1ce1ed6596faaf04c019818eb16a22620d040548155d904729fd8846
+EBUILD libibverbs-1.1.7.ebuild 413 BLAKE2B d25fb471d39c1514ebedd6f025911f371c08d6c86c7e81e02b5c012a517f7da0acf44d8416bd825d2054fa408b5472400dc4b03eff4b282c22a2d3654bd3171d SHA512 687763f0c83d0132063cbef4498e6ff45acb17953ba78c6bd6206729472ea6c298ba218c6c8fa7e7947969b82218adbf1454e6273a8e771005bdb09ccb504f82
 MISC metadata.xml 519 BLAKE2B 376e822d8f6b2652d5f854334dc3e2d61d00f860c1f053333d47ecd8d15a7420930d75ca6761ed270efa89a653c4445eeac4c5b987f8e96728a5877f27e16282 SHA512 bb0e324624f5753a5641acbaa5703744ad4da0860c9adc55a420b198a15c969db8d92d2dabe5dff569244ebb95955e9c6bbf4f02558af598f732f78058f8351e
diff --git a/sys-fabric/libibverbs/libibverbs-1.1.7.ebuild b/sys-fabric/libibverbs/libibverbs-1.1.7.ebuild
index 770cefe90250..865b9b3ef63f 100644
--- a/sys-fabric/libibverbs/libibverbs-1.1.7.ebuild
+++ b/sys-fabric/libibverbs/libibverbs-1.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ OFED_RC="1"
 OFED_RC_VER="1"
 OFED_SUFFIX="1.gcbf2a35"
 
-inherit eutils openib
+inherit openib
 
 DESCRIPTION="A library to use InfiniBand 'verbs' for direct access to IB hardware"
 KEYWORDS="amd64 x86 ~amd64-linux"
diff --git a/sys-fabric/librdmacm/Manifest b/sys-fabric/librdmacm/Manifest
index 791025f8374d..e2f7cb41ab2b 100644
--- a/sys-fabric/librdmacm/Manifest
+++ b/sys-fabric/librdmacm/Manifest
@@ -1,4 +1,4 @@
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
 EBUILD librdmacm-1.0.18-r1.ebuild 709 BLAKE2B e0a76e777dd91a5e25dcfb2335dd9a929830ca1f5c7a2154c0d17161806b4291a25ab41046c32f48699e87a96830066d105146a3114fe614007433aceeafaf8b SHA512 233944aacc663324d4dfc7ffd943326a6e5c7dc146ef54087195cb4d68ae6421018bb491e49763a87d6093c2e6cff828f24d23a60771c9a81b9aad254d154590
-EBUILD librdmacm-1.0.18.ebuild 408 BLAKE2B 968836c172488fc9f4edf105ad8ee79a54693dda0c372e2414f021b36f11ac94943c25889e96f24a2e0a734b46d2ab4dfdc568d0e21a36e1ef023a4aa9653c1d SHA512 05fb7513b2c4611051eed92497f686880bee2b6305583001445583ade3fe59e3e06635c588d4962c7d010f79b04fe83f7877972016793a3138624fe8ed3a49e2
+EBUILD librdmacm-1.0.18.ebuild 398 BLAKE2B bbabd1ea8bbc1d1fdfe7bed4991a118447f9137e0b2cd8d7398f61f6c55f6aeabfd05d17e70185b9bee9f279863ba88fd413d42d4c7a86dabe0eed304b802c71 SHA512 6cf70d37bec05529bea335ddc8649807ffef2d31d4b8b158d2134e2b5d650c751accf67e161bb41be63f589311ee21fa895b16bf33a03a0143748bd0c8f3f6f7
 MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
diff --git a/sys-fabric/librdmacm/librdmacm-1.0.18.ebuild b/sys-fabric/librdmacm/librdmacm-1.0.18.ebuild
index 35ebd2e50f83..2d4e9357a19e 100644
--- a/sys-fabric/librdmacm/librdmacm-1.0.18.ebuild
+++ b/sys-fabric/librdmacm/librdmacm-1.0.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ OFED_RC="1"
 OFED_RC_VER="1"
 OFED_SUFFIX="1"
 
-inherit eutils openib
+inherit openib
 
 DESCRIPTION="OpenIB userspace RDMA CM library"
 KEYWORDS="amd64 x86 ~amd64-linux"
diff --git a/sys-fabric/mstflint/Manifest b/sys-fabric/mstflint/Manifest
index 6edb4a908f9e..dbe6d0a32c4e 100644
--- a/sys-fabric/mstflint/Manifest
+++ b/sys-fabric/mstflint/Manifest
@@ -2,8 +2,10 @@ DIST mstflint-4.10.0_p3.tar.gz 3208065 BLAKE2B 9d27bc41f3af4af2d430814a892bc26b3
 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
+DIST mstflint-4.16.0_p2.tar.gz 4534457 BLAKE2B c199cd0b4eed8ecc20b8ab89235035b7ad258fe583c464dafb31a1e5ba8f6cfd745b132ff12631fa0d98c2d94f16ca69c908c0b6ad94391ec1a3e56ba9967d59 SHA512 03a6b055384b9fab44a31ba6f2de02d1580e08af981c1cad5111a96279872ea960024bfa9debbbdb36019b88713906c3c59d3910a11f169ad5f3a0090bc6c7df
 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
 EBUILD mstflint-4.14.0_p3.ebuild 1144 BLAKE2B c95abfe2e04f37e741ae6fedbd3a503b451233e576de49e78fefe421b0cf2685ad2937123efcdb4ceb9de4810bb133959ce114cd727190be26c8d484118d3e51 SHA512 084b01fb39de7e767c748583dde67a0470fe0f3a57030740ffde195b2c72373ffa9944765f72cacf7101937e5cdcd46cf14130cc06b0ebf30850baf6f39ce24d
+EBUILD mstflint-4.16.0_p2.ebuild 1144 BLAKE2B f2dcd54ad815640f54a82c07d7aa58a3e910562e380b4c5696c42ccb8388954a93a4a5b50b2764ec26e4978331bb1ee66a1c11b9c3e3056b129e15b357e09bf1 SHA512 6a001b874d1d3ad3973b0719dfb84da6127466ae001b8d307e82fdc6927cb9548f97e6098b77a91835d45a6331c56ec2e1f63027acd5ef80653df0fc17c6fdad
 MISC metadata.xml 534 BLAKE2B 2fb988fdcf5a458e45a2caff00d5dfd398fb6588c233434ba82008a5189291119ae93db76d2b6b10f4254d07c099774c9076f4dd989267a5fc11202a75a2664d SHA512 13f5ebf138bfe34cebd1bb672bf1ce89416ff68aaecec2c47d195a329dfb2ffd6425707389786e8498260fe095988a402046b72453a45de6a78c33193bdf94c1
diff --git a/sys-fabric/mstflint/mstflint-4.16.0_p2.ebuild b/sys-fabric/mstflint/mstflint-4.16.0_p2.ebuild
new file mode 100644
index 000000000000..bac06d183ae9
--- /dev/null
+++ b/sys-fabric/mstflint/mstflint-4.16.0_p2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 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="bd8852742cbd5d4d5eb0d67e000275c953cc0820"
+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
+}
diff --git a/sys-fabric/opensm/Manifest b/sys-fabric/opensm/Manifest
index 8536a2563340..bef5c5fe201d 100644
--- a/sys-fabric/opensm/Manifest
+++ b/sys-fabric/opensm/Manifest
@@ -7,6 +7,6 @@ AUX sldd.conf.d 459 BLAKE2B 6a61a958a295812153ad254d38503c967d029375b9fcc40231ce
 AUX sldd.init.d 612 BLAKE2B 970ac3512d62e5dd849a7a4a897bc96d32fbed84f9b8806bcc0cc962b0e30cc69a0fc8ada2cea7ef03d7ffbe0f6a171f9eeaf0e914c7816da99474c340e35259 SHA512 e939ddd800e9f077aff28e30b1e1a7ffa07b1fe779cb212f34e789b4f2bb421da34fcf5b5c186971ebea9b419e2307bfa02296350451938a48646b3bcac1a882
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
 DIST opensm-3.3.23.tar.gz 1357906 BLAKE2B 7f085dc1e0a1f284baf1410661aa247ef7e48cdaa696c38ef8a38d5a214e03966b54fb75c035103ac0d6ab9e0a37500d5fad51b0b52c7f5edffb3c3ddfa86eb4 SHA512 249143fcf2cac0504923992d46dfbd6821aad3da55ecc12c92b273b4e59196f88d9d1802d9f58ae6f1ace49958e0222424aea9b48e5aba519e5a5736fc51c3fe
-EBUILD opensm-3.3.17-r1.ebuild 1367 BLAKE2B ff5739eacc3b04e7e5149ee1afd3722eedfedf22fe8e5cd531e7c16b0c061f65df4beb7620719b21faa0025479d50ff3af26b05562114b068f16768dc63f69ee SHA512 268ff24c075a0df8fcc346864bfa46ad57bb03104e08c9ecf758e392c1ee81b236d76631a0fd81af984021d25c445dc5953823064233a789c0a446263480ee29
-EBUILD opensm-3.3.23-r1.ebuild 1389 BLAKE2B 0e3a8515865535c9e2c0b02484c9c9b1edb9eb3f0fdaacca03448ec45631e1f789cf310176244de137ecba249a4558cf8614a890eedafb1504bf43984292dce6 SHA512 7f15a08be1c3e182894768d7c971471f5118672f4626be7d8dff7a4d71d9756aebb09b60f0e71263f04f5e4506c09a50b6017865c5a6c0f8006a5710baa5595e
+EBUILD opensm-3.3.17-r1.ebuild 1364 BLAKE2B 11ab27c9da717daad18a42757b436638d68442ad8e6f6eb1e26a3405bf4b77293b43b012b6cbc038e0a296f3a6d9d263a17f88430590a8233d95968feadb22ac SHA512 b75d09f20c330cc034d2bc0ad01661113b9e5e9a27c0de6fd691995474e76e94864d287fefa5484fc10e631617c863ac379314c4278720efa869a030994ea68c
+EBUILD opensm-3.3.23-r1.ebuild 1382 BLAKE2B 5eada11aef812498d9f58b1bb4f660e487dc3182e2977da09d3b17f2be36fe124d980398cbe04e4170af003df91fe0fcba8cd8dd0f7d70875965da86e289a6ce SHA512 aed0930f0e9bc88f7a9e7865102ddcb04c5bd75b78e3b801ac70c5f33afc69b9526f56e19be6d46b6f794a5fd2c04bf4cfa957887637fc58d11ed81c0f62ea6b
 MISC metadata.xml 579 BLAKE2B 02d654e22523ce9662d2cee069e3a0e8bbc40054a781801d1d1b0db1e3d4022230108f0e49062493b9480762c58e41fffdb6df52b18297ed93ac5ea1a05b0cc3 SHA512 b795ddb33400618477f6deec90e0e45207c85b8d5c2170cb9d2e01745144903dd998a1c01280f2e127ca3d2c7efb2ccc081a783d4c7af5d90a3196241b373803
diff --git a/sys-fabric/opensm/opensm-3.3.17-r1.ebuild b/sys-fabric/opensm/opensm-3.3.17-r1.ebuild
index 51b8c9211835..ff105e571d0a 100644
--- a/sys-fabric/opensm/opensm-3.3.17-r1.ebuild
+++ b/sys-fabric/opensm/opensm-3.3.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -8,7 +8,7 @@ OFED_RC="1"
 OFED_RC_VER="1"
 OFED_SUFFIX="1"
 
-inherit autotools eutils openib
+inherit autotools epatch openib
 
 DESCRIPTION="OpenSM - InfiniBand Subnet Manager and Administration for OpenIB"
 KEYWORDS="amd64 ~x86 ~amd64-linux"
diff --git a/sys-fabric/opensm/opensm-3.3.23-r1.ebuild b/sys-fabric/opensm/opensm-3.3.23-r1.ebuild
index 12fc2994bc55..210281da4cd0 100644
--- a/sys-fabric/opensm/opensm-3.3.23-r1.ebuild
+++ b/sys-fabric/opensm/opensm-3.3.23-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit autotools eutils
+inherit autotools
 
 HOMEPAGE="https://github.com/linux-rdma/opensm/"
 DESCRIPTION="OpenSM - InfiniBand Subnet Manager and Administration for OpenIB"
diff --git a/sys-fabric/rds-tools/Manifest b/sys-fabric/rds-tools/Manifest
index aa6659641832..78fe3c7bb4ea 100644
--- a/sys-fabric/rds-tools/Manifest
+++ b/sys-fabric/rds-tools/Manifest
@@ -1,4 +1,4 @@
-AUX rds-tools-2.0.4-qa.patch 1678 BLAKE2B 9a5c2f88b74f42ad7bc6ab005f414d402744dc7394173b538ca798dcc21958558c79ebc8a1488b5f7c84a93b88c26cc3010cf3e23cd741cfe0b511e22bf4c9db SHA512 cfd38dbfc2790fc2859ec1655901b3f8de28b5dbccabe3ee895cf620b9da1559a9f036d1af51abbd4f4c64a31dc96a86a4c773c2df861ba561f8a3edbfb21ad4
+AUX rds-tools-2.0.4-qa.patch 1682 BLAKE2B b3824aa80b2646381114ad84842dae9dad163e334fcf914844d76188f0dd6731592b52b89ff7de82a4575699d63a2d629e3e700f04647a26fd9539caedb86f0c SHA512 27da05d3859abed1c5304df00c2372c2a46454f7b4cc04a11bc828c0ce5c5d66620200afe63549005bc0418047266f44a940bddbb73b929c203d8268ecb59024
 DIST OFED-3.12-rc1.tgz 22055476 BLAKE2B 49e6411721392f418369a292513709f396fbb0f17001687aa15b5c0acdc91013cc67354e5978df56452178af7fbbd338a7ff408592ff9126a3045b9bb27375fe SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944
-EBUILD rds-tools-2.0.4-r3.ebuild 505 BLAKE2B e60013cc5593674588fb2a4b5b3ab7437d97a501722358db9890f89bc43918bf71bb901bb14e71fc976731f064a2f01d161cc827414f44384a81bc1983a7d545 SHA512 a4169dca3c0a6d0020da6df1e5a3243809bc7a4917a75330fde559057eeefbc488667f784958604dc06da32eb60aa11cd288e303e4b34f3861e14a6fc443ee41
+EBUILD rds-tools-2.0.4-r4.ebuild 491 BLAKE2B 5627bec5e3c4175b52466a69cd9a8d6904058127a44f313b118f8080884f798ca2056a029b71b58450479a725d70df801eb14e16ad8444f816b418e9a0bf4869 SHA512 e77f91dee0a5de2ab9e65f0edd472ac606dba8bd2d5a8a141dde16a6a16a2a47e157ab153501cb1754f80f9e8d68c71edb00032216c2a9146ca49a8d28887aa7
 MISC metadata.xml 517 BLAKE2B 5216c53922586aa9474737c08b1a86d4baa596d1a0d1872e59b0403ff0166aaeec433ed02cd4443d67aa3c255ca641c9cf170b6217ca6cab0bde98e907a57950 SHA512 b4660bcb112426f8c8e785c68b64c85fd5155917405d72271bdc418821c542eb8e0bc2cb16740188851d75820d25d580a9edf4a3a35715a709b84d0134b4b2a4
diff --git a/sys-fabric/rds-tools/files/rds-tools-2.0.4-qa.patch b/sys-fabric/rds-tools/files/rds-tools-2.0.4-qa.patch
index 0a8e1a575c4a..1be090a4f78d 100644
--- a/sys-fabric/rds-tools/files/rds-tools-2.0.4-qa.patch
+++ b/sys-fabric/rds-tools/files/rds-tools-2.0.4-qa.patch
@@ -1,8 +1,8 @@
 Respect CC,CFLAGS, fix install paths, don't strip binaries
 
 https://bugs.gentoo.org/show_bug.cgi?id=374805
---- Makefile.in
-+++ Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -1,12 +1,15 @@
 -prefix		= $(DESTDIR)@prefix@
 -exec_prefix	= $(DESTDIR)@exec_prefix@
diff --git a/sys-fabric/rds-tools/rds-tools-2.0.4-r3.ebuild b/sys-fabric/rds-tools/rds-tools-2.0.4-r4.ebuild
index 40b339cbe9fa..3a143a8889fe 100644
--- a/sys-fabric/rds-tools/rds-tools-2.0.4-r3.ebuild
+++ b/sys-fabric/rds-tools/rds-tools-2.0.4-r4.ebuild
@@ -1,23 +1,25 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 OFED_VER="3.12"
 OFED_RC="1"
 OFED_RC_VER="1"
 OFED_SUFFIX="1"
 
-inherit base openib toolchain-funcs
+inherit openib toolchain-funcs
 
 DESCRIPTION="OpenIB userspace rds-tools"
 
 KEYWORDS="amd64 ~x86 ~amd64-linux"
-IUSE=""
 
 DEPEND="sys-fabric/libibverbs:${SLOT}"
-RDEPEND="${DEPEND}
-	!sys-fabric/openib-userspace"
+RDEPEND="
+	${DEPEND}
+	!sys-fabric/openib-userspace
+"
+
 block_other_ofed_versions
 
 DOCS=( README )