Cleaning up $FILESDIR.

(Portage version: 2.1.2.7)

5 files changed, 11 insertions, 49 deletions

diff --git a/sys-power/cpufreqd/ChangeLog b/sys-power/cpufreqd/ChangeLog
index 18a198e9e13f..0f5d5b564034 100644
--- a/sys-power/cpufreqd/ChangeLog
+++ b/sys-power/cpufreqd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-power/cpufreqd
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/ChangeLog,v 1.48 2007/03/13 16:53:43 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/ChangeLog,v 1.49 2007/05/17 08:51:45 phreak Exp $
+
+  17 May 2007; Christian Heim <phreak@gentoo.org>
+  -files/cpufreqd-2.2.0-init.d, -files/cpufreqd-2.2.1-init.d,
+  +files/cpufreqd-init.d, cpufreqd-2.2.0-r2.ebuild, cpufreqd-2.2.1.ebuild:
+  Cleaning up $FILESDIR.
 
   13 Mar 2007; Christian Heim <phreak@gentoo.org>
   +files/cpufreqd-conf.d.patch, cpufreqd-2.2.0-r2.ebuild,
diff --git a/sys-power/cpufreqd/cpufreqd-2.2.0-r2.ebuild b/sys-power/cpufreqd/cpufreqd-2.2.0-r2.ebuild
index 355ff764d1d0..bfdece55882f 100644
--- a/sys-power/cpufreqd/cpufreqd-2.2.0-r2.ebuild
+++ b/sys-power/cpufreqd/cpufreqd-2.2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/cpufreqd-2.2.0-r2.ebuild,v 1.2 2007/03/13 16:53:43 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/cpufreqd-2.2.0-r2.ebuild,v 1.3 2007/05/17 08:51:45 phreak Exp $
 
 inherit eutils autotools
 
@@ -64,7 +64,7 @@ src_install() {
 
 	dodoc AUTHORS ChangeLog NEWS README TODO
 
-	newinitd "${FILESDIR}"/${P}-init.d ${PN}
+	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
 }
 
 pkg_postinst() {
diff --git a/sys-power/cpufreqd/cpufreqd-2.2.1.ebuild b/sys-power/cpufreqd/cpufreqd-2.2.1.ebuild
index 0cd0f456007b..b1c9476fbf17 100644
--- a/sys-power/cpufreqd/cpufreqd-2.2.1.ebuild
+++ b/sys-power/cpufreqd/cpufreqd-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/cpufreqd-2.2.1.ebuild,v 1.3 2007/03/13 16:53:43 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/cpufreqd-2.2.1.ebuild,v 1.4 2007/05/17 08:51:45 phreak Exp $
 
 inherit eutils autotools
 
@@ -63,7 +63,7 @@ src_install() {
 
 	dodoc AUTHORS ChangeLog NEWS README TODO
 
-	newinitd "${FILESDIR}"/${P}-init.d ${PN}
+	newinitd "${FILESDIR}"/${PN}-init.d ${PN}
 }
 
 pkg_postinst() {
diff --git a/sys-power/cpufreqd/files/cpufreqd-2.2.1-init.d b/sys-power/cpufreqd/files/cpufreqd-2.2.1-init.d
deleted file mode 100644
index b7ffa4f0a2ed..000000000000
--- a/sys-power/cpufreqd/files/cpufreqd-2.2.1-init.d
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/files/cpufreqd-2.2.1-init.d,v 1.1 2006/11/30 16:42:10 peper Exp $
-
-CONFIGFILE=/etc/cpufreqd.conf
-
-depend() {
-	need localmount
-	use logger lm_sensors
-}
-
-checkconfig() {
-	if [[ ! -f ${CONFIGFILE} ]]; then
-		eerror "Configuration file ${CONFIGFILE} not found"
-		return 1
-	fi
-
-	if [[ ! -e /proc/cpufreq ]] ; then
-		for cpu in /sys/devices/system/cpu/cpu[0-9]* ; do
-                        # We need just one cpu supporting freq scaling.
-                        [[ -e ${cpu}/cpufreq ]] && return 0
-		done
-		eerror "cpufreqd requires the kernel to be configured with CONFIG_CPU_FREQ"
-		eerror "Make sure that the appropiate drivers for your CPU are available."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting CPU Frequency Daemon"
-	start-stop-daemon --start --exec /usr/sbin/cpufreqd -- \
-		-f ${CONFIGFILE}
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping CPU Frequency Daemon"
-	start-stop-daemon --stop --exec /usr/sbin/cpufreqd
-	eend ${?}
-}
diff --git a/sys-power/cpufreqd/files/cpufreqd-2.2.0-init.d b/sys-power/cpufreqd/files/cpufreqd-init.d
index 69ff24f9f288..5917e5128d75 100644
--- a/sys-power/cpufreqd/files/cpufreqd-2.2.0-init.d
+++ b/sys-power/cpufreqd/files/cpufreqd-init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/files/cpufreqd-2.2.0-init.d,v 1.5 2006/10/24 12:39:53 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/files/cpufreqd-init.d,v 1.1 2007/05/17 08:51:45 phreak Exp $
 
 CONFIGFILE=/etc/cpufreqd.conf