commit: 028e1e42a0d86a5853e7b3da54e24c08a25c27f7 Author: dsaf <ghostyn678+git <AT> gmail <DOT> com> AuthorDate: Fri Mar 6 03:30:37 2026 +0000 Commit: dsaf <ghostyn678+git <AT> gmail <DOT> com> CommitDate: Fri Mar 6 04:22:56 2026 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=028e1e42
sys-power/fan2go: drop *, add 0.13.0 * Add myself as a maintainer * Drop patches Signed-off-by: dsaf <ghostyn678+git <AT> gmail.com> sys-power/fan2go/Manifest | 6 +- sys-power/fan2go/fan2go-0.13.0.ebuild | 53 ++++++++++++++++ sys-power/fan2go/fan2go-0.9.1.ebuild | 53 ---------------- sys-power/fan2go/fan2go-0.9.2.ebuild | 53 ---------------- .../fan2go/files/fan2go-0.9.0-fix-tests.patch | 74 ---------------------- sys-power/fan2go/metadata.xml | 5 +- 6 files changed, 59 insertions(+), 185 deletions(-) diff --git a/sys-power/fan2go/Manifest b/sys-power/fan2go/Manifest index 23951cdec2..87b6b91e38 100644 --- a/sys-power/fan2go/Manifest +++ b/sys-power/fan2go/Manifest @@ -1,4 +1,2 @@ -DIST fan2go-0.9.1-vendor.tar.xz 2259140 BLAKE2B defe7e58861dc5162894e2c125589ffd8ba8dbada4e20d6e50cc97dc4f407f9d46b620e46096a3e67b5cf6dbf638e21bbaeaa79e0fccfe098f2658b967a776ca SHA512 74b26fc367ecc495d51204d4ca124711818a55a34449b578189ab859b11cfa104d2260a27054b105da4ee59f22c33924f46feef3bd2c40e3fafed7145fc4bd18 -DIST fan2go-0.9.1.tar.gz 201351 BLAKE2B c681c9191a0ee94865f34feb9c55c368763d9f544136d90ae894f3a7621385350d0d6fbd8c0aa79ad74b383f552f3d352ace2210d0119cf7f7d18a7bf63f1f0f SHA512 a4360f6df5858a2aa7051a53424db6dbe42b013a232f2c1a9b1ec174a01b2f7a66878a09585cfeb6493eaa982578d62ab7417374e305002076dc7681498b581c -DIST fan2go-0.9.2-vendor.tar.xz 2261708 BLAKE2B 797be795caa672b2c4b82da83475417ecc75874e505a7318ccf172ffacf1f4619ba864612d809b3543540d085c561b807e00f0a162595d27c96c83004bdd9ffc SHA512 470436e82238355a3f36de155f033c93e2c8a693839c488622b40985c328268c4d314f176102484efe78049e69ccdf79040c448615b4e82f0f117bbe674affea -DIST fan2go-0.9.2.tar.gz 202315 BLAKE2B af36f5cf9771ef88c997144b8bd0396240228008b08f968b9557b189031bb200156fa57a0168e9a118c24db514563c2cadb8e3b9c6d5aaf55883e4d25e412e1b SHA512 0d3f8b9dea65fb06fcaec9ada59a21e28a6fe2d7bbd129b620522423bcb63675018a7f0e2124b95bba987ae11179a3f44059cc4d0277109e89d2eac85f0c9d4e +DIST fan2go-0.13.0-vendor.tar.xz 2502196 BLAKE2B 27296a117d6f9f4c683f0ae369b1db94f216d890d473ea68e50b7f1ea766c8ff91de53610a0393f9aee0ef95da283fc8c8ce6cec2f18aca3c289b94806ac8624 SHA512 50f0da6b564c86221f27a5ebb466753105caab4cc6a6037290f28286dbd79eaab724aae52120075e2311844a9f1f7b7ab0054a3c1dd7f745cf28ad653b6cf5e8 +DIST fan2go-0.13.0.tar.gz 240777 BLAKE2B e181d6585ac712a909eecf677df5786b995c9addb84717048708189e913fe7d7329ca9c741aab32cbeec18310fa76dfe1705370898b10ad75f55a2e44098fa39 SHA512 650b486ad72e7ea5e16f97d3881bdbd3e96d0d4adec156ce13e4f5088bdff288785b7d4aa8015397aed7f81c069231448057a2509ff085d24d049f6fdf1e9b52 diff --git a/sys-power/fan2go/fan2go-0.13.0.ebuild b/sys-power/fan2go/fan2go-0.13.0.ebuild new file mode 100644 index 0000000000..bfcb1804c9 --- /dev/null +++ b/sys-power/fan2go/fan2go-0.13.0.ebuild @@ -0,0 +1,53 @@ +# Copyright 2022-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module shell-completion systemd + +DESCRIPTION="A simple daemon providing dynamic fan speed control" +HOMEPAGE="https://github.com/markusressel/fan2go"; +SRC_URI="https://github.com/markusressel/fan2go/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://github.com/dsafxP/gentoo-distfiles/releases/download/${P}a/${P}-vendor.tar.xz"; + +LICENSE="AGPL-3" +# Dependent licenses +LICENSE+=" Apache-2.0 BSD ISC MIT" +SLOT="0" + +KEYWORDS="~amd64" + +DEPEND="sys-apps/lm-sensors" +RDEPEND="${DEPEND}" + +src_compile() { + local src_date_epoch=$(date +%s || die) + local date=$(date -u -d @${src_date_epoch} +"%Y-%m-%dT%H:%M:%SZ" || die) + local package=${HOMEPAGE#*://} + + ego build ${GOFLAGS} -v -x \ + -ldflags "-extldflags=-Wl,-z,lazy \ + -X ${PN}/cmd/global.Version=${PN} \ + -X ${package}/cmd/global.Version=${PN} \ + -X ${PN}/cmd/global.Date=${date} \ + -X ${package}/cmd/global.Date=${date}" \ + -tags netgo -o ${PN} main.go + + ./${PN} completion fish > ${PN}.fish || die + ./${PN} completion bash > ${PN}.bash || die + ./${PN} completion zsh > ${PN}.zsh || die +} + +src_install() { + dobin ${PN} + einstalldocs + + systemd_dounit fan2go.service + + insinto /etc/fan2go + doins fan2go.yaml + + newbashcomp "${PN}.bash" "${PN}" + dofishcomp "${PN}.fish" + newzshcomp "${PN}.zsh" "_${PN}" +} diff --git a/sys-power/fan2go/fan2go-0.9.1.ebuild b/sys-power/fan2go/fan2go-0.9.1.ebuild deleted file mode 100644 index af0fa3633b..0000000000 --- a/sys-power/fan2go/fan2go-0.9.1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit go-module shell-completion systemd - -DESCRIPTION="A simple daemon providing dynamic fan speed control" -HOMEPAGE="https://github.com/markusressel/fan2go"; -SRC_URI="https://github.com/markusressel/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" https://gentoo.kropotkin.rocks/go-pkgs/${P}-vendor.tar.xz"; - -LICENSE="AGPL-3 Apache-2.0 MIT BSD BSD-2 MIT MPL-2.0" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND="sys-apps/lm-sensors" -RDEPEND="${DEPEND}" - -src_compile() { - SOURCE_DATE_EPOCH=$(date +%s || die) - DATE=$(date -u -d @${SOURCE_DATE_EPOCH} +"%Y-%m-%dT%H:%M:%SZ" || die) - - ego \ - build \ - -o fan2go \ - -x \ - -v \ - ${GOFLAGS} \ - -ldflags "-X fan2go/cmd.version=${PV} -X fan2go/cmd.date=${DATE}" \ - -a \ - -tags netgo \ - . - - ./fan2go completion fish > fan2go.fish || die - ./fan2go completion bash > fan2go.bash || die - ./fan2go completion zsh > fan2go.zsh || die -} - -src_install() { - dobin fan2go - dodoc README.md - systemd_dounit fan2go.service - insinto /etc/fan2go - doins fan2go.yaml - newbashcomp "${PN}.bash" "${PN}" - dofishcomp "${PN}.fish" - newzshcomp "${PN}.zsh" "_${PN}" -} - -src_test() { - ego test -v ./... || die -} diff --git a/sys-power/fan2go/fan2go-0.9.2.ebuild b/sys-power/fan2go/fan2go-0.9.2.ebuild deleted file mode 100644 index af0fa3633b..0000000000 --- a/sys-power/fan2go/fan2go-0.9.2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit go-module shell-completion systemd - -DESCRIPTION="A simple daemon providing dynamic fan speed control" -HOMEPAGE="https://github.com/markusressel/fan2go"; -SRC_URI="https://github.com/markusressel/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" https://gentoo.kropotkin.rocks/go-pkgs/${P}-vendor.tar.xz"; - -LICENSE="AGPL-3 Apache-2.0 MIT BSD BSD-2 MIT MPL-2.0" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND="sys-apps/lm-sensors" -RDEPEND="${DEPEND}" - -src_compile() { - SOURCE_DATE_EPOCH=$(date +%s || die) - DATE=$(date -u -d @${SOURCE_DATE_EPOCH} +"%Y-%m-%dT%H:%M:%SZ" || die) - - ego \ - build \ - -o fan2go \ - -x \ - -v \ - ${GOFLAGS} \ - -ldflags "-X fan2go/cmd.version=${PV} -X fan2go/cmd.date=${DATE}" \ - -a \ - -tags netgo \ - . - - ./fan2go completion fish > fan2go.fish || die - ./fan2go completion bash > fan2go.bash || die - ./fan2go completion zsh > fan2go.zsh || die -} - -src_install() { - dobin fan2go - dodoc README.md - systemd_dounit fan2go.service - insinto /etc/fan2go - doins fan2go.yaml - newbashcomp "${PN}.bash" "${PN}" - dofishcomp "${PN}.fish" - newzshcomp "${PN}.zsh" "_${PN}" -} - -src_test() { - ego test -v ./... || die -} diff --git a/sys-power/fan2go/files/fan2go-0.9.0-fix-tests.patch b/sys-power/fan2go/files/fan2go-0.9.0-fix-tests.patch deleted file mode 100644 index b6c847480a..0000000000 --- a/sys-power/fan2go/files/fan2go-0.9.0-fix-tests.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/internal/fans/cmd_test.go b/internal/fans/cmd_test.go -index cb94f26..1a086e9 100644 ---- a/internal/fans/cmd_test.go -+++ b/internal/fans/cmd_test.go -@@ -5,8 +5,15 @@ import ( - "github.com/markusressel/fan2go/internal/util" - "github.com/stretchr/testify/assert" - "testing" -+ "os/exec" - ) - -+func getEchoPath() string { -+ // unlikely to fail -+ p, _ := exec.LookPath("echo") -+ return p -+} -+ - func TestCmdFan_NewFan(t *testing.T) { - // GIVEN - config := configuration.FanConfig{ -@@ -132,7 +139,7 @@ func TestCmdFan_GetRpm(t *testing.T) { - config := configuration.FanConfig{ - Cmd: &configuration.CmdFanConfig{ - GetRpm: &configuration.ExecConfig{ -- Exec: "/usr/bin/echo", -+ Exec: getEchoPath(), - Args: []string{"1000"}, - }, - }, -@@ -171,7 +178,7 @@ func TestCmdFan_GetRpm_ParseError(t *testing.T) { - config := configuration.FanConfig{ - Cmd: &configuration.CmdFanConfig{ - GetRpm: &configuration.ExecConfig{ -- Exec: "/usr/bin/echo", -+ Exec: getEchoPath(), - Args: []string{"not_a_number"}, - }, - }, -@@ -226,7 +233,7 @@ func TestCmdFan_GetRpmAvg(t *testing.T) { - config := configuration.FanConfig{ - Cmd: &configuration.CmdFanConfig{ - GetRpm: &configuration.ExecConfig{ -- Exec: "/usr/bin/echo", -+ Exec: getEchoPath(), - Args: []string{"1000"}, - }, - }, -@@ -262,7 +269,7 @@ func TestCmdFan_GetPwm(t *testing.T) { - config := configuration.FanConfig{ - Cmd: &configuration.CmdFanConfig{ - GetPwm: &configuration.ExecConfig{ -- Exec: "/usr/bin/echo", -+ Exec: getEchoPath(), - Args: []string{"255"}, - }, - }, -@@ -282,7 +289,7 @@ func TestCmdFan_SetPwm(t *testing.T) { - config := configuration.FanConfig{ - Cmd: &configuration.CmdFanConfig{ - SetPwm: &configuration.ExecConfig{ -- Exec: "/usr/bin/echo", -+ Exec: getEchoPath(), - Args: []string{"%pwm%"}, - }, - }, -@@ -476,7 +483,7 @@ func TestCmdFan_Supports_RpmSensor_True(t *testing.T) { - config := configuration.FanConfig{ - Cmd: &configuration.CmdFanConfig{ - GetRpm: &configuration.ExecConfig{ -- Exec: "/usr/bin/echo", -+ Exec: getEchoPath(), - Args: []string{"1000"}, - }, - }, diff --git a/sys-power/fan2go/metadata.xml b/sys-power/fan2go/metadata.xml index 147a50f460..bdbd4c9b74 100644 --- a/sys-power/fan2go/metadata.xml +++ b/sys-power/fan2go/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>[email protected]</email> + <name>dsaf</name> + </maintainer> <upstream> <remote-id type="github">markusressel/fan2go</remote-id> <bugs-to>https://github.com/markusressel/fan2go/issues</bugs-to>
