fix bug #300081; eapi=2; cleanup

(Portage version: 2.1.9.24/cvs/Linux i686)

5 files changed, 19 insertions, 194 deletions

diff --git a/media-plugins/vdr-filebrowser/ChangeLog b/media-plugins/vdr-filebrowser/ChangeLog
index 217d53c5b5e2..e71a93ee6233 100644
--- a/media-plugins/vdr-filebrowser/ChangeLog
+++ b/media-plugins/vdr-filebrowser/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/vdr-filebrowser
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-filebrowser/ChangeLog,v 1.2 2009/08/10 10:26:52 zzam Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-filebrowser/ChangeLog,v 1.3 2010/12/23 00:17:27 hd_brummy Exp $
+
+  23 Dec 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-filebrowser-0.0.6b.ebuild,
+  -files/vdr-filebrowser-0.0.6b-typofix.diff,
+  -files/vdr-filebrowser-0.0.6b_vdr-1.5.diff, vdr-filebrowser-0.2.0.ebuild:
+  fix bug #300081; eapi=2; cleanup
 
 *vdr-filebrowser-0.2.0 (10 Aug 2009)
 
diff --git a/media-plugins/vdr-filebrowser/files/vdr-filebrowser-0.0.6b-typofix.diff b/media-plugins/vdr-filebrowser/files/vdr-filebrowser-0.0.6b-typofix.diff
deleted file mode 100644
index 9f304aeebadd..000000000000
--- a/media-plugins/vdr-filebrowser/files/vdr-filebrowser-0.0.6b-typofix.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-fix some compile probs, depend on typos
-
-Joerg Bornkessel <hd_brummy@gentoo.org> 02 Fev 2008
-diff -Naur filebrowser-0.0.6b.orig/po/cs_CZ.po filebrowser-0.0.6b/po/cs_CZ.po
---- filebrowser-0.0.6b.orig/po/cs_CZ.po	2008-02-02 19:59:43.960349841 +0100
-+++ filebrowser-0.0.6b/po/cs_CZ.po	2008-02-02 20:00:19.293265014 +0100
-@@ -85,7 +85,7 @@
- 
- #: menu-filebrowser.c:107 menu-filebrowser.c:226 menu-filebrowser.c:228
- msgid "Filebrowser"
--msgstr   {
-+msgstr ""
- 
- #: menu-filebrowser.c:234 menu-filebrowser.c:443
- msgid "Select Destination"
-diff -Naur filebrowser-0.0.6b.orig/po/tr_TR.po filebrowser-0.0.6b/po/tr_TR.po
---- filebrowser-0.0.6b.orig/po/tr_TR.po	2008-02-02 19:59:43.960349841 +0100
-+++ filebrowser-0.0.6b/po/tr_TR.po	2008-02-02 20:00:41.088291684 +0100
-@@ -85,7 +85,7 @@
- 
- #: menu-filebrowser.c:107 menu-filebrowser.c:226 menu-filebrowser.c:228
- msgid "Filebrowser"
--msgstr     NULL
-+msgstr ""
- 
- #: menu-filebrowser.c:234 menu-filebrowser.c:443
- msgid "Select Destination"
diff --git a/media-plugins/vdr-filebrowser/files/vdr-filebrowser-0.0.6b_vdr-1.5.diff b/media-plugins/vdr-filebrowser/files/vdr-filebrowser-0.0.6b_vdr-1.5.diff
deleted file mode 100644
index b417ff031ecb..000000000000
--- a/media-plugins/vdr-filebrowser/files/vdr-filebrowser-0.0.6b_vdr-1.5.diff
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -Nur filebrowser-old/statebag.c filebrowser/statebag.c
---- filebrowser-old/statebag.c	2006-12-04 22:13:24.000000000 +0100
-+++ filebrowser/statebag.c	2007-06-18 20:20:21.000000000 +0200
-@@ -27,10 +27,10 @@
- #ifdef FILEBROWSER_PLUGIN_BUILD
-   Threads=new cThreadList();
- #endif
--  SelectedFiles=new cStringList();
-+  SelectedFiles=new cStringContainerList();
-   Commands=new cFilebrowserCommands();
-   BaseDir[0]='\0';
--  CurrentFiles=new cStringList();
-+  CurrentFiles=new cStringContainerList();
- }
- 
- cFilebrowserStatebag::~cFilebrowserStatebag()
-diff -Nur filebrowser-old/statebag.h filebrowser/statebag.h
---- filebrowser-old/statebag.h	2006-12-04 22:13:24.000000000 +0100
-+++ filebrowser/statebag.h	2007-06-18 20:21:46.000000000 +0200
-@@ -22,7 +22,7 @@
- #include <vdr/plugin.h>
- 
- //Forward declarations for used classes
--class cStringList;
-+class cStringContainerList;
- #ifdef FILEBROWSER_PLUGIN_BUILD
- class cThreadList;
- #endif
-@@ -31,7 +31,7 @@
- class cFilebrowserStatebag
- {
-   protected:
--    cStringList* SelectedFiles;
-+    cStringContainerList* SelectedFiles;
- #ifdef FILEBROWSER_PLUGIN_BUILD
-     cThreadList* Threads;
- #endif
-@@ -41,7 +41,7 @@
-     cFilebrowserStatebag();
-     ~cFilebrowserStatebag();
- 
--    cStringList* GetSelectedFiles() { return SelectedFiles; };
-+    cStringContainerList* GetSelectedFiles() { return SelectedFiles; };
- #ifdef FILEBROWSER_PLUGIN_BUILD
-     cThreadList* GetThreads() { return Threads; };
- #endif
-@@ -54,7 +54,7 @@
-     cString Filter;
-     cString CurrentDirectory;
-     cString ConfigDirectory;
--    cStringList* CurrentFiles;
-+    cStringContainerList* CurrentFiles;
- 
- #ifdef FILEBROWSER_PLUGIN_BUILD
-     /*
-diff -Nur filebrowser-old/threads.c filebrowser/threads.c
---- filebrowser-old/threads.c	2006-12-07 20:19:48.000000000 +0100
-+++ filebrowser/threads.c	2007-06-18 20:20:21.000000000 +0200
-@@ -35,7 +35,7 @@
-   this->CurrentFile=CurrentFile ? strdup(CurrentFile) : NULL;
-   this->Statebag=Statebag;
-   //deep copy of Selected files
--  SelectedFiles=new cStringList();
-+  SelectedFiles=new cStringContainerList();
-   for(int i=0; i<Statebag->GetSelectedFiles()->Count(); i++)
-   {
-     SelectedFiles->Add(new cStringContainer(strdup((char*)Statebag->GetSelectedFiles()->Get(i)->GetObject())));
-@@ -317,7 +317,7 @@
- 
- char* cConfigCommandThread::SelectedFilesHandler(const char* OrgString, const char* CurrentPos, const cCommandParser::cHandlerParameters* Params)
- {
--  cStringList* SelectedFiles=(cStringList*)Params->Data;
-+  cStringContainerList* SelectedFiles=(cStringContainerList*)Params->Data;
-   char* Text=NULL;
-   int TextLength=0;
-   
-diff -Nur filebrowser-old/threads.h filebrowser/threads.h
---- filebrowser-old/threads.h	2006-12-04 22:13:24.000000000 +0100
-+++ filebrowser/threads.h	2007-06-18 20:20:21.000000000 +0200
-@@ -41,7 +41,7 @@
-     char* DestinationFile;
-     char* CurrentFile;
-     char* Description;
--    cStringList* SelectedFiles;
-+    cStringContainerList* SelectedFiles;
-     ThreadState State;
-     bool RemoveRequested;
-   public:
-diff -Nur filebrowser-old/tools.c filebrowser/tools.c
---- filebrowser-old/tools.c	2007-02-03 18:57:13.000000000 +0100
-+++ filebrowser/tools.c	2007-06-18 20:20:21.000000000 +0200
-@@ -20,10 +20,10 @@
- #include "tools.h"
- 
- /*
--  Implementation cStringList
-+  Implementation cStringContainerList
- */
- 
--bool cStringList::Contains(const char* String)
-+bool cStringContainerList::Contains(const char* String)
- {
-   for(cStringContainer *i = First(); i; i=Next(i))
-   {
-@@ -35,7 +35,7 @@
-   return false;
- }
- 
--void cStringList::Remove(const char* String)
-+void cStringContainerList::Remove(const char* String)
- {
-   for(cStringContainer *i = First(); i!=NULL; i=Next(i))
-   {
-diff -Nur filebrowser-old/tools.h filebrowser/tools.h
---- filebrowser-old/tools.h	2007-02-03 18:57:13.000000000 +0100
-+++ filebrowser/tools.h	2007-06-18 20:20:21.000000000 +0200
-@@ -55,7 +55,7 @@
-     ~cStringContainer() {};
- };
- 
--class cStringList : public cList<cStringContainer>
-+class cStringContainerList : public cList<cStringContainer>
- {
-   public:
-     bool Contains(const char* String);
-
diff --git a/media-plugins/vdr-filebrowser/vdr-filebrowser-0.0.6b.ebuild b/media-plugins/vdr-filebrowser/vdr-filebrowser-0.0.6b.ebuild
deleted file mode 100644
index d645f8676036..000000000000
--- a/media-plugins/vdr-filebrowser/vdr-filebrowser-0.0.6b.ebuild
+++ /dev/null
@@ -1,36 +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-filebrowser/vdr-filebrowser-0.0.6b.ebuild,v 1.2 2009/08/10 10:26:52 zzam Exp $
-
-inherit vdr-plugin
-
-DESCRIPTION="VDR plugin: file manager plugin for moving or renaming files in VDR."
-HOMEPAGE="http://vdr.nasenbaeren.net/filebrowser/"
-SRC_URI="mirror://gentoo/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.4.0"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	if has_version ">=media-video/vdr-1.5.0"; then
-		epatch "${FILESDIR}"/vdr-filebrowser-0.0.6b_vdr-1.5.diff
-		epatch "${FILESDIR}"/vdr-filebrowser-0.0.6b-typofix.diff
-	fi
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	insinto	/etc/vdr/plugins/filebrowser
-	doins   "${FILESDIR}"/commands.conf
-	doins   "${FILESDIR}"/order.conf
-	doins   "${FILESDIR}"/othercommands.conf
-	doins   "${FILESDIR}"/sources.conf
-}
diff --git a/media-plugins/vdr-filebrowser/vdr-filebrowser-0.2.0.ebuild b/media-plugins/vdr-filebrowser/vdr-filebrowser-0.2.0.ebuild
index 6bf559ff3832..a56ce9d4ee09 100644
--- a/media-plugins/vdr-filebrowser/vdr-filebrowser-0.2.0.ebuild
+++ b/media-plugins/vdr-filebrowser/vdr-filebrowser-0.2.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-filebrowser/vdr-filebrowser-0.2.0.ebuild,v 1.1 2009/08/10 10:26:52 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-filebrowser/vdr-filebrowser-0.2.0.ebuild,v 1.2 2010/12/23 00:17:27 hd_brummy Exp $
+
+EAPI="2"
 
 inherit vdr-plugin
 
@@ -16,7 +18,13 @@ IUSE=""
 DEPEND=">=media-video/vdr-1.4.0"
 RDEPEND="${DEPEND}"
 
-PATCHES=("${FILESDIR}/${P}-glibc-2.10.diff")
+src_prepare() {
+	if has_version ">=sys-libs/glibc-2.10.1"; then
+		epatch "${FILESDIR}/${P}-glibc-2.10.diff"
+	fi
+
+	vdr-plugin_src_prepare
+}
 
 src_install() {
 	vdr-plugin_src_install