cleanup

(Portage version: 2.1.7.17/cvs/Linux i686)

5 files changed, 8 insertions, 108 deletions

diff --git a/media-video/noad/ChangeLog b/media-video/noad/ChangeLog
index f929497f43d3..768f8081fb83 100644
--- a/media-video/noad/ChangeLog
+++ b/media-video/noad/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/noad
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.41 2010/03/24 20:20:27 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.42 2010/03/27 20:36:25 hd_brummy Exp $
+
+  27 Mar 2010; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/patches-0.7.x/noad-0.7.0.20100119-asneeded.patch,
+  -files/patches-0.7.x/noad-0.7.0_gcc-4.4.diff,
+  -files/patches-0.7.x/noad-0.7.1-hangcheck.diff,
+  -files/patches-0.7.x/noad-0.7.1-ts_extension.diff:
+  cleanup
 
 *noad-0.7.2 (24 Mar 2010)
 
diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.0.20100119-asneeded.patch b/media-video/noad/files/patches-0.7.x/noad-0.7.0.20100119-asneeded.patch
deleted file mode 100644
index 1d01dad4bedc..000000000000
--- a/media-video/noad/files/patches-0.7.x/noad-0.7.0.20100119-asneeded.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=305571
-
---- Makefile.am
-+++ Makefile.am
-@@ -14,8 +14,7 @@ noinst_PROGRAMS=@PICSRC@ @TOOLSRC@
- EXTRA_PROGRAMS=markpics showindex
- 
- markpics_SOURCES=markpics.cpp
--markpics_LDADD=libnoad.a
--markpics_LDFLAGS=-lMagick++
-+markpics_LDADD=libnoad.a -lMagick++
- markpics_CXXFLAGS=@markpiccxxflags@
- showindex_SOURCES=showindex.cpp
- showindex_LDADD=libnoad.a
diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.0_gcc-4.4.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.0_gcc-4.4.diff
deleted file mode 100644
index c3cc87b7df97..000000000000
--- a/media-video/noad/files/patches-0.7.x/noad-0.7.0_gcc-4.4.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_gcc4.4.dpatch by  <Gerald Dachs <gda@dachsweb.de>>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad noad-0.7.0~/svdrpc.cpp noad-0.7.0/svdrpc.cpp
---- noad-0.7.0~/svdrpc.cpp	2009-12-22 23:20:50.000000000 +0100
-+++ noad-0.7.0/svdrpc.cpp	2009-12-22 23:23:11.000000000 +0100
-@@ -256,7 +256,7 @@
- {
-   char *baseName = NULL;
-   char *cp = NULL;
--  char *vend = strchr(filename,'/');
-+  const char *vend = strchr(filename,'/');
-   if( vend )
-     vend = strchr(vend+1,'/');
-   if( vend )
-@@ -265,9 +265,9 @@
-     asprintf(&baseName,"mesg %s %s",msg, filename);
-   if( baseName[strlen(baseName)-1] == '/' )
-     baseName[strlen(baseName)-1] = '\0';
--  vend = strrchr(baseName, '/');
--  if( vend )
--    *vend = '\0';
-+  char *vend1 = strrchr(baseName, '/');
-+  if( vend1 )
-+    *vend1 = '\0';
-   asprintf(&cp,"%s\r\n",baseName);
- 
-   VDRMessage(cp);
-diff -urNad noad-0.7.0~/vdr_cl.cpp noad-0.7.0/vdr_cl.cpp
---- noad-0.7.0~/vdr_cl.cpp	2009-12-22 23:20:50.000000000 +0100
-+++ noad-0.7.0/vdr_cl.cpp	2009-12-22 23:20:50.000000000 +0100
-@@ -1200,7 +1200,7 @@
-   sortBuffer = NULL;
-   fileName = strdup(FileName);
-   FileName += strlen(VideoDirectory) + 1;
--  char *p = strrchr(FileName, '/');
-+  const char *p = strrchr(FileName, '/');
- 
-   name = NULL;
-   summary = NULL;
-
-diff -Naur noad-0.7.0.orig/showindex.cpp noad-0.7.0/showindex.cpp
---- noad-0.7.0.orig/showindex.cpp	2010-01-05 19:22:48.000000000 +0100
-+++ noad-0.7.0/showindex.cpp	2010-01-05 19:23:31.000000000 +0100
-@@ -46,8 +46,8 @@
-   uchar PictureType;        // current picture-type
-   int Length;               // frame-lenght of current frame
-   char pictypes[]= { 'U','I','P','B' };
--  char *indents[]= { "","","  ","    " };
--  char *indents2[]= { "","    ","  ","" };
-+  const char *indents[]= { "","","  ","    " };
-+  const char *indents2[]= { "","    ","  ","" };
-   int lastFile=0;
-   int lastOffset = 0;
-   unsigned char readBuffer[BYTES_TO_READ+1];
diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.1-hangcheck.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.1-hangcheck.diff
deleted file mode 100644
index 37788a197fd7..000000000000
--- a/media-video/noad/files/patches-0.7.x/noad-0.7.1-hangcheck.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru noad-0.6.0-orig/main.cpp noad-0.6.0/main.cpp
---- noad-0.6.0-orig/main.cpp	2007-05-12 17:28:01.000000000 +0200
-+++ noad-0.6.0/main.cpp	2007-05-12 18:20:30.000000000 +0200
-@@ -566,10 +566,17 @@
-     signal(SIGABRT, signal_handler);
-     signal(SIGSEGV, signal_handler);
-     signal(SIGUSR1, signal_handler);
-+    signal(SIGALRM, signal_handler);
-     
-     // do cleanup at exit...
-     atexit(cleanUp);
-     
-+   
-+    if (!bOnline) {
-+       // now start alarm timer to kill hanging noad (hardcoded 30min timeout)
-+       alarm(30*60);
-+    }
-+    
-     // now do the work..,
-     doNoad(bBefore, recDir);
- 
diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.1-ts_extension.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.1-ts_extension.diff
deleted file mode 100644
index 5f3e95a23321..000000000000
--- a/media-video/noad/files/patches-0.7.x/noad-0.7.1-ts_extension.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-http://article.gmane.org/gmane.linux.vdr/42461/
---- noad/noadifnew      2010-03-14 22:27:15.000000000 +0200
-+++ noad-fix/noadifnew  2010-03-14 22:27:41.000000000 +0200
-@@ -12,7 +12,8 @@
-    exit -1
- fi
- fil="$2/marks.vdr"
--if  test -a $fil
-+filts="$2/marks"
-+if [ -e $fil -o -e $filts ]
- then
-   echo "noad already done for $2"
- else