gentoo resync : 16.09.2021

4 files changed, 2 insertions, 74 deletions

diff --git a/sys-power/bbswitch/Manifest b/sys-power/bbswitch/Manifest
index bba859f0a6ca..196ffe05fcd3 100644
--- a/sys-power/bbswitch/Manifest
+++ b/sys-power/bbswitch/Manifest
@@ -1,7 +1,5 @@
-AUX bbswitch-0.8-kernel-4.12.patch 528 BLAKE2B 4c4b5dbf29338b9a8bbd4cfc974466bee4f5e73c9c39f1093dc48ab2db721743e425c12fdc80e4cfa12c296897ec367f6b255679cf5c4305bf7a844619da38d7 SHA512 52b8f8cc378d915f0671fff193041c13d756db4d4b8db01594d9411a1422e1d8ff0e364d041f472b15b7c581a2fec583ecd86bcb5477b3703c9d993504a6ab61
-AUX bbswitch-0.8-kernel-5.6.patch 1432 BLAKE2B 69c8aab963f1305dd2ffec7e46838df7538e1d87de2048fbd36525fd30a9680dccaf364297b2fae44eb68ad9358dcb865e767bf159502dc9dd2f73490a0d14ce SHA512 90e62a760e9c620b95deaa9ab1f8b8936a764f2adc9991972f3d47bf5768376c6b6007b5613b48303c17ae5ac4fa668ca8b071b7e2b236c7699a91fc01359a99
 AUX bbswitch.modprobe 46 BLAKE2B e76506e79adc57bedd68f038293257e7c70f1f3bc924776741e152b7c95c691f5241066b742583af063a4bdde90134005949ce28715d0b8f0c51f59c582223c8 SHA512 a4fa992d66b401e039c995b64ac5f3b2491c3ccf4412e211d50d1e514253f9341dc77a6d8da808f03988735e44a97bb973f3303ed3c0eeed6f4e21794d3545b6
 DIST bbswitch-0.8_p20200526.tar.gz 15869 BLAKE2B cdeaf539a0996f53d3add215fca1127321b7183526a248340177f4320171b92a5ce531eeedfb1da2f0d9f07c6b61e8cfb635a457406e477640f2e7090b29b655 SHA512 487bcd845d1f462e77b5b9e3f304cd28d0ddfd391ecc36de530a3d18d9d4932bc895ed29972e27006b6f3eeb50c37b523ef786a26b6ee75c19fa55288a496d4a
 EBUILD bbswitch-0.8_p20200526.ebuild 1155 BLAKE2B cf4f4914b11e0d132d7f333bad291e12df6109efbae5a569e20994ea5c8936a4e71754d8e3fffade9d1bd761f4f0a11064e17a9eaf98e2f3ba6127b276f36fbf SHA512 028378100271cf8cbbb61b1cedd1d196e1de3927147c874be16fb6bb69ba8beebb676a93449f354f1f3f4c1e8186c567ebc4d08c30005dc7b3599fdc06c7ec9e
 EBUILD bbswitch-9999.ebuild 1157 BLAKE2B b6b77f0ecaf7ac94cc370d498929a8597572c9ecabcda1b817d9e4ceb01d5028d2e7d79f3ee0f5020fbe1d7d7a6fedba9e9daa16cbcf48e60b4a062eaa65e800 SHA512 3c7484b57111e6a78236e75a480472f68a68222e02dd763462197424812d301d0d2ada87290f0b226f2f9825fdc3e583809adceac348a8e6c49dd5816fe10e92
-MISC metadata.xml 998 BLAKE2B 301228a4c00ee4b8a05f0c1cf42dc09290cd590030d13ce3a14610aafdb5c38aec6b8cad1a2bd5ad61a947886a6765bed3a06f8a10841e4eb384f07311129d8c SHA512 8bf83e54791002aa9918333dd0646d6cce6d3ee8edfd5e66b563e3f1a4b0c530522260a8034f48f14f8efa060f8aeab5e878f72407cf31ec24dc6e03df0a7140
+MISC metadata.xml 999 BLAKE2B 9d2751b5928195f96c509147b5f6093a0fb3fd39762fb2c4b4509cde94258f35bada1009dae271b06f376e80a544f976495b8a4610ff9044d7cbd3658d942bde SHA512 d715f175dff0e5d5e34b23c5633469f2cdfbc64796cfb2c88c2fa02c39c6ab23b17d93b727ec900a0edc3bd8dccb09a27e598e8705d30b12e4c0a4ed423c9d42
diff --git a/sys-power/bbswitch/files/bbswitch-0.8-kernel-4.12.patch b/sys-power/bbswitch/files/bbswitch-0.8-kernel-4.12.patch
deleted file mode 100644
index 1db623d583e9..000000000000
--- a/sys-power/bbswitch/files/bbswitch-0.8-kernel-4.12.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -uNr bbswitch-0.8/bbswitch.c bbswitch-0.8-new/bbswitch.c
---- bbswitch-0.8/bbswitch.c	2013-12-04 18:22:06.000000000 -0500
-+++ bbswitch-0.8-new/bbswitch.c	2017-07-08 01:11:54.588545766 -0400
-@@ -31,7 +31,14 @@
- #include <linux/pci.h>
- #include <linux/acpi.h>
- #include <linux/module.h>
-+#include <linux/version.h>
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)
-+#include <linux/uaccess.h>
-+#else
- #include <asm/uaccess.h>
-+#endif
-+
- #include <linux/suspend.h>
- #include <linux/seq_file.h>
- #include <linux/pm_runtime.h>
diff --git a/sys-power/bbswitch/files/bbswitch-0.8-kernel-5.6.patch b/sys-power/bbswitch/files/bbswitch-0.8-kernel-5.6.patch
deleted file mode 100644
index aa95a21cdb04..000000000000
--- a/sys-power/bbswitch/files/bbswitch-0.8-kernel-5.6.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From c2f808efeb0820edf23dbb66362ad3091321253f Mon Sep 17 00:00:00 2001
-From: Mateusz Mandera <mateusz.mandera@protonmail.com>
-Date: Tue, 31 Mar 2020 15:11:30 +0200
-Subject: [PATCH] Use proc_ops structure for kernel version >= 5.6.0
-
-Since 5.6.0, proc_create requires a proc_ops* argument
-instead of file_operations*.
----
- bbswitch.c | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/bbswitch.c b/bbswitch.c
-index d64cdae..9ca0e42 100644
---- a/bbswitch.c
-+++ b/bbswitch.c
-@@ -42,6 +42,9 @@
- #include <linux/suspend.h>
- #include <linux/seq_file.h>
- #include <linux/pm_runtime.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)
-+#include <linux/proc_fs.h>
-+#endif
- 
- #define BBSWITCH_VERSION "0.8"
- 
-@@ -382,6 +385,15 @@ static int bbswitch_pm_handler(struct notifier_block *nbp,
-     return 0;
- }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)
-+static struct proc_ops bbswitch_fops = {
-+    .proc_open   = bbswitch_proc_open,
-+    .proc_read   = seq_read,
-+    .proc_write  = bbswitch_proc_write,
-+    .proc_lseek = seq_lseek,
-+    .proc_release= single_release
-+};
-+#else
- static struct file_operations bbswitch_fops = {
-     .open   = bbswitch_proc_open,
-     .read   = seq_read,
-@@ -389,6 +401,7 @@ static struct file_operations bbswitch_fops = {
-     .llseek = seq_lseek,
-     .release= single_release
- };
-+#endif
- 
- static struct notifier_block nb = {
-     .notifier_call = &bbswitch_pm_handler
--- 
-2.26.0
-
diff --git a/sys-power/bbswitch/metadata.xml b/sys-power/bbswitch/metadata.xml
index db87fcaac527..0b6cc346ce63 100644
--- a/sys-power/bbswitch/metadata.xml
+++ b/sys-power/bbswitch/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>np-hardass@gentoo.org</email>