gentoo resync : 16.01.2021

4 files changed, 98 insertions, 12 deletions

diff --git a/app-misc/openrgb/Manifest b/app-misc/openrgb/Manifest
index cac95664db4c..11b8629f3898 100644
--- a/app-misc/openrgb/Manifest
+++ b/app-misc/openrgb/Manifest
@@ -2,7 +2,10 @@ AUX OpenRGB-0.5-build-system.patch 755 BLAKE2B bda13d7d9de39d3dd79245ff7a13e22e0
 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
+AUX OpenRGB-0.7-udev.patch 515 BLAKE2B c535efa9d6fbc5b0f56eb9914ca9c23d3d431f2d98b7d3bdee60bbb0abdb67eb5e21b75be9ec9226e8de1def3136d89175f0500e83ec97b3a23ad1ec1e5929ca SHA512 11c09942811077134c78fd916ab842c39361214888d13187071a2bbf8112f995915b491fd8e8574a5cb59b02d70477ac0ecf42592d433ec24feffe194f7a0534
 DIST OpenRGB-release_0.6.tar.bz2 24301305 BLAKE2B 20d8f8f7a3189fd5f94b008b11c869d2a8584dc038322e4ac8649c7b57172637133dd18c05ed8eaa6907ba7c097280727a9e7ce2e676250146044bbc2d66921e SHA512 9eb090e1cab121308f3adea8c50feb819a19cb52feff29e45ec24dfbb37013421f53d2ac614496781af1ef4e612dd41c1abafec509430df7d0715aba59ee5a32
+DIST OpenRGB-release_0.7.tar.bz2 28053114 BLAKE2B dfab42fca654478ab359e6e46133fc20a4bf32aca35d1b2f475d3e4e5e218f35c7e1f03be15381b0e8d874ea24254b88b8fe21548a4183b29b4c66647aeef516 SHA512 6ee605bfc91da14d34bc89fe75790f99548253e2d6aa088e20d1996577629bf15fe0fae09e65d983aa829f54cfcbd33e13f2c7d493a2776fd1723f8725b62186
 EBUILD openrgb-0.6-r1.ebuild 1831 BLAKE2B 3b56b2846aed9d03f6bbc2338063643ea50df986ed0912abbcebc85c22d44ea4d7fd87bbcc5aa9a16599697e09cc221d1ee4cfacd72317abfcce8b1ac9f66f93 SHA512 49ac7263ac9fe57e160f4743d6f712571305504bfa5a498ea17ef37dedfe48906e989f9d20a86a9d8de7dc9af7010bf6555001699f7821e780c2233cd18c8bb3
-EBUILD openrgb-9999.ebuild 1818 BLAKE2B a94c2e6b6e86c6c9b6057bd92c35988f0df5c2faaef78291717838e06b99259ddaa119301d7dbf840b2e902de2d7d1c4d1fd8a1ce2fa237c93b43ce8cd0b1d4a SHA512 510e647d927ac801ed0d03332892aff5cbaf6f353fe37a48a8ae6b24d6fde56037195d097b976ffaf9cf5c3b772d56511f4291ac399357b547c47870e665d16d
+EBUILD openrgb-0.7.ebuild 1865 BLAKE2B db8ba0bbc8b78e1d9fb4c375b3e234efda4056e2ea23069ff68d42a3bdb42f1e2b1baf03306aca93e2881605246d10bf52ef364bc3a5366a4a3e00af05cef9b4 SHA512 69782bcb0497ad92b33dda1300b80c4beb178cb7fd058f9d02d962f2eaa8ce53ce39c796ee1de2ec7a14e1356edc4332949a43f6bfdcaf7c55eb03d4be018d21
+EBUILD openrgb-9999.ebuild 1865 BLAKE2B db8ba0bbc8b78e1d9fb4c375b3e234efda4056e2ea23069ff68d42a3bdb42f1e2b1baf03306aca93e2881605246d10bf52ef364bc3a5366a4a3e00af05cef9b4 SHA512 69782bcb0497ad92b33dda1300b80c4beb178cb7fd058f9d02d962f2eaa8ce53ce39c796ee1de2ec7a14e1356edc4332949a43f6bfdcaf7c55eb03d4be018d21
 MISC metadata.xml 469 BLAKE2B 39e7ed78f80bb0d2123efb9c94032ef7df8c514e29528f658f6865ab80f3734e7767108fc787c153dfc0df6c8ffa413fc1fdddb7da25e68cd2537c3d4ddbfe81 SHA512 de37a252c6697a9dacf486e71619b0f5fe895c67d48c55c71233b0082495662120a141cae683206293781b886526e92f0b48c91c30f2a536502cb6bd1e880c9a
diff --git a/app-misc/openrgb/files/OpenRGB-0.7-udev.patch b/app-misc/openrgb/files/OpenRGB-0.7-udev.patch
new file mode 100644
index 000000000000..a2feaf1c9378
--- /dev/null
+++ b/app-misc/openrgb/files/OpenRGB-0.7-udev.patch
@@ -0,0 +1,16 @@
+Install udev rules to correct dir
+
+Revert https://gitlab.com/CalcProgrammer1/OpenRGB/-/commit/ccbe83919a70be346eea948fb2c4122ef9f34214
+
+--- a/OpenRGB.pro
++++ b/OpenRGB.pro
+@@ -1246,7 +1246,7 @@ unix:!macx {
+     icon.files+=qt/OpenRGB.png
+     metainfo.path=$$PREFIX/share/metainfo/
+     metainfo.files+=qt/org.openrgb.OpenRGB.metainfo.xml
++    rules.path=/lib/udev/rules.d/
+-    rules.path=$$PREFIX/lib/udev/rules.d/
+     rules.files+=60-openrgb.rules
+     INSTALLS += target desktop icon metainfo rules
+ }
+GitLab
diff --git a/app-misc/openrgb/openrgb-0.7.ebuild b/app-misc/openrgb/openrgb-0.7.ebuild
new file mode 100644
index 000000000000..f9e079015112
--- /dev/null
+++ b/app-misc/openrgb/openrgb-0.7.ebuild
@@ -0,0 +1,71 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+# subslot is OPENRGB_PLUGIN_API_VERSION from https://gitlab.com/CalcProgrammer1/OpenRGB/-/blob/master/OpenRGBPluginInterface.h
+SLOT="0/2"
+
+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.7-plugins.patch
+	"${FILESDIR}"/OpenRGB-0.7-udev.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
+	find . -name '*.h' -exec cp --parents '{}' "${ED}/usr/include/OpenRGB/" ';' || die
+}
diff --git a/app-misc/openrgb/openrgb-9999.ebuild b/app-misc/openrgb/openrgb-9999.ebuild
index a3d6ddefcc41..f9e079015112 100644
--- a/app-misc/openrgb/openrgb-9999.ebuild
+++ b/app-misc/openrgb/openrgb-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic qmake-utils
 
@@ -20,10 +20,11 @@ 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"
+# subslot is OPENRGB_PLUGIN_API_VERSION from https://gitlab.com/CalcProgrammer1/OpenRGB/-/blob/master/OpenRGBPluginInterface.h
+SLOT="0/2"
 
 RDEPEND="
-	dev-libs/hidapi:=
+	dev-libs/hidapi
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
@@ -40,6 +41,7 @@ BDEPEND="
 
 PATCHES+=(
 	"${FILESDIR}"/OpenRGB-0.7-plugins.patch
+	"${FILESDIR}"/OpenRGB-0.7-udev.patch
 )
 
 src_prepare() {
@@ -65,11 +67,5 @@ src_install() {
 
 	# 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
+	find . -name '*.h' -exec cp --parents '{}' "${ED}/usr/include/OpenRGB/" ';' || die
 }