gentoo resync : 15.12.2019

4 files changed, 5 insertions, 100 deletions

diff --git a/sys-cluster/rdma-core/Manifest b/sys-cluster/rdma-core/Manifest
index 32e07cc48362..090a3a952288 100644
--- a/sys-cluster/rdma-core/Manifest
+++ b/sys-cluster/rdma-core/Manifest
@@ -2,11 +2,9 @@ AUX ibacm.init 211 BLAKE2B 4f3b2ffb7cbc7f42b14dad5c02bce698feaf079ff75a2f7a7c9d7
 AUX iwpmd.init 211 BLAKE2B ce37edeceae812b999cbcd15b9c9cae55125de0d94ac6983e953117a265c444ab4f9b7a09053c4303c260f1df59cc916ff7f1a89ca6f937a42c2cace6a2a88b4 SHA512 e08d8521d74aa4e266e11833750682974bede45e2b7c42ee3d4ba7cee5695f6e7f5c3c5963b57186f6f669a752faf4c5f4c51f92065425ff6ce859be9affdb07
 AUX optional_pandoc.patch 1611 BLAKE2B 5f6c4f8ebe1379cf733b4b1829f39bfc34ff2715cd3be172a609518560c97adbfeec15a648d3205a3016f24a0e99db4be6cb6602672046b96a01c998fd314b6f SHA512 b9c1be47aa530231d0becf6bd313d881262f5360985206371daf96377f657f4aa1b52227ae371e21154edcac48ccf6b1433f84b689cd373b02b844782654c2c2
 AUX srpd.init 546 BLAKE2B 40a03607fd4a85b821a71b98373b5c59f721bb2da78afbede8299ae6eedd402776c4ee3b4965c7df0b8b1816969a715351a1e659e4a26abc99808e93ef69f6c9 SHA512 14c1dac4581943855c362d7a37ef31a87be458123dd890bdcfb75c35b71b0a6e789a819c768ea352b3846af29ab5c3b1872cbe27a2e127b8fc8c93a835428190
-DIST rdma-core-24.0.tar.gz 1219485 BLAKE2B 400076305ca634a14d8f46df3477f9e3e753b95840237a217cfffe1a78e93ee90994e628f2a0693bde588ce15965df0014acb55bc92c36e3c45011cc69e9898a SHA512 0ef2b2b4250a1738adec964911a286f60e2310472c943dac1be45c70974a8bd1f32ee96013bff9e492132403af810aee1350d404a87ae7671731f7a5bd80c655
-DIST rdma-core-25.0.tar.gz 1494005 BLAKE2B 406926ae57ae4914a77c82025906270bbc45632ed1e0ecb44b1662d797066bf27275c8b4c4bee40795880bdb4ed06f8f9d3714cfffc64132c00395328ee0527f SHA512 b2c6eaf16f89fb913e35b0eb602f60e8bf45979673597c34006ed78c2e671cf1e50b1cc0752740dc474a58fc94eb0c3f66175183e6b903605ff1512469ceef38
 DIST rdma-core-26.0.tar.gz 1444585 BLAKE2B 148b25f6108199b3845446e9f45a59d089e7f546218d70abeadffd5cf3e0b26569bc5099abfb6152f376689e04a493529a61fc1d6b40c153aca23b5df2776bf7 SHA512 7dfdd93d10e4c56cac5ac0c1b46900fe7a6c634920e470ebc582abd7a0f57c57d585b4e0dbbb5ad84f46ca8518132e684d44d33c62b0509461ed5b62b7e0f19b
-EBUILD rdma-core-24.0.ebuild 2394 BLAKE2B 41d23a8da59916065bba0a78ea358e2557f9f81ae1e3fe2ae430e1e98758d015ed72f8da5266dba850933bdcdc3b7ecc17889334480126604e486e50aaa7967c SHA512 2867f122ef0466090ec1fb8a199300f7c5b52fe68a2b57692c96583ea9d5d669d0df6cd0b2c5436d0085cc2a07a0412bce72fb66e2b6e2f4340c020f8a8abecc
-EBUILD rdma-core-25.0.ebuild 2443 BLAKE2B 8544079e018f49322806151b8e90738b565c02ebed4982954c558fe982d46f06b981258a9b1d7f824e3a500cd035f98d1bba50dabbf12866ade7097978adcd5a SHA512 2e7e2d490c870768ecbece72858bff12a732d72ba6da99ce5ff247712d199583fbdcae7699b544c62053f8d679aecb243bf4e4f02d364e3cd4d3f219c0832cd5
-EBUILD rdma-core-26.0.ebuild 2443 BLAKE2B fc1eead938c226fd7c238eacd6d70660fd2bb5e92b8ab3cc6a4edcbfe16ac424ffc6ab15d8ebb368991fe70c51234797416ca90abca4c7bedcc566e4802f33c9 SHA512 2a96af59412d92a230f354db417f68ebb31cb40f6d5be1ab6f630675076184e71b75d6ee9b3b0d6b134b9c2cd9be0432dfd2dfffef7a052fc7370f166390cefb
+DIST rdma-core-26.1.tar.gz 1601313 BLAKE2B 459baa80d5cb74386e567880ec7fd2de9e4aaea177e7022603db5dd70f633152d86618bbab637ca337a9314c0c19b5c0f6a51f281802fa0b8bedb8fad149f26c SHA512 98f0e3f3e951f3b2287711526a2a6c62cb4e0f5eb693894c7f44783c5eb6d4213c9eedc39b2370563e8bca17e133497e475392004ace0203d2a39de371254742
+EBUILD rdma-core-26.0.ebuild 2441 BLAKE2B a18a883e25718e06b3e679b7966af50822d5250f677226b22ace7afa9110c07ed297c64545346a03f13bb06229fcf1b0a812fb2147ebe2dc6421e16a343a86f1 SHA512 0fa5d951b3cd1ba8b5af633523695b6965d038196f16c78f4de32d4deaadfce64a29a3fc05e81ece9d9fcb4463ba2d6dab4ce365f7c061ddfb79f0911e0cfa84
+EBUILD rdma-core-26.1.ebuild 2443 BLAKE2B fc1eead938c226fd7c238eacd6d70660fd2bb5e92b8ab3cc6a4edcbfe16ac424ffc6ab15d8ebb368991fe70c51234797416ca90abca4c7bedcc566e4802f33c9 SHA512 2a96af59412d92a230f354db417f68ebb31cb40f6d5be1ab6f630675076184e71b75d6ee9b3b0d6b134b9c2cd9be0432dfd2dfffef7a052fc7370f166390cefb
 EBUILD rdma-core-9999.ebuild 2390 BLAKE2B 77f3af5fe37f08c92427e3e9d546ff3d4577d8c754274ab77633d93a5a44edca95e883a7d089cfb482f0cfaa9f375a65ac79f7bf77d285be4951cf7b9fdab4ec SHA512 e4df896afa8585fa3e58f55e1f7da6470ab08e7a8d3e5b36f29fb77b3d01cadda2d51e126a845bff76a51101d9211bcd517258813d4205a778c1cbd802b699a9
 MISC metadata.xml 559 BLAKE2B 1526777511ab5118d4de73361959107221858659ebbc60f52eb09b45d0798d969f847e4f157501ed6e8c85c2cee1c93d0b26989b357141bba45af946e2e5b0a1 SHA512 5d69acf3d0a323c0d2ee66971fd058c6c0ebf59e4fac0d4777b15bfcc7db8f515b67e6059d204346404ce3b26cdd77c2bea21e1132f418498fe1523eb16dccbb
diff --git a/sys-cluster/rdma-core/rdma-core-24.0.ebuild b/sys-cluster/rdma-core/rdma-core-24.0.ebuild
deleted file mode 100644
index f50ad59a5b0b..000000000000
--- a/sys-cluster/rdma-core/rdma-core-24.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit cmake-utils python-single-r1 udev systemd
-
-DESCRIPTION="Userspace components for the Linux Kernel's drivers/infiniband subsystem"
-HOMEPAGE="https://github.com/linux-rdma/rdma-core"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core"
-else
-	SRC_URI="https://github.com/linux-rdma/rdma-core/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
-SLOT="0"
-IUSE="neigh python static-libs systemd valgrind"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	virtual/libudev:=
-	neigh? ( dev-libs/libnl:3 )
-	systemd? ( sys-apps/systemd:= )
-	valgrind? ( dev-util/valgrind )
-	python? ( ${PYTHON_DEPS} )"
-
-DEPEND="${COMMON_DEPEND}
-	python? ( dev-python/cython[${PYTHON_USEDEP}] )"
-
-RDEPEND="${COMMON_DEPEND}
-	!sys-fabric/infiniband-diags
-	!sys-fabric/libibverbs
-	!sys-fabric/librdmacm
-	!sys-fabric/libibumad
-	!sys-fabric/ibacm
-	!sys-fabric/libibmad
-	!sys-fabric/srptools
-	!sys-fabric/infinipath-psm
-	!sys-fabric/libcxgb3
-	!sys-fabric/libcxgb4
-	!sys-fabric/libmthca
-	!sys-fabric/libmlx4
-	!sys-fabric/libmlx5
-	!sys-fabric/libocrdma
-	!sys-fabric/libnes"
-
-BDEPEND="virtual/pkgconfig"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_FULL_RUNDIR=/run
-		-DCMAKE_INSTALL_SHAREDSTATEDIR=/var/lib
-		-DCMAKE_INSTALL_UDEV_RULESDIR="$(get_udevdir)"/rules.d
-		-DCMAKE_INSTALL_SYSTEMD_SERVICEDIR="$(systemd_get_systemunitdir)"
-		-DCMAKE_DISABLE_FIND_PACKAGE_pandoc=yes
-		$(ver_test -ge 25 && echo -DCMAKE_DISABLE_FIND_PACKAGE_rst2man=yes)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Systemd="$(usex systemd no yes)"
-		-DENABLE_VALGRIND="$(usex valgrind)"
-		-DENABLE_RESOLVE_NEIGH="$(usex neigh)"
-		-DENABLE_STATIC="$(usex static-libs)"
-	)
-
-	if use python; then
-		mycmakeargs+=( -DNO_PYVERBS=OFF )
-	else
-		mycmakeargs+=( -DNO_PYVERBS=ON )
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	udev_dorules "${D}"/etc/udev/rules.d/70-persistent-ipoib.rules
-	rm -r "${D}"/etc/{udev,init.d} || die
-
-	newinitd "${FILESDIR}"/ibacm.init ibacm
-	newinitd "${FILESDIR}"/iwpmd.init iwpmd
-	newinitd "${FILESDIR}"/srpd.init srpd
-}
diff --git a/sys-cluster/rdma-core/rdma-core-26.0.ebuild b/sys-cluster/rdma-core/rdma-core-26.0.ebuild
index 3e47003b5b6b..326e3d699b0e 100644
--- a/sys-cluster/rdma-core/rdma-core-26.0.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-26.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core"
 else
 	SRC_URI="https://github.com/linux-rdma/rdma-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="|| ( GPL-2 ( CC0-1.0 MIT BSD BSD-with-attribution ) )"
diff --git a/sys-cluster/rdma-core/rdma-core-25.0.ebuild b/sys-cluster/rdma-core/rdma-core-26.1.ebuild
index c2d102716c98..3e47003b5b6b 100644
--- a/sys-cluster/rdma-core/rdma-core-25.0.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-26.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/linux-rdma/rdma-core"
 else
-	SRC_URI="https://github.com/linux-rdma/rdma-core/releases/download/v${PV}/${P}.tar.gz"
+	SRC_URI="https://github.com/linux-rdma/rdma-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi