gentoo resync : 25.09.2021

4 files changed, 27 insertions, 61 deletions

diff --git a/app-misc/openrgb/Manifest b/app-misc/openrgb/Manifest
index da30c406d0a2..cac95664db4c 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
 AUX OpenRGB-0.6-plugins.patch 1002 BLAKE2B 42bb7a51876603003a8cf84759754201a92ae50b6a1d6c3b234ca7a49ad0ad00a6dd6d8dc9e068cd7d865d90cbde6a4a9794845a200e06ca5cfe530d37505dd2 SHA512 6d590398dcc65db8720577e83fe8a11a46f7b0be485f1caf227148250450d936599b4ccc47df8b6f8676676cccfcfdf5ad7f02ad76ca415eb0a9c40a58970cbb
+AUX OpenRGB-0.7-plugins.patch 1035 BLAKE2B 46025eea33f9cbef73994ea25284e05a7dc1848a7a9f2d60d9e173a5e6f40d98d1a0346d75fb5bf2bb05803bfafa1f3a94bb15a7feee25743565644370cc58fb SHA512 2a098ff5ec43347ed91ac43971e50872461a23762124ac252573b602236ced309c94e9a58b8667a52c85a06dd85eb519a1ee0aa7c8ecd577713a28d456db1c14
 DIST OpenRGB-release_0.6.tar.bz2 24301305 BLAKE2B 20d8f8f7a3189fd5f94b008b11c869d2a8584dc038322e4ac8649c7b57172637133dd18c05ed8eaa6907ba7c097280727a9e7ce2e676250146044bbc2d66921e SHA512 9eb090e1cab121308f3adea8c50feb819a19cb52feff29e45ec24dfbb37013421f53d2ac614496781af1ef4e612dd41c1abafec509430df7d0715aba59ee5a32
 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
+EBUILD openrgb-9999.ebuild 1818 BLAKE2B a94c2e6b6e86c6c9b6057bd92c35988f0df5c2faaef78291717838e06b99259ddaa119301d7dbf840b2e902de2d7d1c4d1fd8a1ce2fa237c93b43ce8cd0b1d4a SHA512 510e647d927ac801ed0d03332892aff5cbaf6f353fe37a48a8ae6b24d6fde56037195d097b976ffaf9cf5c3b772d56511f4291ac399357b547c47870e665d16d
 MISC metadata.xml 469 BLAKE2B 39e7ed78f80bb0d2123efb9c94032ef7df8c514e29528f658f6865ab80f3734e7767108fc787c153dfc0df6c8ffa413fc1fdddb7da25e68cd2537c3d4ddbfe81 SHA512 de37a252c6697a9dacf486e71619b0f5fe895c67d48c55c71233b0082495662120a141cae683206293781b886526e92f0b48c91c30f2a536502cb6bd1e880c9a
diff --git a/app-misc/openrgb/files/OpenRGB-0.7-plugins.patch b/app-misc/openrgb/files/OpenRGB-0.7-plugins.patch
new file mode 100644
index 000000000000..b9a6fb2cd16a
--- /dev/null
+++ b/app-misc/openrgb/files/OpenRGB-0.7-plugins.patch
@@ -0,0 +1,24 @@
+Allow installation of plugins not only in ~/.config
+
+Used by app-misc/openrgb-plugin-* packages
+
+--- a/PluginManager.cpp
++++ b/PluginManager.cpp
+@@ -35,7 +35,8 @@ void PluginManager::ScanAndLoadPlugins()
+     | The plugins directory is a directory named "plugins" in   |
+     | the configuration directory                               |
+     \*---------------------------------------------------------*/
+-    const QDir plugins_dir = QString().fromStdString(ResourceManager::get()->GetConfigurationDirectory()) + "plugins/";
++    for (const QDir plugins_dir : {QString().fromStdString(ResourceManager::get()->GetConfigurationDirectory()) + "plugins/",
++                                   QString().fromStdString(GENTOO_PLUGINS_DIR)}) {
+ 
+     /*---------------------------------------------------------*\
+     | Get a list of all files in the plugins directory          |
+@@ -56,6 +57,7 @@ void PluginManager::ScanAndLoadPlugins()
+ 
+         AddPlugin(plugin_path);
+     }
++    }
+ }
+ 
+ void PluginManager::AddPlugin(std::string path)
diff --git a/app-misc/openrgb/openrgb-0.6.ebuild b/app-misc/openrgb/openrgb-0.6.ebuild
deleted file mode 100644
index c356d7aff6fb..000000000000
--- a/app-misc/openrgb/openrgb-0.6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2020-2021 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"
-	PATCHES=(
-		"${FILESDIR}"/OpenRGB-0.5-build-system.patch
-	)
-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
-"
-
-PATCHES+=(
-	"${FILESDIR}"/OpenRGB-0.6-pkgconf.patch
-)
-
-src_prepare() {
-	default
-	rm -r dependencies/{hidapi,libusb,json}* || die
-}
-
-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/openrgb/openrgb-9999.ebuild b/app-misc/openrgb/openrgb-9999.ebuild
index 9ea0dfa538ff..a3d6ddefcc41 100644
--- a/app-misc/openrgb/openrgb-9999.ebuild
+++ b/app-misc/openrgb/openrgb-9999.ebuild
@@ -39,8 +39,7 @@ BDEPEND="
 "
 
 PATCHES+=(
-	"${FILESDIR}"/OpenRGB-0.6-pkgconf.patch
-	"${FILESDIR}"/OpenRGB-0.6-plugins.patch
+	"${FILESDIR}"/OpenRGB-0.7-plugins.patch
 )
 
 src_prepare() {