cleanup, minor fixes

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

8 files changed, 20 insertions, 165 deletions

diff --git a/media-plugins/vdr-extrecmenu/ChangeLog b/media-plugins/vdr-extrecmenu/ChangeLog
index 3bf5130a3df3..138bd973887f 100644
--- a/media-plugins/vdr-extrecmenu/ChangeLog
+++ b/media-plugins/vdr-extrecmenu/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-extrecmenu
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/ChangeLog,v 1.31 2011/12/21 09:02:29 phajdan.jr Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/ChangeLog,v 1.32 2012/02/07 14:22:00 hd_brummy Exp $
+
+  07 Feb 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-extrecmenu-1.2.ebuild, -files/vdr-extrecmenu-1.2-gcc44.patch,
+  -files/vdr-extrecmenu-1.2_pre1-gcc43.patch,
+  -files/vdr-extrecmenu-1.2_pre1-gcc44.patch, vdr-extrecmenu-1.2.1.ebuild,
+  -files/dvdarchive-2.3-beta-configfile.patch:
+  cleanup, minor fixes
 
   21 Dec 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   vdr-extrecmenu-1.2.1.ebuild:
diff --git a/media-plugins/vdr-extrecmenu/Manifest b/media-plugins/vdr-extrecmenu/Manifest
index 776f8d637713..098972119af4 100644
--- a/media-plugins/vdr-extrecmenu/Manifest
+++ b/media-plugins/vdr-extrecmenu/Manifest
@@ -1,22 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
-AUX dvdarchive-2.3-beta-configfile.patch 303 RMD160 b3b6dbc7d5ba133e3cbbfe7c70837e95b918be40 SHA1 818cf89facafb4064c36e82130af72994df7dad4 SHA256 985425984d59df043ac8f14220d57af93c0a6c79b25686f26ae03d02426635f2
 AUX dvdarchive.conf 633 RMD160 e232242a2ae07d24728561fa7bbbeeaec58ecbef SHA1 ce7e18be59142b85f27d7d0439366dc6d319a20b SHA256 761ed894c225fca7be33bd6f3a844c1e952fc5c20c38d76bd480d7b15243578e
-AUX vdr-extrecmenu-1.2-gcc44.patch 687 RMD160 19f66196d92cf9d82949711b08fae28b060bd3ed SHA1 28ca71ca4bc50b73b164252d5a26f7b78f93cdcf SHA256 48ae727c85f28587aec8bd611b880d809bbb2f58301849d828416aef239edd6e
-AUX vdr-extrecmenu-1.2_pre1-gcc43.patch 417 RMD160 173e36cf5d3ff55ca2a1399b4ade9122bcf41ecb SHA1 2124b11f940d796b85c96009e6cdf594372a793d SHA256 747e9cfdda5efcbc76d3e1d76f815b22eb4b3653b1284e60e88fe4c96ba88eda
-AUX vdr-extrecmenu-1.2_pre1-gcc44.patch 1494 RMD160 b9d503c93787d89a21b10ffcb7f64c868f761580 SHA1 563830d2e54450488ab258567ef29848f0789922 SHA256 0baa478f99fe78ee9d585cf63ae9c6095d9adf4f5457043ff8f9a1cbfbb3e7b9
 DIST dvdarchive-2.3-beta.sh.gz 3412 RMD160 bb30c90b6e2cd033bdfe35d98149d4ac15ddb3fc SHA1 1fed47a8a7a9cf998ab31ac04ccd114debdc5001 SHA256 e8df7ea215e8a856cef1c03373d419c24ddace5c63f780282cbc6b18679000bd
 DIST vdr-extrecmenu-1.2.1.tgz 728625 RMD160 49c89db643747bafb196417af8da607cb6e437a7 SHA1 2090d2ead94784a89f7221d61c0a37cb46555ad4 SHA256 1f1317bb421e4ab56e3513021ad676d5b55173221730b96602698e96cd3689cf
-DIST vdr-extrecmenu-1.2.tgz 328174 RMD160 8d6826fcc0039371fe07b0152bffd6df4e01e270 SHA1 40a0861ab9a225296033d64fa7cb39e794067c7a SHA256 80832186e14c999829c797cf789265625ace6e8a546a25103d52c88dcd0ab335
-EBUILD vdr-extrecmenu-1.2.1.ebuild 1274 RMD160 e04380ffabd6aa5288d59c31bd59a5345e39a489 SHA1 9fd3bda6102c7533f5c018aca4c865e585b1d090 SHA256 6dfa26971fa05da43e9ce10d3775f098c1ab0621147ff4c527dd908a213582c4
-EBUILD vdr-extrecmenu-1.2.ebuild 1155 RMD160 2b3393e317f380cfb8b856817c1b5374dcb99644 SHA1 c082f2ff1c64376841b459e7597489e39b751d1f SHA256 6170073ed2274cfa0e3ef1c092bda31d0eb192e15c9db5482f478843712e00cb
-MISC ChangeLog 5200 RMD160 59a28f809f123eb30364a2ed5feedde63d69cc7a SHA1 b7c1d5f46902ef20bda789bc8d68a154ed9e6e44 SHA256 e67e918e161c7df9fd565f2cda52deb31e6352a62d8f6df8bca6206565b9b028
+EBUILD vdr-extrecmenu-1.2.1.ebuild 1244 RMD160 ed5f6b5128eea089fe3bfb2bfe887dbfc35e05d0 SHA1 6f647b17360f15041fa208a47411a2ab46147a70 SHA256 8f7b17d1d1f84d1085ebf6bcb51dc4746b278d60b9a540fa6c42699a7314485e
+MISC ChangeLog 5515 RMD160 8768cf37f48dc85c5f7b8baac35edb2afe0fcfbc SHA1 4d0c3408297d664250e1b31e2723a9109c8ca976 SHA256 04c725c20dbf725ea8a644ab119f5adb50bb0300e8ac5d0235b254e12ab7ddbd
 MISC metadata.xml 337 RMD160 f0276e381deb2e62761aa580195b1c05be29f5d5 SHA1 401d1f6dd5361fa11c936bfa18aa86047a82c614 SHA256 ca40fe91ad4ff2629c376890772b86f0e306359568fd5dad9a5c9804d0791b7f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iEYEAREKAAYFAk7xoKwACgkQuUQtlDBCeQJcnwCePRbgZbGvCc1VyghEUjAOTHru
-Zc0Anjey9a0oya1/dE61UDPBzGk2kpXl
-=aFEd
+iD8DBQFPMTOTdn07HTTCgIoRAjkkAJoDoGj/LBOTOPak17fOy3cxk5IymwCgktga
+uPKvA6q/K5xeAQrqrzGMC54=
+=mf9q
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-extrecmenu/files/dvdarchive-2.3-beta-configfile.patch b/media-plugins/vdr-extrecmenu/files/dvdarchive-2.3-beta-configfile.patch
deleted file mode 100644
index 59130c2ebd57..000000000000
--- a/media-plugins/vdr-extrecmenu/files/dvdarchive-2.3-beta-configfile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- dvdarchive-2.3-beta.sh	2009-10-06 16:23:20.000000000 +0200
-+++ dvdarchive-2.3-beta.sh	2009-10-06 17:32:43.000000000 +0200
-@@ -118,6 +118,10 @@
- DEBUGLOG="/tmp/dvdarchive.sh-debug.log"
- 
- #</Configuration>
-+
-+# read config file
-+. /etc/vdr/dvdarchive.conf
-+
- #
- # No changes needed after this mark
- 
diff --git a/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2-gcc44.patch b/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2-gcc44.patch
deleted file mode 100644
index 96fd9376eb53..000000000000
--- a/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2-gcc44.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur extrecmenu-1.2.orig/mymenueditrecording.c extrecmenu-1.2/mymenueditrecording.c
---- extrecmenu-1.2.orig/mymenueditrecording.c	2010-09-22 15:31:27.000000000 +0200
-+++ extrecmenu-1.2/mymenueditrecording.c	2010-09-22 15:36:19.000000000 +0200
-@@ -25,15 +25,15 @@
- 
-  if(recording)
-  {
--  char *p=(char*)strrchr(recording->Name(),'~'); //TODO
-+  const char *p=(char*)strrchr(recording->Name(),'~'); //TODO
-   if(p)
-   {
-    strn0cpy(name,++p,sizeof(name));
-    strn0cpy(path,recording->Name(),sizeof(path));
-    
--   p=strrchr(path,'~');
--   if(p)
--    *p=0;
-+   char *p2 = strrchr(path,'~');
-+   if(p2)
-+    *p2=0;
-   }
-   else
-    strn0cpy(name,recording->Name(),sizeof(name));  
diff --git a/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2_pre1-gcc43.patch b/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2_pre1-gcc43.patch
deleted file mode 100644
index 63af256cb3a5..000000000000
--- a/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2_pre1-gcc43.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-fix compile problems on gcc-4.3.x
-bug 227093
-diff -ruN extrecmenu-1.2_orig/tools.c extrecmenu-1.2/tools.c
---- extrecmenu-1.2_orig/tools.c	2008-03-22 15:00:12.000000000 +0100
-+++ extrecmenu-1.2/tools.c	2008-06-15 10:54:33.000000000 +0200
-@@ -5,6 +5,7 @@
- #include <string>
- #include <fstream>
- #include <iostream>
-+#include <langinfo.h>
- #include <vdr/plugin.h>
- #include <vdr/videodir.h>
- #include <vdr/recording.h>
-
diff --git a/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2_pre1-gcc44.patch b/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2_pre1-gcc44.patch
deleted file mode 100644
index 3cda48b25805..000000000000
--- a/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2_pre1-gcc44.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ru extrecmenu-1.2-orig/mymenueditrecording.c extrecmenu-1.2/mymenueditrecording.c
---- extrecmenu-1.2-orig/mymenueditrecording.c	2009-06-15 21:37:04.928136215 +0200
-+++ extrecmenu-1.2/mymenueditrecording.c	2009-06-15 21:40:02.881447945 +0200
-@@ -25,15 +25,15 @@
- 
-  if(recording)
-  {
--  char *p=strrchr(recording->Name(),'~');
-+  const char *p=strrchr(recording->Name(),'~');
-   if(p)
-   {
-    strn0cpy(name,++p,sizeof(name));
-    strn0cpy(path,recording->Name(),sizeof(path));
-    
--   p=strrchr(path,'~');
--   if(p)
--    *p=0;
-+   char *p2 = strrchr(path,'~');
-+   if(p2)
-+    *p2=0;
-   }
-   else
-    strn0cpy(name,recording->Name(),sizeof(name));  
-@@ -307,7 +307,7 @@
-         asprintf(&dir,"%s%s%s",base?base:"",base?"~":"",item->Text());
-       else  // needed for move recording menu
-       {
--        char *p=strrchr(recording->Name(),'~');
-+        const char *p=strrchr(recording->Name(),'~');
-         asprintf(&dir,"%s%s%s~%s",base?base:"",base?"~":"",item->Text(),p?p+1:recording->Name());
-       }
-     }
-@@ -315,7 +315,7 @@
-     {
-       if(!dirname)
-       {
--        char *p=strrchr(recording->Name(),'~');
-+        const char *p=strrchr(recording->Name(),'~');
-         asprintf(&dir,"%s",p?++p:recording->Name());
-       }
-     }
-@@ -326,7 +326,7 @@
-       asprintf(&dir,"%s",base);
-     else
-     {
--      char *p=strrchr(recording->Name(),'~');
-+      const char *p=strrchr(recording->Name(),'~');
-       asprintf(&dir,"%s~%s",base,p?p:recording->Name());
-     }
-   }
diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.1.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.1.ebuild
index 058792547082..ce878764d033 100644
--- a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.1.ebuild
+++ b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.1.ebuild,v 1.4 2011/12/21 09:02:29 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.1.ebuild,v 1.5 2012/02/07 14:22:00 hd_brummy Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ DVDARCHIVE="dvdarchive-2.3-beta.sh"
 
 DESCRIPTION="Video Disk Recorder - Extended recordings menu Plugin"
 HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-extrecmenu"
-SRC_URI="http://projects.vdr-developer.org/attachments/download/${VERSION}/${P}.tgz
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz
 	mirror://gentoo/${DVDARCHIVE}.gz"
 
 LICENSE="GPL-2"
diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.ebuild
deleted file mode 100644
index e480a275dcfc..000000000000
--- a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2.ebuild
+++ /dev/null
@@ -1,47 +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-extrecmenu/vdr-extrecmenu-1.2.ebuild,v 1.2 2011/01/28 23:55:46 hd_brummy Exp $
-
-EAPI="3"
-
-inherit vdr-plugin eutils
-
-DVDARCHIVE="dvdarchive-2.3-beta.sh"
-
-DESCRIPTION="Video Disk Recorder - Extended recordings menu Plugin"
-HOMEPAGE="http://projects.vdr-developer.org/projects/show/plg-extrecmenu"
-SRC_URI="http://projects.vdr-developer.org/attachments/download/334/${P}.tgz
-	mirror://gentoo/${DVDARCHIVE}.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.6.0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc44.patch"
-
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${DVDARCHIVE%.sh}-configfile.patch"
-
-	cd "${S}"
-	if grep -q fskProtection /usr/include/vdr/timers.h; then
-		einfo "Enabling parentalrating option"
-		sed -i "s:#WITHPINPLUGIN:WITHPINPLUGIN:" Makefile
-	fi
-
-	vdr-plugin_src_prepare
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	cd "${WORKDIR}"
-	newbin ${DVDARCHIVE} dvdarchive.sh
-
-	insinto /etc/vdr
-	doins "${FILESDIR}"/dvdarchive.conf
-}