Cleaning up $FILESDIR.

Package-Manager: portage-2.1.2.7

6 files changed, 31 insertions, 73 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/Manifest b/sys-power/cpufreqd/Manifest
index 019b894ec733..6f4dcbc4f0c4 100644
--- a/sys-power/cpufreqd/Manifest
+++ b/sys-power/cpufreqd/Manifest
@@ -5,18 +5,14 @@ AUX cpufreqd-2.1.1-init.d 914 RMD160 a0edb5d6151a14bc91b427912a88c888f4ac4b91 SH
 MD5 ca0fa6db77839fe6855623217979b547 files/cpufreqd-2.1.1-init.d 914
 RMD160 a0edb5d6151a14bc91b427912a88c888f4ac4b91 files/cpufreqd-2.1.1-init.d 914
 SHA256 bb7dc7bebaf3b8adb942903f78624836dd93d7c8a34764767a5c0d5a30fa53e5 files/cpufreqd-2.1.1-init.d 914
-AUX cpufreqd-2.2.0-init.d 1133 RMD160 a97f2c05599041a40828995b0b0058dcf2986ae9 SHA1 cccf1858c0a00c81094b823f6a0f03f402f3e094 SHA256 c42a5fccdda0e030ad9215516236c9cb2024a3970bfa6bca7a85aa10ae863133
-MD5 9a07728d8a95118f743f7ce56c3dc02d files/cpufreqd-2.2.0-init.d 1133
-RMD160 a97f2c05599041a40828995b0b0058dcf2986ae9 files/cpufreqd-2.2.0-init.d 1133
-SHA256 c42a5fccdda0e030ad9215516236c9cb2024a3970bfa6bca7a85aa10ae863133 files/cpufreqd-2.2.0-init.d 1133
-AUX cpufreqd-2.2.1-init.d 1133 RMD160 e8b384de6fbcf78d315dccb3f8929e0745fc2e1d SHA1 c0f902ccf848aecb7b2efa193e62e2021ee798ae SHA256 c177575a205f4620d8e96f8350195b0f45abf35bdb4261f561d27281b74a77ad
-MD5 5e70b65d52c6aa49e8e35d1cbb35cb93 files/cpufreqd-2.2.1-init.d 1133
-RMD160 e8b384de6fbcf78d315dccb3f8929e0745fc2e1d files/cpufreqd-2.2.1-init.d 1133
-SHA256 c177575a205f4620d8e96f8350195b0f45abf35bdb4261f561d27281b74a77ad files/cpufreqd-2.2.1-init.d 1133
 AUX cpufreqd-conf.d.patch 269 RMD160 7d597a9fefff26dc0270a94ee6c360e1322390b7 SHA1 9ce182311b269da517f4f126aa485af1dded5423 SHA256 2e4c34e87daffb5929717ba6e91a36c0e85db1e042ff10a1483617f5f4d424e1
 MD5 8c9ec031c68ca45f16ab689cc27c0e29 files/cpufreqd-conf.d.patch 269
 RMD160 7d597a9fefff26dc0270a94ee6c360e1322390b7 files/cpufreqd-conf.d.patch 269
 SHA256 2e4c34e87daffb5929717ba6e91a36c0e85db1e042ff10a1483617f5f4d424e1 files/cpufreqd-conf.d.patch 269
+AUX cpufreqd-init.d 1128 RMD160 c5ac4245afd7c3dd7273fd134c891ed1e64b0719 SHA1 4f1e3231b6d2651ebb12609134950f9f401c24bf SHA256 c7a1e351a2c65dccd0a303bf5cef34ce7ce93b790215d20950140e3146bbc936
+MD5 e8424e8074ea7bf98cddc946ed735641 files/cpufreqd-init.d 1128
+RMD160 c5ac4245afd7c3dd7273fd134c891ed1e64b0719 files/cpufreqd-init.d 1128
+SHA256 c7a1e351a2c65dccd0a303bf5cef34ce7ce93b790215d20950140e3146bbc936 files/cpufreqd-init.d 1128
 AUX nvclock0.8b-fd.patch 580 RMD160 a5db5cb4f0c0f3270e3f042b1033defd6c406376 SHA1 afd021a0144b6adb4dbb936f1a8181db609592fc SHA256 5dad49a3ce2a52b37c4711c497a46c373282bdf27b9b28834a0b5bd977066bf2
 MD5 786c62ca107cb9bc4e67e4cc2af34409 files/nvclock0.8b-fd.patch 580
 RMD160 a5db5cb4f0c0f3270e3f042b1033defd6c406376 files/nvclock0.8b-fd.patch 580
@@ -37,18 +33,18 @@ EBUILD cpufreqd-2.1.1.ebuild 1626 RMD160 a1ca6f3c62dd41a8b2cbec269b80a9243af2de3
 MD5 ca45ad8fc477bc7d527b935fde207c88 cpufreqd-2.1.1.ebuild 1626
 RMD160 a1ca6f3c62dd41a8b2cbec269b80a9243af2de3c cpufreqd-2.1.1.ebuild 1626
 SHA256 e2e245c1e659e0711e5011ed65356a59df15db4b79b8703ae80767e0b3133b69 cpufreqd-2.1.1.ebuild 1626
-EBUILD cpufreqd-2.2.0-r2.ebuild 1921 RMD160 f0a7f7f7bc9b36214484e178d430e052738ddd2e SHA1 0f98aeb793554b42755a64a2f68b3cf65a6069e8 SHA256 8fec73f31c4ad163042d4691a4203bee54da98ed36398343386d1d1af18d55d0
-MD5 b78305c234797d8dc242680deeb5f035 cpufreqd-2.2.0-r2.ebuild 1921
-RMD160 f0a7f7f7bc9b36214484e178d430e052738ddd2e cpufreqd-2.2.0-r2.ebuild 1921
-SHA256 8fec73f31c4ad163042d4691a4203bee54da98ed36398343386d1d1af18d55d0 cpufreqd-2.2.0-r2.ebuild 1921
-EBUILD cpufreqd-2.2.1.ebuild 1865 RMD160 54038282eee2b41cc3a82f00dddf7998f032a531 SHA1 e5d64505182b9a09314cd67e8ee40be92b344087 SHA256 49ab02bc8cd70116b117c260f48334470991899bb3e360abd281c0faed578cfa
-MD5 c55c051f3ac21a36d8258ddb32849e31 cpufreqd-2.2.1.ebuild 1865
-RMD160 54038282eee2b41cc3a82f00dddf7998f032a531 cpufreqd-2.2.1.ebuild 1865
-SHA256 49ab02bc8cd70116b117c260f48334470991899bb3e360abd281c0faed578cfa cpufreqd-2.2.1.ebuild 1865
-MISC ChangeLog 11062 RMD160 732c463068003e84eb1b068175b0d635e38fec88 SHA1 a0a115a953234ecfc68b1ee6e448aad0b9c9c536 SHA256 b12b556e65c107de1dcdaacdea03b2102fe0c1d79d20a9fe364d5f15aeccbdfe
-MD5 9681c4b29da5388c63d60aff56258b3e ChangeLog 11062
-RMD160 732c463068003e84eb1b068175b0d635e38fec88 ChangeLog 11062
-SHA256 b12b556e65c107de1dcdaacdea03b2102fe0c1d79d20a9fe364d5f15aeccbdfe ChangeLog 11062
+EBUILD cpufreqd-2.2.0-r2.ebuild 1922 RMD160 c38ac10455c4deec2a65449556c93666874018de SHA1 cdf17e715c3be07efb2b15aa534352bf9d523aad SHA256 ba46dada975f6d665fe477d81ea4fb72a7825ce31da109e8ed8fc58c099a1d40
+MD5 234d25bd600248b418ca26e67cdd8242 cpufreqd-2.2.0-r2.ebuild 1922
+RMD160 c38ac10455c4deec2a65449556c93666874018de cpufreqd-2.2.0-r2.ebuild 1922
+SHA256 ba46dada975f6d665fe477d81ea4fb72a7825ce31da109e8ed8fc58c099a1d40 cpufreqd-2.2.0-r2.ebuild 1922
+EBUILD cpufreqd-2.2.1.ebuild 1866 RMD160 90f1287699e260702ce5a333c850b75cf1907626 SHA1 6d1dae18a7c13d87e4827e1dbf2003da111e1cb4 SHA256 7021bf3cfad6ba99c0d957aab6ea0e62f161a2606b39f108fa0f97857fdf7596
+MD5 14b58338eb6d769d5c9ef90f24f06807 cpufreqd-2.2.1.ebuild 1866
+RMD160 90f1287699e260702ce5a333c850b75cf1907626 cpufreqd-2.2.1.ebuild 1866
+SHA256 7021bf3cfad6ba99c0d957aab6ea0e62f161a2606b39f108fa0f97857fdf7596 cpufreqd-2.2.1.ebuild 1866
+MISC ChangeLog 11275 RMD160 ff4acfd91e5440705b724fdf69fe7827efb59268 SHA1 9d9dd8664ac665841d87c4a9778ed4069f7ea51e SHA256 116230374856e0ece485615d88aa978b67a32f9cc0cd2e5764ceae02de8d9369
+MD5 e91567bd0267a40520ab7a2360dfc5ef ChangeLog 11275
+RMD160 ff4acfd91e5440705b724fdf69fe7827efb59268 ChangeLog 11275
+SHA256 116230374856e0ece485615d88aa978b67a32f9cc0cd2e5764ceae02de8d9369 ChangeLog 11275
 MISC metadata.xml 254 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f SHA1 653c702fdb89577e9d15e9cbca3891e4acdba061 SHA256 9bffc4ff1cf574848699e33b09ff0f6137d6b64b69d82c7b95cafb32ee75becb
 MD5 f3e68295a919220f58e91a1d3468c851 metadata.xml 254
 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f metadata.xml 254
@@ -63,9 +59,9 @@ MD5 7189f2037d95a8b59b409460cda4b07c files/digest-cpufreqd-2.2.1 482
 RMD160 0102e92dda98b8bb18c1d34284bb9815aba455bb files/digest-cpufreqd-2.2.1 482
 SHA256 868c3e1002f7fe14ca68532470a7b8868dd64b8cfe258c5b4dfa20d197642828 files/digest-cpufreqd-2.2.1 482
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFF9tcbyuNVb5qfaOYRAiS8AJ9JY3/U/yU0T3o1j5aN2hLMaamlawCdHjzr
-zylNWQT6iw1kmMjLG1/t4C4=
-=5c1A
+iD8DBQFGTBesyuNVb5qfaOYRAsh0AJ9TJr+T2a5eI23/3QV7G+D1JMsJjQCfUmh3
+1GwpCQQuX0lh7uEVM3WZoLE=
+=7Ebp
 -----END PGP SIGNATURE-----
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