gentoo resync : 01.10.2021

5 files changed, 46 insertions, 71 deletions

diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index c4dd2e02832f..fdf489b75262 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -1,7 +1,6 @@
+AUX ckb-0.4.4-libinput-1.2.0.patch 1188 BLAKE2B 36ee73dbd1f8ffa70fae27dd4915837d09eef2226d908aa4cd8e7b5c9bde2a645cb212535d33879efdefee687ac52177979116a0ef81ee921f24fad1654608de SHA512 1d39cfe1bceb8b950f6952e57c7848870a3ffd359adb2245b570dc9fe928480b07cd5332e3cabb9b47090b4b3216474f380c5679db963611c7657bea7d3ac083
 AUX ckb.initd 659 BLAKE2B 1de2e8b9b555f2d083698e8302c972619dc08ca652bb1ef06e3a72ec9fa026f74aadb5e86491b4a95fe1c44699a21802907c75c67e3d09bc12caa2114052eaf8 SHA512 45c98f5b3cf2868fd7a5b0a015222b1dc6608847d380a1a3ccc95fab306bfde642a74e5dafe1545b380516fb4d41e30d76b9c1f826882dae28a0332f6c3b40ad
-DIST ckb-0.4.3.tar.gz 1588845 BLAKE2B bdf11580c8224dfe0a7d01f99e3bea1d36fa3d7c1de84ec991ee4454c838db614bd74757ec3b952d28ab672244bb4c28888f6b80366255cfb57ec37ff8742c1d SHA512 6772812fb9608251f3a14efeb16960966be446462ab3f5b1bec896761aeae9e5f5cf9c07b21e509dbef057825c3017323f82f066519cb512ebe2fc6eea6ec217
 DIST ckb-0.4.4.tar.gz 1593244 BLAKE2B 99476d3be98b3edac540b67b275a1ebec440f2a55d8bedd9bbdc815abd15bbeb3d035c703faa2dfdf9f4dcb70f49024c82b2990b1151b0ad5b78b741430d80f9 SHA512 b03d301a6b984957b5a3047769f25311c479f7992c59222b0ce9314b3204dac2d937c26997b97ec2ee1fdc79e3208c76a57a5c603dc1cd99ffb39fd426f58385
-EBUILD ckb-0.4.3-r2.ebuild 1151 BLAKE2B 26119621c4d58064209a92df8816fa3649fe6d09bb355a8faf2c3a31bc1b9247a747106d26d4c916e7641ee261531c609e5e73abd50ad45a871370c9082df253 SHA512 5a473d8136bfafac3cf82848a696108ca518d2873b8174d4ecf1b18d68e6a0b64713920e48bf7094634675a727f19fac8d22fb69c080408d349ccb24248484a2
 EBUILD ckb-0.4.4-r1.ebuild 1222 BLAKE2B 9bbe18f605c63962190d6b9ff32b9f15481e9b561d1979ca7e885ea06c67b12e39427a26cceb9210f0ecc89a10928d7b3ef9676f28106bf1ee330c5fad9e4f88 SHA512 49d385934ae7c6948f73086950e1aa0a82c7043c1b563282f649c84d37372abd07879641f022486c1d4d3879b8dae3efa9742636b08edc1b8a5b67560e49dd3b
-EBUILD ckb-0.4.4.ebuild 1151 BLAKE2B 26119621c4d58064209a92df8816fa3649fe6d09bb355a8faf2c3a31bc1b9247a747106d26d4c916e7641ee261531c609e5e73abd50ad45a871370c9082df253 SHA512 5a473d8136bfafac3cf82848a696108ca518d2873b8174d4ecf1b18d68e6a0b64713920e48bf7094634675a727f19fac8d22fb69c080408d349ccb24248484a2
-MISC metadata.xml 320 BLAKE2B bf241b479ab5a1cbb3e876bad561a31e8c5d9cd9a5e20d4d6d0019486e469b2e54ec4527652a2ebbcf0bcdc644acb1c03018c366023c3da109fb4dce26d45c5c SHA512 86bd38bc7682bfc9e670c00a9f9fe73cbe6289a34fc046a6dc3c9a7b7d170285f50199be4df283aafb2b6d013d8615179c1ed228febd78ca5a4c1cafa3425351
+EBUILD ckb-0.4.4-r2.ebuild 1270 BLAKE2B 66122b7f5a540f2deb6409018acfa5410c8442ddd773a4c00f01b5e0c4bce9d194728fa47a2873e41811cb2c0b378c9d551553bd309c05e4fdda02e02b112221 SHA512 c834ed41c22b438c582a22aae9025e61a2258df7e849ab31a8dca532e07547dccafc246a2ba192e4fe98b9138344597585b5a1b262151ba77068c592f3142c11
+MISC metadata.xml 330 BLAKE2B 1620c787b0b2ede7874f1b8dba4aa6629f436217278024965a9e5a715cb3196b8630351a1b742f7f05177dc7a22b76caf16cc0ed8fd52dec2e81c54dc1f7f3db SHA512 241b50400569870e01576e52b871aded1ab05853677a05ac42a54eb03295ec9e197a6a592e9182c1169dc9e1f963b9439bce6a2c75eddf5ea7168e07ca362dae
diff --git a/app-misc/ckb/ckb-0.4.3-r2.ebuild b/app-misc/ckb/ckb-0.4.4-r2.ebuild
index 296ba6dabec8..e5c7f3974338 100644
--- a/app-misc/ckb/ckb-0.4.3-r2.ebuild
+++ b/app-misc/ckb/ckb-0.4.4-r2.ebuild
@@ -12,6 +12,7 @@ SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="systemd"
 
 RDEPEND="
 	dev-libs/libdbusmenu-qt
@@ -32,9 +33,14 @@ BDEPEND="dev-qt/linguist-tools:5"
 
 S="${WORKDIR}/${PN}-next-${PV}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-libinput-1.2.0.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DDISABLE_UPDATER=yes
+		-DFORCE_INIT_SYSTEM=$(usex systemd systemd openrc)
 	)
 	cmake_src_configure
 }
@@ -50,10 +56,10 @@ pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
 		elog "The ckb daemon will have to be started before use:"
 		elog
-		elog "OpenRC:"
-		elog "# rc-service ckb start"
-		elog
-		elog "Systemd:"
-		elog "# systemctl start ckb-next-daemon"
+			if use systemd ; then
+			elog "# systemctl start ckb-next-daemon"
+		else
+			elog "# rc-service ckb start"
+		fi
 	fi
 }
diff --git a/app-misc/ckb/ckb-0.4.4.ebuild b/app-misc/ckb/ckb-0.4.4.ebuild
deleted file mode 100644
index 296ba6dabec8..000000000000
--- a/app-misc/ckb/ckb-0.4.4.ebuild
+++ /dev/null
@@ -1,59 +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/libdbusmenu-qt
-	dev-libs/quazip:0=
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-sound/pulseaudio
-	virtual/libudev:=
-	x11-libs/libX11
-	x11-libs/libxcb:=
-	x11-libs/xcb-util-wm"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-S="${WORKDIR}/${PN}-next-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_UPDATER=yes
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	dodoc CHANGELOG.md
-
-	newinitd "${FILESDIR}"/ckb.initd ckb-daemon
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "The ckb daemon will have to be started before use:"
-		elog
-		elog "OpenRC:"
-		elog "# rc-service ckb start"
-		elog
-		elog "Systemd:"
-		elog "# systemctl start ckb-next-daemon"
-	fi
-}
diff --git a/app-misc/ckb/files/ckb-0.4.4-libinput-1.2.0.patch b/app-misc/ckb/files/ckb-0.4.4-libinput-1.2.0.patch
new file mode 100644
index 000000000000..211d5e4ea01e
--- /dev/null
+++ b/app-misc/ckb/files/ckb-0.4.4-libinput-1.2.0.patch
@@ -0,0 +1,29 @@
+From dc4dc54c5ebac7e4b455d8df35076fc044a581a7 Mon Sep 17 00:00:00 2001
+From: Tasos Sahanidis <tasos@tasossah.com>
+Date: Mon, 20 Sep 2021 14:48:18 +0300
+Subject: [PATCH] Don't enable unneeded axes in mouse device
+
+Specifically, we used to enable HI_RES wheel events without ever
+sending any. This breaks scrolling in latest libinput as it expects
+us to actually send HI_RES events.
+---
+ src/daemon/input_linux.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/daemon/input_linux.c b/src/daemon/input_linux.c
+index 68cc0ebb..a9ac8c8e 100644
+--- a/src/daemon/input_linux.c
++++ b/src/daemon/input_linux.c
+@@ -25,8 +25,10 @@ int uinputopen(struct uinput_user_dev* indev, int mouse){
+             ioctl(fd, UI_SET_KEYBIT, i);
+         // Enable mouse axes
+         ioctl(fd, UI_SET_EVBIT, EV_REL);
+-        for(int i = 0; i < REL_CNT; i++)
+-            ioctl(fd, UI_SET_RELBIT, i);
++        ioctl(fd, UI_SET_RELBIT, REL_X);
++        ioctl(fd, UI_SET_RELBIT, REL_Y);
++        ioctl(fd, UI_SET_RELBIT, REL_WHEEL);
++        ioctl(fd, UI_SET_RELBIT, REL_HWHEEL);
+     } else {
+         // Enable common keyboard keys
+         for(int i = KEY_ESC; i <= KEY_MEDIA; i++)
diff --git a/app-misc/ckb/metadata.xml b/app-misc/ckb/metadata.xml
index fd46f36caba0..3eca60ac4892 100644
--- a/app-misc/ckb/metadata.xml
+++ b/app-misc/ckb/metadata.xml
@@ -2,10 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>chainsaw@gentoo.org</email>
-		<name>Tony Vroon</name>
+		<email>ajak@gentoo.org</email>
+		<name>John Helmert III</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ccMSC/ckb</remote-id>
+		<remote-id type="github">ckb-next/ckb-next</remote-id>
 	</upstream>
 </pkgmetadata>