media-plugins/vdr-tvonscreen removal (pending 15 Sep 2013), see #414257 #414177 for referency

12 files changed, 0 insertions, 758 deletions

diff --git a/media-plugins/vdr-tvonscreen/ChangeLog b/media-plugins/vdr-tvonscreen/ChangeLog
deleted file mode 100644
index 73243769fe63..000000000000
--- a/media-plugins/vdr-tvonscreen/ChangeLog
+++ /dev/null
@@ -1,55 +0,0 @@
-# ChangeLog for media-plugins/vdr-tvonscreen
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-tvonscreen/ChangeLog,v 1.9 2009/03/12 20:43:23 zzam Exp $
-
-  12 Mar 2009; Matthias Schwarzott <zzam@gentoo.org>
-  vdr-tvonscreen-1.0.141-r1.ebuild:
-  Marked stable on x86.
-
-*vdr-tvonscreen-1.0.141-r2 (25 Feb 2009)
-
-  25 Feb 2009; Matthias Schwarzott <zzam@gentoo.org>
-  +files/vdr-tvonscreen-1.0.141-logo-path.diff,
-  +vdr-tvonscreen-1.0.141-r2.ebuild:
-  Fix default logo path, to match the logos installed by
-  x11-themes/vdr-channel-logos, Bug #257842. Also rdepend on
-  vdr-channel-logos now.
-
-*vdr-tvonscreen-1.0.141-r1 (22 Apr 2008)
-
-  22 Apr 2008; Matthias Schwarzott <zzam@gentoo.org>
-  +files/vdr-tvonscreen-1.0.141-fixes.diff,
-  +files/vdr-tvonscreen-1.0.141-vdr-1.5.3.diff, vdr-tvonscreen-0.7.1.ebuild,
-  +vdr-tvonscreen-1.0.141-r1.ebuild:
-  Added two patches from e-tobi. This should fix some segfaults, and add
-  vdr-1.6 compatibility.
-
-  13 Mar 2007; Matthias Schwarzott <zzam@gentoo.org>
-  vdr-tvonscreen-1.0.141.ebuild:
-  Marked stable on x86.
-
-  13 Nov 2006; Matthias Schwarzott <zzam@gentoo.org>
-  vdr-tvonscreen-0.7.1.ebuild:
-  Marked stable on x86.
-
-*vdr-tvonscreen-1.0.141 (24 Oct 2006)
-
-  24 Oct 2006; Matthias Schwarzott <zzam@gentoo.org>
-  +vdr-tvonscreen-1.0.141.ebuild:
-  Version bumped, thanks to Pierre Cassimans for ebuild.
-
-  19 Oct 2006; Joerg Bornkessel <hd_brummy@gentoo.org>
-  vdr-tvonscreen-0.7.1.ebuild:
-  add ~amd64, thx to Pierre Cassimans on IRC #gentoo-vdr for reporting this
-
-  15 Aug 2006; Matthias Schwarzott <zzam@gentoo.org> metadata.xml:
-  Assigned to Gentoo VDR Project.
-
-*vdr-tvonscreen-0.7.1 (20 Mar 2006)
-
-  20 Mar 2006; Matthias Schwarzott <zzam@gentoo.org>
-  +files/vdr-tvonscreen-0.7.1-includes.diff,
-  +files/vdr-tvonscreen-0.7.1.diff, +metadata.xml,
-  +vdr-tvonscreen-0.7.1.ebuild:
-  Imported from gentoo.de
-
diff --git a/media-plugins/vdr-tvonscreen/Manifest b/media-plugins/vdr-tvonscreen/Manifest
deleted file mode 100644
index 489c7cb2d911..000000000000
--- a/media-plugins/vdr-tvonscreen/Manifest
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX vdr-tvonscreen-0.7.1-includes.diff 364 RMD160 855da04b87d6fd75c00b50a206961df63187bd45 SHA1 8d0f9245768b4378735a116168202185798f0d85 SHA256 d9678372759402b1986e12373aaf6b979efbe9fe3c27f4b82cc05f256df13e45
-AUX vdr-tvonscreen-0.7.1.diff 6109 RMD160 fae9eafbfd84bff00abd707de6d6ee9aa3e9e6e1 SHA1 9aaab0b8881327708597a4c9137826188aab4b6f SHA256 f080f326fb530acbc54d859f4757471c0ed4d43881a8b75ea66c185c774335ce
-AUX vdr-tvonscreen-1.0.141-fixes.diff 4243 RMD160 27773238bba70160ec6334f8c13235577bf41901 SHA1 39d11a4c2f9d2ed4bde08c8982f553022c9c1fb6 SHA256 253a122849defc8b07ea51c1604cc5c06dea0ce0b4052f7d2c68f21795f3a2f3
-AUX vdr-tvonscreen-1.0.141-logo-path.diff 581 RMD160 aa8c4e3e084a853749a6267a1d3f011557d7da04 SHA1 1376ec0a885f7368128b4a141324150f59e4d754 SHA256 73326e4f2a6fdb599047f86d299c37a95ce6c712bcf6069804c5262c0e4b0b23
-AUX vdr-tvonscreen-1.0.141-vdr-1.5.3.diff 5391 RMD160 50ec3fb4ffba2aa0581c41eaacd87ab2bf9008e4 SHA1 20bbd909c86112a87aa049ab1c8e62558eebe6da SHA256 3e73fc290d4d14f1f5f9d7029fc8f3a08b068b47cee4c02e437e9e5d36f4c389
-DIST vdr-tvonscreen-0.7.1.tar.gz 156123 RMD160 1d0d7f6f6f991c68a397a3786de6eaa5ad9f1175 SHA1 f5ddce24864b3ff04fac16d0a662dc7dca860668 SHA256 72535eebdcced6d6c005b7fa90bc622e44618067219da74fee4cf5ddd95e00ce
-DIST vdr-tvonscreen-1.0.141.tar.gz 153054 RMD160 d77f943973504c031776b9d706daf7bb88bf8bac SHA1 b55d7672dc8f36f655f4ea185cd99bb87c19fc2b SHA256 58d553b831c381b67ddb85d786a828ed23008293e69c35c329208ba70ad3e543
-EBUILD vdr-tvonscreen-0.7.1.ebuild 578 RMD160 73879333e66950e25b8adc4b7b72d731183ed437 SHA1 eb12e4b56a2a57edf13a7e9bd39116aabb236f3c SHA256 668832f3cef6af8cf2351f4581737e22c9bd1365a812e381f8c8ac01bad637f9
-EBUILD vdr-tvonscreen-1.0.141-r1.ebuild 606 RMD160 387d3dfa3aee49299fc112424f1f4b2ddba84f42 SHA1 4eab0b839a4d75ddcd7777eb5f8e904d06b975f8 SHA256 f43143c8af1971bc902684fa6667a71ac1ddbab84500f266adae8457bb2e4d0d
-EBUILD vdr-tvonscreen-1.0.141-r2.ebuild 692 RMD160 82a23fdbb7ab6e9624138ab9f54e0a74a79ae27b SHA1 779e8c22d750a2efbbc1ae8b70458b48f554936b SHA256 c08b0fa2ab6a5d5717ee65840c7b35a7618709fb08f081e8fe571e2cf217c8fd
-EBUILD vdr-tvonscreen-1.0.141.ebuild 513 RMD160 e09ee0af5ecb0fd83e046391980f8deb7a8f25bb SHA1 aae691e83587140f64cb16965085570b46d78721 SHA256 c88ae4a2349746bcc5dc893358ce21fe5f59d1e57e4179d8929853deba3b3bbd
-MISC ChangeLog 1931 RMD160 a8a7ac08b49e737a2575122ab71e01d80e9e3533 SHA1 95524a0c40864a06e00e09d44bdc223a6c8acdc7 SHA256 1e66d9d3ec9cdb252d0c69f070a6de20bf7ee52979684653a1d823a6a3b1d100
-MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkm5c/QACgkQt2vP6XvVdOdXJQCgjZjRORD++zpL4q32aJZJYgbP
-+ioAoNkGFrKBBr3jqzNX2u7U3CwQwEi8
-=5RI4
------END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-tvonscreen/files/vdr-tvonscreen-0.7.1-includes.diff b/media-plugins/vdr-tvonscreen/files/vdr-tvonscreen-0.7.1-includes.diff
deleted file mode 100644
index 0789dba9727d..000000000000
--- a/media-plugins/vdr-tvonscreen/files/vdr-tvonscreen-0.7.1-includes.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru tvonscreen-0.7.1-orig/magazine.h tvonscreen-0.7.1/magazine.h
---- tvonscreen-0.7.1-orig/magazine.h	2005-10-17 13:11:26.000000000 +0200
-+++ tvonscreen-0.7.1/magazine.h	2005-10-17 13:11:46.000000000 +0200
-@@ -11,6 +11,7 @@
- #define MAGAZINE_H
- 
- #include <vdr/plugin.h>
-+#include <vdr/device.h>
- #include <time.h>
- #include "gfxtools.h"
- #include "config.h"
diff --git a/media-plugins/vdr-tvonscreen/files/vdr-tvonscreen-0.7.1.diff b/media-plugins/vdr-tvonscreen/files/vdr-tvonscreen-0.7.1.diff
deleted file mode 100644
index 93ea7d952d6f..000000000000
--- a/media-plugins/vdr-tvonscreen/files/vdr-tvonscreen-0.7.1.diff
+++ /dev/null
@@ -1,245 +0,0 @@
-Downloaded from http://www.vdr-portal.de/board/thread.php?postid=433592#post433592
-
-diff -Naur tvonscreen-0.7.1/gfxtools.c tvonscreen-0.7.2/gfxtools.c
---- tvonscreen-0.7.1/gfxtools.c	2005-01-09 17:12:42.000000000 +0100
-+++ tvonscreen-0.7.2/gfxtools.c	2006-02-26 22:27:57.000000000 +0100
-@@ -24,7 +24,12 @@
- 		int index = 0;
- 		char *s;
- 		cReadLine *FileOps= new cReadLine();	
--		while ((s = FileOps->Read(f)) != NULL) 
-+ #if VDRVERSNUM >= 10318
-+                cReadLine ReadLine;
-+                while ( (s = ReadLine.Read(f) ) != NULL )
-+ #else
-+                while ((s = readline(f)) != NULL)
-+ #endif
- 		{
- 			s = skipspace(s);
- 			if (!isXpm)
-diff -Naur tvonscreen-0.7.1/magazine.c tvonscreen-0.7.2/magazine.c
---- tvonscreen-0.7.1/magazine.c	2005-09-11 20:57:10.000000000 +0200
-+++ tvonscreen-0.7.2/magazine.c	2006-02-26 22:22:44.000000000 +0100
-@@ -476,7 +476,12 @@
- #endif
- 
- 	int j=0;
-+#if VDRVERSNUM >= 10318
-+	const char *txt;
-+	cString timetxt;
-+#else
- 	const char *txt,*timetxt;
-+#endif
- 	int lh=-1;
- 	int lhc=0;
- #if VDRVERSNUM >= 10307
-@@ -540,7 +545,11 @@
- 					col=clrYellow;
- 					EDIT_curEVI=i;
- 				}
-+#if VDRVERSNUM >= 10318
-+				timetxt=*cev->GetTimeString();
-+#else
- 				timetxt=cev->GetTimeString();
-+#endif
- #if VDRVERSNUM >= 10300
- 				txt=cev->Title();
- #else
-@@ -643,6 +652,9 @@
- const cEventInfo *magazine::getNext(const cSchedule *s,const cEventInfo *e)
- #endif
- {
-+	if (e == NULL)
-+		return NULL;
-+
- #if VDRVERSNUM >= 10300
- 	const cEvent *pe = NULL;
- 	time_t ref = e->StartTime();
-@@ -687,6 +699,9 @@
- const cEventInfo *magazine::getPrev(const cSchedule *s,const cEventInfo *e)
- #endif
- {
-+	if (e == NULL)
-+		return NULL;
-+
- #if VDRVERSNUM >= 10300
- 	const cEvent *pe = NULL;
- 	time_t ref = e->StartTime();
-@@ -1485,9 +1500,9 @@
- 	{
- 		state = cOsdObject::ProcessKey(Key);
- 	
--		if (state == osUnknown)
-+		if (state == osUnknown && schedArrayNum>currentFirst)
- 		{
--			if (curmode==SHOW && schedArrayNum>currentFirst)
-+			if (curmode==SHOW)
- 			{
- 				switch (Key & ~k_Repeat)
- 				{
-@@ -1523,6 +1538,8 @@
- 						currentFirst++;
- 						if (currentFirst>schedArrayNum-3)
- 							currentFirst=schedArrayNum-3;
-+						if (currentFirst<0)
-+							currentFirst=0;
- 						output();
- 						break;
- 					case kUp:
-@@ -1557,6 +1574,8 @@
- 						currentFirst+=3;
- 						if (currentFirst>schedArrayNum-3)
- 							currentFirst=schedArrayNum-3;
-+						if (currentFirst<0)
-+							currentFirst=0;
- 						output();
- 						break;
- 					case k8: // zum aktuellen Sender
-@@ -1622,18 +1641,21 @@
- 				{
- 					case kOk:
- 						{
--							delete osd;
--							osd=NULL;
- #if VDRVERSNUM >= 10300
- 							cEvent **ev=ev4ch(EDIT_curChannel);
- #else
- 							cEventInfo **ev=ev4ch(EDIT_curChannel);
- #endif
--							me=new tvOcMenuEvent(ev[EDIT_curEVI]);
--							me->Display();
--							curmode=SHOW;
--							EDIT_curEvent=0;
--							return osContinue;
-+							if (ev[EDIT_curEVI] != NULL)
-+							{
-+								delete osd;
-+								osd=NULL;
-+								me=new tvOcMenuEvent(ev[EDIT_curEVI]);
-+								me->Display();
-+								curmode=SHOW;
-+								EDIT_curEvent=0;
-+								return osContinue;
-+							}
- 						}
- 						break;
-             		case kBack:
-@@ -1658,11 +1680,15 @@
- 							EDIT_curChannel++;
- 						if (EDIT_curChannel>schedArrayNum-1)
- 							EDIT_curChannel=schedArrayNum-1;
-+						if (EDIT_curChannel<0)
-+							EDIT_curChannel=0;
- 						if (EDIT_curChannel>currentFirst+2)
- 						{
- 							currentFirst++;
- 							if (currentFirst>schedArrayNum-3)
- 								currentFirst=schedArrayNum-3;
-+							if (currentFirst<0)
-+								currentFirst=0;
- 							EDIT_curChannel=currentFirst+2;
- 						}
- 						outputLR();
-@@ -1789,21 +1815,24 @@
- 						break;			*/
- 				case kRecord:
- 					{
--						delete osd;
--						osd=NULL;
- #if VDRVERSNUM >= 10300
- 						cEvent **ev=ev4ch(EDIT_curChannel);
- #else
- 						cEventInfo **ev=ev4ch(EDIT_curChannel);
- #endif
--						cTimer *timer = new cTimer(ev[EDIT_curEVI]);
--						cTimer *t = Timers.GetTimer(timer);
--						if (t)
-+						if (ev[EDIT_curEVI] != NULL)
- 						{
--							delete timer;
--							timer = t;
-+							delete osd;
-+							osd=NULL;
-+							cTimer *timer = new cTimer(ev[EDIT_curEVI]);
-+							cTimer *t = Timers.GetTimer(timer);
-+							if (t)
-+							{
-+								delete timer;
-+								timer = t;
-+							}
-+							met=new cMenuEditTimer(timer, !t);
- 						}
--						met=new cMenuEditTimer(timer, !t);
- 					}
- 					break;
- 					default:
-diff -Naur tvonscreen-0.7.1/search.c tvonscreen-0.7.2/search.c
---- tvonscreen-0.7.1/search.c	2004-11-23 23:13:37.000000000 +0100
-+++ tvonscreen-0.7.2/search.c	2006-02-26 22:22:44.000000000 +0100
-@@ -17,7 +17,12 @@
- #endif
- {
- 	char buf[200];
-+#if VDRVERSNUM >= 10318
-+	const char *txt,*chan;
-+	cString time1,time2,date;
-+#else
- 	const char *txt,*time1,*time2,*date,*chan;
-+#endif
- 	cChannel *channel;
- 		
- 	myev=ev;
-@@ -26,9 +31,16 @@
- #else
- 	channel = Channels.GetByChannelID(ev->GetChannelID(), true);
- #endif
-+#if VDRVERSNUM >= 10318
-+	time1=*ev->GetTimeString();
-+	time2=*ev->GetEndTimeString();
-+#else
- 	time1=ev->GetTimeString();
- 	time2=ev->GetEndTimeString();
--#if VDRVERSNUM >= 10308
-+#endif
-+#if VDRVERSNUM >= 10318
-+	date=*ev->GetDateString();
-+#elif VDRVERSNUM >= 10308
- 	date=ev->GetDateString();
- #else
- 	date=ev->GetDate();
-@@ -44,7 +56,11 @@
- 	txt=ev->GetTitle();
- #endif
- 
-+#if VDRVERSNUM >= 10318
-+	snprintf(buf,sizeof(buf)-1,"%.6s %s - %s %s/%s",*date,*time1,*time2,chan,txt);
-+#else
- 	snprintf(buf,sizeof(buf)-1,"%.6s %s - %s %s/%s",date,time1,time2,chan,txt);
-+#endif
- 	SetText(buf);
- }
- 
-diff -Naur tvonscreen-0.7.1/timer.h tvonscreen-0.7.2/timer.h
---- tvonscreen-0.7.1/timer.h	2004-11-24 18:09:25.000000000 +0100
-+++ tvonscreen-0.7.2/timer.h	2006-02-26 22:22:44.000000000 +0100
-@@ -11,10 +11,12 @@
- #define TIMER_H
- 
- #include <vdr/plugin.h>
-+#include <vdr/menu.h>
- #include <time.h>
- #include "gfxtools.h"
- #include "config.h"
- 
-+#if VDRVERSNUM < 10331
- #if VDRVERSNUM >= 10300
- class cMenuEvent : public cOsdMenu {
- private:
-@@ -48,6 +50,7 @@
-   virtual ~cMenuEditTimer();
-   virtual eOSState ProcessKey(eKeys Key);
-   };
-+#endif
- 
- class tvOcMenuEvent : public cMenuEvent {
- public:
diff --git a/media-plugins/vdr-tvonscreen/files/vdr-tvonscreen-1.0.141-fixes.diff b/media-plugins/vdr-tvonscreen/files/vdr-tvonscreen-1.0.141-fixes.diff
deleted file mode 100644
index 43f1bc6e4992..000000000000
--- a/media-plugins/vdr-tvonscreen/files/vdr-tvonscreen-1.0.141-fixes.diff
+++ /dev/null
@@ -1,151 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_tvonscreen-1.0-fixes.dpatch by apex at vdrportal.de
-## http://vdrportal.de/board/thread.php?postid=517272#post517272
-##
-## Contains following patches:
-## - http://toms-cafe.de/vdr/download/tvonscreen-0.7.0-fix-noepg.diff
-##   (fixes segmentation fault without any epg data)
-## - http://vdrportal.de/board/thread.php?postid=401733#post401733
-##   (fixes segmentation fault with empty columns)
-## - http://www.vdr-portal.de/board/thread.php?postid=681720#post681720
-##   (fixes segfault when switching to edit mode)
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes segmentation faults.
-
-@DPATCH@
-diff -urNad vdr-plugin-tvonscreen-1.0.141~/magazine.c vdr-plugin-tvonscreen-1.0.141/magazine.c
---- vdr-plugin-tvonscreen-1.0.141~/magazine.c	2006-06-18 15:59:36.000000000 +0200
-+++ vdr-plugin-tvonscreen-1.0.141/magazine.c	2008-04-13 18:11:49.000000000 +0200
-@@ -458,6 +458,9 @@
- }
- const cEvent *magazine::getNext(const cSchedule *s,const cEvent *e)
- {
-+	if (e == NULL)
-+		return NULL;
-+
- 	const cEvent *pe = NULL;
- 	time_t ref = e->StartTime();
- 
-@@ -480,6 +483,9 @@
- }
- const cEvent *magazine::getPrev(const cSchedule *s,const cEvent *e)
- {
-+	if (e == NULL)
-+		return NULL;
-+
- 	const cEvent *pe = NULL;
- 	time_t ref = e->StartTime();
- 	time_t delta = INT_MAX;
-@@ -1077,9 +1083,9 @@
- 	{
- 		state = cOsdObject::ProcessKey(Key);
- 	
--		if (state == osUnknown)
-+		if (state == osUnknown && schedArrayNum>currentFirst)
- 		{
--			if (curmode==SHOW && schedArrayNum>currentFirst)
-+			if (curmode==SHOW)
- 			{
- 				switch (Key & ~k_Repeat)
- 				{
-@@ -1111,6 +1117,8 @@
- 						currentFirst++;
- 						if (currentFirst>schedArrayNum-3)
- 							currentFirst=schedArrayNum-3;
-+						if (currentFirst<0)
-+							currentFirst=0;
- 						output();
- 						break;
- 					case kUp:
-@@ -1145,6 +1153,8 @@
- 						currentFirst+=3;
- 						if (currentFirst>schedArrayNum-3)
- 							currentFirst=schedArrayNum-3;
-+						if (currentFirst<0)
-+							currentFirst=0;
- 						output();
- 						break;
- 					case k8: // zum aktuellen Sender
-@@ -1206,14 +1216,17 @@
- 				{
- 					case kOk:
- 						{
--							delete osd;
--							osd=NULL;
- 							cEvent **ev=ev4ch(EDIT_curChannel);
--							me=new tvOcMenuEvent(ev[EDIT_curEVI]);
--							me->Display();
--							curmode=SHOW;
--							EDIT_curEvent=0;
--							return osContinue;
-+							if (ev[EDIT_curEVI] != NULL)
-+							{
-+								delete osd;
-+								osd=NULL;
-+								me=new tvOcMenuEvent(ev[EDIT_curEVI]);
-+								me->Display();
-+								curmode=SHOW;
-+								EDIT_curEvent=0;
-+								return osContinue;
-+							}
- 						}
- 						break;
-             		case kBack:
-@@ -1238,11 +1251,15 @@
- 							EDIT_curChannel++;
- 						if (EDIT_curChannel>schedArrayNum-1)
- 							EDIT_curChannel=schedArrayNum-1;
-+						if (EDIT_curChannel<0)
-+							EDIT_curChannel=0;
- 						if (EDIT_curChannel>currentFirst+2)
- 						{
- 							currentFirst++;
- 							if (currentFirst>schedArrayNum-3)
- 								currentFirst=schedArrayNum-3;
-+							if (currentFirst<0)
-+								currentFirst=0;
- 							EDIT_curChannel=currentFirst+2;
- 						}
- 						outputLR();
-@@ -1343,17 +1360,20 @@
- 						break;			*/
- 				case kRecord:
- 					{
--						delete osd;
--						osd=NULL;
- 						cEvent **ev=ev4ch(EDIT_curChannel);
--						cTimer *timer = new cTimer(ev[EDIT_curEVI]);
--						cTimer *t = Timers.GetTimer(timer);
--						if (t)
-+						if (ev[EDIT_curEVI] != NULL)
- 						{
--							delete timer;
--							timer = t;
-+							delete osd;
-+							osd=NULL;
-+							cTimer *timer = new cTimer(ev[EDIT_curEVI]);
-+							cTimer *t = Timers.GetTimer(timer);
-+							if (t)
-+							{
-+								delete timer;
-+								timer = t;
-+							}
-+							met=new cMenuEditTimer(timer, !t);
- 						}
--						met=new cMenuEditTimer(timer, !t);
- 					}
- 					break;
- 					default:
-diff -urNad vdr-plugin-tvonscreen-1.0.141~/magazine.h vdr-plugin-tvonscreen-1.0.141/magazine.h
---- vdr-plugin-tvonscreen-1.0.141~/magazine.h	2006-06-18 15:59:36.000000000 +0200
-+++ vdr-plugin-tvonscreen-1.0.141/magazine.h	2008-04-13 18:12:15.000000000 +0200
-@@ -70,7 +70,7 @@
- 	enum modes {SHOW,EDIT};
- 	enum modes curmode;
- 
--	unsigned short EDIT_curEvent;
-+	int EDIT_curEvent;
- 	int EDIT_curChannel;
- 	int EDIT_curEVI;
- 	
diff --git a/media-plugins/vdr-tvonscreen/files/vdr-tvonscreen-1.0.141-logo-path.diff b/media-plugins/vdr-tvonscreen/files/vdr-tvonscreen-1.0.141-logo-path.diff
deleted file mode 100644
index 41125073f2be..000000000000
--- a/media-plugins/vdr-tvonscreen/files/vdr-tvonscreen-1.0.141-logo-path.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru tvonscreen-1.0.141.orig/magazine.c tvonscreen-1.0.141/magazine.c
---- tvonscreen-1.0.141.orig/magazine.c	2009-02-25 16:39:18.024158328 +0100
-+++ tvonscreen-1.0.141/magazine.c	2009-02-25 16:39:51.401402805 +0100
-@@ -183,7 +183,7 @@
- 		txt=channel->ShortName(true);
- 		// logo: 64x48px
- 
--		const char *ConfigDirectory=cPlugin::ConfigDirectory("logos");
-+		const char *ConfigDirectory="/usr/share/vdr/channel-logos";
- 		if (tvonscreenCfg.logos)
- 			ConfigDirectory=tvonscreenCfg.logos;
- 		char *fname=new char[strlen(ConfigDirectory) + 1 + strlen(txt) + strlen(".xpm") + 1];
diff --git a/media-plugins/vdr-tvonscreen/files/vdr-tvonscreen-1.0.141-vdr-1.5.3.diff b/media-plugins/vdr-tvonscreen/files/vdr-tvonscreen-1.0.141-vdr-1.5.3.diff
deleted file mode 100644
index 64e512b09445..000000000000
--- a/media-plugins/vdr-tvonscreen/files/vdr-tvonscreen-1.0.141-vdr-1.5.3.diff
+++ /dev/null
@@ -1,173 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 90_tvonscreen-1.0.141-1.5.3.dpatch by Thomas Günther <tom@toms-cafe.de>
-## http://toms-cafe.de/vdr/download/tvonscreen-1.0.141-1.5.3.diff
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes for VDR >= 1.5.3.
-
-@DPATCH@
-diff -Naurp tvonscreen-1.0.141/anyfont.c tvonscreen-1.0.141-vdr153/anyfont.c
---- tvonscreen-1.0.141/anyfont.c	2004-07-08 13:54:56.000000000 +0000
-+++ tvonscreen-1.0.141-vdr153/anyfont.c	2007-09-14 12:46:58.000000000 +0000
-@@ -10,20 +10,36 @@
- #include "anyfont.h"
- #include "magazine.h"
- 
--#if VDRVERSNUM >= 10307
-+#if VDRVERSNUM >= 10503
-+anyFont::anyFont(cOsd *_osd,int fheight,int transparent)
-+#elif VDRVERSNUM >= 10307
- anyFont::anyFont(cOsd *_osd,const cFont::tPixelData *fd,int fheight,int transparent)
- #else
- anyFont::anyFont(cOsdBase *_osd,const cFont::tPixelData *fd,int fheight,int transparent)
- #endif
- {
- 	osd=_osd;
-+#if VDRVERSNUM >= 10503
-+#if VDRVERSNUM >= 10504
-+	Font = cFont::CreateFont(Setup.FontOsd, fheight);
-+#else
-+	Font = new cFreetypeFont(*AddDirectory(FONTDIR, Setup.FontOsd, fheight);
-+#endif
-+	if (!Font || !Font->Height())
-+		Font = cFont::GetFont(fontSml);
-+#else
- 	FontData=fd;
- 	FontHeight=fheight;
-+#endif
- 	trans=transparent;
- }
- int anyFont::Height(void)
- {
-+#if VDRVERSNUM >= 10503
-+	return Font->Height();
-+#else
- 	return FontHeight-2-2;
-+#endif
- }
- int anyFont::Width(const char *txt) 
- {
-@@ -39,21 +55,29 @@ int anyFont::LargeWidth(const char *txt)
- }
- int anyFont::Width(char c) 
- {
-+#if VDRVERSNUM >= 10503
-+	return Font->Width(c);
-+#else
- 	if ((int)FontData[(((unsigned char)c)-32)*(FontHeight)]>100)
- 	{
- 		mzlog(1," big letter error %c: %d",c,(int)FontData[(((unsigned char)c)-32)*(FontHeight)]);
- 		return 100;
- 	}
- 	return (int)FontData[(((unsigned char)c)-32)*(FontHeight)];
-+#endif
- }
- int anyFont::LargeWidth(char c) 
- {
-+#if VDRVERSNUM >= 10503
-+	return Font->Width(c);
-+#else
- 	if ((int)FontData[(((unsigned char)c)-32)*(FontHeight)]>100)
- 	{
- 		mzlog(1," big letter error %c: %d",c,(int)FontData[(((unsigned char)c)-32)*(FontHeight)]);
- 		return 100;
- 	}
- 	return (int)FontData[(((unsigned char)c)-32)*(FontHeight)]*2;
-+#endif
- }
- #if VDRVERSNUM >= 10307
- int anyFont::Text(int x, int y, const char *txt, tColor fg, tColor bg)
-@@ -61,6 +85,10 @@ int anyFont::Text(int x, int y, const ch
- int anyFont::Text(int x, int y, const char *txt, eDvbColor fg, eDvbColor bg, tWindowHandle wh) 
- #endif
- {
-+#if VDRVERSNUM >= 10503
-+	osd->DrawText(x, y, txt, fg, trans ? clrTransparent : bg, Font);
-+	return x += Font->Width(txt);
-+#else
- 	unsigned int pxl;
- 	int row,col;
- 
-@@ -85,6 +113,7 @@ int anyFont::Text(int x, int y, const ch
- 		x += Width(*txt++);
- 	}
- 	return x;
-+#endif
- }
- #if VDRVERSNUM >= 10307
- int anyFont::LargeText(int x, int y, const char *txt, tColor fg, tColor bg)
-@@ -92,6 +121,10 @@ int anyFont::LargeText(int x, int y, con
- int anyFont::LargeText(int x, int y, const char *txt, eDvbColor fg, eDvbColor bg, tWindowHandle wh) 
- #endif
- {
-+#if VDRVERSNUM >= 10503
-+	osd->DrawText(x, y, txt, fg, trans ? clrTransparent : bg, Font);
-+	return x + Font->Width(txt);
-+#else
- 	unsigned int pxl;
- 	int row,col;
- 
-@@ -116,6 +149,7 @@ int anyFont::LargeText(int x, int y, con
- 		x += LargeWidth(*txt++);
- 	}
- 	return x;
-+#endif
- }
- #if VDRVERSNUM >= 10307
- int anyFont::Text(int x, int y, int w, int h, const char *txt, tColor fg, tColor bg)
-diff -Naurp tvonscreen-1.0.141/anyfont.h tvonscreen-1.0.141-vdr153/anyfont.h
---- tvonscreen-1.0.141/anyfont.h	2004-07-08 13:54:56.000000000 +0000
-+++ tvonscreen-1.0.141-vdr153/anyfont.h	2007-09-14 12:47:38.000000000 +0000
-@@ -19,11 +19,17 @@ class anyFont
- #else
- 	cOsdBase *osd;
- #endif
-+#if VDRVERSNUM >= 10503
-+	const cFont *Font;
-+#else
- 	const cFont::tPixelData *FontData;
- 	int FontHeight;
-+#endif
- 	int trans;
- public:
--#if VDRVERSNUM >= 10307
-+#if VDRVERSNUM >= 10503
-+	anyFont(cOsd *o,int fheight,int transparent=0);
-+#elif VDRVERSNUM >= 10307
- 	anyFont(cOsd *o,const cFont::tPixelData *fd,int fheight,int transparent=0);
- #else
- 	anyFont(cOsdBase *o,const cFont::tPixelData *fd,int fheight,int transparent=0);
-diff -Naurp tvonscreen-1.0.141/magazine.c tvonscreen-1.0.141-vdr153/magazine.c
---- tvonscreen-1.0.141/magazine.c	2006-06-18 13:59:36.000000000 +0000
-+++ tvonscreen-1.0.141-vdr153/magazine.c	2007-09-13 20:04:34.000000000 +0000
-@@ -812,10 +812,12 @@ void magazine::autoTimer(const class cEv
- 	}
- }
- 
-+#if VDRVERSNUM < 10503
- #include "fontosd/fontosd-arial18.c"
- #include "fontosd/fontosd-verdana16.c"
- #include "fontosd/fontosd-tahoma16.c"
- #include "fontosd/fontosd-timesNewRoman16.c"
-+#endif
- 
- void magazine::Show(void)
- {
-@@ -850,10 +852,17 @@ void magazine::Show(void)
- 		delete f3;
- 		delete f4;
- 
-+#if VDRVERSNUM >= 10503
-+		f1=new anyFont(osd,18,1);		// Sendung
-+		f2=new anyFont(osd,16,1);	// Extra-Info
-+		f3=new anyFont(osd,20,1);	// Sender
-+		f4=new anyFont(osd,16);	// Tasten
-+#else
- 		f1=new anyFont(osd,(cFont::tPixelData *)fontosd_arial18,FONTOSD_ARIAL18,1);		// Sendung
- 		f2=new anyFont(osd,(cFont::tPixelData *)fontosd_verdana16,FONTOSD_VERDANA16,1);	// Extra-Info
- 		f3=new anyFont(osd,(cFont::tPixelData *)fontosd_tahoma16,FONTOSD_TAHOMA16,1);	// Sender
- 		f4=new anyFont(osd,(cFont::tPixelData *)fontosd_newroman16,FONTOSD_NEWROMAN16);	// Tasten
-+#endif
- 		for (int i=0; i < (int)(sizeof(Areas)/sizeof(tArea)); i++)
- 		{
- //			cBitmap *b=osd->GetBitmap(i);
diff --git a/media-plugins/vdr-tvonscreen/metadata.xml b/media-plugins/vdr-tvonscreen/metadata.xml
deleted file mode 100644
index d1b88e6872a7..000000000000
--- a/media-plugins/vdr-tvonscreen/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>media-tv</herd>
-<maintainer>
-<email>vdr@gentoo.org</email>
-<name>Gentoo VDR Project</name>
-</maintainer>
-<longdescription lang="en">
-</longdescription>
-</pkgmetadata>
-
diff --git a/media-plugins/vdr-tvonscreen/vdr-tvonscreen-0.7.1.ebuild b/media-plugins/vdr-tvonscreen/vdr-tvonscreen-0.7.1.ebuild
deleted file mode 100644
index 70bbe623a5a0..000000000000
--- a/media-plugins/vdr-tvonscreen/vdr-tvonscreen-0.7.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-tvonscreen/vdr-tvonscreen-0.7.1.ebuild,v 1.5 2008/04/22 10:41:49 zzam Exp $
-
-IUSE=""
-inherit vdr-plugin
-
-DESCRIPTION="VDR plugin: Show EPG like a TV guide"
-HOMEPAGE="http://www.js-home.org/vdr/tvonscreen"
-SRC_URI="http://beejay.vdr-developer.org/patches/${P}.tar.gz"
-KEYWORDS="x86 ~amd64"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND=">=media-video/vdr-1.3.18"
-
-PATCHES=("${FILESDIR}/${P}-includes.diff"
-	"${FILESDIR}/${P}.diff")
diff --git a/media-plugins/vdr-tvonscreen/vdr-tvonscreen-1.0.141-r1.ebuild b/media-plugins/vdr-tvonscreen/vdr-tvonscreen-1.0.141-r1.ebuild
deleted file mode 100644
index d22d2bb74f49..000000000000
--- a/media-plugins/vdr-tvonscreen/vdr-tvonscreen-1.0.141-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-tvonscreen/vdr-tvonscreen-1.0.141-r1.ebuild,v 1.3 2009/03/12 20:43:23 zzam Exp $
-
-IUSE=""
-inherit vdr-plugin
-
-DESCRIPTION="VDR plugin: Show EPG like a TV guide"
-HOMEPAGE="http://www.js-home.org/vdr/tvonscreen"
-SRC_URI="http://www.js-home.org/vdr/tvonscreen/${P}.tar.gz"
-KEYWORDS="~amd64 x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND=">=media-video/vdr-1.4.1"
-
-PATCHES=("${FILESDIR}/${P}-fixes.diff"
-	"${FILESDIR}/${P}-vdr-1.5.3.diff")
-
-NO_GETTEXT_HACK=1
diff --git a/media-plugins/vdr-tvonscreen/vdr-tvonscreen-1.0.141-r2.ebuild b/media-plugins/vdr-tvonscreen/vdr-tvonscreen-1.0.141-r2.ebuild
deleted file mode 100644
index 1b34b9c7d85e..000000000000
--- a/media-plugins/vdr-tvonscreen/vdr-tvonscreen-1.0.141-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-tvonscreen/vdr-tvonscreen-1.0.141-r2.ebuild,v 1.1 2009/02/25 15:52:56 zzam Exp $
-
-IUSE=""
-inherit vdr-plugin
-
-DESCRIPTION="VDR plugin: Show EPG like a TV guide"
-HOMEPAGE="http://www.js-home.org/vdr/tvonscreen"
-SRC_URI="http://www.js-home.org/vdr/tvonscreen/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND=">=media-video/vdr-1.4.1"
-RDEPEND="${DEPEND}
-	x11-themes/vdr-channel-logos"
-
-PATCHES=("${FILESDIR}/${P}-fixes.diff"
-	"${FILESDIR}/${P}-vdr-1.5.3.diff"
-	"${FILESDIR}/${P}-logo-path.diff")
-
-NO_GETTEXT_HACK=1
diff --git a/media-plugins/vdr-tvonscreen/vdr-tvonscreen-1.0.141.ebuild b/media-plugins/vdr-tvonscreen/vdr-tvonscreen-1.0.141.ebuild
deleted file mode 100644
index f98e31ad889d..000000000000
--- a/media-plugins/vdr-tvonscreen/vdr-tvonscreen-1.0.141.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-tvonscreen/vdr-tvonscreen-1.0.141.ebuild,v 1.3 2007/07/10 23:08:59 mr_bones_ Exp $
-
-IUSE=""
-inherit vdr-plugin
-
-DESCRIPTION="VDR plugin: Show EPG like a TV guide"
-HOMEPAGE="http://www.js-home.org/vdr/tvonscreen"
-SRC_URI="http://www.js-home.org/vdr/tvonscreen/${P}.tar.gz"
-KEYWORDS="~amd64 x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND=">=media-video/vdr-1.4.1"