diff options
| -rw-r--r-- | x11-plugins/gkrellm-cpufreq/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-plugins/gkrellm-cpufreq/Manifest | 2 | ||||
| -rw-r--r-- | x11-plugins/gkrellm-cpufreq/files/gkrellm-cpufreq-0.6.4-use-cpupower.patch (renamed from x11-plugins/gkrellm-cpufreq/files/gkrellm-cpufreq-0.6.1-use-cpupower.patch) | 19 | ||||
| -rw-r--r-- | x11-plugins/gkrellm-cpufreq/gkrellm-cpufreq-0.6.4.ebuild (renamed from x11-plugins/gkrellm-cpufreq/gkrellm-cpufreq-0.6.1.ebuild) | 20 |
4 files changed, 35 insertions, 15 deletions
diff --git a/x11-plugins/gkrellm-cpufreq/ChangeLog b/x11-plugins/gkrellm-cpufreq/ChangeLog index 73e93e5..5803faa 100644 --- a/x11-plugins/gkrellm-cpufreq/ChangeLog +++ b/x11-plugins/gkrellm-cpufreq/ChangeLog @@ -1,7 +1,13 @@ # ChangeLog for x11-plugins/gkrellm-cpufreq -# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2018 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*gkrellm-cpufreq-0.6.4 (06 Jan 2018) + + 06 Jan 2018; Dustin Polke <DuPol@gmx.de> +gkrellm-cpufreq-0.6.4.ebuild, + -gkrellm-cpufreq-0.6.1.ebuild: + Version bump to 0.6.4. Drop old. + 31 Jan 2017; Dustin Polke <DuPol@gmx.de> metadata.xml: Fix repoman complaint about metadata. @@ -11,4 +17,3 @@ +files/gkrellm-cpufreq-0.6.1-use-cpupower.patch, +metadata.xml: Copy gkrellm-cpufreq-0.6.1.ebuild,v 1.4 from main tree and port it to cpupower. - diff --git a/x11-plugins/gkrellm-cpufreq/Manifest b/x11-plugins/gkrellm-cpufreq/Manifest index eec59c1..e57ab09 100644 --- a/x11-plugins/gkrellm-cpufreq/Manifest +++ b/x11-plugins/gkrellm-cpufreq/Manifest @@ -1 +1 @@ -DIST gkrellm2-cpufreq-0.6.1.tar.gz 13238 SHA256 ff0ce9f54f00979d1427da8660e9422696756f9d6290aa94d2689896e47049eb SHA512 29863f740acec09bc3ded30865d8049dba20430b4ba2a0f2386b12fd29a2befc0915dc96ab334b897c7670a5b9a2a1cdf8c3c5b27d04a1782bf06e8ab92d45cf WHIRLPOOL b116fc066676353f5bb29f94ea433930856ec54e6ca8665969597e6fca4e0806d0de36b30512f530777ec410d58bd99cab9575f341535b2deb721f43a43c1586 +DIST gkrellm2-cpufreq-0.6.4.tar.gz 13738 BLAKE2B 29090b31187f93ae098d8f2dd74c10c97df5e894bef4ec47bfe0cfca32180f3312e183c370e1a4506f800d9802e71e75ca157e81a219c7743d72d01dfd4bfe4e SHA512 e6a0a37cf41e96f46389658899add2cec751fd9f53548de47268ffd6a27aa2a90bfeeb263a9f91dc958d5255cda74fc61d2618b0d76db4cd84a4122c7245e452 diff --git a/x11-plugins/gkrellm-cpufreq/files/gkrellm-cpufreq-0.6.1-use-cpupower.patch b/x11-plugins/gkrellm-cpufreq/files/gkrellm-cpufreq-0.6.4-use-cpupower.patch index 5a6a2ce..bf88d4b 100644 --- a/x11-plugins/gkrellm-cpufreq/files/gkrellm-cpufreq-0.6.1-use-cpupower.patch +++ b/x11-plugins/gkrellm-cpufreq/files/gkrellm-cpufreq-0.6.4-use-cpupower.patch @@ -1,6 +1,14 @@ --- a/cpufreq.c +++ b/cpufreq.c -@@ -125,13 +125,13 @@ static void next_governor(unsigned int c +@@ -49,6 +49,7 @@ + + #include <gkrellm2/gkrellm.h> + #include <cpufreq.h> ++#include <cpupower.h> + + /* version number */ + #define VERSION "0.6.4" +@@ -125,13 +126,13 @@ static void next_governor(unsigned int c static void governor_userspace(unsigned int cpu) { char cmd[length]; @@ -16,6 +24,15 @@ system(cmd); } +@@ -616,7 +617,7 @@ GkrellmMonitor* gkrellm_init_plugin(void + monitor = &plugin_mon; + + /* determine number of cpus */ +- for( ncpu = 0; cpufreq_cpu_exists(ncpu)==0; ++ncpu ) ++ for( ncpu = 0; cpupower_is_cpu_online(ncpu)==0; ++ncpu ) + ; + ncpu = ncpu > NCPU_MAX ? NCPU_MAX : ncpu; + --- a/cpufreqnextgovernor +++ b/cpufreqnextgovernor @@ -3,10 +3,10 @@ diff --git a/x11-plugins/gkrellm-cpufreq/gkrellm-cpufreq-0.6.1.ebuild b/x11-plugins/gkrellm-cpufreq/gkrellm-cpufreq-0.6.4.ebuild index 3979198..59e9580 100644 --- a/x11-plugins/gkrellm-cpufreq/gkrellm-cpufreq-0.6.1.ebuild +++ b/x11-plugins/gkrellm-cpufreq/gkrellm-cpufreq-0.6.4.ebuild @@ -1,32 +1,30 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ -EAPI="5" +EAPI=6 inherit eutils gkrellm-plugin MY_P=${P/gkrellm/gkrellm2} DESCRIPTION="A Gkrellm2 plugin for displaying and manipulating CPU frequency" -HOMEPAGE="http://iacs.epfl.ch/~winkelma/gkrellm2-cpufreq/" -SRC_URI="http://iacs.epfl.ch/~winkelma/gkrellm2-cpufreq//${MY_P}.tar.gz" +HOMEPAGE="http://chw.populus.org/rub/7" +SRC_URI="http://christoph.winkelmann.googlepages.com/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="" S=${WORKDIR}/${MY_P} -RDEPEND="sys-power/cpupower +RDEPEND="app-admin/gkrellm:2[X] + sys-power/cpupower app-admin/sudo" -PLUGIN_SO=cpufreq.so +PATCHES=( "${FILESDIR}"/${P}-use-cpupower.patch ) -src_prepare() { - epatch "${FILESDIR}"/${P}-use-cpupower.patch -} +PLUGIN_SO=cpufreq.so src_install() { gkrellm-plugin_src_install |