eapi=3; cleanup

(Portage version: 2.1.9.25/cvs/Linux i686)

4 files changed, 11 insertions, 103 deletions

diff --git a/media-plugins/vdr-filebrowser/ChangeLog b/media-plugins/vdr-filebrowser/ChangeLog
index a5b340c9982d..95273ec0771d 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-filebrowser/ChangeLog,v 1.4 2010/12/23 00:24:17 hd_brummy Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-filebrowser/ChangeLog,v 1.5 2011/01/29 00:14:47 hd_brummy Exp $
+
+  29 Jan 2011; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-filebrowser-0.2.0.ebuild,
+  -files/vdr-filebrowser-0.2.0-glibc-2.10.diff,
+  vdr-filebrowser-0.2.1.ebuild:
+  eapi=3; cleanup
 
 *vdr-filebrowser-0.2.1 (23 Dec 2010)
 
diff --git a/media-plugins/vdr-filebrowser/files/vdr-filebrowser-0.2.0-glibc-2.10.diff b/media-plugins/vdr-filebrowser/files/vdr-filebrowser-0.2.0-glibc-2.10.diff
deleted file mode 100644
index 6a701e6a4f20..000000000000
--- a/media-plugins/vdr-filebrowser/files/vdr-filebrowser-0.2.0-glibc-2.10.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -ru -ru filebrowser-0.2.0-orig/commands.c filebrowser-0.2.0/commands.c
---- filebrowser-0.2.0-orig/commands.c	2009-08-10 11:59:00.640660524 +0200
-+++ filebrowser-0.2.0/commands.c	2009-08-10 12:00:32.033982498 +0200
-@@ -96,7 +96,7 @@
-   {
-     if(Pattern[0]!='/')
-     {
--      char* filename_tmp=NULL;
-+      const char* filename_tmp=NULL;
-       Filename=(Filename && (filename_tmp=strrchr(Filename, '/'))) ? filename_tmp + 1 : NULL;
-     }
-     if(Filename==NULL)
-diff -ru -ru filebrowser-0.2.0-orig/menu-filebrowser.c filebrowser-0.2.0/menu-filebrowser.c
---- filebrowser-0.2.0-orig/menu-filebrowser.c	2009-08-10 11:59:00.643994410 +0200
-+++ filebrowser-0.2.0/menu-filebrowser.c	2009-08-10 12:15:39.727224494 +0200
-@@ -141,12 +141,12 @@
-    if ( BaseDirectory ) delete BaseDirectory;
- }
- 
--int cOsdMenuFilebrowser::DirectorySort ( const void* File1, const void* File2 )
-+int cOsdMenuFilebrowser::DirectorySort ( const struct dirent64** File1, const struct dirent64** File2 )
- {
- 
--   struct dirent64* ent1=* ( struct dirent64** ) File1;
-+   const struct dirent64* ent1= *File1;
- 
--   struct dirent64* ent2=* ( struct dirent64** ) File2;
-+   const struct dirent64* ent2= *File2;
- 
-    if ( strcmp ( ent1->d_name, ".." ) == 0 )
-    {
-@@ -202,7 +202,7 @@
-    {
-       if ( * ( Statebag->CurrentDirectory ) )
-       {
--         char* slash=strrchr ( * ( Statebag->CurrentDirectory ), '/' );
-+         char* slash=const_cast<char*>(strrchr ( * ( Statebag->CurrentDirectory ), '/' ));
- 
-          if ( slash )
-          {
-@@ -239,7 +239,7 @@
-    if ( Task==taskBrowse )
-    {
-       char* Title= ( char* ) malloc ( strlen ( tr ( "Filebrowser" ) ) + strlen ( Statebag->CurrentDirectory ) + 3 );
--      char* Title_tmp=NULL;
-+      const char* Title_tmp=NULL;
-       sprintf ( Title, "%s: %s", tr ( "Filebrowser" ), ( ( Title_tmp=strrchr ( Statebag->CurrentDirectory, '/' ) ) && ! ( Statebag->ShowFullPath ) ) ? Title_tmp + 1 : * ( Statebag->CurrentDirectory ) );
-       SetTitle ( Title );
-       free ( Title );
-diff -ru -ru filebrowser-0.2.0-orig/menu-filebrowser.h filebrowser-0.2.0/menu-filebrowser.h
---- filebrowser-0.2.0-orig/menu-filebrowser.h	2009-08-10 11:59:00.643994410 +0200
-+++ filebrowser-0.2.0/menu-filebrowser.h	2009-08-10 12:13:14.360572298 +0200
-@@ -72,7 +72,7 @@
- 
-     eMenuFilebrowserTask Task;
- 
--    static int DirectorySort(const void* File1, const void* File2);
-+    static int DirectorySort(const struct dirent64** File1, const struct dirent64** File2);
-     /*
-      *  This filters entries shown in Filebrowser
-      *  The function uses Statebag->ShowHiddenFiles and Statebag->Filter
diff --git a/media-plugins/vdr-filebrowser/vdr-filebrowser-0.2.0.ebuild b/media-plugins/vdr-filebrowser/vdr-filebrowser-0.2.0.ebuild
deleted file mode 100644
index a56ce9d4ee09..000000000000
--- a/media-plugins/vdr-filebrowser/vdr-filebrowser-0.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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.2 2010/12/23 00:17:27 hd_brummy Exp $
-
-EAPI="2"
-
-inherit vdr-plugin
-
-DESCRIPTION="VDR plugin: file manager plugin for moving or renaming files in VDR."
-HOMEPAGE="http://vdr.nasenbaeren.net/filebrowser/"
-SRC_URI="http://vdr.nasenbaeren.net/filebrowser/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.4.0"
-RDEPEND="${DEPEND}"
-
-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
-
-	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.1.ebuild b/media-plugins/vdr-filebrowser/vdr-filebrowser-0.2.1.ebuild
index f4a3702f9437..015a53915e37 100644
--- a/media-plugins/vdr-filebrowser/vdr-filebrowser-0.2.1.ebuild
+++ b/media-plugins/vdr-filebrowser/vdr-filebrowser-0.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 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-filebrowser/vdr-filebrowser-0.2.1.ebuild,v 1.1 2010/12/23 00:24:17 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-filebrowser/vdr-filebrowser-0.2.1.ebuild,v 1.2 2011/01/29 00:14:47 hd_brummy Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit vdr-plugin