gentoo auto-resync : 18:08:2023 - 15:36:15

6 files changed, 15 insertions, 134 deletions

diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index a7a0392ec766..59aa9df1aaff 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/tuxedo-keyboard/Manifest b/app-laptop/tuxedo-keyboard/Manifest
index 139d80c959fc..f1d2f521bb7f 100644
--- a/app-laptop/tuxedo-keyboard/Manifest
+++ b/app-laptop/tuxedo-keyboard/Manifest
@@ -1,8 +1,3 @@
-AUX tuxedo-keyboard-3.2.1-rm-unused-functions.patch 2021 BLAKE2B 7142e236dadeb5b2693f3b7fbc168c3a47564c23687c3fdac7b55e907d7f14f179e2d878b74eb49728c99c1bae269514e72f0d862ceaf34a4edb9aa77a1a1b85 SHA512 4c9afae566184009506e32d0555203c702ad23e1cee67db4e58ac3a724d85b8cddb2ac0bff84ab8235cf9c7de0335773ec66dfd75d256697d561ec4b5527ff09
-DIST tuxedo-keyboard-3.1.3.tar.gz 56532 BLAKE2B 06c2dec95e7888f765040bd41512c691cab9812fbea213b7766605aad6724adf3d5c6e5a3641621781f483e1ce249e71ea988b765e311d4bb4862997d8effb2c SHA512 dbad1ebc5d91d3306197012ce2fafa5e6063c9b8b62a14c3f1412c9340199c91500a6eeefbed73b1a5d15132dc4b4a73e11c86c15c1b2a3d44765b2664d2f331
-DIST tuxedo-keyboard-3.2.1.tar.gz 58606 BLAKE2B 5b358eea14db5f1ac595468e53cd39f026dc92203209c933df34a7d552dc5d9160fdd1d3867a87580518285ee5558fd983fb6b8c193362cde9ea1bf5689949be SHA512 35aaf129d3a75dd38107c2e20fdc066dc1161419a452716458d556b48dacfd42538bd36729a8f468ba838f7203cceeea24c5851de5bdae9c1b21d9d98f342a87
-DIST tuxedo-keyboard-3.2.3.tar.gz 59913 BLAKE2B 113fef200d6c9f9fa0158a77dbed8c9f8d91ce14db78ae9a306ebd8a802ab5f6838f96b0d689eb6b7a4a8187ac023fec6eda2cd52ed83ba521ad5db3cb96c58a SHA512 9f62c6c603d7aa0b4870c4786526d5f7aa6e96104820ecb00eeaf941ea11ac3ceee849189f6f1e09519c201ea89aca58c19374beb90b087ed347e60fe850fad5
-EBUILD tuxedo-keyboard-3.1.3-r1.ebuild 737 BLAKE2B 578d87fd908f3c72a8c3250a8795d30958dfd52b008c8226235ccea3212433a66fb3127074ff9b5f026cc77efdf9fe01101d35c9af9bb6a58222c340b91f2448 SHA512 e615f9ccbbf8be56de20ac2c3978d4c9a31e063bcdc73850eed90a848ea83ca106518cf0035258858aba837ed0255f25838c82aeed0a93ab6d0a2734620cb4a6
-EBUILD tuxedo-keyboard-3.2.1.ebuild 802 BLAKE2B f3b8d0d01eedff8d92b6b08854fc96d771ae5c5bbd585432fb727a16ad418ff49d4f1080a1835a78c6186d2bf7afffde06bdaf42c4fcfbd9136de737af78a2a5 SHA512 98078511e12f9068b5765371d4e8b700e30bce87a54ed2f9d80cd124404c065c70de79e760abec8fd93db16ab210de2fa0bc58f28302dc1d9dc0af1e4ab352fb
-EBUILD tuxedo-keyboard-3.2.3.ebuild 802 BLAKE2B db4b9204e2716f602e03e013439def2d8059825916268befc7bb963d2c7ebb84910977f92691dac852d07df8d882e942ea7d8db5d3e3fb3e74f9797cdf89233b SHA512 c6842acd8a317827cba492fcd6abc43ecdc9e0da68ce685a08a463c853fc86b3c56385ecd2875368124e070b3c01cfa28589354e03d76e20f052d42909bdb85e
+DIST tuxedo-keyboard-3.2.10.tar.gz 62744 BLAKE2B 7beadb4afd1546d16f2796ec78c0da4b25403eab97da853b0c0f1b1c3927c4b1252dc60979196ed4549fa77e3551037f05d7bde3408325a752f8e94f991dd514 SHA512 1f62544bfdbc2cd3282517dd63ef8649c3c3c4ac1546d667d48dacd2395b31b24cf126a47d9d98c2b5a6dd2ac9d260f3740b1279f72a3a64d39418c93ef2f5aa
+EBUILD tuxedo-keyboard-3.2.10-r1.ebuild 679 BLAKE2B 2aadf2abb214c81c8e1eb975110112f606982704cb44b8ccd7857f0060a7064990137f69493ea9c52bb5c904b2c6b3dc92ec0a7c335619f7169f51b9ec9d8231 SHA512 927fddc6d9fc68715939ccdc36817b4aa71223e8da246d881133d0e25520b3ee5bc81341d775637d9105d1c62a54437d674a848cebd04bf8cde90d77bf4405a2
 MISC metadata.xml 357 BLAKE2B b0b8d2292678d7bc0b58723171f97fe567fa32521ad8193948364e8fb2a66122004ff6dcff6006d185caa01e68c8dcaec4506a5d505ebe84604d5fedd49bb29f SHA512 2f918459910e0a76022dea7d2260070fc599b824cb3538b8ff0d4626345e7372377a5e230a90ad123abd90f9a8678e0108850935fe0ee37c754cfcf851c20cc0
diff --git a/app-laptop/tuxedo-keyboard/files/tuxedo-keyboard-3.2.1-rm-unused-functions.patch b/app-laptop/tuxedo-keyboard/files/tuxedo-keyboard-3.2.1-rm-unused-functions.patch
deleted file mode 100644
index 84e32c9edaea..000000000000
--- a/app-laptop/tuxedo-keyboard/files/tuxedo-keyboard-3.2.1-rm-unused-functions.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-https://github.com/tuxedocomputers/tuxedo-keyboard/pull/162
-https://github.com/tuxedocomputers/tuxedo-keyboard/issues/164
-https://bugs.gentoo.org/902133
-
-diff --git a/src/tuxedo_io/tuxedo_io.c b/src/tuxedo_io/tuxedo_io.c
-index 879efd7..5cf4f20 100644
---- a/src/tuxedo_io/tuxedo_io.c
-+++ b/src/tuxedo_io/tuxedo_io.c
-@@ -49,19 +49,6 @@ static u32 id_check_uniwill;
- 
- static struct uniwill_device_features_t *uw_feats;
- 
--/**
-- * strstr version of dmi_match
-- */
--static bool dmi_string_in(enum dmi_field f, const char *str)
--{
--	const char *info = dmi_get_system_info(f);
--
--	if (info == NULL || str == NULL)
--		return info == str;
--
--	return strstr(info, str) != NULL;
--}
--
- static u32 clevo_identify(void)
- {
- 	return clevo_get_active_interface_id(NULL) == 0 ? 1 : 0;
-@@ -181,7 +168,7 @@ static long clevo_ioctl_interface(struct file *file, unsigned int cmd, unsigned
- 
- 	const char str_no_if[] = "";
- 	char *str_clevo_if;
--	
-+
- 	switch (cmd) {
- 		case R_CL_HW_IF_STR:
- 			if (clevo_get_active_interface_id(&str_clevo_if) == 0) {
-@@ -814,7 +801,7 @@ static int __init tuxedo_io_init(void)
- 	tuxedo_io_device_class = class_create(THIS_MODULE, "tuxedo_io");
- 	device_create(tuxedo_io_device_class, NULL, tuxedo_io_device_handle, NULL, "tuxedo_io");
- 	pr_debug("Module init successful\n");
--	
-+
- 	return 0;
- }
- 
-diff --git a/src/uniwill_keyboard.h b/src/uniwill_keyboard.h
-index 332acd6..859dc30 100644
---- a/src/uniwill_keyboard.h
-+++ b/src/uniwill_keyboard.h
-@@ -51,7 +51,6 @@
- #define UNIWILL_OSD_TOUCHPADWORKAROUND		0xFFF
- 
- static void uw_charging_priority_write_state(void);
--static void uw_charging_profile_write_state(void);
- 
- struct tuxedo_keyboard_driver uniwill_keyboard_driver;
- 
-@@ -771,12 +770,6 @@ static int uw_has_charging_profile(bool *status)
- 	return 0;
- }
- 
--static void uw_charging_profile_write_state(void)
--{
--	if (uw_charging_profile_loaded)
--		uw_set_charging_profile(uw_charging_profile_last_written_value);
--}
--
- static void uw_charging_profile_init(struct platform_device *dev)
- {
- 	u8 value;
diff --git a/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.2.1.ebuild b/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.2.1.ebuild
deleted file mode 100644
index 1e578c35555b..000000000000
--- a/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-CONFIG_CHECK="ACPI_WMI INPUT_SPARSEKMAP"
-
-inherit linux-mod toolchain-funcs
-
-DESCRIPTION="Kernel Module for Tuxedo Keyboard"
-HOMEPAGE="https://github.com/tuxedocomputers/tuxedo-keyboard"
-SRC_URI="https://github.com/tuxedocomputers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="clevo_acpi(tuxedo:${S}:src) clevo_wmi(tuxedo:${S}:src) uniwill_wmi(tuxedo:${S}:src) tuxedo_keyboard(tuxedo:${S}:src) tuxedo_io(tuxedo:${S}:src/tuxedo_io)"
-
-PATCHES=( "${FILESDIR}"/${PN}-${PV}-rm-unused-functions.patch )
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KDIR=${KV_DIR} V=1 KBUILD_VERBOSE=1"
-}
diff --git a/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.1.3-r1.ebuild b/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.2.10-r1.ebuild
index 9449f92a3cbb..f3c83e786b3f 100644
--- a/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.1.3-r1.ebuild
+++ b/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.2.10-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 CONFIG_CHECK="ACPI_WMI INPUT_SPARSEKMAP"
 
-inherit linux-mod toolchain-funcs
+inherit linux-mod-r1
 
 DESCRIPTION="Kernel Module for Tuxedo Keyboard"
 HOMEPAGE="https://github.com/tuxedocomputers/tuxedo-keyboard"
@@ -14,10 +14,17 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-BUILD_TARGETS="all"
-MODULE_NAMES="clevo_acpi(tuxedo:${S}:src) clevo_wmi(tuxedo:${S}:src) uniwill_wmi(tuxedo:${S}:src) tuxedo_keyboard(tuxedo:${S}:src) tuxedo_io(tuxedo:${S}:src/tuxedo_io)"
+PATCHES=( )
 
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KDIR=${KV_DIR} V=1 KBUILD_VERBOSE=1"
+src_compile() {
+	local modlist=(
+		clevo_acpi=tuxedo::src
+		clevo_wmi=tuxedo::src
+		uniwill_wmi=tuxedo::src
+		tuxedo_keyboard=tuxedo::src
+		tuxedo_io=tuxedo::src/tuxedo_io
+	)
+	local modargs=( KDIR=${KV_OUT_DIR} )
+
+	linux-mod-r1_src_compile
 }
diff --git a/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.2.3.ebuild b/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.2.3.ebuild
deleted file mode 100644
index b3fce1cb74dc..000000000000
--- a/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.2.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-CONFIG_CHECK="ACPI_WMI INPUT_SPARSEKMAP"
-
-inherit linux-mod toolchain-funcs
-
-DESCRIPTION="Kernel Module for Tuxedo Keyboard"
-HOMEPAGE="https://github.com/tuxedocomputers/tuxedo-keyboard"
-SRC_URI="https://github.com/tuxedocomputers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BUILD_TARGETS="all"
-MODULE_NAMES="clevo_acpi(tuxedo:${S}:src) clevo_wmi(tuxedo:${S}:src) uniwill_wmi(tuxedo:${S}:src) tuxedo_keyboard(tuxedo:${S}:src) tuxedo_io(tuxedo:${S}:src/tuxedo_io)"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2.1-rm-unused-functions.patch )
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KDIR=${KV_DIR} V=1 KBUILD_VERBOSE=1"
-}