community/cpupower: upgrade to 5.4.35

Also add -openrc and -bash-completion subpackages and clean the APKBUILD
up a bit

2 files changed, 49 insertions, 52 deletions

diff --git a/community/cpupower/APKBUILD b/community/cpupower/APKBUILD
index 95db8f0353..92c00ac367 100644
--- a/community/cpupower/APKBUILD
+++ b/community/cpupower/APKBUILD
@@ -1,43 +1,38 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Ben Allen <bensallen@me.com>
 pkgname=cpupower
-_kver=4.4.14
-_kpkgrel=2
-
-pkgver=$_kver
-pkgrel=$_kpkgrel
+pkgver=5.4.35
+pkgrel=0
 pkgdesc="Linux kernel tool to examine and tune power saving related features of your processor"
 url="https://www.kernel.org/"
 arch="all"
-license="GPL-2.0"
+license="GPL-2.0-only"
 depends_dev="pciutils-dev readline-dev"
-makedepends="$depends_dev bash linux-headers"
-subpackages="$pkgname-doc $pkgname-dev"
+makedepends="$depends_dev bash linux-headers gettext-dev"
+subpackages="$pkgname-doc $pkgname-dev $pkgname-openrc $pkgname-bash-completion"
 replaces="linux-tools-cpupower"
-source="https://kernel.org/pub/linux/kernel/v4.x/linux-$pkgver.tar.xz
+source="https://kernel.org/pub/linux/kernel/v5.x/linux-$pkgver.tar.xz
+	nls.patch
 	cpupower.initd
 	cpupower.confd
-	nls.patch
 	"
-
-builddir="$srcdir"/linux-$pkgver
+options="!check" # no tests
+builddir="$srcdir"/linux-$pkgver/tools/power/cpupower
 
 build() {
-	cd "$builddir"/tools/power/cpupower
 	make NLS=false VERSION=$pkgver-$pkgrel
 }
 
 package() {
-	cd "$builddir"/tools/power/cpupower
-	make NLS=false DESTDIR="$pkgdir" mandir="/usr/share/man" install || return 1
+	make NLS=false VERSION=$pkgver-$pkgrel DESTDIR="$pkgdir" libdir=/usr/lib mandir=/usr/share/man install
 
 	install -Dm755 "$srcdir"/$pkgname.initd \
-		"$pkgdir"/etc/init.d/$pkgname || return 1
+		"$pkgdir"/etc/init.d/$pkgname
 	install -Dm644 "$srcdir"/$pkgname.confd \
-		"$pkgdir"/etc/conf.d/$pkgname || return 1
+		"$pkgdir"/etc/conf.d/$pkgname
 }
 
-sha512sums="c9d4f3e8949cfb715ff2fc4169a12938132f967ad509c154f5c8598c70ac14989364083f1ab29c2fbab120945363f1343f2a30819df9be53938d4ef43391dbc5  linux-4.4.14.tar.xz
+sha512sums="66daf0192339450b0838cd1aef013ea8675f8687e2271d8d9b79c842e8cb081541788eb16fb0b6e5cd0b15617be67813c53a4db2d2e63219f3c64e692c325c5d  linux-5.4.35.tar.xz
+3f95439c334a5b1dd173c4ed2e58721d4687177e3b4070b375deaca38062bd88af352838acbff8b2bc8f5e624359ce8dd604091adb940b2232520e60ba65fbf0  nls.patch
 97ecfeaaaa8efca7af585316b843bf7be885e88095bbdfbf52bc9a96b14dc862435482781e205ea022ab208978aaa4aabb317354fab890ed514a5088ae5045c8  cpupower.initd
-63cd12a4d8782198c71662e9205e346e064b65bae5e3e175b5bc43bdf7ec6ddf675b60349750afe3c37c8a925f9ae9a93530671821342581bd282a69e0773b8c  cpupower.confd
-f4e8365ddccc26f3dec66311fac04560661934f9ddb888d48c2e67818a0647883e13e8542149f7981f532ff58c002e901ca543061cd0c46c29ea089dfe3ceafe  nls.patch"
+63cd12a4d8782198c71662e9205e346e064b65bae5e3e175b5bc43bdf7ec6ddf675b60349750afe3c37c8a925f9ae9a93530671821342581bd282a69e0773b8c  cpupower.confd"
diff --git a/community/cpupower/nls.patch b/community/cpupower/nls.patch
index 24f5afd45f..28c74eb19c 100644
--- a/community/cpupower/nls.patch
+++ b/community/cpupower/nls.patch
@@ -1,8 +1,8 @@
-diff --git a/tools/power/cpupower/utils/cpupower-info.c b/tools/power/cpupower/utils/cpupower-info.c
-index 10299f2..b26cc08 100644
---- a/tools/power/cpupower/utils/cpupower-info.c
-+++ b/tools/power/cpupower/utils/cpupower-info.c
-@@ -41,8 +41,10 @@ int cmd_info(int argc, char **argv)
+diff --git a/utils/cpupower-info.c b/utils/cpupower-info.c
+index 4c9d342b7..91b43d67c 100644
+--- a/utils/cpupower-info.c
++++ b/utils/cpupower-info.c
+@@ -39,8 +39,10 @@ int cmd_info(int argc, char **argv)
  	} params = {};
  	int ret = 0;
  
@@ -13,11 +13,11 @@ index 10299f2..b26cc08 100644
  
  	/* parameter parsing */
  	while ((ret = getopt_long(argc, argv, "b", set_opts, NULL)) != -1) {
-diff --git a/tools/power/cpupower/utils/cpupower-set.c b/tools/power/cpupower/utils/cpupower-set.c
-index 3e6f374..a40b50d 100644
---- a/tools/power/cpupower/utils/cpupower-set.c
-+++ b/tools/power/cpupower/utils/cpupower-set.c
-@@ -43,8 +43,10 @@ int cmd_set(int argc, char **argv)
+diff --git a/utils/cpupower-set.c b/utils/cpupower-set.c
+index 3cd95c6cb..7f8698493 100644
+--- a/utils/cpupower-set.c
++++ b/utils/cpupower-set.c
+@@ -41,8 +41,10 @@ int cmd_set(int argc, char **argv)
  	int perf_bias = 0;
  	int ret = 0;
  
@@ -28,11 +28,11 @@ index 3e6f374..a40b50d 100644
  
  	params.params = 0;
  	/* parameter parsing */
-diff --git a/tools/power/cpupower/utils/cpupower.c b/tools/power/cpupower/utils/cpupower.c
-index 9ea9143..24d19db 100644
---- a/tools/power/cpupower/utils/cpupower.c
-+++ b/tools/power/cpupower/utils/cpupower.c
-@@ -189,8 +189,10 @@ int main(int argc, const char *argv[])
+diff --git a/utils/cpupower.c b/utils/cpupower.c
+index 8e3d08042..0ab891d3a 100644
+--- a/utils/cpupower.c
++++ b/utils/cpupower.c
+@@ -191,8 +191,10 @@ int main(int argc, const char *argv[])
  		return EXIT_FAILURE;
  	}
  
@@ -43,11 +43,11 @@ index 9ea9143..24d19db 100644
  
  	/* Turn "perf cmd --help" into "perf help cmd" */
  	if (argc > 1 && !strcmp(argv[1], "--help")) {
-diff --git a/tools/power/cpupower/utils/helpers/helpers.h b/tools/power/cpupower/utils/helpers/helpers.h
-index aa9e954..261692a 100644
---- a/tools/power/cpupower/utils/helpers/helpers.h
-+++ b/tools/power/cpupower/utils/helpers/helpers.h
-@@ -10,13 +10,13 @@
+diff --git a/utils/helpers/helpers.h b/utils/helpers/helpers.h
+index 357b19bb1..cde3a9f6f 100644
+--- a/utils/helpers/helpers.h
++++ b/utils/helpers/helpers.h
+@@ -9,7 +9,6 @@
  #ifndef __CPUPOWERUTILS_HELPERS__
  #define __CPUPOWERUTILS_HELPERS__
  
@@ -55,18 +55,20 @@ index aa9e954..261692a 100644
  #include <locale.h>
  
  #include "helpers/bitmask.h"
- 
+@@ -18,6 +17,8 @@
  /* Internationalization ****************************/
  #ifdef NLS
-+#include <libintl.h>
  
++#include <libintl.h>
++
  #define _(String) gettext(String)
  #ifndef gettext_noop
-diff --git a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
-index 05f953f..dec8ff9 100644
---- a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
-+++ b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
-@@ -268,7 +268,7 @@ void list_monitors(void)
+ #define gettext_noop(String) String
+diff --git a/utils/idle_monitor/cpupower-monitor.c b/utils/idle_monitor/cpupower-monitor.c
+index 3d54fd433..7026e3367 100644
+--- a/utils/idle_monitor/cpupower-monitor.c
++++ b/utils/idle_monitor/cpupower-monitor.c
+@@ -273,7 +273,7 @@ void list_monitors(void)
  			 * percent, time (granlarity)
  			 */
  			printf("%s\t[%c] -> %s\n", s.name, range_abbr[s.range],
@@ -75,11 +77,11 @@ index 05f953f..dec8ff9 100644
  		}
  	}
  }
-diff --git a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h
-index 9e43f33..d96d618 100644
---- a/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h
-+++ b/tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h
-@@ -60,7 +60,7 @@ extern long long timespec_diff_us(struct timespec start, struct timespec end);
+diff --git a/utils/idle_monitor/cpupower-monitor.h b/utils/idle_monitor/cpupower-monitor.h
+index eafef38f1..f3e44f063 100644
+--- a/utils/idle_monitor/cpupower-monitor.h
++++ b/utils/idle_monitor/cpupower-monitor.h
+@@ -67,7 +67,7 @@ extern long long timespec_diff_us(struct timespec start, struct timespec end);
  
  #define print_overflow_err(mes, ov)						\
  {										\