gentoo resync : 24.06.2021

32 files changed, 400 insertions, 71 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 03c0071468c7..67735dc16946 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/OpenRGB/OpenRGB-0.5.ebuild b/app-misc/OpenRGB/OpenRGB-0.5.ebuild
deleted file mode 100644
index 6c5d8e23cd0c..000000000000
--- a/app-misc/OpenRGB/OpenRGB-0.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://gitlab.com/CalcProgrammer1/OpenRGB"}
-else
-	SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/OpenRGB-release_${PV}.tar.bz2"
-	S="${WORKDIR}/OpenRGB-release_${PV}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software"
-HOMEPAGE="https://gitlab.com/CalcProgrammer1/OpenRGB/"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	dev-libs/hidapi:=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	virtual/libusb:1
-"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/nlohmann_json
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	rm -r dependencies/{hidapi,libusb,json}* || die
-	if [[ ${PV} != *9999* ]]; then
-		eapply "${FILESDIR}/OpenRGB-0.5-build-system.patch"
-	fi
-}
-
-src_configure() {
-	eqmake5 INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}" install
-
-	dodoc README.md OpenRGB.patch
-}
diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
index 1b017dd34946..5869dd4fd3bb 100644
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@@ -5,7 +5,7 @@ AUX carbon-c-relay.initd-r1 1801 BLAKE2B 4627b6e0d9a44d5c544ccff0c33557c73dd9719
 DIST carbon-c-relay-3.5.tar.gz 304570 BLAKE2B 4b2595eb3aecab7793e2f8a96a6f0a28b967d5e753ee25b175d70fcd2c9d6c492252b2ece5012fd446ba586da9f82e80cc10a9ed3f520bd6600f17e7137fd5ec SHA512 5461e9c32b2953e2c182f71bcaebde33f571dc9672d63231aedf88aca65b2576d0787ab24e871905d46fd0a4176b31f817f75aee09f93a66a280ca67caf74e66
 DIST carbon-c-relay-3.6.tar.gz 557612 BLAKE2B 9921a6488a0f04d6b8a7bbe54d13d23dcf979331103e1b862a8a504ead92afdc7530c665cd5a8973ac0cee952c7454ca8fcfb7b9e632ebf8c175083e83c10cc1 SHA512 7336e29890610d5248059c9de7653892d761005881897bff8279c0b12396a5d9aaedf4987121338f43951b8d322cddaaab43a2151b89e98eee9e4da8c7188cd4
 DIST carbon-c-relay-3.7.2.tar.gz 561080 BLAKE2B 55674699b2afcffa911954a52e3c51b92380c81083db0330e7e6eab495e72938b7761a8c7bc17ac65ea56db1c11f4c360bab3b7442ca13f3466170d6bb3f6fd6 SHA512 dab2eaf2da07afd429012b93f0c826e2fe6e43371afa07d34793dd212820790af2487f5710524deac52c3ed18b874ce8ff54d90b3872e269dc570b7ad30c1826
-EBUILD carbon-c-relay-3.5.ebuild 1513 BLAKE2B c9bf034367fcd6b298f00698a82f109013e1bcda1c4943d4576c51112fdde7753439fa7d696c9d14185fdcf60353d89201a20ac52b11d28e938ca762ab2fbf91 SHA512 13d6a3a86f052a7e02915bed4c265dd0c59eb3c18837858555c02d36304eb0692d296b4734927b135c3117a8b377ac369e5ea8e02679a73d4f462e433db5b8f8
-EBUILD carbon-c-relay-3.6.ebuild 1613 BLAKE2B ca68818d31e1c6582e5c45debadaf3c9610254a7bc9b1d7aee3a84d081b2ba8a482172990ac28e8f6a67d8164e281ec602a1321270ab738236bb13c99fef63d8 SHA512 beef14fe252949cf2ff5a458a7b4f52b553f923615db5d62a30a5d17655e27272dc61d5e7fc26a3b44e2ec8d1d1cf2843a9389b08a8612934017e3b08c4fa524
-EBUILD carbon-c-relay-3.7.2.ebuild 1566 BLAKE2B 282f10b7a5dfe4af717005521c7fc04b92c052ef4d4ac0b752f9f4083682e5f8560b770e436773747d856c767e61823934d034381954b5040b3246316e4de3e7 SHA512 faea1bcd6addee89c340815273a524568fecd3e138c11889e5f5df8d24d5f12157d14d68518ff327a4e97550434d9600670212ed2b69ce9411a8e027ccd5108b
+EBUILD carbon-c-relay-3.5-r1.ebuild 1514 BLAKE2B b785d81ddc95d3af346eab986d91a37bae33a10ff5d2376cc21117f75c857fc9ef71fb2ed78ec5a7ab66aa1b79938ea4d3d49cf9c5fbd49ae0ada636fed3707d SHA512 88cb663258a0d84dcf01300bee13181e517a6283ccd5305e2e85c24361b80d8d1152fdebd8da25d95e5df43a788e1fc74491ff0facd12595eccb1cc9b573e564
+EBUILD carbon-c-relay-3.6-r1.ebuild 1614 BLAKE2B d638ee7914142d9cb8d996dff745f75addcba95810e44288f6fd2cb0a0c8187af7a3729e45f5850a84092c88c40bdb3dc164073b0f7e1ee066a74ebf2ca6a3c1 SHA512 d1d20548e0a3997071e7a53c817a56b904661badc2d7aaf56cae00eea4536bb514d24578fd8a4d1cec99f25bff9c0a3926feffbc678743cd39ded3dc3f4dd1a0
+EBUILD carbon-c-relay-3.7.2-r1.ebuild 1567 BLAKE2B 13280b7bde34cd94b238fc0d95bdf78d5727c7535891a9b0382caeb4ced930dabcdef57a34de586b90b2c1c6b586e4120ebd2fbe7dbc4d53c34a4aceb46088e5 SHA512 73039e2207eb62431fc06ce0bd9216d8f0f337abe686d290ed3e3e84fb3130a45be437ca035d9fb35a4ac381ef1fef63d7e6eb409f735945631357e5e0ca2b95
 MISC metadata.xml 653 BLAKE2B 224540619f2aa5e40aeb57085a4d13640c7cc6381a7a26fea6a6854935f6705576b5ca5ea88b0b7647ff3c293c6bd83b4b170c66ab12521dc7e01811506a33da SHA512 91e5e7ea08dcac8edbbbe0ed7a6b8ccac8a6ea7c2ba89d33c4f188aabaa5a975ac1738c31b942c8db8c6a37f6b1dff67f757b60991143c13f821f63ffea5ca0a
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.5.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.5-r1.ebuild
index 39b2136d9ab9..4fd7b63ac246 100644
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.5.ebuild
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.5-r1.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
 RDEPEND="lz4? ( app-arch/lz4 )
 	snappy? ( app-arch/snappy )
 	zlib? ( app-arch/gzip )
-	ssl? ( dev-libs/openssl:0 )
+	ssl? ( dev-libs/openssl:0= )
 	!oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) )
 	pcre2? ( dev-libs/libpcre2 )
 	oniguruma? ( dev-libs/oniguruma )"
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.6.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.6-r1.ebuild
index 56e47ddbd5b4..9a577c441d51 100644
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.6.ebuild
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.6-r1.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
 RDEPEND="lz4? ( app-arch/lz4 )
 	snappy? ( app-arch/snappy )
 	zlib? ( app-arch/gzip )
-	ssl? ( dev-libs/openssl:0 )
+	ssl? ( dev-libs/openssl:0= )
 	!oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) )
 	pcre2? ( dev-libs/libpcre2 )
 	oniguruma? ( dev-libs/oniguruma )"
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.7.2.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.7.2-r1.ebuild
index 4ff80bd27a2b..09b7c5973e5f 100644
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.7.2.ebuild
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.7.2-r1.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="
 RDEPEND="lz4? ( app-arch/lz4 )
 	snappy? ( app-arch/snappy )
 	zlib? ( app-arch/gzip )
-	ssl? ( dev-libs/openssl:0 )
+	ssl? ( dev-libs/openssl:0= )
 	!oniguruma? ( !pcre2? ( pcre? ( dev-libs/libpcre ) ) )
 	pcre2? ( dev-libs/libpcre2 )
 	oniguruma? ( dev-libs/oniguruma )
diff --git a/app-misc/klavaro/Manifest b/app-misc/klavaro/Manifest
index 7e625f9625ef..32b0353d8289 100644
--- a/app-misc/klavaro/Manifest
+++ b/app-misc/klavaro/Manifest
@@ -3,5 +3,5 @@ AUX klavaro-3.0.1-out-of-source.patch 266 BLAKE2B 7244226db930cabc35bd29e6e6f1a4
 AUX klavaro-3.0.1-static.patch 227 BLAKE2B 8ed9f3ee511784c75248a1cb14a06ce09e7a8fdb0b69bb9067cf8afecf225c059915eddb04aaf01a0f305f3f51e6d020b635e2942237c6d76742ad9408338f69 SHA512 30b76f6454302527d043bf3d29b97ac65cdd17bac48d394ce5b9f7c391a9640a976a54ca066b301f23a5f78b200641072513cb4f5eee5a89ac24510fa5b84104
 AUX klavaro-desktop-keywords.patch 420 BLAKE2B 14dea4731492e2c728517053c3c9a15c99e8bca0d36f25d23a6e7dbc9a54e59b5878100ae8924ae78740ff2e7ceb4cbffae1c968eeff8039fb9f539329fd0073 SHA512 f526da8a40a7de95564f9a8edf4176b043aeb3b5ee600691f66ca27a820da1d2f0d87b6c4da45b8a3a3009aeb440a1a24a65f728174ea079e6712e08c3fe5606
 DIST klavaro-3.01.tar.bz2 1140146 BLAKE2B fcd26cc6dfabd7ae0147fc279361a890ab928e42e02837a3322eae51fc6e959b02896ce789fae6a10b2f600eeb026c45955571d5264a29950cc7183eeb22a4cf SHA512 5d58269867d2b39309e07ca9dd6c525d67acaca93dea0010332e39e8f3dd444070dbc75abad00ac4ca3fd4155f41cf871cb8ccee3dc332aa31f85c8b17d7c48b
-EBUILD klavaro-3.0.1-r1.ebuild 826 BLAKE2B c260dd6808f8812187548b0fc8452c052634a545fd33fcfbd4dbe91aa3a2071258dcb37d23633366a0ee2c12dfeb879610b6dc212a48c195bc57e5da72784041 SHA512 449888bb77c5448627620eb69e225964cd15814dfdc0dd0b3065284a243ad2a0eed131e70e34588426ad5c0e5d69db89c82bc35a39e96d4f6ebffb6810816cc7
+EBUILD klavaro-3.0.1-r1.ebuild 796 BLAKE2B 97a292a8f3bc57139f3c4b19f7bee582eb53cddcf3377c9a273835ecaeffff2f21a9dd1f9b12aa2f99d33e8fcfe786ba59f6c439f2beccda8ed245157a308ee1 SHA512 5799969ba108bdac5345b6b01539ea4611d7a247c6b8128e208ec0749652181dbb792a45e0abfdc511f77cd67fec3063284823eecf00fc4b4f3bde063d20697e
 MISC metadata.xml 244 BLAKE2B d00878c0c5edc36629a30cd4005404290bd7eb773d5d715f189d89e05f019b84e0c25dd18c2b8a0010e9737d7c4da343d3fd79db1c196dd01c47bebe2ff30077 SHA512 cba7dce2e4ffc562ca054e00c09dc2d6ef32c8ba4928224c361374f4ae61164624a56ff7778328d624feb4a1de20be8c69f1bc4762f30babbfd67658a78694a4
diff --git a/app-misc/klavaro/klavaro-3.0.1-r1.ebuild b/app-misc/klavaro/klavaro-3.0.1-r1.ebuild
index 5a0721302c5c..42901b94ea82 100644
--- a/app-misc/klavaro/klavaro-3.0.1-r1.ebuild
+++ b/app-misc/klavaro/klavaro-3.0.1-r1.ebuild
@@ -17,7 +17,6 @@ KEYWORDS="amd64 x86"
 
 BDEPEND="
 	dev-util/intltool
-	dev-util/gtk-builder-convert
 	>=sys-devel/gettext-0.18.3
 "
 RDEPEND="
diff --git a/app-misc/openrgb-plugin-effects/Manifest b/app-misc/openrgb-plugin-effects/Manifest
new file mode 100644
index 000000000000..5404dfffc17d
--- /dev/null
+++ b/app-misc/openrgb-plugin-effects/Manifest
@@ -0,0 +1,3 @@
+DIST OpenRGBEffectsPlugin-a8ea7eef586d9dc341fbe67f60cb8cb4d69a9504.tar.bz2 345726 BLAKE2B e8cf741ba935521c449d3b2a326a44b709c919cb3e3694cbd07939205b8f589dcc00b46cdb1f08684e4e4d3d0a798aade7c051ebc16c3c82368fbeb94ec84fb5 SHA512 134b46090386f94fcf77c4a0a1807ac94ecb8323f318e01098a1edf9b3cf555dbc7f1c5abce484dd4aba9cea32ae7aac5abc0f5f1d26e8edee4afe197f5a254f
+EBUILD openrgb-plugin-effects-0_p20210619.ebuild 1216 BLAKE2B 5e6bdd46fea196d181de40601f62b8ffe212962e8d605b437bcef37e5a8d596531656a632dafaef10f662c33e1e173f425087fb17fa1156a32896b9b1561ab22 SHA512 21edaed69de8d6454fb182d34f24a6ddf5b4831e0f3f5c07b358063fb8e79fd3867285a89823aa45688e6a3cd0a33f5b5295d65098d08f84b0b31fb952f6e280
+MISC metadata.xml 483 BLAKE2B 8a331ab87feb1fe11fe4a5d9e0d7657685d858182c847e3ef3d647f2b0f4f0f31de36c4fba307a1a9ca09ba82fc8aba9a6a887fe2669b453fa7b96e82d54ec57 SHA512 304f23af3f70c7ae7c7221bf53cc991e160711bc7160d7d6082388b457cf88c06851b66963537580fd15c60d63cf0787722b1f63f16c4679d47fc8ef173469f2
diff --git a/app-misc/openrgb-plugin-effects/metadata.xml b/app-misc/openrgb-plugin-effects/metadata.xml
new file mode 100644
index 000000000000..6a2173ad1876
--- /dev/null
+++ b/app-misc/openrgb-plugin-effects/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>alexey+gentoo@asokolov.org</email>
+		<name>Alexey Sokolov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">OpenRGBDevelopers/OpenRGBEffectsPlugin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-misc/openrgb-plugin-effects/openrgb-plugin-effects-0_p20210619.ebuild b/app-misc/openrgb-plugin-effects/openrgb-plugin-effects-0_p20210619.ebuild
new file mode 100644
index 000000000000..3bf56003dd4d
--- /dev/null
+++ b/app-misc/openrgb-plugin-effects/openrgb-plugin-effects-0_p20210619.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+MY_GIT_COMMIT="a8ea7eef586d9dc341fbe67f60cb8cb4d69a9504"
+SRC_URI="https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin/-/archive/${MY_GIT_COMMIT}/OpenRGBEffectsPlugin-${MY_GIT_COMMIT}.tar.bz2"
+S="${WORKDIR}/OpenRGBEffectsPlugin-${MY_GIT_COMMIT}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Plugin for OpenRGB with various Effects that can be synced across devices"
+HOMEPAGE="https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	>=app-misc/openrgb-0.6-r1:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-libs/openal
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/nlohmann_json
+"
+
+src_prepare() {
+	default
+	rm -r OpenRGB || die
+}
+
+src_configure() {
+	eqmake5 \
+		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
+		INCLUDEPATH+="${ESYSROOT}/usr/include/OpenRGB" \
+		INCLUDEPATH+="${ESYSROOT}/usr/include/OpenRGB/RGBController" \
+		INCLUDEPATH+="${ESYSROOT}/usr/include/OpenRGB/i2c_smbus" \
+		INCLUDEPATH+="${ESYSROOT}/usr/include/OpenRGB/net_port"
+}
+
+src_install() {
+	exeinto /usr/$(get_libdir)/OpenRGB/plugins
+	doexe libOpenRGBEffectsPlugin.so.1.0
+}
diff --git a/app-misc/openrgb-plugin-skin/Manifest b/app-misc/openrgb-plugin-skin/Manifest
new file mode 100644
index 000000000000..79d08a8418aa
--- /dev/null
+++ b/app-misc/openrgb-plugin-skin/Manifest
@@ -0,0 +1,3 @@
+DIST openrgbskinplugin-3d937cf5112a98052f98a106dc0f5de1eafc20ea.tar.bz2 14673 BLAKE2B e9ba7e072882a995d9d37274e612f0ad404c369bafb4e59db379f43242873f08f36adc5521277c2bac4e730c35cde561e535e30e5a37155bfe0fa408d5ba3b45 SHA512 1a23b843230da6778079873949e72280efe46c6c015eb27456283bae5d88b539d8a5f69e6f1580400e1cfa746bcd36b6a1ae597f510b0c331d16f56b6ae28670
+EBUILD openrgb-plugin-skin-0_p20210601.ebuild 1187 BLAKE2B 3787187a597ae41c7b76bd64b69b9f81e5ecd5ea9f3a0d0d7f15365e986fe063c16b1cf25269ab8180c6f24a947214d520f2b6180bd2948ace79b5e6e59dbba0 SHA512 4ec36536f8c0d1d84c88e174d6fedc4cf0587081313da5f283cd47916e6ae1bd23c34fdc1213131c6d2c68e4e65dbf81cb2b011430ebf6353a05d2b6225457b3
+MISC metadata.xml 480 BLAKE2B 40751f727ac315ecffd1b7bba51550a3236f729c02e1c483ae20f88760a1e326f4f713fb6e309ed28ec9ff2209fe0be04342b3297ada413d945bfd6e188b49c5 SHA512 1d2a7653985a13012dc8be80d751a559566332073ec0348a2f358b73294813f5cdc4922d1aeeab276199ae92496ddf7aa190e48be3dc295025f04f3a73d914cb
diff --git a/app-misc/openrgb-plugin-skin/metadata.xml b/app-misc/openrgb-plugin-skin/metadata.xml
new file mode 100644
index 000000000000..33a23a620596
--- /dev/null
+++ b/app-misc/openrgb-plugin-skin/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>alexey+gentoo@asokolov.org</email>
+		<name>Alexey Sokolov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">OpenRGBDevelopers/openrgbskinplugin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-misc/openrgb-plugin-skin/openrgb-plugin-skin-0_p20210601.ebuild b/app-misc/openrgb-plugin-skin/openrgb-plugin-skin-0_p20210601.ebuild
new file mode 100644
index 000000000000..82292356f05e
--- /dev/null
+++ b/app-misc/openrgb-plugin-skin/openrgb-plugin-skin-0_p20210601.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+MY_GIT_COMMIT="3d937cf5112a98052f98a106dc0f5de1eafc20ea"
+SRC_URI="https://gitlab.com/OpenRGBDevelopers/openrgbskinplugin/-/archive/${MY_GIT_COMMIT}/openrgbskinplugin-${MY_GIT_COMMIT}.tar.bz2"
+S="${WORKDIR}/openrgbskinplugin-${MY_GIT_COMMIT}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Plugin for OpenRGB that allows you to customize the look and feel of OpenRGB"
+HOMEPAGE="https://gitlab.com/OpenRGBDevelopers/openrgbskinplugin"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	>=app-misc/openrgb-0.6-r1:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/nlohmann_json
+"
+
+src_prepare() {
+	default
+	rm -r OpenRGB || die
+}
+
+src_configure() {
+	eqmake5 \
+		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
+		INCLUDEPATH+="${ESYSROOT}/usr/include/OpenRGB" \
+		INCLUDEPATH+="${ESYSROOT}/usr/include/OpenRGB/RGBController" \
+		INCLUDEPATH+="${ESYSROOT}/usr/include/OpenRGB/i2c_smbus" \
+		INCLUDEPATH+="${ESYSROOT}/usr/include/OpenRGB/net_port"
+}
+
+src_install() {
+	exeinto /usr/$(get_libdir)/OpenRGB/plugins
+	doexe libOpenRGBSkinPlugin.so.1.0.0
+}
diff --git a/app-misc/openrgb-plugin-visualmap/Manifest b/app-misc/openrgb-plugin-visualmap/Manifest
new file mode 100644
index 000000000000..da5619d59c7b
--- /dev/null
+++ b/app-misc/openrgb-plugin-visualmap/Manifest
@@ -0,0 +1,3 @@
+DIST OpenRGBVisualMapPlugin-b603bb994719c765cc52c116c6f9f3983fc2a7b2.tar.bz2 45381 BLAKE2B e289f952a8f6553ff81a557753cbb94fb56111a6724f3141fc44a2f1abe9fa3d8e8b4eb769b54adfcb8ee6580d26378ca0b15fd83c14eb669e4682dad07729b8 SHA512 aab553dff55bc4d6990657ad9f29dbbe5ab78dfb532dba50923b32c2bb86ced8d37fc1190dca1b59f420aba7f0db81fbd0d35d49e499e19b9efa4638269a784d
+EBUILD openrgb-plugin-visualmap-0_p20210614.ebuild 1272 BLAKE2B 7acd90ea08a8682273095a684e261de453404939d6d1e8d14493cf06049eb0534c33cd3bd6b2235afb966321f08a0e1f9c6d49dfacea3a22193a15a95a546a5d SHA512 0608740bea699c2368b6485fcb7f6cd666b8244abe6930bca00551b38aa1abfe3a0b83eaa84dad929f884594a9a47fe92e822477720eaeaecfbbc7f3d260f30b
+MISC metadata.xml 483 BLAKE2B 8a331ab87feb1fe11fe4a5d9e0d7657685d858182c847e3ef3d647f2b0f4f0f31de36c4fba307a1a9ca09ba82fc8aba9a6a887fe2669b453fa7b96e82d54ec57 SHA512 304f23af3f70c7ae7c7221bf53cc991e160711bc7160d7d6082388b457cf88c06851b66963537580fd15c60d63cf0787722b1f63f16c4679d47fc8ef173469f2
diff --git a/app-misc/openrgb-plugin-visualmap/metadata.xml b/app-misc/openrgb-plugin-visualmap/metadata.xml
new file mode 100644
index 000000000000..6a2173ad1876
--- /dev/null
+++ b/app-misc/openrgb-plugin-visualmap/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>alexey+gentoo@asokolov.org</email>
+		<name>Alexey Sokolov</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">OpenRGBDevelopers/OpenRGBEffectsPlugin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-misc/openrgb-plugin-visualmap/openrgb-plugin-visualmap-0_p20210614.ebuild b/app-misc/openrgb-plugin-visualmap/openrgb-plugin-visualmap-0_p20210614.ebuild
new file mode 100644
index 000000000000..c75698693526
--- /dev/null
+++ b/app-misc/openrgb-plugin-visualmap/openrgb-plugin-visualmap-0_p20210614.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+MY_GIT_COMMIT="b603bb994719c765cc52c116c6f9f3983fc2a7b2"
+SRC_URI="https://gitlab.com/OpenRGBDevelopers/OpenRGBVisualMapPlugin/-/archive/${MY_GIT_COMMIT}/OpenRGBVisualMapPlugin-${MY_GIT_COMMIT}.tar.bz2"
+S="${WORKDIR}/OpenRGBVisualMapPlugin-${MY_GIT_COMMIT}"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Plugin for OpenRGB to create virtual devices out of multiple real ones"
+HOMEPAGE="https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin"
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	>=app-misc/openrgb-0.6-r1:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/nlohmann_json
+"
+
+src_prepare() {
+	default
+	rm -r OpenRGB || die
+	sed -i -e '/RGBController.cpp/d' OpenRGBVisualMapPlugin.pro || die
+}
+
+src_configure() {
+	eqmake5 \
+		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
+		INCLUDEPATH+="${ESYSROOT}/usr/include/OpenRGB" \
+		INCLUDEPATH+="${ESYSROOT}/usr/include/OpenRGB/RGBController" \
+		INCLUDEPATH+="${ESYSROOT}/usr/include/OpenRGB/i2c_smbus" \
+		INCLUDEPATH+="${ESYSROOT}/usr/include/OpenRGB/net_port"
+}
+
+src_install() {
+	exeinto /usr/$(get_libdir)/OpenRGB/plugins
+	doexe libOpenRGBVisualMapPlugin.so.1.0.0
+}
diff --git a/app-misc/OpenRGB/Manifest b/app-misc/openrgb/Manifest
index cd23d3c3a8ed..7994a7bde906 100644
--- a/app-misc/OpenRGB/Manifest
+++ b/app-misc/openrgb/Manifest
@@ -1,8 +1,8 @@
 AUX OpenRGB-0.5-build-system.patch 755 BLAKE2B bda13d7d9de39d3dd79245ff7a13e22e09381a62ceaa58413b0aaa28017b6e860d032ab6ceb84f1140dc7f6c23dfecc1cadbcf696c8f872016307ea34d8870dc SHA512 50e110c01833113504a3a64e438a404196ae0af8e75007d6c42f3fcab5c20468f3fcb80f83d1f98ac7e1f4f88b1808ee28d0bf342b416d581c354a2388af32bf
 AUX OpenRGB-0.6-pkgconf.patch 709 BLAKE2B eec83247caac6527f0c0ca80716fc3fc3266cdca9635f643968bb620be3a03f3d3030c97e0c68af8e77a03725eaa46f7393667ceb72a63a665947ae87242afc8 SHA512 0436714eb4e900caa421dba2b3fcba41826ab74ed8f2e42884c48006f4af31fe10a114e84c41212343911b5f52804a27b031410fc55fe234138905779db4cf6b
-DIST OpenRGB-release_0.5.tar.bz2 24183948 BLAKE2B c3e6eaab2224f97287a454375486cdacc6814f35fe6752271293d30110d066998d95a901224929cdec7f57a3983fa9d8f5dc488a2ccb6d128df36fac6bc4582a SHA512 d0bd69de94e7e94b9972c07851602d8437b4485d02e83e2fe84f21292acbeef32624ec82d5cb79de85a4dfec35431c469b124b0cc41cf1f741e6e52803dd82eb
+AUX OpenRGB-0.6-plugins.patch 1002 BLAKE2B 42bb7a51876603003a8cf84759754201a92ae50b6a1d6c3b234ca7a49ad0ad00a6dd6d8dc9e068cd7d865d90cbde6a4a9794845a200e06ca5cfe530d37505dd2 SHA512 6d590398dcc65db8720577e83fe8a11a46f7b0be485f1caf227148250450d936599b4ccc47df8b6f8676676cccfcfdf5ad7f02ad76ca415eb0a9c40a58970cbb
 DIST OpenRGB-release_0.6.tar.bz2 24301305 BLAKE2B 20d8f8f7a3189fd5f94b008b11c869d2a8584dc038322e4ac8649c7b57172637133dd18c05ed8eaa6907ba7c097280727a9e7ce2e676250146044bbc2d66921e SHA512 9eb090e1cab121308f3adea8c50feb819a19cb52feff29e45ec24dfbb37013421f53d2ac614496781af1ef4e612dd41c1abafec509430df7d0715aba59ee5a32
-EBUILD OpenRGB-0.5.ebuild 1117 BLAKE2B 7aeb09d188ebf71fb187e20f866f9806ebb02882af669dbb654e8e2f2a22f79350771232abe9ef43a0cc96c14a606a326c8e38872528aad2cfd346ebbada9624 SHA512 1fdf041c54921e0fd9c8bc75ddcd60788692c70bc1cd7c4dbd1358d54b026704d5d3791817be144dd850d88c23db381d1ad8c9e41be7ae699398065d52ce68a9
-EBUILD OpenRGB-0.6.ebuild 1148 BLAKE2B c67c05a6a8562bb036b39b9f56d2d921efbd49a169232d20dbfcbb5c5c3880bff05b25b2a2c05b622a68e979f957e41d818a1e3b74031b6de1c6d8a00fdd5514 SHA512 896f54875ae900b173b0aaa50dab04e8da6c830faaeed79c0176437574e8effbac616729e3b333e59dbfc83dce3489fce3575afb79e0e3ba71d7f7f8f121a770
-EBUILD OpenRGB-9999.ebuild 1176 BLAKE2B ffa186f6395fde7f33f259ac47dbe5fb13320d6841103e665af9aa2bea6bcd527b02ebd339c43a235522ff5a6264af0581e0a6a2d14b043f94f3157649a26f5d SHA512 3739d5f3d9b82e54ebdb25707d38e9c66c5cea186bf5fb5de688c04096fcf3620460e8dd06c70be1c3f94ca5b91e8b2e5fc3eb08b69da08361d2a3f43093dcdc
+EBUILD openrgb-0.6-r1.ebuild 1831 BLAKE2B 3b56b2846aed9d03f6bbc2338063643ea50df986ed0912abbcebc85c22d44ea4d7fd87bbcc5aa9a16599697e09cc221d1ee4cfacd72317abfcce8b1ac9f66f93 SHA512 49ac7263ac9fe57e160f4743d6f712571305504bfa5a498ea17ef37dedfe48906e989f9d20a86a9d8de7dc9af7010bf6555001699f7821e780c2233cd18c8bb3
+EBUILD openrgb-0.6.ebuild 1148 BLAKE2B c67c05a6a8562bb036b39b9f56d2d921efbd49a169232d20dbfcbb5c5c3880bff05b25b2a2c05b622a68e979f957e41d818a1e3b74031b6de1c6d8a00fdd5514 SHA512 896f54875ae900b173b0aaa50dab04e8da6c830faaeed79c0176437574e8effbac616729e3b333e59dbfc83dce3489fce3575afb79e0e3ba71d7f7f8f121a770
+EBUILD openrgb-9999.ebuild 1859 BLAKE2B 796244747f9898148287eb938f44f27eb0a1b7642ecddf6621089bc5cd0a750f1e17383315b9d1836fe631aa6fa4ff1ff3f79902cacca844a24f510230da13f4 SHA512 87bd20984bc860162dd642e7ecc4563a122846eb65cf6c2295cd8d5511ef8404311a95ff3f34b110e0d1b0d030377c01ddba0b33eef24deab16c7148ccb9361b
 MISC metadata.xml 468 BLAKE2B 995cee43adec6a52c9ee8cef1abd9940cfe501e860cad863ed32161ef04c9bb1fa8d11d87869dea37d882170d8c54b548666ba788641899a3d8364b1307d7450 SHA512 9dab70cc3cc39d8051f93190030aaffbdf5256a4ca68c0ae85c4563021d6c459fa4fa4319efdce25f7dea18f797d4fb52ea63d448dda90e5ac69b79d98f21ecf
diff --git a/app-misc/OpenRGB/files/OpenRGB-0.5-build-system.patch b/app-misc/openrgb/files/OpenRGB-0.5-build-system.patch
index fe805988af5d..fe805988af5d 100644
--- a/app-misc/OpenRGB/files/OpenRGB-0.5-build-system.patch
+++ b/app-misc/openrgb/files/OpenRGB-0.5-build-system.patch
diff --git a/app-misc/OpenRGB/files/OpenRGB-0.6-pkgconf.patch b/app-misc/openrgb/files/OpenRGB-0.6-pkgconf.patch
index 380b1091d225..380b1091d225 100644
--- a/app-misc/OpenRGB/files/OpenRGB-0.6-pkgconf.patch
+++ b/app-misc/openrgb/files/OpenRGB-0.6-pkgconf.patch
diff --git a/app-misc/openrgb/files/OpenRGB-0.6-plugins.patch b/app-misc/openrgb/files/OpenRGB-0.6-plugins.patch
new file mode 100644
index 000000000000..ccc83de27ebe
--- /dev/null
+++ b/app-misc/openrgb/files/OpenRGB-0.6-plugins.patch
@@ -0,0 +1,24 @@
+Allow installation of plugins not only in ~/.config
+
+Used by app-misc/openrgb-plugin-* packages
+
+diff --git a/PluginManager.cpp b/PluginManager.cpp
+index b424b8b..991fb75 100644
+--- a/PluginManager.cpp
++++ b/PluginManager.cpp
+@@ -15,7 +15,8 @@ void PluginManager::ScanAndLoadPlugins(bool dark_theme)
+     \*--------------------------------------------------------------------------------------*/
+     OpenRGBPluginInterface *OpenRGBPlugin = nullptr;
+ 
+-    const QDir pluginsDir = QString().fromStdString(ResourceManager::get()->GetConfigurationDirectory()) + "plugins/";
++    for (const QDir pluginsDir : {QString().fromStdString(ResourceManager::get()->GetConfigurationDirectory()) + "plugins/",
++                                  QString().fromStdString(GENTOO_PLUGINS_DIR)}) {
+ 
+     std::vector<std::string> FileList;
+ 
+@@ -54,4 +56,5 @@ void PluginManager::ScanAndLoadPlugins(bool dark_theme)
+             std::cout << loader.errorString().toStdString() << std::endl;
+         }
+     }
++    }
+ }
diff --git a/app-misc/OpenRGB/metadata.xml b/app-misc/openrgb/metadata.xml
index c308d68bd107..c308d68bd107 100644
--- a/app-misc/OpenRGB/metadata.xml
+++ b/app-misc/openrgb/metadata.xml
diff --git a/app-misc/openrgb/openrgb-0.6-r1.ebuild b/app-misc/openrgb/openrgb-0.6-r1.ebuild
new file mode 100644
index 000000000000..b53579dca202
--- /dev/null
+++ b/app-misc/openrgb/openrgb-0.6-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic qmake-utils
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=${EGIT_REPO_URI:-"https://gitlab.com/CalcProgrammer1/OpenRGB"}
+else
+	SRC_URI="https://gitlab.com/CalcProgrammer1/OpenRGB/-/archive/release_${PV}/OpenRGB-release_${PV}.tar.bz2"
+	S="${WORKDIR}/OpenRGB-release_${PV}"
+	KEYWORDS="~amd64 ~x86"
+	PATCHES=(
+		"${FILESDIR}"/OpenRGB-0.5-build-system.patch
+	)
+fi
+
+DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software"
+HOMEPAGE="https://openrgb.org https://gitlab.com/CalcProgrammer1/OpenRGB/"
+LICENSE="GPL-2"
+SLOT="0/1"
+
+RDEPEND="
+	dev-libs/hidapi:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	virtual/libusb:1
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/nlohmann_json
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES+=(
+	"${FILESDIR}"/OpenRGB-0.6-pkgconf.patch
+	"${FILESDIR}"/OpenRGB-0.6-plugins.patch
+)
+
+src_prepare() {
+	default
+	rm -r dependencies/{hidapi,libusb,json}* || die
+}
+
+src_configure() {
+	# Some plugins require symbols defined in the main binary.
+	# The official build system bundles OpenRGB as a submodule instead, and
+	# compiles the .cpp file again.
+	append-ldflags -Wl,--export-dynamic
+
+	eqmake5 \
+		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
+		DEFINES+="GENTOO_PLUGINS_DIR=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\""
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}" install
+
+	dodoc README.md OpenRGB.patch
+
+	# This is for plugins. Upstream doesn't install any headers at all.
+	insinto /usr/include/OpenRGB
+	doins *.h
+	insinto /usr/include/OpenRGB/RGBController
+	doins RGBController/*.h
+	insinto /usr/include/OpenRGB/i2c_smbus
+	doins i2c_smbus/*.h
+	insinto /usr/include/OpenRGB/net_port
+	doins net_port/*.h
+}
diff --git a/app-misc/OpenRGB/OpenRGB-0.6.ebuild b/app-misc/openrgb/openrgb-0.6.ebuild
index c356d7aff6fb..c356d7aff6fb 100644
--- a/app-misc/OpenRGB/OpenRGB-0.6.ebuild
+++ b/app-misc/openrgb/openrgb-0.6.ebuild
diff --git a/app-misc/OpenRGB/OpenRGB-9999.ebuild b/app-misc/openrgb/openrgb-9999.ebuild
index c1f1eb4bbcb3..9ea0dfa538ff 100644
--- a/app-misc/OpenRGB/OpenRGB-9999.ebuild
+++ b/app-misc/openrgb/openrgb-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit qmake-utils
+inherit flag-o-matic qmake-utils
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -18,9 +18,9 @@ else
 fi
 
 DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacturer software"
-HOMEPAGE="https://gitlab.com/CalcProgrammer1/OpenRGB/"
+HOMEPAGE="https://openrgb.org https://gitlab.com/CalcProgrammer1/OpenRGB/"
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/1"
 
 RDEPEND="
 	dev-libs/hidapi:=
@@ -40,6 +40,7 @@ BDEPEND="
 
 PATCHES+=(
 	"${FILESDIR}"/OpenRGB-0.6-pkgconf.patch
+	"${FILESDIR}"/OpenRGB-0.6-plugins.patch
 )
 
 src_prepare() {
@@ -48,11 +49,28 @@ src_prepare() {
 }
 
 src_configure() {
-	eqmake5 INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann"
+	# Some plugins require symbols defined in the main binary.
+	# The official build system bundles OpenRGB as a submodule instead, and
+	# compiles the .cpp file again.
+	append-ldflags -Wl,--export-dynamic
+
+	eqmake5 \
+		INCLUDEPATH+="${ESYSROOT}/usr/include/nlohmann" \
+		DEFINES+="GENTOO_PLUGINS_DIR=\\\\\"\\\"${EPREFIX}/usr/$(get_libdir)/OpenRGB/plugins\\\\\"\\\""
 }
 
 src_install() {
 	emake INSTALL_ROOT="${ED}" install
 
 	dodoc README.md OpenRGB.patch
+
+	# This is for plugins. Upstream doesn't install any headers at all.
+	insinto /usr/include/OpenRGB
+	doins *.h
+	insinto /usr/include/OpenRGB/RGBController
+	doins RGBController/*.h
+	insinto /usr/include/OpenRGB/i2c_smbus
+	doins i2c_smbus/*.h
+	insinto /usr/include/OpenRGB/net_port
+	doins net_port/*.h
 }
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index d5e2e4a33aae..4d997987b9c9 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -3,6 +3,6 @@ AUX screen-4.6.2-utmp-exit.patch 1558 BLAKE2B e08e83f8b9f0cd09cd9bad4486a75d71bd
 AUX screen-CVE-2021-26937.patch 1864 BLAKE2B 7425a49e003601f21130cf9c42354aaeb5f3cd639dd274971393420ccf45e8273539ae020f8a1a6e4063e741e75dcbf8cecd4e35b26c6d04ffca108ddea7bd32 SHA512 419f4d10b23369fccdadfb024b6ce268794e7f76188b25dd9051ff8cd6080dc0c70f66b9c2480095d655bb63f20ba1fdfa1ce0c681c9b8aff4d4918764018516
 AUX screenrc 10412 BLAKE2B f4866f4a83b22c37484b66e4c7d52ec479fe12ae3e72e5c9e769b1b543ecf04d14ef4339e1c72064741cbf39502ef82d3beb213326a30889f128e135f60bd528 SHA512 06fbec5e28480a2c369330fac0c94faa47e5d28e037d9fefd0cb3e813002c504866dc8ac86872b7ac6f16059a219e396a9c425b578b8afe882153ddb506158f7
 DIST screen-4.8.0.tar.gz 854854 BLAKE2B 97ef6f18bf2c63c477260b742ac0b3501f112d380c41ccecc5cf2853db853cc62d4fd6d37edeca35fb41a43b76d98a5cfe160749c992d284f9764b0a0fdcc778 SHA512 770ebaf6ee9be711bcb8a6104b3294f2bf4523dae6683fdc5eac4b3aff7e511be2d922b6b2ad28ec241113c2e4fe0d80f9a482ae1658adc19c8c3a3680caa25c
-EBUILD screen-4.8.0-r2.ebuild 4158 BLAKE2B 05754b07214cbdbef6569408e697e503b171639bb795f4f2a00902ab539a33fbf25cf7e8de4bf3effa1e8eadce6f95c4a4cdedb4541e215a0c29cf27be140a17 SHA512 b16dbfa0934cbf58e72989dd30b5bd19abcb4bedd81aa2169d88f7bb06995b368ab57801212b6b114b69e163489446803547bd2b07a26f6690af3b1148f5566f
-EBUILD screen-9999.ebuild 4221 BLAKE2B b3156a67b9708e22c231e902ee005bf034c118cf610f5461b6408d17694601bb00e4b3aaccc670247aae6b762241e6375324db184cd1410fc3baca8a5bf22e13 SHA512 a8b839ebdbc262851c3725c7099bc85b444b8b00ed40badba7c240a5810eeb22aa0714971b2f116e1860de2c1204b403ffe3bda1200e86ecad2dd5c667a98ba3
+EBUILD screen-4.8.0-r3.ebuild 4178 BLAKE2B 57d59e6fe7cbef9b277731c0bbc1a7045222c2f80ccfec404278a197bc39da4f67cbb39c8b883f9969e0eafa23bbced7d1082e96b683e37e6631059d768a4787 SHA512 21f9d6153c112693936fa28ef9ebe5402a5f7e478e5410efd324884a416c7dc7a3ff634ede0eeaa225fe043dbb3c2cf57a65dbe09b781ac40c117e4a98cc2018
+EBUILD screen-9999.ebuild 4241 BLAKE2B 23ba0ca01a4f1c279fc59895eed1191c64046f25d2fabc73b0569a348ffe1e1a84598092e5438def0edf1b646d15162045c169c17a557b012372b850776166c3 SHA512 bc7cdd5e34914086081496862ec84cb2ae39a3f48ab60c1fc36999ec1caea90ace33b311b957b9d55945f6041935ced0e05a6d0f777e480418f8f5961c527025
 MISC metadata.xml 1782 BLAKE2B bb6d45dd49af2c1abcaf4801d509421a885cd9c636c44e71964962abbd111a54505cd3dcdc594479489b943714a4b534332eb4aa1c5a43d0d679a18866983920 SHA512 d12c60725b314af0ea8ea909d387699e18da8a742036c35f2822235536b6787595ec5acaa8b7e1af0a429e0eb618051e62ba937dcf53a245ae804c3ace29d47b
diff --git a/app-misc/screen/screen-4.8.0-r2.ebuild b/app-misc/screen/screen-4.8.0-r3.ebuild
index 589b58f29346..565bb0f58b8a 100644
--- a/app-misc/screen/screen-4.8.0-r2.ebuild
+++ b/app-misc/screen/screen-4.8.0-r3.ebuild
@@ -24,6 +24,7 @@ IUSE="debug nethack pam selinux multiuser"
 
 CDEPEND="
 	>=sys-libs/ncurses-5.2:0=
+	virtual/libcrypt:=
 	pam? ( sys-libs/pam )"
 RDEPEND="${CDEPEND}
 	acct-group/utmp
diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild
index b61017df938f..dad214f37c40 100644
--- a/app-misc/screen/screen-9999.ebuild
+++ b/app-misc/screen/screen-9999.ebuild
@@ -24,6 +24,7 @@ IUSE="debug nethack pam selinux multiuser"
 
 CDEPEND="
 	>=sys-libs/ncurses-5.2:0=
+	virtual/libcrypt:=
 	pam? ( sys-libs/pam )"
 RDEPEND="${CDEPEND}
 	acct-group/utmp
diff --git a/app-misc/tmuxp/Manifest b/app-misc/tmuxp/Manifest
index 4347b5ea160d..5839479a79b5 100644
--- a/app-misc/tmuxp/Manifest
+++ b/app-misc/tmuxp/Manifest
@@ -1,12 +1,16 @@
 AUX tmuxp-1.6.4-tests.patch 689 BLAKE2B b3c52055186d41be30378d9960099a705c0f7f4606c16a5aaa62f3e2df55b5ceec7feb77329715d13b7aa9fadad9424ed55dfaccb7c24bd6550be40ea6faa425 SHA512 d5ab3b391fe9c4b0646cbecbe3c3f4633829d6f1544503e96ad7d9b2265736c3082c959988344146a6623f125eac339f2f6875ec7b121e5c7db256089324cef8
 AUX tmuxp-1.7.2-relax-click-dep.patch 236 BLAKE2B 034c3f1b09e96de2dd6e534a6607ad8b3c3d46a4a9fa6dfcd196733237176e7b400f99f8289a0ad7bdda56faa5352778e05997fd4d53e3c7686cdb1c2af221b1 SHA512 b21d87efe015efc93b973d20b43805bb5c514e4f5ef4b3ee5a0961bdd7edb249d9804a9e6d573a22a1b607fbca4f4a2b219d0cb47d2d26c0a577c3cc7c0786fb
 AUX tmuxp-1.7.2-tests.patch 475 BLAKE2B 07d6def54c025b6b1d538813258ba06cf9b030ac8e40160492490f31d37c07e5158a95b5b1a28a3350aab1b1bb188b29a2c12b8521ac3a12f937ceb623e04707 SHA512 1842005a34e7b4a495e9e735243d1681158cb8e24b37006edcd7c1929df1eefc2a2f174f6eefd08866f1b830951610d881c654063ce20217fb8e457a84baa7fb
+AUX tmuxp-1.9.2-relax-click-dep.patch 242 BLAKE2B 549f6cafda02226dedee9101bb65d70cce452890c93a004f3ad121764fce57b370d3364b5fd5a5b6341db93d09a46ebeedd080da3b96fa7e3dc926c7abce3edb SHA512 337a1fe1373f61041fd2ed268371385f19284376fa05594cd8a2d465147b41c1bc1cb1a82a1ba690866bced822ec95dfe4a32d060a29feec1d829a4da6ee8bca
+AUX tmuxp-1.9.2-tests.patch 564 BLAKE2B f164bcd3bd5344e39fe050bc3c716dc3678584071990ed19c6cdcc0ab816852d0b18f89d358ba0607260dec0eb87596e245dc386a7afb0884461d44e22dec35f SHA512 f15745bfeb8c72dc0d4a1e1cac489acaa31a18282aa8d39e5b142d207f92cbbf110e1752449f14eb2b4fabcaf9022d7f3256956e26328a2f607edfd87ac05c47
 DIST tmuxp-1.5.4.tar.gz 843048 BLAKE2B 863b428198e8bb2895802ba7365ac2ec43fc75c708b41929934b6803c79b8f6436b5233ad567f1ab010e6ae372d89261a7ee19953fa01ab9defd1e290b6da621 SHA512 f6fdecff23de883076461fcef3fb1555242d8a96f1c05c88fd0fb3216bbb99fb321680f484972b10f54ff87eb032d8627397f76960262612954eaab6bbf7c7a9
 DIST tmuxp-1.6.5.tar.gz 1017117 BLAKE2B 4cc8955f9dcfffd237ffde3e7487496aaf85dd886fd124ad76d61e10fa64f90bac79cc4df9aac63122446b7a4727b01ceaea502d7bbe5f5ba7f68e89bbb86feb SHA512 9095c196f20b537662ffa9d819c675e325fda7f49fb3fd9811f00fc1e1c763b7ea29cdd500bb7d775d1673ab2fc1386f662a2ff6744ffcd2b7aaab13a014cce3
 DIST tmuxp-1.7.2.tar.gz 1027293 BLAKE2B 2564d196c9c327584d24f57ce72165a7cdff2209fe6869a4d3519eb0246329cd8159ecaa20c2a39e153bde224201b1f846f4244c4df72ac540cf0d71f9fba75a SHA512 2ccf63c9f5b7049438ca6079894aac92a0f7496a56c68d88e5a9d5c2a42188a4e40d559792857881f492b28392a329697d4d43781f38ee7c49ed592aac8a69f8
 DIST tmuxp-1.8.2.tar.gz 1019801 BLAKE2B 1e02139df6cc5ee0aec31e3a39413297195b6951a9acaa487a8f705f7f28b79ece0e5388284d017dbf45744540eecb0809e4a7e668f91b824aa0e4adcd64bcf8 SHA512 b6993be72bdab1ef469dbf43d056fbd812612437716af8a4c2e803a55f7ad803246789ccb0b3cafa5ad9047ae86426b4aede27480f20f6d3593d9bf737b74323
+DIST tmuxp-1.9.2.tar.gz 816621 BLAKE2B f471ba2b7a6f97b123661ca2473c63273dc79b08cbe25f4ea756d174ab58e5070d0fc2dfbe8ec254785946e2fa139121d2e9fa5d7d5c127c18580e514064523d SHA512 e4af94fde475c999cee5aa6ad4b60a05c3a9f6f338290406043544250c4dcf688bc39e501631f442b59009156e04eb383098ea717fe7be8e9811b44886515935
 EBUILD tmuxp-1.5.4.ebuild 964 BLAKE2B 643aaf5a7db258f05164547d93e0dc4a63af82a79048a247f08bb8e8cbd5ad5bd71d27e1c708f4f63573424ed70804dd66a6e25b62460e641339bc4426384444 SHA512 f9ed588279ec0739ffe842847a271144c8418d1dcb1aa8190816320eb621a1900b77a1a5bdb5dc037a0b12cd266b10334c72562e8b0444acd5cbdabf3e74a061
 EBUILD tmuxp-1.6.5.ebuild 1122 BLAKE2B 005720290707591c2291ce5f5431fc10484945080fe3d62b437966acab6fb6395f031f24793cd6a9b2321597e7f0dbc8341d541ebf9ccff2870f8397f7485b3e SHA512 f4bf6bfaab0999505f3822139d9ce10128e57f56a74d42ece314c900d128e9a9f8042e40f722e4776ab35cd990041193cc476b1512649a284f34cce88a357864
 EBUILD tmuxp-1.7.2-r1.ebuild 1028 BLAKE2B f85c50f310a394e8c04b9becfd180956aad59b4ddb9b24313d107d03a567892032977b1cc6525edfd25d33d582aca9c4b2e3b19d0ebc2b099340a553bce2c558 SHA512 896e236ad5a5b537c7f53b2662c06d07f9c37378f3259e5288a9b28095157f97050bdef41ba46fb7051fedcbff318d7de1e7d58eb42b7d747288c57c68f40f3f
 EBUILD tmuxp-1.8.2.ebuild 1029 BLAKE2B 473845e85cd9d4a5637efec7c4f693c6d51cd2498739b181c981eba65c82b5d447d335cd2d45db8b6bbb4f9b090bdadfe5e0628f26a1b94b0b244836c8fa9f0c SHA512 75510a50fa787d40051b7531440654aa770d6b090c95d5ff1518df589a2e4968e83a2a1f765d5df8f65bb9a941082a9eb862643ffa29f5c5527f058388eee283
+EBUILD tmuxp-1.9.2.ebuild 1035 BLAKE2B 8d1c7d60b3ed255893682dedf9b7ef24a4104da64767feb6ef063a78bb9f0aaf3eb3bb7b401ebb30c6619b671c60a0cdd7332d82a9bae357d8e3a0909981b211 SHA512 1d5ca877103ab636935924918fa44f7b095dadd6814e89c2394e66e1c5fe59dcc1dfc853394559f8f080581a317ee64239b2066ed9779f5322e7b29a2bfc37cc
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/app-misc/tmuxp/files/tmuxp-1.9.2-relax-click-dep.patch b/app-misc/tmuxp/files/tmuxp-1.9.2-relax-click-dep.patch
new file mode 100644
index 000000000000..f4c2be80d2dc
--- /dev/null
+++ b/app-misc/tmuxp/files/tmuxp-1.9.2-relax-click-dep.patch
@@ -0,0 +1,10 @@
+diff --git a/requirements/base.txt b/requirements/base.txt
+index 4b713f1..3ca88e5 100644
+--- a/requirements/base.txt
++++ b/requirements/base.txt
+@@ -1,4 +1,4 @@
+ kaptan>=0.5.10
+ libtmux>=0.10.1,<0.11
+-click>=7,<8.1
++click>=7
+ colorama>=0.3.9
diff --git a/app-misc/tmuxp/files/tmuxp-1.9.2-tests.patch b/app-misc/tmuxp/files/tmuxp-1.9.2-tests.patch
new file mode 100644
index 000000000000..3329c547489f
--- /dev/null
+++ b/app-misc/tmuxp/files/tmuxp-1.9.2-tests.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/test_workspacebuilder.py b/tests/test_workspacebuilder.py
+index e85b409..22368b1 100644
+--- a/tests/test_workspacebuilder.py
++++ b/tests/test_workspacebuilder.py
+@@ -343,7 +343,7 @@ def test_environment_variables(session):
+     assert session.show_environment('FOO') == 'BAR'
+     assert session.show_environment('PATH') == '/tmp'
+ 
+-
++@pytest.mark.skip("hangs indefinitely")
+ def test_automatic_rename_option(session):
+     """With option automatic-rename: on."""
+     yaml_config = loadfixture("workspacebuilder/window_automatic_rename.yaml")
diff --git a/app-misc/tmuxp/tmuxp-1.9.2.ebuild b/app-misc/tmuxp/tmuxp-1.9.2.ebuild
new file mode 100644
index 000000000000..75e9bbb0189c
--- /dev/null
+++ b/app-misc/tmuxp/tmuxp-1.9.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="tmux session manager. built on libtmux"
+HOMEPAGE="https://tmuxp.git-pull.com"
+SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=app-misc/tmux-3.0a
+	>=dev-python/kaptan-0.5.10[${PYTHON_USEDEP}]
+	>=dev-python/libtmux-0.10.1[${PYTHON_USEDEP}]
+	<dev-python/libtmux-0.11[${PYTHON_USEDEP}]
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/pytest-rerunfailures-4.2[${PYTHON_USEDEP}]
+		!dev-python/flaky
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/tmuxp-1.6.4-tests.patch"
+	"${FILESDIR}/tmuxp-1.7.2-tests.patch"
+	"${FILESDIR}/tmuxp-1.9.2-relax-click-dep.patch"
+	"${FILESDIR}/tmuxp-1.9.2-tests.patch"
+)
+
+distutils_enable_tests pytest
+
+python_test() {
+	SHELL="/bin/bash" epytest
+}