in -r1 Version added patch http://www.vdr-portal.de/board/thread.php?postid=468888#post468888

  make variables configurable in vdr.sysinfo conf file
  RDEPEND inherit in 0.0.4a & 0.1.0a fixed

Package-Manager: portage-2.0.54-r2

8 files changed, 177 insertions, 11 deletions

diff --git a/media-plugins/vdr-sysinfo/ChangeLog b/media-plugins/vdr-sysinfo/ChangeLog
index 9d3687ac404e..52a00a58d3fe 100644
--- a/media-plugins/vdr-sysinfo/ChangeLog
+++ b/media-plugins/vdr-sysinfo/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-plugins/vdr-sysinfo
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-sysinfo/ChangeLog,v 1.3 2006/05/01 12:32:07 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-sysinfo/ChangeLog,v 1.4 2006/05/22 21:18:15 hd_brummy Exp $
+
+*vdr-sysinfo-0.1.0a-r1 (22 May 2006)
+
+  22 May 2006; Joerg Bornkessel <hd_brummy@gentoo.org> +files/confd-0.1.0a,
+  +files/vdr-sysinfo-0.1.0a-gentoo.diff, vdr-sysinfo-0.0.4a.ebuild,
+  vdr-sysinfo-0.1.0a.ebuild, +vdr-sysinfo-0.1.0a-r1.ebuild:
+  in -r1 Version added patch http://www.vdr-portal.de/board/thread.php?postid=468888#post468888
+  make variables configurable in vdr.sysinfo conf file
+  RDEPEND inherit in 0.0.4a & 0.1.0a fixed
 
 *vdr-sysinfo-0.1.0a (01 May 2006)
 
diff --git a/media-plugins/vdr-sysinfo/Manifest b/media-plugins/vdr-sysinfo/Manifest
index 7a1959595bd7..dc13e3c6adef 100644
--- a/media-plugins/vdr-sysinfo/Manifest
+++ b/media-plugins/vdr-sysinfo/Manifest
@@ -1,17 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f998c57b8b5373bd8986af08b55898e3 ChangeLog 700
+MD5 f3f4b049ad3057c75f61b4a83c406aa9 ChangeLog 1137
+MD5 67410df1245e2fd434387753464dcb77 files/confd-0.1.0a 443
 MD5 46f39cc2dbf69a20f4db3e410e7722f6 files/digest-vdr-sysinfo-0.0.4a 244
 MD5 5588392bbeebb660060c2606f6d452eb files/digest-vdr-sysinfo-0.1.0a 66
+MD5 7b2d943a0046507e0def3e8467f81525 files/digest-vdr-sysinfo-0.1.0a-r1 152
+MD5 c7bda58bae2b6ca7b8dd9b617c4f1f5c files/vdr-sysinfo-0.1.0a-gentoo.diff 3775
 MD5 7c30ab7528b676a1a0c2737821599b29 metadata.xml 300
-MD5 3d0e82c20b9cc2e8a4a0faf3e797dd47 vdr-sysinfo-0.0.4a.ebuild 796
-MD5 47735ea0d6b323e19ce3df2a996cef14 vdr-sysinfo-0.1.0a.ebuild 796
+MD5 0a44932d8ca5cf700f4f63c21db88bda vdr-sysinfo-0.0.4a.ebuild 834
+MD5 1e7315e6dc0bd1a94e0a990db99ddfd8 vdr-sysinfo-0.1.0a-r1.ebuild 883
+MD5 b288d5c2b0af861f8457043f985bb9ec vdr-sysinfo-0.1.0a.ebuild 834
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 Comment: no further Information
 
-iD8DBQFEVf/Udn07HTTCgIoRAv+6AJ9nKTKeIEvQCTVkDw+urvE3+G2HgQCcCpT/
-67/CF6IKIg9/IB4xSqHGotM=
-=P5TS
+iD8DBQFEciqndn07HTTCgIoRAlNpAJ0SQ48p3LC122nhC+nLuJiOsGzamQCgtuy0
+5ct2dqKPoOSQtUN5O3DNBok=
+=xUjP
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-sysinfo/files/confd-0.1.0a b/media-plugins/vdr-sysinfo/files/confd-0.1.0a
new file mode 100644
index 000000000000..66eacf48e6f8
--- /dev/null
+++ b/media-plugins/vdr-sysinfo/files/confd-0.1.0a
@@ -0,0 +1,16 @@
+# Global config file for VDR sysinfo plugin
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-sysinfo/files/confd-0.1.0a,v 1.1 2006/05/22 21:18:15 hd_brummy Exp $
+
+# I most cases here is no user activity needed
+# Yust if you get wrong or no output in OSD of plugin
+# you have something to change on next parameter
+# Get right parameter by run 'sensors' on Konsole
+
+#CPU_TEMP="CPU Temp"
+
+#MOBO_TEMP="M/B Temp"
+
+#FAN_1="fan2"
+
+#FAN_2="fan1"
+
diff --git a/media-plugins/vdr-sysinfo/files/digest-vdr-sysinfo-0.1.0a-r1 b/media-plugins/vdr-sysinfo/files/digest-vdr-sysinfo-0.1.0a-r1
new file mode 100644
index 000000000000..6c7400a5d7c9
--- /dev/null
+++ b/media-plugins/vdr-sysinfo/files/digest-vdr-sysinfo-0.1.0a-r1
@@ -0,0 +1,2 @@
+MD5 aaf5005f705f7729f3ae3cf22fdef518 vdr-sysinfo-0.1.0a-firefly-20060520.tar.bz2 9172
+MD5 0e733d856dc53b088ca65d5b6a5372d8 vdr-sysinfo-0.1.0a.tgz 17693
diff --git a/media-plugins/vdr-sysinfo/files/vdr-sysinfo-0.1.0a-gentoo.diff b/media-plugins/vdr-sysinfo/files/vdr-sysinfo-0.1.0a-gentoo.diff
new file mode 100644
index 000000000000..9dbede1299bd
--- /dev/null
+++ b/media-plugins/vdr-sysinfo/files/vdr-sysinfo-0.1.0a-gentoo.diff
@@ -0,0 +1,101 @@
+fix some path to sysinfo.sh on gentoo install
+sysinfo.sh prepared to use /etc/conf.d/vdr.sysinfo
+
+Joerg Bornkessel hd_brummy@gentoo.org ( 22 May 2006 )
+
+diff -Naur sysinfo-0.1.0a.orig/script/sysinfo.sh sysinfo-0.1.0a/script/sysinfo.sh
+--- sysinfo-0.1.0a.orig/script/sysinfo.sh	2006-05-22 18:53:38.770308750 +0200
++++ sysinfo-0.1.0a/script/sysinfo.sh	2006-05-22 18:54:25.325218250 +0200
+@@ -1,31 +1,35 @@
+ #!/bin/bash
+ 
++source /etc/conf.d/vdr.sysinfo
++
+ case "$1" in
+ 	cputemp)
+-		sensors | grep -i 'CPU TEMP' | cut -c 10-18 | tr -d ' '
+-		exit $?
++		sensors | grep -i ${CPU_TEMP:=CPU Temp} | cut -c 10-18 | tr -d ' '
+         ;;
+ 	cpufan)
+-		sensors | grep -i 'FAN1' | cut -c 10-18 | tr -d ' '
+-		exit $?
++		sensors | grep -i ${FAN_1:=FAN1} | cut -c 10-18 | tr -d ' '
+         ;;
++	cputime)
++		ps -eo%C | awk '/[.]/ { a=a+$1 } ; END { print a }'
++		;;
+ 	mbtemp)
+-		sensors | grep -i 'M/B TEMP' | cut -c 10-18 | tr -d ' '
+-		exit $?
++		sensors | grep -i ${MOBO_TEMP:=M/B Temp} | cut -c 10-18 | tr -d ' '
+         ;;
+ 	mbfan)
+-		sensors | grep -i 'FAN2' | cut -c 10-18 | tr -d ' '
+-		exit $?
++		sensors | grep -i ${FAN_2:=FAN2} | cut -c 10-18 | tr -d ' '
+         ;;		
+ 	vidspace)
+-		df -h | grep hda1 | cut -c 33-38 | tr -d ' '
+-		exit $?
++		df -h | grep hd | grep video | awk '{ print $4}'
+         ;;		
+ 	*)
+-		echo ""
+-		echo "Usage: sysinfo.sh {cputemp|cpufan|mbtemp|mbfan|vidspace}"
+-		echo ""
++		echo "Usage: sysinfo.sh {cputemp|cpufan|cputime|mbtemp|mbfan|vidspace}"
+ 		exit 1
+ 		;;
+ esac
++
++case ${PIPESTATUS[@]} in
++     0|'0 0'*) exit 0 ;;
++     *) exit 1 ;;
++esac
++
+ exit 0
+diff -Naur sysinfo-0.1.0a.orig/sysinfoosd.c sysinfo-0.1.0a/sysinfoosd.c
+--- sysinfo-0.1.0a.orig/sysinfoosd.c	2006-05-22 18:53:38.770308750 +0200
++++ sysinfo-0.1.0a/sysinfoosd.c	2006-05-22 18:56:07.627611750 +0200
+@@ -152,18 +152,18 @@
+ 	osd->DrawText(15, iTop+10, cTemp, pal[3],pal[1],font);
+ 	sprintf(cTemp, tr("M/B temperature:"));
+ 	osd->DrawText(15, iTop+40, cTemp, pal[3],pal[1],font);
+-	ExecShellCmd("sysinfo.sh cputemp", cTemp);
++	ExecShellCmd("/usr/share/vdr/sysinfo/sysinfo.sh cputemp", cTemp);
+ 	osd->DrawText(270, iTop+10, cTemp, pal[3],pal[1],font);
+-	ExecShellCmd("sysinfo.sh mbtemp", cTemp);
++	ExecShellCmd("/usr/share/vdr/sysinfo/sysinfo.sh mbtemp", cTemp);
+ 	osd->DrawText(270, iTop+40, cTemp, pal[3],pal[1],font);
+ 	// Fan rpm
+ 	sprintf(cTemp, tr("Fan1:"));
+ 	osd->DrawText(((iWidth/2)+20), iTop+10, cTemp, pal[3],pal[1],font);
+ 	sprintf(cTemp, tr("Fan2:"));
+ 	osd->DrawText(((iWidth/2)+20), iTop+40, cTemp, pal[3],pal[1],font);
+-	ExecShellCmd("sysinfo.sh cpufan", cTemp);
++	ExecShellCmd("/usr/share/vdr/sysinfo/sysinfo.sh cpufan", cTemp);
+ 	osd->DrawText(((iWidth/2)+170), iTop+10, cTemp, pal[3],pal[1],font);
+-	ExecShellCmd("sysinfo.sh mbfan", cTemp);
++	ExecShellCmd("/usr/share/vdr/sysinfo/sysinfo.sh mbfan", cTemp);
+ 	osd->DrawText(((iWidth/2)+170), iTop+40, cTemp, pal[3],pal[1],font);
+ 	// Draw line separator
+ 	osd->DrawRectangle(iTop+74, 0, iWidth, 1, pal[2]);
+@@ -174,7 +174,7 @@
+ 	char cTemp[100];	// 2DO
+ 	sprintf(cTemp, tr("Video disk free space:"));
+ 	osd->DrawText(15, iTop+10, cTemp, pal[3],pal[1],font);
+-	ExecShellCmd("sysinfo.sh vidspace", cTemp);
++	ExecShellCmd("/usr/share/vdr/sysinfo/sysinfo.sh vidspace", cTemp);
+ 	osd->DrawText(285, iTop+10, cTemp, pal[3],pal[1],font);
+ 	// Draw line separator
+ 	osd->DrawRectangle(iTop+46, 0, iWidth, 1, pal[2]);
+@@ -222,7 +222,7 @@
+ 
+ 	// Calculate cpu free
+ 	//ExecShellCmd("CPU=0; for I in `ps -eo ""%C"" | grep ""\\.""`; do CPU=`echo $CPU $I | awk '{ print $1 + $2 }'`; done; echo $CPU", cTemp);
+-	ExecShellCmd("sysinfo.sh cputime", cTemp);
++	ExecShellCmd("/usr/share/vdr/sysinfo/sysinfo.sh cputime", cTemp);
+ 	iPerCentCpu=atoi(cTemp);
+ 	if (iPerCentCpu>100) iPerCentCpu=100;
+ 	sprintf(cTemp, tr("CPU used:"));
diff --git a/media-plugins/vdr-sysinfo/vdr-sysinfo-0.0.4a.ebuild b/media-plugins/vdr-sysinfo/vdr-sysinfo-0.0.4a.ebuild
index a3a306a087fd..3b8fdea14efc 100644
--- a/media-plugins/vdr-sysinfo/vdr-sysinfo-0.0.4a.ebuild
+++ b/media-plugins/vdr-sysinfo/vdr-sysinfo-0.0.4a.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-sysinfo/vdr-sysinfo-0.0.4a.ebuild,v 1.2 2006/03/31 17:48:53 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-sysinfo/vdr-sysinfo-0.0.4a.ebuild,v 1.3 2006/05/22 21:18:15 hd_brummy Exp $
 
-inherit vdr-plugin
+inherit vdr-plugin eutils
 
 DESCRIPTION="VDR plugin: Shows information over your system (CPU/Memory usage ...)"
 HOMEPAGE="http://kikko77.altervista.org/"
@@ -15,6 +15,8 @@ IUSE=""
 
 DEPEND=">=media-video/vdr-1.3.7"
 
+RDEPEND="sys-apps/lm_sensors"
+
 src_unpack() {
 	vdr-plugin_src_unpack
 
diff --git a/media-plugins/vdr-sysinfo/vdr-sysinfo-0.1.0a-r1.ebuild b/media-plugins/vdr-sysinfo/vdr-sysinfo-0.1.0a-r1.ebuild
new file mode 100644
index 000000000000..dc16de0e3bdd
--- /dev/null
+++ b/media-plugins/vdr-sysinfo/vdr-sysinfo-0.1.0a-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-sysinfo/vdr-sysinfo-0.1.0a-r1.ebuild,v 1.1 2006/05/22 21:18:15 hd_brummy Exp $
+
+inherit vdr-plugin eutils
+
+DESCRIPTION="VDR plugin: Shows information over your system (CPU/Memory usage ...)"
+HOMEPAGE="http://kikko77.altervista.org/"
+SRC_URI="http://kikko77.altervista.org/sections/Download/[12]_sysinfo/${P}.tgz
+		mirror://gentoo/${P}-firefly-20060520.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.3.7"
+
+RDEPEND="sys-apps/lm_sensors"
+
+PATCHES="${DISTDIR}/${P}-firefly-20060520.tar.bz2 ${FILESDIR}/${P}-gentoo.diff"
+
+VDR_CONFD_FILE="${FILESDIR}/confd-${PV}"
+
+src_install() {
+	vdr-plugin_src_install
+	insinto /usr/share/vdr/sysinfo/
+	insopts -m0755
+	doins script/sysinfo.sh
+}
diff --git a/media-plugins/vdr-sysinfo/vdr-sysinfo-0.1.0a.ebuild b/media-plugins/vdr-sysinfo/vdr-sysinfo-0.1.0a.ebuild
index 992d8b24037a..5b93c758e7c4 100644
--- a/media-plugins/vdr-sysinfo/vdr-sysinfo-0.1.0a.ebuild
+++ b/media-plugins/vdr-sysinfo/vdr-sysinfo-0.1.0a.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-sysinfo/vdr-sysinfo-0.1.0a.ebuild,v 1.1 2006/05/01 12:32:07 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-sysinfo/vdr-sysinfo-0.1.0a.ebuild,v 1.2 2006/05/22 21:18:15 hd_brummy Exp $
 
-inherit vdr-plugin
+inherit vdr-plugin eutils
 
 DESCRIPTION="VDR plugin: Shows information over your system (CPU/Memory usage ...)"
 HOMEPAGE="http://kikko77.altervista.org/"
@@ -15,6 +15,8 @@ IUSE=""
 
 DEPEND=">=media-video/vdr-1.3.7"
 
+RDEPEND="sys-apps/lm_sensors"
+
 src_unpack() {
 	vdr-plugin_src_unpack