diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-03 10:28:17 +0000 |
| commit | d99093fb4bb5652015c06274d64083daa2439e4f (patch) | |
| tree | cf61513204d97974179580065e85df5c8009087c /sys-power | |
| parent | 463397cf1e064185110fe57c568d73f99a06f5d1 (diff) | |
gentoo resync : 03.03.2021
Diffstat (limited to 'sys-power')
35 files changed, 50 insertions, 715 deletions
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz Binary files differindex 8159010b15f5..8d89ea52f1fe 100644 --- a/sys-power/Manifest.gz +++ b/sys-power/Manifest.gz diff --git a/sys-power/acpilight/Manifest b/sys-power/acpilight/Manifest index e1c2a18357c4..bab12b51c299 100644 --- a/sys-power/acpilight/Manifest +++ b/sys-power/acpilight/Manifest @@ -1,6 +1,7 @@ +AUX acpilight-1.2-fix-log10-of-zero.patch 715 BLAKE2B 33a33f4869a5c3cc27898ca5adea8d79c7b94d497ece5204b38e9ced59f686999ce1b625bf0e7b83447b862c9fb769ab6a8095c0498819c8254cb70cbead6b22 SHA512 786e4c0ab97d240a5fdedbee2adddd90c9aea390f9ad1becb5d61e1f0023d076bb01b0c847f6a68e49cbebee28b218cf7940c9fa087a4865539670fe81ce051e AUX acpilight.confd 269 BLAKE2B 196245bd083f89d9d975a81aaaf66d0422655cd6a5f575c2cbb898747c92bdb888f8123dbf8ddf34089be2547d39e33508119065ffb97c26f9d1d3915bee8bb2 SHA512 28e513dbcaa30cec4d2f876c244766037eb6e94ff660ff2caf9cb955f40c710ea750cac73eb5e3890b42904227ccbd7f6c3e2595c2496e54d3339d6afdd0ffb0 AUX acpilight.initd 742 BLAKE2B bc2ad5027cd9e5c9f8d0d55e249117f7f59ad587522d21ea2baf69e45a884df242d46cb3001ef46ef63c1e1f87a18bc5c05d4facf1e9d72d4b596926e9a6b69b SHA512 9fe648ea994eeb9baa294226b55bd6230cb2b28952f651755da622278539fc071527e3aa2425e26687bb8065ef2e372ab93d7090532dbf3208ccac8519f01fca DIST acpilight-v1.2.tar.gz 18068 BLAKE2B 469fd12c0a24b152681d73add559733a294f8a0848f46d0d3a1e209dea2ad3b180294677a8d84a82387ec34b00bbfda85a10f447fe22b81a3c51225cdce14051 SHA512 ef634ec0f315fe94dca138f1b9231f320b93340db3365ab9a09cf898fe4691f70573041bcb04563d760f1201000ea3ff11ab5dad3bfffddf3d3070dedb5732d7 EBUILD acpilight-1.2-r1.ebuild 1493 BLAKE2B 0f0338f8f615905cc32cf86989b8d22444083bb1ed54fffdc26f3643f15ba579e127510ad36ac627e3aeb971fee633fbc8d75d2663c8c85b3d1b9bc0cc3b72cf SHA512 b2ea18b03eca0c055931f3b27ce3a4c37e0e427ce616318b266779895cb600fef96b381899b419319e822cacf15a6b060689f4d0b2620d26f1c1ad0412d7ec63 -EBUILD acpilight-1.2.ebuild 1496 BLAKE2B 6124f01b9d84286f0287550be51d792c461dfb552300d5948b3ffab2a6d9a0bf03264299bf0ccdc607ebe2f4989683eaecf19d09686e3c9823a7a6c9e6f09231 SHA512 4d9a05aef6b99dc1c548c6a3a361c15815214e20d84078d5f0573a2d39ee4d86a2923861d6982e495fb82d98d89191ee67e070323e20a3283df07822ed2f93eb +EBUILD acpilight-1.2-r2.ebuild 1570 BLAKE2B 3590c498247d7f4c6606e63a9611fc787ba46cd24060cab0a94f6f593ea036e3f415d7b36be4c230e5028bea65dbea29edc9cc1568dc13ee58428a81d0033467 SHA512 b3d32d4a2a7936b14c2a7cad1ff0ed5fab964b06a2944ed638888311671108ae066b090aa609ccdd4eaa3669413f55c59c3b0f9c9cd97ea6e2f70d4a2517a55b MISC metadata.xml 337 BLAKE2B ad7ecd612b078bad830f6f10efaca7f41b7b5ef1d290799ce4c2dbd5489076c5c0fc3500e0c64bc3f00f448f80a1eedb9737c967258bbea5e105a85d7e4b8749 SHA512 6f624eadeaad1f4a440a2663ac9672cd6a36dbb668d11bcdb621aa5ddb739632c8bc74bbbde9905adf023618a9432a26bfec4f6861f5e4ba6167a0c2658dacd0 diff --git a/sys-power/acpilight/acpilight-1.2.ebuild b/sys-power/acpilight/acpilight-1.2-r2.ebuild index 98f3c664a900..ea5d3b4b729b 100644 --- a/sys-power/acpilight/acpilight-1.2.ebuild +++ b/sys-power/acpilight/acpilight-1.2-r2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_7 ) +PYTHON_COMPAT=( python3_7 python3_8 python3_9 ) -inherit python-r1 udev +inherit python-single-r1 udev MY_P="${PN}-v${PV}" @@ -14,7 +14,7 @@ HOMEPAGE="https://gitlab.com/wavexx/acpilight/" SRC_URI="https://gitlab.com/wavexx/acpilight/-/archive/v${PV}/${MY_P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="" S="${WORKDIR}/${MY_P}" @@ -26,11 +26,13 @@ RDEPEND="virtual/udev REQUIRED_USE="${PYTHON_REQUIRED_USE}" DOCS=( README.rst NEWS.rst ) +PATCHES=( "${FILESDIR}/acpilight-1.2-fix-log10-of-zero.patch" ) + # Disable Makefile that installs by default src_compile() { :; } src_install() { - python_foreach_impl python_doscript xbacklight + python_doscript xbacklight udev_dorules "${S}"/90-backlight.rules doman xbacklight.1 einstalldocs diff --git a/sys-power/acpilight/files/acpilight-1.2-fix-log10-of-zero.patch b/sys-power/acpilight/files/acpilight-1.2-fix-log10-of-zero.patch new file mode 100644 index 000000000000..ffc061910f01 --- /dev/null +++ b/sys-power/acpilight/files/acpilight-1.2-fix-log10-of-zero.patch @@ -0,0 +1,26 @@ +From fdf8a4c57c3997f95ea0571b627f3c5a31dfe7b1 Mon Sep 17 00:00:00 2001 +From: Mart <mart@martlubbers.net> +Date: Thu, 1 Oct 2020 09:55:08 +0000 +Subject: [PATCH] set the perceived to zero when the screen is off + +This fixes the issue that you cannot take the 10-log of zero +--- + xbacklight | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/xbacklight b/xbacklight +index 2cb0fa8..f1c2187 100755 +--- a/xbacklight ++++ b/xbacklight +@@ -82,6 +82,8 @@ class LogController(RawController): + + @property + def brightness(self): ++ if super().brightness == 0: ++ return 0 + return log10(super().brightness)/log10(super().max_brightness)*self.max_brightness + + @brightness.setter +-- +GitLab + diff --git a/sys-power/ncpufreqd/Manifest b/sys-power/ncpufreqd/Manifest deleted file mode 100644 index 2baed5581233..000000000000 --- a/sys-power/ncpufreqd/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST ncpufreqd-2.4.tar.xz 9552 BLAKE2B 9eb3c48d5cd3f530c639bf56aedecd6ed76ea523189ef6ae4141fcfe9f62b76ee1ba0820e01831c4e14f91517c17cc38238d273dd6ff2e48a798d70ca6596058 SHA512 9532604ac4245157152a3990e13225aae335e8b1bb22eca2299a30eee76d9305511ac2176fefb469d8aa573f32a3f46adb6b75e799498bc9577e1616cd5fc362 -EBUILD ncpufreqd-2.4.ebuild 519 BLAKE2B 063adf121ed2364624dee37e30f4bff894bd623787036558f8e4df1ca0ef20045f7c41cccfd628a1651e7d55a3e27cc5162e8eddddd467aebf723af757d47e2a SHA512 de2e5880353c4d87b15b43e062e5d5d8664eb1140e44e5d74997cb74c6827bb43b71f3f2b1de322f4ff70f1c02def4b09fe5cea8bd171009129c850cc713c746 -MISC metadata.xml 253 BLAKE2B bb2f6de4deb453b302901058deb33349c955fdde060747cd8c094e938e3bc5f8ac6a6b63552fb55a066f5e8586494cd36eb5d68aa1398c1e79b8f9fee753c559 SHA512 cde97266361f018b48934b04550e58cd23bd60e220477e80b8d81cdfc44f45351dff088636bde9aaefdc4860baccfab07ccfb4dc4d090475f361a5730a1f4187 diff --git a/sys-power/ncpufreqd/metadata.xml b/sys-power/ncpufreqd/metadata.xml deleted file mode 100644 index a1603d3434ab..000000000000 --- a/sys-power/ncpufreqd/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="bitbucket">nelchael/ncpufreqd</remote-id> - </upstream> -</pkgmetadata> diff --git a/sys-power/ncpufreqd/ncpufreqd-2.4.ebuild b/sys-power/ncpufreqd/ncpufreqd-2.4.ebuild deleted file mode 100644 index 6976550604e1..000000000000 --- a/sys-power/ncpufreqd/ncpufreqd-2.4.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="Daemon controlling CPU speed and temperature" -HOMEPAGE="https://bitbucket.org/nelchael/ncpufreqd" -SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz" -LICENSE="ZLIB" - -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="" - -DEPEND=" - app-arch/xz-utils - virtual/logger" -RDEPEND="${DEPEND}" - -src_install() { - cmake-utils_src_install - - doinitd gentoo-init.d/ncpufreqd - einstalldocs -} diff --git a/sys-power/pm-quirks/Manifest b/sys-power/pm-quirks/Manifest deleted file mode 100644 index 8b390b3c2049..000000000000 --- a/sys-power/pm-quirks/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST pm-quirks-20100619.tar.gz 10033 BLAKE2B dd6e455ac8dd76789b0698cce77be682e886afdc2ae547850e10c091b0f531609f8bf071cd87182dc0533585444220a1ed266dc04bfaed132671a65d56d9bfc8 SHA512 e20244fb72475945e08010d7ec19db2c017c1a04fa01d3d08c03d704d7f07f9c087bac6a5a44242cc8ed6cec5db47bc06a8862dd0f74088a565d37b6d7b95afc -EBUILD pm-quirks-20100619-r1.ebuild 472 BLAKE2B 2d7ed61cde96da7152b1024df6c2b79cf5e24842511af75283c032a9ceb1ea116f98ea863c88b5ef51e0a8102af954502d71d58481640ac04ac4bec5c4777af6 SHA512 414e067584671fa69758ef6a50176c872aa0b27a35040b252c127e586987f85dffe1bc908790d21991e0587438a44a3b80dc95c35ddeee18d645032d4bd61d63 -MISC metadata.xml 270 BLAKE2B 9c2dafa0390cfc7b94b5c44505d72021bf57cf8ffb35be7a3327f4316c3e4b2dbbfa0325d97243a8ea933440a5678cc5d35c639f5aa210b1d5ceb8ab65eb5d90 SHA512 92c366ec57074ced42e6f9960f97d1cd1a022dba7450b51f3617a6a5e00c755496dfa84aa4ac259f4b00c676366b1eaa3ec30eeb9bcb0bf41253d1910005db2f diff --git a/sys-power/pm-quirks/metadata.xml b/sys-power/pm-quirks/metadata.xml deleted file mode 100644 index f843557871de..000000000000 --- a/sys-power/pm-quirks/metadata.xml +++ /dev/null @@ -1,8 +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> - <name>Gentoo Freedesktop Project</name> - </maintainer> -</pkgmetadata> diff --git a/sys-power/pm-quirks/pm-quirks-20100619-r1.ebuild b/sys-power/pm-quirks/pm-quirks-20100619-r1.ebuild deleted file mode 100644 index 6be0547c41cd..000000000000 --- a/sys-power/pm-quirks/pm-quirks-20100619-r1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Video Quirks database for pm-utils" -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="" - -S="${WORKDIR}" - -src_install() { - insinto /usr/$(get_libdir)/pm-utils - doins -r video-quirks -} 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 -} diff --git a/sys-power/powermgmt-base/Manifest b/sys-power/powermgmt-base/Manifest index 18b14105a3d7..fd25a2fbede6 100644 --- a/sys-power/powermgmt-base/Manifest +++ b/sys-power/powermgmt-base/Manifest @@ -1,3 +1,3 @@ DIST powermgmt-base_1.31.tar.gz 10015 BLAKE2B 7beb933598b7885a996d9410ede2df92f280e6ff6c5e318223db7fb181e13a78e962ef9d2184e951c102d940f85a19f725c62af260c3d182469933ac82d3f99a SHA512 deae8b227e079a73fdd3f9a6be83bdc76400d457c17d3a0881ace1fddc8785ee401beddbafad93dbf3a09b5effe5ca7c998eae69a0740a083a9e8a65c2f0af40 -EBUILD powermgmt-base-1.31-r1.ebuild 1023 BLAKE2B cd4d9bfbb226d87256b6f399f66bfa27a5a33bc16bc748c7db8f2f8f72e586f384a637c82037748349e520e19a752f408dd84efcebf992c706ec7acebcd61af4 SHA512 9694da4f7c0b621720bd675d8da69ecb8cd77afe21ca1741e3d2c83a95e21eed5f1b22ebe3c81ca33852dd7c901df4134d48303ca9dc50ebaa857a1e7e3b825f -MISC metadata.xml 281 BLAKE2B 3d9b4370754826c0b520531da7c7a2cd3c6517a94b2ce83d40eed23cbe4a2d362f9c98db4f4895ddd023a2ed915cdc3dbd5262d4b16f24110d89b93a44f9442a SHA512 ed5b52d81e30aadc840b8e7c834a1af4b9805c24c5598e34ccb41189f245ea52a389de7846043a60815411333efcf7281b680b20aeebb3d2ba4358a7716b1730 +EBUILD powermgmt-base-1.31-r2.ebuild 915 BLAKE2B e5161c2fc4238dc7c884d2def18eb4c33aa1144c2b2a92c13dec2281e6452f9717a16006ae312e6e20974a1546f9c4af07968838363d2a2df9f7f554dbd8452b SHA512 e442d526a048383bbc23fc074a66eb3b6293e2772738fb0b136fb5a179ddc720e522e3cca9bb6e031c8f39397eb74f6caf086f149af546a1666f7250a96d61d6 +MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/sys-power/powermgmt-base/metadata.xml b/sys-power/powermgmt-base/metadata.xml index 7e5225dfb557..7a38bb900964 100644 --- a/sys-power/powermgmt-base/metadata.xml +++ b/sys-power/powermgmt-base/metadata.xml @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> -<use> - <flag name="pm-utils">Adds support for on_ac_power through <pkg>sys-power/pm-utils</pkg></flag> - </use> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/sys-power/powermgmt-base/powermgmt-base-1.31-r1.ebuild b/sys-power/powermgmt-base/powermgmt-base-1.31-r2.ebuild index 974b61639253..cac5e37fe874 100644 --- a/sys-power/powermgmt-base/powermgmt-base-1.31-r1.ebuild +++ b/sys-power/powermgmt-base/powermgmt-base-1.31-r2.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 + inherit toolchain-funcs DESCRIPTION="Script to test whether computer is running on AC power" @@ -11,16 +12,17 @@ SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 arm ~ia64 ppc ppc64 x86" -IUSE="+pm-utils" -RDEPEND="!pm-utils? ( virtual/awk ) +RDEPEND=" + virtual/awk sys-apps/grep - sys-apps/kmod[tools] - pm-utils? ( >=sys-power/pm-utils-1.4.1 )" + sys-apps/kmod[tools]" +DEPEND="${RDEPEND}" -S=${WORKDIR}/${PN} +S="${WORKDIR}/${PN}" src_prepare() { + default sed -i \ -e 's:$(CC) $(CFLAGS):$(CC) $(LDFLAGS) $(CFLAGS):' \ src/Makefile || die @@ -37,11 +39,7 @@ src_install() { doman man/{acpi,apm}_available.1 - if ! use pm-utils; then - doman man/on_ac_power.1 - else - rm -f "${D}"/sbin/on_ac_power - fi + doman man/on_ac_power.1 newdoc debian/powermgmt-base.README.Debian README dodoc debian/changelog diff --git a/sys-power/uhubctl/Manifest b/sys-power/uhubctl/Manifest index 07376dafb7d6..1c1709882a18 100644 --- a/sys-power/uhubctl/Manifest +++ b/sys-power/uhubctl/Manifest @@ -1,5 +1,3 @@ -DIST uhubctl-1.8.tar.gz 16158 BLAKE2B 1203e9711716987c0f60786cfe48a92a9a9a78f4bceb3851889a305a1289772375c6a512c361ba1e3e937fa1cb2f64e07365ef494e248e07a7a4f45f9e78c451 SHA512 fcc88ca47467e8e6085a75461495393306ddff1d6f7c9184c129bbdd044451b6430ac916f648b9f71c798054373f3d9102185e3d0c8f355c47e2574a1984ec9d -DIST uhubctl-2.3.0.tar.gz 25367 BLAKE2B 7e5b6bf5f4a76e90a78292b23127af366e3388ffb8565fc1d763b9bd45faf0518411996a307a42c62827006ef9488e39282c95b2ba6c0bc289863cec7c91ac25 SHA512 e1ddc8d20b626e99facd8b0e6b746e2fdcaec667c7b280b656aa608b7990cfac1ea3e5379e89d0b1be8756ba5e91485ad003eb2bd5dfb3cc3c9cdf3d18ad1bd3 -EBUILD uhubctl-1.8-r1.ebuild 512 BLAKE2B 2a7ceb5488c6a6e27538b283fb73e0c900f9fb0f790c4d33d7e0e39d68028d11aa6d6aaaa962bbda540644ac977b1149e03c1d5a201035e2e383bdbc5e59df3a SHA512 78a2690aec04450bcea17296e9a1e48c55a0febca72bf5f21e945a304557fdd515d713a87d153cac5aadcccfc1e66dd12ca2b6eff3759c43ff56a331b67eae9f -EBUILD uhubctl-2.3.0.ebuild 546 BLAKE2B b24952a3c08703e459fb6c7e6da4cefb9e54baeb801381965c4db760463c400354123603ee594c4f81fc1cee9283dc67b933686bbc1f824fbf0c205da988cd1c SHA512 a912a647faff98ee7dd4aaf7a3d630271ba72f0389b89498da624c0a58fb0216fa8c867fc2b6a754c9c9e5de4e2b0f866b51e056002e4271fd42d7e973cc0ae0 +DIST uhubctl-2.4.0.tar.gz 25661 BLAKE2B 44d1fa0ce92beb3c4c3e2d21c8acb982f71f2e450afffb8c467c488495f389b745ba437c6fbbe3049cd3f67a73fa8bda6ed9c987ab1326f12db59623ee107ece SHA512 d7f07679c4678565ce0174e1eb591263fae5629dd6fbb5aaa0321ca10176b8b2d662e75a3019caeb83aaf470c8386188848ba3095e1006451e8710b2a2c9bb1d +EBUILD uhubctl-2.4.0.ebuild 546 BLAKE2B b24952a3c08703e459fb6c7e6da4cefb9e54baeb801381965c4db760463c400354123603ee594c4f81fc1cee9283dc67b933686bbc1f824fbf0c205da988cd1c SHA512 a912a647faff98ee7dd4aaf7a3d630271ba72f0389b89498da624c0a58fb0216fa8c867fc2b6a754c9c9e5de4e2b0f866b51e056002e4271fd42d7e973cc0ae0 MISC metadata.xml 247 BLAKE2B 0f6116ad1a6532d4d062e4e8dadf00f3053ccd4408f030535d3adc5f0399e43ac1682b3786a1a321ba7dd8c1b448cebc5938207a5af59fc033e0e6cf4c654c40 SHA512 8111616dc98858617382132291d5d7a4900eb04643a2c67d4c2eae21dbd08e2fd5f73d533befaa5a0c6a074b04046f1e5bf7a139386ca10ffffef329825d0514 diff --git a/sys-power/uhubctl/uhubctl-1.8-r1.ebuild b/sys-power/uhubctl/uhubctl-1.8-r1.ebuild deleted file mode 100644 index b4d0bbc30d7d..000000000000 --- a/sys-power/uhubctl/uhubctl-1.8-r1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="USB hub per-port power control" -HOMEPAGE="https://github.com/mvp/uhubctl" -SRC_URI="https://github.com/mvp/uhubctl/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -DEPEND="virtual/libusb:1" -RDEPEND="${DEPEND}" - -src_prepare() { - sed -i "s#\$(shell git describe --abbrev=4 --dirty --always --tags)#${PV}#" Makefile || die - eapply_user -} diff --git a/sys-power/uhubctl/uhubctl-2.3.0.ebuild b/sys-power/uhubctl/uhubctl-2.4.0.ebuild index 094e1cc2428c..094e1cc2428c 100644 --- a/sys-power/uhubctl/uhubctl-2.3.0.ebuild +++ b/sys-power/uhubctl/uhubctl-2.4.0.ebuild |