gentoo auto-resync : 10:11:2024 - 21:02:06

6 files changed, 53 insertions, 66 deletions

diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 0a8c9f756259..f7b8595e3ae1 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/sandmann-bin/Manifest b/sys-power/sandmann-bin/Manifest
index 71201016d401..b4fdd714c2cb 100644
--- a/sys-power/sandmann-bin/Manifest
+++ b/sys-power/sandmann-bin/Manifest
@@ -1,5 +1,3 @@
-DIST sandmann-1.0.tar.xz 16661756 BLAKE2B 06a2ce44a0498987ce1dfafaa0aee560c2deef69efc7cfd6191dd12e265be21b15b167d7adc01066343a777cf66c88b2ec5d95f46fede003f80676966ad95ad3 SHA512 e9f5f41b4f2bf45f7d4528baf593f4f120e5a9c4eacf13a4c0961ba66f8ed5877abb3f10b6b35679dc56f2e55e80e0cc6bb3a42800859ff40354b0a750b16d66
 DIST sandmann-1.2.tar.xz 16868444 BLAKE2B b4e6bfefedc31af3b1fcb9c5b05349a23eb6150296dff6ee74a6626e6f6914a244bb7bb22ece4a28daa699f3291f1b7194307f1b524ed0c8ab924587e5b001f6 SHA512 44a3287f61361d0594988715ef8d302d772dbec40a50054c5091642cbba18ef006ddb59e52303f9482ddb66de6006ef340b3726be7486cdb40092302e5aa5501
-EBUILD sandmann-bin-1.0.ebuild 1114 BLAKE2B b9af7c75bd53a650f549ad08b1cc9ad5567c6d2134d38a6552f7349c25c68ce59df58ddc1473d6e0da3e76eee966537acb1dd35b1f3112cce4a4a314f72000a3 SHA512 45329cb8d4b3bb762a1426b82dad7093d91113d276f8b805f8b3e40201e4e707cc8b312958a3663a0bab431281e612812f7fff5492297b3ff4ec362da25ff623
-EBUILD sandmann-bin-1.2.ebuild 1090 BLAKE2B 9cdc08662e69d764676ba8942b7d68577ba3858aa7ac002e513662f32c8f01739b9f79569ed2d6fd96f75bed1f90ce8492a834ca967b6b457cafa9435e760540 SHA512 90773340d9e8efe48f1d78ce0b3fcf42cfe94b68a992cae7955f9c208d33ad1f09e44a118e6f3439c5ebbb329766cefd2de74e5c9d9fb73e150a6a1b2653922e
+EBUILD sandmann-bin-1.2.ebuild 1089 BLAKE2B 06708a68265a9e98a1459b4aa98cfffb5d5fabec6306c815708ca4e8eec7d891edf08e09803d3dfe8f7d17daa748d375d6854c6bd23633f5cc9661bf11ca2f95 SHA512 3409d59899d567db3f96fad33cc79a5ebb1b7a7fda058cb9e4690eed94c187069ec07d03a3e5241d11da387c4f68b295b535f172aac490e3ad0ee724e4c6a838
 MISC metadata.xml 325 BLAKE2B e4545d64288ea3ddffc1d9b15b821818525ea3067d6210b13892fbfec6e1e0b7467c27e3f5b6e41462b34f8d68c67237295d35a0b73c7357170e69678c9671d7 SHA512 dffb9f5183d36bf676faba8d414c9597aede9c2222218e31ccecbbaf152a869b0aa6f36e09cbfd2bfab8349869074ca8883d12682eb6a738bef01581cc9e7845
diff --git a/sys-power/sandmann-bin/sandmann-bin-1.0.ebuild b/sys-power/sandmann-bin/sandmann-bin-1.0.ebuild
deleted file mode 100644
index d42f123b88a5..000000000000
--- a/sys-power/sandmann-bin/sandmann-bin-1.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-utils-2 systemd tmpfiles
-
-MY_PN=${PN%-bin}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="An autosuspend and wakeup daemon"
-HOMEPAGE="https://gitlab.com/Flow/sandmann"
-SRC_URI="https://geekplace.eu/projects/${MY_PN}/archive/${MY_P}.tar.xz"
-KEYWORDS="amd64"
-
-LICENSE="GPL-3+ LGPL-3"
-SLOT="0"
-
-# >=java-config-2.3.2 to get the libdir fix.
-RDEPEND="
-	acct-user/sandmann
-	>=dev-java/java-config-2.3.2
-	sys-apps/systemd
-	sys-auth/polkit
-	|| (
-		virtual/jre:17
-		virtual/jre:21
-	)
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's|^ExecStart=.*|ExecStart=/usr/bin/sandmann|' \
-		sandmann.service || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	local my_emake_args=(
-		DESTDIR="${D}"
-		SYSTEMD_SYSTEM_UNIT_DIR="$(systemd_get_systemunitdir)"
-		TARGET_BINARY=
-		SOURCELESS_INSTALL=true
-	)
-
-	emake ${my_emake_args[@]} install
-
-	java-pkg_newjar out/main/assembly.dest/out.jar sandmann.jar
-	java-pkg_dolauncher sandmann
-
-	dodoc README.md
-}
-
-pkg_postinst() {
-	tmpfiles_process sandmann.conf
-}
diff --git a/sys-power/sandmann-bin/sandmann-bin-1.2.ebuild b/sys-power/sandmann-bin/sandmann-bin-1.2.ebuild
index 601f1616d2cf..62f852a65ff8 100644
--- a/sys-power/sandmann-bin/sandmann-bin-1.2.ebuild
+++ b/sys-power/sandmann-bin/sandmann-bin-1.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-3+ LGPL-3"
 SLOT="0"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # >=java-config-2.3.2 to get the libdir fix.
 RDEPEND="
diff --git a/sys-power/throttled/Manifest b/sys-power/throttled/Manifest
index b8f98228ff37..b409b12aec2c 100644
--- a/sys-power/throttled/Manifest
+++ b/sys-power/throttled/Manifest
@@ -1,5 +1,7 @@
 AUX throttled.initd 138 BLAKE2B 5f032097afb1a6aa1e7cf17c01416dafeeb16d758ebac50854f1583e788598749678ae87e8efb085ba14d4d6a669f0e6cb17360f406c431c561b3b05e7aea231 SHA512 35ce59d72146d641eefcbb8aad026677204af421526ee6b34cb799338b1b109f5a21eee8dcb6562758a2d0c2d75ece80dea128d461bde05ee149ca9efbd0c99b
 AUX throttled.service 251 BLAKE2B 2eee705a40bcdd273cb52757330083ad82018814bfa6fa52cffc29e4709ee608e5253022ff547ee9447242d06db138da4846d2ba632596a79867cc5a6f14906d SHA512 66a47dc1349a18115868cc0a92739dc19b4f141e3ae6b65beebdb2add902013488ec33ac224075c261e788a36631f7d8ba7e3249c537bc04b499d1f03acf4239
 DIST throttled-0.10.0.gh.tar.gz 22191 BLAKE2B c301ee070ff462acd613c90525209eb5237c57e7171bf25133535f9c9a50d226b919065d8f6999f95b45f7f0d4c30e63abb5e04ec768d76b3c82dd19f092a693 SHA512 b89c467295bfc592d7b3ce0c4a41fedf436acf8067f8ef63d8596b92343ed8e04d371d065a9e35fdddba40772f12255c30960c2c46f0cbd5093bfc5e72fb4e18
+DIST throttled-0.11.gh.tar.gz 22195 BLAKE2B d45b8fe04c92dfd2903c1777a3d2bd017cfa4d4f740fa7f7dfc384b4ca902552b386f3e92112dcc57bd6b25644c9bf63a987f9ad4d7c81d3bcfa0a445c1cedfa SHA512 f60ce27d17abd6ddd7db6b77a80ac80e129fba24bbc2d21608d1cc8ed2b0131dac2f53d3fea07ac24f994850146e553c6d4c7fc0dedffee109a1aa6df8684c7a
 EBUILD throttled-0.10.0.ebuild 998 BLAKE2B 98d61163d187c1d4c4b5da57f758625673645efc73e1b24b352796e01b3d74d6839cb58c6842508ea8bb8058f768b88f8ec0fbd9307d6ec1e8acfc2eaa2b87fd SHA512 9668ca181a1a6f3146549c7b0dfbbce9443a264bc3cccae6f2e5a860f1a821f1bc2446470150bf2498c6cbe79166e522af07045639df59d9ad9bb0df04af0c4f
+EBUILD throttled-0.11.ebuild 1142 BLAKE2B 8a45b704da57b087900e65833c2e156fc6f66ae832cc168a4b7e0b24e5fe5bbdb89127821c7f7dca3f7ab7f767aec9ef7b90eec42648683fe88ab8b471b88835 SHA512 fd6a7aaa98e8598fe12457531a1e6cac17dba034b7328405a0ddefaddd102febd8156c233fc2a93f8b66b0a17bc5efe12d3958d871f19ba8184bfe447d3a9add
 MISC metadata.xml 600 BLAKE2B e55795b1a0947d87afa39d04ba63755c97c173ab201234efe87e49833d3a41dd74a98ac2aee22bab0e4f723e34b6a36e999f07f8c71cf78915fef6fb1c11f273 SHA512 1f0ad49b2c3b2703f8508b87a63ec2fa695fc77a769ad34d9a0bd19359cab2305582211552586cd3ec608cd6a0c64ed7c5928d7ffaddcf8a50baeb348fc362bd
diff --git a/sys-power/throttled/throttled-0.11.ebuild b/sys-power/throttled/throttled-0.11.ebuild
new file mode 100644
index 000000000000..955b3325dd7f
--- /dev/null
+++ b/sys-power/throttled/throttled-0.11.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit linux-info python-single-r1 systemd
+
+DESCRIPTION="Daemon to work around throttling issues on some Intel laptops"
+HOMEPAGE="https://github.com/erpalma/throttled"
+SRC_URI="https://github.com/erpalma/throttled/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+CONFIG_CHECK="~X86_MSR ~DEVMEM"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pygobject[${PYTHON_USEDEP}]
+	')
+	sys-apps/pciutils
+	test? ( dev-python/pytest-import-check )
+"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_test() {
+	epytest -p no:python --import-check mmio.py throttled.py
+}
+
+src_install() {
+	default
+	python_newscript throttled.py throttled
+	python_domodule mmio.py
+	newinitd "${FILESDIR}/throttled.initd" throttled
+	systemd_dounit "${FILESDIR}/throttled.service"
+	insinto /etc
+	doins etc/throttled.conf
+}