Merge updates from master

app-misc/fastfetch/Manifest

@@ -1 +1 @@
-DIST fastfetch-20220120.tar.gz 177779 BLAKE2B 348b42b132c033db3830f74c2aab9ee40d88842c86ff395e14ba74863dbb353ad1f017ca9d8c136142e32c0492af193b735a6aab9bc973ace6d22162eb73d851 SHA512 1c4e8bd6ab4d21fec732007c3026ea690486ea5f3749115204235cff918e3e0479013ef19c65aeea6e38049a1d3fe0a05f1d1750cbae2b09e9caa64fe4945f2e
+DIST fastfetch-0.554.tar.gz 177779 BLAKE2B 348b42b132c033db3830f74c2aab9ee40d88842c86ff395e14ba74863dbb353ad1f017ca9d8c136142e32c0492af193b735a6aab9bc973ace6d22162eb73d851 SHA512 1c4e8bd6ab4d21fec732007c3026ea690486ea5f3749115204235cff918e3e0479013ef19c65aeea6e38049a1d3fe0a05f1d1750cbae2b09e9caa64fe4945f2e

app-misc/fastfetch/fastfetch-0.554.ebuild

@@ -6,8 +6,6 @@ EAPI=8
 inherit bash-completion-r1 cmake
 
 COMMIT="e30a64e97e0bf1c6bf68aa6f54a25c5995c2fdd2"
-VERSION_MAJOR="554"
-VERSION_MINOR="cd4739e"
 
 DESCRIPTION="Like neofetch but faster"
 HOMEPAGE="https://github.com/LinusDierheimer/fastfetch"
@@ -58,10 +56,12 @@ src_configure() {
 	use xfce || disable_check XFCONF libxfconf
 	use xrandr || disable_check XRANDR xrandr
 
+	VERSION_MAJOR="$(ver_cut 2)"
+
 	# version comes from git, fake it
 	sed -i -e "
-		s/\(PROJECT_VERSION\) .*$/\1 "r${VERSION_MAJOR}.${VERSION_MINOR}")/
-		s/\(PROJECT_VERSION_MAJOR\) .*$/\1 "${VERSION_MAJOR}")/" CMakeLists.txt || die "Cannot patch version"
+		s/\(PROJECT_VERSION\) .*$/\1 \"r${VERSION_MAJOR}.0\")/
+		s/\(PROJECT_VERSION_MAJOR\) .*$/\1 \"${VERSION_MAJOR}\")/" CMakeLists.txt || die "Cannot patch version"
 
 	cmake_src_configure
 }

app-text/katarakt/Manifest

@@ -1 +0,0 @@
-DIST katarakt-v0.2.tar.gz 52004 BLAKE2B af014425bbf9c36350f4c10e57d9668f4a362d786c660f032381f6cf68b006d384c88bb0f4cabee4c0bc8e5f01ad25a44ef38d100ddfdfe955a442313b77b322 SHA512 a07054e0e9915f6239b8149bbd08c8b5ec095b0e9ffb54e03761ad9e59914f66166e4b8359298721a6b46c2bcf5114f40ad117c4826a32660c1fba28f69b8e68

app-text/katarakt/files/katarakt-0.2-install.patch

@@ -1,26 +0,0 @@
-From 4801619c7752b317da8d57183f590d9c3cce42e1 Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach <kurt@kmk-computers.de>
-Date: Thu, 30 Jan 2020 19:22:05 +0100
-Subject: [PATCH] build: Install binary
-
-Add an install target for the binary.
-
-Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
----
- katarakt.pro | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/katarakt.pro b/katarakt.pro
-index a632713db2ce..220dfd68b1b9 100644
---- a/katarakt.pro
-+++ b/katarakt.pro
-@@ -57,3 +57,6 @@ web.depends = $$website.target
- web.CONFIG = phony
- 
- QMAKE_EXTRA_TARGETS += documentation website doc web
-+
-+target.path = $$INSTALL_ROOT/$$PREFIX/bin/
-+INSTALLS += target
--- 
-2.24.1
-

app-text/katarakt/files/katarakt-0.2-poppler.patch

@@ -1,29 +0,0 @@
-From 23b68e9c48204d43b37b23735ad9ea0b219fec7b Mon Sep 17 00:00:00 2001
-From: Philipp Erhardt <Philipp.Erhardt@informatik.stud.uni-erlangen.de>
-Date: Mon, 19 Oct 2020 20:42:37 +0200
-Subject: [PATCH] Fix compilation if the version number contains a leading zero
-
----
- katarakt.pro | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/katarakt.pro b/katarakt.pro
-index a632713db2ce..84cd59797d0a 100644
---- a/katarakt.pro
-+++ b/katarakt.pro
-@@ -17,9 +17,9 @@ unix {
- 
-     isEmpty(PKG_CONFIG):PKG_CONFIG = pkg-config    # same as in link_pkgconfig.prf
-     POPPLER_VERSION = $$system($$PKG_CONFIG --modversion $$POPPLER)
--    POPPLER_VERSION_MAJOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 1)
--    POPPLER_VERSION_MINOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 2)
--    POPPLER_VERSION_MICRO = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 3)
-+    POPPLER_VERSION_MAJOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 1 | sed "\'s,^0*\\(.\\),\1,\'")
-+    POPPLER_VERSION_MINOR = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 2 | sed "\'s,^0*\\(.\\),\1,\'")
-+    POPPLER_VERSION_MICRO = $$system(echo "$$POPPLER_VERSION" | cut -d . -f 3 | sed "\'s,^0*\\(.\\),\1,\'")
- 
-     DEFINES += POPPLER_VERSION_MAJOR=$$POPPLER_VERSION_MAJOR
-     DEFINES += POPPLER_VERSION_MINOR=$$POPPLER_VERSION_MINOR
--- 
-2.33.0
-

app-text/katarakt/katarakt-0.2.ebuild

@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit qmake-utils
-
-DESCRIPTION="Simple PDF viewer"
-HOMEPAGE="https://gitlab.cs.fau.de/Qui_Sum/katarakt"
-SRC_URI="https://gitlab.cs.fau.de/Qui_Sum/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="
-	app-text/asciidoc
-	virtual/pkgconfig"
-RDEPEND="
-	app-text/poppler[qt5]
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-install.patch"
-	"${FILESDIR}/${P}-poppler.patch"
-)
-
-src_configure() {
-	eqmake5 PREFIX="${EPREFIX}/usr"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	emake doc
-	doman doc/katarakt.1
-}

app-text/katarakt/metadata.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>kurt@kmk-computers.de</email>
-    <name>Kurt Kanzenbach</name>
-  </maintainer>
-  <longdescription lang="en">
-    katarakt is a simple PDF viewer. It is designed to use as much available
-    screen space as possible.
-
-    There are currently two layouts. The presentation layout is very simple and
-    only supports scrolling on a per page basis. As the name suggests the
-    current page is displayed in the center and zoomed to fit the window. It is
-    active by default.
-
-    The grid layout is much more advanced and offers continuous (smooth, per
-    pixel) scrolling, zooming and adjusting the column count. Pages keep their
-    correct relative size and are shown in a grid.
-  </longdescription>
-</pkgmetadata>

app-vim/dracula/Manifest

@@ -0,0 +1 @@
+DIST dracula-2.0.0-vim.tar.gz 12112 BLAKE2B 08fe4e138ad34f9cebbf88836d30ff2cb12e58817d192d9b2d1f40b9f9fe0f30e3686754d7f87ebba14d748e5f1bd48d10acd14b6391681054ad2adb83fc5093 SHA512 cd86681aff1bd5dfc3b6747e7468fa192776c00cd10dbf6ae99703a679f2576d7c9e1439a829c22459b7bc3248d3657213c6a8d68acd579bb90cf496fa089c71

app-vim/dracula/dracula-2.0.0.ebuild

@@ -0,0 +1,31 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+DESCRIPTION="Dark theme for Vim"
+HOMEPAGE="https://draculatheme.com/vim"
+SRC_URI="https://github.com/${PN}/vim/archive/refs/tags/v${PV}.tar.gz -> ${P}-vim.tar.gz"
+S="${WORKDIR}/vim-${PV}"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+
+VIM_PLUGIN_HELPFILES="dracula"
+
+src_prepare() {
+	default
+	rm -r .github || die
+
+	# collision with app-vim/airline-themes
+	rm -r autoload/airline || die
+
+	# avoid collision with other packages
+	cd after/syntax || die
+	for file in *.vim; do
+		mkdir "${file%.vim}" || die
+		mv "${file}" "${file%.vim}/${PN}.vim" || die
+	done
+}

app-vim/dracula/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">dracula/vim</remote-id>
+	</upstream>
+</pkgmetadata>

app-vim/tempus/Manifest

@@ -0,0 +1 @@
+DIST tempus-themes-vim-b720ee2d4c5588b5a27bb3544d3ded5ee1acab45.tar.gz 32983 BLAKE2B adc0420ac75c2cd7e11f92a59164d8eec6b2a179cc7b14dbdc4fa3de5a5d97587cb98d4fde6b42b072d55339826b17e4e7a527eab5dd0b4733a81bedb630ab49 SHA512 f0401d5ed86a512bab2ef730aecfbcf34c4f35fc5a4de515340e58db05b18d09440986185129893c85ef8122b371e1403308552f0b1e940859fb2304518486bf

app-vim/tempus/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">protesilaos/tempus-themes-vim</remote-id>
+	</upstream>
+</pkgmetadata>

app-vim/tempus/tempus-2.0.0.20210514.ebuild

@@ -0,0 +1,17 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vim-plugin
+
+COMMIT="b720ee2d4c5588b5a27bb3544d3ded5ee1acab45"
+DESCRIPTION="Accessible themes for Vim"
+HOMEPAGE="https://protesilaos.com/tempus-themes/"
+SRC_URI="https://gitlab.com/protesilaos/${PN}-themes-vim/-/archive/${COMMIT}/${PN}-themes-vim-${COMMIT}.tar.gz"
+S="${WORKDIR}/${PN}-themes-vim-${COMMIT}"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64"
+
+DOCS=( CONTRIBUTING.md README.md )

dev-libs/tfdn/Manifest

@@ -1,2 +1,2 @@
-DIST tfdn-1.0.2.tar.gz 205745 BLAKE2B 6e807c07d11b8120144a0d25f5c3ffb1f0f7b0b6397439bf16af8df3cab615782700966ff8c616c80213bd193edf4a2ba2e66b84a641560bbe1bf99da3d790e2 SHA512 fade7799ed2f890b2076567b7aaf7765520e4198fcee0fb394249a8d010ef6454c7807e406069fc916ddd63f7c54d054146b0d369c05dec9f92fcefa01a00521
 DIST tfdn-1.0.3.tar.gz 205741 BLAKE2B 35065a0fc270cc7075a7223dcb69af110eb786f7358623555d3b1cf8061cd5fb4cddee8659c7ecb60389dc83fe367916372e2757cd58e82fb5926919bce8eeb9 SHA512 7d4d48a077e5ee43180d80e9e770ebb93c49750a10bd941bec1a71e17714619167c4be5d02fb7f0f3cf9f8380a3a28b9bd4e204bec59b28b21bcc1bbc905a33f
+DIST tfdn-1.1.0.tar.gz 206457 BLAKE2B fe8f7a23cb116fc28f8206d3cc085b95a54def69366d0d1ace2174cf4ee5e28fdbd95ffa29b2ea9c716081f3397e7a044fd1205488ad1e5cb1cf0924df02bdfe SHA512 de738bccda56e914bb7ea112318b5272512c10d27a62abc296eba0ff0d100f42555c807d57d59a5efe4f200c90de113652d26dece2cf9665b110dda1dfd49146

dev-libs/tfdn/tfdn-1.1.0.ebuild

@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

dev-libs/zlib-google/Manifest

@@ -0,0 +1 @@
+DIST zlib-google-97.0.4692.13.tar.gz 313211 BLAKE2B 2bf86ea9c3ffa84d3af1da212bc678695e3a7183adf6f1250d9b90d638ba2d1742551d00e0bc45e3739fca75afe2320df21d7ed93d173b2cf66afd7a3721f22f SHA512 2e71d60b1af38525559f1207b629d035221143e5e53edb73413683457a28b2db195afdd0c9c8b7a54eadeb04594478239cd8b7a2fa97f4cb7f690697704e1529

dev-libs/zlib-google/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lssndrbarbieri@gmail.com</email>
+    <name>Alessandro Barbieri</name>
+  </maintainer>
+</pkgmetadata>

dev-libs/zlib-google/zlib-google-97.0.4692.13.ebuild

@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="google zlib extras"
+HOMEPAGE="https://chromium.googlesource.com/chromium/src/+/refs/heads/main/third_party/zlib/google"
+SRC_URI="https://chromium.googlesource.com/chromium/src/+archive/refs/tags/${PV}/third_party/zlib.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"
+
+KEYWORDS="~amd64"
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	cd google || die
+
+	tc-export CXX
+
+	${CXX} \
+		${CXXFLAGS} \
+		${LDFLAGS} \
+		-DUSE_SYSTEM_ZLIB \
+		-fPIC \
+		-shared \
+		-I. \
+		-Wl,-soname,libzlib_compression_utils_portable.so \
+		compression_utils_portable.cc \
+		-o libzlib_compression_utils_portable.so \
+		-lz \
+		|| die
+}
+
+src_install() {
+	cd google || die
+	dolib.so libzlib_compression_utils_portable.so
+	doheader compression_utils_portable.h
+}

dev-python/aodhclient/aodhclient-2.3.0.ebuild

@@ -39,7 +39,6 @@ DEPEND="
 		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
 		>=dev-python/reno-1.6.2[${PYTHON_USEDEP}]
 		>=dev-python/tempest-10[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
 		>=dev-python/pifpaf-0.23[${PYTHON_USEDEP}]
 		dev-python/gnocchi[${PYTHON_USEDEP}]

dev-python/automaton/Manifest

@@ -1 +1 @@
-DIST automaton-2.2.0.tar.gz 31629 BLAKE2B 1db3968bf2eb3dcec77edd6ca8f7ad6afd16d4e1a23fe3f5520ab78d8b78e817cf9bde14bb008e8740fdbd03e4b871361402283407133def0c15485962a210ce SHA512 9b773ac93f17542800b93e36ca8b42ab522b2fb1c72d36256a62a37463e49e9f299fbdb9d4507b7f2a6cf678bbcd16fc86be9d20720acf0b254e1bacca4c0300
+DIST automaton-2.4.0.tar.gz 34381 BLAKE2B dda40e6e8b5978e808e80a83581b7c101cca2d5abfd9f46388960608979ce44a1a6457e4cdcb7e7b527f3527c83c0db994c8c55908f61bacd5369ef1bce585fa SHA512 e399fd12fd883112d49aff0d092fbc2b51952a24e3b40eae47d0bd7f5e2648689ab76413a2d404ef686ce5622e4661db1beb3e44a690c5c0279b85f69d267ecd

dev-python/automaton/automaton-2.2.0.ebuild

@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_8 )
-
-inherit distutils-r1
-
-DESCRIPTION="Friendly state machines for python."
-HOMEPAGE="https://pypi.org/project/automaton/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
-"

dev-python/automaton/automaton-2.4.0.ebuild

@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="Friendly state machines for python."
+HOMEPAGE="
+	https://pypi.org/project/automaton
+	https://opendev.org/openstack/automaton
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-3.1.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest

dev-python/castellan/castellan-3.9.1.ebuild

@@ -39,11 +39,9 @@ DEPEND="
 		>=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}]
 		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.6.0[${PYTHON_USEDEP}]
 		>=dev-python/pifpaf-0.10.0[${PYTHON_USEDEP}]
 	)
 "

dev-python/etcd3/Manifest

@@ -0,0 +1 @@
+DIST etcd3-0.12.0.tar.gz 63926 BLAKE2B adf6df5f1ced114387572c6a3361c7c57298b27be173fb91416ff989f7a252c81c1fcbe0bbbda3815102ad06fb2053d0585517ec75457a54e9617e61c6b53969 SHA512 d31cf0059036af91b489d6197fcda71314b5dcd068b6095212e1fec39d55b0bc4e943da3fdda6131fd1a6d48741334f5659e470c3284f0c6ab1a39d662d7d78a

dev-python/etcd3/etcd3-0.12.0.ebuild

@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for the etcd API v3"
+HOMEPAGE="
+	https://pypi.org/project/etcd3
+	https://github.com/kragniz/python-etcd3
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/grpcio-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/tenacity-5.0.2[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.6.1[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/grpcio-tools[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pifpaf[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest

dev-python/etcd3/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">etcd3</remote-id>
+	</upstream>
+</pkgmetadata>

dev-python/gabbi/gabbi-2.3.0.ebuild

@@ -32,7 +32,6 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	test? (
-		dev-python/stestr[${PYTHON_USEDEP}]
 	)
 "
 

dev-python/glance_store/glance_store-2.7.0.ebuild

@@ -53,7 +53,6 @@ DEPEND="
 		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
 		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
 		>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]

dev-python/iuliia/Manifest

@@ -1 +1,2 @@
 DIST iuliia-0.11.4.tar.gz 21376 BLAKE2B 181c7ace6ff35c10d6dbb1669621f94e51391ae4dc22c0f1d046856c99c7fce2dfd8d70f395b9dfa58d00212f3010049d02bcf8cf1ff9ac215274ae31236355e SHA512 29b36c1df9ddd4ddd0700d93f42615729984e82b20e5b8d9e72040936ee50b6df06cea95eca98497d12992913a6618ab67900d2f60e32f6c8d1043e784781827
+DIST iuliia-0.11.5.tar.gz 21585 BLAKE2B 99492fb2783b92ed36231fdaaf06ff405e4ec29fa0766a29657a4fce901050e995cb88238fccffbd7bb80ab949d4b6428ad6cb251cb35568d7b95f4e650e0686 SHA512 86e9dbff7a32486ed35782055fdabb6abb014ceb4e4f26acc0933007f4be11ccbb439e13d01edfcadd19b64e241bfacbce1d4e2faf368d9aa697f3d307b4ff84

dev-python/iuliia/iuliia-0.11.5.ebuild

@@ -0,0 +1,22 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+DISTUTILS_USE_PEP517="flit"
+inherit distutils-r1
+
+DESCRIPTION="Transliterate Cyrillic to Latin in every possible way"
+HOMEPAGE="
+	https://dangry.ru/iuliia/
+	https://pypi.org/project/iuliia
+	https://github.com/nalgeon/iuliia-py
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest

dev-python/keystonemiddleware/keystonemiddleware-9.3.0.ebuild

@@ -45,13 +45,11 @@ BDEPEND="
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
 		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
 		>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 		>=dev-python/python-memcached-1.59[${PYTHON_USEDEP}]
 		>=dev-python/webtest-2.0.27[${PYTHON_USEDEP}]
 		>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
 	)
 "
 

dev-python/ldappool/Manifest

@@ -1 +1 @@
-DIST ldappool-2.4.1.tar.gz 18611 BLAKE2B 44de0b3b3c4ef94e232189216e55c0adf85b51e4d6e2e7c47a6c9dca455e9e09919bc04e264e027e4ba96af8dc7315a78e5094f5ed2ccd4c8f6c3952da38370f SHA512 ea22290d9acc7f90093cb27aacbf339e1edbad33780051db263cc5254d0b42494e6dd67da9f5e506f09c5867a69afbea89d14e0c3aac47233cba0ffe361b1a75
+DIST ldappool-3.0.0.tar.gz 22373 BLAKE2B 077a4cac18185860790cb57b4bbc858c9e8bb9dfe8df61732ee10e3ec037508e198c085a0163b8fade62cf61e491f16a691720a7fa8e23190302c5dcee6728ab SHA512 75491fa41b09ab9416397d40a596801c2f1ac133cb3946dcaf2f502414ca8241b72ccd8a106b8e04ff133cd5d568e3ed88795ca8c84b973f7be0c49ba123df31

dev-python/ldappool/ldappool-3.0.0.ebuild

@@ -1,26 +1,34 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_8 )
+EAPI=8
+
 DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_8 )
 
 inherit distutils-r1
 
 DESCRIPTION="A connection pool for python-ldap"
-HOMEPAGE="https://launchpad.net/oslo"
+HOMEPAGE="
+	https://pypi.org/project/ldappool
+	https://opendev.org/openstack/ldappool
+	https://launchpad.net/ldappool
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64"
 
-DEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-"
 RDEPEND="
 	>=dev-python/python-ldap-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
 "
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest

dev-python/neutron-lib/neutron-lib-2.15.0.ebuild

@@ -56,12 +56,10 @@ DEPEND="
 	${RDEPEND}
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	test? (
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
 		>=dev-python/reno-3.1.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]

dev-python/os-brick/os-brick-5.0.1.ebuild

@@ -41,11 +41,9 @@ DEPEND="
 		>=dev-python/oslotest-4.4.1[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.5.0[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.4.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/oslo-vmware-3.8.0[${PYTHON_USEDEP}]
 		>=dev-python/castellan-3.7.0[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.6.0[${PYTHON_USEDEP}]
 	)
 "
 

dev-python/os-ken/os-ken-2.1.0.ebuild

@@ -35,7 +35,6 @@ DEPEND="
 	test? (
 		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-1.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 
 		dev-python/lxml[${PYTHON_USEDEP}]

dev-python/os-testr/os-testr-2.0.1.ebuild

@@ -21,7 +21,6 @@ KEYWORDS="~amd64"
 
 RDEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stestr-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 "

dev-python/os-traits/os-traits-2.6.0.ebuild

@@ -25,7 +25,6 @@ DEPEND="
 	${RDEPEND}
 	test? (
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 	)

dev-python/os-win/os-win-5.5.0.ebuild

@@ -60,7 +60,6 @@ DEPEND="
 	test? (
 		>=dev-python/ddt-1.2.1[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.8.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 	)

dev-python/oslo-db/oslo-db-11.0.0.ebuild

@@ -53,9 +53,7 @@ DEPEND="
 		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
 		>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.6.0[${PYTHON_USEDEP}]
 		>=dev-python/pifpaf-0.10.0[${PYTHON_USEDEP}]
 		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
 		>=dev-python/psycopg-2.8.0[${PYTHON_USEDEP}]

dev-python/oslo-messaging/oslo-messaging-12.9.1.ebuild

@@ -44,14 +44,12 @@ DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
 		>=dev-python/pifpaf-2.2.0[${PYTHON_USEDEP}]
 		>=dev-python/confluent-kafka-1.3.0[${PYTHON_USEDEP}]
 		>=dev-python/pyngus-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.6.0[${PYTHON_USEDEP}]
 		>=dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
 		>=dev-python/greenlet-0.4.15[${PYTHON_USEDEP}]
 	)

dev-python/oslo-metrics/oslo-metrics-0.3.0.ebuild

@@ -32,8 +32,6 @@ DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.6.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 	)
 "
 

dev-python/oslo-middleware/oslo-middleware-4.4.0.ebuild

@@ -41,8 +41,6 @@ BDEPEND="
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 		>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 	)
 "
 

dev-python/oslo-reports/oslo-reports-2.3.0.ebuild

@@ -32,11 +32,9 @@ DEPEND="
 	${RDEPEND}
 	test? (
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
 		>=dev-python/eventlet-0.18.2[${PYTHON_USEDEP}]
 		>=dev-python/greenlet-0.4.15[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.6.0[${PYTHON_USEDEP}]
 	)
 "
 

dev-python/oslo-rootwrap/oslo-rootwrap-6.3.0.ebuild

@@ -27,11 +27,9 @@ DEPEND="
 	test? (
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
 		>=dev-python/eventlet-0.18.2[${PYTHON_USEDEP}]
 		>=dev-python/reno-3.1.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.3.0[${PYTHON_USEDEP}]
 	)
 "
 

dev-python/oslo-service/oslo-service-2.6.0.ebuild

@@ -45,7 +45,6 @@ DEPEND="
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
 		>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 	)
 "
 

dev-python/oslo-versionedobjects/oslo-versionedobjects-2.5.0.ebuild

@@ -41,9 +41,7 @@ DEPEND="
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 		>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.3.0[${PYTHON_USEDEP}]
 	)
 "
 

dev-python/oslo-vmware/oslo-vmware-3.9.1.ebuild

@@ -42,8 +42,6 @@ DEPEND="
 	test? (
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.3.0[${PYTHON_USEDEP}]
 		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
 		>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
 	)

dev-python/osprofiler/osprofiler-3.4.2.ebuild

@@ -42,9 +42,7 @@ DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.6.0[${PYTHON_USEDEP}]
 		>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
 		>=dev-python/elasticsearch-py-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/redis-py-2.10.0[${PYTHON_USEDEP}]

dev-python/ovsdbapp/ovsdbapp-1.12.0.ebuild

@@ -31,7 +31,6 @@ DEPEND="
 	test? (
 		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 		net-misc/openvswitch

dev-python/pure-protobuf/Manifest

@@ -1,2 +1 @@
-DIST pure-protobuf-2.0.0.tar.gz 17576 BLAKE2B 49979559b3c08eb9abdddfa80e78ca4d953347a005b042d5b69aa4c6caef185c358408b1bf54d9161c0cadf69422b1ed033c74b324e947328c55f8b6ec4fd050 SHA512 a8d5211f34d0d6fab28d8b54fb3bb87d41a13b61a01f6f79f47fc1c0eafaf1ab17ddfd323c1035fcd4794b7b23823f48f38af3aa485835683f824cdd4689b098
-DIST pure-protobuf-2.0.1.tar.gz 15205 BLAKE2B 976fd1db77d8fcbc07c3bbdd277989c33b31186b67e773a3ea0bdce703f5aa2bf77938aa13a252672f2b710ccc9df084031a6f6855791b7465d3b5623bd33fed SHA512 75b6c735715e69240ad24e38f6692a181e9382daa4eeb9b3747873c5edbd16cee0ceaa1a773402129b8a60d7741411cf703bc7a8dd26b4433e60925a1380d3f1
+DIST pure-protobuf-2.1.0.tar.gz 15566 BLAKE2B 9e07c5dc70c928bfb20504c58f60cdea51dbc45a41134cf95056829b1aec3b5f1f4e684d101332c5764349fda863aa11301c6eab99eb4c34b74a43161640ba8b SHA512 7c76eaf866a7cdddc886a583883f4aec502c4edb1952902b8a6a259b10d0577adc94874e1e1dfc0378690791872248d878e0448925ab68468bd71a194dc100fc

dev-python/pure-protobuf/pure-protobuf-2.0.0-r1.ebuild

@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_8 )
-
-inherit distutils-r1
-
-DESCRIPTION="A more Pythonic version of doxypy, a Doxygen filter for Python"
-HOMEPAGE="
-	https://github.com/eigenein/protobuf
-	https://pypi.org/project/pure-protobuf/
-"
-SRC_URI="https://github.com/eigenein/protobuf/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-S="${WORKDIR}/protobuf-${PV}"
-
-distutils_enable_tests pytest
-
-PATCHES="${FILESDIR}/${PN}-do-not-install-tests.patch"

dev-python/pure-protobuf/pure-protobuf-2.1.0.ebuild

@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-
+DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
 DESCRIPTION="Python implementation of Protocol Buffers data types with dataclasses support"
@@ -13,10 +13,12 @@ HOMEPAGE="
 	https://pypi.org/project/pure-protobuf/
 "
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-S="${WORKDIR}/protobuf-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
+# ModuleNotFoundError
+RESTRICT="test"
+
 distutils_enable_tests pytest

dev-python/python-barbicanclient/python-barbicanclient-5.2.0.ebuild

@@ -35,7 +35,6 @@ DEPEND="
 	test? (
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]

dev-python/python-blazarclient/python-blazarclient-3.3.1.ebuild

@@ -35,7 +35,6 @@ DEPEND="
 	test? (
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 	)
 "

dev-python/python-designateclient/python-designateclient-4.3.0.ebuild

@@ -39,7 +39,6 @@ BDEPEND="
 		>=dev-python/os-testr-1.0.0[${PYTHON_USEDEP}]
 		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
 		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/reno-3.1.0[${PYTHON_USEDEP}]
 		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
 	)

dev-python/python-heatclient/python-heatclient-2.4.0.ebuild

@@ -41,7 +41,6 @@ BDEPEND="
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
 		>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]

dev-python/python-magnumclient/python-magnumclient-3.5.0.ebuild

@@ -39,12 +39,10 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	test? (
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
 		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 	)

dev-python/python-manilaclient/Manifest

@@ -1 +1 @@
-DIST python-manilaclient-3.0.0.tar.gz 307814 BLAKE2B acc8dbd42f44e9d05f69d38823efd347b9d558f937dd76f985d734bff04cc869590a9b4dd2a1b16b76f4921febdf25701c11984c1475837bacef3871fccf55e4 SHA512 831de81e02745918c17282ddd382e61800123dba74edca6918dbf37270d95edeaaa8cc4afff7341c32dd9ebe786b801a9c4d6fe14d082e5fa9dfa4d294fbeb2e
+DIST python-manilaclient-3.1.0.tar.gz 309246 BLAKE2B aeaac9665237d6af918fbec243e010755cdaef5f1a2f73af39641fdb077c6266cce5e8848e6ac9df5cb9001c27bcfa886620db20f03b38593ba5542f46dd058d SHA512 01f7bdf8c01a6b26c66c202c5472a819563264f8cc7fb29dc0d9ff95831866535ed11c8c77e1c0e6f333fd0028d3f4fda3fe4b2c23f693e17ea003ceb5b5b862

dev-python/python-manilaclient/python-manilaclient-3.1.0.ebuild

@@ -25,10 +25,9 @@ RDEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
 	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
 	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
 	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
@@ -36,8 +35,8 @@ RDEPEND="
 	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
 	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	test? (
 		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]

dev-python/python-mistralclient/python-mistralclient-4.3.0.ebuild

@@ -40,7 +40,6 @@ BDEPEND="
 		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
 		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
 		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
 	)
 "

dev-python/python-monascaclient/python-monascaclient-2.4.0.ebuild

@@ -32,8 +32,6 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	test? (
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-1.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 	)

dev-python/python-octaviaclient/python-octaviaclient-2.4.0.ebuild

@@ -35,10 +35,8 @@ DEPEND="
 	test? (
 		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
 		>=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
 		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 	)
 "

dev-python/python-saharaclient/python-saharaclient-3.4.0.ebuild

@@ -37,7 +37,6 @@ DEPEND="
 	${RDEPEND}
 	test? (
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-1.0.0[${PYTHON_USEDEP}]
 		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
 	)
 "

dev-python/python-senlinclient/python-senlinclient-2.3.0.ebuild

@@ -37,13 +37,11 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	test? (
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
 		>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
 		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 	)

dev-python/python-troveclient/python-troveclient-7.1.1.ebuild

@@ -39,7 +39,6 @@ DEPEND="
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
 		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 		>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]

dev-python/python-vitrageclient/python-vitrageclient-4.4.0.ebuild

@@ -35,7 +35,6 @@ DEPEND="
 	test? (
 		>=dev-python/subunit-1.2.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.3.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-1.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.5.0[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 	)

dev-python/python-zaqarclient/python-zaqarclient-2.2.0.ebuild

@@ -39,7 +39,6 @@ DEPEND="
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-1.0.0[${PYTHON_USEDEP}]
 		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
 		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
 	)

dev-python/python-zunclient/python-zunclient-4.3.0.ebuild

@@ -36,11 +36,9 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	test? (
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
 		>=dev-python/ddt-1.0.1[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
 		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
 		>=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
 		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]

dev-python/taskflow/Manifest

@@ -1 +1 @@
-DIST taskflow-4.5.0.tar.gz 1068584 BLAKE2B 53d3541f99df2b38f1b5ee822017d71d9fe0188b4c8542fed328a316c35215a093a49058638cc6d28dcb85a0d057505958f6e814db010fcb9b17040aa281c93b SHA512 d5245cd5c80ace671f84d222c874db8078d277cbf95b7f03bb1b6b55bb72dad9f8a97d11d2e7a427ffd316b792c18c270018f802fe420b4ed5ab42bfa6f47684
+DIST taskflow-4.6.3.tar.gz 1076461 BLAKE2B 9a95bfb7f8ef7e06dbf90a29be202d7361f798e41af2700b8713d22e526612905471f4cf269f18f642d01a430f22d321cda981146b672a11ce8dc81b0479f849 SHA512 b024cccc04f8ad5f57515381d1175f4e1ad654fe8f345da1cf041035e40b0a91e0e81bf2203b4df33c5426276ea0b99afb83b6f0759f5fc7da469cc33e75d514

dev-python/taskflow/taskflow-4.6.3.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,20 +8,19 @@ PYTHON_COMPAT=( python3_8 )
 inherit distutils-r1
 
 DESCRIPTION="A library to do [jobs, tasks, flows] in a HA manner using different backends"
-HOMEPAGE="https://github.com/openstack/taskflow"
+HOMEPAGE="
+	https://github.com/openstack/taskflow
+	https://opendev.org/openstack/taskflow
+	https://pypi.org/project/taskflow
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64"
 
 DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
@@ -31,8 +30,28 @@ RDEPEND="
 	>=dev-python/automaton-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
 	>=dev-python/tenacity-6.0.0[${PYTHON_USEDEP}]
 	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/pydot-1.2.4[${PYTHON_USEDEP}]
 "
+
+RDEPEND="${DEPEND}"
+BDEPEND="
+	test? (
+		>=dev-python/kazoo-2.6.0[${PYTHON_USEDEP}]
+		>=dev-python/kombu-4.3.0[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.18.2[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		>=dev-python/alembic-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/SQLAlchemy-Utils-0.30.11[${PYTHON_USEDEP}]
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		>=dev-python/psycopg-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/pydotplus-2.0.2[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+
+	)
+"
+
+distutils_enable_tests pytest

gui-apps/sfwbar/Manifest

@@ -1,5 +1,2 @@
-DIST sfwbar-0.9.10.1.tar.gz 214168 BLAKE2B d9ff7fbf500c5f24a0ad787c2ea73d8c19dc8755f821cb167a00f4e3b3b07559f70c23d1e391df6caf22d7258f12d0a6f0f98614031c7bb70f9d7fadf1eecf92 SHA512 42f55e42b90c1fd4a30f2ac8a83004f7e17bb6e9716796e88ec28e4526a59143abe1f6f91eaae4c4c663481eb8d4ca883bff056b1fc3c2b0e9b55dfd00ce0d7a
-DIST sfwbar-0.9.7.tar.gz 98524 BLAKE2B 151c0065584858bc3f7e0d092df859840b1806c4f122962e160b9211fc7b6fbfc99febb02f98eb798ef986e37e9e52e5b3d4ec1f36f5da7e9766b8598c014e1f SHA512 e9f214eaf1fa9741fd32c3689b3eb7c9ac1db831c327f7d6e55b876e50dade1514091083e4ee0ab7f3cbc69e07e7f8f73242a54c5ffbb2fddfd1bddb8d33b591
-DIST sfwbar-0.9.8.tar.gz 197627 BLAKE2B 352bf354fd55541c6d554ed4fbb2f1f766d00c6fd06ddf94ec640abfd11c95ede0fb9660906105fa390add7d0f34d9ba778a257ab04c3f20ae900a0d96127a40 SHA512 514bff2752756706d03e8ba71078a35b4bb552d3983c0cbe1e139f415ade705b34bc6abf478feee0e98f36865aca0aa21b72b37bbd0393e6d4bb61eddf7ab377
-DIST sfwbar-0.9.9.3.tar.gz 208100 BLAKE2B eb31d249eb032435f1553991ffd58c244731dfbe15f570aa53fe35dfa583841e0a3fa8bc1b907e1d89b28aa7e9f2bcef556e163372f6a7be0afeeddfe05cba04 SHA512 a8cccaed028e32b924609bb6d6b502bccbfe70c1179aab6f50d82a52ddef705de268660613c530d011513a8f72d8785578d75287ad5280c7cf39306d6457e5b7
 DIST sfwbar-1.0_beta2.tar.gz 194345 BLAKE2B d34f0609a403daa2a995500adf9443aeed98e399d43ecfd0819cf0e34845e2376db114efe2e7ee31bef4958c2951427916b4b82013a8c654db49cb1b2dc14468 SHA512 a69bd9bcd763096d2ee9c46a0f13fc578b0671aea04027dd3fb6d41385a8e6fc57a06ff63068634b28128bac8e5355e543303be1da59d4b1adc2b5fadc5c8f63
+DIST sfwbar-1.0_beta3.tar.gz 220599 BLAKE2B 4cc44c659c63d90a7485387d4972e65bc08256d5a6d140c74fe768e3f174c6bb4aba88602c34c44b816f33790cbcb6df13f750c741f64ca26a2d783be220fd32 SHA512 7b26941f003eefae169ea5a183a06387aff8f2b4018f16e6472dddd5e38661e257f1d2a0447b82b44af09afc6b99af34893cb82524e536d70891918ac1699d76

gui-apps/sfwbar/sfwbar-0.9.7.ebuild

@@ -1,25 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Sway Floating Window Bar"
-HOMEPAGE="https://github.com/LBCrion/sfwbar"
-SRC_URI="https://github.com/LBCrion/sfwbar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	>=x11-libs/gtk+-3.22.0:3[introspection,wayland]
-	gui-libs/gtk-layer-shell
-	dev-libs/libucl
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"

gui-apps/sfwbar/sfwbar-0.9.8.ebuild

@@ -1,25 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Sway Floating Window Bar"
-HOMEPAGE="https://github.com/LBCrion/sfwbar"
-SRC_URI="https://github.com/LBCrion/sfwbar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	>=x11-libs/gtk+-3.22.0:3[introspection,wayland]
-	gui-libs/gtk-layer-shell
-	dev-libs/libucl
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"

gui-apps/sfwbar/sfwbar-0.9.9.3.ebuild

@@ -1,25 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Sway Floating Window Bar"
-HOMEPAGE="https://github.com/LBCrion/sfwbar"
-SRC_URI="https://github.com/LBCrion/sfwbar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	>=x11-libs/gtk+-3.22.0:3[introspection,wayland]
-	gui-libs/gtk-layer-shell
-	dev-libs/libucl
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"

gui-apps/sfwbar/sfwbar-1.0_beta3.ebuild

@@ -1,4 +1,4 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ IUSE=""
 DEPEND="
 	>=x11-libs/gtk+-3.22.0:3[introspection,wayland]
 	gui-libs/gtk-layer-shell
-	dev-libs/libucl
+	dev-libs/json-c
 	dev-util/wayland-scanner
 "
 RDEPEND="${DEPEND}"

media-fonts/twemoji/Manifest

@@ -0,0 +1,2 @@
+DIST twemoji-13.1.0-noto.tar.gz 170352518 BLAKE2B 545e58d47b247998c0f376bbc9ec43fcb2ac4c1d24465420ae43a168987dcb7c4eba873b9cc64cfc6ffce3290551242d7e44ed69606f9c3d8a59dbeeddc3cdb2 SHA512 a7ea0c33f4703749d8a30f4be2fac5971429dcec7b6feed2645854d9ae1eebb428597a56ad148c3732e320a65d4133da30c0003ed39f07c5270462e31fdf3d0b
+DIST twemoji-13.1.0.tar.gz 4646713 BLAKE2B b144e76f2428d1fc523742a9501ac7c73af04e9d0ce4c1b5c5131da21d2a69416a8f3512dd0ffd01dd44e7b7620311abb8ced5c45f10c70ca9ec20406583820c SHA512 a1463c76a2bbcece8871cb868967c0bff74a495bf88d28e41c8962ed12ffba1966ee622f72f6da2222a06db8debb62ae89fe1fffcd9272e8aa3fcc029713115b

media-fonts/twemoji/files/75-twemoji.conf

@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+    <!--
+    Treat this file as a reference and modify as necessary if you are not satisfied with the results.
+
+
+    This config attempts to guarantee that colorful emojis from Twemoji will be displayed,
+    no matter how badly the apps and websites are written.
+
+    It uses a few different tricks, some of which introduce conflicts with other fonts.
+    -->
+
+
+    <!--
+    This adds a generic family 'emoji',
+    aimed for apps that don't specify specific font family for rendering emojis.
+    -->
+    <match target="pattern">
+        <test qual="any" name="family"><string>emoji</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <!--
+    This adds Twemoji as a final fallback font for the default font families.
+    In this case, Twemoji will be selected if and only if no other font can provide a given symbol.
+
+    Note that usually other fonts will have some glyphs available (e.g. Symbola or DejaVu fonts),
+    causing some emojis to be rendered in black-and-white.
+    -->
+    <match target="pattern">
+        <test name="family"><string>sans</string></test>
+        <edit name="family" mode="append"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test name="family"><string>serif</string></test>
+        <edit name="family" mode="append"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test name="family"><string>sans-serif</string></test>
+        <edit name="family" mode="append"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test name="family"><string>monospace</string></test>
+        <edit name="family" mode="append"><string>Twemoji</string></edit>
+    </match>
+
+    <!--
+    If other fonts contain emoji glyphs, they could interfere and make some emojis rendered in wrong font (often in black-and-white).
+    For example, DejaVu Sans contains black-and-white emojis, which we can remove using the following trick:
+    -->
+    <match target="scan">
+        <test name="family" compare="contains">
+            <string>DejaVu</string>
+        </test>
+        <edit name="charset" mode="assign" binding="same">
+            <minus>
+                <name>charset</name>
+                <charset>
+                    <range>
+                        <int>0x1f600</int>
+                        <int>0x1f640</int>
+                    </range>
+                </charset>
+            </minus>
+        </edit>
+    </match>
+
+    <!--
+    Recognize legacy ways of writing EmojiOne family name.
+    -->
+    <match target="pattern">
+        <test qual="any" name="family"><string>EmojiOne</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Emoji One</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>EmojiOne Color</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>EmojiOne Mozilla</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <!--
+    Use Twemoji when other popular fonts are being specifically requested.
+
+    It is quite common that websites would only request Apple and Google emoji fonts.
+    These aliases will make Twemoji be selected in such cases to provide good-looking emojis.
+
+    This obviously conflicts with other emoji fonts if you have them installed.
+    -->
+    <match target="pattern">
+        <test qual="any" name="family"><string>Apple Color Emoji</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Segoe UI Emoji</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Segoe UI Symbol</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Noto Color Emoji</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>NotoColorEmoji</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Android Emoji</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Noto Emoji</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Twitter Color Emoji</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>JoyPixels</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Twemoji Mozilla</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>TwemojiMozilla</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>EmojiTwo</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Emoji Two</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>EmojiSymbols</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+
+    <match target="pattern">
+        <test qual="any" name="family"><string>Symbola</string></test>
+        <edit name="family" mode="assign" binding="same"><string>Twemoji</string></edit>
+    </match>
+</fontconfig>

media-fonts/twemoji/files/noto-build-all-flags.patch

@@ -0,0 +1,11 @@
+--- old/Makefile	2018-05-03 20:32:14.000000000 +0200
++++ new/Makefile	2018-05-08 11:48:20.811073447 +0200
+@@ -78,7 +78,7 @@
+ 
+ ALL_FLAGS = $(basename $(notdir $(wildcard $(FLAGS_SRC_DIR)/*.png)))
+ 
+-FLAGS = $(SELECTED_FLAGS)
++FLAGS = $(ALL_FLAGS)
+ 
+ FLAG_NAMES = $(FLAGS:%=%.png)
+ FLAG_FILES = $(addprefix $(FLAGS_DIR)/, $(FLAG_NAMES))

media-fonts/twemoji/files/noto-build-path.patch

@@ -0,0 +1,11 @@
+--- a/add_glyphs.py.old	2018-11-18 11:11:56.387323302 +0100
++++ b/add_glyphs.py	2018-11-18 11:12:18.203529159 +0100
+@@ -22,7 +22,7 @@
+ import add_emoji_gsub
+ import add_aliases
+ 
+-sys.path.append(
++sys.path.insert(0,
+     path.join(os.path.dirname(__file__), 'third_party', 'color_emoji'))
+ from png import PNG
+ 

media-fonts/twemoji/files/noto-pngquant-verbose.patch

@@ -0,0 +1,11 @@
+--- a/Makefile~	2020-04-22 23:04:44.000000000 +0200
++++ b/Makefile	2020-04-22 23:06:42.069275340 +0200
+@@ -20,7 +20,7 @@
+ 
+ PNGQUANT = pngquant
+ PYTHON = python3
+-PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force
++PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force -v
+ BODY_DIMENSIONS = 136x128
+ IMOPS := -size $(BODY_DIMENSIONS) canvas:none -compose copy -gravity center
+ 

media-fonts/twemoji/files/noto-use-gm.patch

@@ -0,0 +1,27 @@
+--- a/Makefile~	2019-03-28 17:45:53.000000000 +0100
++++ b/Makefile	2019-06-02 10:36:55.587055453 +0200
+@@ -21,7 +21,7 @@
+ PNGQUANT = pngquant
+ PNGQUANTFLAGS = --speed 1 --skip-if-larger --quality 85-95 --force
+ BODY_DIMENSIONS = 136x128
+-IMOPS := -size $(BODY_DIMENSIONS) canvas:none -compose copy -gravity center
++IMOPS = -size 136x128 -background none -gravity center -extent 136x128 -compose copy
+ 
+ # zopflipng is better (about 5-10%) but much slower.  it will be used if
+ # present.  pass ZOPFLIPNG= as an arg to make to use optipng instead.
+@@ -165,13 +165,13 @@
+ # imagemagick packaged with ubuntu trusty (6.7.7-10) by using -composite.
+ 
+ $(EMOJI_DIR)/%.png: $(EMOJI_SRC_DIR)/%.png | $(EMOJI_DIR)
+-	@convert $(IMOPS) "$<" -composite "PNG32:$@"
++	@gm convert $(IMOPS) "$<" "PNG32:$@"
+ 
+ $(FLAGS_DIR)/%.png: $(FLAGS_SRC_DIR)/%.png ./waveflag | $(FLAGS_DIR)
+ 	@./waveflag $(FLAGS_DIR)/ "$<"
+ 
+ $(RESIZED_FLAGS_DIR)/%.png: $(FLAGS_DIR)/%.png | $(RESIZED_FLAGS_DIR)
+-	@convert $(IMOPS) "$<" -composite "PNG32:$@"
++	@gm convert $(IMOPS) "$<" "PNG32:$@"
+ 
+ flag-symlinks: $(RESIZED_FLAG_FILES) | $(RENAMED_FLAGS_DIR)
+ 	@$(subst ^, ,                                  \

media-fonts/twemoji/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">twitter/twemoji</remote-id>
+	</upstream>
+</pkgmetadata>

media-fonts/twemoji/twemoji-13.1.0.ebuild

@@ -0,0 +1,116 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit font python-any-r1
+
+NOTO_PV="2.034"
+DESCRIPTION="A color emoji font with a flat visual style, designed and used by Twitter"
+HOMEPAGE="https://twemoji.twitter.com"
+SRC_URI="https://github.com/googlefonts/noto-emoji/archive/refs/tags/v${NOTO_PV}.tar.gz -> ${P}-noto.tar.gz
+	https://github.com/twitter/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/noto-emoji-${NOTO_PV}"
+
+LICENSE="Apache-2.0 CC-BY-4.0 MIT OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	app-arch/zopfli
+	$(python_gen_any_dep '
+		>=dev-python/fonttools-4.7.0[${PYTHON_USEDEP}]
+		>=dev-python/nototools-0.2.13[${PYTHON_USEDEP}]
+	')
+	media-gfx/pngquant
+	x11-libs/cairo
+	|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[png] )
+"
+
+RESTRICT="binchecks strip"
+
+DOCS=( CONTRIBUTING.md FOLDERS.md LEGACY.md README.md )
+
+PATCHES=(
+	# https://github.com/googlei18n/noto-emoji/issues/240
+	"${FILESDIR}"/noto-build-path.patch
+	# Be more verbose
+	"${FILESDIR}"/noto-pngquant-verbose.patch
+
+)
+
+FONT_S="${S}"
+FONT_SUFFIX="ttf"
+FONT_CONF=( "${FILESDIR}"/75-${PN}.conf )
+
+python_check_deps() {
+	has_version -b "dev-python/fonttools[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/nototools[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	font_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	mv "${WORKDIR}"/${P}/assets "${S}" || die
+	mv "${WORKDIR}"/${P}/*.md "${S}" || die
+}
+
+src_prepare() {
+	default
+
+	# Be more verbose
+	sed -i -e 's:\(@$(ZOPFLIPNG) -y "$<" "$@"\) 1> /dev/null 2>&1:\1:g' Makefile || die
+
+	# Based on Fedora patch to allow graphicsmagick usage
+	if has_version -b media-gfx/graphicsmagick; then
+		eapply "${FILESDIR}/noto-use-gm.patch"
+	fi
+
+	sed NotoColorEmoji.tmpl.ttx.tmpl \
+		-e "s/Noto Color Emoji/${PN^}/" \
+		-e "s/NotoColorEmoji/${PN^}/" \
+		-e "s/Copyright .* Google Inc\./Twitter, Inc and other contributors./" \
+		-e "s/ Version .*/ ${PV}/" \
+		-e "s/.*is a trademark.*//" \
+		-e "s/Google, Inc\./Twitter, Inc and other contributors/" \
+		-e "s,http://www.google.com/get/noto/,https://twemoji.twitter.com," \
+		-e "s/.*is licensed under.*/      Creative Commons Attribution 4.0 International/" \
+		-e "s,http://scripts.sil.org/OFL,http://creativecommons.org/licenses/by/4.0/," \
+		> ${PN^}.tmpl.ttx.tmpl || die
+
+	pushd assets/72x72 || die
+	for png in *.png; do
+		mv ${png} emoji_u${png//-/_} || die
+	done
+}
+
+src_compile() {
+	python_setup
+	einfo "Building fonts..."
+
+	emake EMOJI=${PN^} EMOJI_SRC_DIR="assets/72x72" \
+		FLAGS= BODY_DIMENSIONS=76x72 \
+		BYPASS_SEQUENCE_CHECK=true \
+		VIRTUAL_ENV=true
+}
+
+src_install() {
+	rm NotoColorEmoji_WindowsCompatible.ttf *.tmpl.ttf || die
+
+	# Don't lose fancy emoji icons
+	insinto /usr/share/icons/${PN}/72/emotes/
+	doins assets/72x72/*.png
+
+	insinto /usr/share/icons/${PN}/scalable/emotes/
+	doins assets/svg/*.svg
+
+	font_src_install
+
+	einstalldocs
+}

media-libs/skcms/skcms-0_pre20211006.ebuild

@@ -36,5 +36,5 @@ src_install() {
 }
 
 src_test() {
-	./tests || die
+	LD_LIBRARY_PATH="./:${LD_LIBRARY_PATH}" ./tests || die
 }

net-client/lagrange/Manifest

@@ -1,4 +1,4 @@
-DIST lagrange-1.9.3.tar.gz 8586488 BLAKE2B 71f2aba21570f41f804ddf48b2aaa5a60a473aca8eaba5c6820fb7ccd6d878cf69f17dffcb15ae409e104dc0115a9637039db34d8abf97f18ab5693d0b4e27f2 SHA512 03d1d25c09b0b6ad9812517b31dafe0819b0a5e9c646a40873636f6021e1958eb24fb2460db666da7cdf544e5bb225eeae30654fa417ffbcfbfb3b3cd2ca0571
-DIST lagrange-1.9.3.tar.gz.sig 488 BLAKE2B c34f5989b5ae7944f7a448241010c3ab035013cbed2ae8b2915a4a64b0d17686bf9003f2019e3bb7262aa5b891bf40b2a5d2ecf35a88c4368081ec0561534893 SHA512 c2286bb0299c06112e2f0f11ce52471e2207c4bba614e90bda505258e0a07b841474fedd5cdf1ab8df9aec678b8775baa289a491c48b2177a9ef6680c97802f7
+DIST lagrange-1.10.1.tar.gz 8652043 BLAKE2B 2cc88adf60c527b4590ad1173b2c85189c6cf9f8c826b5957d8aba363e31b7bf858b720d6706622597d3fee2865b8e0f45e60774adbb818b5a1f83d20000aee6 SHA512 ebc7ce67ca66770feffc311a09c0d1d6c14765ba5678095c801d62e29a8dea7bfbfc2475f4904e4683bb380ae9a6e8000d27a040545bc4480a56527a7d676b2c
+DIST lagrange-1.10.1.tar.gz.sig 488 BLAKE2B e2a84bb6060aecec26f3813a2bf30585cb175bbdb4a2e40569c5e019bdc8bfb0ae7ae64b0ac8198c1ac9f879b14f023846634df0809ab4a958c2f4000b163cf6 SHA512 7ac1973fc8bf978c409046fe12466dd49b1bb701eb9b36711359c19963d426d56d2793f771929c498640051395f51670d3553125bcd4dbdcc41e77523930f1a6
 DIST lagrange-1.9.5.tar.gz 8594827 BLAKE2B 657586c66305f7896e5b80e24c520184b4af89648fa0635b8b37bc4debe90ee0fff84e91f6a261df2e8d3aa945d75dcd88b28a607e6427117451c58dec0b2a89 SHA512 fd24daf6c3d054e4600f5bbf6a64a911516228938c471cb0e4dfc09fdf4bd2f7ed80fb0478ba02bddc676f60bd164d2b54295719eebf36dca95db369377c1105
 DIST lagrange-1.9.5.tar.gz.sig 488 BLAKE2B 0516b044f18c5b513f1110cb8c4609f44cdb7c90d36cd342b388c81dc437e344e24655f646fa9d439e3d9ba6965d58f7db374c23c56e0205c7739bbe2768c001 SHA512 c701bfe145674ed186b026171913cc2c2bf7fcdf7a287787e0b18ec7f0a5cc93d99de8d3723065557aedb72471e972af2da345ce651b494e366bbaf1f955124c

net-client/lagrange/lagrange-1.10.1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+fribidi +harfbuzz mp3 webp"
 
 DEPEND="
-	dev-libs/tfdn:=[ssl]
+	>=dev-libs/tfdn-1.1.0:=[ssl]
 	media-libs/libsdl2[sound(+),video(+)]
 	fribidi? ( dev-libs/fribidi )
 	harfbuzz? ( media-libs/harfbuzz:=[truetype(+)] )

net-irc/catgirl/Manifest

@@ -1,2 +1,2 @@
-DIST catgirl-1.9a.tar.gz 62635 BLAKE2B 9b1d7fb9eb7b8bd5703a2d9ebf354efbc229a85dcca95a3351a88201f426e20a022a8a19e654b9db85d5697b3043a79083d31f1c9d1d9c253f4015a1d81450c0 SHA512 2eed6cc54d19a090345aa719adc256d6c8d4f26a81c7a399c20d3b4cbce336bc94b15c1c4b92a54d7cf8b16eda09e589c931292627234b000e567b2d22742420
 DIST catgirl-2.0.tar.gz 63201 BLAKE2B eaa28ba283085b844b7c7e0da11bafe6055ca09ca96955b32c7322ec5308941b9b3cd7fc6d24d853b28d84e63d36f4bc438c5eea76279f0252ac9d7be7014c44 SHA512 bb0b07596edfe9136b38340d2a254a27dc9335225629e23ae05ebb0cd91243d6436d2802e6a914e61f6db1a6d37eec324aff36c8f61c53b987fd82b903e8d836
+DIST catgirl-2.0a.tar.gz 63237 BLAKE2B fe2c90121f8b1eacba5d246378808ac45fe1b3a7f53f56361595f2937bbd0e3d0ba373162aa3e98f49a9f418a6b206321e609f877cf56cca575d75c59a5db732 SHA512 4e948f3feae9754e2e751b997d35710655a49e08efba7f75ed6c126c1a7326552c5eb17f22a94a694d84653dbbae2d866bf10b9a3e33c5289d6a823628cbca5d

net-irc/catgirl/catgirl-2.0a.ebuild

@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,8 +14,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 DEPEND="
-	dev-libs/libretls
-	sys-libs/ncurses
+	dev-libs/libretls:=
+	sys-libs/ncurses:=
 "
 BDEPEND="virtual/pkgconfig"
 RDEPEND="${DEPEND}"

profiles/package.mask

@@ -13,40 +13,5 @@
 # Depends on masked libhandy 1.5.0
 >=app-text/komikku-0.36.0
 
-# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2022-01-21)
-# Unavailable dep <dev-python/prettytable-0.8.0
-dev-python/automaton
-# requires dev-python/automaton
-dev-python/taskflow
-# requires dev-python/taskflow
-app-admin/glance
-sys-cluster/cinder
-sys-cluster/nova
-dev-python/pypowervm
-
-# Unavailable dep <dev-python/prettytable-0.8.0
-dev-python/ldappool
-# requires dev-python/ldappool
-sys-auth/keystone
-
-# Unavailable dep <dev-python/prettytable-0.8.0
-dev-python/python-manilaclient
-# requires dev-python/python-manilaclient
-sys-cluster/heat
-
 # Unavailable dep dev-libs/boost[threads]
 net-p2p/monero
-
-# Unavailable dep sys-fabric/ofed
-sys-cluster/portals4
-# requires sys-cluster/portals4
-sys-cluster/SOS
-sys-cluster/extrae
-# requires sys-cluster/extrae
-sys-cluster/mcxx
-sys-cluster/nanos6
-sys-cluster/nanox
-sys-cluster/OpenHPC-meta
-sys-cluster/paraver-kernel
-sys-cluster/spectral
-sys-cluster/wxparaver

sys-auth/keystone/keystone-20.0.0.0_rc1.ebuild

@@ -92,7 +92,6 @@ DEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/bashate-0.5.1[${PYTHON_USEDEP}]
-		>=dev-python/stestr-1.0.0[${PYTHON_USEDEP}]
 		>=dev-python/freezegun-0.3.6[${PYTHON_USEDEP}]
 		>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
 		>=dev-python/oslo-db-6.0.0[${PYTHON_USEDEP}]

sys-cluster/nova/nova-24.0.0.0_rc2.ebuild

@@ -145,12 +145,10 @@ DEPEND="
 		>=dev-python/python-ironicclient-3.0.0[${PYTHON_USEDEP}]
 		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.8.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
 		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
 		>=dev-python/gabbi-1.35.0[${PYTHON_USEDEP}]
 		>=dev-python/wsgi_intercept-1.7.0[${PYTHON_USEDEP}]
 		>=dev-python/oslo-vmware-3.6.0[${PYTHON_USEDEP}]

sys-cluster/portals4/metadata.xml

@@ -15,7 +15,6 @@
 		<flag name="pmi">Enable PMI support</flag>
 		<flag name="ppe">Enable process-offload engine for Portals. Experimental</flag>
 		<flag name="reliable-udp">Use reliable UDP for remote communication</flag>
-		<flag name="transport-ib">Use IB for remote communication</flag>
 		<flag name="transport-shmem">Use Shared memory for on-node communication. This is currently experimental and should be avoided</flag>
 		<flag name="transport-udp">Use UDP for remote communication</flag>
 		<flag name="zero-mrs">Enable this when using MOFED V2.2+ or Qlogic InfiniPath Hardware of IB communication</flag>

sys-cluster/portals4/portals4-1.0_alpha1_p20190109-r3.ebuild

@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,6 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE_TRANSPORT="
-	transport-ib
 	transport-shmem
 	+transport-udp
 "
@@ -35,7 +34,6 @@ RDEPEND="
 	knem? ( sys-cluster/knem )
 	pmi? ( sys-cluster/pmix[pmi] )
 	ppe? ( sys-kernel/xpmem )
-	transport-ib? ( sys-fabric/ofed )
 "
 DEPEND="
 	${RDEPEND}
@@ -46,7 +44,6 @@ PATCHES=( "${FILESDIR}/${PN}-fix-PPE-related-compile-and-link-errors.patch" )
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	?? ( ppe transport-shmem )
-	^^ ( transport-ib transport-udp )
 
 	knem? ( transport-shmem )
 	reliable-udp? ( transport-udp )
@@ -64,13 +61,14 @@ src_configure() {
 		--disable-picky
 		--disable-pmi-from-portals
 		--disable-static
+		--disable-transport-ib
 		--with-ev="${EPREFIX}/usr"
+		--without-ofed
 
 		$(use_enable me-triggered)
 		$(use_enable ppe)
 		$(use_enable reliable-udp)
 		$(use_enable test testing)
-		$(use_enable transport-ib)
 		$(use_enable transport-shmem)
 		$(use_enable transport-udp)
 		$(use_enable unordered-matching)
@@ -92,11 +90,6 @@ src_configure() {
 	else
 		myconf+=( "--without-pmi" )
 	fi
-	if use transport-ib; then
-		myconf+=( "--with-ofed=${EPREFIX}/usr" )
-	else
-		myconf+=( "--without-ofed" )
-	fi
 
 	econf "${myconf[@]}"
 }

x11-drivers/OpenTabletDriver-bin/OpenTabletDriver-bin-0.6.0.2.ebuild

@@ -47,7 +47,6 @@ src_install() {
 
 	insinto "/lib/udev/rules.d"
 	doins -r "${S}/99-${LP}.rules"
-	udevadm control --reload || die
 
 	cd "${FILESDIR}" || die
 	dobin "${SP}"
@@ -59,6 +58,7 @@ src_install() {
 }
 
 pkg_postinst() {
+	udevadm control --reload || die
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		elog "Please replug your tablet before attempting to use the driver"
 	fi