cleanup, minor ebuild fixes

(Portage version: 2.1.6.11/cvs/Linux i686)

10 files changed, 16 insertions, 157 deletions

diff --git a/media-plugins/vdr-extrecmenu/ChangeLog b/media-plugins/vdr-extrecmenu/ChangeLog
index 1693764fd983..0775f61f2123 100644
--- a/media-plugins/vdr-extrecmenu/ChangeLog
+++ b/media-plugins/vdr-extrecmenu/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/vdr-extrecmenu
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/ChangeLog,v 1.22 2008/11/08 17:12:45 zzam Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/ChangeLog,v 1.23 2009/05/07 21:00:04 hd_brummy Exp $
+
+  07 May 2009; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/vdr-extrecmenu-0.12a-uint32_t.diff, -vdr-extrecmenu-0.13.ebuild,
+  -vdr-extrecmenu-1.0.ebuild, -files/0.13/MainMenuHooks.diff,
+  -vdr-extrecmenu-0.13-r1.ebuild, vdr-extrecmenu-1.1.ebuild,
+  -files/0.13/series, -vdr-extrecmenu-0.12a.ebuild,
+  vdr-extrecmenu-1.2_pre1.ebuild:
+  cleanup, minor ebuild fixes
 
   08 Nov 2008; Matthias Schwarzott <zzam@gentoo.org>
   vdr-extrecmenu-1.1.ebuild:
diff --git a/media-plugins/vdr-extrecmenu/files/0.13/MainMenuHooks.diff b/media-plugins/vdr-extrecmenu/files/0.13/MainMenuHooks.diff
deleted file mode 100644
index 152f67106efc..000000000000
--- a/media-plugins/vdr-extrecmenu/files/0.13/MainMenuHooks.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-# 90_MainMenuHooks.dpatch by Tobias Grimm <tg@e-tobi.net>
-#
-# All lines beginning with `## DP:' are a description of the patch.
-# DP: Adds support fpr the MainMenuHook patch in VDR.
-
-diff -urNad vdr-plugin-extrecmenu-0.13~/extrecmenu.c vdr-plugin-extrecmenu-0.13/extrecmenu.c
---- vdr-plugin-extrecmenu-0.13~/extrecmenu.c	2007-02-03 21:13:28.000000000 +0100
-+++ vdr-plugin-extrecmenu-0.13/extrecmenu.c	2007-03-11 11:52:23.000000000 +0100
-@@ -137,7 +137,16 @@
- 
- bool cPluginExtrecmenu::Service(const char *Id,void *Data)
- {
-- return false;
-+  if (strcmp(Id, "MainMenuHooksPatch-v1.0::osRecordings") == 0 && mysetup.ReplaceOrgRecMenu==true) 
-+  {
-+    if (Data == NULL)
-+      return true;
-+    cOsdMenu **menu = (cOsdMenu**) Data;
-+    if (menu)
-+      *menu = (cOsdMenu*) MainMenuAction();
-+    return true;
-+  }
-+  return false;
- }
- 
- const char **cPluginExtrecmenu::SVDRPHelpPages(void)
-
diff --git a/media-plugins/vdr-extrecmenu/files/0.13/series b/media-plugins/vdr-extrecmenu/files/0.13/series
deleted file mode 100644
index 1061ddba6782..000000000000
--- a/media-plugins/vdr-extrecmenu/files/0.13/series
+++ /dev/null
@@ -1 +0,0 @@
-MainMenuHooks.diff
diff --git a/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-0.12a-uint32_t.diff b/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-0.12a-uint32_t.diff
deleted file mode 100644
index 846659058a8a..000000000000
--- a/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-0.12a-uint32_t.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-http://www.mail-archive.com/vdr@linuxtv.org/msg01088.html
-
-Joerg Bornkessel <hd_brummy@gentoo.org> 03.Dec.2006
-
-diff -Naur extrecmenu-0.12a.orig/patchfont.c extrecmenu-0.12a/patchfont.c
---- extrecmenu-0.12a.orig/patchfont.c	2006-12-03 16:57:01.863253339 +0100
-+++ extrecmenu-0.12a/patchfont.c	2006-12-03 16:57:46.305785975 +0100
-@@ -2,6 +2,7 @@
-  * See the README file for copyright information and how to reach the author.
-  */
- 
-+#include <stdint.h>
- #include <vdr/font.h>
- #include "patchfont.h"
- #include "mymenusetup.h"
diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-0.12a.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-0.12a.ebuild
deleted file mode 100644
index 43134f772465..000000000000
--- a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-0.12a.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/vdr-extrecmenu-0.12a.ebuild,v 1.4 2007/07/10 23:09:00 mr_bones_ Exp $
-
-inherit vdr-plugin eutils
-
-S=${WORKDIR}/${VDRPLUGIN}-${PV}
-
-DESCRIPTION="Video Disk Recorder - Extended recordings menu Plugin"
-HOMEPAGE="http://martins-kabuff.de/extrecmenu.html"
-SRC_URI="http://martins-kabuff.de/download/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~amd64"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.7"
-
-PATCHES="${FILESDIR}/${P}-uint32_t.diff"
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	if grep -q fskProtection /usr/include/vdr/timers.h; then
-		sed -i "s:#WITHPINPLUGIN:WITHPINPLUGIN:" Makefile
-	fi
-}
diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-0.13-r1.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-0.13-r1.ebuild
deleted file mode 100644
index b52b4e7ece8c..000000000000
--- a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-0.13-r1.ebuild
+++ /dev/null
@@ -1,28 +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-extrecmenu/vdr-extrecmenu-0.13-r1.ebuild,v 1.2 2007/07/10 23:09:00 mr_bones_ Exp $
-
-inherit vdr-plugin eutils
-
-S=${WORKDIR}/${VDRPLUGIN}-${PV}
-
-DESCRIPTION="Video Disk Recorder - Extended recordings menu Plugin"
-HOMEPAGE="http://martins-kabuff.de/extrecmenu.html"
-SRC_URI="http://martins-kabuff.de/download/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.7"
-
-PATCHES="${FILESDIR}/${PV}/MainMenuHooks.diff"
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	if grep -q fskProtection /usr/include/vdr/timers.h; then
-		sed -i "s:#WITHPINPLUGIN:WITHPINPLUGIN:" Makefile
-	fi
-}
diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-0.13.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-0.13.ebuild
deleted file mode 100644
index 010290f0df05..000000000000
--- a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-0.13.ebuild
+++ /dev/null
@@ -1,26 +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-extrecmenu/vdr-extrecmenu-0.13.ebuild,v 1.2 2007/07/10 23:09:00 mr_bones_ Exp $
-
-inherit vdr-plugin eutils
-
-S=${WORKDIR}/${VDRPLUGIN}-${PV}
-
-DESCRIPTION="Video Disk Recorder - Extended recordings menu Plugin"
-HOMEPAGE="http://martins-kabuff.de/extrecmenu.html"
-SRC_URI="http://martins-kabuff.de/download/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.7"
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	if grep -q fskProtection /usr/include/vdr/timers.h; then
-		sed -i "s:#WITHPINPLUGIN:WITHPINPLUGIN:" Makefile
-	fi
-}
diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.0.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.0.ebuild
deleted file mode 100644
index b673a2366ae1..000000000000
--- a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.0.ebuild
+++ /dev/null
@@ -1,26 +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-extrecmenu/vdr-extrecmenu-1.0.ebuild,v 1.1 2007/10/07 20:23:36 hd_brummy Exp $
-
-inherit vdr-plugin eutils
-
-S=${WORKDIR}/${VDRPLUGIN}-${PV}
-
-DESCRIPTION="Video Disk Recorder - Extended recordings menu Plugin"
-HOMEPAGE="http://martins-kabuff.de/extrecmenu.html"
-SRC_URI="http://martins-kabuff.de/download/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.7"
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	if grep -q fskProtection /usr/include/vdr/timers.h; then
-		sed -i "s:#WITHPINPLUGIN:WITHPINPLUGIN:" Makefile
-	fi
-}
diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.1.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.1.ebuild
index 8b6713b217fc..f58adf2c90e8 100644
--- a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.1.ebuild
+++ b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.1.ebuild,v 1.2 2008/11/08 17:12:45 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.1.ebuild,v 1.3 2009/05/07 21:00:04 hd_brummy Exp $
 
 inherit vdr-plugin eutils
 
@@ -16,6 +16,7 @@ KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.3.7"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	vdr-plugin_src_unpack
diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2_pre1.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2_pre1.ebuild
index 513e09e575f5..de6d49fd137f 100644
--- a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2_pre1.ebuild
+++ b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2_pre1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2_pre1.ebuild,v 1.3 2008/06/15 21:40:50 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2_pre1.ebuild,v 1.4 2009/05/07 21:00:04 hd_brummy Exp $
 
 inherit vdr-plugin eutils
 
@@ -18,6 +18,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.6.0"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	vdr-plugin_src_unpack