gentoo resync : 14.12.2020

7 files changed, 41 insertions, 250 deletions

diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index a1ef25807fa2..173d49d5eec7 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -1,11 +1,5 @@
-AUX ckb-0.4.0-modprobe.patch 3049 BLAKE2B a144c5f7c3f1e8871fa4074f5cd36ba9b6664ba1047c8fc2b8a4b32b1b717ebe430b4a761c50b022684eafabcaed6c9af2f8dcc1ff91da53dc475e7fffab42e8 SHA512 7979cb591fa3190667cfd73e4d2e8b8a7fa894e07138f2bf7da841df3f739cbb2ced1f57c90383f0376a721b3fa02b56650845e01970ecee0e2000460f75dd22
+AUX ckb-0.4.2-gcc10.patch 868 BLAKE2B 67c3682f6aca611fd0955ab157e7e5b9a7ffd94a9acf45c12f2c8c0fda64de71e80939eb1a500331c8df4efa136bf031199fe4b5698aaf337b154837b44b135e SHA512 b0ae75c0be22576773adea5c0ecae8bae2b957de569a8863d31dcff2f29444941d50ca17e09d87e13d31c064191e0bff630b5f90cc606c0e24d6beb4d7b58cd7
 AUX ckb.initd 659 BLAKE2B 1de2e8b9b555f2d083698e8302c972619dc08ca652bb1ef06e3a72ec9fa026f74aadb5e86491b4a95fe1c44699a21802907c75c67e3d09bc12caa2114052eaf8 SHA512 45c98f5b3cf2868fd7a5b0a015222b1dc6608847d380a1a3ccc95fab306bfde642a74e5dafe1545b380516fb4d41e30d76b9c1f826882dae28a0332f6c3b40ad
-DIST ckb-0.2.9.tar.gz 664625 BLAKE2B 37dc9c75876ca46fb10241da7b223ca67e5b9c0a998386f0f82eba15a97045e269b1f8a75dea18297865826bff241c21b255a507fd26e73747ee2656a228c4ce SHA512 7910f089d7b01ceade5ae8282db931c9decb9296d4c9c5fc2419eb7fb4ba5a2c0f85721a3a6846ed24a72f61b18374baa7fd27e11329b5d2f65b21916e8b96e1
-DIST ckb-0.4.0.tar.gz 838586 BLAKE2B 42d786d1934cce6bb082ba4c9f7081401153fa2bd209f290659cfd42787ef69fad9ad86c35df973f1934a03699a1472aa2a1ceb8ef70f46316558e764e5cd88c SHA512 81058d1e31e7328dac1b3a83cb443b9d9f29593e872d189766c1dfe8b502965fd9ea7a962423e94d5053c99d8dd8c50bd98638c11631a2ca586fb9ade700284f
-DIST ckb-0.4.1.tar.gz 845316 BLAKE2B 03b6d09ab9297fea30ecff5485fcb33d7ad00335b25ce8bbd7727db1b794c7016a8f161562b5271e29fcefb332b50797d91ff8c09724b96b8929033763ad6624 SHA512 294a29146978c722fdfbb9c2581ed3fc492b2ffead0de8c434bfe90e6aff6e61748517c0f98ae0d8747e7a95684cf22badf778b35358dbaa8acbc18a25ade993
 DIST ckb-0.4.2.tar.gz 883681 BLAKE2B b3d921010b1caa8cb870770c6cf3ff0e9f6c65ea742325995e26351331e3063a16e8a391f593bfc8b16663cef0580e087d776796ea69776465122b08e00e9382 SHA512 4c80101e935a4d5137b0fd6aaf7d97889913af0bbb8e3097e035e2420043d6525094c1e3f7b5676e8c50328454251ff3260f6aa9b81ec583a2e8136333ee6af8
-EBUILD ckb-0.2.9-r1.ebuild 1188 BLAKE2B 31bd8b6247e0f3615b9f2a770e60651ebc3962390c1fb73c39138269acfd9daf30845c70a04c123a358fe52bef07933c618e748076a28bc3b7b79375374779bd SHA512 18531d54b89558b00ada031fd161f96f56105ace63b300db85aa699408184668aab56a9b21fec7c214df232525c5bbe28097aefe3bf7f1b63c650ffa0068f644
-EBUILD ckb-0.4.0.ebuild 929 BLAKE2B b29439748d07eaf2de1b48f473df25edeea66e460fa3770d024a13b8f3fe51d2586a7eb2944bc4d4560b6eb68c93182f5a8b15147b498d9fd4c12e7773a14d1f SHA512 79751bab8d45a33cbcadb17043623516a2ccd8dad6977e05d62564ecf2b19d7d387bda283b216c90a3207f9f84dcfbce431f49853266be294403e4593eedaea3
-EBUILD ckb-0.4.1.ebuild 883 BLAKE2B 8d533915088e7206c86c6f471bc706621416f21ae7eb05983eaa9835af968fee54cc3a7f7afd83c26bcb7561e513075b6b74778a24026a1da8316aac6ce4eb94 SHA512 baf2bd6325e50ec524c21911ec9ff9e961c14ed90ae6da0223f2fec17a34ec407b5474065b3db20ce2577b13b7ee6497d5682e0ea240a08f4eaa5c12cbe91c2b
-EBUILD ckb-0.4.2.ebuild 883 BLAKE2B 8d533915088e7206c86c6f471bc706621416f21ae7eb05983eaa9835af968fee54cc3a7f7afd83c26bcb7561e513075b6b74778a24026a1da8316aac6ce4eb94 SHA512 baf2bd6325e50ec524c21911ec9ff9e961c14ed90ae6da0223f2fec17a34ec407b5474065b3db20ce2577b13b7ee6497d5682e0ea240a08f4eaa5c12cbe91c2b
+EBUILD ckb-0.4.2-r1.ebuild 794 BLAKE2B 5adcbcbb36a5e9c6da8bd9c31017b17020e68e2e8fc063d8227401726a3aa6626bb60012d4f323da00827274ae73aeec439c0199f249a1c5da7983ff7085b114 SHA512 392a3918f652d78b20fde9d8705bdd78ffbcf3847c0aa1352cf559b1dacfdf54f1316880ef8fe0e12bfd375c55b239037070cf606cb46d01187f4785ee09c7f8
 MISC metadata.xml 319 BLAKE2B 413fd0ee948a3bf39044251e819bbf2e10c2896b857b8079a23fe46d8639ddcc7c1c7289c8d3a6f8b9a82cb05e65b38298fabe4359c27497a7aced8fa97d276f SHA512 a878c93cd07a39758b418d7884df552a6741805d148959487d0b0114fb6e5476a718b637b02526310b810e153b0e027abafef14d4e3fd981e1ba1ba88bb1fda2
diff --git a/app-misc/ckb/ckb-0.2.9-r1.ebuild b/app-misc/ckb/ckb-0.2.9-r1.ebuild
deleted file mode 100644
index a0d3d2a09f0a..000000000000
--- a/app-misc/ckb/ckb-0.2.9-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils systemd
-
-DESCRIPTION="Corsair K65/K70/K95 Driver"
-HOMEPAGE="https://github.com/ckb-next/ckb-next"
-SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/quazip-0.7.2[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	virtual/libudev:=
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md BUILD.md DAEMON.md )
-
-S="${WORKDIR}/${PN}-next-${PV}"
-
-src_prepare() {
-	default
-	sed -i -e "s/-Werror=all//" src/ckb-daemon/ckb-daemon.pro || die
-	sed -i -e "/quazip/d" -e "s/^.*QUAZIP_STATIC/LIBS += -lquazip5/" src/ckb/ckb.pro || die
-	sed -i -e "s#/usr/lib#/usr/libexec#" src/ckb/animscript.cpp || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	dobin bin/ckb bin/ckb-daemon
-	dodir /usr/bin/ckb-animations
-	exeinto /usr/libexec/ckb-animations
-	doexe bin/ckb-animations/*
-
-	newinitd "${FILESDIR}"/ckb.initd ckb-daemon
-	domenu usr/ckb.desktop
-	doicon usr/ckb.png
-	systemd_dounit service/systemd/ckb-daemon.service
-}
diff --git a/app-misc/ckb/ckb-0.4.0.ebuild b/app-misc/ckb/ckb-0.4.0.ebuild
deleted file mode 100644
index a0ae03736993..000000000000
--- a/app-misc/ckb/ckb-0.4.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop cmake-utils systemd
-
-DESCRIPTION="Corsair K65/K70/K95 Driver"
-HOMEPAGE="https://github.com/ckb-next/ckb-next"
-SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/quazip-0.7.2[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	virtual/libudev:=
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
-PATCHES=( "${FILESDIR}/${P}-modprobe.patch" )
-S="${WORKDIR}/${PN}-next-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_UPDATER=yes
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/ckb.initd ckb-daemon
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-misc/ckb/ckb-0.4.1.ebuild b/app-misc/ckb/ckb-0.4.2-r1.ebuild
index b9d31b54b0ea..5dcd46ea00a6 100644
--- a/app-misc/ckb/ckb-0.4.1.ebuild
+++ b/app-misc/ckb/ckb-0.4.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop cmake-utils systemd
+inherit xdg cmake
 
 DESCRIPTION="Corsair K65/K70/K95 Driver"
 HOMEPAGE="https://github.com/ckb-next/ckb-next"
@@ -12,38 +12,31 @@ SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
-DEPEND="
+RDEPEND="
 	>=dev-libs/quazip-0.7.2[qt5(+)]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
 	virtual/libudev:=
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}"
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
 
-DOCS=( CHANGELOG.md README.md )
 S="${WORKDIR}/${PN}-next-${PV}"
 
+PATCHES=( "${FILESDIR}"/${P}-gcc10.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		-DDISABLE_UPDATER=yes
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	newinitd "${FILESDIR}"/ckb.initd ckb-daemon
-	cmake-utils_src_install
-}
+	cmake_src_install
+	dodoc CHANGELOG.md
 
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
+	newinitd "${FILESDIR}"/ckb.initd ckb-daemon
 }
diff --git a/app-misc/ckb/ckb-0.4.2.ebuild b/app-misc/ckb/ckb-0.4.2.ebuild
deleted file mode 100644
index b9d31b54b0ea..000000000000
--- a/app-misc/ckb/ckb-0.4.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop cmake-utils systemd
-
-DESCRIPTION="Corsair K65/K70/K95 Driver"
-HOMEPAGE="https://github.com/ckb-next/ckb-next"
-SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	>=dev-libs/quazip-0.7.2[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	virtual/libudev:=
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
-S="${WORKDIR}/${PN}-next-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_UPDATER=yes
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/ckb.initd ckb-daemon
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/app-misc/ckb/files/ckb-0.4.0-modprobe.patch b/app-misc/ckb/files/ckb-0.4.0-modprobe.patch
deleted file mode 100644
index 31dc3303b328..000000000000
--- a/app-misc/ckb/files/ckb-0.4.0-modprobe.patch
+++ /dev/null
@@ -1,72 +0,0 @@
----
- src/daemon/input_linux.c | 21 ++++++++++++++-------
- src/gui/mainwindow.cpp   | 14 ++++++++------
- 2 files changed, 22 insertions(+), 13 deletions(-)
-
-diff --git a/src/daemon/input_linux.c b/src/daemon/input_linux.c
-index 0391243e..8489f5b5 100644
---- a/src/daemon/input_linux.c
-+++ b/src/daemon/input_linux.c
-@@ -55,13 +55,20 @@ int uinputopen(struct uinput_user_dev* indev, int mouse){
- ///
- /// Some tips on using [uinput_user_dev in](http://thiemonge.org/getting-started-with-uinput)
- int os_inputopen(usbdevice* kb){
--    /// First check whether the uinput module is loaded by the kernel.
--    ///
--    // Load the uinput module (if it's not loaded already)
--    if(system("modprobe uinput") != 0) {
--        ckb_fatal("Failed to load uinput module\n");
--        return 1;
-+    /// Let's see if uinput is already available
-+    int fd = open("/dev/uinput", O_RDWR);
-+    if(fd < 0){
-+        fd = open("/dev/input/uinput", O_RDWR);
-+    }
-+
-+    // If not available, load the module
-+    if(fd < 0){
-+        if(system("modprobe uinput") != 0) {
-+            ckb_fatal("Failed to load uinput module\n");
-+            return 1;
-+        }
-     }
-+    close(fd);
- 
-     if(IS_SINGLE_EP(kb)) {
-         kb->uinput_kb = 0;
-@@ -79,7 +86,7 @@ int os_inputopen(usbdevice* kb){
-     indev.id.product = kb->product;
-     indev.id.version = kb->fwversion;
-     // Open keyboard
--    int fd = uinputopen(&indev, 0);
-+    fd = uinputopen(&indev, 0);
-     kb->uinput_kb = fd;
-     if(fd <= 0)
-         return 0;
-diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
-index 968764e7..1eb95bda 100644
---- a/src/gui/mainwindow.cpp
-+++ b/src/gui/mainwindow.cpp
-@@ -282,14 +282,16 @@ void MainWindow::updateVersion(){
-         if(kextstatOut.isEmpty())
-             daemonWarning.append(tr("<br /><b>Warning:</b> System Extension by \"Fumihiko Takayama\" is not allowed in Security & Privacy. Please allow it and then unplug and replug your devices."));
- #elif defined(Q_OS_LINUX)
--            QProcess modprobe;
--            modprobe.start("modprobe", QStringList("uinput"));
-+            if(!(QFileInfo("/dev/uinput").exists() || QFileInfo("/dev/input/uinput").exists())){
-+                QProcess modprobe;
-+                modprobe.start("modprobe", QStringList("uinput"));
- 
--            if(!modprobe.waitForFinished())
--                qDebug() << "Modprobe error";
-+                if(!modprobe.waitForFinished())
-+                    qDebug() << "Modprobe error";
- 
--            if(modprobe.exitCode())
--                daemonWarning.append(tr("<br /><b>Warning:</b> The uinput module could not be loaded. If this issue persists after rebooting, compile a kernel with CONFIG_INPUT_UINPUT=y."));
-+                if(modprobe.exitCode())
-+                    daemonWarning.append(tr("<br /><b>Warning:</b> The uinput module could not be loaded. If this issue persists after rebooting, compile a kernel with CONFIG_INPUT_UINPUT=y."));
-+            }
- #endif
-         settingsWidget->setStatus(tr("No devices connected") + daemonWarning);
-     }
diff --git a/app-misc/ckb/files/ckb-0.4.2-gcc10.patch b/app-misc/ckb/files/ckb-0.4.2-gcc10.patch
new file mode 100644
index 000000000000..e070471cdc02
--- /dev/null
+++ b/app-misc/ckb/files/ckb-0.4.2-gcc10.patch
@@ -0,0 +1,28 @@
+From a9f41cd8b8f5b04c0c66c6d94f96a9725943831e Mon Sep 17 00:00:00 2001
+From: Erik Zeek <zeekec@gmail.com>
+Date: Tue, 12 May 2020 09:56:49 -0600
+Subject: [PATCH] Fix gcc-10/-fno-common error
+
+gcc-10 now defaults to -fno-common and does not automatically add extern
+to variables declared in headers.
+
+https://gcc.gnu.org/gcc-10/porting_to.html
+
+Signed-off-by: Erik Zeek <zeekec@gmail.com>
+---
+ src/daemon/devnode.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/daemon/devnode.h b/src/daemon/devnode.h
+index a0b3a931..349e778d 100644
+--- a/src/daemon/devnode.h
++++ b/src/daemon/devnode.h
+@@ -5,7 +5,7 @@
+ #include "usb.h"
+ 
+ /// Device path base ("/dev/input/ckb" or "/var/run/ckb")
+-const char *const devpath;
++extern const char *const devpath;
+ 
+ /// Group ID for the control nodes. -1 to give read/write access to everybody
+ extern long gid;