[gentoo-commits] repo/gentoo:master commit in: sys-power/powerstat/

["Eli Schwartz" <eschwartz@gentoo.org>]

commit:     0bf2ff5a02f001973e626a2cf5f8904aae689149
Author:     Vladimir Pavljuchenkov <spiderx <AT> spiderx <DOT> dp <DOT> ua>
AuthorDate: Tue Aug 20 20:23:04 2024 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Fri Aug 23 02:03:13 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bf2ff5a

sys-power/powerstat: version bump to 0.04.03, update live ebuild

Closes: https://bugs.gentoo.org/938243

Signed-off-by: Vladimir Pavljuchenkov <spiderx <AT> spiderx.dp.ua>
Closes: https://github.com/gentoo/gentoo/pull/38224
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 sys-power/powerstat/Manifest                                |  1 +
 .../{powerstat-9999.ebuild => powerstat-0.04.03.ebuild}     | 13 ++++++++++---
 sys-power/powerstat/powerstat-9999.ebuild                   | 13 ++++++++++---
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/sys-power/powerstat/Manifest b/sys-power/powerstat/Manifest
index e12e0993ee14..d55dcfbb9c48 100644
--- a/sys-power/powerstat/Manifest
+++ b/sys-power/powerstat/Manifest
@@ -1 +1,2 @@
 DIST powerstat-0.02.27.tar.gz 62629 BLAKE2B d7fe4b517d9a4d91003c7a263ed77bba24457ce20639e420658c3735176952f3283e2bbc64ec597d88b6206e431c29f75ea9b133331a6652f021f667d9466ccc SHA512 3bbab9ed88000b277d75f94d9d3e180944d6c8619cf5e7e8b783c9d303fadde47fe9347e93ac7f54c52687afb456bc26c590712486f589602f93058cd144922f
+DIST powerstat-0.04.03.tar.gz 63790 BLAKE2B d8cc04873ebdeafa642a3c2676f7f5e91b9573e067c6f23928c577c87c8e73532baa47052f0ba99910a828c1c398a7e79d51409b383ae961826c76a92699a38e SHA512 41655929d498720373a9dfc736d7a29987529dbb92643d2883da3cfda4935a4574893962651ce87e43929c070202086ba21317c034f346720c3d9683cf9523b7

diff --git a/sys-power/powerstat/powerstat-9999.ebuild b/sys-power/powerstat/powerstat-0.04.03.ebuild
similarity index 61%
copy from sys-power/powerstat/powerstat-9999.ebuild
copy to sys-power/powerstat/powerstat-0.04.03.ebuild
index 0f707208abf8..82bd7c280e91 100644
--- a/sys-power/powerstat/powerstat-9999.ebuild
+++ b/sys-power/powerstat/powerstat-0.04.03.ebuild
@@ -3,24 +3,31 @@
 
 EAPI=8
 
-inherit git-r3 toolchain-funcs
+inherit bash-completion-r1 toolchain-funcs
 
 DESCRIPTION="Laptop power measuring tool"
 HOMEPAGE="https://launchpad.net/ubuntu/+source/powerstat https://github.com/ColinIanKing/powerstat"
-EGIT_REPO_URI="https://github.com/ColinIanKing/${PN}.git"
+SRC_URI="https://github.com/ColinIanKing/${PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 
 src_prepare() {
 	default
 
-	# Don't compress manpages
+	# Don't compress manpages, respect CFLAGS
 	sed -i  -e '/install:/s/ powerstat.8.gz//' \
 		-e '/cp powerstat.8/s/.gz//' \
+		-e '/CFLAGS += -Wall/s| -O2||' \
 		Makefile || die "sed failed"
 }
 
 src_compile() {
 	emake CC="$(tc-getCC)"
 }
+
+src_install() {
+	default
+	dobashcomp bash-completion/powerstat
+}

diff --git a/sys-power/powerstat/powerstat-9999.ebuild b/sys-power/powerstat/powerstat-9999.ebuild
index 0f707208abf8..a4538d1cb047 100644
--- a/sys-power/powerstat/powerstat-9999.ebuild
+++ b/sys-power/powerstat/powerstat-9999.ebuild
@@ -3,11 +3,12 @@
 
 EAPI=8
 
-inherit git-r3 toolchain-funcs
+EGIT_REPO_URI="https://github.com/ColinIanKing/${PN}.git"
+
+inherit bash-completion-r1 git-r3 toolchain-funcs
 
 DESCRIPTION="Laptop power measuring tool"
 HOMEPAGE="https://launchpad.net/ubuntu/+source/powerstat https://github.com/ColinIanKing/powerstat"
-EGIT_REPO_URI="https://github.com/ColinIanKing/${PN}.git"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -15,12 +16,18 @@ SLOT="0"
 src_prepare() {
 	default
 
-	# Don't compress manpages
+	# Don't compress manpages, respect CFLAGS
 	sed -i  -e '/install:/s/ powerstat.8.gz//' \
 		-e '/cp powerstat.8/s/.gz//' \
+		-e '/CFLAGS += -Wall/s| -O2||' \
 		Makefile || die "sed failed"
 }
 
 src_compile() {
 	emake CC="$(tc-getCC)"
 }
+
+src_install() {
+	default
+	dobashcomp bash-completion/powerstat
+}