gentoo resync : 24.06.2021

8 files changed, 279 insertions, 0 deletions

diff --git a/app-misc/openrgb/Manifest b/app-misc/openrgb/Manifest
new file mode 100644
index 000000000000..7994a7bde906
--- /dev/null
+++ b/app-misc/openrgb/Manifest
@@ -0,0 +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
+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
+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
new file mode 100644
index 000000000000..fe805988af5d
--- /dev/null
+++ b/app-misc/openrgb/files/OpenRGB-0.5-build-system.patch
@@ -0,0 +1,13 @@
+diff --git a/OpenRGB.pro b/OpenRGB.pro
+index 91e0079..7f279dd 100644
+--- a/OpenRGB.pro
++++ b/OpenRGB.pro
+@@ -26,8 +26,5 @@ TEMPLATE = app
+ win32:BUILDDATE = $$system(date /t)
+ unix:BUILDDATE  = $$system(date -R -d "@${SOURCE_DATE_EPOCH:-$(date +%s)}")
+-GIT_COMMIT_ID   = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ rev-parse HEAD)
+-GIT_COMMIT_DATE = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ show -s --format=%ci HEAD)
+-GIT_BRANCH      = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ rev-parse --abbrev-ref HEAD)
+ 
+ DEFINES +=                                                              \
+     VERSION_STRING=\\"\"\"$$VERSION\\"\"\"                              \
diff --git a/app-misc/openrgb/files/OpenRGB-0.6-pkgconf.patch b/app-misc/openrgb/files/OpenRGB-0.6-pkgconf.patch
new file mode 100644
index 000000000000..380b1091d225
--- /dev/null
+++ b/app-misc/openrgb/files/OpenRGB-0.6-pkgconf.patch
@@ -0,0 +1,11 @@
+--- a/OpenRGB.pro	2021-06-06 22:51:12.022561718 +0100
++++ b/OpenRGB.pro	2021-06-06 22:51:24.466105358 +0100
+@@ -837,7 +837,7 @@ unix:!macx {
+         # hidapi-hidraw >= 0.10.1 supports USAGE/USAGE_PAGE                                     #
+         # Define USE_HID_USAGE if hidapi-hidraw supports it                                     #
+         #---------------------------------------------------------------------------------------#
+-        HIDAPI_HIDRAW_VERSION = $$system(pkgconf --modversion hidapi-hidraw)
++        HIDAPI_HIDRAW_VERSION = $$system(pkg-config --modversion hidapi-hidraw)
+         if(versionAtLeast(HIDAPI_HIDRAW_VERSION, "0.10.1")) {
+             DEFINES += USE_HID_USAGE
+         }
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
new file mode 100644
index 000000000000..c308d68bd107
--- /dev/null
+++ b/app-misc/openrgb/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">CalcProgrammer1/OpenRGB</remote-id>
+	</upstream>
+</pkgmetadata>
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
new file mode 100644
index 000000000000..c356d7aff6fb
--- /dev/null
+++ b/app-misc/openrgb/openrgb-0.6.ebuild
@@ -0,0 +1,57 @@
+# 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
new file mode 100644
index 000000000000..9ea0dfa538ff
--- /dev/null
+++ b/app-misc/openrgb/openrgb-9999.ebuild
@@ -0,0 +1,76 @@
+# 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
+	net-libs/mbedtls:=
+	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,mbedtls}* || 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
+}