diff options
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/torsmo/ChangeLog | 9 | ||||
| -rw-r--r-- | app-admin/torsmo/Manifest | 21 | ||||
| -rw-r--r-- | app-admin/torsmo/files/digest-torsmo-0.14 | 1 | ||||
| -rw-r--r-- | app-admin/torsmo/files/digest-torsmo-0.16 | 1 | ||||
| -rw-r--r-- | app-admin/torsmo/files/digest-torsmo-0.17-r1 | 1 | ||||
| -rw-r--r-- | app-admin/torsmo/files/torsmo-0.17-kernel2.4.patch | 102 | ||||
| -rw-r--r-- | app-admin/torsmo/torsmo-0.16.ebuild | 40 | ||||
| -rw-r--r-- | app-admin/torsmo/torsmo-0.17-r1.ebuild (renamed from app-admin/torsmo/torsmo-0.14.ebuild) | 18 |
8 files changed, 141 insertions, 52 deletions
diff --git a/app-admin/torsmo/ChangeLog b/app-admin/torsmo/ChangeLog index ec4eb7e5b6d3..ef95043e9955 100644 --- a/app-admin/torsmo/ChangeLog +++ b/app-admin/torsmo/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-admin/torsmo # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/ChangeLog,v 1.13 2004/10/19 22:00:17 bazik Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/ChangeLog,v 1.14 2004/12/02 20:46:10 dragonheart Exp $ + +*torsmo-0.17-r1 (03 Dec 2004) + + 03 Dec 2004; Daniel Black <dragonheart@gentoo.org> + +files/torsmo-0.17-kernel2.4.patch, -torsmo-0.14.ebuild, + -torsmo-0.16.ebuild, +torsmo-0.17-r1.ebuild: + added 2.4 kernel patch as per bug #69405. 19 Oct 2004; Sven Blumenstein <bazik@gentoo.org> : Stable on sparc. diff --git a/app-admin/torsmo/Manifest b/app-admin/torsmo/Manifest index 5817150511ed..3af3fcbe2dcd 100644 --- a/app-admin/torsmo/Manifest +++ b/app-admin/torsmo/Manifest @@ -1,9 +1,18 @@ -MD5 c16a75759c74604344c61c8790a3a058 torsmo-0.14.ebuild 1207 -MD5 ef89d5070f3162f88703356be653bfa0 torsmo-0.16.ebuild 1207 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + MD5 bd0dd434f60799d6f3fcc02713ddb09c torsmo-0.17.ebuild 1334 -MD5 ddd479dba3c4095eba7eea5b05710ced ChangeLog 2215 +MD5 24d34eacbb0f977cdf02589d29614f57 ChangeLog 2456 MD5 e62755aeb2fcd53a4426e99d3af550ed metadata.xml 549 -MD5 552e015366516a5ff2034d10b083c303 files/torsmo-0.17-mozilla.patch 601 -MD5 0b0637dc0d84ad4add55e41e75a72790 files/digest-torsmo-0.14 62 -MD5 db0c2639b478a6cf43ba3e09d0bbd4f9 files/digest-torsmo-0.16 62 +MD5 7cb27fd15dc2516cac2e0de8d5502261 torsmo-0.17-r1.ebuild 1438 +MD5 38f2bbcb59c900a0fc2a2f0ec2f75463 files/digest-torsmo-0.17-r1 62 MD5 38f2bbcb59c900a0fc2a2f0ec2f75463 files/digest-torsmo-0.17 62 +MD5 552e015366516a5ff2034d10b083c303 files/torsmo-0.17-mozilla.patch 601 +MD5 d27874dbf963063e13d6387d8ef3912f files/torsmo-0.17-kernel2.4.patch 2388 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.6 (GNU/Linux) + +iD8DBQFBr38YmdTrptrqvGERAsA+AJsF9na0LzTUohJv6gdv/nXkC9DEgwCcDnoy +7BvI/Adcs0jm2Vvu4vzOh9c= +=vIoz +-----END PGP SIGNATURE----- diff --git a/app-admin/torsmo/files/digest-torsmo-0.14 b/app-admin/torsmo/files/digest-torsmo-0.14 deleted file mode 100644 index 3851e993af5d..000000000000 --- a/app-admin/torsmo/files/digest-torsmo-0.14 +++ /dev/null @@ -1 +0,0 @@ -MD5 7a21e436a3b5469b84a0e0bbceed32ba torsmo-0.14.tar.gz 57538 diff --git a/app-admin/torsmo/files/digest-torsmo-0.16 b/app-admin/torsmo/files/digest-torsmo-0.16 deleted file mode 100644 index c6e569d5b796..000000000000 --- a/app-admin/torsmo/files/digest-torsmo-0.16 +++ /dev/null @@ -1 +0,0 @@ -MD5 47d0d4548a8ed5006f2fe977ba7e8a75 torsmo-0.16.tar.gz 73332 diff --git a/app-admin/torsmo/files/digest-torsmo-0.17-r1 b/app-admin/torsmo/files/digest-torsmo-0.17-r1 new file mode 100644 index 000000000000..e37968182c78 --- /dev/null +++ b/app-admin/torsmo/files/digest-torsmo-0.17-r1 @@ -0,0 +1 @@ +MD5 8c82134cd78f9d4a7b6f6721ee2c16f9 torsmo-0.17.tar.gz 80286 diff --git a/app-admin/torsmo/files/torsmo-0.17-kernel2.4.patch b/app-admin/torsmo/files/torsmo-0.17-kernel2.4.patch new file mode 100644 index 000000000000..0146d39adc97 --- /dev/null +++ b/app-admin/torsmo/files/torsmo-0.17-kernel2.4.patch @@ -0,0 +1,102 @@ +--- linux.c.orig 2004-05-25 18:27:19.000000000 +0930 ++++ linux.c 2004-12-03 06:11:57.604376744 +0930 +@@ -176,7 +176,24 @@ + static int running_processes; + static unsigned int cpu_user, cpu_system, cpu_nice; + +-static FILE *stat_fp; ++static FILE *stat_fp, *proc_fp; ++ ++static void update_procs() { ++ static int rep; ++ char buf[64]; ++ float fj; ++ int dj; ++ if (proc_fp == NULL) ++ proc_fp = open_file("/proc/loadavg", &rep); ++ else ++ fseek(proc_fp, 0, SEEK_SET); ++ while (!feof(proc_fp)){ ++ if (fgets(buf, 64, proc_fp) == NULL) break; ++ else ++ sscanf(buf, "%f %f %f %d/%d %d",&fj,&fj,&fj,&running_processes,&dj,&dj); ++ } ++} ++ + + static void update_stat() { + static int rep; +@@ -191,10 +208,6 @@ + while (!feof(stat_fp)) { + if (fgets(buf, 255, stat_fp) == NULL) + break; +- +- if (strncmp(buf, "procs_running ", 14) == 0) { +- sscanf(buf, "%*s %d", &running_processes); +- } + else if (strncmp(buf, "cpu ", 4) == 0) { + sscanf(buf, "%*s %u %u %u", &cpu_user, &cpu_nice, &cpu_system); + } +@@ -204,7 +217,7 @@ + } + + int get_running_processes() { +- update_stat(); ++ update_procs(); + return running_processes; + } + +@@ -253,7 +266,7 @@ + } + } + +-#define I2C_DIR "/sys/bus/i2c/devices/" ++#define I2C_DIR "/proc/sys/dev/sensors/" + + int open_i2c_sensor(const char *dev, const char *type, int n, int *div) { + char path[256]; +@@ -272,12 +285,13 @@ + if (strcmp(type, "vol") == 0) + type = "in"; + +- snprintf(path, 255, I2C_DIR "%s/%s%d_input", dev, type, n); ++ snprintf(path, 255, I2C_DIR "%s/%s%d", dev, type, n); + + /* open file */ + fd = open(path, O_RDONLY); + if (fd < 0) ERR("can't open '%s': %s", path, strerror(errno)); + ++ + if (strcmp(type, "in") == 0 || strcmp(type, "temp") == 0) + *div = 1; + else +@@ -287,7 +301,8 @@ + } + + double get_i2c_info(int fd, int div) { +- int val = 0; ++ double val = 0; ++ double jf; + + if (fd <= 0) return 0; + +@@ -301,14 +316,13 @@ + /* should read until n == 0 but I doubt that kernel will give these + * in multiple pieces. :) */ + buf[n] = '\0'; +- val = atoi(buf); ++ if (div) ++ sscanf(buf, "%lf %lf %lf", &jf, &jf, &val); ++ else ++ sscanf(buf, "%lf %lf", &jf, &val); + } + +- /* divide voltage and temperature by 1000 */ +- if (div) +- return val / 1000.0; +- else +- return val; ++ return val; + } + + void get_load_average(double v[3]) { diff --git a/app-admin/torsmo/torsmo-0.16.ebuild b/app-admin/torsmo/torsmo-0.16.ebuild deleted file mode 100644 index be110de968fc..000000000000 --- a/app-admin/torsmo/torsmo-0.16.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/torsmo-0.16.ebuild,v 1.6 2004/10/05 02:58:11 pvdabeel Exp $ - -DESCRIPTION="system monitor that sits in the corner of your desktop" -HOMEPAGE="http://torsmo.sourceforge.net/" -SRC_URI="mirror://sourceforge/torsmo/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="x86 ppc" -IUSE="" - -RDEPEND="virtual/libc - virtual/x11" -DEPEND="${RDEPEND} - >=sys-devel/automake-1.4 - sys-devel/autoconf - sys-apps/grep - sys-apps/sed - sys-devel/gcc" - -src_install() { - emake DESTDIR=${D} install || die "make install failed" - dodoc ChangeLog AUTHORS README NEWS torsmorc.sample -} - -pkg_postinst() { - einfo 'default configuration file is "~/.torsmorc"' - einfo "you can find a sample configuration file in" - einfo "/usr/share/doc/${PF}/torsmorc.sample.gz" - einfo - einfo "Comment out temperature info lines if you have no kernel" - einfo "support for it." - einfo - ewarn "Torsmo doesn't work with window managers that" - ewarn "take control over root window such as Gnome's nautilus." - ewarn "May not work on KDE until you exit (and then only breifly)" - ewarn "for the above reason." -} diff --git a/app-admin/torsmo/torsmo-0.14.ebuild b/app-admin/torsmo/torsmo-0.17-r1.ebuild index 5325a93ba321..08981d516ca2 100644 --- a/app-admin/torsmo/torsmo-0.14.ebuild +++ b/app-admin/torsmo/torsmo-0.17-r1.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/torsmo-0.14.ebuild,v 1.7 2004/10/05 02:58:11 pvdabeel Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/torsmo-0.17-r1.ebuild,v 1.1 2004/12/02 20:46:10 dragonheart Exp $ + +inherit eutils kernel-mod DESCRIPTION="system monitor that sits in the corner of your desktop" HOMEPAGE="http://torsmo.sourceforge.net/" @@ -8,8 +10,8 @@ SRC_URI="mirror://sourceforge/torsmo/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="x86 ppc" -IUSE="" +KEYWORDS="~x86 ~ppc ~amd64 ~sparc" +IUSE="mozilla" RDEPEND="virtual/libc virtual/x11" @@ -20,6 +22,16 @@ DEPEND="${RDEPEND} sys-apps/sed sys-devel/gcc" +src_unpack() { + unpack ${A} + cd ${S} + use mozilla && epatch ${FILESDIR}/${P}-mozilla.patch + if kernel-mod_is_2_4_kernel + then + epatch ${FILESDIR}/${P}-kernel2.4.patch + fi +} + src_install() { emake DESTDIR=${D} install || die "make install failed" dodoc ChangeLog AUTHORS README NEWS torsmorc.sample |