eapi=3, cleanup, stable amd64

(Portage version: 2.1.9.25/cvs/Linux i686)

8 files changed, 14 insertions, 736 deletions

diff --git a/media-plugins/vdr-clock/ChangeLog b/media-plugins/vdr-clock/ChangeLog
index c88fc899e5f3..aa40145a12bd 100644
--- a/media-plugins/vdr-clock/ChangeLog
+++ b/media-plugins/vdr-clock/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-clock
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-clock/ChangeLog,v 1.9 2008/04/28 08:05:18 zzam Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-clock/ChangeLog,v 1.10 2011/01/28 18:13:42 hd_brummy Exp $
+
+  28 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-clock-0.0.5b-r1.ebuild, -files/vdr-clock-0.0.5b-gcc4.diff,
+  -files/0.0.6/pingpong-fixes.diff, -files/vdr-clock-0.0.5b-makefile.diff,
+  -vdr-clock-0.0.6.ebuild, -vdr-clock-0.0.10.ebuild, vdr-clock-1.0.0.ebuild:
+  eapi=3, cleanup, stable amd64
 
   28 Apr 2008; Matthias Schwarzott <zzam@gentoo.org>
   vdr-clock-0.0.5b-r1.ebuild, vdr-clock-0.0.6.ebuild,
diff --git a/media-plugins/vdr-clock/files/0.0.6/pingpong-fixes.diff b/media-plugins/vdr-clock/files/0.0.6/pingpong-fixes.diff
deleted file mode 100644
index 0506d523deb0..000000000000
--- a/media-plugins/vdr-clock/files/0.0.6/pingpong-fixes.diff
+++ /dev/null
@@ -1,637 +0,0 @@
-diff -u --recursive --new-file clock-0.0.6/clock.c clock-0.0.6-fixes/clock.c
---- clock-0.0.6/clock.c	2006-05-21 17:28:06.000000000 +0200
-+++ clock-0.0.6-fixes/clock.c	2007-05-20 01:16:15.000000000 +0200
-@@ -23,6 +23,9 @@
- 
- // Global variables
- 
-+bool      ClockActive = false;
-+
-+int       HideMenuEntry = 1;
- int       TimeWidth  = Setup.OSDWidth;
- int       TimeHeight = Setup.OSDHeight;
- int       XOffset    = 100;
-@@ -76,13 +79,12 @@
- class cOSDClock : public cThread, public cOsdObject{
- private:
-   cOsd *osd;
--  eKeys LastKey;
-   bool running, shutdown;
-   tColor ColorH, ColorM, ColorS, ColorForeGround, ColorBackGround;
-   int r;
-   void DrawArrow(double width, double len, tColor col, double ang, cEnhancedBitmap &img);
-   void DrawScale(int r, tColor col, cEnhancedBitmap &Analog);
--  void cOSDClock::DrawModernSec(int r, int sec, tColor col, cEnhancedBitmap &Analog);
-+  void DrawModernSec(int r, int sec, tColor col, cEnhancedBitmap &Analog);
-   void DrawPoint(double x, double y, int r, tColor col, cEnhancedBitmap &Analog);
-   tColor getColor(int color);
-   static cBitmap bmClock;
-@@ -413,7 +415,6 @@
-     } // while running
-   shutdown = true;
-   delete osd;
--  cRemote::Put(LastKey);
- }
- 
- 
-@@ -421,9 +422,9 @@
- {
-   if (Key != kNone)
-     {
-+      ClockActive = false;
-       if (AlarmTime == -1)
- 	Alarm = false;
--      if (Key != kOk) LastKey = Key;
-       return (osEnd);
-     }
-   return (osContinue);
-@@ -435,6 +436,7 @@
- class cMenuSetupClock : public cMenuSetupPage {
- private:
-   char Color[16][32];
-+  int newHideMainMenuEntry;
-   int newSize;
-   int newShowSec;
-   int newShowAlarm;
-@@ -465,6 +467,7 @@
- cMenuSetupClock::cMenuSetupClock(void)
- {
-   cSetup data;
-+  newHideMainMenuEntry = HideMenuEntry;
-   newSize       = Size;
-   newShowSec    = ShowSec;
-   newShowAlarm  = ShowAlarm;
-@@ -501,6 +504,7 @@
-     }
- 
-   int current = Current();
-+  Add(new cMenuEditBoolItem( tr("Hide main menu entry"),         &newHideMainMenuEntry));
-   Add(new cMenuEditIntItem(  tr("x Position"),                   &newXOffset,    0, Setup.OSDWidth - x));
-   Add(new cMenuEditIntItem(  tr("y Position"),                   &newYOffset,    0, Setup.OSDHeight - y));
-   Add(new cMenuEditStraItem( tr("Type of the clock"),            &newType,       7, ClockType));
-@@ -539,6 +543,7 @@
- 
- void cMenuSetupClock::Store(void)
- {
-+  SetupStore("HideMenuEntry",    HideMenuEntry    = newHideMainMenuEntry);
-   SetupStore("XOffset",    XOffset    = newXOffset);
-   SetupStore("YOffset",    YOffset    = newYOffset);
-   SetupStore("ShowSec",    ShowSec    = newShowSec);
-@@ -571,13 +576,13 @@
-   cPluginClock(void);
-   virtual ~cPluginClock();
-   virtual const char *Version(void) { return VERSION; }
--  virtual const char *Description(void) { return DESCRIPTION; }
-+  virtual const char *Description(void) { return tr(DESCRIPTION); }
-   virtual const char *CommandLineHelp(void);
-   virtual bool ProcessArgs(int argc, char *argv[]);
-   virtual bool Initialize(void);
-   virtual bool Start(void);
-   virtual void Housekeeping(void);
--  virtual const char *MainMenuEntry(void) { return MAINMENUENTRY; }
-+  virtual const char *MainMenuEntry(void);
-   virtual cOsdObject *MainMenuAction(void);
-   virtual cMenuSetupPage *SetupMenu(void);
-   virtual bool SetupParse(const char *Name, const char *Value);
-@@ -625,10 +630,24 @@
-   // Perform any cleanup or other regular tasks.
- }
- 
-+const char *cPluginClock::MainMenuEntry(void) {
-+  if (HideMenuEntry)
-+     return NULL;
-+  else
-+     return tr(MAINMENUENTRY);
-+}
-+
- cOsdObject *cPluginClock::MainMenuAction(void)
- {
--  // Perform the action when selected from the main VDR menu.
--  return new cOSDClock();
-+    // Perform the action when selected from the main VDR menu.
-+    if (ClockActive) {
-+        ClockActive = false;
-+        return NULL;
-+    }
-+    else {
-+        ClockActive = true;
-+        return new cOSDClock();
-+    }
- }
- 
- cMenuSetupPage *cPluginClock::SetupMenu(void)
-@@ -642,7 +661,8 @@
- {
-   // Parse your own setup parameters and store their values.
- 
--  if      (!strcasecmp(Name, "XOffset"))          XOffset    = atoi(Value);
-+  if      (!strcasecmp(Name, "HideMenuEntry"))    HideMenuEntry    = atoi(Value);
-+  else if (!strcasecmp(Name, "XOffset"))          XOffset    = atoi(Value);
-   else if (!strcasecmp(Name, "YOffset"))          YOffset    = atoi(Value);
-   else if (!strcasecmp(Name, "ShowSec"))          ShowSec    = atoi(Value);
-   else if (!strcasecmp(Name, "ShowAlarm"))        ShowAlarm  = atoi(Value);
-diff -u --recursive --new-file clock-0.0.6/HISTORY clock-0.0.6-fixes/HISTORY
---- clock-0.0.6/HISTORY	2004-08-09 15:46:17.000000000 +0200
-+++ clock-0.0.6-fixes/HISTORY	2007-05-20 01:41:33.000000000 +0200
-@@ -1,5 +1,18 @@
- VDR Plugin 'clock' Revision History
- ----------------------------------
-+2007-05-20: Version 0.0.6patched
-+- Fixed segmention fault if user key is pressed again with clock shown.
-+- Updated i18n.c for VDR 1.3.42 and higher.
-+- Added option "Hide main menu entry".
-+- Fixed Compiler fault by adding patch reported on VDR-Portal
-+  see http://vdr-portal.de/board/thread.php?threadid=57401
-+- Added english and german translations for description and main menu entry 
-+- Known Problem: If mainmenu is opened during the clock is shown on screen,
-+                 user key or Menuentry must pressed two times for open the
-+		 clock again.
-+
-+XXXX-XX-XX: Version 0.0.6
-+- Someone know it ????????
- 
- 2004-08-09: Version 0.0.5b1
- - Adapted to VDR 1.3.x (tanks to Alexander Hans)
-diff -u --recursive --new-file clock-0.0.6/i18n.c clock-0.0.6-fixes/i18n.c
---- clock-0.0.6/i18n.c	2006-05-07 10:44:51.000000000 +0200
-+++ clock-0.0.6-fixes/i18n.c	2007-05-20 01:16:15.000000000 +0200
-@@ -26,6 +26,10 @@
-     "",// TODO
-     "",// TODO
-     "ÇÐáë",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Offset",
-     "Abstand vom linken Rand",
-@@ -44,6 +48,10 @@
-     "",// TODO
-     "",// TODO
-     "ÀÐáâÞïÝØÕ Þâ ÛÕÒÞÓÞ ÚàÐï",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Show Seconds",
-     "Sekunden anzeigen",
-@@ -62,6 +70,10 @@
-     "",// TODO
-     "",// TODO
-     "¿ÞÚÐ×Ðâì áÕÚãÝÔë",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Type of the clock",
-     "Art der Uhr",
-@@ -80,6 +92,10 @@
-     "",// TODO
-     "",// TODO
-     "²ØÔ çÐáÞÒ",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Length of sec arrow [%]",
-     "Länge des Sekundenzeigers [%]",
-@@ -98,6 +114,10 @@
-     "",// TODO
-     "",// TODO
-     "´ÛØÝÐ áÕÚãÝÔÝÞÙ áâàÕÛÚØ [%]",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Length of min arrow [%]",
-     "Länge des Minutenzeigers [%]",
-@@ -116,6 +136,10 @@
-     "",// TODO
-     "",// TODO
-     "´ÛØÝÐ ÜØÝãâÝÞÙ áâàÕÛÚØ [%]",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Length of hour arrow [%]",
-     "Länge des Stundenzeigers [%]",
-@@ -134,6 +158,10 @@
-     "",// TODO
-     "",// TODO
-     "´ÛØÝÐ  çÐáÞÒÞÙ áâàÕÛÚØ [%]",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Width of sec arrow [%]",
-     "Breite des Sekundenzeigers [%]",
-@@ -152,6 +180,10 @@
-     "",// TODO
-     "",// TODO
-     "ÈØàØÝÐ áÕÚãÝÔÝÞÙ áâàÕÛÚØ [%]",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Width of min arrow [%]",
-     "Breite des Minutenzeigers [%]",
-@@ -170,6 +202,10 @@
-     "",// TODO
-     "",// TODO
-     "ÈØàØÝÐ ÜØÝãâÝÞÙ áâàÕÛÚØ [%]",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Width of hour arrow [%]",
-     "Breite des Stundenzeigers [%]",
-@@ -188,6 +224,10 @@
-     "",// TODO
-     "",// TODO
-     "ÈØàØÝÐ çÐáÞÒÞÙ áâàÕÛÚØ [%]",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Analog clock size",
-     "Größe der Analogen Uhr",
-@@ -206,6 +246,10 @@
-     "",// TODO
-     "",// TODO
-     "ÀÐ×ÜÕà áâàÕÛÞçÝëå çÐáÞÒ",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Transparent",
-     "Transparent",
-@@ -224,6 +268,10 @@
-     "",// TODO
-     "",// TODO
-     "¿àÞ×àÐçÝëÕ",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "White",
-     "Weiss",
-@@ -242,6 +290,10 @@
-     "",// TODO
-     "",// TODO
-     "±ÕÛëÕ",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Background color",
-     "Hintergrundfarbe",
-@@ -260,6 +312,10 @@
-     "",// TODO
-     "",// TODO
-     "ÆÒÕâ ×ÐÔÝÕÓÞ äÞÝÐ",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Black",
-     "Schwarz",
-@@ -278,6 +334,10 @@
-     "",// TODO
-     "",// TODO
-     "ÇñàÝëÙ",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Hour arrow color",
-     "Farbe des Stundenzeigers",
-@@ -296,6 +356,10 @@
-     "",// TODO
-     "",// TODO
-     "ÆÒÕâ çÐáÞÒÞÙ áâàÕÛÚØ",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Red",
-     "Rot",
-@@ -314,6 +378,10 @@
-     "",// TODO
-     "",// TODO
-     "ºàÐáÝëÙ",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Green",
-     "Grün",
-@@ -331,7 +399,11 @@
-     "",// TODO
-     "",// TODO
-     "",// TODO
--    "·ÕÛñÝëÙ",// TODO  
-+    "·ÕÛñÝëÙ",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Yellow",
-     "Gelb",
-@@ -350,6 +422,10 @@
-     "",// TODO
-     "",// TODO
-     "¶ñÛâëÙ",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Blue",
-     "Blau",
-@@ -368,6 +444,10 @@
-     "",// TODO
-     "",// TODO
-     "ÁØÝØÙ",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Seconds arrow color",
-     "Farbe des Sekundenzeigers",
-@@ -386,6 +466,10 @@
-     "",// TODO
-     "",// TODO
-     "ÆÒÕâ áÕÚãÝÔÝÞÙ áâàÕÛÚØ",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Minutes arrow color",
-     "Farbe des Minutenzeigers",
-@@ -404,6 +488,10 @@
-     "",// TODO
-     "",// TODO
-     "ÆÒÕâ ÜØÝãâÝÞÙ áâàÕÛÚØ",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Foreground color",
-     "Vordergrund Farbe",
-@@ -422,6 +510,10 @@
-     "",// TODO
-     "",// TODO
-     "ÆÒÕâ ßÕàÕÔÝÕÓÞ äÞÝÐ",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Arrow color",
-     "Zeigerfarbe",
-@@ -440,6 +532,10 @@
-     "",// TODO
-     "",// TODO
-     "ÆÒÕâ áâàÕÛÞÚ",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Digital",
-     "Digital",
-@@ -458,6 +554,10 @@
-     "",// TODO
-     "",// TODO
-     "ÆëäàÞÒëÕ",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Analog",
-     "Analog",
-@@ -476,6 +576,10 @@
-     "",// TODO
-     "",// TODO
-     "ÁâàÕÛÞçÝëÕ",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Internet time",
-     "Internet Zeit",
-@@ -494,6 +598,10 @@
-     "",// TODO
-     "",// TODO
-     "¸ÝâÕàÝÕâ ÒàÕÜï",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Tea clock",
-     "Teekocher",
-@@ -512,6 +620,10 @@
-     "",// TODO
-     "",// TODO
-     "²àÕÜï ÔÛï çÐï",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "It's tea time",
-     "Es ist Tee Zeit!",
-@@ -530,6 +642,10 @@
-     "",// TODO
-     "",// TODO
-     "²àÕÜï çÐï!",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Time till tea",
-     "Zeit bis der Tee fertig ist",
-@@ -548,6 +664,10 @@
-     "",// TODO
-     "",// TODO
-     "²àÕÜï ×ÐÒÐàÚØ çÐï",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "Show Countdown",
-     "Countdown anzeigen",
-@@ -566,6 +686,10 @@
-     "",// TODO
-     "",// TODO
-     "¾ÑàÐâÝëÙ Þâçñâ ÒàÕÜÕÝØ",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "FullScreen",
-     "FullScreen",
-@@ -584,6 +708,10 @@
-     "",// TODO
-     "",// TODO
-     "²Õáì àÐ×ÜÕà",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { "x Position",
-     "x Position",
-@@ -602,24 +730,76 @@
-     "",// TODO
-     "",// TODO
-     "x ¿Þ×ØæØï",// TODO
--  },
--  { "y Position",
--    "y Position",
--    "",// TODO
--    "",// TODO
--    "",// TODO
--    "",// TODO
--    "y Position",
--    "",// TODO
--    "",// TODO
--    "",// TODO
--    "",// TODO
--    "",// TODO
--    "",// TODO
--    "",// TODO
--    "",// TODO
--    "",// TODO
--    "y ¿Þ×ØæØï",// TODO
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-+  },
-+  { "y Position", // English
-+    "y Position", // German
-+    "", // Slovenski
-+    "", // Italian
-+    "", // Nederlands
-+    "", // Português
-+    "y Position", // Français
-+    "", // Norsk
-+    "", // Finnish
-+    "", // Polski
-+    "", // Español
-+    "", // ÅëëçíéêÜ (Greek)
-+    "", // Svenska
-+    "", // Romaneste
-+    "", // Magyar
-+    "", // Català
-+    "y ¿Þ×ØæØï", // ÀãááÚØÙ (Russian)
-+    "", // Hrvatski (Croatian)
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-+  },
-+  { "A Simple Clock",
-+    "Eine einfache Uhr",
-+    "",
-+    "",
-+    "",
-+    "",
-+    "",
-+    "",
-+    "",
-+    "",
-+    "",
-+    "",
-+    "",
-+    "",
-+    "",
-+    "",
-+    "",
-+    "",
-+    "", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-+  },
-+  { "Hide main menu entry", // English
-+    "Hauptmenüeintrag verstecken", // Deutsch
-+    "", // Slovenski
-+    "Nascondi voce menù", // Italiano
-+    "", // Nederlands
-+    "", // Português
-+    "Masquer dans le menu principal", // Français
-+    "", // Norsk
-+    "Piilota valinta päävalikosta", // suomi
-+    "", // Polski
-+    "Ocultar en el menú principal", // Español
-+    "", // ÅëëçíéêÜ (Greek)
-+    "", // Svenska
-+    "", // Romaneste
-+    "", // Magyar
-+    "", // Català
-+    "ÁÚàëâì ÚÞÜÐÝÔã Ò ÓÛÐÒÝÞÜ ÜÕÝî", // ÀãááÚØÙ (Russian)
-+    "", // Hrvatski (Croatian)
-+    "Peida valik peamenüüs", // Eesti
-+    "", // Dansk
-+    "", // Èesky (Czech)
-   },
-   { NULL }
-   };
-diff -u --recursive --new-file clock-0.0.6/Makefile clock-0.0.6-fixes/Makefile
---- clock-0.0.6/Makefile	2006-05-21 18:03:28.000000000 +0200
-+++ clock-0.0.6-fixes/Makefile	2006-06-29 10:29:28.000000000 +0200
-@@ -66,10 +66,10 @@
- ### Targets:
- 
- all: libvdr-$(PLUGIN).so
--	@install -d ../../man
-+	
- libvdr-$(PLUGIN).so: $(OBJS)
--	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
--	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
-+	@$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-+	@cp -v $@ $(LIBDIR)/$@.$(APIVERSION)
- 
- dist: clean
- 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-@@ -81,3 +81,4 @@
- 
- clean:
- 	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
-+	@-rm -f ../../man/$(PLUGIN).man
-diff -u --recursive --new-file clock-0.0.6/README clock-0.0.6-fixes/README
---- clock-0.0.6/README	2004-08-09 15:14:37.000000000 +0200
-+++ clock-0.0.6-fixes/README	2007-05-20 01:44:24.000000000 +0200
-@@ -24,3 +24,5 @@
- 
- The clock will be disabled as soon as you press any other button.
- Otherwise there would be a mess in the OSD. 
-+
-+The "Hide main menu entry" opton is normaly set to "yes" as default.
diff --git a/media-plugins/vdr-clock/files/vdr-clock-0.0.5b-gcc4.diff b/media-plugins/vdr-clock/files/vdr-clock-0.0.5b-gcc4.diff
deleted file mode 100644
index d1630adf199c..000000000000
--- a/media-plugins/vdr-clock/files/vdr-clock-0.0.5b-gcc4.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru clock-0.0.5b1-orig/clock.c clock-0.0.5b1/clock.c
---- clock-0.0.5b1-orig/clock.c	2006-07-06 15:25:12.274378054 +0200
-+++ clock-0.0.5b1/clock.c	2006-07-06 15:25:20.907212424 +0200
-@@ -82,7 +82,7 @@
-   int r;
-   void DrawArrow(double width, double len, tColor col, double ang, cEnhancedBitmap &img);
-   void DrawScale(int r, tColor col, cEnhancedBitmap &Analog);
--  void cOSDClock::DrawModernSec(int r, int sec, tColor col, cEnhancedBitmap &Analog);
-+  void DrawModernSec(int r, int sec, tColor col, cEnhancedBitmap &Analog);
-   void DrawPoint(double x, double y, int r, tColor col, cEnhancedBitmap &Analog);
-   tColor getColor(int color);
-   static cBitmap bmClock;
diff --git a/media-plugins/vdr-clock/files/vdr-clock-0.0.5b-makefile.diff b/media-plugins/vdr-clock/files/vdr-clock-0.0.5b-makefile.diff
deleted file mode 100644
index 00a96c0b97f9..000000000000
--- a/media-plugins/vdr-clock/files/vdr-clock-0.0.5b-makefile.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.orig	2006-02-04 22:03:57.183524250 +0100
-+++ Makefile	2006-02-04 22:04:24.045203000 +0100
-@@ -66,13 +66,9 @@
- ### Targets:
- 
- all: libvdr-$(PLUGIN).so
--	@install -d ../../man
--	@install README ../../man/$(PLUGIN).man
- libvdr-$(PLUGIN).so: $(OBJS)
- 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
- 	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
--	@mkdir ../../man
--	@cp README ../../man/$(PLUGIN).man
- 
- dist: clean
- 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-@@ -84,5 +80,4 @@
- 
- clean:
- 	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
--	@-rm ../../man/$(PLUGIN).man
- 
diff --git a/media-plugins/vdr-clock/vdr-clock-0.0.10.ebuild b/media-plugins/vdr-clock/vdr-clock-0.0.10.ebuild
deleted file mode 100644
index 255661bd7101..000000000000
--- a/media-plugins/vdr-clock/vdr-clock-0.0.10.ebuild
+++ /dev/null
@@ -1,19 +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-clock/vdr-clock-0.0.10.ebuild,v 1.1 2008/01/28 15:55:18 zzam Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="Video Disk Recorder Clock PlugIn"
-HOMEPAGE="http://vdr.humpen.at"
-SRC_URI="http://vdr.humpen.at/uploads/media/${P}.tgz
-		mirror://vdrfiles/${PN}/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.2.0"
-
-#PATCHES="${FILESDIR}/${PV}/pingpong-fixes.diff"
diff --git a/media-plugins/vdr-clock/vdr-clock-0.0.5b-r1.ebuild b/media-plugins/vdr-clock/vdr-clock-0.0.5b-r1.ebuild
deleted file mode 100644
index 40e6fce270d3..000000000000
--- a/media-plugins/vdr-clock/vdr-clock-0.0.5b-r1.ebuild
+++ /dev/null
@@ -1,22 +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-clock/vdr-clock-0.0.5b-r1.ebuild,v 1.5 2008/04/28 08:05:18 zzam Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="Video Disk Recorder Clock PlugIn"
-HOMEPAGE="http://vdr.humpen.at"
-SRC_URI="http://vdr.humpen.at/uploads/media/${PN}-0.0.5b1.tgz
-		mirror://vdrfiles/${PN}/${PN}-0.0.5b1.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~amd64"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.2.0"
-
-S=${WORKDIR}/clock-0.0.5b1
-
-PATCHES=("${FILESDIR}/${P}-makefile.diff"
-	"${FILESDIR}/${P}-gcc4.diff")
diff --git a/media-plugins/vdr-clock/vdr-clock-0.0.6.ebuild b/media-plugins/vdr-clock/vdr-clock-0.0.6.ebuild
deleted file mode 100644
index fc3d9e981aff..000000000000
--- a/media-plugins/vdr-clock/vdr-clock-0.0.6.ebuild
+++ /dev/null
@@ -1,19 +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-clock/vdr-clock-0.0.6.ebuild,v 1.4 2008/04/28 08:05:18 zzam Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="Video Disk Recorder Clock PlugIn"
-HOMEPAGE="http://vdr.humpen.at"
-SRC_URI="http://vdr.humpen.at/uploads/media/${P}.tgz
-		mirror://vdrfiles/${PN}/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.2.0"
-
-PATCHES=("${FILESDIR}/${PV}/pingpong-fixes.diff")
diff --git a/media-plugins/vdr-clock/vdr-clock-1.0.0.ebuild b/media-plugins/vdr-clock/vdr-clock-1.0.0.ebuild
index 40c103bee1e0..e656ea24b2fb 100644
--- a/media-plugins/vdr-clock/vdr-clock-1.0.0.ebuild
+++ b/media-plugins/vdr-clock/vdr-clock-1.0.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-clock/vdr-clock-1.0.0.ebuild,v 1.2 2008/04/28 08:05:18 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-clock/vdr-clock-1.0.0.ebuild,v 1.3 2011/01/28 18:13:42 hd_brummy Exp $
+
+EAPI="3"
 
 inherit vdr-plugin
 
@@ -10,7 +12,8 @@ SRC_URI="http://vdr.aistleitner.info/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.2.0"
+RDEPEND="${DEPEND}"
\ No newline at end of file