gentoo resync : 03.03.2021

4 files changed, 5 insertions, 77 deletions

diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index 7aae2ee350cc..672c49e4c9ba 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -1,7 +1,4 @@
-AUX ckb-0.4.2-gcc10.patch 868 BLAKE2B 67c3682f6aca611fd0955ab157e7e5b9a7ffd94a9acf45c12f2c8c0fda64de71e80939eb1a500331c8df4efa136bf031199fe4b5698aaf337b154837b44b135e SHA512 b0ae75c0be22576773adea5c0ecae8bae2b957de569a8863d31dcff2f29444941d50ca17e09d87e13d31c064191e0bff630b5f90cc606c0e24d6beb4d7b58cd7
 AUX ckb.initd 659 BLAKE2B 1de2e8b9b555f2d083698e8302c972619dc08ca652bb1ef06e3a72ec9fa026f74aadb5e86491b4a95fe1c44699a21802907c75c67e3d09bc12caa2114052eaf8 SHA512 45c98f5b3cf2868fd7a5b0a015222b1dc6608847d380a1a3ccc95fab306bfde642a74e5dafe1545b380516fb4d41e30d76b9c1f826882dae28a0332f6c3b40ad
-DIST ckb-0.4.2.tar.gz 883681 BLAKE2B b3d921010b1caa8cb870770c6cf3ff0e9f6c65ea742325995e26351331e3063a16e8a391f593bfc8b16663cef0580e087d776796ea69776465122b08e00e9382 SHA512 4c80101e935a4d5137b0fd6aaf7d97889913af0bbb8e3097e035e2420043d6525094c1e3f7b5676e8c50328454251ff3260f6aa9b81ec583a2e8136333ee6af8
 DIST ckb-0.4.3.tar.gz 1588845 BLAKE2B bdf11580c8224dfe0a7d01f99e3bea1d36fa3d7c1de84ec991ee4454c838db614bd74757ec3b952d28ab672244bb4c28888f6b80366255cfb57ec37ff8742c1d SHA512 6772812fb9608251f3a14efeb16960966be446462ab3f5b1bec896761aeae9e5f5cf9c07b21e509dbef057825c3017323f82f066519cb512ebe2fc6eea6ec217
-EBUILD ckb-0.4.2-r2.ebuild 796 BLAKE2B 9bc343aa665e14200c2700e23517e735546e0ebf723c60d222297243af360c2a608ef1284a9df50692758f5274870c73af3154f6cf2a0a13b6cdb6fbcbb6452b SHA512 7a46d2b0deda858e4f3e4b64433e5d64497114c8cbe3ebaa8ea3046dc6e7e25104f906fe1c1456f1ef1fb3d06d8a0a582c14084bf1ad37c2c344d3807fed282b
-EBUILD ckb-0.4.3-r1.ebuild 1148 BLAKE2B ce766e2161c63520acb6dc9c62d71d847cc76b4bedb3fd7b8dae73bad21a4569fa6de344114e954e5b1228a719948ac5a05623909a590a4156b92080ce5b1a49 SHA512 94191e1fec557ab2046ff224e2809c61c25a93eb08dcbba24e1acc50b73670c200bb8a6c37d2ed1b918acd44fef3ace47831649138f3827741114806dd634e90
+EBUILD ckb-0.4.3-r2.ebuild 1151 BLAKE2B 26119621c4d58064209a92df8816fa3649fe6d09bb355a8faf2c3a31bc1b9247a747106d26d4c916e7641ee261531c609e5e73abd50ad45a871370c9082df253 SHA512 5a473d8136bfafac3cf82848a696108ca518d2873b8174d4ecf1b18d68e6a0b64713920e48bf7094634675a727f19fac8d22fb69c080408d349ccb24248484a2
 MISC metadata.xml 319 BLAKE2B 413fd0ee948a3bf39044251e819bbf2e10c2896b857b8079a23fe46d8639ddcc7c1c7289c8d3a6f8b9a82cb05e65b38298fabe4359c27497a7aced8fa97d276f SHA512 a878c93cd07a39758b418d7884df552a6741805d148959487d0b0114fb6e5476a718b637b02526310b810e153b0e027abafef14d4e3fd981e1ba1ba88bb1fda2
diff --git a/app-misc/ckb/ckb-0.4.2-r2.ebuild b/app-misc/ckb/ckb-0.4.2-r2.ebuild
deleted file mode 100644
index 6cf15eba6ad5..000000000000
--- a/app-misc/ckb/ckb-0.4.2-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake
-
-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"
-
-RDEPEND="
-	>=dev-libs/quazip-0.7.2:0[qt5(+)]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	virtual/libudev:=
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-next-${PV}"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc10.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_UPDATER=yes
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	dodoc CHANGELOG.md
-
-	newinitd "${FILESDIR}"/ckb.initd ckb-daemon
-}
diff --git a/app-misc/ckb/ckb-0.4.3-r1.ebuild b/app-misc/ckb/ckb-0.4.3-r2.ebuild
index 8d8485e09da7..296ba6dabec8 100644
--- a/app-misc/ckb/ckb-0.4.3-r1.ebuild
+++ b/app-misc/ckb/ckb-0.4.3-r2.ebuild
@@ -13,8 +13,9 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 
-RDEPEND="dev-libs/libdbusmenu-qt
-	dev-libs/quazip:0
+RDEPEND="
+	dev-libs/libdbusmenu-qt
+	dev-libs/quazip:0=
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
@@ -26,8 +27,8 @@ RDEPEND="dev-libs/libdbusmenu-qt
 	x11-libs/libX11
 	x11-libs/libxcb:=
 	x11-libs/xcb-util-wm"
-BDEPEND="dev-qt/linguist-tools:5"
 DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/linguist-tools:5"
 
 S="${WORKDIR}/${PN}-next-${PV}"
 
diff --git a/app-misc/ckb/files/ckb-0.4.2-gcc10.patch b/app-misc/ckb/files/ckb-0.4.2-gcc10.patch
deleted file mode 100644
index e070471cdc02..000000000000
--- a/app-misc/ckb/files/ckb-0.4.2-gcc10.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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;