Merge updates from master

14 files changed, 116 insertions, 72 deletions

diff --git a/app-portage/gentoopm/gentoopm-0.3.2-r2.ebuild b/app-portage/gentoopm/gentoopm-0.3.2-r2.ebuild
index f61a859929be..b91aa32ecd30 100644
--- a/app-portage/gentoopm/gentoopm-0.3.2-r2.ebuild
+++ b/app-portage/gentoopm/gentoopm-0.3.2-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/gentoopm/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips x86"
+KEYWORDS="amd64 arm arm64 ~mips x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-perl/Font-TTF/Font-TTF-1.60.0.ebuild b/dev-perl/Font-TTF/Font-TTF-1.60.0.ebuild
deleted file mode 100644
index 1c75c26ecd85..000000000000
--- a/dev-perl/Font-TTF/Font-TTF-1.60.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_AUTHOR=BHALLISSY
-DIST_VERSION=1.06
-inherit perl-module
-
-DESCRIPTION="module for compiling and altering fonts"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	virtual/perl-IO-Compress
-	dev-perl/IO-String
-	dev-perl/XML-Parser
-"
-DEPEND="${RDEPEND}"
-
-src_test() {
-	perl_rm_files t/changes.t
-	perl-module_src_test
-}
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
index f49f6a71ac49..c0525bd6d967 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-shell-extension-bing-wallpaper-27.tar.gz 7202160 BLAKE2B bb908ccf0c67a06f80ef34edaed6257c5ae1b00570d6f3ab15a9a9c330368a2ae658f019943bf1806c1c97573cc5612b3c7dd22720d3048d628fcc2c15336420 SHA512 eaedbcf7e442d86b06f13745ac7796789bd5c7ccb0e64a4fbe10d4f6a2917ef9b4b9c1733d56c6620e0e8b4c4ef1281fd0d48151938519dd28249f07d54382f2
 DIST gnome-shell-extension-bing-wallpaper-28.tar.gz 7204530 BLAKE2B f52f8e83d203e3c2ca0f5437079d463c9e51a9ff9e594ad26fc291c362c4e340781a362beca316d0164e972b5b52a749a2afaf9ff1af74fb8eff3217deb7dbe9 SHA512 8c292129e539b415f19c732691d833463e437b06e1bca5a42f34885c19f7b8c4ab450a07956c0adcfdf0bf279ca303b1577a9723e3ce535eefa73efded26ae6b
-DIST gnome-shell-extension-bing-wallpaper-29.tar.gz 4175058 BLAKE2B 0881999f0cf13b6108e57fd8f1cd23d307ae107c2d9a2292f736fbf2cd40ba009612cfe28028d51d52976176ce5e22184a13099ffead69d4a88aa39243712a49 SHA512 478f3bd89f67efb6dbde892d31c32eb62e9115c7cf94334e463e0c75090ff7b68ab4cb66dced7bdb510bec1f34cb9f7596d89411849d8c9c0466f011f76952c4
+DIST gnome-shell-extension-bing-wallpaper-30.tar.gz 4177860 BLAKE2B e11c6db54eabac4b64813f5439a4d9d6d2d25e4eac62d4cb9531c2d3f2ff7919d2c2eeb0e6778c1e1c0b63763312db5391a38bb09baa36c7f88289be02a913ef SHA512 541945c3aedb0bde9f4ab68914fe95f3e62e7ee3a92fb2fc7acda6f530e0cf908e94e792db20d243562201edf42bd6ca70123038261756baa82d83bb9af400fb
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-29.ebuild b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-30.ebuild
index c31bdf512404..c31bdf512404 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-29.ebuild
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-30.ebuild
diff --git a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
deleted file mode 100644
index 3e27e1485653..000000000000
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="jmk-x11-fonts-${PV}"
-
-DESCRIPTION="This package contains character-cell fonts for use with X"
-HOMEPAGE="http://www.jmknoble.net/fonts/"
-SRC_URI="http://www.pobox.com/~jmknoble/fonts/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc s390 sparc x86"
-
-BDEPEND="
-	x11-misc/imake
-	>=x11-apps/mkfontscale-1.2.0
-	x11-apps/bdftopcf"
-
-PATCHES=( "${FILESDIR}"/gzip.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	xmkmf || die
-	default
-}
-
-src_install() {
-	emake install INSTALL_DIR="${ED}/usr/share/fonts/jmk"
-	einstalldocs
-}
diff --git a/sys-cluster/rdma-core/Manifest b/sys-cluster/rdma-core/Manifest
index 1488868ffaee..2355b453c178 100644
--- a/sys-cluster/rdma-core/Manifest
+++ b/sys-cluster/rdma-core/Manifest
@@ -2,3 +2,4 @@ DIST rdma-core-30.0.tar.gz 1485452 BLAKE2B 8774a41eaba486007a4b695fc5196935102c1
 DIST rdma-core-31.0.tar.gz 1501133 BLAKE2B 5e67d68ab8eb4019ffb18e7d1995caa8e84a2136201c8649f64093a6c8b8c7b8255e997c12bfd38f33de5608e0fa58a35a1a45e144cf9a65bde671a9f087de1c SHA512 b453343d419ccdc7eb0ae7092dfc84cfcd39b0b64a3e4b3bae18b5078f8e9ce7b2c1c126c535372d4717bb5af3cf2ca26a70e271f00631c66077e619814865c0
 DIST rdma-core-32.0.tar.gz 1525119 BLAKE2B 8f754c04be3f13a90a162fde09f96b26d66534aa7284c12e6c0765390f00412cf34052cc1c313f01df8b8bc49cad459a72350cea6e08316387cd6016fd7cb019 SHA512 fbc458e47801b8869fa0a6a045c2ecf10b9021f8fe115cedad8601a4672f116f393a353dcac238ad297935950a09be4a6faa45e373ea6248711d077a57737c16
 DIST rdma-core-33.0.tar.gz 1549162 BLAKE2B 7b7c8711eaeb9e66159962bcf0f70644cbb4af96df70f3c9ee6e9d9c8c3e4de5d3248666a0b3fe490537f91cc18c5d09448c72b98c45585e0645594deedee071 SHA512 64ace358c6336519131aea858012e22791bf2ab95f06d655a87835361b5822f5ce0c29db8ddb83121a62f4606418d5fa11358e7ad84da4f93f6233fb3947e52c
+DIST rdma-core-34.0.tar.gz 1571236 BLAKE2B 1c6799ba742926ef99f8fa7a0e20d7b910e0f3157e5de4350f7068d7d6f4fa79b8fa6be631e9675517bd12b91083c5e92157a1c097691ead0888823702c3583a SHA512 33ce5fbf0d468a31f7ac0e513cf107e3d730f5db279368aa986536f70d684f40e7bacdf965d18b77922272b0420a6cd973c0b73371758107d8f7751be5851ee7
diff --git a/sys-cluster/rdma-core/rdma-core-30.0-r2.ebuild b/sys-cluster/rdma-core/rdma-core-30.0-r2.ebuild
index 9c1f190ade86..ce83f105d8b7 100644
--- a/sys-cluster/rdma-core/rdma-core-30.0-r2.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-30.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -79,7 +79,7 @@ src_configure() {
 	)
 
 	if use python; then
-		mycmakeargs+=( -DNO_PYVERBS=OFF )
+		mycmakeargs+=( -DNO_PYVERBS=OFF -DPYTHON_EXECUTABLE="${PYTHON}" )
 	else
 		mycmakeargs+=( -DNO_PYVERBS=ON )
 	fi
diff --git a/sys-cluster/rdma-core/rdma-core-31.0.ebuild b/sys-cluster/rdma-core/rdma-core-31.0.ebuild
index c41bde738b01..de6187a84feb 100644
--- a/sys-cluster/rdma-core/rdma-core-31.0.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-31.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -79,7 +79,7 @@ src_configure() {
 	)
 
 	if use python; then
-		mycmakeargs+=( -DNO_PYVERBS=OFF )
+		mycmakeargs+=( -DNO_PYVERBS=OFF -DPYTHON_EXECUTABLE="${PYTHON}" )
 	else
 		mycmakeargs+=( -DNO_PYVERBS=ON )
 	fi
diff --git a/sys-cluster/rdma-core/rdma-core-32.0-r1.ebuild b/sys-cluster/rdma-core/rdma-core-32.0-r1.ebuild
index f8daeb644520..ce3ac942f512 100644
--- a/sys-cluster/rdma-core/rdma-core-32.0-r1.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-32.0-r1.ebuild
@@ -79,7 +79,7 @@ src_configure() {
 	)
 
 	if use python; then
-		mycmakeargs+=( -DNO_PYVERBS=OFF )
+		mycmakeargs+=( -DNO_PYVERBS=OFF -DPYTHON_EXECUTABLE="${PYTHON}" )
 	else
 		mycmakeargs+=( -DNO_PYVERBS=ON )
 	fi
diff --git a/sys-cluster/rdma-core/rdma-core-32.0.ebuild b/sys-cluster/rdma-core/rdma-core-32.0.ebuild
index c41bde738b01..0eb085a071bc 100644
--- a/sys-cluster/rdma-core/rdma-core-32.0.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-32.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -79,7 +79,7 @@ src_configure() {
 	)
 
 	if use python; then
-		mycmakeargs+=( -DNO_PYVERBS=OFF )
+		mycmakeargs+=( -DNO_PYVERBS=OFF -DPYTHON_EXECUTABLE="${PYTHON}")
 	else
 		mycmakeargs+=( -DNO_PYVERBS=ON )
 	fi
diff --git a/sys-cluster/rdma-core/rdma-core-33.0-r1.ebuild b/sys-cluster/rdma-core/rdma-core-33.0-r1.ebuild
index d83a2529ce22..2eed6260b0d3 100644
--- a/sys-cluster/rdma-core/rdma-core-33.0-r1.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-33.0-r1.ebuild
@@ -79,7 +79,7 @@ src_configure() {
 	)
 
 	if use python; then
-		mycmakeargs+=( -DNO_PYVERBS=OFF )
+		mycmakeargs+=( -DNO_PYVERBS=OFF -DPYTHON_EXECUTABLE="${PYTHON}" )
 	else
 		mycmakeargs+=( -DNO_PYVERBS=ON )
 	fi
diff --git a/sys-cluster/rdma-core/rdma-core-33.0.ebuild b/sys-cluster/rdma-core/rdma-core-33.0.ebuild
index f6e231ffefad..de6187a84feb 100644
--- a/sys-cluster/rdma-core/rdma-core-33.0.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-33.0.ebuild
@@ -79,7 +79,7 @@ src_configure() {
 	)
 
 	if use python; then
-		mycmakeargs+=( -DNO_PYVERBS=OFF )
+		mycmakeargs+=( -DNO_PYVERBS=OFF -DPYTHON_EXECUTABLE="${PYTHON}" )
 	else
 		mycmakeargs+=( -DNO_PYVERBS=ON )
 	fi
diff --git a/sys-cluster/rdma-core/rdma-core-34.0.ebuild b/sys-cluster/rdma-core/rdma-core-34.0.ebuild
new file mode 100644
index 000000000000..2eed6260b0d3
--- /dev/null
+++ b/sys-cluster/rdma-core/rdma-core-34.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit cmake 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/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~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? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_MULTI_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"
+
+PATCHES=( "${FILESDIR}"/optional_pandoc.patch )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR=/etc
+		-DCMAKE_INSTALL_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 -DPYTHON_EXECUTABLE="${PYTHON}" )
+	else
+		mycmakeargs+=( -DNO_PYVERBS=ON )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	udev_dorules "${D}"/etc/udev/rules.d/70-persistent-ipoib.rules
+	rm -r "${D}"/etc/{udev,init.d} || die
+
+	if use neigh; then
+		newinitd "${FILESDIR}"/ibacm.init ibacm
+		newinitd "${FILESDIR}"/iwpmd.init iwpmd
+	fi
+	newinitd "${FILESDIR}"/srpd.init srpd
+
+	use python && python_optimize
+}
diff --git a/sys-cluster/rdma-core/rdma-core-9999.ebuild b/sys-cluster/rdma-core/rdma-core-9999.ebuild
index 22768de9389d..e5d5b606af7f 100644
--- a/sys-cluster/rdma-core/rdma-core-9999.ebuild
+++ b/sys-cluster/rdma-core/rdma-core-9999.ebuild
@@ -79,7 +79,7 @@ src_configure() {
 	)
 
 	if use python; then
-		mycmakeargs+=( -DNO_PYVERBS=OFF )
+		mycmakeargs+=( -DNO_PYVERBS=OFF -DPYTHON_EXECUTABLE="${PYTHON}" )
 	else
 		mycmakeargs+=( -DNO_PYVERBS=ON )
 	fi