gentoo auto-resync : 13:05:2023 - 05:50:34

8 files changed, 114 insertions, 12 deletions

diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index 695664833b0e..e413342e08c2 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/tuxedo-control-center-bin/Manifest b/app-laptop/tuxedo-control-center-bin/Manifest
index 518c9856cbb5..7f257425de2d 100644
--- a/app-laptop/tuxedo-control-center-bin/Manifest
+++ b/app-laptop/tuxedo-control-center-bin/Manifest
@@ -1,6 +1,6 @@
 AUX tccd.initd 673 BLAKE2B 418e8a473ca8592c7de313a4a18a71172555ed3a79cb7c5f22dca8932883ae0190c091d0585773d3a5ceec6637611740744fdaa4542b00edecbc04e00a39eab0 SHA512 d08f4e4b11e9a1b62c5694fba862cd6fc223e2461a93272fd7085daf7f7942cf15dad0f9370257d19f9252e2d38c82c15de4d311cc037326edf6dc4f05e2bebd
-DIST tuxedo-control-center_1.1.4.rpm 86231740 BLAKE2B be8b7d7c6de05601acd90a89b3e6bb89c5e251a94a18c7f1021e88797fbc1fc9c580545ca3d86e1ebf11f689d2454d4b6eac1736be0a31eabf28668d0ca0b32c SHA512 80e0c0f8ba81b8fe7bee2ec86b13a5f50c2a174b4260b7922a58df821a0b2ae89cd40c87e41c48de0a9e24a56ec1ad5123a664fc94123b95c05e61801db67072
 DIST tuxedo-control-center_1.2.4.rpm 87792476 BLAKE2B 1d825b457be311da9022147eea8d86e17cc61c2c7decb5c334ad0f1cf44e7c0affe8026a650bcf6325fb21381fb4a17c3825a37c3815b489b059ea34b97f1794 SHA512 ac887b6681e6c56cd45f2c6f59dfb250c95f2a2ccdf1521c51126243461d680a7e7399a835672f1adf0512879fe7d69c8c7a3ca0e4ab217c3b617bfe41a7951d
-EBUILD tuxedo-control-center-bin-1.1.4.ebuild 2162 BLAKE2B 06bcb903da3372992102f2725fd56a26515897e36f6ae7d0eced25a861b66a68c07b3932afe7e6f301b9c956ce6272a780cd915a254223d78959d5a1f44a288d SHA512 0e258f315034e86a6dd9327a941367ccc0a1a02813c15c63ec0ee30f727867346c97ca85cf01af08a98e3d4c18a27756dd2996685bd4a9d01e0cf1040fd5a44d
-EBUILD tuxedo-control-center-bin-1.2.4.ebuild 2164 BLAKE2B f7ec9a9c90ceaa973f768df7424344513b3e259905f9739596555a99b9e82574f89114122d2b0d63d6762a0189b3521a59f4f701f0a39a55edc6ad418b30f567 SHA512 45a52b3b062588d528376edd471a3d7e4a22de5aa96f8567ec2e9ac740de0d8e37a9af8f6623213474255b0501a0f494e5b03bc9ec56ce551a0e06465ec87997
+DIST tuxedo-control-center_2.0.2.rpm 80479580 BLAKE2B 7c83fd64ee8d7ca8b50e3634d36567d3a930656c5e34f23fd7b703bc560d35376701df081aaa5d09692df61689a5a81ec87a8a4a8d55db2cc2577c638d02731b SHA512 e9c9abfc2c0d0e226038f49d388a31625120f6780558b7606e719be61a4563c698e4c46d6f0d6a3e774179a5f5785dc07ff243901578da474dfa80cf71fe0394
+EBUILD tuxedo-control-center-bin-1.2.4.ebuild 2206 BLAKE2B dc9f6544d46cb84c0f0074c29929df082ab8700ab94475360bcc36392fa7a931e57fdf957ac5d91e4a17773bfcf8c5507600b41d8100d778f8128f08b6cb9e2f SHA512 000cec37298ee6b79c254d3296ead27a1ecc4f6f1cdb8d53743ef74e683ddda13516494485919e8a9487ed43ee79e99797fb08f833c98a81e8c718a2b437a146
+EBUILD tuxedo-control-center-bin-2.0.2.ebuild 2206 BLAKE2B dc9f6544d46cb84c0f0074c29929df082ab8700ab94475360bcc36392fa7a931e57fdf957ac5d91e4a17773bfcf8c5507600b41d8100d778f8128f08b6cb9e2f SHA512 000cec37298ee6b79c254d3296ead27a1ecc4f6f1cdb8d53743ef74e683ddda13516494485919e8a9487ed43ee79e99797fb08f833c98a81e8c718a2b437a146
 MISC metadata.xml 353 BLAKE2B 47a9f99d0e75bc84826b971868085f87ea41b27b43ac799022ca946a95bd2ec17709c4f8a3348da857be5868dacf4c0054370bea19b58c97fa18ac692266a1db SHA512 23a55745ddd0bff3320be5c5fbd81d2db654b06a5b899a71b12aa1d11d6b17e6a7ac209237cbd4181b1586e33305bd45397b843f608dbc93c4dd12516f23c88e
diff --git a/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-1.2.4.ebuild b/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-1.2.4.ebuild
index b52b259557f6..6c558463d5fb 100644
--- a/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-1.2.4.ebuild
+++ b/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-1.2.4.ebuild
@@ -23,6 +23,7 @@ RDEPEND="${DEPEND}"
 BDEPEND="app-arch/xz-utils[extra-filters]"
 
 S="${WORKDIR}"
+QA_PREBUILT="opt/tuxedo-control-center/*"
 
 src_prepare() {
 	default
diff --git a/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-1.1.4.ebuild b/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-2.0.2.ebuild
index 512f3a375727..6c558463d5fb 100644
--- a/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-1.1.4.ebuild
+++ b/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-2.0.2.ebuild
@@ -9,7 +9,7 @@ MY_PN="${PN/-bin/}"
 
 DESCRIPTION="Tool to control performance, energy, fan and comfort settings on TUXEDO laptops"
 HOMEPAGE="https://github.com/tuxedocomputers/tuxedo-control-center"
-SRC_URI="https://rpm.tuxedocomputers.com/opensuse/15.2/x86_64/${MY_PN}_${PV}.rpm"
+SRC_URI="https://rpm.tuxedocomputers.com/opensuse/15.4/x86_64/${MY_PN}_${PV}.rpm"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -17,12 +17,13 @@ KEYWORDS="-* ~amd64"
 
 RESTRICT="strip splitdebug"
 
-DEPEND=">=app-laptop/tuxedo-keyboard-3.0.0"
+DEPEND=">=app-laptop/tuxedo-keyboard-3.1.3"
 RDEPEND="${DEPEND}"
 # See bug #827729
 BDEPEND="app-arch/xz-utils[extra-filters]"
 
 S="${WORKDIR}"
+QA_PREBUILT="opt/tuxedo-control-center/*"
 
 src_prepare() {
 	default
@@ -43,7 +44,7 @@ src_install() {
 	doins opt/tuxedo-control-center/resources/dist/tuxedo-control-center/data/dist-data/com.tuxedocomputers.tccd.conf
 
 	insinto /usr/share/polkit-1/actions
-	doins opt/tuxedo-control-center/resources/dist/tuxedo-control-center/data/dist-data/de.tuxedocomputers.tcc.policy
+	doins opt/tuxedo-control-center/resources/dist/tuxedo-control-center/data/dist-data/com.tuxedocomputers.tccd.policy
 
 	systemd_dounit opt/tuxedo-control-center/resources/dist/tuxedo-control-center/data/dist-data/tccd.service
 	systemd_dounit opt/tuxedo-control-center/resources/dist/tuxedo-control-center/data/dist-data/tccd-sleep.service
diff --git a/app-laptop/tuxedo-keyboard/Manifest b/app-laptop/tuxedo-keyboard/Manifest
index 00614551419a..139d80c959fc 100644
--- a/app-laptop/tuxedo-keyboard/Manifest
+++ b/app-laptop/tuxedo-keyboard/Manifest
@@ -1,5 +1,8 @@
-DIST tuxedo-keyboard-3.0.10.tar.gz 50759 BLAKE2B 08fec486f6555ff5b8de6b1ea49ce504747238284fda31b05686fd5955bf3bb3fc48b49c40b50c1bbdfcbf4af2f206a99f645b294ebceafec4c87751fd460090 SHA512 a3c5b74fc5587763f131a66f507c0b33d462ed87c8e05391152c09d1425b5e1771bfb08cc2d1e3bb73b02074f503d866ea463fd44fb06d00b38c6ac4cfcd4e3b
+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
-EBUILD tuxedo-keyboard-3.0.10-r1.ebuild 716 BLAKE2B 98d7426db5f05bbb0d4cc17a7fbc0935530411564439167a942c6a8d21c5e17a9b4733ea387cee8d6e4e9028d4122971087e5e2f3aee11487ce0c4558a710e07 SHA512 ca0f9a4dc06b5b98e10bcabf3bdc9d9b923d25ad2e6a08662580391711ae99b345b0ddfb58407ea353de1236609e7d0d195b1ae8b98b4a9f96f88fee662ab602
+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
 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
new file mode 100644
index 000000000000..84e32c9edaea
--- /dev/null
+++ b/app-laptop/tuxedo-keyboard/files/tuxedo-keyboard-3.2.1-rm-unused-functions.patch
@@ -0,0 +1,71 @@
+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.0.10-r1.ebuild b/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.2.1.ebuild
index 45910306dcb3..1e578c35555b 100644
--- a/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.0.10-r1.ebuild
+++ b/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.2.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 CONFIG_CHECK="ACPI_WMI INPUT_SPARSEKMAP"
 
 inherit linux-mod toolchain-funcs
@@ -13,10 +13,11 @@ SRC_URI="https://github.com/tuxedocomputers/${PN}/archive/v${PV}.tar.gz -> ${P}.
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 BUILD_TARGETS="all"
-MODULE_NAMES="clevo_acpi(tuxedo:${S}:src) clevo_wmi(tuxedo:${S}:src) tuxedo_keyboard(tuxedo:${S}:src) tuxedo_io(tuxedo:${S}:src/tuxedo_io)"
+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
diff --git a/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.2.3.ebuild b/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.2.3.ebuild
new file mode 100644
index 000000000000..b3fce1cb74dc
--- /dev/null
+++ b/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.2.3.ebuild
@@ -0,0 +1,25 @@
+# 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"
+}