diff options
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/torsmo/ChangeLog | 174 | ||||
| -rw-r--r-- | app-admin/torsmo/Manifest | 20 | ||||
| -rw-r--r-- | app-admin/torsmo/files/digest-torsmo-0.18-r3 | 1 | ||||
| -rw-r--r-- | app-admin/torsmo/files/digest-torsmo-0.18-r6 | 1 | ||||
| -rw-r--r-- | app-admin/torsmo/files/torsmo-0.18.avgsmp.patch | 223 | ||||
| -rw-r--r-- | app-admin/torsmo/files/torsmo-0.18.i2c.patch | 168 | ||||
| -rw-r--r-- | app-admin/torsmo/files/torsmo-0.18.noswap.patch | 15 | ||||
| -rw-r--r-- | app-admin/torsmo/files/torsmo-0.18.xwin.patch | 18 | ||||
| -rw-r--r-- | app-admin/torsmo/metadata.xml | 15 | ||||
| -rw-r--r-- | app-admin/torsmo/torsmo-0.18-r3.ebuild | 60 | ||||
| -rw-r--r-- | app-admin/torsmo/torsmo-0.18-r6.ebuild | 61 |
11 files changed, 0 insertions, 756 deletions
diff --git a/app-admin/torsmo/ChangeLog b/app-admin/torsmo/ChangeLog deleted file mode 100644 index 30d84162815c..000000000000 --- a/app-admin/torsmo/ChangeLog +++ /dev/null @@ -1,174 +0,0 @@ -# ChangeLog for app-admin/torsmo -# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/ChangeLog,v 1.37 2005/11/28 07:07:56 dragonheart Exp $ - - 28 Nov 2005; Daniel Black <dragonheart@gentoo.org> -torsmo-0.18-r1.ebuild, - torsmo-0.18-r3.ebuild, -torsmo-0.18-r4.ebuild, torsmo-0.18-r6.ebuild: - removed seti support - bug #113759. remove older versions too. - - 29 Jul 2005; Daniel Black <dragonheart@gentoo.org> torsmo-0.18-r1.ebuild: - removed epatch || die - -*torsmo-0.18-r6 (22 Jun 2005) - - 22 Jun 2005; Daniel Black <dragonheart@gentoo.org> - files/torsmo-0.18.avgsmp.patch, -torsmo-0.18-r5.ebuild, - +torsmo-0.18-r6.ebuild: - previous patch had error. Brenden Matthews emailed me a new patch - -*torsmo-0.18-r5 (21 Jun 2005) - - 21 Jun 2005; Daniel Black <dragonheart@gentoo.org> - +files/torsmo-0.18.avgsmp.patch, +torsmo-0.18-r5.ebuild: - another small patch for a small feature of unknown origin. bug #96601 thanks - to Brenden Matthews - -*torsmo-0.18-r4 (06 Jun 2005) - - 06 Jun 2005; Daniel Black <dragonheart@gentoo.org> - +files/torsmo-0.18.i2c.patch, +torsmo-0.18-r4.ebuild: - i2c patch as per bug 95114 thanks to mrbelh. Patch thanks to Bartosz - Zapalowski - - 24 May 2005; Jason Wever <weeve@gentoo.org> torsmo-0.18-r3.ebuild: - Stable on SPARC wrt bug #93343. - - 22 May 2005; Stephanie Lockwood-Childs <wormo@gentoo.org> - torsmo-0.18-r3.ebuild: - stable on ppc - - 21 May 2005; Simon Stelling <blubb@gentoo.org> torsmo-0.18-r3.ebuild: - stable on amd64 - - 20 May 2005; Daniel Black <dragonheart@gentoo.org> - -files/torsmo-0.17-kernel2.4.patch, -files/torsmo-0.17-mldonkey.patch, - -files/torsmo-0.17-mozilla.patch, -torsmo-0.17.ebuild, - -torsmo-0.17-r1.ebuild, -torsmo-0.18-r2.ebuild, torsmo-0.18-r3.ebuild: - 0.18-r3 x86 stable as per bug #93343. Old version cleanout - - 05 May 2005; Sven Wegener <swegener@gentoo.org> torsmo-0.18-r2.ebuild, - torsmo-0.18-r3.ebuild: - Fixed [<>]=cat/pkg-ver* dependencies. - - 01 May 2005; Daniel Black <dragonheart@gentoo.org> torsmo-0.18-r3.ebuild: - Added Seti support as per bug #85633. Thanks to mike will - <shalafi@gmail.NOSPAM.com> and Stephanie amerei@gmail.FREE_FROM_SPAMcom> - for the patch. - - 31 Mar 2005; <blubb@gentoo.org> torsmo-0.18-r1.ebuild: - stable on amd64 - - 27 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> torsmo-0.18-r1.ebuild: - Stable on ppc. - -*torsmo-0.18-r3 (28 Feb 2005) - - 28 Feb 2005; Daniel Black <dragonheart@gentoo.org> - +files/torsmo-0.18.noswap.patch, +torsmo-0.18-r3.ebuild: - added patch to eliminate a SIGFPE when there is no swap active. Bug #82903 by - Alias John Doe <pbx06@hotmail.com> decribes the problem and fix. - - 31 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> torsmo-0.18-r1.ebuild: - Stable on sparc - -*torsmo-0.18-r2 (30 Jan 2005) - - 30 Jan 2005; Daniel Black <dragonheart@gentoo.org> torsmo-0.18-r1.ebuild, - +torsmo-0.18-r2.ebuild, -torsmo-0.18.ebuild: - Revision bump to add Xft support. Thanks to Peter Beutner <imago@devinity.de> - in bug #78239. Old version removed. - -*torsmo-0.18-r1 (01 Jan 2005) - - 01 Jan 2005; Daniel Black <dragonheart@gentoo.org> - +files/torsmo-0.18.xwin.patch, +torsmo-0.18-r1.ebuild, torsmo-0.18.ebuild: - revision bump to fix endless loop for AMD64 users. Bug #74036 and - http://sourceforge.net/tracker/index.php?func=detail&aid=1087205&group_id=1085 - 94&atid=650929 refer. Thanks to Florian Huber <florian.huber@mnet-online.de> - for pointing out the solution and floam@sh.nu for testing it. - - 28 Dec 2004; Daniel Black <dragonheart@gentoo.org> torsmo-0.18.ebuild: - X libraries fix as per bug #75828. Fix by Emil Beinroth <emilbeinroth@gmx.net>. - -*torsmo-0.18 (27 Dec 2004) - - 27 Dec 2004; Daniel Black <dragonheart@gentoo.org> +torsmo-0.18.ebuild: - version bump as per bug #75629. mozilla.patch has been incorportaed. - kernel2.4.patch and mldonkey.patch I haven't bothered to port. Submissions - welcome. Ebuild thanks to Jonathan Smith <smith.jonathan@gmail.com>. - - 08 Dec 2004; Daniel Black <dragonheart@gentoo.org> - +files/torsmo-0.17-mldonkey.patch, torsmo-0.17-r1.ebuild: - Added torsmo-0.17-mldonkey.patch as per bug #73485. Thank to Lloyd - <stuff@whatafool.com> for the bug report. - - 06 Dec 2004; Daniel Black <dragonheart@gentoo.org> torsmo-0.17-r1.ebuild: - moved from kernel-mod to linux-info eclass as per bug #73472 with patch by dsd. - - 04 Dec 2004; Daniel Black <dragonheart@gentoo.org> torsmo-0.17-r1.ebuild: - Changed src_compile to fix bug #73265. Thanks Tim STella <denstark@gmail.com> - for the bug report - -*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. - - 05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> torsmo-0.14.ebuild, - torsmo-0.16.ebuild, torsmo-0.17.ebuild: - Masked torsmo-0.17.ebuild stable for ppc - - 05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> torsmo-0.14.ebuild, - torsmo-0.16.ebuild: - Masked torsmo-0.16.ebuild stable for ppc - - 05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> torsmo-0.14.ebuild: - Masked torsmo-0.14.ebuild stable for ppc - - 02 Sep 2004; Travis Tilley <lv@gentoo.org> torsmo-0.17.ebuild: - stable on amd64 - - 16 Aug 2004; Daniel Black <dragonheart@gentoo.org> - +files/torsmo-0.17-mozilla.patch, torsmo-0.17.ebuild: - Mozilla patch by affinity <waffinity@gmail.com> in bug #60526 - - 18 Jul 2004; Daniel Black <dragonheart@gentoo.org> torsmo-0.17.ebuild: - x86 stable - - 15 Jun 2004; Daniel Black <dragonheart@gentoo.org> -torsmo-0.13.ebuild, - torsmo-0.14.ebuild, torsmo-0.16.ebuild: - x86 stable and remove old version - - 30 May 2004; Danny van Dyk <kugelfang@gentoo.org> torsmo-0.17.ebuild: - Marked ~amd64. - -*torsmo-0.17 (29 May 2004) - - 29 May 2004; Grant Goodyear <g2boojum@gentoo.org> +torsmo-0.17.ebuild: - Version bump. Fixes battery glitch. In the process of adding the - changelog entry I discovered that Bug # 52074 requests a bump - (thanks Lauri Hakkarainen!). - -*torsmo-0.16 (15 May 2004) - - 15 May 2004; Daniel Black <dragonheart@gentoo.org> +torsmo-0.16.ebuild: - Version bump as requested by Tobias Klausmann - <klausman-gentoo@schwarzvogel.de> and Lauri Hakkarainen - <lauri.hakkarainen@2ndpoint.fi> in bug #51015 - - 08 May 2004; David Holm <dholm@gentoo.org> torsmo-0.14.ebuild: - Added to ~ppc. - -*torsmo-0.14 (08 May 2004) -*torsmo-0.13 (08 May 2004) - - 08 May 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml, - +torsmo-0.13.ebuild, +torsmo-0.14.ebuild: - Inital import thanks to ares <ares@serversecurity.org> in bug #50305. Version - bump notified by <revertex@revertex.trix.net> in bug #50352 - diff --git a/app-admin/torsmo/Manifest b/app-admin/torsmo/Manifest deleted file mode 100644 index 706dbdefd620..000000000000 --- a/app-admin/torsmo/Manifest +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 1905b7fb9dcb83207d5184ff99b57246 ChangeLog 6789 -MD5 19932267a722d71554454bb3779a9ae0 files/digest-torsmo-0.18-r3 62 -MD5 19932267a722d71554454bb3779a9ae0 files/digest-torsmo-0.18-r6 62 -MD5 ba979f27a7ea62133aa8fd0a7deeeaa9 files/torsmo-0.18.avgsmp.patch 6232 -MD5 0aa744033b2091d42d3817cd1bb62f59 files/torsmo-0.18.i2c.patch 5254 -MD5 665c68fb6d053d92d013ba44a84f394c files/torsmo-0.18.noswap.patch 524 -MD5 3345892556d2bc8fddf510c86d3c70f0 files/torsmo-0.18.xwin.patch 575 -MD5 e62755aeb2fcd53a4426e99d3af550ed metadata.xml 549 -MD5 b1057777d2c405c476be5f4c969c05d4 torsmo-0.18-r3.ebuild 1599 -MD5 09fb43dd77e3d3481f0f3904d87637cf torsmo-0.18-r6.ebuild 1639 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDy/U+KolR564NvWYRApU2AKCsrERiC5+4vsyHXs74zsM5ynQD/ACdGS2u -eZzDIIU0al9O+m9B5XWYFxA= -=P6lG ------END PGP SIGNATURE----- diff --git a/app-admin/torsmo/files/digest-torsmo-0.18-r3 b/app-admin/torsmo/files/digest-torsmo-0.18-r3 deleted file mode 100644 index f2c1092e434d..000000000000 --- a/app-admin/torsmo/files/digest-torsmo-0.18-r3 +++ /dev/null @@ -1 +0,0 @@ -MD5 88bd8f627637d785a1d681f4f15f00b6 torsmo-0.18.tar.gz 84020 diff --git a/app-admin/torsmo/files/digest-torsmo-0.18-r6 b/app-admin/torsmo/files/digest-torsmo-0.18-r6 deleted file mode 100644 index f2c1092e434d..000000000000 --- a/app-admin/torsmo/files/digest-torsmo-0.18-r6 +++ /dev/null @@ -1 +0,0 @@ -MD5 88bd8f627637d785a1d681f4f15f00b6 torsmo-0.18.tar.gz 84020 diff --git a/app-admin/torsmo/files/torsmo-0.18.avgsmp.patch b/app-admin/torsmo/files/torsmo-0.18.avgsmp.patch deleted file mode 100644 index bfae73a6d290..000000000000 --- a/app-admin/torsmo/files/torsmo-0.18.avgsmp.patch +++ /dev/null @@ -1,223 +0,0 @@ -diff -ruN torsmo-0.18/linux.c torsmo-0.18.new/linux.c ---- torsmo-0.18/linux.c 2004-12-21 14:20:07.000000000 -0700 -+++ torsmo-0.18.new/linux.c 2005-06-21 19:28:17.000000000 -0600 -@@ -115,7 +115,9 @@ - - void update_net_stats() { - static int rep; -- unsigned int i; -+ // FIXME: arbitrary size chosen to keep code simple. -+ unsigned int i, i2; -+ unsigned int curtmp1, curtmp2; - char buf[256]; - double delta; - -@@ -134,7 +136,7 @@ - fgets(buf, 255, net_dev_fp); /* garbage (field names) */ - - /* read each interface */ -- for (i=0; i<16; i++) { -+ for (i2=0; i2<16; i2++) { - struct net_stat *ns; - char *s, *p; - long long r, t, last_recv, last_trans; -@@ -174,9 +176,28 @@ - ns->trans += (t - ns->last_read_trans); - ns->last_read_trans = t; - -+ -+ - /* calculate speeds */ -- ns->recv_speed = (ns->recv - last_recv) / delta; -- ns->trans_speed = (ns->trans - last_trans) / delta; -+ ns->net_rec[0] = (ns->recv - last_recv) / delta; -+ ns->net_trans[0] = (ns->trans - last_trans) / delta; -+ curtmp1 = 0; -+ curtmp2 = 0; -+ // get an average -+ for (i=0;i<info.net_rec_avg_samples;i++) { -+ curtmp1 += ns->net_rec[i]; -+ curtmp2 += ns->net_trans[i]; -+ } -+ ns->recv_speed = curtmp1 / (double)info.net_rec_avg_samples; -+ ns->trans_speed = curtmp2 / (double)info.net_trans_avg_samples; -+ if (info.net_rec_avg_samples > 1) { -+ for (i=info.net_rec_avg_samples;i>1;i--) { -+ ns->net_rec[i-1] = ns->net_rec[i-2]; -+ ns->net_trans[i-1] = ns->net_trans[i-2]; -+ } -+ } -+ -+ - } - - /* fclose(net_dev_fp); net_dev_fp = NULL; */ -@@ -193,8 +214,12 @@ - static FILE *stat_fp; - - static void update_stat() { -+ // FIXME: arbitrary size? -+ static double cpu_val[15]; - static int rep; - char buf[256]; -+ int i; -+ double curtmp; - - if (stat_fp == NULL) - stat_fp = open_file("/proc/stat", &rep); -@@ -228,10 +253,15 @@ - - if (clock_ticks == 0) - clock_ticks = sysconf(_SC_CLK_TCK); -- -- info.cpu_usage = (cpu_user+cpu_nice+cpu_system - last_cpu_sum) / delta -- / (double) clock_ticks / info.cpu_count; -+ curtmp = 0; -+ cpu_val[0] = (cpu_user+cpu_nice+cpu_system-last_cpu_sum) / delta / (double) clock_ticks / info.cpu_count; -+ for (i=0;i<info.cpu_avg_samples;i++) -+ curtmp += cpu_val[i]; -+ info.cpu_usage = curtmp / info.cpu_avg_samples; - last_cpu_sum = cpu_user+cpu_nice+cpu_system; -+ for (i=info.cpu_avg_samples;i>1;i--) -+ cpu_val[i-1] = cpu_val[i-2]; -+ - } - } - -diff -ruN torsmo-0.18/torsmo.c torsmo-0.18.new/torsmo.c ---- torsmo-0.18/torsmo.c 2004-12-21 15:14:46.000000000 -0700 -+++ torsmo-0.18.new/torsmo.c 2005-06-21 19:14:26.000000000 -0600 -@@ -61,6 +61,8 @@ - - static long default_fg_color, default_bg_color, default_out_color; - -+static int cpu_avg_samples, net_rec_avg_samples, net_trans_avg_samples; -+ - #ifdef OWN_WINDOW - /* create own window or draw stuff to root? */ - static int own_window; -@@ -1841,6 +1843,9 @@ - fork_to_background = 0; - border_margin = 3; - border_width = 1; -+ info.cpu_avg_samples = 4; -+ info.net_rec_avg_samples = 4; -+ info.net_trans_avg_samples = 4; - default_fg_color = WhitePixel(display, screen); - default_bg_color = BlackPixel(display, screen); - default_out_color = BlackPixel(display, screen); -@@ -1975,6 +1980,46 @@ - else - CONF_ERR - } -+ CONF("cpu_avg_samples") { -+ if(value) { -+ cpu_avg_samples = strtol(value, 0, 0); -+ if (cpu_avg_samples < 1 || cpu_avg_samples > 14) -+ CONF_ERR -+ else -+ info.cpu_avg_samples = cpu_avg_samples; -+ } -+ else -+ CONF_ERR -+ } -+ CONF("net_rec_avg_samples") { -+ if(value) { -+ net_rec_avg_samples = strtol(value, 0, 0); -+ if (net_rec_avg_samples < 1 || net_rec_avg_samples > 14) { -+ CONF_ERR -+ } -+ else -+ info.net_rec_avg_samples = net_rec_avg_samples; -+ } -+ else -+ CONF_ERR -+ } -+ CONF("net_trans_avg_samples") { -+ if(value) { -+ net_trans_avg_samples = strtol(value, 0, 0); -+ if (net_trans_avg_samples < 1 || net_trans_avg_samples > 14) -+ CONF_ERR -+ else -+ info.net_trans_avg_samples = net_trans_avg_samples; -+ } -+ else -+ CONF_ERR -+ } -+ -+ -+ -+ -+ -+ - #ifdef XDBE - CONF("double_buffer") { - use_xdbe = string_to_bool(value); -diff -ruN torsmo-0.18/torsmo.h torsmo-0.18.new/torsmo.h ---- torsmo-0.18/torsmo.h 2004-12-21 14:49:17.000000000 -0700 -+++ torsmo-0.18.new/torsmo.h 2005-06-21 19:14:49.000000000 -0600 -@@ -19,6 +19,7 @@ - long long last_read_recv, last_read_trans; - long long recv, trans; - double recv_speed, trans_speed; -+ double net_rec[15], net_trans[15]; - }; - - struct fs_stat { -@@ -30,6 +31,7 @@ - - struct cpu_stat { - unsigned int user, nice, system, idle, iowait, irq, softirq; -+ int cpu_avg_samples; - }; - - enum { -@@ -71,6 +73,9 @@ - float cpu_usage; - struct cpu_stat cpu_summed; - unsigned int cpu_count; -+ unsigned int cpu_avg_samples; -+ -+ unsigned int net_rec_avg_samples, net_trans_avg_samples; - - float loadavg[3]; - -diff -ruN torsmo-0.18/torsmorc.sample torsmo-0.18.new/torsmorc.sample ---- torsmo-0.18/torsmorc.sample 2004-12-21 14:56:12.000000000 -0700 -+++ torsmo-0.18.new/torsmorc.sample 2005-06-21 19:19:28.000000000 -0600 -@@ -75,6 +75,16 @@ - # set to yes if you want all text to be in uppercase - uppercase no - -+# number of cpu samples to average -+# set to 1 to disable averaging -+cpu_avg_samples 4 -+ -+# number of net samples to average -+# set to 1 to disable averaging -+net_rec_avg_samples 4 # receiving -+net_trans_avg_samples 4 # transmitting -+ -+ - # boinc (seti) dir - # seti_dir /opt/seti - -diff -ruN torsmo-0.18/x11.c torsmo-0.18.new/x11.c ---- torsmo-0.18/x11.c 2004-12-21 15:19:55.000000000 -0700 -+++ torsmo-0.18.new/x11.c 2005-06-21 19:14:26.000000000 -0600 -@@ -64,15 +64,6 @@ - - XFree(buf); buf = 0; - -- /* get workarea */ -- if (XGetWindowProperty(display, root, ATOM(_NET_WORKAREA), desktop*4, 4, -- False, XA_CARDINAL, &type, &format, &nitems, &bytes, &buf) == -- Success && type == XA_CARDINAL) { -- workarea[0] = ((long *) buf)[0]; -- workarea[1] = ((long *) buf)[1]; -- workarea[2] = ((long *) buf)[2]; -- workarea[3] = ((long *) buf)[3]; -- } - } - - if (buf) { XFree(buf); buf = 0; } diff --git a/app-admin/torsmo/files/torsmo-0.18.i2c.patch b/app-admin/torsmo/files/torsmo-0.18.i2c.patch deleted file mode 100644 index 8ddeb28688a3..000000000000 --- a/app-admin/torsmo/files/torsmo-0.18.i2c.patch +++ /dev/null @@ -1,168 +0,0 @@ -diff -ruN torsmo-0.18/freebsd.c torsmo-0.18.new/freebsd.c ---- torsmo-0.18/freebsd.c 2004-08-25 18:24:24.000000000 +0200 -+++ torsmo-0.18.new/freebsd.c 2005-04-19 11:17:18.000000000 +0200 -@@ -278,7 +278,7 @@ - oldtotal = total; - } - --double get_i2c_info(int fd, int div) { -+double get_i2c_info(int *fd, int div, char *devtype) { - return 0; - } - -@@ -314,7 +314,7 @@ - snprintf(buf, n, "Battery is charging"); - } - --int open_i2c_sensor(const char *dev, const char *type, int n, int *div) -+int open_i2c_sensor(const char *dev, const char *type, int n, int *div, char *devtype) - { - return 0; - } -diff -ruN torsmo-0.18/linux.c torsmo-0.18.new/linux.c ---- torsmo-0.18/linux.c 2004-12-21 22:20:07.000000000 +0100 -+++ torsmo-0.18.new/linux.c 2005-04-19 11:16:26.000000000 +0200 -@@ -300,7 +300,7 @@ - - #define I2C_DIR "/sys/bus/i2c/devices/" - --int open_i2c_sensor(const char *dev, const char *type, int n, int *div) { -+int open_i2c_sensor(const char *dev, const char *type, int n, int *div, char *devtype) { - char path[256]; - char buf[64]; - int fd; -@@ -319,6 +319,7 @@ - type = "in"; - - snprintf(path, 255, I2C_DIR "%s/%s%d_input", dev, type, n); -+ strcpy (devtype, path); - - /* open file */ - fd = open(path, O_RDONLY); -@@ -329,6 +330,10 @@ - else - *div = 0; - -+ /* fan does not use *_div as a read divisor */ -+ if (strcmp ("fan", type) == 0) -+ return fd; -+ - /* test if *_div file exist, open it and use it as divisor */ - snprintf(path, 255, I2C_DIR "%s/%s%d_div", dev, type, n); - -@@ -349,24 +354,29 @@ - return fd; - } - --double get_i2c_info(int fd, int div) { -+double get_i2c_info(int *fd, int div, char *devtype) { - int val = 0; - -- if (fd <= 0) return 0; -+ if (*fd <= 0) return 0; - -- lseek(fd, 0, SEEK_SET); -+ lseek(*fd, 0, SEEK_SET); - - /* read integer */ - { - char buf[64]; - unsigned int n; -- n = read(fd, buf, 63); -+ n = read(*fd, buf, 63); - /* should read until n == 0 but I doubt that kernel will give these - * in multiple pieces. :) */ - buf[n] = '\0'; - val = atoi(buf); - } - -+ close (*fd); -+ /* open file */ -+ *fd = open(devtype, O_RDONLY); -+ if (*fd < 0) ERR("can't open '%s': %s", devtype, strerror(errno)); -+ - /* divide voltage and temperature by 1000 */ - /* or if any other divisor is given, use that */ - if (div > 1) -diff -ruN torsmo-0.18/netbsd.c torsmo-0.18.new/netbsd.c ---- torsmo-0.18/netbsd.c 2004-08-25 19:55:57.000000000 +0200 -+++ torsmo-0.18.new/netbsd.c 2005-04-19 11:17:42.000000000 +0200 -@@ -301,7 +301,7 @@ - - } - --double get_i2c_info(int fd, int div) { -+double get_i2c_info(int *fd, int div, char *devtype) { - return -1; - } - -@@ -321,7 +321,7 @@ - void get_battery_stuff(char *buf, unsigned int n, const char *bat) { - } - --int open_i2c_sensor(const char *dev, const char *type, int n, int *div) -+int open_i2c_sensor(const char *dev, const char *type, int n, int *div, char *devtype) - { - return -1; - } -diff -ruN torsmo-0.18/torsmo.c torsmo-0.18.new/torsmo.c ---- torsmo-0.18/torsmo.c 2004-12-21 23:14:46.000000000 +0100 -+++ torsmo-0.18.new/torsmo.c 2005-04-19 11:29:50.000000000 +0200 -@@ -377,6 +377,7 @@ - struct { - int fd; - int arg; -+ char devtype[256]; - } i2c; /* 2 */ - - struct { -@@ -606,10 +607,10 @@ - /* if scanf couldn't read three values, read type and num and use - * default device */ - sscanf(arg, "%63s %d", buf2, &n); -- obj->data.i2c.fd = open_i2c_sensor(0, buf2, n, &obj->data.i2c.arg); -+ obj->data.i2c.fd = open_i2c_sensor(0, buf2, n, &obj->data.i2c.arg, obj->data.i2c.devtype); - } - else { -- obj->data.i2c.fd = open_i2c_sensor(buf1, buf2, n, &obj->data.i2c.arg); -+ obj->data.i2c.fd = open_i2c_sensor(buf1, buf2, n, &obj->data.i2c.arg, obj->data.i2c.devtype); - } - END - OBJ(loadavg, INFO_LOADAVG) -@@ -705,11 +706,11 @@ - END - OBJ(temp1, INFO_I2C) - obj->type = OBJ_i2c; -- obj->data.i2c.fd = open_i2c_sensor(0, "temp", 1, &obj->data.i2c.arg); -+ obj->data.i2c.fd = open_i2c_sensor(0, "temp", 1, &obj->data.i2c.arg, obj->data.i2c.devtype); - END - OBJ(temp2, INFO_I2C) - obj->type = OBJ_i2c; -- obj->data.i2c.fd = open_i2c_sensor(0, "temp", 2, &obj->data.i2c.arg); -+ obj->data.i2c.fd = open_i2c_sensor(0, "temp", 2, &obj->data.i2c.arg, obj->data.i2c.devtype); - END - OBJ(time, 0) - obj->data.s = strdup(arg ? arg : "%F %T"); -@@ -1032,7 +1033,7 @@ - OBJ(i2c) { - double r; - -- r = get_i2c_info(obj->data.i2c.fd, obj->data.i2c.arg); -+ r = get_i2c_info(&obj->data.i2c.fd, obj->data.i2c.arg, obj->data.i2c.devtype); - - if (r >= 100.0 || r == 0) - snprintf(p, n, "%d", (int) r); -diff -ruN torsmo-0.18/torsmo.h torsmo-0.18.new/torsmo.h ---- torsmo-0.18/torsmo.h 2004-12-21 22:49:17.000000000 +0100 -+++ torsmo-0.18.new/torsmo.h 2005-04-19 11:16:42.000000000 +0200 -@@ -172,8 +172,8 @@ - void update_running_processes(void); - char* get_freq(); - void update_load_average(); --int open_i2c_sensor(const char *dev, const char *type, int n, int *div); --double get_i2c_info(int fd, int arg); -+int open_i2c_sensor(const char *dev, const char *type, int n, int *div, char *devtype); -+double get_i2c_info(int *fd, int arg, char *devtype); - - char* get_adt746x_cpu(void); - char* get_adt746x_fan(void); diff --git a/app-admin/torsmo/files/torsmo-0.18.noswap.patch b/app-admin/torsmo/files/torsmo-0.18.noswap.patch deleted file mode 100644 index c8943206cc64..000000000000 --- a/app-admin/torsmo/files/torsmo-0.18.noswap.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- torsmo.c.orig 2005-02-28 17:03:39.994538136 +0930 -+++ torsmo.c 2005-02-28 17:06:19.378308120 +0930 -@@ -1126,7 +1126,11 @@ - human_readable(cur->swapmax*1024, p); - } - OBJ(swapperc) { -- snprintf(p, 255, "%*u", pad_percents, (cur->swap*100) / cur->swapmax); -+ if (cur->swapmax == 0) { -+ strncpy(p, "No swap", 255); -+ } else { -+ snprintf(p, 255, "%*u", pad_percents, (cur->swap*100) / cur->swapmax); -+ } - } - OBJ(swapbar) { - new_bar(p, obj->data.pair.a, obj->data.pair.b, diff --git a/app-admin/torsmo/files/torsmo-0.18.xwin.patch b/app-admin/torsmo/files/torsmo-0.18.xwin.patch deleted file mode 100644 index 57275b8d59da..000000000000 --- a/app-admin/torsmo/files/torsmo-0.18.xwin.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- x11.c.orig 2005-01-01 07:56:33.135756896 +0930 -+++ x11.c 2005-01-01 07:57:16.810117384 +0930 -@@ -64,15 +64,6 @@ - - XFree(buf); buf = 0; - -- /* get workarea */ -- if (XGetWindowProperty(display, root, ATOM(_NET_WORKAREA), desktop*4, 4, -- False, XA_CARDINAL, &type, &format, &nitems, &bytes, &buf) == -- Success && type == XA_CARDINAL) { -- workarea[0] = ((long *) buf)[0]; -- workarea[1] = ((long *) buf)[1]; -- workarea[2] = ((long *) buf)[2]; -- workarea[3] = ((long *) buf)[3]; -- } - } - - if (buf) { XFree(buf); buf = 0; } diff --git a/app-admin/torsmo/metadata.xml b/app-admin/torsmo/metadata.xml deleted file mode 100644 index c7276eb66101..000000000000 --- a/app-admin/torsmo/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>no-herd</herd> -<maintainer> - <email>dragonheart@gentoo.org</email> - <name>Daniel Black</name> - <description>A user ebuild that I felt obliged to include. Please take over if you want -it</description> -</maintainer> -<longdescription> -Torsmo is a system monitor that sits in the corner of your desktop. Torsmo can show various information about your -system and it's peripherals. -</longdescription> -</pkgmetadata> diff --git a/app-admin/torsmo/torsmo-0.18-r3.ebuild b/app-admin/torsmo/torsmo-0.18-r3.ebuild deleted file mode 100644 index b52595666694..000000000000 --- a/app-admin/torsmo/torsmo-0.18-r3.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/torsmo-0.18-r3.ebuild,v 1.9 2005/11/28 07:07:56 dragonheart Exp $ - -inherit eutils - -DESCRIPTION="minimalist system monitor for X" -HOMEPAGE="http://torsmo.sourceforge.net/" -SRC_URI="mirror://sourceforge/torsmo/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ppc sparc x86" -IUSE="truetype" - -RDEPEND="virtual/libc - virtual/x11 - truetype? ( >=media-libs/freetype-2 )" - -DEPEND="truetype? ( >=media-libs/freetype-2 ) - virtual/x11 - >=sys-devel/automake-1.4 - sys-devel/autoconf - sys-apps/grep - sys-apps/sed - sys-devel/gcc" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${P}.xwin.patch - epatch ${FILESDIR}/${P}.noswap.patch -} - -src_compile() { - econf \ - $(use_enable truetype xft) \ - --x-libraries=/usr/X11R6/lib/ || die "econf failed" - emake || die "compile failed" -} - -src_install() { - emake DESTDIR=${D} install || die "make install failed" - dodoc ChangeLog AUTHORS README 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." - einfo - ewarn "Please note that >=0.18 contains mozilla support without" - ewarn "patching, thus the mozilla USE flag has been dropped" -} diff --git a/app-admin/torsmo/torsmo-0.18-r6.ebuild b/app-admin/torsmo/torsmo-0.18-r6.ebuild deleted file mode 100644 index d2525ab5e08e..000000000000 --- a/app-admin/torsmo/torsmo-0.18-r6.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/torsmo-0.18-r6.ebuild,v 1.2 2005/11/28 07:07:56 dragonheart Exp $ - -inherit eutils - -DESCRIPTION="minimalist system monitor for X" -HOMEPAGE="http://torsmo.sourceforge.net/" -SRC_URI="mirror://sourceforge/torsmo/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="truetype" - -RDEPEND="virtual/libc - virtual/x11 - truetype? ( >=media-libs/freetype-2 )" - -DEPEND="truetype? ( >=media-libs/freetype-2 ) - virtual/x11 - >=sys-devel/automake-1.4 - sys-devel/autoconf - sys-apps/grep - sys-apps/sed - sys-devel/gcc" - -src_unpack() { - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${P}.noswap.patch - epatch ${FILESDIR}/${P}.i2c.patch - epatch ${FILESDIR}/${P}.avgsmp.patch -} - -src_compile() { - econf \ - `use_enable truetype xft` \ - --x-libraries=/usr/X11R6/lib/ || die "econf failed" - emake || die "compile failed" -} - -src_install() { - emake DESTDIR=${D} install || die "make install failed" - dodoc ChangeLog AUTHORS README 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." - einfo - ewarn "Please note that >=0.18 contains mozilla support without" - ewarn "patching, thus the mozilla USE flag has been dropped" -} |