cleanup

(Portage version: 2.1.10.11/cvs/Linux i686)

5 files changed, 6 insertions, 99 deletions

diff --git a/media-plugins/vdr-dvdswitch/ChangeLog b/media-plugins/vdr-dvdswitch/ChangeLog
index 66229d682083..994ff8e5d4a3 100644
--- a/media-plugins/vdr-dvdswitch/ChangeLog
+++ b/media-plugins/vdr-dvdswitch/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-dvdswitch
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvdswitch/ChangeLog,v 1.26 2012/06/30 20:45:56 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvdswitch/ChangeLog,v 1.27 2012/06/30 20:48:23 hd_brummy Exp $
+
+  30 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/0.1.3/no-files-crash.diff, -vdr-dvdswitch-0.1.3-r2.ebuild,
+  -vdr-dvdswitch-0.1.6.ebuild, -files/0.1.3/vdr-1.5.4-compatibility.diff:
+  cleanup
 
   30 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-dvdswitch-0.2.0.ebuild:
diff --git a/media-plugins/vdr-dvdswitch/files/0.1.3/no-files-crash.diff b/media-plugins/vdr-dvdswitch/files/0.1.3/no-files-crash.diff
deleted file mode 100644
index 867b37bed45f..000000000000
--- a/media-plugins/vdr-dvdswitch/files/0.1.3/no-files-crash.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: dvdswitch-0.1.3/menu.c
-===================================================================
---- dvdswitch-0.1.3.orig/menu.c
-+++ dvdswitch-0.1.3/menu.c
-@@ -754,8 +754,10 @@ eOSState cMainMenu::MenuMove(eKeys Key)
-   SetHelp();
- 
-   mItem = (cMainMenuItem*)Get(Current());
--  MainMenuOptions.setLastSelectItemName(mItem->FileName());
--  MainMenuOptions.LastSelectItemType(mItem->Type());
-+  if (mItem) {
-+    MainMenuOptions.setLastSelectItemName(mItem->FileName());
-+    MainMenuOptions.LastSelectItemType(mItem->Type());
-+  }
- 
-   return state;
- }
diff --git a/media-plugins/vdr-dvdswitch/files/0.1.3/vdr-1.5.4-compatibility.diff b/media-plugins/vdr-dvdswitch/files/0.1.3/vdr-1.5.4-compatibility.diff
deleted file mode 100644
index 301df7e5bbcc..000000000000
--- a/media-plugins/vdr-dvdswitch/files/0.1.3/vdr-1.5.4-compatibility.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 90_dvdswitch-0.1.3-1.5.4.dpatch by Thomas Günther <tom@toms-cafe.de>
-## http://toms-cafe.de/vdr/download/dvdswitch-0.1.3-1.5.4.diff
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes for VDR >= 1.5.4.
-
-@DPATCH@
---- dvdswitch-0.1.3/helpers.h
-+++ dvdswitch-0.1.3/helpers.h
-@@ -80,7 +80,7 @@ class cStringListItem : public cListObje
-     char *Value(void) { return String; }
- };
- 
--class cStringList : public cList<cStringListItem> {};
-+//class cStringList : public cList<cStringListItem> {};
- 
- // --- cTokenizer ---------------------------------------
- 
diff --git a/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.3-r2.ebuild b/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.3-r2.ebuild
deleted file mode 100644
index a70909401d63..000000000000
--- a/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.3-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.3-r2.ebuild,v 1.5 2011/01/23 23:29:57 hd_brummy Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="vdr plugin to play dvds and dvd file structures"
-HOMEPAGE="http://www.vdr-portal.de/board/thread.php?threadid=49165"
-SRC_URI="http://download.schmidtie.de/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.3.21"
-RDEPEND="media-plugins/vdr-dvd"
-
-DEFAULT_IMAGE_DIR="/var/vdr/video/dvd-images"
-
-VDR_CONFD_FILE="${FILESDIR}/0.1.3/confd-r2"
-
-PATCHES=("${FILESDIR}/${PV}/no-files-crash.diff"
-	"${FILESDIR}/${PV}/vdr-1.5.4-compatibility.diff")
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	# patching default image-dir to /var/vdr/video/dvd-images
-	sed -e "s:/video/dvd:${DEFAULT_IMAGE_DIR}:" -i setup.c
-}
diff --git a/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.6.ebuild b/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.6.ebuild
deleted file mode 100644
index bddf8ee01104..000000000000
--- a/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.6.ebuild,v 1.3 2012/02/20 17:51:55 hd_brummy Exp $
-
-EAPI="3"
-
-inherit vdr-plugin
-
-VERSION="445" # every bump, new version
-
-DESCRIPTION="vdr plugin to play dvds and dvd file structures"
-HOMEPAGE="http://projects.vdr-developer.org/projects/plg-dvdswitch"
-SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.6.0"
-RDEPEND="media-plugins/vdr-dvd"
-
-DEFAULT_IMAGE_DIR="/var/vdr/video/dvd-images"
-
-VDR_CONFD_FILE="${FILESDIR}/0.1.3/confd-r2"
-
-src_prepare() {
-	vdr-plugin_src_prepare
-
-	sed -e "s:/video/dvd:${DEFAULT_IMAGE_DIR}:" -i setup.c
-}