gentoo Easter resync : 12.04.2020

3 files changed, 39 insertions, 1 deletions

diff --git a/sys-power/acpi_call/Manifest b/sys-power/acpi_call/Manifest
index a851e93d18c7..04d8ee895318 100644
--- a/sys-power/acpi_call/Manifest
+++ b/sys-power/acpi_call/Manifest
@@ -3,11 +3,12 @@ AUX acpi_call-1.1.0-linux-4.12.patch 315 BLAKE2B 49c7e3145e367169ac028dbc854659b
 AUX acpi_call-1.1.0-linux-4.14.patch 317 BLAKE2B f1d5067511174466d551e9747f7160c12eff6e6a83473c98b51baf80206c2b8e5045ab2c2085451794b8ccc1fe6820c7bfa38de9c280cdb248971f965d64bab8 SHA512 3c823712a59b0bf739fe06cc5dffe6b895ff869dd78457615452a13ef810976a27b7a9ef5bf61189135b8d278e2df340199f36e8016d6e90b040317d468b9b39
 AUX acpi_call-3.17-linux-4.12.patch 256 BLAKE2B ed94570d4e815c92ec5228ef5d6caefe55649902105cf071c4c1c83fa8b2240b9ace2c25c6a66528a50be0998aaf17b16e83a254b87de4b77365497a3f1a2b5d SHA512 49c12db4eefa721599096947faadc48e328f5d3a37eba5ee6f833124e228632e2cc0a871d7ee8427c1e798a1adf67df75674061c2cc6c05ffca1a3b02cffd742
 AUX acpi_call-3.17-linux-4.14.patch 341 BLAKE2B 8402c22a3f016f8b2b00805f6ce1db3b3a6005e4ce83ee43764ef248eaa5b49ba368b9dcb11ca923dd84f1bede7a1c39d64f72a09f882e53d2f3e59c1fa9e1a3 SHA512 d49ab94daf00cad83226060d8b884ba00f1d970fc1f3872ef5f47ef3ff657dc6f4d7d6656b76f8a685f6b865fb1b4d338f96f16cada5672f0e9560d6c0565dab
+AUX acpi_call-3.17-linux-5.6.patch 1002 BLAKE2B ac5ddd5a3375aff549117cb0410d1a3d0468e07f11eb9456b89809e2d6481ab0f63a33d4b5447a8de868ee3aa3b908ea1530b2ba59a9f551c59a5839f46b8220 SHA512 31aba84449ea18511914c7bc05124cbeefbb51ce34736b84b0bf83bf7f6ab9dc3d6df74e2f87ac09d7a6117f9839573b6602c0f94e8b56184af7695d9a4db389
 DIST acpi_call-1.1.0.tar.gz 10470 BLAKE2B 000c5e6f1eb968bdea3d8dfb6d6bf7b18daffe8baa75ff32e8c6c4b98cafe0a72a67a65a17994a1c8efa16f528bdfbf2b27686a146730c319a5195dfa9ec0d51 SHA512 d5cf13c15f9057e3a27aaacfee6dcdb17b6a79194bdc8fd57b8140c07a532e2e58151bea881aa158c1183ac3bbe89f83fcfc2279ffd9e945a72331b6ddbf2c70
 DIST acpi_call-3.17.tar.gz 10470 BLAKE2B e1a4912f4b92532aa8496e668541975b7e563dfd7613d41f33503d5eecad786b84ba98b205f27c4a4fbd3b37b034a467cf7c9a73f2995539d2117f50751df682 SHA512 39f8f924995ba4e5490e93f03c33db083ced224699b1028102294b2cc99edebd1eea04d33b50beed9dea86939c124682ef8d013c990d5611471b104be3200cb1
 EBUILD acpi_call-1.1.0-r1.ebuild 778 BLAKE2B b437b750c540d2348bdf13094d23a9c38a34c83984f1b7e47b436ee9977533e583246090bf9dc3c5353c2935885e58470e2d4635136d5cd2d534f53ad91588d3 SHA512 d806686711e0103bd4245aaa8d0dcb9ff0964f391c6935f5c1425a443bfe8cd8ff82ca27e8ff9c0e6ed0d5a87145b2feb706b3d2fb5a5a2eaf0f6e9f93346a74
 EBUILD acpi_call-1.1.0-r2.ebuild 832 BLAKE2B fa8a5377ffd2d5e7f9b2b2ac86b1709c5630f6720023e73a6bf598962a7b63011b75d94e25a108c216a6121e92918217c527d638fcdceca7d3af48ff9d136e67 SHA512 a29a162870bacf966f8036fd2c079803ad2037798c5ee9b06dcf1f5e550cbdfc4387538a477ad90d5a7fc7a98d407e6575287146e77cc2628b3236cb7123b201
 EBUILD acpi_call-1.1.0.ebuild 708 BLAKE2B 464a13863e5540b2cf702d7ab51dec1d15b5b400456594310661de9a757b83810d1577b978783ae385bed69ba2d22f539ef42700e4b544b58b532138dade486c SHA512 83848672df330912eede86df9025be30a3100e73fea3227ef84a68a11ee56de07f0a604c8dd8d3485723a6f78877f6fd953a6a27c273c459296f1566ac0974ef
-EBUILD acpi_call-3.17.ebuild 802 BLAKE2B 8fff4c3f825053f56c7906ca7941c0d935c81538afd2faee64e60f9462efc544fd892a1a14c6374b1aa289c3d8fc2e9e5e36609bce5bc75f953e466ddd25fe2c SHA512 dc1d88033e5d5d8ba011fd4e298d93dff76e3503821f8fb194fbb545ce6111583a5548ea2ec9912a6175451a0a8ee984c0b10079e53b373580f30b2e3b75ecac
+EBUILD acpi_call-3.17.ebuild 838 BLAKE2B 71d8509fcad153659845160310a601feb3c4c92fb771901a5f129beba01305baa449d046811c04483b958609879c6bc970415f7c8de7086d28196b8e6c2b4a11 SHA512 fa46311f5e21706a4e01646451c95dcb8f1f423a739d1277654eb02ad8927d61b0f8e074499a997797754b0734830e957c1d850c831dd740b7a9d860cbce3aba
 EBUILD acpi_call-9999.ebuild 715 BLAKE2B 7b6725b9122d01c93c9ebb60230f41dcb0a5036311e648be94d8e584ce2b216fce012d271b6d093e509b371b0965e90784fd907a524755a5d7026b8482bed88a SHA512 d82b65acee84a956e54a3c767868ba4d79dba200ee8bd02921af71555cfc5c2cf20443c7739cf73224c325696b655e6161fe879be9c725b8a6eb4bacfa310bbd
 MISC metadata.xml 304 BLAKE2B e9ebd649d5b044096dfa71d43332fb12c6577abdff31ae880ab30f7d5bf83e244afa2a57d9ca135b5378dae1c45f7b8422c08caf24e5c0a604f76c3fe1774e01 SHA512 024d05a8863a152a45a50bc42018182781d46b83c0b83dc24f844909432f7a90c2e041a6aca6b57932a773082749639500e6a8a9823fcb64b54705cb753801ce
diff --git a/sys-power/acpi_call/acpi_call-3.17.ebuild b/sys-power/acpi_call/acpi_call-3.17.ebuild
index 186d45388dc7..62437ef10975 100644
--- a/sys-power/acpi_call/acpi_call-3.17.ebuild
+++ b/sys-power/acpi_call/acpi_call-3.17.ebuild
@@ -29,6 +29,7 @@ BUILD_TARGETS="default"
 PATCHES=(
 	"${FILESDIR}/${P}-linux-4.12.patch"
 	"${FILESDIR}/${P}-linux-4.14.patch"
+	"${FILESDIR}/${P}-linux-5.6.patch"
 )
 
 src_compile() {
diff --git a/sys-power/acpi_call/files/acpi_call-3.17-linux-5.6.patch b/sys-power/acpi_call/files/acpi_call-3.17-linux-5.6.patch
new file mode 100644
index 000000000000..c05c7e3c337e
--- /dev/null
+++ b/sys-power/acpi_call/files/acpi_call-3.17-linux-5.6.patch
@@ -0,0 +1,36 @@
+From d128d10c5f1554254ce55f3c79ca08390279d628 Mon Sep 17 00:00:00 2001
+From: "Jason A. Donenfeld" <Jason@zx2c4.com>
+Date: Sun, 8 Mar 2020 13:04:55 +0800
+Subject: [PATCH] Support newer proc_ops interface for 5.6
+
+Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
+---
+ acpi_call.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/acpi_call.c b/acpi_call.c
+index 801798b..65eb344 100644
+--- a/acpi_call.c
++++ b/acpi_call.c
+@@ -348,11 +348,18 @@ static ssize_t acpi_proc_read( struct file *filp, char __user *buff,
+     return ret;
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)
+ static struct file_operations proc_acpi_operations = {
+         .owner    = THIS_MODULE,
+         .read     = acpi_proc_read,
+         .write    = acpi_proc_write,
+ };
++#else
++static const struct proc_ops proc_acpi_operations = {
++        .proc_read  = acpi_proc_read,
++        .proc_write = acpi_proc_write,
++};
++#endif
+ 
+ #else
+ static int acpi_proc_read(char *page, char **start, off_t off,
+-- 
+2.25.1
+