gentoo auto-resync : 27:12:2023 - 19:39:54

3 files changed, 0 insertions, 46 deletions

diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index bcb2642dfc89..e904d592e817 100644
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
diff --git a/app-laptop/tp_smapi/Manifest b/app-laptop/tp_smapi/Manifest
index 1e53dea0758b..cd621efa3c76 100644
--- a/app-laptop/tp_smapi/Manifest
+++ b/app-laptop/tp_smapi/Manifest
@@ -1,6 +1,5 @@
 AUX tp_smapi-0.40-confd 785 BLAKE2B da1e2a5ce6e441eebf1a3dffcce8a863688a525f6ee4c29537b1783e3283c5a0311e4317617cff4be8c35246accf69738778c6c34e4d2af77a18f23a1e84b363 SHA512 a08f0b15ea37f79e1a8b41b3a3a59421dcf26e482d2eaa269e7c3f728c142e68e8c130c8a53f4c14829436a20e1354318464de780d9fbe10777d7929d7944dca
 AUX tp_smapi-0.40-initd 1851 BLAKE2B 852fc13e2d74a570918c451966214ed8ca3daea9bdb66e856f48554261f4cafc8d8be7b76889a6a639f0dc1310d34036131a9982be0cdcf0e458707e7938b161 SHA512 ebf8ac628e00979f21e266fb6d187f02bfeeafc9482a0c5bed4fd4f092c7a27158747ccf629c802969ad2a8f13124276ef889927b3f1f01a7ce44fdcde103698
-AUX tp_smapi-0.43-linux-6.4.patch 1465 BLAKE2B 0489612a5cf4d39e34d90b170484f03a9219388ad6ef4a0be6fba6c8b68301c6022c1dc0314715e2f4210629db3c3804b1cf5b76588944611eada14631ab16ff SHA512 2d3c9d889c20009647a297f8c4a229adea6e1af26992ff0e7e4fb20b39d9947fc5e3fddfa74dda2a12018d44e70f1988edf17d02b738b48a016c310e1359372f
 DIST tp_smapi-0.43.tgz 40122 BLAKE2B e14caa05d741d14b03c56c57badc5900a47735bc58966b5195ca34269a6227ecc50518ee5ce8cf47a4aacb314a0ed0332b987098f3be024b6af9024df6efdf9b SHA512 ec2e40a248e7eb5bff2ad9e57087058a8b4706d564bd340daba5a4700ad8a5389d1f9ec29984516a1167827ae55c28240dafb558df29e1f758a4f7af80caa1e7
 DIST tp_smapi-0.44.tgz 40724 BLAKE2B 03b765bc5736f514cf2a315dcc6d14bbb7869b98da8c5e016be49bd47bc2d1ec4da7c0c5b5468356df6aa4083b2de4048a078b5498dc7aa0083e3fcfbb64aa41 SHA512 c6b6068941d43505d14dc155441287ba5576f0b1b09861e13853e5360f9b4483d709b823761d39c93bc0c860100d43cc485d2454d66a66ceaaf2d43b5b0c9dc9
 EBUILD tp_smapi-0.43-r2.ebuild 1972 BLAKE2B 7233b4d28930f40417981c4f3b68924ffa505149970dd989e2487e529eda0b24fa4ef76902fdc01587d0837cf371430a68c7551724a1d9e6123bf6e451b4ed10 SHA512 7216a203f3330a6b1c6299ddc9ac9c3f6e511453e95fc11b12bb45dba9d9613ae56fed73e61ad469e46f70460770a05512804ddb24e6aa3a6572c5d279291b8e
diff --git a/app-laptop/tp_smapi/files/tp_smapi-0.43-linux-6.4.patch b/app-laptop/tp_smapi/files/tp_smapi-0.43-linux-6.4.patch
deleted file mode 100644
index 4ff1facca07f..000000000000
--- a/app-laptop/tp_smapi/files/tp_smapi-0.43-linux-6.4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 0c3398b1acf2a2cabd9cee91dc3fe3d35805fa8b Mon Sep 17 00:00:00 2001
-From: Evgeni Golov <evgeni@golov.de>
-Date: Fri, 16 Jun 2023 18:13:54 +0200
-Subject: [PATCH] update DEFINE_SEMAPHORE usage for linux 6.4+
-
-Linux changed the DEFINE_SEMAPHORE macro in
-48380368dec14859723b9e3fbd43e042638d9a76, making it take two parameters
-instead of one. Pass an explicit 1 as on 6.4+.
----
- thinkpad_ec.c | 4 +++-
- tp_smapi.c    | 4 +++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/thinkpad_ec.c b/thinkpad_ec.c
-index a8e812f..62ef5ca 100644
---- a/thinkpad_ec.c
-+++ b/thinkpad_ec.c
-@@ -90,8 +90,10 @@ static u64 prefetch_jiffies;                      /* time of prefetch, or: */
- /* Locking: */
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
- static DECLARE_MUTEX(thinkpad_ec_mutex);
--#else
-+#elif LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0)
- static DEFINE_SEMAPHORE(thinkpad_ec_mutex);
-+#else
-+static DEFINE_SEMAPHORE(thinkpad_ec_mutex, 1);
- #endif
- 
- /* Kludge in case the ACPI DSDT reserves the ports we need. */
-diff --git a/tp_smapi.c b/tp_smapi.c
-index 6346287..9feebab 100644
---- a/tp_smapi.c
-+++ b/tp_smapi.c
-@@ -111,8 +111,10 @@ static unsigned short smapi_port;  /* APM control port, normally 0xB2 */
- 
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)
- static DECLARE_MUTEX(smapi_mutex);
--#else
-+#elif LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0)
- static DEFINE_SEMAPHORE(smapi_mutex);
-+#else
-+static DEFINE_SEMAPHORE(smapi_mutex, 1);
- #endif
- 
- /**