gentoo resync : 03.03.2021

19 files changed, 0 insertions, 596 deletions

diff --git a/sys-power/pm-utils/Manifest b/sys-power/pm-utils/Manifest
deleted file mode 100644
index eb9e37c82851..000000000000
--- a/sys-power/pm-utils/Manifest
+++ /dev/null
@@ -1,19 +0,0 @@
-AUX 1.4.1-bluetooth-sync.patch 1504 BLAKE2B a69c87b78effbfe3751577605bc6e3add1ad074a10b9d330284c2810e976bd95a58c357854fd5eb6501b16861485103b7ecd4dcfa99135cd0143c7fed1dce3ad SHA512 35e02607280b4cd166fbbb1dfc44ef33d20debe1e564db9d532af74a773cc4f8cc3ee3be149318cbbc0f9cc451b5001a499609dd962ff42c0a7c3305215ef831
-AUX 1.4.1-disable-sata-alpm.patch 578 BLAKE2B 2e11d69402aaa7b4958e2a924b7643c5d94e3b5a31d7062f2ff158d78b13340b1b8f12174fb74f2bdf54b5793c631355da6748a364c85fc9b95cfb23c4535644 SHA512 ae2ed5c0170c3c54592819b39b3901f88c795b285decdffc1c505d3f05b2f68f9c5f9ff074157d7b176daa674cd63cda05faf11cd8f03a91a6010f3de1acf683
-AUX 1.4.1-echo-n.patch 1602 BLAKE2B ce264300bf9c17f67b008ec82b717e1cc7fc1e4f22db028b8e2a4201675b86b668fd3cf3546e1e9bc7eec71179bf5da4eacf9fda5f73254ab3f219b861f5a039 SHA512 a3ea6ac65b5a75b2af43c3c4ba36c2cab50ad7d4f916ff2750426ae87853d110253d157b365884615f0daa58b51fd41fb45d3dbc182b8d53f55e1f04e968f62b
-AUX 1.4.1-fix-alpm-typo.patch 1052 BLAKE2B 58c50b22787c72fce794747fac16afd4fa2c51489c5cb73a724501ead6a3571b78ce38b931fd595798de563e85265e235e3687c00b629112132035aa72b82fbb SHA512 9858ad0400e420387c458349e375cf7d9c9fd40f54cc329595eda9458adf830cdd5033dc4c0408aae9fb010852face5c82df04a2ef1dce536d451e50372a2555
-AUX 1.4.1-fix-intel-audio-powersave-hook.patch 1412 BLAKE2B 837d62c26c9bc1fd9fe8a84f94b17352e5b9e7d9b8ed4b756fa75067cbc77fa4926cdda9a4595b6f855ae70c4f9c780647452b04599c3789f01b76e21f78a0a7 SHA512 5c5cc0e810c9a189de5d3b603cac1c5adb69058f2033daad3558463d1a0f65c039e19132da54da373929fe8e652ae06e28edad2ea9ce17a2f73527e494eecaff
-AUX 1.4.1-ignore-led-failure.patch 269 BLAKE2B c9e7b2f3991a99ebc8fb077a3f6e7023e518e2a14f653e261c3a62f20d7d8a62653d092783869446fc957915eda902648c4cc6930e1e6b3038ab10754af1222b SHA512 7429d2adad4caa53a787456a223ae2b280b81285bebf3f952597a8e56ec818c61502721d95095ac58e9846769f70ab377cd1ea5bede7c4f9620a7ff0c4b9f0d3
-AUX 1.4.1-inhibit-on-right-status.patch 568 BLAKE2B 0666d449e5f4212d7fe205161b011d107dd4e93e05ee36e551daa8d9af4488df0db215c10e5c025d7c8ff2ec0188ed33d6d09d5d50c9e83a09a094f56364bb47 SHA512 79e835bf1ba214e6fc5c4ea3d8861f61d83c583311d170215265cf1f7180dacd74b380ee4e14c36ed75cc9777f8f02004167c263fb2bf8a871538732f5adf3e9
-AUX 1.4.1-logging-append.patch 485 BLAKE2B a88d921732e7df4631eb299c73facbe9d8da3f74de943e7dd9378bf180c7258c9a38d1e45aabab1982106f0b1dcd45745e0492410546af721577febf64ccd992 SHA512 215f3ca6a01fc22fa2065a7d3be02a95e0cef15fb4c04121b1dec673a98318e78799a81545474535f8ec6d48309809af855b79cc122db2010193d24647c71b71
-AUX 1.4.1-run-hook-logging.patch 461 BLAKE2B 173e312894b8016ee3147561bed1ba7de1ba96c57c02981b50e482e2e59abfa3226390ebff81e6e1bc89ef68f50f49a24ddb2814a1e007cc53b8a71fb790b8ee SHA512 f6c136229527033765203344f7cb08959c289bb011a74ac44afc0e32a6a7e3983ea8dcbc5b0929a7ea23101a56ebceb79425614f88c131c9fe13b3885f008458
-AUX 1.4.1-suspend-hybrid.patch 1096 BLAKE2B 7ccec36730bb1daa742df1ff5d242c6d00515c8b976b9eb08b5f5ef3830e5a5a2ee169e30736d39a144179e5987f8556d1cfc4e7a5502b3d2fc2ba3512471989 SHA512 57fe2b4c55a6b946eccfba1701d9d21d9e9e3e8937b37be3a9d0984664e32dfb368373b3f6556382de0f72e3ea38dd710f4e6efc0ce8fca959e35c745243acc3
-AUX 1.4.1-uswsusp-hibernate-mode.patch 385 BLAKE2B 6e96801e64517ec6b58a40af38fb02327084f02c87b4ef91200c9cfe397c5289e373b77485779a1b719eadda446f2aad542762346b010c013a092dcfeffca0c9 SHA512 b558aef41b93ffc528e18d80a82db99bef3afc19955a112437adb1dcae2342272f45d14de758ae07f496bf3f36b479b3439959ad2731ab76f75d60f55134e3b0
-AUX 1.4.1-xfs_buffer_arguments.patch 956 BLAKE2B da0f33bdf2b4187df3bcdbeb976effe6e0761406d0820df27159cdd2666f2fe10e0116ec2b55636bd80e553807854506a651378e6bfcf6e5267f01cf1a87009f SHA512 5e3a3394f941833446b6d2ee0f0d0fb570e1bafc1ebbff218bdd67dc8f15b2f7e919e2b45157c761e924e32811c28a7b0eacd1a571bccdb4ceaa6f029f99c0f8
-AUX pm-utils.logrotate 157 BLAKE2B 1f7d19cda14b736fc9e434574ff949f5b04cb3f5389f7d0d23b2d6340d7f2766bd0ae1ba19ad1a4c55b4ca85cc1fd9660a236b22e3259293fc2aa6fffd9bf06f SHA512 70e9ef36928258e046f37d3369aad28c1222c1ca58956b57ba35a6476762228cd7b3a68bbf434c4b4936db3b4a921a50025e6da885632d7696f4f4c800310707
-AUX power.d/pci_devices 1391 BLAKE2B 5da4f067b6b7e6d6905fb719cdbead8abf65d347ea37d3d239532127f34b569075ddcc3a9178b46a751260e137402844b1ad779ce39b66f5e1adeeb752ef57e1 SHA512 62ec8d6b6704690304ab31612c6141a6f0362cde0a18c884606d1513afebad2acddb82268471bf57bd5a641604a6f196446c8da8d899ccc3e09c008db18df7b2
-AUX power.d/usb_bluetooth 1121 BLAKE2B abcd8ab1e9b455dacadd5ca9627a63e9bb61c6c49912d644283c299c10171d27b684d48166058f64e1a2ebdb24f04492bf728015e3e9f33f7612da3c8d903e13 SHA512 b96abfdb8745f320ac3f1f368d1095195c68b0a56270aea4c5ad61e913ddc1641c5b5e1aadc6225d78f88956c4ffb2a396e031de02b9ecced09fac09765701bf
-AUX sleep.d/50unload_alx 316 BLAKE2B b674a3b9480c77836dc7137dedd4639704b428a6109f7e13971ef45ee328e157c7b4304e12ed0e022298c68d6fc4d2aafbb2da4a5b50d27366e6991ff027320b SHA512 64e7f77088a6157c90024d26ae6afde40abffc17d8ec2775e6a4ed17fac6c6fc1787c9f1b02cd0f4cd9e18dd74502f84e894006875b7dcacc39e509b3e0d86b0
-DIST pm-utils-1.4.1.tar.gz 208687 BLAKE2B dde7992acf1b28378021f4bd433a8e08c37bb35035af19d8b811cf8a22c141ded5cc02caf3e2ffd7119592eefcd941e4ddebb0dfbe715007788ea201cb96d073 SHA512 5bc9479fe75f120aee136befeb24c8d7d85f61410b551177ed61fd1b4ea9cce7989796b067e357ea93b44b4ae9f66311687066f188236c5efdfd3750695a8017
-EBUILD pm-utils-1.4.1-r7.ebuild 2958 BLAKE2B d6682a59f2bfee19428292a17f27ab3460075a23907f5323ed4bb691a59bf8a0a7ff8a8f051f120ac31828dc1642c51761b49db55df6bf891c4d3affd42b05c8 SHA512 731c270de8041ee0165557544a364de70a7ca1773886b8373e571aa623b2ea9978b7e95556829b0d04e0f78b7c49925dd0d37a250b831782c4b6c5d8f1e2920a
-MISC metadata.xml 321 BLAKE2B 17786e84c4ddae5272489e8238655805099de241a1ffa04c985434d4a35c902d2f5a39c8a288dc1c35d6c4d54167d4ccf8439982faee55418ff8872e2ca6aac6 SHA512 8bbd7192ac92567bef9234c1725dd9abd12fbb2809d961d0f6690f05b9477e0d07ef6056a516b1eddb1c533c6b80560c9924d74f1e2fe57f682ca1e622354563
diff --git a/sys-power/pm-utils/files/1.4.1-bluetooth-sync.patch b/sys-power/pm-utils/files/1.4.1-bluetooth-sync.patch
deleted file mode 100644
index b41f32cf9165..000000000000
--- a/sys-power/pm-utils/files/1.4.1-bluetooth-sync.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 640b53438c20818b3e344343b58b1f1765606a85 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt@ubuntu.com>
-Date: Mon, 31 Jan 2011 15:30:01 +0100
-Subject: [PATCH] 49bluetooth: Wait for btusb module to get unused
-
-The 49bluetooth hook disables /proc/acpi/ibm/bluetooth but this isn't
-synchronous, i. e. it doesn't wait until the module usage count actually drops
-to 0. Due to that, it's impossible to add btusb to SUSPEND_MODULES (on some
-models/older kernels you need to do that to fix suspend problems), as at that
-point the module is still in use.
-
-On my system (ThinkPad X201) the module takes between 0.3 and 0.5 seconds to
-unload, so use 100 ms wait steps with a timeout of 2 seconds.
-
-Bug: https://bugs.freedesktop.org//show_bug.cgi?id=33759
-Bug-Ubuntu: https://launchpad.net/bugs/698331
----
- pm/sleep.d/49bluetooth |    9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/pm/sleep.d/49bluetooth b/pm/sleep.d/49bluetooth
-index d46ba49..0dc1909 100755
---- a/pm/sleep.d/49bluetooth
-+++ b/pm/sleep.d/49bluetooth
-@@ -12,6 +12,15 @@ suspend_bluetooth()
- 	if grep -q enabled /proc/acpi/ibm/bluetooth; then
- 		savestate ibm_bluetooth enable
- 		echo disable > /proc/acpi/ibm/bluetooth
-+
-+		# wait for up to 2 seconds for the module to actually get
-+		# unused
-+		TIMEOUT=20
-+		while [ $TIMEOUT -ge 0 ]; do
-+		    [ `cat /sys/module/btusb/refcnt` = 0 ] && break
-+		    TIMEOUT=$((TIMEOUT-1))
-+		    sleep 0.1
-+		done
- 	else
- 		savestate ibm_bluetooth disable
- 	fi
--- 
-1.7.2.3
-
diff --git a/sys-power/pm-utils/files/1.4.1-disable-sata-alpm.patch b/sys-power/pm-utils/files/1.4.1-disable-sata-alpm.patch
deleted file mode 100644
index e3e3819b82eb..000000000000
--- a/sys-power/pm-utils/files/1.4.1-disable-sata-alpm.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Disable SATA link power management by default, as it still causes disk errors and corruptions on many hardware.
-Author: Martin Pitt <martin.pitt@ubuntu.com>
-Bug-Ubuntu: https://launchpad.net/bugs/539467
-
---- pm/power.d/sata_alpm
-+++ pm/power.d/sata_alpm
-@@ -2,7 +2,7 @@
- 
- . "${PM_FUNCTIONS}"
- 
--SATA_ALPM_ENABLE=${SATA_ALPM_ENABLE:-true}
-+SATA_ALPM_ENABLE=${SATA_ALPM_ENABLE:-false}
- 
- help() {
- cat <<EOF
-@@ -16,7 +16,7 @@
- 
- This hook has 1 parameter:
- SATA_ALPM_ENABLE = whether to use SATA ALPM on battery.
--Defaults to "true".
-+Defaults to "false".
- 
- EOF
- }
diff --git a/sys-power/pm-utils/files/1.4.1-echo-n.patch b/sys-power/pm-utils/files/1.4.1-echo-n.patch
deleted file mode 100644
index 354ccb6a7e65..000000000000
--- a/sys-power/pm-utils/files/1.4.1-echo-n.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From ffce4bc35a34b6b543e2ae2828a3096a19ebb1ae Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 28 Jul 2015 22:24:56 -0400
-Subject: [PATCH] Avoid -n in "echo -n foo > /sys/bar"
-
-It's not portable and not needed.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=91497
-
-[ Rebased on top of Gentoo's -r6 patchset. ]
----
- pm/pm-functions.in | 8 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/pm/pm-functions.in b/pm/pm-functions.in
-index c82be30..a68f955 100644
---- a/pm/pm-functions.in
-+++ b/pm/pm-functions.in
-@@ -296,13 +296,13 @@
- if [ -z "$SUSPEND_MODULE" ]; then
- 	if grep -q mem /sys/power/state; then
- 		SUSPEND_MODULE="kernel"
--		do_suspend() { echo -n "mem" >/sys/power/state; }
-+		do_suspend() { echo "mem" >/sys/power/state; }
- 	elif [ -c /dev/pmu ] && pm-pmu --check; then
- 		SUSPEND_MODULE="kernel"
- 		do_suspend() { pm-pmu --suspend; }
- 	elif grep -q standby /sys/power/state; then
- 		SUSPEND_MODULE="kernel"
--		do_suspend() { echo -n "standby" >/sys/power/state; }
-+		do_suspend() { echo "standby" >/sys/power/state; }
- 	fi
- fi
- 
-@@ -317,10 +317,10 @@
- 		HIBERNATE_MODE_SAVE=$(cat /sys/power/disk) && \
- 		HIBERNATE_MODE_SAVE="${HIBERNATE_MODE_SAVE##*[}" && \
- 		HIBERNATE_MODE_SAVE="${HIBERNATE_MODE_SAVE%%]*}" && \
--		echo -n "${HIBERNATE_MODE}" > /sys/power/disk
--		echo -n "disk" > /sys/power/state
-+		echo "${HIBERNATE_MODE}" > /sys/power/disk
-+		echo "disk" > /sys/power/state
- 		RET=$?
--		echo -n "$HIBERNATE_MODE_SAVE" > /sys/power/disk
-+		echo "$HIBERNATE_MODE_SAVE" > /sys/power/disk
- 		return "$RET"
- 	}
- fi
--- 
-2.4.6
-
diff --git a/sys-power/pm-utils/files/1.4.1-fix-alpm-typo.patch b/sys-power/pm-utils/files/1.4.1-fix-alpm-typo.patch
deleted file mode 100644
index 799369159ff2..000000000000
--- a/sys-power/pm-utils/files/1.4.1-fix-alpm-typo.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 93d46b88f415c1931b017856e3162c192bfba07c Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt@ubuntu.com>
-Date: Wed, 11 Jan 2012 15:39:53 +0100
-Subject: [PATCH 3/3] Fix typo in sata_alpm
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-ALPM → APLM
-
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=44676
-Bug-Ubuntu: https://launchpad.net/bugs/900930
----
- pm/power.d/sata_alpm |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pm/power.d/sata_alpm b/pm/power.d/sata_alpm
-index 5ede307..400e1e7 100644
---- a/pm/power.d/sata_alpm
-+++ b/pm/power.d/sata_alpm
-@@ -28,7 +28,7 @@ set_sata_alpm() {
-     [ "${kv%-*}" \< "2.6.33" ] && exit $NA  # avoid fs corruption
-     for f in /sys/class/scsi_host/host*; do
- 	[ -w "$f/link_power_management_policy" ] || continue
--	printf "Setting SATA APLM on %s to %s..." "${f##*/}" "$1"
-+	printf "Setting SATA ALPM on %s to %s..." "${f##*/}" "$1"
- 	echo "$1" > "$f/link_power_management_policy" && echo Done. || \
- 	    echo Failed.
-     done
diff --git a/sys-power/pm-utils/files/1.4.1-fix-intel-audio-powersave-hook.patch b/sys-power/pm-utils/files/1.4.1-fix-intel-audio-powersave-hook.patch
deleted file mode 100644
index 2d884da1e7b6..000000000000
--- a/sys-power/pm-utils/files/1.4.1-fix-intel-audio-powersave-hook.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Florian Kriener <florian@kriener.org>
-To: submit@bugs.debian.org
-Subject: [pm-utils] wrong path in intel-audio-powersave (and a small bug)
-Date: Sat, 25 Sep 2010 11:27:30 +0200
-
-In the script intel-audio-powersave is this loop
-
-for dev in /sys/module/snd_*/parameters/power_save; do
-	[ -w "$dev/parameters/power_save" ] || continue
-     printf "Setting power savings for $s to %d..." "$dev##*/" "$1"
-	echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed.
-done
-
-I think it should be
-
-for dev in /sys/module/snd_*; do
-	[ -w "$dev/parameters/power_save" ] || continue
-     printf "Setting power savings for %s to %d..." "${dev##*/}" "$1"
-	echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed.
-done
-
-
-This fixes the two bugs.
-
-diff --git a/pm/power.d/intel-audio-powersave b/pm/power.d/intel-audio-powersave
-index 36675a8..da63e40 100644
---- a/pm/power.d/intel-audio-powersave
-+++ b/pm/power.d/intel-audio-powersave
-@@ -20,9 +20,9 @@ EOF
- 
- audio_powersave() {
-     [ "$INTEL_AUDIO_POWERSAVE" = "true" ] || exit $NA
--    for dev in /sys/module/snd_*/parameters/power_save; do
-+    for dev in /sys/module/snd_*; do
- 	[ -w "$dev/parameters/power_save" ] || continue
--	printf "Setting power savings for $s to %d..." "$dev##*/" "$1"
-+	printf "Setting power savings for %s to %d..." "${dev##*/}" "$1"
- 	echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed.
-     done
- }
diff --git a/sys-power/pm-utils/files/1.4.1-ignore-led-failure.patch b/sys-power/pm-utils/files/1.4.1-ignore-led-failure.patch
deleted file mode 100644
index 7b8e4f2da1d1..000000000000
--- a/sys-power/pm-utils/files/1.4.1-ignore-led-failure.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: LED operation should not block S3/S4
-Author: Adam Lee <adam8157@gmail.com>
-
-Some Lenovo Thinkpad models don't have a suspend LED, this should not
-block S3/S4.
-
---- pm/sleep.d/95led
-+++ pm/sleep.d/95led
-@@ -14,3 +14,5 @@
- 	*) exit $NA
- 		;;
- esac
-+
-+exit 0
diff --git a/sys-power/pm-utils/files/1.4.1-inhibit-on-right-status.patch b/sys-power/pm-utils/files/1.4.1-inhibit-on-right-status.patch
deleted file mode 100644
index 250ae0872fbd..000000000000
--- a/sys-power/pm-utils/files/1.4.1-inhibit-on-right-status.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Do not use the exit status of log rather the exit status of the hook.
-
-http://bugs.freedesktop.org/show_bug.cgi?id=32210
-http://bugs.gentoo.org/360673
-
---- pm/pm-functions.in
-+++ pm/pm-functions.in
-@@ -197,9 +197,11 @@
- 	# rest of args passed to hook unchanged.
- 	log "Running hook $*:"
- 	hook_ok "$1" && "$@"
-+	# log() changes the return value, so save it for later
-+	local status=$?
- 	log ""
- 	log -n "$*: " 
--	hook_exit_status $? && LAST_HOOK="${1##*/}" || inhibit
-+	hook_exit_status $status && LAST_HOOK="${1##*/}" || inhibit
- }
- 
- if profiling; then
diff --git a/sys-power/pm-utils/files/1.4.1-logging-append.patch b/sys-power/pm-utils/files/1.4.1-logging-append.patch
deleted file mode 100644
index 7a5d682b122d..000000000000
--- a/sys-power/pm-utils/files/1.4.1-logging-append.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: James Westby <james.westby@ubuntu.com>
-Description: Do not clear the log file on each operation, but instead append to it.
- This makes debugging of several suspends much easier.
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=25255
-Bug-Ubuntu: https://launchpad.net/bugs/410352
-
---- pm/pm-functions.in
-+++ pm/pm-functions.in
-@@ -271,7 +271,7 @@
- 		return 1
- 	fi
- 	export LOGGING=true
--	exec > "$1" 2>&1
-+	exec >> "$1" 2>&1
- }
- 
- check_suspend() { [ -n "$SUSPEND_MODULE" ]; }
diff --git a/sys-power/pm-utils/files/1.4.1-run-hook-logging.patch b/sys-power/pm-utils/files/1.4.1-run-hook-logging.patch
deleted file mode 100644
index 19ac4064d791..000000000000
--- a/sys-power/pm-utils/files/1.4.1-run-hook-logging.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: In suspend log, put empty line after running the hook, not in between.
-Author: Dominique Brazziel <dbrazziel@snet.net>
-Bug-Debian: http://bugs.debian.org/661168
-
---- pm/pm-functions.in
-+++ pm/pm-functions.in
-@@ -199,9 +199,9 @@
- 	hook_ok "$1" && "$@"
- 	# log() changes the return value, so save it for later
- 	local status=$?
--	log ""
- 	log -n "$*: " 
- 	hook_exit_status $status && LAST_HOOK="${1##*/}" || inhibit
-+	log ""
- }
- 
- if profiling; then
diff --git a/sys-power/pm-utils/files/1.4.1-suspend-hybrid.patch b/sys-power/pm-utils/files/1.4.1-suspend-hybrid.patch
deleted file mode 100644
index 8d92002733f3..000000000000
--- a/sys-power/pm-utils/files/1.4.1-suspend-hybrid.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Add support for in-kernel suspend to both
-Author: Bojan Smojver <bojan@rexursive.com>
-Author: Jaroslav Škarvada <jskarvad@redhat.com>
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=52572
-Bug-Ubuntu: https://launchpad.net/bugs/1172692
-
---- pm/pm-functions.in
-+++ pm/pm-functions.in
-@@ -336,8 +336,28 @@
- 	{
- 		[ -n "${HIBERNATE_MODE}" ] && \
- 		grep -qw "${HIBERNATE_MODE}" /sys/power/disk && \
-+		HIBERNATE_MODE_SAVE=$(cat /sys/power/disk) && \
-+		HIBERNATE_MODE_SAVE="${HIBERNATE_MODE_SAVE##*[}" && \
-+		HIBERNATE_MODE_SAVE="${HIBERNATE_MODE_SAVE%%]*}" && \
- 		echo -n "${HIBERNATE_MODE}" > /sys/power/disk
- 		echo -n "disk" > /sys/power/state
-+		RET=$?
-+		echo -n "$HIBERNATE_MODE_SAVE" > /sys/power/disk
-+		return "$RET"
-+	}
-+fi
-+
-+# for kernels that support suspend to both (i.e. hybrid suspend)
-+# since kernel 3.6
-+if [ -z "$SUSPEND_HYBRID_MODULE" ] && \
-+	[ -f /sys/power/disk ] && \
-+	grep -q disk /sys/power/state && \
-+	grep -q suspend /sys/power/disk; then
-+	SUSPEND_HYBRID_MODULE="kernel"
-+	do_suspend_hybrid()
-+	{
-+		HIBERNATE_MODE="suspend"
-+		do_hibernate
- 	}
- fi
diff --git a/sys-power/pm-utils/files/1.4.1-uswsusp-hibernate-mode.patch b/sys-power/pm-utils/files/1.4.1-uswsusp-hibernate-mode.patch
deleted file mode 100644
index 8c970698d5bb..000000000000
--- a/sys-power/pm-utils/files/1.4.1-uswsusp-hibernate-mode.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Check HIBERNATE_MODE in uswsusp module
-Author: Vadim Solomin <vadic052@gmail.com>
-Bug-Debian: http://bugs.debian.org/589553
-
---- pm/module.d/uswsusp
-+++ pm/module.d/uswsusp
-@@ -87,7 +87,11 @@
- 	HIBERNATE_MODULE="uswsusp"
- 	do_hibernate()
- 	{
--		s2disk
-+		if [ -n "$HIBERNATE_MODE" ]; then
-+			s2disk -P "shutdown method=$HIBERNATE_MODE"
-+		else
-+			s2disk
-+		fi
- 	}
- fi
- 
diff --git a/sys-power/pm-utils/files/1.4.1-xfs_buffer_arguments.patch b/sys-power/pm-utils/files/1.4.1-xfs_buffer_arguments.patch
deleted file mode 100644
index 3eee91166f88..000000000000
--- a/sys-power/pm-utils/files/1.4.1-xfs_buffer_arguments.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From fdc626dadfd985e823f4e828f2a542c945aea219 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@st.com>
-Date: Tue, 10 Jan 2012 11:21:02 +0100
-Subject: [PATCH 2/2] pm/power.d/xfs_buffer: Fix wrong argument ordering
-
-Write the values in the correct order.
-
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=44620
-Bug-Ubuntu: https://launchpad.net/bugs/645974
-
-Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com>
----
- pm/power.d/xfs_buffer |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/pm/power.d/xfs_buffer b/pm/power.d/xfs_buffer
-index d21e845..9f06f6e 100644
---- a/pm/power.d/xfs_buffer
-+++ b/pm/power.d/xfs_buffer
-@@ -59,7 +59,7 @@ xfs_ac() {
- xfs_battery() {
-     state_exists xfs_buffer_default || \
- 	read_values |savestate xfs_buffer_default
--    write_values "$XFS_AGE_BUFFER" "$XFS_BUFD" "$XFS_SYNCD"
-+    write_values "$XFS_AGE_BUFFER" "$XFS_SYNCD" "$XFS_BUFD"
- }
- 
- case $1 in
--- 
-1.7.7.3
-
diff --git a/sys-power/pm-utils/files/pm-utils.logrotate b/sys-power/pm-utils/files/pm-utils.logrotate
deleted file mode 100644
index 85de40035092..000000000000
--- a/sys-power/pm-utils/files/pm-utils.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/pm-suspend.log /var/log/pm-powersave.log {
-       monthly
-       rotate 4
-       delaycompress
-       compress
-       notifempty
-       missingok
-}
diff --git a/sys-power/pm-utils/files/power.d/pci_devices b/sys-power/pm-utils/files/power.d/pci_devices
deleted file mode 100644
index c06b706d82a7..000000000000
--- a/sys-power/pm-utils/files/power.d/pci_devices
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-
-#
-# This script adjusts the power control of a set of PCI devices that
-# prove beneficial to enable power savings
-#
-
-PCI_DEVICES_PM_ENABLE="${PCI_DEVICES_PM_ENABLE:-true}"
-
-set_pci_device()
-{
-	for dev in /sys/bus/pci/devices/* ; do
-		if [ -e $dev/class -a -e $dev/power/control ]; then
-			id=`basename $dev`
-			case `cat $dev/class` in
-			0x020000) # ethernet
-				echo "Setting Ethernet device $id to $1"
-				echo $1 > $dev/power/control
-				;;
-			0x028000) # wireless
-				echo "Setting Wireless device $id to $1"
-				echo $1 > $dev/power/control
-				;;
-			0x040300) # audio
-				echo "Setting Audio device $id to $1"
-				echo $1 > $dev/power/control
-				;;
-			0x060000) # host bridge
-				echo "Setting Host Bridge $id to $1"
-				echo $1 > $dev/power/control
-				;;
-			0x080500) # SD card reader
-				echo "Setting SD card reader device $id to $1"
-				echo $1 > $dev/power/control
-				;;
-			0x088000|0x088001) # card reader
-				echo "Setting card reader device $id to $1"
-				echo $1 > $dev/power/control
-				;;
-			0x0c0000|0x0c0010) # firewire
-				echo "Setting FireWire device $id to $1"
-				echo $1 > $dev/power/control
-				;;
-			esac
-		fi
-	done
-}
-
-case "$1" in
-	true) # powersaving on
-		[ "$PCI_DEVICES_PM_ENABLE" = true ] && set_pci_device "auto"
-		;;
-	false) # powersaving off
-		[ "$PCI_DEVICES_PM_ENABLE" = true ] && set_pci_device "on"
-		;;
-	*)
-		exit 254
-		;;
-esac
-
-exit 0
diff --git a/sys-power/pm-utils/files/power.d/usb_bluetooth b/sys-power/pm-utils/files/power.d/usb_bluetooth
deleted file mode 100644
index 615d19e95631..000000000000
--- a/sys-power/pm-utils/files/power.d/usb_bluetooth
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-#
-# This script adjusts the USB bluetooth device settings via the USB
-# power control.  This simply sets this to "auto" for power saving and to "on"
-# for non-power saving.   This has been shown to save about 1W on some
-# systems.
-#
-# According to http://www.usb.org/developers/defined_class
-#   USB wireless bluetooth devices have baseclass 0xe0, subclass 0x01,
-#   protocol 0x01
-#
-
-USB_BLUETOOTH_PM_ENABLE="${USB_BLUETOOTH_PM_ENABLE:-true}"
-
-set_usb_bluetooth()
-{
-	for dev in /sys/bus/usb/devices/* ; do
-		if [ -e $dev/bDeviceClass -a \
-		     -e $dev/bDeviceSubClass -a \
-		     -e $dev/bDeviceProtocol -a \
-		     -e $dev/power/control ]; then
-			if [ x`cat $dev/bDeviceClass` = xe0 -a \
-		     	x`cat $dev/bDeviceSubClass` = x01 -a \
-		     	x`cat $dev/bDeviceProtocol` = x01 ]; then
-				echo Setting $dev to $1
-				echo $1 > $dev/power/control
-			fi
-		fi
-	done
-}
-
-case "$1" in
-	true) # powersaving on
-		[ "$USB_BLUETOOTH_PM_ENABLE" = true ] && set_usb_bluetooth "auto"
-		;;
-	false) # powersaving off
-		[ "$USB_BLUETOOTH_PM_ENABLE" = true ] && set_usb_bluetooth "on"
-		;;
-	*)
-		exit 254
-		;;
-esac
-
-exit 0
diff --git a/sys-power/pm-utils/files/sleep.d/50unload_alx b/sys-power/pm-utils/files/sleep.d/50unload_alx
deleted file mode 100644
index 6d352c50f7c0..000000000000
--- a/sys-power/pm-utils/files/sleep.d/50unload_alx
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# 50unload_alx: unload the alx module during suspend (LP #1173952)
-
-[ -d /sys/module/alx ] || exit 0
-
-. "${PM_FUNCTIONS}"
-
-case "$1" in
-	suspend)
-		echo "Unloading alx kernel module ..."
-		modunload alx && echo Done. || echo Failed.
-		;;
-	resume)
-		echo "Reloading alx kernel module ..."
-		;;
-esac
-exit 0
diff --git a/sys-power/pm-utils/metadata.xml b/sys-power/pm-utils/metadata.xml
deleted file mode 100644
index 26e2876f1a74..000000000000
--- a/sys-power/pm-utils/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>freedesktop-bugs@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="ntp">Install support for <pkg>net-misc/ntp</pkg></flag>
-  </use>
-</pkgmetadata>
diff --git a/sys-power/pm-utils/pm-utils-1.4.1-r7.ebuild b/sys-power/pm-utils/pm-utils-1.4.1-r7.ebuild
deleted file mode 100644
index c49848365a21..000000000000
--- a/sys-power/pm-utils/pm-utils-1.4.1-r7.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib
-
-DESCRIPTION="Suspend and hibernation utilities"
-HOMEPAGE="https://pm-utils.freedesktop.org/"
-SRC_URI="https://pm-utils.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="alsa debug ntp video_cards_intel video_cards_radeon"
-
-vbetool="!video_cards_intel? ( sys-apps/vbetool )"
-RDEPEND="!<app-laptop/laptop-mode-tools-1.55-r1
-	!sys-power/powermgmt-base[-pm-utils(+)]
-	sys-apps/dbus
-	>=sys-apps/util-linux-2.13
-	sys-power/pm-quirks
-	alsa? ( media-sound/alsa-utils )
-	ntp? ( || ( net-misc/ntp net-misc/openntpd ) )
-	amd64? ( ${vbetool} )
-	x86? ( ${vbetool} )
-	video_cards_radeon? ( app-laptop/radeontool )"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog NEWS pm/HOWTO* README* TODO"
-
-src_prepare() {
-	local ignore="01grub"
-	use ntp || ignore+=" 90clock"
-
-	use debug && echo 'PM_DEBUG="true"' > "${T}"/gentoo
-	echo "HOOK_BLACKLIST=\"${ignore}\"" >> "${T}"/gentoo
-
-	epatch \
-		"${FILESDIR}"/${PV}-bluetooth-sync.patch \
-		"${FILESDIR}"/${PV}-disable-sata-alpm.patch \
-		"${FILESDIR}"/${PV}-fix-intel-audio-powersave-hook.patch \
-		"${FILESDIR}"/${PV}-logging-append.patch \
-		"${FILESDIR}"/${PV}-fix-alpm-typo.patch \
-		"${FILESDIR}"/${PV}-inhibit-on-right-status.patch \
-		"${FILESDIR}"/${PV}-ignore-led-failure.patch \
-		"${FILESDIR}"/${PV}-run-hook-logging.patch \
-		"${FILESDIR}"/${PV}-suspend-hybrid.patch \
-		"${FILESDIR}"/${PV}-uswsusp-hibernate-mode.patch \
-		"${FILESDIR}"/${PV}-xfs_buffer_arguments.patch \
-		"${FILESDIR}"/${PV}-echo-n.patch
-}
-
-src_configure() {
-	econf --disable-doc
-}
-
-src_install() {
-	default
-	doman man/*.{1,8}
-
-	# Remove duplicate documentation install
-	rm -r "${ED}"/usr/share/doc/${PN}
-
-	insinto /etc/pm/config.d
-	doins "${T}"/gentoo
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN} #408091
-
-	exeinto /usr/$(get_libdir)/${PN}/sleep.d
-	doexe "${FILESDIR}"/sleep.d/50unload_alx
-
-	exeinto /usr/$(get_libdir)/${PN}/power.d
-	doexe "${FILESDIR}"/power.d/{pci_devices,usb_bluetooth}
-
-	# No longer required with current networkmanager (rm -f from debian/rules)
-	rm -f "${ED}"/usr/$(get_libdir)/${PN}/sleep.d/55NetworkManager
-
-	# No longer required with current kernels (rm -f from debian/rules)
-	rm -f "${ED}"/usr/$(get_libdir)/${PN}/sleep.d/49bluetooth
-
-	# Punt HAL related file wrt #401257 (rm -f from debian/rules)
-	rm -f "${ED}"/usr/$(get_libdir)/${PN}/power.d/hal-cd-polling
-
-	# Punt hooks which have shown to not reduce, or even increase power usage
-	# (rm -f from debian rules)
-	rm -f "${ED}"/usr/$(get_libdir)/${PN}/power.d/{journal-commit,readahead}
-
-	# Remove hooks which are not stable enough yet (rm -f from debian/rules)
-	rm -f "${ED}"/usr/$(get_libdir)/${PN}/power.d/harddrive
-
-	# Change to executable (chmod +x from debian/rules)
-	fperms +x /usr/$(get_libdir)/${PN}/defaults
-}