Version bumped. Fixed homepage URI. Added a glibc-2.10 patch, Bug #280305.

Package-Manager: portage-2.1.6.13/cvs/Linux i686

5 files changed, 114 insertions, 14 deletions

diff --git a/media-plugins/vdr-filebrowser/ChangeLog b/media-plugins/vdr-filebrowser/ChangeLog
index ebb0d1481f76..217d53c5b5e2 100644
--- a/media-plugins/vdr-filebrowser/ChangeLog
+++ b/media-plugins/vdr-filebrowser/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-filebrowser
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-filebrowser/ChangeLog,v 1.1 2008/02/02 20:51:16 hd_brummy Exp $
+# 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 $
+
+*vdr-filebrowser-0.2.0 (10 Aug 2009)
+
+  10 Aug 2009; Matthias Schwarzott <zzam@gentoo.org>
+  vdr-filebrowser-0.0.6b.ebuild, +vdr-filebrowser-0.2.0.ebuild,
+  +files/vdr-filebrowser-0.2.0-glibc-2.10.diff:
+  Version bumped. Fixed homepage URI. Added a glibc-2.10 patch, Bug #280305.
 
 *vdr-filebrowser-0.0.6b (02 Feb 2008)
 
diff --git a/media-plugins/vdr-filebrowser/Manifest b/media-plugins/vdr-filebrowser/Manifest
index 9434938fb246..ac63641fe499 100644
--- a/media-plugins/vdr-filebrowser/Manifest
+++ b/media-plugins/vdr-filebrowser/Manifest
@@ -7,15 +7,17 @@ AUX othercommands.conf 657 RMD160 1d2a88b0081c6852652cb23a3428767685af90a6 SHA1
 AUX sources.conf 338 RMD160 3537178857b77cf33d511b4f4daeccd2363088bf SHA1 4631e852ccec617d4b7899e68f0b3e2695e767e5 SHA256 cc657db1ee65b67afe59c4acdcc678d91420240f990013e654c4eb6e8004c381
 AUX vdr-filebrowser-0.0.6b-typofix.diff 982 RMD160 55fc12580d0c14805281a8da6eb6fa232d81af69 SHA1 7c9e5bb197b78e25a629a9d2bcc7468f2e3a1772 SHA256 334d477adc225403c22667175830fc906c67a0a3a20cf3da90d995cabf7e1f9f
 AUX vdr-filebrowser-0.0.6b_vdr-1.5.diff 4097 RMD160 5e69e35047bc2b775f0c598843e4942156b7bd89 SHA1 39dbf03f64f927e38ba3d09877bdb05dc0e04f88 SHA256 df2b1a36ca571d34e3680bc4bcd247125a247122906b882b50ec4e69555d327a
+AUX vdr-filebrowser-0.2.0-glibc-2.10.diff 2612 RMD160 8dc4f2492f1c023ca34953492afc2ee957808a01 SHA1 d0d315be8b27039e804927554346149edd0055d6 SHA256 b044a795d5ea66e7b34b4daec63a09e4370e39c972c2ae12329898aece2c7cf9
 DIST vdr-filebrowser-0.0.6b.tgz 47419 RMD160 8ba18b5097b131265c6dfcaa7cbd64b79713eb30 SHA1 7ca0e8cf6f0b65bc44d25fa493f9dd6e2fc82bd0 SHA256 802e933f961a905087d3422c1df161eb0cf7f0fa4727617dc773e52c97a984b3
-EBUILD vdr-filebrowser-0.0.6b.ebuild 1023 RMD160 b85a95cb96a2381aaefc35fba1287856a16c8f3d SHA1 5cd3db43c45a12aace702ca8fc4c083bd19c4987 SHA256 cd21736de7dced7712262066475eecbef23a252a42718a098f08e3b048181c4f
-MISC ChangeLog 654 RMD160 71f6c2371dc78aa5d165e6ad641a400d1612c8b1 SHA1 ba86f4bda5e3b0931248db8e16dbcb2d8ca7ee74 SHA256 875549df5a9f36bca372d407096c390996844f84d67f315b84d02cb997f25b82
+DIST vdr-filebrowser-0.2.0.tgz 59494 RMD160 0b87c226c71840aabe328c88f053563508403bde SHA1 453c971e7fb6a1ad94be4b237f8b4e5a0993cacd SHA256 3790eb069e631466177b59f7543252d5f119053b438f060a62ee0b07e5580df0
+EBUILD vdr-filebrowser-0.0.6b.ebuild 983 RMD160 d15bb3c289d97eea379d6bb8e9e588d9267df911 SHA1 7d452ddedfda1e0f438bf4aca7f012e13e2c6a05 SHA256 3ca3a4af7801eaf810e061fc425890ebac3b0e2defd2232c8d37a9c725df5e1a
+EBUILD vdr-filebrowser-0.2.0.ebuild 839 RMD160 fbea57a79d3ad7abdf4b1a35d747168ca1e75763 SHA1 7074f408c4f93432799194293a9e1ccf9251e4aa SHA256 2c81a4522cc78f05e43f38554856abd28e6624b23e0f7195381dfd5ea68bd3c3
+MISC ChangeLog 930 RMD160 f244faf986dece54ce79439c544a5bc8fd20cbf2 SHA1 14d1aac7ee87aca82ca15dd9824d8f1bf9ba1a9a SHA256 65cccf079e3e25bbb7db0f04e03684ae16f421e230539db8848e76196c25f122
 MISC metadata.xml 251 RMD160 b4bdfc1a9e947ad1d1f76c1942f02057d5cbc993 SHA1 6e174f6e4395999a9dafd53f523e079766c0b094 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iD8DBQFHpNfQdn07HTTCgIoRAgdsAJ9lUtsrXNnp0HsTgMAoOo7f9Qu+jQCgiBKj
-Q5dDX6B0qhYWu7qFiSyN+V4=
-=8yPd
+iEYEARECAAYFAkp/9fYACgkQt2vP6XvVdOdUdwCdGPntN8hr95iERAABscOGrdLg
+1RQAnjQbSM7cD9WHl2w0erddWBs5IJIa
+=5now
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..6a701e6a4f20
--- /dev/null
+++ b/media-plugins/vdr-filebrowser/files/vdr-filebrowser-0.2.0-glibc-2.10.diff
@@ -0,0 +1,61 @@
+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.0.6b.ebuild b/media-plugins/vdr-filebrowser/vdr-filebrowser-0.0.6b.ebuild
index 80bc78965a61..d645f8676036 100644
--- a/media-plugins/vdr-filebrowser/vdr-filebrowser-0.0.6b.ebuild
+++ b/media-plugins/vdr-filebrowser/vdr-filebrowser-0.0.6b.ebuild
@@ -1,19 +1,20 @@
-# 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-filebrowser/vdr-filebrowser-0.0.6b.ebuild,v 1.1 2008/02/02 20:51:16 hd_brummy Exp $
+# $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://www.stud.uni-karlsruhe.de/~uqg8/vdr/filebrowser/"
-SRC_URI="http://www.stud.uni-karlsruhe.de/~uqg8/vdr/filebrowser/${P}.tgz"
+HOMEPAGE="http://vdr.nasenbaeren.net/filebrowser/"
+SRC_URI="mirror://gentoo/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.4.0"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	vdr-plugin_src_unpack
diff --git a/media-plugins/vdr-filebrowser/vdr-filebrowser-0.2.0.ebuild b/media-plugins/vdr-filebrowser/vdr-filebrowser-0.2.0.ebuild
new file mode 100644
index 000000000000..6bf559ff3832
--- /dev/null
+++ b/media-plugins/vdr-filebrowser/vdr-filebrowser-0.2.0.ebuild
@@ -0,0 +1,29 @@
+# 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.2.0.ebuild,v 1.1 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="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}"
+
+PATCHES=("${FILESDIR}/${P}-glibc-2.10.diff")
+
+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
+}