gentoo resync : 14.12.2020

4 files changed, 72 insertions, 8 deletions

diff --git a/app-misc/OpenRGB/Manifest b/app-misc/OpenRGB/Manifest
index 3d5be5410329..c61dfcfc90fd 100644
--- a/app-misc/OpenRGB/Manifest
+++ b/app-misc/OpenRGB/Manifest
@@ -1,5 +1,8 @@
 AUX OpenRGB-0.2-build-system.patch 736 BLAKE2B cf03e1690f6bc671de860cc2d7346cb8bf97bb0bde16d6931f476794358a682b740f976ffac12c0e3ab8b52a11d785d1b31706120c3323e35cc812cede2a98e5 SHA512 5959c2b2c07f53f583fbb7c6f29e2128343167daff4bad59d652be44dd6b8fb6bcf04e84bf523731ccd2d8f296966bd7239c8edbccb72b3a9c42a3e184db71f7
+AUX OpenRGB-0.5-build-system.patch 755 BLAKE2B bda13d7d9de39d3dd79245ff7a13e22e09381a62ceaa58413b0aaa28017b6e860d032ab6ceb84f1140dc7f6c23dfecc1cadbcf696c8f872016307ea34d8870dc SHA512 50e110c01833113504a3a64e438a404196ae0af8e75007d6c42f3fcab5c20468f3fcb80f83d1f98ac7e1f4f88b1808ee28d0bf342b416d581c354a2388af32bf
 DIST OpenRGB-release_0.4.tar.bz2 2195819 BLAKE2B 6416e143707e5ae48d0f26d205e1cc27571299d7d4b8483d18cc03db237d71ebc3574973fc1540dacc24662c536888e575e89db417e52dc9672d412fe41c540b SHA512 9ecdf0a0aec5916b1c705c1ad0bd567f46f9b0a4409211cb195ec7a4bfbc95c80bde13798839d23e867ed613cb34c6e9629da4aac942490f58ca9528f5f0a8bd
+DIST OpenRGB-release_0.5.tar.bz2 24183948 BLAKE2B c3e6eaab2224f97287a454375486cdacc6814f35fe6752271293d30110d066998d95a901224929cdec7f57a3983fa9d8f5dc488a2ccb6d128df36fac6bc4582a SHA512 d0bd69de94e7e94b9972c07851602d8437b4485d02e83e2fe84f21292acbeef32624ec82d5cb79de85a4dfec35431c469b124b0cc41cf1f741e6e52803dd82eb
 EBUILD OpenRGB-0.4.ebuild 1114 BLAKE2B fbac5c83ffd46cd98d0665ca8e633508e04688a75ee593adbb094ea87fbf7e41e32f770dbccb596c4528b52d088a99cfce6fb7f155651c5c7bfffaf99009dd8d SHA512 3f80f1865c71f22069c8036cb3d54bf39eee755781ba70f784828bcffdb40a31704cf6e37c5ac0f60a29bc2d63f82aa46aa1b5147dbb9015de7f692131531832
-EBUILD OpenRGB-9999.ebuild 1190 BLAKE2B b9ad9b39646859eda82bae53514679d8646b04d21717b2170675a663ef236fb92590d4a7714ccb379a4b166e8f2408161ad4f603ed36e2171ee043edf1564759 SHA512 115d970d9a25a71b7a9045cc617cf42cc66f6fbb91f5411e712cde987dad0ba1d8dfdffb69c8b3ccf91776e8ee58b9eb3a61a691cb10f40ef5fd6f42bfcbbdae
+EBUILD OpenRGB-0.5.ebuild 1117 BLAKE2B 7aeb09d188ebf71fb187e20f866f9806ebb02882af669dbb654e8e2f2a22f79350771232abe9ef43a0cc96c14a606a326c8e38872528aad2cfd346ebbada9624 SHA512 1fdf041c54921e0fd9c8bc75ddcd60788692c70bc1cd7c4dbd1358d54b026704d5d3791817be144dd850d88c23db381d1ad8c9e41be7ae699398065d52ce68a9
+EBUILD OpenRGB-9999.ebuild 1117 BLAKE2B 7aeb09d188ebf71fb187e20f866f9806ebb02882af669dbb654e8e2f2a22f79350771232abe9ef43a0cc96c14a606a326c8e38872528aad2cfd346ebbada9624 SHA512 1fdf041c54921e0fd9c8bc75ddcd60788692c70bc1cd7c4dbd1358d54b026704d5d3791817be144dd850d88c23db381d1ad8c9e41be7ae699398065d52ce68a9
 MISC metadata.xml 454 BLAKE2B 3494c8e32c5f741e269a332fbf382e5bc6dee352d9aa3ae674d78fab6b4db06ba734ab82182a9d0ac4888813b1d3bea80fb87e252070bf931575e8eabe58047c SHA512 586db979df41b203cc4c4df318ebeb136d7098c535325c34a5c75dd40dc0ed8b137e62ffec323ef1a28da7cb646f1fc1bc4aef75f9f25537f7dfcc8d502ba6bc
diff --git a/app-misc/OpenRGB/OpenRGB-0.5.ebuild b/app-misc/OpenRGB/OpenRGB-0.5.ebuild
new file mode 100644
index 000000000000..6c5d8e23cd0c
--- /dev/null
+++ b/app-misc/OpenRGB/OpenRGB-0.5.ebuild
@@ -0,0 +1,53 @@
+# 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/OpenRGB/OpenRGB-9999.ebuild b/app-misc/OpenRGB/OpenRGB-9999.ebuild
index 1499b76f7273..6c5d8e23cd0c 100644
--- a/app-misc/OpenRGB/OpenRGB-9999.ebuild
+++ b/app-misc/OpenRGB/OpenRGB-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit qmake-utils udev
+inherit qmake-utils
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -18,7 +18,6 @@ DESCRIPTION="Open source RGB lighting control that doesn't depend on manufacture
 HOMEPAGE="https://gitlab.com/CalcProgrammer1/OpenRGB/"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="udev"
 
 RDEPEND="
 	dev-libs/hidapi:=
@@ -39,7 +38,7 @@ src_prepare() {
 	default
 	rm -r dependencies/{hidapi,libusb,json}* || die
 	if [[ ${PV} != *9999* ]]; then
-		eapply "${FILESDIR}/OpenRGB-0.2-build-system.patch"
+		eapply "${FILESDIR}/OpenRGB-0.5-build-system.patch"
 	fi
 }
 
@@ -51,8 +50,4 @@ src_install() {
 	emake INSTALL_ROOT="${ED}" install
 
 	dodoc README.md OpenRGB.patch
-
-	if use udev; then
-		udev_dorules 60-openrgb.rules
-	fi
 }
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\\"\"\"                              \