fix #46959 #43567 #58127

9 files changed, 59 insertions, 102 deletions

diff --git a/sys-apps/cpufreqd/ChangeLog b/sys-apps/cpufreqd/ChangeLog
index 92386b8f3fed..bb1fd500fecd 100644
--- a/sys-apps/cpufreqd/ChangeLog
+++ b/sys-apps/cpufreqd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/cpufreqd
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpufreqd/ChangeLog,v 1.14 2004/07/23 12:51:27 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpufreqd/ChangeLog,v 1.15 2004/07/28 00:11:12 vapier Exp $
+
+*cpufreqd-1.1.2-r1 (27 Jul 2004)
+
+  27 Jul 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/1.1.2-prefer-sysfs.patch, -cpufreqd-1.1.1.ebuild,
+  +cpufreqd-1.1.2-r1.ebuild, -cpufreqd-1.1.2.ebuild, -cpufreqd-1.1.ebuild:
+  Verison bump to fix init.d script bug #46959 et al, add patch to use sysfs
+  over procfs #43567 by Dennis Nienhüser, and add amd64 #58127 by James Couzens.
 
   23 Jul 2004; Alexander Gabert <pappy@gentoo.org> cpufreqd-1.1.1.ebuild,
   cpufreqd-1.1.2.ebuild, cpufreqd-1.1.ebuild:
diff --git a/sys-apps/cpufreqd/Manifest b/sys-apps/cpufreqd/Manifest
index 0225abf72053..068ae9dd4381 100644
--- a/sys-apps/cpufreqd/Manifest
+++ b/sys-apps/cpufreqd/Manifest
@@ -1,8 +1,15 @@
-MD5 b0104d9c1c6b72bad6c80318e0e6fea0 cpufreqd-1.1.2.ebuild 1248
-MD5 b5e31568a5f952a57ee48e5b57e07a34 cpufreqd-1.1.ebuild 1252
-MD5 c6bd3ee9b446635a6f1eab33598e1987 cpufreqd-1.1.1.ebuild 1181
-MD5 0d0ecb083ba17f4f7d4de458e85fa508 ChangeLog 2000
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3ed99d62f6bb392cbe7df1328df7ae22 ChangeLog 2378
+MD5 0b2d75d6467d74ad134bc21130683045 cpufreqd-1.1.2-r1.ebuild 1243
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 8917ce64fc2e2eb0da260929ea971f98 files/digest-cpufreqd-1.1 71
-MD5 d80d3c22801187272f72a7de7fbd1bb1 files/digest-cpufreqd-1.1.2 66
-MD5 82e5687ec7d54db66926a515248a0d72 files/digest-cpufreqd-1.1.1 66
+MD5 1ecbd62bec29d7ef35701b3c71ffdc94 files/1.1.2-prefer-sysfs.patch 921
+MD5 d80d3c22801187272f72a7de7fbd1bb1 files/digest-cpufreqd-1.1.2-r1 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.8 (GNU/Linux)
+
+iD8DBQFBBu8vHTu7gpaalycRAmfPAJ9ORhnlXPoy9Y2lPku4dSzyIR7wVACgkpRB
+0baP0Wz5NgJYJBhD1QE0ofE=
+=ogmb
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/cpufreqd/cpufreqd-1.1.1.ebuild b/sys-apps/cpufreqd/cpufreqd-1.1.1.ebuild
deleted file mode 100644
index 6d38c994b5e1..000000000000
--- a/sys-apps/cpufreqd/cpufreqd-1.1.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpufreqd/cpufreqd-1.1.1.ebuild,v 1.5 2004/07/23 12:51:27 pappy Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Daemon to adjust CPU speed for power saving"
-HOMEPAGE="http://sourceforge.net/projects/cpufreqd/"
-SRC_URI="mirror://sourceforge/cpufreqd/${P}.tar.gz"
-DEPEND=">=sys-apps/sed-4"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i '/^DAEMON=/s:/sbin/:/usr/sbin/:' scripts/gentoo/cpufreqd
-
-	# cpufreqd segfaults when built as PIE
-	filter-flags "-fpie" "-fPIE" "-Wl,-pie"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc README Authors TODO
-
-	exeinto /etc/init.d
-	newexe ${S}/scripts/gentoo/cpufreqd cpufreqd
-}
-
-pkg_postinst() {
-	echo
-	einfo "A default config file has been copied to /etc/cpufreqd.conf"
-	echo
-	einfo "CPUFreqd does not support using percentage frequencies on"
-	einfo "2.6 kernels where sysfs is used instead - please manually"
-	einfo "edit the config file to use an absolute value instead, if"
-	einfo "you are using a 2.6 series kernel."
-	echo
-}
diff --git a/sys-apps/cpufreqd/cpufreqd-1.1.2.ebuild b/sys-apps/cpufreqd/cpufreqd-1.1.2-r1.ebuild
index 0617554b18f8..49ea79dc31e6 100644
--- a/sys-apps/cpufreqd/cpufreqd-1.1.2.ebuild
+++ b/sys-apps/cpufreqd/cpufreqd-1.1.2-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpufreqd/cpufreqd-1.1.2.ebuild,v 1.3 2004/07/23 12:51:27 pappy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpufreqd/cpufreqd-1.1.2-r1.ebuild,v 1.1 2004/07/28 00:11:12 vapier Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic eutils
 
 DESCRIPTION="Daemon to adjust CPU speed for power saving"
 HOMEPAGE="http://sourceforge.net/projects/cpufreqd/"
@@ -11,13 +11,13 @@ DEPEND=">=sys-apps/sed-4"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc amd64"
 IUSE=""
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	sed -i '/^DAEMON=/s:/sbin/:/usr/sbin/:' scripts/gentoo/cpufreqd
+	epatch ${FILESDIR}/${PV}-prefer-sysfs.patch
 }
 
 src_compile() {
diff --git a/sys-apps/cpufreqd/cpufreqd-1.1.ebuild b/sys-apps/cpufreqd/cpufreqd-1.1.ebuild
deleted file mode 100644
index 170f03cdbeed..000000000000
--- a/sys-apps/cpufreqd/cpufreqd-1.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/cpufreqd/cpufreqd-1.1.ebuild,v 1.5 2004/07/23 12:51:27 pappy Exp $
-
-inherit eutils flag-o-matic
-
-S=${WORKDIR}/${P/_/-}.orig
-DESCRIPTION="Daemon to adjust CPU speed for power saving"
-HOMEPAGE="http://sourceforge.net/projects/cpufreqd/"
-SRC_URI="mirror://sourceforge/${PN}/${P/-/_}.0.orig.tar.gz"
-DEPEND=">=sys-apps/sed-4"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* x86 ppc"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	#correct the init-script
-	sed -i -e s:/bin/cpufreqd:/usr/sbin/cpufreqd: ${S}/scripts/gentoo/cpufreqd
-
-	# cpufreqd segfaults when built as PIE
-	filter-flags "-fpie" "-fPIE" "-Wl,-pie"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc README Authors TODO
-
-	exeinto /etc/init.d
-	newexe ${S}/scripts/gentoo/cpufreqd cpufreqd
-}
-
-pkg_postinst() {
-	echo
-	einfo "A default config file has been copied to /etc/cpufreqd.conf"
-	echo
-	einfo "CPUFreqd does not support using percentage frequencies on"
-	einfo "2.6 kernels where sysfs is used instead - please manually"
-	einfo "edit the config file to use an absolute value instead, if"
-	einfo "you are using a 2.6 series kernel."
-	echo
-}
diff --git a/sys-apps/cpufreqd/files/1.1.2-prefer-sysfs.patch b/sys-apps/cpufreqd/files/1.1.2-prefer-sysfs.patch
new file mode 100644
index 000000000000..0c715b89406b
--- /dev/null
+++ b/sys-apps/cpufreqd/files/1.1.2-prefer-sysfs.patch
@@ -0,0 +1,32 @@
+--- cpufreqd-1.1.1/sys_check.c	2004-01-27 12:22:13.000000000 +0100
++++ sys_check.c	2004-03-02 23:13:13.158613312 +0100
+@@ -40,14 +40,6 @@
+   struct stat sb;
+   int rc;
+   
+-  /* try fisrt with the 2.4 series */
+-  rc = stat(CPUFREQ_PROC_INTERFACE, &sb);
+-  if (rc == 0) {
+-    cp_log(LOG_DEBUG, "find_cpufreq_interface(): found %s interface.\n", CPUFREQ_PROC_INTERFACE);
+-    configuration->has_sysfs = 0;
+-    return 0;
+-  }
+-
+   /* try with the 2.5 series */
+   rc = stat(CPUFREQ_SYSFS_INTERFACE, &sb);
+   if (rc == 0) {
+@@ -56,6 +48,14 @@
+     return 0;
+   }
+   
++  /* try fisrt with the 2.4 series */
++  rc = stat(CPUFREQ_PROC_INTERFACE, &sb);
++  if (rc == 0) {
++    cp_log(LOG_DEBUG, "find_cpufreq_interface(): found %s interface.\n", CPUFREQ_PROC_INTERFACE);
++    configuration->has_sysfs = 0;
++    return 0;
++  }
++
+   cp_log(LOG_ERR, "find_cpufreq_interface(): no cpufreq interface found.\n");
+   return -1;
+     
diff --git a/sys-apps/cpufreqd/files/digest-cpufreqd-1.1 b/sys-apps/cpufreqd/files/digest-cpufreqd-1.1
deleted file mode 100644
index ba17b4a5f0bc..000000000000
--- a/sys-apps/cpufreqd/files/digest-cpufreqd-1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 930ac2bf94080a226674690d22de62af cpufreqd_1.1.0.orig.tar.gz 213712
diff --git a/sys-apps/cpufreqd/files/digest-cpufreqd-1.1.1 b/sys-apps/cpufreqd/files/digest-cpufreqd-1.1.1
deleted file mode 100644
index 72b63563f96e..000000000000
--- a/sys-apps/cpufreqd/files/digest-cpufreqd-1.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e95631963743b6ba8aa442cac502cbbd cpufreqd-1.1.1.tar.gz 216165
diff --git a/sys-apps/cpufreqd/files/digest-cpufreqd-1.1.2 b/sys-apps/cpufreqd/files/digest-cpufreqd-1.1.2-r1
index be0abf1f0108..be0abf1f0108 100644
--- a/sys-apps/cpufreqd/files/digest-cpufreqd-1.1.2
+++ b/sys-apps/cpufreqd/files/digest-cpufreqd-1.1.2-r1