Added patch against font problems.

Package-Manager: portage-2.1.3_rc6

5 files changed, 81 insertions, 9 deletions

diff --git a/media-plugins/vdr-cpumon/ChangeLog b/media-plugins/vdr-cpumon/ChangeLog
index 7436b00d12d5..f316eb457f4c 100644
--- a/media-plugins/vdr-cpumon/ChangeLog
+++ b/media-plugins/vdr-cpumon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-cpumon
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-cpumon/ChangeLog,v 1.2 2007/06/27 12:15:42 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-cpumon/ChangeLog,v 1.3 2007/07/08 21:23:00 zzam Exp $
+
+*vdr-cpumon-0.0.5-r1 (08 Jul 2007)
+
+  08 Jul 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-cpumon-0.0.5-vdr-1.5.diff, +vdr-cpumon-0.0.5-r1.ebuild:
+  Added patch against font problems.
 
   27 Jun 2007; Matthias Schwarzott <zzam@gentoo.org>
   vdr-cpumon-0.0.5.ebuild:
diff --git a/media-plugins/vdr-cpumon/Manifest b/media-plugins/vdr-cpumon/Manifest
index 2b95886ea540..a0ed46bd35f4 100644
--- a/media-plugins/vdr-cpumon/Manifest
+++ b/media-plugins/vdr-cpumon/Manifest
@@ -1,15 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX vdr-cpumon-0.0.5-vdr-1.5.diff 968 RMD160 2758b26fe79a81a253970964236eeb9f4d28cc53 SHA1 a2b4192d4a5d6736ea124db47e6b83e200540600 SHA256 a156cc38cbfb2f504837681d9e0160b8e6c1c0ca9119228f896c9011f6b297ab
+MD5 4743922d63da2940faa794c26a0d92fa files/vdr-cpumon-0.0.5-vdr-1.5.diff 968
+RMD160 2758b26fe79a81a253970964236eeb9f4d28cc53 files/vdr-cpumon-0.0.5-vdr-1.5.diff 968
+SHA256 a156cc38cbfb2f504837681d9e0160b8e6c1c0ca9119228f896c9011f6b297ab files/vdr-cpumon-0.0.5-vdr-1.5.diff 968
 DIST vdr-cpumon-0.0.5.tgz 17059 RMD160 bef50ccd2573e027908a1d7573d9ff4c7c6f5d2b SHA1 4b184fee12623a1416337f9a8606b1ac9b55ef4e SHA256 953971ee286ba999b0944571e254e4d1a6b1b25531b57edeb4e9c33996000dfb
+EBUILD vdr-cpumon-0.0.5-r1.ebuild 577 RMD160 37d1dff2ba246c667be0faec7ddf078c74fd0ac8 SHA1 182af1aab14a0f48e63622a1c497096636946e33 SHA256 16a98268b14b6b8ad6b6c2741af0bf76ce5f20a3d06a89ff2d7185486ef912fb
+MD5 d3b13d14300f9008f083123b19a43a47 vdr-cpumon-0.0.5-r1.ebuild 577
+RMD160 37d1dff2ba246c667be0faec7ddf078c74fd0ac8 vdr-cpumon-0.0.5-r1.ebuild 577
+SHA256 16a98268b14b6b8ad6b6c2741af0bf76ce5f20a3d06a89ff2d7185486ef912fb vdr-cpumon-0.0.5-r1.ebuild 577
 EBUILD vdr-cpumon-0.0.5.ebuild 531 RMD160 aa258602cc070b4ceaaf1b16fba870150d4c5d1d SHA1 e36f1ade1d90c122074ed04ec2e89f3abfc4bc35 SHA256 c42745c71b563c1af3dc9d8311da7b35bd4ac156476796bae92962fc69d48d84
 MD5 dd5448a27b2461bfa65de334a4826bca vdr-cpumon-0.0.5.ebuild 531
 RMD160 aa258602cc070b4ceaaf1b16fba870150d4c5d1d vdr-cpumon-0.0.5.ebuild 531
 SHA256 c42745c71b563c1af3dc9d8311da7b35bd4ac156476796bae92962fc69d48d84 vdr-cpumon-0.0.5.ebuild 531
-MISC ChangeLog 482 RMD160 4ed643f2c6fdff9d56c9ea7a8daff5b2c489ab73 SHA1 a27143df3c1b53fe179ea2b6f700fcdf080e57e3 SHA256 3974bd6bcbe9eda1768610f1496d0e7640db207f597748596b33dedf9bb6b776
-MD5 873dff4a070efa067aa8075dd3294177 ChangeLog 482
-RMD160 4ed643f2c6fdff9d56c9ea7a8daff5b2c489ab73 ChangeLog 482
-SHA256 3974bd6bcbe9eda1768610f1496d0e7640db207f597748596b33dedf9bb6b776 ChangeLog 482
+MISC ChangeLog 678 RMD160 707690a3bb30bda3bbd878f1ce5d73966aa742ec SHA1 fa84c19a75511f0dc778ff65cc52ad2374df531f SHA256 9a2f5440ffca2d9d16e5e484229e52e5ceff60715e85b473458003f9d0d02f07
+MD5 b87ad2bc4e2f86df28675aba9dca4db5 ChangeLog 678
+RMD160 707690a3bb30bda3bbd878f1ce5d73966aa742ec ChangeLog 678
+SHA256 9a2f5440ffca2d9d16e5e484229e52e5ceff60715e85b473458003f9d0d02f07 ChangeLog 678
 MISC metadata.xml 258 RMD160 3978316b72989b0150dd21a2ba1f2449a158ebc9 SHA1 4ed083cc2156c1d9ea22136d69bcdd9da3d758b9 SHA256 1d6292676863287cee09b69ba35f3ea7546ed6718a3fea1d326deae735dadf64
 MD5 8ba67721f7ef0b4783a69038d2995113 metadata.xml 258
 RMD160 3978316b72989b0150dd21a2ba1f2449a158ebc9 metadata.xml 258
@@ -17,10 +25,13 @@ SHA256 1d6292676863287cee09b69ba35f3ea7546ed6718a3fea1d326deae735dadf64 metadata
 MD5 43e733aa2e22f6d9ac3da13ec2fec9e7 files/digest-vdr-cpumon-0.0.5 238
 RMD160 0ac92508c03cbeb3e14c8c53acb59627fbf06e0d files/digest-vdr-cpumon-0.0.5 238
 SHA256 35f1e85a0132d2c8f338840aa0a374a0a5af89ffbcc964d56fd89bafbcfce652 files/digest-vdr-cpumon-0.0.5 238
+MD5 43e733aa2e22f6d9ac3da13ec2fec9e7 files/digest-vdr-cpumon-0.0.5-r1 238
+RMD160 0ac92508c03cbeb3e14c8c53acb59627fbf06e0d files/digest-vdr-cpumon-0.0.5-r1 238
+SHA256 35f1e85a0132d2c8f338840aa0a374a0a5af89ffbcc964d56fd89bafbcfce652 files/digest-vdr-cpumon-0.0.5-r1 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGglT4t2vP6XvVdOcRAqXDAKDQ6NYUEL+f7rcBwxbMsTg2aXFItQCgskCH
-mol+2SfL+bNITj31Zrhdkfs=
-=XZVv
+iD8DBQFGkVW6t2vP6XvVdOcRAl66AKDBPhHNua7Oqxg6dUG7fPY/0GFKUgCghSRH
+mGt8JpnyKElNn7oBP0xqzCE=
+=7zpI
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-cpumon/files/digest-vdr-cpumon-0.0.5-r1 b/media-plugins/vdr-cpumon/files/digest-vdr-cpumon-0.0.5-r1
new file mode 100644
index 000000000000..5c2b6bb595dd
--- /dev/null
+++ b/media-plugins/vdr-cpumon/files/digest-vdr-cpumon-0.0.5-r1
@@ -0,0 +1,3 @@
+MD5 ddcafa3bb3e633c32813812e4795e490 vdr-cpumon-0.0.5.tgz 17059
+RMD160 bef50ccd2573e027908a1d7573d9ff4c7c6f5d2b vdr-cpumon-0.0.5.tgz 17059
+SHA256 953971ee286ba999b0944571e254e4d1a6b1b25531b57edeb4e9c33996000dfb vdr-cpumon-0.0.5.tgz 17059
diff --git a/media-plugins/vdr-cpumon/files/vdr-cpumon-0.0.5-vdr-1.5.diff b/media-plugins/vdr-cpumon/files/vdr-cpumon-0.0.5-vdr-1.5.diff
new file mode 100644
index 000000000000..88607a0e9083
--- /dev/null
+++ b/media-plugins/vdr-cpumon/files/vdr-cpumon-0.0.5-vdr-1.5.diff
@@ -0,0 +1,33 @@
+Index: cpumon-0.0.5/cpumonosd.c
+===================================================================
+--- cpumon-0.0.5.orig/cpumonosd.c
++++ cpumon-0.0.5/cpumonosd.c
+@@ -72,6 +72,7 @@ cCpuMonOsd::~cCpuMonOsd(void)
+ 
+ void cCpuMonOsd::Action()
+ {
++   const cFont *font = cFont::GetFont(fontOsd);
+    // reset the osd area
+    osd->DrawRectangle(0, 0, 399, 399, clrTransparent);
+    // draw a plugin title
+@@ -249,6 +250,7 @@ void cCpuMonOsd::drawBoard(void)
+ 
+ void cCpuMonOsd::drawLegend()
+ {
++  const cFont *font = cFont::GetFont(fontOsd);
+   // draw a small legend
+   osd->DrawRectangle(XBASE - 5, YBASE + 5, XBASE + XLENGTH + 5, YBASE + 125, bgcolor);
+   
+Index: cpumon-0.0.5/cpumonosd.h
+===================================================================
+--- cpumon-0.0.5.orig/cpumonosd.h
++++ cpumon-0.0.5/cpumonosd.h
+@@ -10,8 +10,6 @@
+ #include "cpumonfetcher.h"
+ #include "parms.h"
+ 
+-static const cFont *font = cFont::GetFont(fontOsd);
+-
+ struct fs
+ {
+   int val;
diff --git a/media-plugins/vdr-cpumon/vdr-cpumon-0.0.5-r1.ebuild b/media-plugins/vdr-cpumon/vdr-cpumon-0.0.5-r1.ebuild
new file mode 100644
index 000000000000..2671289e75d3
--- /dev/null
+++ b/media-plugins/vdr-cpumon/vdr-cpumon-0.0.5-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-cpumon/vdr-cpumon-0.0.5-r1.ebuild,v 1.1 2007/07/08 21:23:00 zzam Exp $
+
+inherit vdr-plugin
+
+DESCRIPTION="VDR Plugin: Show cpu-usage on OSD"
+HOMEPAGE="ftp://ftp.eui.fh-koblenz.de/pub/studenten/Philipp.Glass/vdr"
+SRC_URI="ftp://ftp.eui.fh-koblenz.de/pub/studenten/Philipp.Glass/vdr/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.3.44"
+
+PATCHES="${FILESDIR}/${P}-vdr-1.5.diff"
+