Version cleanup

(Portage version: 2.2_rc27/cvs/Linux x86_64)

5 files changed, 7 insertions, 183 deletions

diff --git a/x11-plugins/gkrellm-cpufreq/ChangeLog b/x11-plugins/gkrellm-cpufreq/ChangeLog
index 8a1d712e31c5..93d31fb91db6 100644
--- a/x11-plugins/gkrellm-cpufreq/ChangeLog
+++ b/x11-plugins/gkrellm-cpufreq/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-plugins/gkrellm-cpufreq
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-cpufreq/ChangeLog,v 1.7 2007/12/06 17:44:53 opfer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-cpufreq/ChangeLog,v 1.8 2009/05/27 20:23:00 lack Exp $
+
+  27 May 2009; Jim Ramsay <lack@gentoo.org>
+  -files/gkrellm-cpufreq-0.6-hotplug.patch, -gkrellm-cpufreq-0.5.5.ebuild,
+  -gkrellm-cpufreq-0.6.ebuild, -gkrellm-cpufreq-0.6-r1.ebuild:
+  Version cleanup
 
   06 Dec 2007; Christian Faulhammer <opfer@gentoo.org>
   gkrellm-cpufreq-0.6.1.ebuild:
diff --git a/x11-plugins/gkrellm-cpufreq/files/gkrellm-cpufreq-0.6-hotplug.patch b/x11-plugins/gkrellm-cpufreq/files/gkrellm-cpufreq-0.6-hotplug.patch
deleted file mode 100644
index a42280635493..000000000000
--- a/x11-plugins/gkrellm-cpufreq/files/gkrellm-cpufreq-0.6-hotplug.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- cpufreq.c	2006-10-02 06:56:33.000000000 +0200
-+++ cpufreq-fixed.c	2007-06-26 18:44:00.000000000 +0200
-@@ -45,7 +45,7 @@
- #include <cpufreq.h>
- 
- /* version number */
--#define  VERSION        "0.6"
-+#define  VERSION        "0.6.1"
- 
- /* name in the configuration tree */
- #define  CONFIG_NAME	"CPUfreq"
-@@ -57,6 +57,8 @@
- 
- #define NCPU_MAX 8
- 
-+#define	PROC_STAT_FILE	"/proc/stat"
-+
- static unsigned int ncpu;
- static unsigned long khz_max;
- static unsigned long khz[NCPU_MAX];
-@@ -85,7 +87,29 @@
- static gint controls_coupled = 0;
- static gint style_id;
- 
-+static void get_num_cpus() {
-+  FILE	*f;
-+  gchar	buf[1024];
-+  ncpu = 0;
-+  f = fopen(PROC_STAT_FILE, "r");
-+  while (fgets(buf, sizeof(buf), f))
-+  {
-+    if (strncmp(buf, "cpu", 3) != 0)
-+      continue;
-+    ++ncpu;
-+    }
-+  fclose(f);
-+  // If multiple CPUs, the first one will be a composite.  Report only real.
-+  if (ncpu > 1)
-+    --ncpu;
-+}
-+
- static void read_governors() {
-+
-+  /* Since there could be CPU-hotplug on the system, we need to re-check */
-+  /* before we update, otherwise we crash: */
-+  get_num_cpus();
-+
-   unsigned int cpu;
-   for ( cpu=0; cpu<ncpu; ++cpu ) {
-     struct cpufreq_policy* policy = cpufreq_get_policy(cpu);
-@@ -545,10 +569,7 @@
-   style_id = gkrellm_add_meter_style(&plugin_mon, STYLE_NAME);
-   monitor = &plugin_mon;
- 
--  /* determine number of cpus */
--  for( ncpu = 0; cpufreq_cpu_exists(ncpu)==0; ++ncpu )
--    ;
--  ncpu = ncpu > NCPU_MAX ? NCPU_MAX : ncpu;
-+  get_num_cpus();
- 
-   /* determine maximal frequency */
-   unsigned int cpu;
diff --git a/x11-plugins/gkrellm-cpufreq/gkrellm-cpufreq-0.5.5.ebuild b/x11-plugins/gkrellm-cpufreq/gkrellm-cpufreq-0.5.5.ebuild
deleted file mode 100644
index 6f8cbe43aa10..000000000000
--- a/x11-plugins/gkrellm-cpufreq/gkrellm-cpufreq-0.5.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-cpufreq/gkrellm-cpufreq-0.5.5.ebuild,v 1.3 2007/07/11 20:39:23 mr_bones_ Exp $
-
-inherit 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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-PLUGIN_SO=cpufreq.so
-
-src_install() {
-	gkrellm-plugin_src_install
-	exeinto /usr/sbin
-	doexe cpufreqset
-	doexe cpufreqsetgovernor
-	doexe cpufreqnextgovernor
-}
-
-pkg_postinst() {
-	echo
-	einfo "Add this to /etc/sudors to allow users to change cpu governor and speed:"
-	einfo "ALL ALL=NOPASSWD:/usr/sbin/cpufreqset [0-9]*"
-	einfo "ALL ALL=NOPASSWD:/usr/sbin/cpufreqnextgovernor"
-	einfo "ALL ALL=NOPASSWD:/usr/sbin/cpufreqsetgovernor [a-z]*"
-	echo
-}
diff --git a/x11-plugins/gkrellm-cpufreq/gkrellm-cpufreq-0.6-r1.ebuild b/x11-plugins/gkrellm-cpufreq/gkrellm-cpufreq-0.6-r1.ebuild
deleted file mode 100644
index e5c9c5aabdd9..000000000000
--- a/x11-plugins/gkrellm-cpufreq/gkrellm-cpufreq-0.6-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-cpufreq/gkrellm-cpufreq-0.6-r1.ebuild,v 1.2 2007/07/11 20:39:23 mr_bones_ Exp $
-
-inherit 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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND="sys-power/cpufrequtils
-		app-admin/sudo"
-
-PLUGIN_SO=cpufreq.so
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-hotplug.patch" || die "Patch failed"
-}
-
-src_install() {
-	gkrellm-plugin_src_install
-	exeinto /usr/sbin
-	doexe cpufreqnextgovernor
-}
-
-pkg_postinst() {
-	echo
-	einfo "Add these lines to /etc/sudoers to allow users to change cpu governor and speed:"
-	einfo "ALL ALL = (root) NOPASSWD: /usr/bin/cpufreq-set -c [0-9]* -g userspace"
-	einfo "ALL ALL = (root) NOPASSWD: /usr/bin/cpufreq-set -c [0-9]* -f [0-9]*"
-	einfo "ALL ALL = (root) NOPASSWD: /usr/sbin/cpufreqnextgovernor"
-	echo
-}
diff --git a/x11-plugins/gkrellm-cpufreq/gkrellm-cpufreq-0.6.ebuild b/x11-plugins/gkrellm-cpufreq/gkrellm-cpufreq-0.6.ebuild
deleted file mode 100644
index efec78e5d2d4..000000000000
--- a/x11-plugins/gkrellm-cpufreq/gkrellm-cpufreq-0.6.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellm-cpufreq/gkrellm-cpufreq-0.6.ebuild,v 1.2 2007/07/11 20:39:23 mr_bones_ Exp $
-
-inherit 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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND="sys-power/cpufrequtils
-		app-admin/sudo"
-
-PLUGIN_SO=cpufreq.so
-
-src_install() {
-	gkrellm-plugin_src_install
-	exeinto /usr/sbin
-	doexe cpufreqnextgovernor
-}
-
-pkg_postinst() {
-	echo
-	einfo "Add these lines to /etc/sudoers to allow users to change cpu governor and speed:"
-	einfo "ALL ALL = (root) NOPASSWD: /usr/bin/cpufreq-set -c [0-9]* -g userspace"
-	einfo "ALL ALL = (root) NOPASSWD: /usr/bin/cpufreq-set -c [0-9]* -f [0-9]*"
-	einfo "ALL ALL = (root) NOPASSWD: /usr/sbin/cpufreqnextgovernor"
-	echo
-}