cleanup old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x34C2808A

10 files changed, 0 insertions, 481 deletions

diff --git a/media-video/vdr/files/vdr-1.6.0-extensions-72-gcc-4.4.diff b/media-video/vdr/files/vdr-1.6.0-extensions-72-gcc-4.4.diff
deleted file mode 100644
index a36d2b7f8774..000000000000
--- a/media-video/vdr/files/vdr-1.6.0-extensions-72-gcc-4.4.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ru vdr-1.6.0-orig/menu.c vdr-1.6.0/menu.c
---- vdr-1.6.0-orig/menu.c	2009-06-04 10:55:14.481017158 +0200
-+++ vdr-1.6.0/menu.c	2009-06-04 10:57:12.690998810 +0200
-@@ -777,14 +777,14 @@
-         }
- #endif /* PINPLUGIN */
- #ifdef USE_LIEMIEXT
--     char* p = strrchr(data.file, '~');
-+     const char* p = strrchr(data.file, '~');
-      if (p) {
-         p++;
-         Utf8Strn0Cpy(name, p, sizeof(name));
-         Utf8Strn0Cpy(path, data.file, sizeof(path));
--        p = strrchr(path, '~');
--        if (p)
--           p[0] = 0;
-+        char *p2 = strrchr(path, '~');
-+        if (p2)
-+           p2[0] = 0;
-         }
-      else {
-         Utf8Strn0Cpy(name, data.file, sizeof(name));
-diff -ru vdr-1.6.0-orig/videodir.c vdr-1.6.0/videodir.c
---- vdr-1.6.0-orig/videodir.c	2009-06-04 10:55:14.477693736 +0200
-+++ vdr-1.6.0/videodir.c	2009-06-04 10:55:24.531019647 +0200
-@@ -199,9 +199,10 @@
- #ifdef USE_HARDLINKCUTTER
- static bool StatNearestDir(const char *FileName, struct stat *Stat)
- {
--  cString Name(FileName);
-+  char *Name = strdup(FileName);
-+  cString Name_str(Name, true); /* manage free for us */
-   char *p;
--  while ((p = strrchr((const char*)Name + 1, '/')) != NULL) {
-+  while ((p = strrchr(Name + 1, '/')) != NULL) {
-         *p = 0; // truncate at last '/'
-         if (stat(Name, Stat) == 0) {
-            isyslog("StatNearestDir: Stating %s", (const char*)Name);
diff --git a/media-video/vdr/files/vdr-1.6.0-gcc-4.4.diff b/media-video/vdr/files/vdr-1.6.0-gcc-4.4.diff
deleted file mode 100644
index e57458deb180..000000000000
--- a/media-video/vdr/files/vdr-1.6.0-gcc-4.4.diff
+++ /dev/null
@@ -1,115 +0,0 @@
-diff --git a/recording.c b/recording.c
---- a/recording.c
-+++ b/recording.c
-@@ -509,8 +509,8 @@ cRecording::cRecording(cTimer *Timer, const cEvent *Event)
-      Utf8Strn0Cpy(SubtitleBuffer, Subtitle, MAX_SUBTITLE_LENGTH);
-      Subtitle = SubtitleBuffer;
-      }
--  char *macroTITLE   = strstr(Timer->File(), TIMERMACRO_TITLE);
--  char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE);
-+  const char *macroTITLE   = strstr(Timer->File(), TIMERMACRO_TITLE);
-+  const char *macroEPISODE = strstr(Timer->File(), TIMERMACRO_EPISODE);
-   if (macroTITLE || macroEPISODE) {
-      name = strdup(Timer->File());
-      name = strreplace(name, TIMERMACRO_TITLE, Title);
-@@ -551,7 +551,7 @@ cRecording::cRecording(const char *FileName)
-   sortBuffer = NULL;
-   fileName = strdup(FileName);
-   FileName += strlen(VideoDirectory) + 1;
--  char *p = strrchr(FileName, '/');
-+  const char *p = strrchr(FileName, '/');
- 
-   name = NULL;
-   info = new cRecordingInfo;
-@@ -1022,7 +1022,7 @@ void cRecordings::DelByName(const char *FileName)
-   if (recording) {
-      cThreadLock DeletedRecordingsLock(&DeletedRecordings);
-      Del(recording, false);
--     char *ext = strrchr(recording->FileName(), '.');
-+     char *ext = strrchr(recording->fileName, '.');
-      if (ext) {
-         strncpy(ext, DELEXT, strlen(ext));
-         recording->fileSizeMB = DirSizeMB(recording->FileName());
-diff --git a/svdrp.c b/svdrp.c
---- a/svdrp.c
-+++ b/svdrp.c
-@@ -736,7 +736,7 @@ void cSVDRP::CmdGRAB(const char *Option)
-      char *strtok_next;
-      FileName = strtok_r(p, delim, &strtok_next);
-      // image type:
--     char *Extension = strrchr(FileName, '.');
-+     const char *Extension = strrchr(FileName, '.');
-      if (Extension) {
-         if (strcasecmp(Extension, ".jpg") == 0 || strcasecmp(Extension, ".jpeg") == 0)
-            Jpeg = true;
-@@ -795,16 +795,17 @@ void cSVDRP::CmdGRAB(const char *Option)
-      char RealFileName[PATH_MAX];
-      if (FileName) {
-         if (grabImageDir) {
--           cString s;
--           char *slash = strrchr(FileName, '/');
-+           cString s(FileName);
-+           FileName = s;
-+           const char *slash = strrchr(FileName, '/');
-            if (!slash) {
-               s = AddDirectory(grabImageDir, FileName);
-               FileName = s;
-               }
-            slash = strrchr(FileName, '/'); // there definitely is one
--           *slash = 0;
--           char *r = realpath(FileName, RealFileName);
--           *slash = '/';
-+           cString t(s);
-+           t.Truncate(slash - FileName);
-+           char *r = realpath(t, RealFileName);
-            if (!r) {
-               LOG_ERROR_STR(FileName);
-               Reply(501, "Invalid file name \"%s\"", FileName);
-diff --git a/channels.c b/channels.c
---- a/channels.c
-+++ b/channels.c
-@@ -574,7 +574,7 @@ void cChannel::SetLinkChannels(cLinkChannels *LinkChannels)
-      }
-   else
-      q += sprintf(q, " none");
--  dsyslog(buffer);
-+  dsyslog("%s", buffer);
- }
- 
- void cChannel::SetRefChannel(cChannel *RefChannel)
-diff --git a/device.c b/device.c
---- a/device.c
-+++ b/device.c
-@@ -529,7 +529,7 @@ eVideoSystem cDevice::GetVideoSystem(void)
-   return vsPAL;
- }
- 
--//#define PRINTPIDS(s) { char b[500]; char *q = b; q += sprintf(q, "%d %s ", CardIndex(), s); for (int i = 0; i < MAXPIDHANDLES; i++) q += sprintf(q, " %s%4d %d", i == ptOther ? "* " : "", pidHandles[i].pid, pidHandles[i].used); dsyslog(b); }
-+//#define PRINTPIDS(s) { char b[500]; char *q = b; q += sprintf(q, "%d %s ", CardIndex(), s); for (int i = 0; i < MAXPIDHANDLES; i++) q += sprintf(q, " %s%4d %d", i == ptOther ? "* " : "", pidHandles[i].pid, pidHandles[i].used); dsyslog("%s", b); }
- #define PRINTPIDS(s)
- 
- bool cDevice::HasPid(int Pid) const
-diff --git a/pat.c b/pat.c
---- a/pat.c
-+++ b/pat.c
-@@ -144,7 +144,7 @@ void cCaDescriptors::AddCaDescriptor(SI::CaDescriptor *d, bool Stream)
-   q += sprintf(q, "CAM: %04X %5d %5d %04X %d -", source, transponder, serviceId, d->getCaType(), Stream);
-   for (int i = 0; i < nca->Length(); i++)
-       q += sprintf(q, " %02X", nca->Data()[i]);
--  dsyslog(buffer);
-+  dsyslog("%s", buffer);
- #endif
- }
- 
-diff --git a/receiver.c b/receiver.c
---- a/receiver.c
-+++ b/receiver.c
-@@ -40,7 +40,7 @@ cReceiver::~cReceiver()
- {
-   if (device) {
-      const char *msg = "ERROR: cReceiver has not been detached yet! This is a design fault and VDR will segfault now!";
--     esyslog(msg);
-+     esyslog("%s", msg);
-      fprintf(stderr, "%s\n", msg);
-      *(char *)0 = 0; // cause a segfault
-      }
diff --git a/media-video/vdr/files/vdr-1.6.0-ldflags.patch b/media-video/vdr/files/vdr-1.6.0-ldflags.patch
deleted file mode 100644
index 313dc06b981d..000000000000
--- a/media-video/vdr/files/vdr-1.6.0-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2010-08-19 19:55:32.592363028 +0100
-+++ Makefile	2010-08-19 19:55:45.162140354 +0100
-@@ -94,7 +94,7 @@
- # The main program:
- 
- vdr: $(OBJS) $(SILIB)
--	$(CXX) $(CXXFLAGS) -rdynamic $(OBJS) $(NCURSESLIB) $(LIBS) $(LIBDIRS) $(SILIB) -o vdr
-+	$(CXX) $(CXXFLAGS) -rdynamic $(LDFLAGS) $(OBJS) $(NCURSESLIB) $(LIBS) $(LIBDIRS) $(SILIB) -o vdr
- 
- # The libsi library:
- 
diff --git a/media-video/vdr/files/vdr-1.6.0-makefile-install-header.diff b/media-video/vdr/files/vdr-1.6.0-makefile-install-header.diff
deleted file mode 100644
index bb53811385a9..000000000000
--- a/media-video/vdr/files/vdr-1.6.0-makefile-install-header.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: vdr-1.5.13/Makefile
-===================================================================
---- vdr-1.5.13.orig/Makefile
-+++ vdr-1.5.13/Makefile
-@@ -20,6 +20,7 @@ PREFIX  ?= /usr/local
- MANDIR   = $(PREFIX)/share/man
- BINDIR   = $(PREFIX)/bin
- LOCDIR   = ./locale
-+INCDIR   = $(PREFIX)/include
- LIBS     = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig
- INCLUDES = -I/usr/include/freetype2
- 
-@@ -161,7 +162,7 @@ clean-plugins:
- 
- # Install the files:
- 
--install: install-bin install-conf install-doc install-plugins install-i18n
-+install: install-bin install-conf install-doc install-plugins install-i18n install-header
- 
- # VDR binary:
- 
-@@ -192,6 +193,13 @@ install-plugins: plugins
- 	@mkdir -p $(DESTDIR)$(PLUGINLIBDIR)
- 	@cp --remove-destination $(PLUGINDIR)/lib/lib*-*.so.$(APIVERSION) $(DESTDIR)$(PLUGINLIBDIR)
- 
-+# Header files:
-+
-+install-header:
-+	@mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
-+	@cp *.h Make.config $(DESTDIR)$(INCDIR)/vdr
-+	@cp libsi/*.h $(DESTDIR)$(INCDIR)/vdr/libsi
-+
- # Source documentation:
- 
- srcdoc:
diff --git a/media-video/vdr/files/vdr-1.6.0-shared-tinyxml.diff b/media-video/vdr/files/vdr-1.6.0-shared-tinyxml.diff
deleted file mode 100644
index 2f33b2693275..000000000000
--- a/media-video/vdr/files/vdr-1.6.0-shared-tinyxml.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Naur vdr-1.6.0.orig/Makefile vdr-1.6.0/Makefile
---- vdr-1.6.0.orig/Makefile	2010-12-29 14:58:18.000000000 +0100
-+++ vdr-1.6.0/Makefile	2010-12-29 14:59:26.000000000 +0100
-@@ -53,7 +53,8 @@
- endif
- 
- ifdef SETUP
--OBJS += tinystr.o tinyxml.o tinyxmlerror.o tinyxmlparser.o submenu.o
-+OBJS += submenu.o
-+LIBS += -ltinyxml
- endif
- 
- ifdef TTXTSUBS
-diff -Naur vdr-1.6.0.orig/submenu.c vdr-1.6.0/submenu.c
---- vdr-1.6.0.orig/submenu.c	2010-12-29 14:58:18.000000000 +0100
-+++ vdr-1.6.0/submenu.c	2010-12-29 15:00:29.000000000 +0100
-@@ -39,7 +39,7 @@
-   _currentMenu = currentMenu;
-   _level       = level;
- 
--  if (xml != NULL && xml->Type() == TiXmlNode::ELEMENT) {
-+  if (xml != NULL && xml->Type() == TiXmlNode::TINYXML_ELEMENT) {
-      const char *tag = xml->Value();
- 
-      if (cSubMenuNode::IsType(tag) != cSubMenuNode::UNDEFINED) {
-diff -Naur vdr-1.6.0.orig/submenu.h vdr-1.6.0/submenu.h
---- vdr-1.6.0.orig/submenu.h	2010-12-29 14:58:18.000000000 +0100
-+++ vdr-1.6.0/submenu.h	2010-12-29 15:01:50.000000000 +0100
-@@ -17,7 +17,9 @@
- 
- #include "thread.h"
- #include "tools.h"
--#include "tinystr.h"
-+#define TIXML_USE_STL
-+#include <tinystr.h>
-+#include <tinyxml.h>
- 
- class cSubMenuNode;
- class cSubMenuNodes;
diff --git a/media-video/vdr/files/vdr-1.6.0-use-v4l2.patch b/media-video/vdr/files/vdr-1.6.0-use-v4l2.patch
deleted file mode 100644
index ffc02f4b52f4..000000000000
--- a/media-video/vdr/files/vdr-1.6.0-use-v4l2.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-
-    from Version 1.7.3
-    - Changed cDvbDevice::GrabImage() to use V4L2 (thanks to Marco Schlüßler).
-
-diff --git a/dvbdevice.c b/dvbdevice.c
-index e0b05a1..6aa0056 100644
---- a/dvbdevice.c
-+++ b/dvbdevice.c
-@@ -10,7 +10,7 @@
- #include "dvbdevice.h"
- #include <errno.h>
- #include <limits.h>
--#include <linux/videodev.h>
-+#include <linux/videodev2.h>
- #include <linux/dvb/audio.h>
- #include <linux/dvb/dmx.h>
- #include <linux/dvb/frontend.h>
-@@ -604,69 +604,103 @@ uchar *cDvbDevice::GrabImage(int &Size, bool Jpeg, int Quality, int SizeX, int S
-   int videoDev = open(buffer, O_RDWR);
-   if (videoDev >= 0) {
-      uchar *result = NULL;
--     struct video_mbuf mbuf;
--     if (ioctl(videoDev, VIDIOCGMBUF, &mbuf) == 0) {
--        int msize = mbuf.size;
--        unsigned char *mem = (unsigned char *)mmap(0, msize, PROT_READ | PROT_WRITE, MAP_SHARED, videoDev, 0);
--        if (mem && mem != (unsigned char *)-1) {
--           // set up the size and RGB
--           struct video_capability vc;
--           if (ioctl(videoDev, VIDIOCGCAP, &vc) == 0) {
--              struct video_mmap vm;
--              vm.frame = 0;
--              if ((SizeX > 0) && (SizeX <= vc.maxwidth) &&
--                  (SizeY > 0) && (SizeY <= vc.maxheight)) {
--                 vm.width = SizeX;
--                 vm.height = SizeY;
--                 }
--              else {
--                 vm.width = vc.maxwidth;
--                 vm.height = vc.maxheight;
--                 }
--              vm.format = VIDEO_PALETTE_RGB24;
--              if (ioctl(videoDev, VIDIOCMCAPTURE, &vm) == 0 && ioctl(videoDev, VIDIOCSYNC, &vm.frame) == 0) {
--                 // make RGB out of BGR:
--                 int memsize = vm.width * vm.height;
--                 unsigned char *mem1 = mem;
--                 for (int i = 0; i < memsize; i++) {
--                     unsigned char tmp = mem1[2];
--                     mem1[2] = mem1[0];
--                     mem1[0] = tmp;
--                     mem1 += 3;
--                     }
--
--                 if (Quality < 0)
--                    Quality = 100;
--
--                 dsyslog("grabbing to %s %d %d %d", Jpeg ? "JPEG" : "PNM", Quality, vm.width, vm.height);
--                 if (Jpeg) {
--                    // convert to JPEG:
--                    result = RgbToJpeg(mem, vm.width, vm.height, Size, Quality);
--                    if (!result)
--                       esyslog("ERROR: failed to convert image to JPEG");
--                    }
--                 else {
--                    // convert to PNM:
--                    char buf[32];
--                    snprintf(buf, sizeof(buf), "P6\n%d\n%d\n255\n", vm.width, vm.height);
--                    int l = strlen(buf);
--                    int bytes = memsize * 3;
--                    Size = l + bytes;
--                    result = MALLOC(uchar, Size);
--                    if (result) {
--                       memcpy(result, buf, l);
--                       memcpy(result + l, mem, bytes);
-+     // set up the size and RGB
-+     v4l2_format fmt;
-+     memset(&fmt, 0, sizeof(fmt));
-+     fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+     fmt.fmt.pix.width = SizeX;
-+     fmt.fmt.pix.height = SizeY;
-+     fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_BGR24;
-+     fmt.fmt.pix.field = V4L2_FIELD_ANY;
-+     if (ioctl(videoDev, VIDIOC_S_FMT, &fmt) == 0) {
-+        v4l2_requestbuffers reqBuf;
-+        memset(&reqBuf, 0, sizeof(reqBuf));
-+        reqBuf.count = 2;
-+        reqBuf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+        reqBuf.memory = V4L2_MEMORY_MMAP;
-+        if (ioctl(videoDev, VIDIOC_REQBUFS, &reqBuf) >= 0) {
-+           v4l2_buffer mbuf;
-+           memset(&mbuf, 0, sizeof(mbuf));
-+           mbuf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+           mbuf.memory = V4L2_MEMORY_MMAP;
-+           if (ioctl(videoDev, VIDIOC_QUERYBUF, &mbuf) == 0) {
-+              int msize = mbuf.length;
-+              unsigned char *mem = (unsigned char *)mmap(0, msize, PROT_READ | PROT_WRITE, MAP_SHARED, videoDev, 0);
-+              if (mem && mem != (unsigned char *)-1) {
-+                 v4l2_buffer buf;
-+                 memset(&buf, 0, sizeof(buf));
-+                 buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+                 buf.memory = V4L2_MEMORY_MMAP;
-+                 buf.index = 0;
-+                 if (ioctl(videoDev, VIDIOC_QBUF, &buf) == 0) {
-+                    v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+                    if (ioctl (videoDev, VIDIOC_STREAMON, &type) == 0) {
-+                       memset(&buf, 0, sizeof(buf));
-+                       buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+                       buf.memory = V4L2_MEMORY_MMAP;
-+                       buf.index = 0;
-+                       if (ioctl(videoDev, VIDIOC_DQBUF, &buf) == 0) {
-+                          if (ioctl(videoDev, VIDIOC_STREAMOFF, &type) == 0) {
-+                             // make RGB out of BGR:
-+                             int memsize = fmt.fmt.pix.width * fmt.fmt.pix.height;
-+                             unsigned char *mem1 = mem;
-+                             for (int i = 0; i < memsize; i++) {
-+                                 unsigned char tmp = mem1[2];
-+                                 mem1[2] = mem1[0];
-+                                 mem1[0] = tmp;
-+                                 mem1 += 3;
-+                                 }
-+
-+                             if (Quality < 0)
-+                                Quality = 100;
-+
-+                             dsyslog("grabbing to %s %d %d %d", Jpeg ? "JPEG" : "PNM", Quality, fmt.fmt.pix.width, fmt.fmt.pix.height);
-+                             if (Jpeg) {
-+                                // convert to JPEG:
-+                                result = RgbToJpeg(mem, fmt.fmt.pix.width, fmt.fmt.pix.height, Size, Quality);
-+                                if (!result)
-+                                   esyslog("ERROR: failed to convert image to JPEG");
-+                                }
-+                             else {
-+                                // convert to PNM:
-+                                char buf[32];
-+                                snprintf(buf, sizeof(buf), "P6\n%d\n%d\n255\n", fmt.fmt.pix.width, fmt.fmt.pix.height);
-+                                int l = strlen(buf);
-+                                int bytes = memsize * 3;
-+                                Size = l + bytes;
-+                                result = MALLOC(uchar, Size);
-+                                if (result) {
-+                                   memcpy(result, buf, l);
-+                                   memcpy(result + l, mem, bytes);
-+                                   }
-+                                else
-+                                   esyslog("ERROR: failed to convert image to PNM");
-+                                }
-+                             }
-+                          else
-+                             esyslog("ERROR: video device VIDIOC_STREAMOFF failed");
-+                          }
-+                       else
-+                          esyslog("ERROR: video device VIDIOC_DQBUF failed");
-                        }
-                     else
--                       esyslog("ERROR: failed to convert image to PNM");
-+                       esyslog("ERROR: video device VIDIOC_STREAMON failed");
-                     }
-+                 else
-+                    esyslog("ERROR: video device VIDIOC_QBUF failed");
-+                 munmap(mem, msize);
-                  }
-+              else
-+                 esyslog("ERROR: failed to memmap video device");
-               }
--           munmap(mem, msize);
-+           else
-+              esyslog("ERROR: video device VIDIOC_QUERYBUF failed");
-            }
-         else
--           esyslog("ERROR: failed to memmap video device");
-+           esyslog("ERROR: video device VIDIOC_REQBUFS failed");
-         }
-+     else
-+        esyslog("ERROR: video device VIDIOC_S_FMT failed");
-      close(videoDev);
-      return result;
-      }
diff --git a/media-video/vdr/files/vdr-1.6.0_p2_fontconfig_fontsort.patch b/media-video/vdr/files/vdr-1.6.0_p2_fontconfig_fontsort.patch
deleted file mode 100644
index 88f214d848a8..000000000000
--- a/media-video/vdr/files/vdr-1.6.0_p2_fontconfig_fontsort.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/font.c b/font.c
-index 706a017..72c5ec3 100644
---- a/font.c
-+++ b/font.c
-@@ -482,7 +482,8 @@ cString cFont::GetFontFileName(const char *FontName)
-      FcPatternAddBool(pat, FC_SCALABLE, FcTrue);
-      FcConfigSubstitute(NULL, pat, FcMatchPattern);
-      FcDefaultSubstitute(pat);
--     FcFontSet *fontset = FcFontSort(NULL, pat, FcFalse, NULL, NULL);
-+     FcResult fresult;
-+     FcFontSet *fontset = FcFontSort(NULL, pat, FcFalse, NULL, &fresult);
-      if (fontset) {
-         for (int i = 0; i < fontset->nfont; i++) {
-             FcBool scalable;
diff --git a/media-video/vdr/files/vdr-1.6.0_p2_gcc-4.7.patch b/media-video/vdr/files/vdr-1.6.0_p2_gcc-4.7.patch
deleted file mode 100644
index bebdbba5b2bd..000000000000
--- a/media-video/vdr/files/vdr-1.6.0_p2_gcc-4.7.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fix building with gcc-4.7
-
-https://bugs.gentoo.org/show_bug.cgi?id=419165
-signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> 2012/06/10
-
-diff -Naur vdr-1.6.0.orig/config.h vdr-1.6.0/config.h
---- vdr-1.6.0.orig/config.h	2012-06-10 17:41:26.000000000 +0200
-+++ vdr-1.6.0/config.h	2012-06-10 17:42:19.000000000 +0200
-@@ -182,7 +182,7 @@
- #ifdef USE_CMDSUBMENU
-                       AddConfig(l);
- #else
--                      Add(l);
-+                      this->Add(l);
- #endif /* CMDSUBMENU */
-                    else {
-                       esyslog("ERROR: error in %s, line %d", fileName, line);
diff --git a/media-video/vdr/files/vdr-1.6.0_p2_linguas-v3.diff b/media-video/vdr/files/vdr-1.6.0_p2_linguas-v3.diff
deleted file mode 100644
index 0b9eb5d668d6..000000000000
--- a/media-video/vdr/files/vdr-1.6.0_p2_linguas-v3.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-install only the given value in LINGUAS
-signed-of: Joerg Bornkessel <hd_brummy@gentoo.org> ( 2012/04/15 )
-
-diff -Naur vdr-1.7.27.orig/Makefile vdr-1.7.27/Makefile
---- vdr-1.7.27.orig/Makefile	2012-04-15 15:45:18.000000000 +0200
-+++ vdr-1.7.27/Makefile	2012-04-15 15:46:21.000000000 +0200
-@@ -144,7 +144,7 @@
- 
- PODIR     = po
- LOCALEDIR = locale
--I18Npo    = $(wildcard $(PODIR)/*.po)
-+I18Npo    = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
- I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
- I18Npot   = $(PODIR)/vdr.pot
- 
-@@ -167,7 +167,7 @@
- 
- install-i18n:
- 	@mkdir -p $(DESTDIR)$(LOCDIR)
--	@(cd $(LOCALEDIR); cp -r --parents * $(DESTDIR)$(LOCDIR))
-+	@(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] && continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
- 
- # The 'include' directory (for plugins):
- 
diff --git a/media-video/vdr/files/vdr-dvb-api-5-is-fine.diff b/media-video/vdr/files/vdr-dvb-api-5-is-fine.diff
deleted file mode 100644
index 7f851f77b05a..000000000000
--- a/media-video/vdr/files/vdr-dvb-api-5-is-fine.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru vdr-1.6.0-orig/dvbdevice.h vdr-1.6.0/dvbdevice.h
---- vdr-1.6.0-orig/dvbdevice.h	2009-01-12 14:05:10.000000000 +0100
-+++ vdr-1.6.0/dvbdevice.h	2009-01-12 14:05:52.000000000 +0100
-@@ -15,7 +15,7 @@
- #include "device.h"
- #include "dvbspu.h"
- 
--#if DVB_API_VERSION != 3
-+#if (DVB_API_VERSION != 3) && (DVB_API_VERSION != 5)
- #error VDR requires Linux DVB driver API version 3!
- #endif
-