summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-07-08 08:36:40 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-07-08 08:36:40 +0000
commitd216f1a822ec5fad62234599e733ff17c238dd95 (patch)
treecd298cf308406b75f45d709df47b34a4d90a7ace /sys-power/acpitool
parentx86 stable, only documentation fixes and cosmetics, remove old (diff)
downloadgentoo-2-d216f1a822ec5fad62234599e733ff17c238dd95.tar.gz
gentoo-2-d216f1a822ec5fad62234599e733ff17c238dd95.tar.bz2
gentoo-2-d216f1a822ec5fad62234599e733ff17c238dd95.zip
old
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-power/acpitool')
-rw-r--r--sys-power/acpitool/Manifest14
-rw-r--r--sys-power/acpitool/acpitool-0.4.7-r1.ebuild25
-rw-r--r--sys-power/acpitool/files/acpitool-0.4.7-gcc43.patch300
-rw-r--r--sys-power/acpitool/files/acpitool-0.4.7-proc_acpi_info_move.patch68
4 files changed, 0 insertions, 407 deletions
diff --git a/sys-power/acpitool/Manifest b/sys-power/acpitool/Manifest
index ada759f567d9..8d7a8c2ba0cb 100644
--- a/sys-power/acpitool/Manifest
+++ b/sys-power/acpitool/Manifest
@@ -1,18 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX acpitool-0.4.7-gcc43.patch 9307 RMD160 22d7f2b66efc0337df1179376ecd8d731c88628d SHA1 6a9b203b9022acfcc466b420ea3d4e23c6d51272 SHA256 6549caaab5a5f224a8d38fe6cfb273679caed5eca3939f28e19393bd7c2ede98
-AUX acpitool-0.4.7-proc_acpi_info_move.patch 1925 RMD160 f5c5751032161855f2ac2af78626aefb670907bb SHA1 89852d30509209be6ecf077726318852765f114f SHA256 360aa177ecf11e0ec22bc6bbebab8d865de61d15d965c6cf47063ca6215ad177
-DIST acpitool-0.4.7.tar.bz2 105943 RMD160 82385c84d94cdcbf272b2b54d8df3b05afc73cdd SHA1 203ed12250d88eb5bc5a4ab4bb837317c9222ca0 SHA256 6908261eb226edd397e43fb6e0d0f673b7cfcd1635dd0948a280e284d96b6b8c
DIST acpitool-0.5.1.tar.bz2 109584 RMD160 6909c8d05badfb72a9e1212af238bc0c41b9e4c3 SHA1 7c4cdffd09b4c68971cf2e3edd95693cf6b3b740 SHA256 004fb6cd43102918b6302cf537a2db7ceadda04aef2e0906ddf230f820dad34f
-EBUILD acpitool-0.4.7-r1.ebuild 765 RMD160 404deb6fd7557d414bca000ee403ce2168a3a4f4 SHA1 35b691c2a595bbbfc4a116b7533f4e4322710243 SHA256 ba9603041c07b1c6450bdb0a8ca57d49e6ba30f2970ebe8f267edbd718feba0b
EBUILD acpitool-0.5.1.ebuild 658 RMD160 609298b4025ed88782802e1601ba48088a5560f7 SHA1 0d641831de240fbe79f91f18a284d964a6d66d7e SHA256 0fef21cb13c1d9deafc5270e74b6ce7f777b9ef6b980dd852a43a5d00013aec4
MISC ChangeLog 4168 RMD160 5af195d12fbd5598478e1f59532b4bdbbed4a690 SHA1 d958a95d5d33f93a53a2aea70105201896139082 SHA256 0bcfc02dc3f31b9875844f490ad308276ba51dd32d0a5aff1378e38c40e5f7fc
MISC metadata.xml 160 RMD160 8521c3bd3ae0fb2bfddce5edb33fd31e223747e1 SHA1 194b7194f38673fe427e5893a42cd4c1506ce846 SHA256 b13062a43e40469b137e1206494a44b45755ea69511b64e5373cb1ce30bbb160
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkv6yngACgkQCaWpQKGI+9S5iQCfT89h1gM8XQOES1G3/C52STNV
-T54An2HIW4crCLhWAoWCRXIRK9DsNvw2
-=/yMz
------END PGP SIGNATURE-----
diff --git a/sys-power/acpitool/acpitool-0.4.7-r1.ebuild b/sys-power/acpitool/acpitool-0.4.7-r1.ebuild
deleted file mode 100644
index a6673132c90d..000000000000
--- a/sys-power/acpitool/acpitool-0.4.7-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpitool/acpitool-0.4.7-r1.ebuild,v 1.5 2008/04/20 08:46:22 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="A small command line application, intended to be a replacement for the apm tool"
-HOMEPAGE="http://freeunix.dyndns.org:8088/site2/acpitool.shtml"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-src_unpack() {
- unpack ${A}
- epatch "${FILESDIR}"/${PN}-0.4.7-proc_acpi_info_move.patch
- epatch "${FILESDIR}"/${PN}-0.4.7-gcc43.patch #214171
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- dodoc AUTHORS ChangeLog README TODO
-}
diff --git a/sys-power/acpitool/files/acpitool-0.4.7-gcc43.patch b/sys-power/acpitool/files/acpitool-0.4.7-gcc43.patch
deleted file mode 100644
index 08067d7a0571..000000000000
--- a/sys-power/acpitool/files/acpitool-0.4.7-gcc43.patch
+++ /dev/null
@@ -1,300 +0,0 @@
-sniped from Fedora
-
-http://bugs.gentoo.org/214171
-
---- acpitool-0.4.7/src/cpu.cpp.gcc43
-+++ acpitool-0.4.7/src/cpu.cpp
-@@ -27,6 +27,8 @@
- #include <config.h>
- #endif
-
-+#include <cstdlib>
-+#include <cstring>
- #include <iostream>
- #include <iomanip>
- #include <fstream>
-@@ -57,7 +59,7 @@ int Show_CPU_Info()
- {
- for(int t=0; t<4; t++) fgets(str, 299, cpuinfo_fp); // skip 4 lines //
- fgets(str, 299, cpuinfo_fp);
-- bzero(temp, 130); // use sscanf to extract what we need : //
-+ memset(temp, '\0', 130); // use sscanf to extract what we need : //
- sscanf(str, "%*[^:] %*s %[^\n]",temp); // ignore all up till :, then ignore the :, then use what's left //
- printf(" CPU type : %s \n", temp); // till the newline char //
- fgets(str, 299, cpuinfo_fp);
-@@ -67,13 +69,13 @@ int Show_CPU_Info()
- Show_Freq_Info(); // show freq scaling info if we have it //
- else
- {
-- bzero(temp, 130);
-+ memset(temp, '\0', 130);
- sscanf(str, "%*[^:] %*s %s",temp); // ignore all up till :, then ignore the :, then use what's left //
- printf(" CPU speed : %s MHz \n", temp);
- }
-
- fgets(str, 299, cpuinfo_fp);
-- bzero(temp, 130);
-+ memset(temp, '\0', 130);
- sscanf(str, "%*[^:] %*s %s",temp);
- printf(" Cache size : %s KB\n", temp);
-
-@@ -82,7 +84,7 @@ int Show_CPU_Info()
- while(!feof(cpuinfo_fp)) // Run loop until Bogomips line is found //
- { // Need this generic aproach: the bogomips location is //
- fgets(str, 299, cpuinfo_fp); // different for Amd64, Opteron, Core Duo, P4 with Ht, ... //
-- bzero(temp, 130);
-+ memset(temp, '\0', 130);
- if(strncmp(str,"bogo",4)==0)
- {
- sscanf(str, "%*[^:] %*s %s",temp);
-@@ -153,23 +155,23 @@ int Show_CPU_Info()
- if(file_in)
- {
- file_in.getline(str, 90); // processor id
-- bzero(temp, 130);
-+ memset(temp, '\0', 130);
- strncpy(temp, str+25, 5);
- cout<<" Processor ID : "<<temp<<endl;
-
- file_in.getline(str, 100); // acpi id
- file_in.getline(str, 100); // bus mastering control
-- bzero(temp, 130);
-+ memset(temp, '\0', 130);
- strncpy(temp, str+25, 5);
- cout<<" Bus mastering control : "<<temp<<endl;
-
- file_in.getline(str, 100); // power management
-- bzero(temp, 130);
-+ memset(temp, '\0', 130);
- strncpy(temp, str+25, 5);
- cout<<" Power management : "<<temp<<endl;
-
- file_in.getline(str, 100); // throttling control
-- bzero(temp, 130);
-+ memset(temp, '\0', 130);
- strncpy(temp, str+25, 5);
- cout<<" Throttling control : "<<temp<<endl;
- if(strncmp(temp,"yes",3)==0)
-@@ -177,7 +179,7 @@ int Show_CPU_Info()
-
- file_in.getline(str, 100); // limit interface (beware: on linux2.4
- // this line yields "perf mgmt")
-- bzero(temp, 130);
-+ memset(temp, '\0', 130);
- strncpy(temp, str+25, 5);
- cout<<" Limit interface : "<<temp<<endl;
-
-@@ -196,7 +198,7 @@ int Show_CPU_Info()
- if(power_fp)
- {
- fgets(str, 100, power_fp); // active state
-- bzero(temp, 80);
-+ memset(temp, '\0', 80);
- strncpy(temp, str+25, 5);
- cout<<" Active C-state : "<<temp;
-
-@@ -268,11 +270,11 @@ int Show_CPU_Info()
- if(throt_fp)
- {
- fgets(str, 100, throt_fp); // active state
-- bzero(temp, 80);
-+ memset(temp, '\0', 80);
- strncpy(temp, str+25, 5);
- cout<<" T-state count : "<<temp; // number of throttling states //
- fgets(str, 100, throt_fp);
-- bzero(temp, 80);
-+ memset(temp, '\0', 80);
- strncpy(temp, str+25, 5);
- cout<<" Active T-state : "<<temp<<endl;
- fclose(throt_fp);
---- acpitool-0.4.7/src/main.cpp.gcc43
-+++ acpitool-0.4.7/src/main.cpp
-@@ -27,6 +27,7 @@
- #include <config.h>
- #endif
-
-+#include <cstdlib>
- #include <iostream>
- #include <iomanip>
- #include <fstream>
---- acpitool-0.4.7/src/toshiba.cpp.gcc43
-+++ acpitool-0.4.7/src/toshiba.cpp
-@@ -28,6 +28,7 @@
- #include <config.h>
- #endif
-
-+#include <cstring>
- #include <iostream>
- #include <iomanip>
- #include <fstream>
---- acpitool-0.4.7/src/battery.cpp.gcc43
-+++ acpitool-0.4.7/src/battery.cpp
-@@ -27,6 +27,8 @@
- #include <config.h>
- #endif
-
-+#include <cstdlib>
-+#include <cstring>
- #include <iostream>
- #include <iomanip>
- #include <fstream>
-@@ -69,15 +71,15 @@ int Do_Battery_Stuff(int show_empty, int
- Batt_Info[i] = new Battery_Info;
-
- Batt_Info[i]->Battery_Present = 0;
-- bzero(Batt_Info[i]->Remaining_Cap, 10);
-- bzero(Batt_Info[i]->Design_Cap, 10);
-- bzero(Batt_Info[i]->LastFull_Cap, 10);
-- bzero(Batt_Info[i]->Present_Rate, 10);
-- bzero(Batt_Info[i]->Charging_State, 12);
-- bzero(Batt_Info[i]->Technology, 13);
-- bzero(Batt_Info[i]->Model, 13);
-- bzero(Batt_Info[i]->Serial, 13);
-- bzero(Batt_Info[i]->Bat_Type, 13);
-+ memset(Batt_Info[i]->Remaining_Cap, '\0', 10);
-+ memset(Batt_Info[i]->Design_Cap, '\0', 10);
-+ memset(Batt_Info[i]->LastFull_Cap, '\0', 10);
-+ memset(Batt_Info[i]->Present_Rate, '\0', 10);
-+ memset(Batt_Info[i]->Charging_State, '\0', 12);
-+ memset(Batt_Info[i]->Technology, '\0', 13);
-+ memset(Batt_Info[i]->Model, '\0', 13);
-+ memset(Batt_Info[i]->Serial, '\0', 13);
-+ memset(Batt_Info[i]->Bat_Type, '\0', 13);
- // initialize all struct members to blanks --> avoid rubbish in output //
-
- Get_Battery_Info(Bat_Nr, Batt_Info[i], verbose);
---- acpitool-0.4.7/src/thinkpad.cpp.gcc43
-+++ acpitool-0.4.7/src/thinkpad.cpp
-@@ -1,5 +1,7 @@
- /* support for IBM Thinkpad acpi driver */
-
-+#include <cstdlib>
-+#include <cstring>
- #include <iomanip>
- #include <iostream>
- #include <fstream>
---- acpitool-0.4.7/src/freq.cpp.gcc43
-+++ acpitool-0.4.7/src/freq.cpp
-@@ -27,6 +27,8 @@
- #include <config.h>
- #endif
-
-+#include <cstdlib>
-+#include <cstring>
- #include <iostream>
- #include <iomanip>
- #include <fstream>
-@@ -86,7 +88,7 @@ int Get_Min_Freq()
-
- if(freqinfo_fp)
- {
-- bzero(str, 300);
-+ memset(str, '\0', 300);
- fscanf(freqinfo_fp, "%s", str);
- min_freq = atoi(str);
- fclose(freqinfo_fp);
-@@ -110,7 +112,7 @@ int Get_Max_Freq()
-
- if(freqinfo_fp)
- {
-- bzero(str, 300);
-+ memset(str, '\0', 300);
- fscanf(freqinfo_fp, "%s", str);
- max_freq = atoi(str);
- fclose(freqinfo_fp);
-@@ -133,7 +135,7 @@ int Get_Current_Freq()
-
- if(freqinfo_fp)
- {
-- bzero(str, 300);
-+ memset(str, '\0', 300);
- fscanf(freqinfo_fp, "%s", str);
- cur_freq = atoi(str);
- fclose(freqinfo_fp);
-@@ -155,7 +157,7 @@ int Get_Governor(char *c)
-
- if(freqinfo_fp)
- {
-- bzero(str, 300);
-+ memset(str, '\0', 300);
- fscanf(freqinfo_fp, "%s", str);
- if (strlen(str)>0)
- strcpy(c, str);
-@@ -178,7 +180,7 @@ int Get_Driver(char *c)
-
- if(freqinfo_fp)
- {
-- bzero(str, 300);
-+ memset(str, '\0', 300);
- fscanf(freqinfo_fp, "%s", str);
- if (strlen(str)>0)
- strcpy(c, str);
---- acpitool-0.4.7/src/acpitool.cpp.gcc43
-+++ acpitool-0.4.7/src/acpitool.cpp
-@@ -28,6 +28,8 @@
- #include <config.h>
- #endif
-
-+#include <cstring>
-+#include <cstdlib>
- #include <iostream>
- #include <iomanip>
- #include <fstream>
-@@ -158,8 +160,8 @@ int Do_SysVersion_Info(int verbose)
- {
- char Acpi_Version[10], Kernel_Version[15];
-
-- bzero(Acpi_Version, 10);
-- bzero(Kernel_Version, 15);
-+ memset(Acpi_Version, '\0', 10);
-+ memset(Kernel_Version, '\0', 15);
-
- Get_Kernel_Version(Kernel_Version, verbose);
- Get_ACPI_Version(Acpi_Version, verbose);
-@@ -214,8 +216,8 @@ int Do_Thermal_Info(const int show_trip,
- char *name;
- char Temperature[5], State[5];
-
-- bzero(Temperature, 5);
-- bzero(State, 5);
-+ memset(Temperature, '\0', 5);
-+ memset(State, '\0', 5);
-
- dirname = "/proc/acpi/thermal_zone/";
- thermal_dir = opendir(dirname);
-@@ -299,7 +301,7 @@ int Do_Thermal_Info(const int show_trip,
- while(!feof(fp))
- {
- /* fscanf(fp, "%s", str); */
-- bzero(str, 120);
-+ memset(str, '\0', 120);
- fgets(str, 120, fp);
- if (strlen(str)!=0)
- cout<<" "<<str; /* avoid printing empty line */
-@@ -328,7 +330,7 @@ int Do_AC_Info(int verbose)
- char *name;
- char AC_Status[9];
-
-- bzero(AC_Status, 9); // avoid rubbish in output //
-+ memset(AC_Status, '\0', 9); // avoid rubbish in output //
-
- dirname = "/proc/acpi/ac_adapter/";
- ac_dir = opendir(dirname);
-@@ -402,7 +404,7 @@ int Do_Fan_Info(int verbose)
- return 0;
- }
-
-- bzero(FAN_Status, 9); // avoid rubbish in output //
-+ memset(FAN_Status, '\0', 9); // avoid rubbish in output //
-
- dirname = "/proc/acpi/fan/";
- fan_dir = opendir(dirname);
-@@ -531,7 +533,7 @@ int Toggle_WakeUp_Device(const int Devic
- file_in.getline(str, 50);
- if(strlen(str)!=0) // avoid empty last line //
- {
-- bzero(Name[index], 5);
-+ memset(Name[index], '\0', 5);
- strncpy(Name[index], str, 4);
- index++;
- }
diff --git a/sys-power/acpitool/files/acpitool-0.4.7-proc_acpi_info_move.patch b/sys-power/acpitool/files/acpitool-0.4.7-proc_acpi_info_move.patch
deleted file mode 100644
index ccdcbefd9703..000000000000
--- a/sys-power/acpitool/files/acpitool-0.4.7-proc_acpi_info_move.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Files acpitool-0.4.7.old/src/acpitool and acpitool-0.4.7/src/acpitool differ
-diff -Nru acpitool-0.4.7.old/src/acpitool.cpp acpitool-0.4.7/src/acpitool.cpp
---- acpitool-0.4.7.old/src/acpitool.cpp 2007-04-29 14:38:46.289190064 +0000
-+++ acpitool-0.4.7/src/acpitool.cpp 2007-04-29 14:43:59.411033861 +0000
-@@ -54,15 +54,15 @@
- char *filename;
-
- filename = "/proc/acpi/info";
--
- file_in.open(filename);
-- if (!file_in)
-- return 0;
-- else
-- {
-- file_in.close();
-- return 1;
-+ if(!file_in.is_open()) {
-+ filename = "/sys/module/acpi/parameters/acpica_version";
-+ file_in.open(filename);
- }
-+ if(!file_in.is_open()) return 0;
-+
-+ file_in.close();
-+ return 1;
- }
-
- int Print_ACPI_Info(int show_ac, int show_therm, int show_trip, int show_fan, int show_batteries, int show_empty, int show_version, int show_cpu, int show_wake, int e_set, int info_level, int verbose)
-@@ -96,23 +96,24 @@
- char *filename, str[50];
-
- filename = "/proc/acpi/info";
--
- file_in.open(filename);
-- if (!file_in)
-- {
-- if(!verbose)
-- {
-- strcpy(c, "<n.a>");
-- return 0;
-- }
-- else
-- {
-- cout<<" Could not open file : "<<filename<<endl;
-- cout<<" Make sure your kernel has ACPI support enabled."<<endl;
-- return -1;
-- }
-+ if(!file_in.is_open()) {
-+ filename = "/sys/module/acpi/parameters/acpica_version";
-+ file_in.open(filename);
-+ }
-+ if(!file_in.is_open()) {
-+ // failure
-+ if(!verbose) {
-+ strcpy(c, "<n.a>");
-+ return 0;
-+ }
-+ else {
-+ cout<<" Could not open file : "<<filename<<endl;
-+ cout<<" Make sure your kernel has ACPI support enabled."<<endl;
-+ return -1;
-+ }
- }
--
-+
- file_in.getline(str, 50);
- file_in.close();
-
-Files acpitool-0.4.7.old/src/acpitool.o and acpitool-0.4.7/src/acpitool.o differ