gentoo resync : 30.10.2021

9 files changed, 2 insertions, 71 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 688110e2a8f8..774fe86e911d 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/acpi_call/Manifest b/sys-power/acpi_call/Manifest
index 251bf618776b..72b4d0cc4630 100644
--- a/sys-power/acpi_call/Manifest
+++ b/sys-power/acpi_call/Manifest
@@ -1,7 +1,4 @@
-AUX acpi_call-1.2.1-kernel-5.13.patch 977 BLAKE2B 424730bdb4dfac67f1a8f882539685367813b781d4e5fb75c8b36eab9a558553213b5a457a82e55be2ab4e08596601f43de1845050ac60371511d2504b2f6ace SHA512 587ba8155311bacbf8a150c36857858b6399feac87aeee5f5f5075c4954b730d909fc7c8d8c2c094cc801bff669ccac9d24f362eeb103d96c53deba543e5e388
-DIST acpi_call-1.2.1.tar.gz 12340 BLAKE2B e113f8c150c8e2f4f75ca1dd81cc4399f24bedcd716c9158561e8cb9f5e63e77cade18e6543ade4ec383690bf7041a583e297948789773db8ad9b63a957e61e8 SHA512 91553cf70a6b0173a6bfec38fcfb62ecd17614c91a888933704bb57d788592ce6981b01fb7c5e4bb8efdbe7fe229860c9f2be4b549dd71b232704c8bf0b3cfee
 DIST acpi_call-1.2.2.tar.gz 12403 BLAKE2B 3195ec7e4d6189abdbb1409914d97d481f63ec79ec89a2ab630120ea99aabf8ca5890c500149a386a4a661d17e58387a6b252b625b6abadef1d977691156745e SHA512 3916a211bcc4a2435c6ba9664b1c86d8ab587c052a03e6edccd00fd7d01c6a756003dcc146e22e2cf688795600589c8cac1d83774c989794dcadc91f5caa2b5e
-EBUILD acpi_call-1.2.1.ebuild 745 BLAKE2B b6bec39ac75d74897a80bc957c557846b872b580e0885340ce602cdc9469aaaf5c666076ae71686b6cb16e6080dd768527c126000400b12e0c8f30382df28ef7 SHA512 d1be7f89409827ee157907b68f419287cafa707442373bb90f1686699dd39d2a52ef673abfd59028d5f03c90a4e210266039c9ca8f8b380d75f9e6eaaac55bd9
-EBUILD acpi_call-1.2.2.ebuild 696 BLAKE2B 1be076aa6f346966a56ed82e46029949510b3359e9cea3d23cd7ab4badc088f2ab7e7531702d27cb644e06dbe1556dd09f876fca28f2ab538cb7623ba22f5e88 SHA512 93b59851ff940a0f3231590b5afc608acc2f8f91cea627963ef551fbc82f5e554f4bdc46257fcb51b41a1eb005c28cc89e060fcc70373dd7985720e11cf8a81a
+EBUILD acpi_call-1.2.2.ebuild 695 BLAKE2B 8df9796c1c8c2d66d2a0e02b42170477abae9fe39cacb914a026e06b52289dfa222d72780fa82679b4ac73fb7b1363f0342702a70f97ad1b5631c9f01b106c70 SHA512 d924f609372a0965218a2bbb0380403a71b0207863e5f16938495e62948cda4e10c769a9950f1b3dba8272f4923964f2e1c6072e261ddd179afc0f1ef3097071
 EBUILD acpi_call-9999.ebuild 670 BLAKE2B 02dd23b77eb28cf9425e3039c61f594a044c0dd7bd4ded1c91d70bb2a970e0b7b5adebe4c6ead52ec3fdabeae1ff5bb69c5cb980d452804e1966ed6c2d510a63 SHA512 7ee0c7e030b5494c94b4e74c85c29bb31a579db2f9a3bb67e0c5ca4edd3da5511a6aba1a8ee78ab430440a58a23ea1e3afc8e8b0f5bdaae1738c77c29aaf626f
 MISC metadata.xml 410 BLAKE2B 5ebcbe3474317a93bdc9b8bd8c033300de713d3906638585d8296262c084f7101ca189edd5cc8bcfeaeba6dea68ca75f7349a5e189f94da4dfa85145c939767b SHA512 fbd1f13cfdfa756b2feb04e8b426e8e26eb835d037833aa0dac48aa1ed1f88f0ce985ff3812282298c9fb533279dfaab8bf8cd79852dbb0b1953d7d0209f7985
diff --git a/sys-power/acpi_call/acpi_call-1.2.1.ebuild b/sys-power/acpi_call/acpi_call-1.2.1.ebuild
deleted file mode 100644
index 418c4c459dee..000000000000
--- a/sys-power/acpi_call/acpi_call-1.2.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info linux-mod
-
-DESCRIPTION="A linux kernel module that enables calls to ACPI"
-HOMEPAGE="https://github.com/nix-community/acpi_call"
-SRC_URI="https://github.com/nix-community/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="examples"
-
-PATCHES=( "${FILESDIR}/${P}-kernel-5.13.patch" )
-
-BUILD_TARGETS="default"
-CONFIG_CHECK="ACPI"
-MODULE_NAMES="acpi_call(misc:${S})"
-
-src_compile() {
-	BUILD_PARAMS="KDIR=${KV_OUT_DIR} M=${S}"
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	linux-mod_src_install
-
-	if use examples; then
-		insinto /usr/share/acpi_call
-		doins examples/*.sh
-	fi
-}
diff --git a/sys-power/acpi_call/acpi_call-1.2.2.ebuild b/sys-power/acpi_call/acpi_call-1.2.2.ebuild
index 781cbf2fc3af..90e2e0158a01 100644
--- a/sys-power/acpi_call/acpi_call-1.2.2.ebuild
+++ b/sys-power/acpi_call/acpi_call-1.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nix-community/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="examples"
 
 BUILD_TARGETS="default"
diff --git a/sys-power/acpi_call/files/acpi_call-1.2.1-kernel-5.13.patch b/sys-power/acpi_call/files/acpi_call-1.2.1-kernel-5.13.patch
deleted file mode 100644
index 786e639c03ca..000000000000
--- a/sys-power/acpi_call/files/acpi_call-1.2.1-kernel-5.13.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 48011f82726c263f49a2b9ca3d9f674bdb4cfd22 Mon Sep 17 00:00:00 2001
-From: Alexander Wetzel <alexander@wetzel-home.de>
-Date: Thu, 8 Jul 2021 16:37:43 +0200
-Subject: [PATCH] Fix for 5.13+ kernels
-
-Upstream commit d4455faccd6c ('proc: mandate ->proc_lseek
-in "struct proc_ops"') made seek support for proc mandatory.
-
-Not providing it will cause a null pointer exception for kernels
->=5.13.0
-
-Signed-off-by: Alexander Wetzel <alexander@wetzel-home.de>
----
- acpi_call.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/acpi_call.c b/acpi_call.c
-index ebdda25..9fd9886 100644
---- a/acpi_call.c
-+++ b/acpi_call.c
-@@ -369,6 +369,9 @@ static ssize_t acpi_proc_read( struct file *filp, char __user *buff,
- static struct proc_ops proc_acpi_operations = {
- 	.proc_read = acpi_proc_read,
- 	.proc_write = acpi_proc_write,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0)
-+	.proc_lseek = default_llseek,
-+#endif
- };
- #else
- static struct file_operations proc_acpi_operations = {
diff --git a/sys-power/athcool/files/athcool b/sys-power/athcool/files/athcool
index 8dfef3a0afa7..8dfef3a0afa7 100755..100644
--- a/sys-power/athcool/files/athcool
+++ b/sys-power/athcool/files/athcool
diff --git a/sys-power/nut/files/nut-2.2.2-init.d-upsdrv b/sys-power/nut/files/nut-2.2.2-init.d-upsdrv
index 9b49ee395568..9b49ee395568 100755..100644
--- a/sys-power/nut/files/nut-2.2.2-init.d-upsdrv
+++ b/sys-power/nut/files/nut-2.2.2-init.d-upsdrv
diff --git a/sys-power/nut/files/nut-2.6.5-init.d-upsd b/sys-power/nut/files/nut-2.6.5-init.d-upsd
index c4debd306601..c4debd306601 100755..100644
--- a/sys-power/nut/files/nut-2.6.5-init.d-upsd
+++ b/sys-power/nut/files/nut-2.6.5-init.d-upsd
diff --git a/sys-power/nut/files/nut-2.6.5-init.d-upsmon b/sys-power/nut/files/nut-2.6.5-init.d-upsmon
index 3aafe1676d6e..3aafe1676d6e 100755..100644
--- a/sys-power/nut/files/nut-2.6.5-init.d-upsmon
+++ b/sys-power/nut/files/nut-2.6.5-init.d-upsmon