diff options
Diffstat (limited to 'sys-power')
38 files changed, 826 insertions, 631 deletions
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz Binary files differindex 486729f19580..cec756e4f52f 100644 --- a/sys-power/Manifest.gz +++ b/sys-power/Manifest.gz diff --git a/sys-power/RyzenAdj/Manifest b/sys-power/RyzenAdj/Manifest index cfd4f76cfc5d..215067f29660 100644 --- a/sys-power/RyzenAdj/Manifest +++ b/sys-power/RyzenAdj/Manifest @@ -1,7 +1,5 @@ -DIST RyzenAdj-0.12.0.tar.gz 125323 BLAKE2B d7cd07d20942d4c6ecfadf639e4cf4d0a6c7732f8a263f5c42ef5a3113953ebf8246e88df9f975cdcc225d368f56bb5719c76d9a599ee32693ce72225a39de45 SHA512 9e38114c7495b98fe65ecd86ba389510258361b3837b0aeabd9fd6004d5b6ea95d85ce949e2df23c50939c205dce8177227cdcc33b20a19f7371e93841a3b049 -DIST RyzenAdj-0.13.0.tar.gz 125519 BLAKE2B d0f4ef060449cb957ad4cb73ff55b843043394388df2575825c6822687e83246108a2d695b3463aa431724ca5a82688fd87af87af9d14f17f697c303d0e398e9 SHA512 d9757e2afd128b216ff3fb83582c4bfd4d96d5dc1d9cd8e5d27b4dd92c25abe3c38b35000dcfaaddf32042a03803177d5e9258ee6c9b01fb40f7b4708e37ba0e DIST RyzenAdj-0.15.0.tar.gz 126215 BLAKE2B 4575d47b71b3f777bfaaeb29217c8debf955f561d5bfb7ffdafcacfa23840514f875cfa19e7b41332e948716ec59b2442c900fdb85e1f36c9fb841bd42d6ccdf SHA512 1b40eafeb8fc308d97d76285f13cc5a9ea6043ae3a3af14ebcca3762c93f8b5f64463586aed19413fc79718565b44c43a14480de3e43456f9340f6fbc699a891 -EBUILD RyzenAdj-0.12.0.ebuild 628 BLAKE2B 8da9401971d9380a176a1b800629be652fb9b7fcb57b05140a8c1f365ac60a4c7a94773bf37b8ba9f4ad75c98f12df869a119f6af4cf027c48f29a67786d43e6 SHA512 6411b1d85e9507ffb1cbefe62b3ffaa3ed1865a7cb70dad05ed455943f01395d20e8bbc5ab27ccb952cc0526e58783bba4c9901eca5e16e129683e414acdaebb -EBUILD RyzenAdj-0.13.0.ebuild 633 BLAKE2B 349176adfdf41d7a473ebdf429d8f8e351303acf6d473d75f27b9b4002a58ad46eb64d7f669c27ca72a46ef57f7860c9a13aaf55e098e22e5c66cc10e42043fe SHA512 a924bbebad781d3ae46f3fd716f50dbfa8f572fa971ba9769bc6520110154c20f5e045c644bfa968059c48c806861c8493c97042f3793fe0d783acc926d21f12 +DIST RyzenAdj-0.16.0.tar.gz 126451 BLAKE2B c414f6fdb4f18f83aa55e1890fda18558aaabe838d7470aadaa1ac3d2d98552b967bc5753f1784d711bc80b77af3f14ace96ed9986c3dcbf5ba248329a985df0 SHA512 15a49bda180b1a60838f358031c8b443382ced2b74fa9b9717846adc62a9310da43c85841d06cbfa869ea9b9fd0457b09dea26380479b587adac5b4624eb161d EBUILD RyzenAdj-0.15.0.ebuild 622 BLAKE2B 7d5b40fb595a042af8c379e5001349e04fce11fb53a07bb24ad0b6236da2dc9c0ed5112097ca67749ae0f37c5700f43fb8dfb5892cab8bafe4801291f28ee8fa SHA512 547d202c1f2715850ea5c342fc2ad0bb33d1c47ff13a85f2752fb9ccd997ca4ce955912ec1f8ca54691f904f933298f75f0f4d06297ce733f4439789f0e9543d +EBUILD RyzenAdj-0.16.0.ebuild 624 BLAKE2B e2116ad6bbd97e5d5e2128ecc7fb6d4c90d78291e4c9e47ec5e343642275fcbef0e8537542d12d36fea583286d618175e28cff2d904344c3f61aaf98e04075f8 SHA512 b3539670b926ffde67d97711ac5ee942772fd7c1dfe38250b64b765b0a1f502e5e7c8e552b15e45f17e2acb5d606c027e78bd040c58e19235db1ce2dd0c7ea69 MISC metadata.xml 249 BLAKE2B 1a960ff7b0ab1623c6ace9dffde6315ccaf7d9fddb4c9d6273157ce416e09bc2ec3ee307a249cb99fb101c7b89ae1cef79effd18db96b5fd8101205f2c367cdf SHA512 c29cd8d6b930deb93c89376dc11e7cef35f7c94ea5935d4e16ceadcd4eebc2c745f7cdf1a48dd8cf75261a3e1cc925781059322161d9d8330258485c9194e122 diff --git a/sys-power/RyzenAdj/RyzenAdj-0.13.0.ebuild b/sys-power/RyzenAdj/RyzenAdj-0.13.0.ebuild deleted file mode 100644 index 5e3b52b0a70b..000000000000 --- a/sys-power/RyzenAdj/RyzenAdj-0.13.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="The power management tool for mobile and desktop Ryzen APUs" -HOMEPAGE="https://github.com/FlyGoat/RyzenAdj" -SRC_URI="https://github.com/FlyGoat/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="amd64 x86" - -DEPEND="sys-apps/pciutils" -RDEPEND="${DEPEND}" -BDEPEND="" - -src_configure() { - CMAKE_BUILD_TYPE="Release" - cmake_src_configure -} - -src_install() { - dosbin "${BUILD_DIR}"/ryzenadj - - dolib.so "${BUILD_DIR}"/libryzenadj.so - - dodoc "${S}"/README.md -} diff --git a/sys-power/RyzenAdj/RyzenAdj-0.12.0.ebuild b/sys-power/RyzenAdj/RyzenAdj-0.16.0.ebuild index 1212e30f5521..565e80910604 100644 --- a/sys-power/RyzenAdj/RyzenAdj-0.12.0.ebuild +++ b/sys-power/RyzenAdj/RyzenAdj-0.16.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,11 +11,10 @@ SRC_URI="https://github.com/FlyGoat/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P LICENSE="LGPL-3" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" DEPEND="sys-apps/pciutils" RDEPEND="${DEPEND}" -BDEPEND="" src_configure() { CMAKE_BUILD_TYPE="Release" diff --git a/sys-power/acpi/Manifest b/sys-power/acpi/Manifest index dd484ac791e6..a2d12bfe784d 100644 --- a/sys-power/acpi/Manifest +++ b/sys-power/acpi/Manifest @@ -1,3 +1,5 @@ DIST acpi-1.7.tar.gz 100501 BLAKE2B 0e98ceef0cd51fe5616f8209e4967010fed6e4d198549196b8321dfada499fa3bc220cf0c64b9c9c6dbbcdf80d2fb1428ee3b98f9bd56ef59b508cb8c06039f0 SHA512 e6c96707d651eb20aa4a4c76f78891154d576ccdfaef08b5eff6094b90b62a0e97f6e35a4a996dcc3b5f0b57ee2c60542f41832039c6cbdf853ff3d022c1b609 +DIST acpi-1.8.tar.gz 106155 BLAKE2B 132ce716d98f70ba014c885441439cf2f93c69cb8f90159f2fc219efd8cb2d51d5179902d900524b9796d17ee70a3efd2e729d502fa5a01033871bdee08e76e0 SHA512 b1f8da4ece480a7bbeb04f214950c169970b7171ffa3531aec58d55bd6a1ca0de68587b35e7379a2fa643f8863617d82da2e70af70ad4b5a175d4d8f8312a3e6 EBUILD acpi-1.7-r1.ebuild 386 BLAKE2B aec6e3275e62e2ce161a3f231a84efcfd4464a4ac35b0fc6cc21944a68cf5adc3c8c46395572c124457fa8eb026bc5c58e44ba2cebd6a6233753587f2bc56b06 SHA512 38466a72d4fd8c99abb23aaf0b9af3cdf29a038ec1e6ee45aad788aa2355847e543d317b049a1687dc083d5f7d9d1399f7bbb14fabe3ece89bae7b46ec2994dc +EBUILD acpi-1.8.ebuild 388 BLAKE2B e9b51fd2f00bc2e2a28ae75b32938ac9a12fea0df844a5e520a96a9c9dafdc7b3eb06f97f3d3c1b577c59832e7176ad68e4364573ccc60c3bcede8566abb0340 SHA512 eabc0d5210574e691d4f12bca060d556ee7bc298b3c33a110bc92f8ba17d69b46d10bca6a61c458c311e72b28cafe412e16b4fcd469650be37070cd2bb3b7eea MISC metadata.xml 588 BLAKE2B 04c5f394f17594b1c154dbbbd6ac5fe9ae2509559c8986ccd71f6e12966a2eb0546596304db0fa87d2164d7e9da093bef58714e42057aa0a9654960b5eafdf3f SHA512 5644d0cd41d5a2369de45c843dec14de38e36b0d69c3ed84a6d8b44cc6a21a1a9b1c17dd109db2aabfd44f19d25e8818999cb9be7873ac630013562b28142c38 diff --git a/sys-power/acpi/acpi-1.8.ebuild b/sys-power/acpi/acpi-1.8.ebuild new file mode 100644 index 000000000000..aed29d95b0a4 --- /dev/null +++ b/sys-power/acpi/acpi-1.8.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Displays information about ACPI devices" +HOMEPAGE="https://sourceforge.net/projects/acpiclient/" +SRC_URI="https://downloads.sourceforge.net/acpiclient/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" + +src_install() { + default + einstalldocs +} diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest index e0f25705a1a9..b83c46b77215 100644 --- a/sys-power/apcupsd/Manifest +++ b/sys-power/apcupsd/Manifest @@ -1,3 +1,4 @@ +AUX apcupsd-3.14.14-lto.patch 874 BLAKE2B 687915f30422df22173d1bcd3040b148f3f9f0cfc7bf4f492056351a6dcdb7c680eb4de60c147a0bd73a1aebc2d2d746af3cfb3397a98375449cd5a355a8c087 SHA512 ec2ec1277918ca96b148daa259aae6441df64c203bf315d962ddc608bfbca10b19f3dbf0dc78f32b05d28a91230a71591990b479dd075f38f43895c802aa5cd5 AUX apcupsd-3.14.9-aliasing.patch 2108 BLAKE2B b6ce1e6e3e40b6d533a08d5fac633e7c3d81574b2b2fd9c442a10eac8e507abfa73ddf3dc74ac9fc4d8bbd9c7da3f7d9eb5194f6df959dbe792d5b103d88844c SHA512 48eb51385136216d1cdddb6b237b89a52c516b223aa7fe50fb35761cd595d9ab7f7fabbd0e4f8c0f7d45df6feed0a2e240d227181f3d772fc5fa9f8bfa62529f AUX apcupsd-3.14.9-close-on-exec.patch 1700 BLAKE2B 33bc681a008c98a6659a832359d3906bfe153db7cf3fbb0dbf442dc60e97c41dd0680eb5674592c835a28731f1fb361a20f2f5acae88f84142781153fba5ca66 SHA512 5f348efc11f35538fc9810d9026b2f8eeeadf5675ca1bf2275f704310a654266e5e79e393a59e6c25171a94f5d0b1d9e74b45a1511c4289242379f6f4e30888b AUX apcupsd-3.14.9-commfailure.patch 519 BLAKE2B 58763a637f44ad3e506b1f8da73027353d05bbcab6a3a108d39c4d189682a8185d89960e46eb760b7f5781115b266ff0c5ebb902a1307634faed0639c7b4ceb9 SHA512 856063b915ccd583abbef4347e01a8a5f71f7853efbfeb62d2edfee1acd14030e34373c420d5fdd58bc47ce03e79b55dd4a5ee6486c8dee984e8f272257af673 @@ -6,10 +7,9 @@ AUX apcupsd-3.14.9-gapcmon.patch 1213 BLAKE2B ecc9798a010cb60beb9bacd93b1223b2d8 AUX apcupsd-3.14.9-wall-on-mounted-usr.patch 815 BLAKE2B dcc4e89328b0d5afc8d33555cc5c9b9a5ea06e74d80ffc761506f0435b65b4174ce9e4873344e7a1838f3a11d69eb9f7286b189f0cc67e7c21ae66db1baa7aca SHA512 00a3a01f3afdb1755c65ebc9832778bd3a7bfeab115531a1282668ba5340fd081eeaa263264a6510722ac4726e5d84961089c6c0305d0a6f7d1cf9e4de80be00 AUX apcupsd-tmpfiles.conf 70 BLAKE2B 6bc5fdff60918a5ccb616e28cc3832053938accd47a75aa29c3e569808c59ee35d618f385022309ab8eb2f714b5d87d6c752547447d896b7537b30b8dfc262ed SHA512 c63242a06cc14242575c24a8aca4ea35a7150e6073425c8230e36c7117a1bc49dc659dbb0c455ddc454a0ac5ebd7faa5638fb70282c38ed5d1ca9ffab700ef05 AUX apcupsd-udev.rules 328 BLAKE2B be1a8ff2eb09c045137ab2f1e48d3caa5ea9df85f766da5f9ae04786895631503d986cb184c74fd92aa6c229d34fedeab0a61dc5cad4a8fba1a799ade3f01081 SHA512 ba2ebb9f28011548c845a81f17a328b98ec8d79c1e6be33aeab863d77b9d3aa61b4dfbd1bb89a0cae00465387dffe8cc223634a6e9a2f59170846d4bed9e7135 -AUX apcupsd.conf 12475 BLAKE2B c7695035887fa4fa867b2588f2ed0e2fee6c6a0086c221fec3019e3de639202287e9a35082334b8801cda38c846a0bcac714b046b1ddc1297f764bb211e42fb9 SHA512 1519d3cd47a2a73ff4148e4f74964ae841d37639616fe5b974b426983f5379db89b8793a6952389c443c56b84d0ef33f6995eccd920f71b4e5efc842a58a04e1 AUX apcupsd.init 804 BLAKE2B 7afd83a6be8b068133f6221cc2396a1fe4cab23f6dec68957b48ef7940730908e7a20e1597a21480eeffdb79314fd02505d4bafdd0b7a6bd1ff2b7c452f847ef SHA512 dd7fcc52b495c3f73bc9b2fe73bbb7c8fe3ec959ea733360d370148d617d98f34de3b48f1cb451f9a8356eb8088b06d3c736bd6cbad2bb5e9e609e37d5f2c53c -AUX apcupsd.powerfail.init 397 BLAKE2B 472512906536753d3054d275707764a98094c14866da63fbc8d2d62e16a9099fdce0b61cf572a4ba862f0be13e1ed3407821ed07ec90f9c77fb8d95f18aafc2f SHA512 cd0ed9d24a8371de7920bf0ce2e89bb63c0bee58da1ac782ed2b929068f95b2af47458529223a33ecea4e8f73ddfe3a7b9591af6f64828de7ed1d91e2edbb6e1 +AUX apcupsd.powerfail.init-r1 360 BLAKE2B 87015320928267dc48b1f3c31f588e0c99fac819238b41c2ed6161558d3d384501ca396a62c53b1f198c59b4a09b6ad0ffafd06fb13c7191841f968bc7ef4c40 SHA512 69a0221e5050e32e44ef5145ecd6c7ce113418f3f13a957be72954be396f898705643a2e81f38a9db6d835bc4dc2d2ff901519e75851963aaa8b8eb446da6f5f AUX apcupsd.service 111 BLAKE2B bf2ac8161af5b971642298c30b08ad78d289044bb2452bdef39b31119b60eceb0a14add7c00262132bb80dbf1964103242452cb8d9b815d6ec82c204100ea184 SHA512 011e3e52e7909f36fb73b6064277a69e5db41263cfc72bda07e326172396d5318cd2b050f1fb84c4cc6da7a247c0035c36c55322ffb234a1cfa7bf13ba492889 DIST apcupsd-3.14.14.tar.gz 1843409 BLAKE2B 48a3b249780064d699d86b658584aa222ce9f3b46a81209110b4684bf737cca7492b87b063154864ce76478f29f73cda83ab96b47f4a7aa7aa91e29a8abbf4a8 SHA512 c953bbf3e08f809748a7978a3952604176390d1cd276f187fe096d9bc3c8993b52127e8350c0363387da41318e24b4d1e00ea58df71f3bb8f50c9a5a64cd2d7f -EBUILD apcupsd-3.14.14-r3.ebuild 4343 BLAKE2B d2d3b03953b4e90df7d9cec95c8404742146971e31bed12b72b7613d596d0ee3a1bdf6c8d4fbb26b3a1115a31f0d0d544333663066d80ef3b47c6b6746b91f66 SHA512 96093ec3659cbd3809ae81cdbd75bfde0641bc3eca4dbf0f272779cab9c3b2bb18e05bcd67f69e7b3eeb0091f462bc4d0a5acc2d82411313503d3d9cd4dcb983 -MISC metadata.xml 1162 BLAKE2B ff0f026e800ae6f2985d46fdcc2f756e46706b3a1910a3032215996636de9839e0936c5ff88cc7d9e709caf2ad53c9d9b8beca73ca17b8bd4b408c039a0d5696 SHA512 aae2a1aaf01a2412d5e054f8ed93fafb912f8a4cf48d2790615746751091f412f9bf3e19c2d857506ba50ef2a312ad5eec7c2dac770eb0b1130e062af856ab36 +EBUILD apcupsd-3.14.14-r4.ebuild 4396 BLAKE2B 9c4c170cc4134d5e20e7ed5faad2ab1bc9ca9c178ceaa21b8ff785c8c50282db95c38185e83bd1e53634dc2029e8e33c36729e40f66d73bb217b4fe147e8c53e SHA512 299ab7d98a8e790aea6cc3b75ff0264e25ba691784e6831463d2a9f4221e9d04e6a33cd3c53c93755ea276592ec211d7d196024d87f91cbb14a9637ed874e0bf +MISC metadata.xml 1273 BLAKE2B 1df1dcddcde2814806465b73da094a12f782b5e5ff5368b5b57dfdc290ecc68e817561296e3799d047cd1071656a408b068baf11eb5dc9c9153b5418d0f6ca59 SHA512 297eceae5e520df991f9be3cc8f58436d1b92ce46643fbc46bcc8457931f3fd67cac036e4d7a0e1fa42cbf1705c553596ed9de88b074ee265e152f59b7c6b328 diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r4.ebuild index 2f2835921c9c..e524435a49b8 100644 --- a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild +++ b/sys-power/apcupsd/apcupsd-3.14.14-r4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 inherit linux-info systemd udev tmpfiles @@ -12,24 +12,27 @@ SRC_URI="https://downloads.sourceforge.net/apcupsd/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~arm ~arm64 ppc ~riscv x86" -IUSE="selinux snmp +usb +modbus cgi" - -DEPEND=">=sys-apps/util-linux-2.23[tty-helpers(-)] - cgi? ( >=media-libs/gd-1.8.4 ) - modbus? ( usb? ( virtual/libusb:0 ) ) - snmp? ( >=net-analyzer/net-snmp-5.7.2 )" - -RDEPEND="${DEPEND} +IUSE="cgi +modbus selinux snmp +usb" + +DEPEND=" + sys-apps/util-linux[tty-helpers] + cgi? ( media-libs/gd:2= ) + modbus? ( + usb? ( virtual/libusb:0= ) + ) + snmp? ( net-analyzer/net-snmp ) +" + +RDEPEND=" virtual/mailx - selinux? ( sec-policy/selinux-apcupsd )" + selinux? ( sec-policy/selinux-apcupsd ) + ${DEPEND} +" CONFIG_CHECK="~USB_HIDDEV ~HIDRAW" ERROR_USB_HIDDEV="CONFIG_USB_HIDDEV: needed to access USB-attached UPSes" ERROR_HIDRAW="CONFIG_HIDRAW: needed to access USB-attached UPSes" -DOCS=( ChangeLog ReleaseNotes ) -HTML_DOCS=( doc/manual ) - PATCHES=( "${FILESDIR}"/${PN}-3.14.9-aliasing.patch "${FILESDIR}"/${PN}-3.14.9-close-on-exec.patch @@ -37,6 +40,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.14.9-fix-nologin.patch "${FILESDIR}"/${PN}-3.14.9-gapcmon.patch "${FILESDIR}"/${PN}-3.14.9-wall-on-mounted-usr.patch + "${FILESDIR}"/${PN}-3.14.14-lto.patch ) pkg_setup() { @@ -45,66 +49,71 @@ pkg_setup() { fi } -src_configure() { - local myconf - - use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=/usr/libexec/${PN}/cgi-bin" - - if use usb ; then - myconf="${myconf} --with-upstype=usb --with-upscable=usb --enable-usb --with-dev=" - use modbus && myconf="${myconf} --enable-modbus-usb" - else - myconf="${myconf} --with-upstype=apcsmart --with-upscable=smart --disable-usb" - use modbus || myconf="${myconf} --disable-modbus" - fi +src_prepare() { + default + # skip this specific doc step as produced files never installed + # this avoids calling the col command not available on musl based system. + sed -i "/^SUBDIRS/ s/doc//g" Makefile || die +} +src_configure() { # We force the DISTNAME to gentoo so it will use gentoo's layout also # when installed on non-linux systems. - econf \ - --sbindir=/sbin \ - --sysconfdir=/etc/apcupsd \ - --with-pwrfail-dir=/etc/apcupsd \ - --with-lock-dir=/run/apcupsd \ - --with-pid-dir=/run/apcupsd \ - --with-log-dir=/var/log \ - --with-nis-port=3551 \ - --enable-net --enable-pcnet \ - --with-distname=gentoo \ - $(use_enable snmp) \ - --disable-gapcmon \ - ${myconf} \ - APCUPSD_MAIL=$(type -p mail) + local myeconfargs + myeconfargs=( + APCUPSD_MAIL="$(type -p mail)" + --disable-gapcmon + --enable-net + --enable-pcnet + --sbindir="/sbin" + --sysconfdir="${EPREFIX}/etc/apcupsd" + --with-distname="gentoo" + --with-pwrfail-dir="${EPREFIX}/etc/apcupsd" + --with-lock-dir="${EPREFIX}/run/apcupsd" + --with-log-dir="${EPREFIX}/var/log" + --with-nisip="127.0.0.1" + --with-nis-port="3551" + --with-pid-dir="${EPREFIX}/run/apcupsd" + --with-upscable="$(usex usb usb smart)" + --with-upstype="$(usex usb usb apcsmart)" + $(use_enable cgi) + $(use_enable modbus) + $(use_enable snmp) + $(use_enable usb) + $(use_with cgi cgi-bin "${EPREFIX}/usr/libexec/${PN}/cgi-bin") + $(usex modbus $(use_enable usb modbus-usb) "--disable-modbus-usb") + $(usex usb "--without-serial-dev" "--with-serial-dev=/dev/ttyS0") + $(usex usb "--with-dev=" "--with-dev=/dev/ttyS0") + ) + + econf "${myeconfargs[@]}" } src_compile() { - # Workaround for bug #280674; upstream should really just provide - # the text files in the distribution, but I wouldn't count on them - # doing that anytime soon. - MANPAGER=$(type -p cat) \ - emake VERBOSE=2 + emake VERBOSE="2" } src_install() { - emake DESTDIR="${D}" VERBOSE=2 install + emake DESTDIR="${D}" VERBOSE="2" install + + rm "${ED}"/etc/init.d/apcupsd || die rm "${ED}"/etc/init.d/halt || die + rm -r "${ED}"/usr/share/hal || die insinto /etc/apcupsd newins examples/safe.apccontrol safe.apccontrol - doins "${FILESDIR}"/apcupsd.conf doman doc/*.8 doc/*.5 + docinto html + dodoc -r doc/manual/. einstalldocs - rm "${ED}"/etc/init.d/apcupsd || die - newinitd "${FILESDIR}/${PN}.init" "${PN}" - newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail - - systemd_dounit "${FILESDIR}"/${PN}.service - dotmpfiles "${FILESDIR}"/${PN}-tmpfiles.conf + newinitd "${FILESDIR}"/apcupsd.init apcupsd + newinitd "${FILESDIR}"/apcupsd.powerfail.init-r1 apcupsd.powerfail - # remove hal settings, we don't really want to have it still around. - rm -r "${D}"/usr/share/hal || die + systemd_dounit "${FILESDIR}"/apcupsd.service + dotmpfiles "${FILESDIR}"/apcupsd-tmpfiles.conf # replace it with our udev rules if we're in Linux if use kernel_linux ; then diff --git a/sys-power/apcupsd/files/apcupsd-3.14.14-lto.patch b/sys-power/apcupsd/files/apcupsd-3.14.14-lto.patch new file mode 100644 index 000000000000..54ad76b61a35 --- /dev/null +++ b/sys-power/apcupsd/files/apcupsd-3.14.14-lto.patch @@ -0,0 +1,29 @@ +Fix extern symbol declarations to be consistent with the definition. + +Bug: https://bugs.gentoo.org/941584 +Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com> + +diff -rup a/src/apcupsd.c a/src/apcupsd.c +--- a/src/apcupsd.c ++++ b/src/apcupsd.c +@@ -31,7 +31,7 @@ static void daemon_start(void); + int pidcreated = 0; + extern int kill_on_powerfail; + extern FILE *trace_fd; +-extern char *pidfile; ++extern const char *pidfile; + + /* + * The terminate function and trapping signals allows apcupsd +diff -rup a/src/options.c b/src/options.c +--- a/src/options.c ++++ b/src/options.c +@@ -62,7 +62,7 @@ int terminate_on_powerfail = FALSE; + int kill_on_powerfail = FALSE; + int dumb_mode_test = FALSE; /* for testing dumb mode */ + int go_background = TRUE; +-extern char *pidfile; ++extern const char *pidfile; + extern bool trace; + + static void print_usage(char *argv[]) diff --git a/sys-power/apcupsd/files/apcupsd.conf b/sys-power/apcupsd/files/apcupsd.conf deleted file mode 100644 index 83201f3c2b14..000000000000 --- a/sys-power/apcupsd/files/apcupsd.conf +++ /dev/null @@ -1,329 +0,0 @@ -## apcupsd.conf v1.1 ## -# -# for apcupsd release 3.14.10 (13 September 2011) - gentoo -# -# "apcupsd" POSIX config file - -# -# ========= General configuration parameters ============ -# - -# UPSNAME xxx -# Use this to give your UPS a name in log files and such. This -# is particulary useful if you have multiple UPSes. This does not -# set the EEPROM. It should be 8 characters or less. -#UPSNAME - -# UPSCABLE <cable> -# Defines the type of cable connecting the UPS to your computer. -# -# Possible generic choices for <cable> are: -# simple, smart, ether, usb -# -# Or a specific cable model number may be used: -# 940-0119A, 940-0127A, 940-0128A, 940-0020B, -# 940-0020C, 940-0023A, 940-0024B, 940-0024C, -# 940-1524C, 940-0024G, 940-0095A, 940-0095B, -# 940-0095C, M-04-02-2000 -# -UPSCABLE usb - -# To get apcupsd to work, in addition to defining the cable -# above, you must also define a UPSTYPE, which corresponds to -# the type of UPS you have (see the Description for more details). -# You must also specify a DEVICE, sometimes referred to as a port. -# For USB UPSes, please leave the DEVICE directive blank. For -# other UPS types, you must specify an appropriate port or address. -# -# UPSTYPE DEVICE Description -# apcsmart /dev/tty** Newer serial character device, appropriate for -# SmartUPS models using a serial cable (not USB). -# -# usb <BLANK> Most new UPSes are USB. A blank DEVICE -# setting enables autodetection, which is -# the best choice for most installations. -# -# net hostname:port Network link to a master apcupsd through apcupsd's -# Network Information Server. This is used if the -# UPS powering your computer is connected to a -# different computer for monitoring. -# -# snmp hostname:port:vendor:community -# SNMP network link to an SNMP-enabled UPS device. -# Hostname is the ip address or hostname of the UPS -# on the network. Vendor can be can be "APC" or -# "APC_NOTRAP". "APC_NOTRAP" will disable SNMP trap -# catching; you usually want "APC". Port is usually -# 161. Community is usually "private". -# -# netsnmp hostname:port:vendor:community -# OBSOLETE -# Same as SNMP above but requires use of the -# net-snmp library. Unless you have a specific need -# for this old driver, you should use 'snmp' instead. -# -# dumb /dev/tty** Old serial character device for use with -# simple-signaling UPSes. -# -# pcnet ipaddr:username:passphrase:port -# PowerChute Network Shutdown protocol which can be -# used as an alternative to SNMP with the AP9617 -# family of smart slot cards. ipaddr is the IP -# address of the UPS management card. username and -# passphrase are the credentials for which the card -# has been configured. port is the port number on -# which to listen for messages from the UPS, normally -# 3052. If this parameter is empty or missing, the -# default of 3052 will be used. -# -UPSTYPE usb -DEVICE - -# POLLTIME <int> -# Interval (in seconds) at which apcupsd polls the UPS for status. This -# setting applies both to directly-attached UPSes (UPSTYPE apcsmart, usb, -# dumb) and networked UPSes (UPSTYPE net, snmp). Lowering this setting -# will improve apcupsd's responsiveness to certain events at the cost of -# higher CPU utilization. The default of 60 is appropriate for most -# situations. -POLLTIME 30 - -# LOCKFILE <path to lockfile> -# Path for device lock file. Not used on Win32. -LOCKFILE /run/apcupsd - -# SCRIPTDIR <path to script directory> -# Directory in which apccontrol and event scripts are located. -SCRIPTDIR /etc/apcupsd - -# PWRFAILDIR <path to powerfail directory> -# Directory in which to write the powerfail flag file. This file -# is created when apcupsd initiates a system shutdown and is -# checked in the OS halt scripts to determine if a killpower -# (turning off UPS output power) is required. -PWRFAILDIR /etc/apcupsd - -# NOLOGINDIR <path to nologin directory> -# Directory in which to write the nologin file. The existence -# of this flag file tells the OS to disallow new logins. -NOLOGINDIR /etc - - -# -# ======== Configuration parameters used during power failures ========== -# - -# The ONBATTERYDELAY is the time in seconds from when a power failure -# is detected until we react to it with an onbattery event. -# -# This means that, apccontrol will be called with the powerout argument -# immediately when a power failure is detected. However, the -# onbattery argument is passed to apccontrol only after the -# ONBATTERYDELAY time. If you don't want to be annoyed by short -# powerfailures, make sure that apccontrol powerout does nothing -# i.e. comment out the wall. -ONBATTERYDELAY 10 - -# -# Note: BATTERYLEVEL, MINUTES, and TIMEOUT work in conjunction, so -# the first that occurs will cause the initation of a shutdown. -# - -# If during a power failure, the remaining battery percentage -# (as reported by the UPS) is below or equal to BATTERYLEVEL, -# apcupsd will initiate a system shutdown. -BATTERYLEVEL 0 - -# If during a power failure, the remaining runtime in minutes -# (as calculated internally by the UPS) is below or equal to MINUTES, -# apcupsd, will initiate a system shutdown. -MINUTES 0 - -# If during a power failure, the UPS has run on batteries for TIMEOUT -# many seconds or longer, apcupsd will initiate a system shutdown. -# A value of 0 disables this timer. -# -# Note, if you have a Smart UPS, you will most likely want to disable -# this timer by setting it to zero. That way, you UPS will continue -# on batteries until either the % charge remaing drops to or below BATTERYLEVEL, -# or the remaining battery runtime drops to or below MINUTES. Of course, -# if you are testing, setting this to 60 causes a quick system shutdown -# if you pull the power plug. -# If you have an older dumb UPS, you will want to set this to less than -# the time you know you can run on batteries. -TIMEOUT 0 - -# Time in seconds between annoying users to signoff prior to -# system shutdown. 0 disables. -ANNOY 45 - -# Initial delay after power failure before warning users to get -# off the system. -ANNOYDELAY 90 - -# The condition which determines when users are prevented from -# logging in during a power failure. -# NOLOGON <string> [ disable | timeout | percent | minutes | always ] -NOLOGON disable - -# If KILLDELAY is non-zero, apcupsd will continue running after a -# shutdown has been requested, and after the specified time in -# seconds attempt to kill the power. This is for use on systems -# where apcupsd cannot regain control after a shutdown. -# KILLDELAY <seconds> 0 disables -KILLDELAY 0 - -# -# ==== Configuration statements for Network Information Server ==== -# - -# NETSERVER [ on | off ] on enables, off disables the network -# information server. If netstatus is on, a network information -# server process will be started for serving the STATUS and -# EVENT data over the network (used by CGI programs). -NETSERVER on - -# NISIP <dotted notation ip address> -# IP address on which NIS server will listen for incoming connections. -# This is useful if your server is multi-homed (has more than one -# network interface and IP address). Default value is 0.0.0.0 which -# means any incoming request will be serviced. Alternatively, you can -# configure this setting to any specific IP address of your server and -# NIS will listen for connections only on that interface. Use the -# loopback address (127.0.0.1) to accept connections only from the -# local machine. -NISIP 127.0.0.1 - -# NISPORT <port> default is 3551 as registered with the IANA -# port to use for sending STATUS and EVENTS data over the network. -# It is not used unless NETSERVER is on. If you change this port, -# you will need to change the corresponding value in the cgi directory -# and rebuild the cgi programs. -NISPORT 3551 - -# If you want the last few EVENTS to be available over the network -# by the network information server, you must define an EVENTSFILE. -EVENTSFILE /var/log/apcupsd.events - -# EVENTSFILEMAX <kilobytes> -# By default, the size of the EVENTSFILE will be not be allowed to exceed -# 10 kilobytes. When the file grows beyond this limit, older EVENTS will -# be removed from the beginning of the file (first in first out). The -# parameter EVENTSFILEMAX can be set to a different kilobyte value, or set -# to zero to allow the EVENTSFILE to grow without limit. -EVENTSFILEMAX 25 - -# -# ========== Configuration statements used if sharing ============= -# a UPS with more than one machine - -# -# Remaining items are for ShareUPS (APC expansion card) ONLY -# - -# UPSCLASS [ standalone | shareslave | sharemaster ] -# Normally standalone unless you share a UPS using an APC ShareUPS -# card. -UPSCLASS standalone - -# UPSMODE [ disable | share ] -# Normally disable unless you share a UPS using an APC ShareUPS card. -UPSMODE disable - -# -# ===== Configuration statements to control apcupsd system logging ======== -# - -# Time interval in seconds between writing the STATUS file; 0 disables -STATTIME 0 - -# Location of STATUS file (written to only if STATTIME is non-zero) -STATFILE /var/log/apcupsd.status - -# LOGSTATS [ on | off ] on enables, off disables -# Note! This generates a lot of output, so if -# you turn this on, be sure that the -# file defined in syslog.conf for LOG_NOTICE is a named pipe. -# You probably do not want this on. -LOGSTATS off - -# Time interval in seconds between writing the DATA records to -# the log file. 0 disables. -DATATIME 0 - -# FACILITY defines the logging facility (class) for logging to syslog. -# If not specified, it defaults to "daemon". This is useful -# if you want to separate the data logged by apcupsd from other -# programs. -#FACILITY DAEMON - -# -# ========== Configuration statements used in updating the UPS EPROM ========= -# - -# -# These statements are used only by apctest when choosing "Set EEPROM with conf -# file values" from the EEPROM menu. THESE STATEMENTS HAVE NO EFFECT ON APCUPSD. -# - -# UPS name, max 8 characters -#UPSNAME UPS_IDEN - -# Battery date - 8 characters -#BATTDATE mm/dd/yy - -# Sensitivity to line voltage quality (H cause faster transfer to batteries) -# SENSITIVITY H M L (default = H) -#SENSITIVITY H - -# UPS delay after power return (seconds) -# WAKEUP 000 060 180 300 (default = 0) -#WAKEUP 60 - -# UPS Grace period after request to power off (seconds) -# SLEEP 020 180 300 600 (default = 20) -#SLEEP 180 - -# Low line voltage causing transfer to batteries -# The permitted values depend on your model as defined by last letter -# of FIRMWARE or APCMODEL. Some representative values are: -# D 106 103 100 097 -# M 177 172 168 182 -# A 092 090 088 086 -# I 208 204 200 196 (default = 0 => not valid) -#LOTRANSFER 208 - -# High line voltage causing transfer to batteries -# The permitted values depend on your model as defined by last letter -# of FIRMWARE or APCMODEL. Some representative values are: -# D 127 130 133 136 -# M 229 234 239 224 -# A 108 110 112 114 -# I 253 257 261 265 (default = 0 => not valid) -#HITRANSFER 253 - -# Battery charge needed to restore power -# RETURNCHARGE 00 15 50 90 (default = 15) -#RETURNCHARGE 15 - -# Alarm delay -# 0 = zero delay after pwr fail, T = power fail + 30 sec, L = low battery, N = never -# BEEPSTATE 0 T L N (default = 0) -#BEEPSTATE T - -# Low battery warning delay in minutes -# LOWBATT 02 05 07 10 (default = 02) -#LOWBATT 2 - -# UPS Output voltage when running on batteries -# The permitted values depend on your model as defined by last letter -# of FIRMWARE or APCMODEL. Some representative values are: -# D 115 -# M 208 -# A 100 -# I 230 240 220 225 (default = 0 => not valid) -#OUTPUTVOLTS 230 - -# Self test interval in hours 336=2 weeks, 168=1 week, ON=at power on -# SELFTEST 336 168 ON OFF (default = 336) -#SELFTEST 336 diff --git a/sys-power/apcupsd/files/apcupsd.powerfail.init b/sys-power/apcupsd/files/apcupsd.powerfail.init-r1 index be591f86c185..d582d9eb5b3a 100644 --- a/sys-power/apcupsd/files/apcupsd.powerfail.init +++ b/sys-power/apcupsd/files/apcupsd.powerfail.init-r1 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 2009 Gentoo Foundation +# Copyright 2009-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 description='Signal the UPS to kill power in a power failure condition' @@ -9,7 +9,7 @@ depend() { } start() { - if [ "$(runlevel | cut -d' ' -f2)" = "0" -a -f /etc/apcupsd/powerfail ] ; then + if [ -f /etc/apcupsd/powerfail ] ; then ebegin 'Signaling UPS to kill power' /sbin/apcupsd --killpower eend $? diff --git a/sys-power/apcupsd/metadata.xml b/sys-power/apcupsd/metadata.xml index d64a3eaece13..e37ee3898b20 100644 --- a/sys-power/apcupsd/metadata.xml +++ b/sys-power/apcupsd/metadata.xml @@ -5,6 +5,10 @@ <email>john.einar@gmail.com</email> <name>John Einar Reitan</name> </maintainer> + <maintainer type="person"> + <email>conikost@gentoo.org</email> + <name>Conrad Kostecki</name> + </maintainer> <maintainer type="project"> <email>base-system@gentoo.org</email> <name>Gentoo Base System</name> diff --git a/sys-power/iasl/Manifest b/sys-power/iasl/Manifest index 2cb5e0820a07..2a19e20dfe87 100644 --- a/sys-power/iasl/Manifest +++ b/sys-power/iasl/Manifest @@ -1,5 +1,10 @@ AUX iasl-20200326-Makefile.patch 2227 BLAKE2B eaf6d7cb51f65f430d207cea7c54c2f5489dd3dc3fd2930035af37576cf2c22b237c229a6bfe2f5ffa5c76c3bd8c4b138d360c4c0beba7f2558f1efabf577afa SHA512 07be0ba4034d3b3c19b7e29e66ec41b433c32bc077622db89520b89f52f44ad8069a4c50a9da6579eec130672b5187e0217e6dacc3b0c638b1d9ba54d83f91b3 +AUX iasl-20241212-Makefile-fixes.patch 2353 BLAKE2B 4b5b35072adbfc97e5b62d274eca95356b300f5d37fab08cda3a79aa715ef4597ae1935c869383674c7c3d4e087318a9c1a24b4177a0526f6cde3482f524f420 SHA512 a41c05608abd46002197b450ce60d8ef608bbdfb9a79cca13a373cb25353f0b2785d3221a11484b958634d607ca5e46130b94b699b0e5ed83b316eb1610341a3 +AUX iasl-20241212-Makefile-verbose.patch 4798 BLAKE2B 90d5cdbab63f2b92f67ea3c27fa7a932a108ee1d6804d102fa5d1fb0b15b367bc2ef4756a5ff57e14273c06320dd12ef2ebae7a07d6fe28b7f7476b3082a836f SHA512 bbdcda4b1167b5c3e1cdc8cc17300cfc580ea9f70188423f08534d089608c9eb4e27ee5cf3843a36399c299deda3d5b8fc0f7bf12f473334cfff2f54c307124f DIST acpica-unix-20200717.tar.gz 1847795 BLAKE2B 84af34884bbea39aed9ea7ec86f20a27f3dd10fa68456b5f12de2bdecf9f205c43b4b4e5dcfb55325571a5682794cdc2e0c5a83c646036a15cc90f81223aefff SHA512 16de55b97a3b478dd2dd44fcbe51b871c7cc6174d337939b873bcbc871bee10487a796aa86abaa7b54ff6b75279cdbf9ec48e19f6baaea4290daf1ad56bdbc46 +DIST acpica-unix-20241212.tar.gz 1952563 BLAKE2B 325ed37b858f2d88d4fadf54d4a45eac9f0edef183152e02328fdba25c880226e9d254a56441bc24e018cbab595582f2b1f9d69101aee38b9eaa5972fc4b5379 SHA512 daa4243f927451ac18c337cf17c27849e68329b3f7eb25b8c3379fda9c6a484201b73d4ffccab89a0ae22cc5e432f141ba149015a003834b0515bdb3d4efe0a8 DIST acpitests-unix-20200717.tar.gz 2212717 BLAKE2B 939e8022c5ecb7c5e862767f89c0b0de6146e23014dc0100d7dee0f3502e7adcbba72a468c828f804317e75d3a80ba5864c5497a7695f70be0bc1e3dcc69b4e6 SHA512 02c6674cbb2d98f783f25c71b1f391713de6fb3b56e5b57de9a7ccba0927453be4db8aea513e6e7ad491fcf3a0b2c14fefe8a2b82877a2ae01ea1d7832d36844 +DIST acpitests-unix-20241212.tar.gz 2006353 BLAKE2B bab6e3ac4ee8d6822f854557c0af32f02e16d5b7efe513ed22a8e5f9beb9ea6012dc7be7d55c8a647a21d6946925018475ca7c77fbf50814b2503c2bc92f7b76 SHA512 9c9b0ccd116ef0cbb51bc0b365f80e42dddd474f5e43cac2362974b0d8539ce609fd7f3c25bd1182c322f929cb55647e24a8faef8d321e6e7f078adad60fd3b6 EBUILD iasl-20200717.ebuild 3425 BLAKE2B d6d6eb5b956861b9690a3958d15a70ff81784faa7651da91fe39ba3489d88580d3641c3dda6360b704cc1298ef40318065fa6dbafdc13d2c5baf98b5b324189c SHA512 f8344028abf52e1e89627e873ec10425475cf8a2c041453f2f9ac15547f64637802472907016a82a84e31c67a48842236e7b95268686aa62ac5ec0b9f4f8fef5 -MISC metadata.xml 219 BLAKE2B a270ed4d40f32df54032c9bffe34e24cb5c1db00d0084b1c8275595f3fffc3c0fa5518dfcde32b2f8d4b9b0fea636c60679a99bb2636cefc5c7ddf32b5f94a1c SHA512 7bb667bc481064e5afe1856084f0b8bcbcad41a8805d31d29ef5c698598ac615aa11872029ebdbb1eea70e80f2268162f69f0ea6d9b56a4ca5bb76e3d9c8918d +EBUILD iasl-20241212.ebuild 3094 BLAKE2B 7967e0c6342b10ceb3476aaf93315a738594406061bed1aff9133899f7fbd294acb8617ced12311d2fd3b463ef9950c91cb8f65c6a870c80ed0332e1d2334f03 SHA512 6b5a4d4208f051f3a506bdbd643c405b6c84c5877c827313964a3e5f6e40ba67bf8500dfa8c7afe72bcf8a472d0d9ef1f553177a2cb99b01d2370e21114f4def +MISC metadata.xml 755 BLAKE2B 76c59455c0c9978b7bc2a16369e96af627559f1205163a516aa1295ccac21c82f637f453b8bf3b036731cdbade078f82694960ecf7af877025fd4fb07db243c3 SHA512 5bef5c23a7507d0c606e4786b2b12821e843c5d5d3b5635a582aca6b169466524840caee77d60a45dba0eeafcf12a990a55639816894e74f4ea8fbdb4b26cb38 diff --git a/sys-power/iasl/files/iasl-20241212-Makefile-fixes.patch b/sys-power/iasl/files/iasl-20241212-Makefile-fixes.patch new file mode 100644 index 000000000000..ad1a6d62ddc8 --- /dev/null +++ b/sys-power/iasl/files/iasl-20241212-Makefile-fixes.patch @@ -0,0 +1,93 @@ +From 58e46dacfd83a7d33c8922fcb2ea110f37bee62f Mon Sep 17 00:00:00 2001 +From: "Evgeny Grin (Karlson2k)" <k2k@drgrin.dev> +Date: Thu, 30 Jan 2025 11:25:24 +0100 +Subject: [PATCH 1/2] Makefile fixes for Gentoo + +Based on David Seifert patch seen as dadf5340788610052aeb2f4c5232fb744a8bd9f5 +in Gentoo repo git + +Signed-off-by: Evgeny Grin (Karlson2k) <k2k@drgrin.dev> +--- + generate/unix/Makefile.config | 25 ++++++------------------- + generate/unix/acpiexec/Makefile | 4 ++-- + 2 files changed, 8 insertions(+), 21 deletions(-) + +diff --git a/generate/unix/Makefile.config b/generate/unix/Makefile.config +index ae80ccf2e..8e985c691 100644 +--- a/generate/unix/Makefile.config ++++ b/generate/unix/Makefile.config +@@ -42,8 +42,8 @@ CC ?= gcc + # + OBJDIR = obj + BINDIR = bin +-COMPILEOBJ = $(CC) -c $(CFLAGS) $(OPT_CFLAGS) -o $@ $< +-LINKPROG = $(CC) $(OBJECTS) -o $(PROG) $(LDFLAGS) $(OPT_LDFLAGS) ++COMPILEOBJ = $(CC) -c $(CFLAGS) $(CPPFLAGS) $(OPT_CFLAGS) -o $@ $< ++LINKPROG = $(CC) $(LDFLAGS) $(OPT_LDFLAGS) $(OBJECTS) -o $(PROG) $(LIBS) + PREFIX ?= /usr + INSTALLDIR = $(PREFIX)/bin + UNAME_S := $(shell uname -s) +@@ -75,19 +75,16 @@ ifeq ($(UNAME_S), Haiku) + ACPI_HOST = _HAIKU + endif + ++ifeq ($(UNAME_S), Linux) ++ACPI_HOST = _LINUX ++endif ++ + ifeq ($(ACPI_HOST), _APPLE) + INSTALL = cp + INSTALLFLAGS ?= -f + else + INSTALL = install +- +-# Do not strip debug info when in debug mode +-ifeq ($(DEBUG),TRUE) + INSTALLFLAGS ?= -m 555 +-else +-INSTALLFLAGS ?= -m 555 -s +-endif +- + endif + + INSTALLPROG = \ +@@ -174,16 +171,6 @@ CFLAGS +=-m32 + LDFLAGS +=-m32 + endif + +-# +-# Optionally disable optimizations. Optimization causes problems on +-# some compilers such as gcc 4.4 +-# +-ifneq ($(NOOPT),TRUE) +-OPT_CFLAGS += -O2 +-else +-OPT_CFLAGS += -O0 +-endif +- + # + # Optionally disable fortify source. This option can cause + # compile errors in toolchains where it is already defined. +diff --git a/generate/unix/acpiexec/Makefile b/generate/unix/acpiexec/Makefile +index 9e5852614..411178cf6 100644 +--- a/generate/unix/acpiexec/Makefile ++++ b/generate/unix/acpiexec/Makefile +@@ -257,13 +257,13 @@ CFLAGS += \ + endif + + ifneq ($(ACPI_HOST),_QNX) +-LDFLAGS += -lpthread ++LIBS += -lpthread + endif + + ifneq ($(ACPI_HOST),_APPLE) + ifneq ($(ACPI_HOST),_QNX) + ifneq ($(ACPI_HOST),_HAIKU) +-LDFLAGS += -lrt ++LIBS += -lrt + endif + endif + endif +-- +2.45.2.windows.1 + diff --git a/sys-power/iasl/files/iasl-20241212-Makefile-verbose.patch b/sys-power/iasl/files/iasl-20241212-Makefile-verbose.patch new file mode 100644 index 000000000000..c833bf8f42f6 --- /dev/null +++ b/sys-power/iasl/files/iasl-20241212-Makefile-verbose.patch @@ -0,0 +1,129 @@ +From 9b18ed925e1e33e5b45ae79b5f47deec78ea111d Mon Sep 17 00:00:00 2001 +From: "Evgeny Grin (Karlson2k)" <k2k@drgrin.dev> +Date: Thu, 30 Jan 2025 11:25:24 +0100 +Subject: [PATCH 2/2] Verbose make output + +--- + generate/unix/Makefile.rules | 4 ++-- + generate/unix/iasl/Makefile | 34 +++++++++++++++++----------------- + 2 files changed, 19 insertions(+), 19 deletions(-) + +diff --git a/generate/unix/Makefile.rules b/generate/unix/Makefile.rules +index f2a16be4d..838252719 100644 +--- a/generate/unix/Makefile.rules ++++ b/generate/unix/Makefile.rules +@@ -12,12 +12,12 @@ $(FINAL_PROG) : $(PROG) + + $(PROG) : $(INTERMEDIATES) $(MISC) $(OBJECTS) + @echo "- Link" $(PROG) +- @$(LINKPROG) ++ $(LINKPROG) + $(RENAMEPROG) + + $(OBJDIR)/%.o : %.c $(HEADERS) $(ACPICA_HEADERS) + @echo $(PROG) $< +- @$(COMPILEOBJ) ++ $(COMPILEOBJ) + + clean : + @rm -f $(PROG) $(PROG).exe $(OBJECTS) $(OBJDIR)/*.o $(INTERMEDIATES) $(MISC) +diff --git a/generate/unix/iasl/Makefile b/generate/unix/iasl/Makefile +index 8fde63d46..271c7a704 100644 +--- a/generate/unix/iasl/Makefile ++++ b/generate/unix/iasl/Makefile +@@ -322,42 +322,42 @@ safe_yacc = \ + # + $(OBJDIR)/aslcompiler.y : $(ASL_PARSER) + @echo "- " $(MACROPROC) " Preprocess main iASL parser" +- @$(MACROPROC) $(MFLAGS) $(ASL_COMPILER)/aslparser.y > $@ ++ $(MACROPROC) $(MFLAGS) $(ASL_COMPILER)/aslparser.y > $@ + + # + # Parser and Lexer - intermediate C files + # + $(OBJDIR)/aslcompilerlex.c : $(ASL_LEXER) + @echo "- " $(LEX) " "$< +- @$(LEX) $(LFLAGS) -PAslCompiler -o$@ $(ASL_COMPILER)/aslcompiler.l ++ $(LEX) $(LFLAGS) -PAslCompiler -o$@ $(ASL_COMPILER)/aslcompiler.l + + $(OBJDIR)/aslcompilerparse.c $(OBJDIR)/aslcompiler.y.h : $(OBJDIR)/aslcompiler.y + @echo "- " $(YACC) " "$< +- @$(call safe_yacc,AslCompiler,$<,$@) ++ $(call safe_yacc,AslCompiler,$<,$@) + + $(OBJDIR)/dtcompilerparserlex.c : $(ASL_COMPILER)/dtcompilerparser.l $(OBJDIR)/dtcompilerparser.y.h + @echo "- " $(LEX) " "$< +- @$(LEX) $(DLFLAGS) -PDtCompilerParser -o$@ $< ++ $(LEX) $(DLFLAGS) -PDtCompilerParser -o$@ $< + + $(OBJDIR)/dtcompilerparserparse.c $(OBJDIR)/dtcompilerparser.y.h : $(ASL_COMPILER)/dtcompilerparser.y + @echo "- " $(YACC) " "$< +- @$(call safe_yacc,DtCompilerParser,$<,$@) ++ $(call safe_yacc,DtCompilerParser,$<,$@) + + $(OBJDIR)/dtparserlex.c : $(ASL_COMPILER)/dtparser.l $(OBJDIR)/dtparser.y.h + @echo "- " $(LEX) " "$< +- @$(LEX) $(DLFLAGS) -PDtParser -o$@ $< ++ $(LEX) $(DLFLAGS) -PDtParser -o$@ $< + + $(OBJDIR)/dtparserparse.c $(OBJDIR)/dtparser.y.h : $(ASL_COMPILER)/dtparser.y + @echo "- " $(YACC) " "$< +- @$(call safe_yacc,DtParser,$<,$@) ++ $(call safe_yacc,DtParser,$<,$@) + + $(OBJDIR)/prparserlex.c : $(ASL_COMPILER)/prparser.l $(OBJDIR)/prparser.y.h + @echo "- " $(LEX) " "$< +- @$(LEX) $(LFLAGS) -PPrParser -o$@ $< ++ $(LEX) $(LFLAGS) -PPrParser -o$@ $< + + $(OBJDIR)/prparserparse.c $(OBJDIR)/prparser.y.h : $(ASL_COMPILER)/prparser.y + @echo "- " $(YACC) " "$< +- @$(call safe_yacc,PrParser,$<,$@) ++ $(call safe_yacc,PrParser,$<,$@) + + # + # Parsers and Lexers - final object files +@@ -367,32 +367,32 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prparser.y.h : $(ASL_COMPILER)/prparse + # + $(OBJDIR)/aslcompilerlex.o : $(OBJDIR)/aslcompilerlex.c + @echo "- " "Intermediate" $< +- @$(CC) -c $(CFLAGS) -Wall $(WERROR_FLAGS) -o$@ $< ++ $(CC) -c $(CFLAGS) -Wall $(WERROR_FLAGS) -o$@ $< + + $(OBJDIR)/aslcompilerparse.o : $(OBJDIR)/aslcompilerparse.c + @echo "- " "Intermediate" $< +- @$(CC) -c $(CFLAGS) -Wall $(WERROR_FLAGS) -o$@ $< ++ $(CC) -c $(CFLAGS) -Wall $(WERROR_FLAGS) -o$@ $< + + $(OBJDIR)/dtcompilerparserlex.o : $(OBJDIR)/dtcompilerparserlex.c + @echo "- " "Intermediate" $< +- @$(CC) -c $(CFLAGS) -Wall $(WERROR_FLAGS) -o$@ $< ++ $(CC) -c $(CFLAGS) -Wall $(WERROR_FLAGS) -o$@ $< + + $(OBJDIR)/dtcompilerparserparse.o : $(OBJDIR)/dtcompilerparserparse.c + @echo "- " "Intermediate" $< +- @$(CC) -c $(CFLAGS) -Wall $(WERROR_FLAGS) -o$@ $< ++ $(CC) -c $(CFLAGS) -Wall $(WERROR_FLAGS) -o$@ $< + + $(OBJDIR)/dtparserlex.o : $(OBJDIR)/dtparserlex.c + @echo "- " "Intermediate" $< +- @$(CC) -c $(CFLAGS) -Wall $(WERROR_FLAGS) -o$@ $< ++ $(CC) -c $(CFLAGS) -Wall $(WERROR_FLAGS) -o$@ $< + + $(OBJDIR)/dtparserparse.o : $(OBJDIR)/dtparserparse.c + @echo "- " "Intermediate" $< +- @$(CC) -c $(CFLAGS) -Wall $(WERROR_FLAGS) -o$@ $< ++ $(CC) -c $(CFLAGS) -Wall $(WERROR_FLAGS) -o$@ $< + + $(OBJDIR)/prparserlex.o : $(OBJDIR)/prparserlex.c + @echo "- " "Intermediate" $< +- @$(CC) -c $(CFLAGS) -Wall $(WERROR_FLAGS) -o$@ $< ++ $(CC) -c $(CFLAGS) -Wall $(WERROR_FLAGS) -o$@ $< + + $(OBJDIR)/prparserparse.o : $(OBJDIR)/prparserparse.c + @echo "- " "Intermediate" $< +- @$(CC) -c $(CFLAGS) -Wall $(WERROR_FLAGS) -o$@ $< ++ $(CC) -c $(CFLAGS) -Wall $(WERROR_FLAGS) -o$@ $< +-- +2.45.2.windows.1 + diff --git a/sys-power/iasl/iasl-20241212.ebuild b/sys-power/iasl/iasl-20241212.ebuild new file mode 100644 index 000000000000..e951b9155c71 --- /dev/null +++ b/sys-power/iasl/iasl-20241212.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit edos2unix toolchain-funcs + +MY_PN=acpica-unix +MY_P="${MY_PN}-${PV}" +MY_TESTS_P="${MY_PN/ca/tests}-${PV}" +REL_TAG="R${PV:0:4}_${PV:4:2}_${PV:6:2}" + +DESCRIPTION="Intel ACPI Source Language (ASL) compiler" +HOMEPAGE="https://www.acpica.org/downloads/" +SRC_URI=" + https://github.com/acpica/acpica/releases/download/${REL_TAG}/${MY_P}.tar.gz + test? ( https://github.com/acpica/acpica/releases/download/${REL_TAG}/${MY_TESTS_P}.tar.gz )" +S="${WORKDIR}/${MY_P}" + +LICENSE="iASL" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86" +IUSE="examples test" +RESTRICT="!test? ( test )" + +BDEPEND=" + app-alternatives/yacc + app-alternatives/lex" + +PATCHES=( + "${FILESDIR}"/${P}-Makefile-fixes.patch + "${FILESDIR}"/${P}-Makefile-verbose.patch +) + +pkg_setup() { + if use test; then + ewarn 'You have selected USE="test". This will install the test results' + ewarn "into /usr/share/${PF}/, compressed as a tarball." + ewarn 'The tests themselves will only rarely die, but the test results' + ewarn 'are interesting for arch testing. The tests may take quite some' + ewarn 'time to complete.' + fi +} + +src_compile() { + emake -C generate/unix \ + CC="$(tc-getCC)" \ + 'YACC=LC_ALL=C yacc' \ + 'YFLAGS=' \ + 'LEX=LC_ALL=C lex' \ + NOFORTIFY=TRUE \ + NOWERROR=TRUE +} + +aslts_test() { + export ASL="${S}"/generate/unix/bin/iasl \ + acpibin="${S}"/generate/unix/bin/acpibin \ + acpiexec="${S}"/generate/unix/bin/acpiexec \ + ASLTSDIR="${WORKDIR}/${MY_TESTS_P}"/tests/aslts + export PATH="${PATH}:${ASLTSDIR}/bin" + echo "$ASLTSDIR" >"${T}"/asltdir + cd "${ASLTSDIR}" || die + edos2unix $(find . -type 'f') + emake install + chmod +x $(find bin/ ! -regex 'ERROR_OPCODES|HOW_TO_USE|README' ) || die "chmod bin +x failed" + + #The below Do commands runs the tests twice and then dies if the results aren't + #Identical. + Do 1 || die "failed Do 1" + Do 2 || die "failed Do 2" +} + +aapits_test() { + mv "${WORKDIR}/${MY_TESTS_P}/tests/aapits" "${S}/tools/" || die "mv failed" + cd "${S}/tools/aapits" || die "cannot find ${S}/tools/aapits" + edos2unix $(find . -type 'f') + chmod +x $(find bin/ | sed -r -e '/\/[A-Z_]+$/d') || die "chmod bin +x failed" + emake + emake -C asl + cd ../bin || die + ./aapitsrun || die "aapitsrun failed" +} + +src_test() { + aslts_test + #The aapits test currently fails, missing include probably. + #aapits_test +} + +src_install() { + emake -C generate/unix install DESTDIR="${D}" + + if ! use examples; then + rm "${ED}/usr/bin/acpiexamples" || die + fi + + dodoc "${S}"/changes.txt + newdoc "${S}"/source/compiler/readme.txt compiler-readme.txt + newdoc "${S}"/generate/unix/readme.txt unix-readme.txt + newdoc "${S}"/generate/lint/readme.txt lint-readme.txt + newdoc "${S}"/source/compiler/new_table.txt compiler-new_table.txt + + if use test; then + tb="${T}"/testresults.tar.bz2 + export ASLTSDIR="$(<"${T}"/asltdir)" + ebegin "Creating Test Tarball" + tar -cjf "${tb}" -C "${ASLTSDIR}"/tmp/RESULTS . || die "tar failed" + eend $? + insinto /usr/share/${PF} + doins ${tb} + fi +} diff --git a/sys-power/iasl/metadata.xml b/sys-power/iasl/metadata.xml index cdfe9b16ccbe..4cf5326077e4 100644 --- a/sys-power/iasl/metadata.xml +++ b/sys-power/iasl/metadata.xml @@ -4,4 +4,17 @@ <maintainer type="person"> <email>robbat2@gentoo.org</email> </maintainer> + <upstream> + <maintainer status="active"> + <email>saket.dumbre@intel.com</email> + <name>Saket Dumbre</name> + </maintainer> + <doc lang="en">https://www.intel.com/content/www/us/en/developer/topic-technology/open/acpica/documentation.html</doc> + <bugs-to>https://github.com/acpica/acpica/issues</bugs-to> + <remote-id type="github">acpica/acpica</remote-id> + </upstream> + <use> + <flag name="examples">Install acpiexamples binary</flag> + <flag name="test">Perform tests (slow!) and install compressed test results</flag> + </use> </pkgmetadata> diff --git a/sys-power/intel-undervolt/Manifest b/sys-power/intel-undervolt/Manifest index f2b72d56cd52..1437dbee42fe 100644 --- a/sys-power/intel-undervolt/Manifest +++ b/sys-power/intel-undervolt/Manifest @@ -1,3 +1,3 @@ DIST intel-undervolt-1.7.tar.gz 31481 BLAKE2B 0daade381b492184616356f097de32d14c76d6ab3f7dd59240fb25f92ee1b9aebb16cbef8b6836e16e361a9560b000655470140c31b5822fed7bd90e0b9d9bf2 SHA512 727eddd47a92f6092e89f9326c6b453785fac6155f2c2c50887f9a90704226e6abaf27b4a91cabd4783c4477371699a92186fe7847ac9218da9c26fb295a5304 -EBUILD intel-undervolt-1.7-r1.ebuild 1288 BLAKE2B cc7600305629b0cf69107a0817eb7c2d1c9d65ab4173141ff9041255f5f119d01a588287054753fbadc6c816e8acdc37bc189c96a50e01386ec52d67404b02c4 SHA512 9203e30fc2b0e37232148f777324987a005b4a648b4086c67e3a2506c3d7035e7bc92ec44be0f91120d56f6fbc8c5da6383cd949b2573f61f1ecef7e8a6e7d5d +EBUILD intel-undervolt-1.7-r1.ebuild 1256 BLAKE2B 8cab5ede13d01b4c0b96d364a13a14f789551bb2682dda25651980868a74593d69f61497b217896e4e607f92d7a7d8c23ae6f4076be6f312575bc902709d6bde SHA512 3bbe46cd3b509ca0f1f4cefa257432bff0473e85af44cef5ed83f7900dc08c4ec3e687208319fcc4c58cbfe5b344abf883c846f0bdf64d56f6d531a09816d06c MISC metadata.xml 356 BLAKE2B 22c12ccf85f7527222e159bc4b625db43978a15dfb87a25c63ad58d7319d0008c9fcf809273e94e74108155a64ac702b2e61481b0566f99d1da5f6b353c05b4e SHA512 bd62ea205e920df3426fe93bab565c491f8c4df43c2f8e503a7ffa3972d962caeedba545fe3b9389a82de789839356ad9e92c75f9b0919a91a4ddb51025d35eb diff --git a/sys-power/intel-undervolt/intel-undervolt-1.7-r1.ebuild b/sys-power/intel-undervolt/intel-undervolt-1.7-r1.ebuild index 6390ac5c14d9..46f5c056910d 100644 --- a/sys-power/intel-undervolt/intel-undervolt-1.7-r1.ebuild +++ b/sys-power/intel-undervolt/intel-undervolt-1.7-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit linux-info systemd toolchain-funcs +inherit eapi9-ver linux-info systemd toolchain-funcs DESCRIPTION="Intel CPU undervolting and throttling configuration tool" HOMEPAGE="https://github.com/kitsunyan/intel-undervolt" @@ -53,10 +53,8 @@ src_compile() { } pkg_postinst() { - for v in ${REPLACING_VERSIONS}; do - if [[ ${v} == 1.6 ]] ; then - elog "openrc service has been renamed to intel-undervolt-loop" - elog "please update your startup configuration" - fi - done + if ver_replacing -eq 1.6 ; then + elog "openrc service has been renamed to intel-undervolt-loop" + elog "please update your startup configuration" + fi } diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest index 0f14202e5557..def7ce024635 100644 --- a/sys-power/nut/Manifest +++ b/sys-power/nut/Manifest @@ -7,7 +7,8 @@ AUX nut.powerfail.initd 1305 BLAKE2B 88bd2a1b5b3fbb2ab9ea4d408e4cc57399702c587ec AUX systemd_notify.patch 1753 BLAKE2B a44167bf491b393474b94ee4c375013cd23d1e1151311eab40ba6ca2c190019631aeb3fd21e20b9ce0a0b98d98506c88ddd9fe043a1000268d8b7b4195d8b489 SHA512 9984fb879a002cd00949dd7e10f5720f3b50ce871312750dbdb8b805903b37b1f8be2c7b2f6b79a13739fba2c28bf0f85427af7c9b7421ebf13cabfb3cd88381 DIST nut-2.8.0.tar.gz 3287640 BLAKE2B 6ad87e9c90920d45846d9c1311e8feeb3c36bfa506d62d938940c00d2fc7f7b30632d079a8ee969db624824ae4fd3e14e41e8acd1eda296e26a3aa340f186b94 SHA512 3c413ae54088045a713eb80cf1bdda474f41bb3b67c7c0248aa7a0c4d441dce1ff42627a2735273d7e36892d1f2eeb895220cf28af63fec2fa0c7a267f82d577 DIST nut-2.8.2.tar.gz 5599935 BLAKE2B 87187293d8acda72c2d807d6f41f2601a318540f63a0ea93782b115402c6b43a0b61ecc710fd6de126d25e59dd4e03681f2b859a87549e9d5f7617ac7b2dad8c SHA512 b6f8f22318e4a4fcb8073a63132b1cb083952c665191b82a7d6765a61b859575a4b0c2ba84ed17cfb8c88d34179876d64520dd2f75f02fe8707b406da2c0821c -EBUILD nut-2.8.0-r3.ebuild 5736 BLAKE2B ff76344746befe48fbdcd9c3f9d6230151c5443504e26cf55fc4dd6e24aa98f361470d80a2ce913a08eb66fe0d9ac8a3fa7c9bd3bbff98c2f82a4ee98ee635e9 SHA512 6f213d2a7e9affa7b598ce3bea7c0cf2915e25d9143007fe679733a95cf584ac6a810a4ccd8dc12b8b3ce8184cafc4d45572ca26130068409efd43754bdd62c0 -EBUILD nut-2.8.2.ebuild 7020 BLAKE2B 76cabd8e0388a6a867cb1e59584ab93d9c95b46fbb3b002df5403ea05e14f5a9c547f23520bc3a785305d323299c07e72c6158ff3c671654c0d8c40dec312e46 SHA512 469c3899460fe7cbc8271054994b3b17a1c0a7b9ef8d8fc08ef771ff20b12c37c9695439152b24cc6894640f851c2671ec0410c70e1d18fc95c94f5f2a4281fe -EBUILD nut-9999.ebuild 7023 BLAKE2B a1ae0041d27e276fc118db1a59925e0cc44bb3893aeeedbdace87f41f6922865d5d3807a978a88d96d1417973add0ae3f7422ede2b85b2dc193c5aaa6f76d2ff SHA512 a520a4b8459fed1c3bc2b309aaf6673a3e0ff43cb0c501637171cbb2a52f6de7486279550c68e548cbf9a5f00c3ec934f6822ceafca52f91dede272e7518d82d +EBUILD nut-2.8.0-r3.ebuild 5713 BLAKE2B 2f79a61f69f7cd0c276ad7aea49027d04213f223ac554d77a37658118d5b298b9abc71b096cb07ea41ae94e5b2f5ee604d2e5f9241cb051ce71841515829fc04 SHA512 364de301afe19a14b4f412f88bf1687bdf0027a13ee47dbe6c4290344866ebeed9edb844add68bca86dff2c62775cbf4238d50e3f8c116ad0552661b8231a6f9 +EBUILD nut-2.8.2-r1.ebuild 6975 BLAKE2B 0dfbe562605e177a20a07daffa5f1cc004b5e2aa02a6e93dfc1a09739d0e9d7e08f8ca31f4789643c9058efc26077f6cad552a9014d8781dd4356c1d4df73a65 SHA512 4c031cd895fa823389b3c30d880f20eb8c670afbbea995193a7662e8629afe24d05ab2bce4d93b5397ce025ce1d7d708fc4e15e1e9f32af6cbfaf66fbbc184b2 +EBUILD nut-2.8.2.ebuild 6997 BLAKE2B 55b4aab8f0b9072cb95db2093e3f6389f2e9d62b159a366153a4fbdd694c98fcfcaa29fbf1c2c596b9a6600131c60006f3ddb2984db7f3f8ad24d134258eb723 SHA512 362a1e9622da83cafb70d47e68c31391c5b628ecf80d2460dba9e2a2da470d102ac7e5027a8452514b32146476bb86a93ac5529b8fe2e93c6c0db6ffdd4b4ec5 +EBUILD nut-9999.ebuild 6975 BLAKE2B 0dfbe562605e177a20a07daffa5f1cc004b5e2aa02a6e93dfc1a09739d0e9d7e08f8ca31f4789643c9058efc26077f6cad552a9014d8781dd4356c1d4df73a65 SHA512 4c031cd895fa823389b3c30d880f20eb8c670afbbea995193a7662e8629afe24d05ab2bce4d93b5397ce025ce1d7d708fc4e15e1e9f32af6cbfaf66fbbc184b2 MISC metadata.xml 1351 BLAKE2B 7673ac0c20af6c4b5e3a57f2cad063b40f4141069974544202fe0c34e1df3996fa91af47598616208b17c100c590db4afeff3d0ef61731c6a05768ed2421c9b3 SHA512 7f4755b84bd2c84f42c987a035cd4b91f74a57bbfa57289cfe7aafd02e10e43beca25edced1273a4282db6a257262201e6921190c5ac069fc9ffcd0767ebb31b diff --git a/sys-power/nut/nut-2.8.0-r3.ebuild b/sys-power/nut/nut-2.8.0-r3.ebuild index fbde9a676af0..c477f083e7df 100644 --- a/sys-power/nut/nut-2.8.0-r3.ebuild +++ b/sys-power/nut/nut-2.8.0-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -122,7 +122,6 @@ src_configure() { ) filter-lto - append-flags -fno-lto tc-export CC CXX AR use cgi && myeconfargs+=( --with-cgipath=/usr/share/nut/cgi ) diff --git a/sys-power/nut/nut-2.8.2-r1.ebuild b/sys-power/nut/nut-2.8.2-r1.ebuild new file mode 100644 index 000000000000..2b726a626e93 --- /dev/null +++ b/sys-power/nut/nut-2.8.2-r1.ebuild @@ -0,0 +1,261 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +inherit bash-completion-r1 desktop linux-info optfeature +inherit python-single-r1 systemd tmpfiles toolchain-funcs udev wrapper xdg + +MY_P=${P/_/-} + +DESCRIPTION="Network-UPS Tools" +HOMEPAGE="https://networkupstools.org/" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/networkupstools/${PN}.git" + inherit git-r3 +else + SRC_URI="https://networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" # waiting for ~arch of dev-libs/libgpiod: ~ppc ~ppc64 +fi + +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +IUSE="gpio cgi doc ipmi serial i2c +man snmp +usb modbus selinux ssl tcpd test xml zeroconf python monitor systemd" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + monitor? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) + snmp? ( python ) +" + +# sys-apps/systemd-253 required for Type=notify-reload +DEPEND=" + acct-group/nut + acct-user/nut + dev-libs/libltdl + virtual/udev + cgi? ( >=media-libs/gd-2[png] ) + gpio? ( dev-libs/libgpiod ) + i2c? ( sys-apps/i2c-tools ) + ipmi? ( sys-libs/freeipmi ) + modbus? ( dev-libs/libmodbus ) + python? ( ${PYTHON_DEPS} ) + snmp? ( net-analyzer/net-snmp:= ) + ssl? ( >=dev-libs/openssl-1:= ) + systemd? ( >=sys-apps/systemd-253 ) + tcpd? ( sys-apps/tcp-wrappers ) + usb? ( virtual/libusb:1 ) + xml? ( >=net-libs/neon-0.25.0:= ) + zeroconf? ( net-dns/avahi ) +" +BDEPEND=" + virtual/pkgconfig + man? ( app-text/asciidoc ) + test? ( dev-util/cppunit ) +" +RDEPEND=" + ${DEPEND} + monitor? ( $(python_gen_cond_dep ' + dev-python/pyqt5[gui,widgets,${PYTHON_USEDEP}] + ') + ) + selinux? ( sec-policy/selinux-nut ) +" + +PATCHES=( + "${FILESDIR}/${PN}-2.6.2-lowspeed-buffer-size.patch" + "${FILESDIR}/systemd_notify.patch" +) +PATCH_NEEDS_AUTOGEN=1 + +pkg_pretend() { + if use i2c; then + CONFIG_CHECK="~I2C_CHARDEV" + ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue" + fi + if use usb; then + CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV" + ERROR_HIDRAW="HIDRAW is needed to support USB UPSes" + ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB UPSes" + fi + if use gpio; then + CONFIG_CHECK="~GPIO_CDEV_V1" + ERROR_GPIO_CDEV_V1="GPIO_CDEV_V1 is needed to support GPIO UPSes" + fi + if use serial; then + CONFIG_CHECK="~SERIAL_8250" + ERROR_SERIAL_8250="SERIAL_8250 is needed to support Serial UPSes" + fi + + # Now do the actual checks setup above + check_extra_config +} + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + if [[ ${PV} == *9999 ]] || [[ ${PATCH_NEEDS_AUTOGEN} == 1 ]] ; then + ./autogen.sh || die + fi + + xdg_environment_reset +} + +src_configure() { + local myeconfargs=( + --datadir=/usr/share/nut + --datarootdir=/usr/share/nut + --disable-static + --disable-strip + --disable-Werror + --sysconfdir=/etc/nut + --with-dev + --with-drvpath="/$(get_libdir)/nut" + --with-group=nut + --with-htmlpath=/usr/share/nut/html + --with-logfacility=LOG_DAEMON + --with-statepath=/var/lib/nut + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + --with-systemdtmpfilesdir="/usr/lib/tmpfiles.d" + --with-udev-dir="$(get_udevdir)" + --with-user=nut + --without-powerman + --without-python + --without-python2 + --with-altpidpath=/run/nut + --with-pidpath=/run/nut + $(use_with cgi) + $(use_with gpio) + $(use_with i2c linux_i2c) + $(use_with ipmi freeipmi) + $(use_with ipmi) + $(use_with monitor nut_monitor) + $(use_with python pynut) + $(use_with serial) + $(use_with snmp) + $(use_with ssl) + $(use_with systemd libsystemd) + $(use_with tcpd wrap) + $(use_with usb) + $(use_with xml neon) + $(use_with zeroconf avahi) + ) + + tc-export CC CXX AR + + use cgi && myeconfargs+=( --with-cgipath=/usr/share/nut/cgi ) + use man && myeconfargs+=( --with-doc=man ) + use python && myeconfargs+=( --with-python3="${PYTHON}" ) || myeconfargs+=( --without-python3 ) + + export bashcompdir="$(get_bashcompdir)" + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + rm -rf "${ED}/etc/hotplug" || die + + find "${ED}" -name '*.la' -delete || die + + dodir /sbin + + if use cgi; then + elog "CGI monitoring scripts are installed in ${EPREFIX}/usr/share/nut/cgi." + elog "copy them to your web server's ScriptPath to activate (this is a" + elog "change from the old location)." + elog "If you use lighttpd, see lighttpd_nut.conf in the documentation." + elog + elog "Use script aliases according to the web server you use (apache, nginx, lighttpd, etc...)" + fi + + # This must be done after all of the install phases + local i + for i in "${ED}"/etc/nut/*.sample ; do + mv "${i}" "${i/.sample/}" || die + done + + local DOCS=( AUTHORS MAINTAINERS NEWS.adoc README.adoc TODO.adoc UPGRADING.adoc ) + einstalldocs + + if use doc; then + newdoc lib/README.adoc README.lib.adoc + dodoc docs/*.txt + docinto cables + dodoc docs/cables/* + fi + + newinitd "${FILESDIR}"/nut-2.8.0-init.d-upsd upsd + newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv + newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsmon upsmon + newinitd "${FILESDIR}"/nut-2.6.5-init.d-upslog upslog + newinitd "${FILESDIR}"/nut.powerfail.initd nut.powerfail + + newbashcomp "${S}"/scripts/misc/nut.bash_completion upsc + bashcomp_alias upsc upscmd upsd upsdrvctl upsmon upsrw + + if use zeroconf; then + insinto /etc/avahi/services + doins scripts/avahi/nut.service + fi + + if use monitor; then + make_wrapper NUT-Monitor-py3qt5 /usr/share/nut/nut-monitor/app/NUT-Monitor-py3qt5 /usr/share/nut/nut-monitor/app + + # Install desktop shortcut + newmenu scripts/python/app/nut-monitor-py3qt5.desktop nut-monitor.desktop + + # Installing Application icons + local res + for res in 48 64 256; do + doicon -s ${res} scripts/python/app/icons/${res}x${res}/nut-monitor.png + done + doicon -s scalable scripts/python/app/icons/scalable/nut-monitor.svg + fi + + use python && python_optimize +} + +pkg_postinst() { + elog "Please note that NUT now runs under the 'nut' user." + elog "NUT is in the uucp group for access to RS-232 UPS." + elog "However if you use a USB UPS you may need to look at the udev or" + elog "hotplug rules that are installed, and alter them suitably." + elog + elog "You are strongly advised to read the UPGRADING file provided by upstream." + elog + elog "Please note that upsdrv is NOT automatically started by upsd anymore." + elog "If you have multiple UPS units, you can use their NUT names to" + elog "have a service per UPS:" + elog "ln -s /etc/init.d/upsdrv /etc/init.d/upsdrv.\$UPSNAME" + elog + elog 'If you want apcupsd to power off your UPS when it' + elog 'shuts down your system in a power failure, you must' + elog 'add nut.powerfail to your shutdown runlevel:' + elog + elog 'rc-update add nut.powerfail shutdown' + elog + + optfeature "all notify events generate a global message (wall) to all users, plus they are logged via the syslog" \ + sys-apps/util-linux[logger,tty-helpers] + + udev_reload + + tmpfiles_process nut-common-tmpfiles.conf + xdg_pkg_postinst +} + +pkg_postrm() { + udev_reload + xdg_pkg_postrm +} diff --git a/sys-power/nut/nut-2.8.2.ebuild b/sys-power/nut/nut-2.8.2.ebuild index 6e1213d48302..4f2e397b5bab 100644 --- a/sys-power/nut/nut-2.8.2.ebuild +++ b/sys-power/nut/nut-2.8.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -151,7 +151,6 @@ src_configure() { ) filter-lto - append-flags -fno-lto tc-export CC CXX AR use cgi && myeconfargs+=( --with-cgipath=/usr/share/nut/cgi ) diff --git a/sys-power/nut/nut-9999.ebuild b/sys-power/nut/nut-9999.ebuild index 6cfe1784c38b..2b726a626e93 100644 --- a/sys-power/nut/nut-9999.ebuild +++ b/sys-power/nut/nut-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit bash-completion-r1 desktop flag-o-matic linux-info optfeature +inherit bash-completion-r1 desktop linux-info optfeature inherit python-single-r1 systemd tmpfiles toolchain-funcs udev wrapper xdg MY_P=${P/_/-} @@ -150,8 +150,6 @@ src_configure() { $(use_with zeroconf avahi) ) - filter-lto - append-flags -fno-lto tc-export CC CXX AR use cgi && myeconfargs+=( --with-cgipath=/usr/share/nut/cgi ) diff --git a/sys-power/power-profiles-daemon/Manifest b/sys-power/power-profiles-daemon/Manifest index f6a6b098d851..fda055f09045 100644 --- a/sys-power/power-profiles-daemon/Manifest +++ b/sys-power/power-profiles-daemon/Manifest @@ -1,8 +1,6 @@ AUX power-profiles-daemon.initd 391 BLAKE2B dd75825711a868de7b6c996c67c332b80a361b84dab19b86f93c77ae781c007ed8a665fbf776dfb18671ad7b297a85cc8bd021ffb4d7ff33451e9e074c53eb23 SHA512 5652346153ad999525bf2973336ebe7806af279fce9dd62091918d00ce0ebbdf315a03472bf8de61a1df51c9087feb0b2771ce85870274ae5770a0f1aea08bfc -DIST power-profiles-daemon-0.21.tar.bz2 63984 BLAKE2B 206c954272fb93b17a09e4108c74462d2524ef9160880ce59709504314fd38f413c7eb65ab4f0a085f6458b04f85b4833e0df3786f0aff08e7bdc0a3a65d8d2a SHA512 8038ff7c164bbcbeebc50c911f3129e79d4f8d63278bc674e10bf2920af0bc9b0b139d5a2e056889b0b7ec86df19cc7be3e8c84e70e777544e117ee7a036b375 -DIST power-profiles-daemon-0.22.tar.bz2 66394 BLAKE2B 7c204aa29ebda4f9034729b5ea09e1cd516a788c0fc58cf57f49791103f85506bc34bf8c2db9a4f1e42fa280ba4d6ce1c095df3a90deb90db795d7c02b4d6606 SHA512 7fcb960f956ad95cfa7f31ac8d8b3070ff72822106017177cdab873c2e8e6017d7357b09fea2a14450990acc844f7db30d5cdcce33d59661c775da54ad095af9 DIST power-profiles-daemon-0.23.tar.bz2 66801 BLAKE2B fbfaad44ddacbb4ffce7a8c9ab5eab0e6d9e0f114629f8d6d0fd06dcd55211f863c1ab8dedceb3a96831862cbda7e18158f35f99da6dbb54318b9568de22883d SHA512 fda9ee667455991d2e8a011a9ea9060df7605dafdd4116f433328fb9dc0a3fd8f8bada644c3c8b63d8a0bdff212fdd827bb4bcd9f2aec7338917b2375c278276 -EBUILD power-profiles-daemon-0.21.ebuild 2612 BLAKE2B e36ed5b4388bfb153074b9d74a1a3fba63f2ee2ccecf50d21f034f04e7e9a024786226883b7bb50c94169ebff397c3e472cd50e8cd24b0e4e395b094a3d54942 SHA512 8bb32e5a63fca9e39ccef14863586c228d4e13a5812044695e4b339f5cde4bb2eb3fe229277d34e8d168dfc18d3290d6845b1ede8000acb35a06a390c05656ff -EBUILD power-profiles-daemon-0.22.ebuild 2615 BLAKE2B c665bb1f029dbe38a49a89a3de2fa06036d0a499494bccf4ae2637ecfc70808d15644172407dffae3d45626f04a07131598a16752441e49df07f444f0ceeeba6 SHA512 8f802a2f1926754a0027e7688d454f14e17415b105ff8c6fe86f53c004aadd493130052cb8889c17a07684f1742cff7e5e246713d6f4434127a362ef24fcafed -EBUILD power-profiles-daemon-0.23.ebuild 2614 BLAKE2B 43f81bea10bd8874792d23c52a758d85d63428945c7a1449230ba9a6d33d0112ce0ce3378f3746a7735d9fdc0158b824df8a9bc5e2d549065861b1dc9ec60253 SHA512 2e5e7214d4a1e0e3efacf882f61aa72c22e86363113b52d9333a8bf29579b7f089785130546a8bee1806b4cca57e710dd73118ee1ba51989c1d0fde0d4ddc8d2 +DIST power-profiles-daemon-0.30.tar.bz2 70413 BLAKE2B da35aba711018ec319aac68b05b9ffb51fe00a80df3340ad8bd08562b021e3ac92267305d791b9920627a6bb0bdc64fa7bd1d8ae6adc3a076f2a7c2ff396344b SHA512 91ff790aa7f9fb0004d112f9c2f28de55f9985d5fbed15ebf1d15722ff0c007ebc89407ba38e88016745162b0ca7058540ed276b372efbefdd6b2e23408c89dc +EBUILD power-profiles-daemon-0.23.ebuild 2612 BLAKE2B bab8db3ff0364d74cc4a96c8ae689c1968cfe077e3865f3e5df25d2d4ac23f9ecb713aa4b2017edd897ac62552d05517afcdac9b099d5940c0c37b67c4217617 SHA512 9fbbeddd09dbd6b3316e213125474f6b9af23e9b79e714c2f4f62959ed1bbc08d453a7479fe16592a72a5e3c00175d7e7675b2ff8878be0413bb057373e5263a +EBUILD power-profiles-daemon-0.30.ebuild 2615 BLAKE2B 5bf8f6498457be5101a93396076a2571a15bfa34be31ee32dc88cf0eaf883d0b14e1e73ca61d9d306044af557c9f2d166c6cb322dbf6b0bec752b7a9d2f8ad4a SHA512 15bb9d9295233fef7d1dab0bf77a07ad2dd464836a3e120c12ab419d131ca4527f24393c4ba1a537934cda146a7e9f65a5ddacc52781f87d9161555479bafe09 MISC metadata.xml 349 BLAKE2B 3d5b11de51426f4ba58d91ba184112dc8c2ca996eb68b55a1fee0ebd1c5f9a04369304ca1dc06adf67c936e429a5f4982352696a436768f86cdb59689d0c6f0a SHA512 a857194a96f8d2e3d639b93256e5c0518578aa2ff3e85e3a4c5f1293750e0d40a5637b3660199153bd25185b2cf548d0bd54c52a4f4a7673f44eb027653fcaec diff --git a/sys-power/power-profiles-daemon/power-profiles-daemon-0.21.ebuild b/sys-power/power-profiles-daemon/power-profiles-daemon-0.21.ebuild deleted file mode 100644 index 120f8f64690c..000000000000 --- a/sys-power/power-profiles-daemon/power-profiles-daemon-0.21.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) - -inherit meson python-single-r1 shell-completion systemd - -DESCRIPTION="Makes power profiles handling available over D-Bus" -HOMEPAGE="https://gitlab.freedesktop.org/upower/power-profiles-daemon/" -SRC_URI="https://gitlab.freedesktop.org/upower/${PN}/-/archive/${PV}/${P}.tar.bz2" -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" - -IUSE="bash-completion gtk-doc man selinux test zsh-completion" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RESTRICT="!test? ( test )" - -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') - dev-libs/glib:2 - >=dev-libs/libgudev-234 - >=sys-auth/polkit-0.99 - sys-power/upower - selinux? ( sec-policy/selinux-powerprofiles ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - bash-completion? ( - >=app-shells/bash-completion-2.0 - $(python_gen_cond_dep '>=dev-python/shtab-1.7.0[${PYTHON_USEDEP}]') - ) - gtk-doc? ( - dev-util/gi-docgen - dev-util/gtk-doc - ) - man? ( - $(python_gen_cond_dep 'dev-python/argparse-manpage[${PYTHON_USEDEP}]') - ) - test? ( - dev-util/umockdev - $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/python-dbusmock[${PYTHON_USEDEP}] - ') - ) - zsh-completion? ( - $(python_gen_cond_dep '>=dev-python/shtab-1.7.0[${PYTHON_USEDEP}]') - ) -" - -python_check_deps() { - if use test; then - python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]" && - python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" - else - python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" - fi - - if use bash-completion || use zsh-completion; then - python_has_version ">=dev-python/shtab-1.7.0[${PYTHON_USEDEP}]" - fi - - use man && python_has_version "dev-python/argparse-manpage[${PYTHON_USEDEP}]" -} - -src_configure() { - local emesonargs=( - -Dpylint=disabled - -Dsystemdsystemunitdir="$(systemd_get_systemunitdir)" - $(meson_feature bash-completion bashcomp) - $(meson_use gtk-doc gtk_doc) - $(meson_feature man manpage) - $(meson_use test tests) - ) - use zsh-completion && emesonargs+=( -Dzshcomp="$(get_zshcompdir)" ) - meson_src_configure -} - -src_install() { - meson_src_install - python_fix_shebang "${D}"/usr/bin/powerprofilesctl - newinitd "${FILESDIR}/power-profiles-daemon.initd" power-profiles-daemon -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "You need to enable the service:" - if systemd_is_booted; then - elog "# systemctl enable ${PN}" - else - elog "# rc-update add ${PN} default" - fi - fi -} diff --git a/sys-power/power-profiles-daemon/power-profiles-daemon-0.23.ebuild b/sys-power/power-profiles-daemon/power-profiles-daemon-0.23.ebuild index bf5a6e5bdcc9..841a8729d25e 100644 --- a/sys-power/power-profiles-daemon/power-profiles-daemon-0.23.ebuild +++ b/sys-power/power-profiles-daemon/power-profiles-daemon-0.23.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/upower/power-profiles-daemon/" SRC_URI="https://gitlab.freedesktop.org/upower/${PN}/-/archive/${PV}/${P}.tar.bz2" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="bash-completion gtk-doc man selinux test zsh-completion" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/sys-power/power-profiles-daemon/power-profiles-daemon-0.22.ebuild b/sys-power/power-profiles-daemon/power-profiles-daemon-0.30.ebuild index fda723bbfe4a..144a003a1ec5 100644 --- a/sys-power/power-profiles-daemon/power-profiles-daemon-0.22.ebuild +++ b/sys-power/power-profiles-daemon/power-profiles-daemon-0.30.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit meson python-single-r1 shell-completion systemd diff --git a/sys-power/powertop/Manifest b/sys-power/powertop/Manifest index 257ba9d28f9c..a0c927e4ea56 100644 --- a/sys-power/powertop/Manifest +++ b/sys-power/powertop/Manifest @@ -1,5 +1,6 @@ +AUX powertop-2.15-gettext.patch 1672 BLAKE2B 1fc1de94449b246204d8ab55ef0286e6f09d7f178e113af2000af3e66ab63d888e6a7898f4805149197fc8d9a905505c655fa99216f8c5318dadf9d3a4a17075 SHA512 4bda5c26692362d30cc7e20ff4c204c18604f9422cda0b3198730272bdc62eb4c6d1e9e15728b7def12df10ed4a1c06be59f07ac80e901e3556f4876dddaffc9 AUX powertop-2.8-ncurses_tinfo.patch 1385 BLAKE2B 1b11138ae9c8fc90236b421d733f8cf0edff843572cfbfececba0efed5dd2a154ca561692b42e087a1c75bc19966b71fde241a029f16b126074b7d857e8c4bf5 SHA512 f1f483c43355fc1c52d0d7b9ca8e01f71c371e4e77c275584afc9f7178985e0028d42ed675adc52a1ea014325c5aaaafe245fa9166c14326cf467bd92c274522 DIST powertop-2.15.tar.gz 302891 BLAKE2B f554ee9499c78f1888ecd58a1a357bc6f29f53ae2d3bf6b2819d760afe901f5d5394665a2e6a3ecae9b48cbf9703532feb5c16da9bd3edd4f1d31fe12610a2da SHA512 de4ca3ea25697d2cd5f05c41c82c326ad3e2d21cbf38ddb9b3af40c0d862a70781ca45d9ef7b735ad6def0cb580e4fa153eb4a6e6598e204fc931b30d85ecf41 -EBUILD powertop-2.15.ebuild 3483 BLAKE2B 0eec2393d616b3ea8e395ea0237947c3a6bd05b4e3856c05b071d4c3280e8a5e8a6fc1ab98b3ecbeccb4c13b3b0e916ad504f98e4f398bb1232a0711083110f8 SHA512 b7f0efdc99475e604d11c1d51947eca6a7777809fbc2f45bb8ab8b6e86ab3d4aebd01de87b84be3533c6bf616e40c5fd336e77fe06cb15f9c4eb92a98dfa0fb9 +EBUILD powertop-2.15.ebuild 3523 BLAKE2B e6c48bb7235a5db33a868cfdf7812ed24530b4d1ad9f61e882941f364b5e82697948ce31fd1f4a6a0750a350ad67ff126dcbb7811322452be13c04dea6a7ed1f SHA512 0ac038fe598487226e002b31ffd828515b8927451f1d06c3d958e4ee55c8e4f6420833dbc49dc2fe9a0622e2323c4cc889940426a3aea41344195398688677fe EBUILD powertop-9999.ebuild 3473 BLAKE2B 5b108a050ffb4053199dac8f73a2c5b6b524d2dd6ac18c9c490c207f97a7881e9ba848c8d15e889e65d077383f599a66da7e5df030b5bc9aadbe47d633effda6 SHA512 b0efc0ccb076d78cca7bb2058149b351de60f536ea7cd30214afc968a120aecabd00a4e80050e0e4dc73130d074642226f671ade99fca9ebfb80f1f9a4997a1e MISC metadata.xml 329 BLAKE2B 36e2978d4bf67578b4b7f91394698392a26706d5192ce83091c904255009dee966e58b7b10e92b23852a304f870b866f46904d0ea118efa1b192b467aff71511 SHA512 5621a5cdf201d058b65bcb4c4afea6b8bb3ef7d7fb67fc9c582f5d728b19693883493255e485e90aaa06a18ceb6bde55f6bd099f1be454be3bad762be7ff5843 diff --git a/sys-power/powertop/files/powertop-2.15-gettext.patch b/sys-power/powertop/files/powertop-2.15-gettext.patch new file mode 100644 index 000000000000..243cb11dd9ba --- /dev/null +++ b/sys-power/powertop/files/powertop-2.15-gettext.patch @@ -0,0 +1,49 @@ +https://bugs.gentoo.org/945828 + +From bd1c81e3e5e5f0af348fed5881c550432a275075 Mon Sep 17 00:00:00 2001 +From: Matt Turner <mattst88@gmail.com> +Date: Tue, 3 Dec 2024 19:42:33 -0500 +Subject: [PATCH] build: Use AM_GNU_GETTEXT_REQUIRE_VERSION and require 0.19.6 + +This bumps the version requirement from 0.19 (from 2014) to 0.19.6 +(2015). + +Using only the old AM_GNU_GETTEXT_VERSION results in old gettext +infrastructure being placed in the package. By using both macros we get +the latest gettext files while the other programs in the Autotools +family can still see the old macro. + +Otherwise, with gettext-0.23 we get + +``` +*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.18 but the autoconf macros are from gettext version 0.22 +``` + +Equivalent to the commit to xz.git here: +https://git.tukaani.org/?p=xz.git;a=commit;h=3d576cf92158d62790017ad7f2dd6dc1dd6b42bb +--- + configure.ac | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git ./configure.ac ./configure.ac +index c698818..2349c3c 100644 +--- ./configure.ac ++++ ./configure.ac +@@ -24,8 +24,13 @@ AC_CONFIG_HEADERS([config.h]) + GETTEXT_PACKAGE=powertop + AC_SUBST([GETTEXT_PACKAGE]) + AM_SILENT_RULES([yes]) ++ ++dnl Support for _REQUIRE_VERSION was added in gettext 0.19.6. If both ++dnl _REQUIRE_VERSION and _VERSION are present, the _VERSION is ignored. ++dnl We use both for compatibility with other programs in the Autotools family. + AM_GNU_GETTEXT([external]) +-AM_GNU_GETTEXT_VERSION([0.18.2]) ++AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.6]) ++AM_GNU_GETTEXT_VERSION([0.19.6]) + + m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + AX_REQUIRE_DEFINED([AX_ADD_FORTIFY_SOURCE]) +-- +2.45.3 + diff --git a/sys-power/powertop/powertop-2.15.ebuild b/sys-power/powertop/powertop-2.15.ebuild index 91149b6a6d1b..e3c075a2ce6f 100644 --- a/sys-power/powertop/powertop-2.15.ebuild +++ b/sys-power/powertop/powertop-2.15.ebuild @@ -40,6 +40,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-2.8-ncurses_tinfo.patch + "${FILESDIR}"/${PN}-2.15-gettext.patch ) pkg_setup() { diff --git a/sys-power/suspend/Manifest b/sys-power/suspend/Manifest index a75dce296e40..27784dc0b505 100644 --- a/sys-power/suspend/Manifest +++ b/sys-power/suspend/Manifest @@ -1,8 +1,6 @@ AUX suspend-1.0_p20200924-Use-pkgconf-for-libgcrypt.patch 594 BLAKE2B 701b3f254a5405bf89fa7aa706aa51910a00c450a5079cef13095b0e02a85d7a15826ea8fc4071e3db5cad55135aa980d0bb1cf7795cd78d09cd593325045c14 SHA512 4a769559842ccfcdb155afe3fee061e9780195f5aac090cf8c7de032abab27082279462f37c56909c30f67f17f6543dbe153cb511ad02007769498bc9134f4bc AUX suspend-1.0_p20200924-fix-loff_t-for-musl.patch 541 BLAKE2B bcdff0919162886afe89338bcf01831717930636b9a19950b920a4836e74aa3deb0c4660894f6d809b051dd9b870409f0af98fe217c6ce05a1d8c518400fdb38 SHA512 bf87a57cc7eb8334f0fd542b9bdae42708f2c050f8d930f1171d333a45b124a8725d681676f96834530de5503cdeb465d96a6a6e8d818f54f1fe69dd1c3ca844 DIST suspend-1.0_p20120915.tar.xz 111080 BLAKE2B 99eea1d9808219373501001f0af90973c9176c1b19d62bff7be26886b11ebb514134b68434e9b453146ef1a4af2c4cc8e26326b956a1b2378c38c100638af17c SHA512 bb714b4a7c0f5749c4b711a5c38ca5d8cb5078176a75387957123f75cfe8348adc3aa4e96335eb65c14ad1dd2f99fd6dbca3b415525dd39b3c547f9b13b775be -DIST suspend-1.0_p20190605.patch.xz 6224 BLAKE2B 0eefbef5a8d777590f69c85b02edb5575a357b373b78d94846e2c2bd59430cbd55af59ee0e676faa7f60388cb3910adb2182dedadb1fdc1df38a409411ea2df1 SHA512 cf576a029b35306368cbdabb9863965e055198920b86eab7205083f3502ae69ec3e8a4267fb6ceaaf1560a8bdb0c59543453f1baad4758c8adc4ac4ae92736bc DIST suspend-1.0_p20200924.patch.xz 6664 BLAKE2B 8a0529859cfd1a19f52fb46f306111ec4e520c9678113fd7c5ad12ada85bed89fedeeafee5145f11f07ef8dac1c6c1ae0ff2d6c6d6f794c268759d70895b1af9 SHA512 27c7cfcf2b2a0f8ccafd4c0020c1dce3aa1df352adac81ba5f24b76381a833f10621f7ae58e55c7c3d41f41ba63a38aa818454edaa32ad1f0fdc6db45b5bfe73 -EBUILD suspend-1.0_p20190605.ebuild 1236 BLAKE2B 58de9f7d775ea9a68f7195816286b699ec0a2030b1cd019436e28cce341a0bdbf65655746dfe6f6b8f230db0e6fa4188e4a5a94e786cf61229fd2dbc9bfddefe SHA512 75764d08c169246882f1e177a327fa12f842c931b215af2de76d80039e42c7054be9ced7aeab4d7ecee9c311d5d913e5306595229faec1ce149c7739b43b3673 -EBUILD suspend-1.0_p20200924.ebuild 1366 BLAKE2B 4953ef695487a6e3051f5bb979070190f41c77915e1250a857da917a26df63715ef4486affa75c060c714a26a7a3a4ae22ea4b5c656b05ca02a567bde87e7019 SHA512 ea60cec2e7daa68b8af84cffe7836564d21846c4368ea633a6caa7d3e11c5443a839b5462bfa2c89d73a5b0fb737d937095862da187028b077dfbcba8573c3bf +EBUILD suspend-1.0_p20200924.ebuild 1366 BLAKE2B 2f5af1fb30595256f6cbdd9994a8c66fde9567c0894102beeffd34069f743239363b8550b5f2480f5d5117a30caa7ba44e9441dd5efb2f570c61492662e3ce7b SHA512 e0eb04b0dd54565be38bd2a0d88f1d54027e35bf2c6d021feeec4695d73d98ffbb3510d1961089bd92177a85441d329995f2a1b74c196455756cbb1644646670 MISC metadata.xml 389 BLAKE2B 0bc94dc6aa54043a6ab91fa6c38efd86bcf30994d48cbcffe7abda631d34722e1290c5b5cf94e2b68bcd0e4049f51aab530a2ddc773fa509e61e40749f729660 SHA512 4391c9a84e51fba159ecd8594288f45c25e0bcdfb7b96dc4c9240c79d872a573aeca1c4d02c2bc6353e1f5a089bf1f062ae4f7218d8b188b13d5850888427d59 diff --git a/sys-power/suspend/suspend-1.0_p20190605.ebuild b/sys-power/suspend/suspend-1.0_p20190605.ebuild deleted file mode 100644 index 68a9887f5290..000000000000 --- a/sys-power/suspend/suspend-1.0_p20190605.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -BASE_PV="1.0_p20120915" - -DESCRIPTION="Userspace Software Suspend and S2Ram" -HOMEPAGE="http://suspend.sourceforge.net -https://github.com/bircoph/suspend" -SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${PN}-${BASE_PV}.tar.xz - https://dev.gentoo.org/~bircoph/patches/${P}.patch.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="crypt +lzo threads" - -RDEPEND=" - dev-libs/libx86 - >=sys-apps/pciutils-2.2.4 - crypt? ( - >=dev-libs/libgcrypt-1.6.3:0[static-libs] - dev-libs/libgpg-error[static-libs] ) - lzo? ( >=dev-libs/lzo-2[static-libs] ) " -DEPEND="${RDEPEND}" -BDEPEND=" - >=dev-lang/perl-5.10 - virtual/pkgconfig" - -S="${WORKDIR}/${PN}" - -PATCHES=( "${WORKDIR}/${P}.patch" ) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - --disable-fbsplash \ - $(use_enable crypt encrypt) \ - $(use_enable lzo compress) \ - $(use_enable threads) -} - -src_install() { - dodir etc - emake DESTDIR="${D}" install - rm "${D}/usr/share/doc/${PF}"/COPYING* || die -} - -pkg_postinst() { - elog "In order to make this package work with genkernel see:" - elog "https://bugs.gentoo.org/show_bug.cgi?id=156445" -} diff --git a/sys-power/suspend/suspend-1.0_p20200924.ebuild b/sys-power/suspend/suspend-1.0_p20200924.ebuild index b4d67354418a..b008abc3ab26 100644 --- a/sys-power/suspend/suspend-1.0_p20200924.ebuild +++ b/sys-power/suspend/suspend-1.0_p20200924.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,6 +13,8 @@ https://github.com/bircoph/suspend" SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${PN}-${BASE_PV}.tar.xz https://dev.gentoo.org/~bircoph/patches/${P}.patch.xz" +S="${WORKDIR}/${PN}" + LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" @@ -30,8 +32,6 @@ BDEPEND=" >=dev-lang/perl-5.10 virtual/pkgconfig" -S="${WORKDIR}/${PN}" - PATCHES=( "${WORKDIR}/${P}.patch" "${FILESDIR}/${PN}-1.0_p20200924-Use-pkgconf-for-libgcrypt.patch" diff --git a/sys-power/thermald/Manifest b/sys-power/thermald/Manifest index 5289024b30c2..1d770ee4b5b4 100644 --- a/sys-power/thermald/Manifest +++ b/sys-power/thermald/Manifest @@ -1,6 +1,6 @@ AUX thermald 385 BLAKE2B 3ffb7f013a3c0f7fbffab5386173e157617229c9c0a36bd9e6bec1f7d7892ae6dee314be21d95000b6086d60cd51112e40b057f7e102c5c1d77d09ccb856c56d SHA512 70420ee1d41d20c2c540467865b98bf98d51f7e23b3d4c80a94e06e039dfa6fb931cafab98d2c66c8fd1f35eea4b49c0e2ddc4eea81fb7654f11c977305ca4d6 -DIST thermald-2.5.7.tar.gz 182761 BLAKE2B d812e1a7e0b55dd5d06ff491183ad0061acb79d2c80a6a248456821676bd3728e28a5d6b23d8fe2565ca8424830f095de8595e85bdfc514f17418af50d7e7284 SHA512 49699eb2a3f3d1197e680a39ecba767a1f11a5d4209671d30152f1e126f7c48b650909c4dd90c496a7857b0fa9ad6fc8c5a849413a8e544b3d5f62d8acfc8268 DIST thermald-2.5.8.tar.gz 179188 BLAKE2B a00844e0147fdb104881624ba1ecbaa565155e4554b218b04b0edd4434f552e2bcc047e6eaada30b0e63b702a75318392ef8c39a8013003377c3e9ee80e694ab SHA512 d74d487e0fa0b51289b4cda2d9094eef6467993a8ca9ba5e2ac8af2fb8e7b9283116ca0647e604ab4d3c445657b31869201287d5ceace0221f7717b0a2cd244d -EBUILD thermald-2.5.7.ebuild 1332 BLAKE2B dc252bdc593ffd4a06423810a7367ad9331cfd06620b87edef72f3333ad722958942bb267048e8418aad01a76f4ce8b46ce0fd1be81d017e225976417183eebf SHA512 9c0ac1e948bc510a90082537887541bdcbf58e60fd4c08800a17c77aee41c917c079510a53b5175eb83358c1c5e33a3cf29baa3a64bca3c78426e36dfbf9df58 +DIST thermald-2.5.9.tar.gz 182016 BLAKE2B 200609171070bae818f15505d75c5f3aefd265ff6ceca73e846b7efa25a73fc6c8635c59dcbb07c276e7547318ec8b232b00bacd4be936c3384e579c5c7823bc SHA512 0541cf490d9a97544b5c10a036a0d8219410c4451d0471b3896a62a743509cd41f5c9b862d81708a2c68603fbc0056268612d84089ef93308b91712c6d26854b EBUILD thermald-2.5.8.ebuild 1310 BLAKE2B 4fa4b8e48422e3ab913f88f0a2a40e79916830172141e40ffe69a6ba3165602049f3c4a7c1efbb53c602878728feb4da4eb29203417480ce551a2e2aa5ff2a6b SHA512 1b988930a943d80de74181a10fa916435dfe461f73d7a6673d09475a52b2c8857f31be8ff5d499d3679f43f77d8d32f130fe9fd77b730788fe3bd67ede114531 +EBUILD thermald-2.5.9.ebuild 1312 BLAKE2B 36db1a63935fcf13529ec861554be8f007b6ca86d31991301a8783d48a931b2d3ee50fcb0ab91561e2fdc0b5d8e4770d07e214c4f9c21e7619d8f3d2bf9e1892 SHA512 ee16d11d3d48237dd2e5ff49c2e184c3bf626d11c658f9b8f4344fdd310b3dab0ffc1f7afebb2e3da2469b79f12a4a3624d06074e5dcf51d76c19e011d93274f MISC metadata.xml 648 BLAKE2B dc9cd4601c2577a6c7df13c8511586e2fdaee12f587cf31b0abd10dc637dbec8bf0a6e17672a935738f8929d5057c8b83a4bccb551b420c5de52b63f395a39f2 SHA512 9c1d353d16359f135b32850fa9fd52023994fe4148258b05564e6bc01b5a1c93aea0588e137aa24c382ad6587e0791d31176b3dcee25970a11a0b8efa01256c3 diff --git a/sys-power/thermald/thermald-2.5.7.ebuild b/sys-power/thermald/thermald-2.5.9.ebuild index a45c7071a9a0..24fd168dbe76 100644 --- a/sys-power/thermald/thermald-2.5.7.ebuild +++ b/sys-power/thermald/thermald-2.5.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,13 +8,13 @@ inherit autotools linux-info out-of-source systemd DESCRIPTION="Thermal daemon for Intel architectures" HOMEPAGE="https://github.com/intel/thermal_daemon" SRC_URI="https://github.com/intel/thermal_daemon/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S=${WORKDIR}/thermal_daemon-${PV} LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" RDEPEND=" - dev-libs/dbus-glib:= dev-libs/glib:= dev-libs/libxml2:= dev-libs/libevdev @@ -24,7 +24,6 @@ DEPEND="${RDEPEND} dev-util/gtk-doc dev-util/glib-utils" -S=${WORKDIR}/thermal_daemon-${PV} DOCS=( thermal_daemon_usage.txt README.txt ) CONFIG_CHECK="~PERF_EVENTS_INTEL_RAPL ~X86_INTEL_PSTATE ~INTEL_POWERCLAMP ~INT340X_THERMAL ~ACPI_THERMAL_REL ~INT3406_THERMAL" diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest index dbee0c812225..f421ef2fb01c 100644 --- a/sys-power/upower/Manifest +++ b/sys-power/upower/Manifest @@ -1,3 +1,3 @@ DIST upower-v1.90.4.tar.bz2 139422 BLAKE2B a06be2d483773a2115f4cdd4f7c023589ebc937846fc360341cd57d1a225f4dc1b448f50438216c3ae679effa86d61b96f7c4b9d59f6b0f30e9dcbc047a5cac7 SHA512 2db8f2fea4086939c7ec236674ddd03ff043eeb1c7e46deb40b45aed5d31b6eb0e84fa44f189336b0a171f3e2f92f2f50e2f355b9366e0d686e570d0107e88da -EBUILD upower-1.90.4-r1.ebuild 2872 BLAKE2B 28fb1cfe277ab2b8f1be8d7dd2103de963cedbbbb17ee32348d034b23186eebf25aec1093e93f5444d1a235a6ddfc96c7e5de530e15cfe3f205729575f6c5695 SHA512 06fc37690ca2e9d1e11a01ec6af4870dc2fe4be2735c387f840728e1a71ce1f233ec6f6f71c7dceba2f4215e01342a50ea1c762e30293f393f3de4b3d534beed +EBUILD upower-1.90.4-r1.ebuild 2834 BLAKE2B 2cf53f9246ecd8d28cbe358f142854c0f911eb592e0c09b12dc1d01b8029fe8d29f47602e43674e8f536480f8a3c13969729997e90c0571f8732b00b8649ab7f SHA512 99a77e3a30dd24bb55b4e6d9377dd9272b33af244b83fef0645d8dae49a6bfdd992ad55127edef70a9b421704d2e54804cb0203dd49f0ff0b6147356a29f7f34 MISC metadata.xml 319 BLAKE2B deed435a52138ca25bc6db202a294303839a6be54e3c257f25e25b8050ae30992fd18054cf568bcfd33e14211523a328546cf9732fc10844437994fa79e3f63d SHA512 47a7e588aee976740610165259518b427b425dc9aaff3afd74d4abb34717dd4ca23c0d062347a1257e192a56ce16d7793d4d58738d0cfd178adcc55992136194 diff --git a/sys-power/upower/upower-1.90.4-r1.ebuild b/sys-power/upower/upower-1.90.4-r1.ebuild index 27df80f7b519..c7585b1cacc0 100644 --- a/sys-power/upower/upower-1.90.4-r1.ebuild +++ b/sys-power/upower/upower-1.90.4-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit meson python-any-r1 systemd udev xdg-utils +inherit eapi9-ver meson python-any-r1 systemd udev xdg-utils DESCRIPTION="D-Bus abstraction for enumerating power devices, querying history and statistics" HOMEPAGE="https://upower.freedesktop.org/" @@ -99,7 +99,7 @@ src_install() { pkg_postinst() { udev_reload - if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 0.99.12; then + if ver_replacing -lt 0.99.12; then elog "Support for Logitech Unifying Receiver battery state readout was" elog "removed in version 0.99.12, these devices have been directly" elog "supported by the Linux kernel since version >=3.2." |