fix DOS line endings in patch so that it works with the stable version of patch. git-ify the file name to patch

(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64)

3 files changed, 20 insertions, 14 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 98690ec30f53..af6364d2830e 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.263 2008/11/17 16:34:23 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.264 2008/11/17 22:51:10 cardoe Exp $
+
+  17 Nov 2008; Doug Goldstein <cardoe@gentoo.org>
+  files/mythtv-0.21-bttv.patch,
+  files/mythtv-0.21-mythflix-naming-collision.patch:
+  fix DOS line endings in patch so that it works with the stable version of
+  patch. git-ify the file name to patch
 
   17 Nov 2008; Doug Goldstein <cardoe@gentoo.org>
   mythtv-0.21_p18314-r1.ebuild, mythtv-0.21_p19046.ebuild:
diff --git a/media-tv/mythtv/files/mythtv-0.21-bttv.patch b/media-tv/mythtv/files/mythtv-0.21-bttv.patch
index 1b1b711b1a1e..d1f418dab361 100644
--- a/media-tv/mythtv/files/mythtv-0.21-bttv.patch
+++ b/media-tv/mythtv/files/mythtv-0.21-bttv.patch
@@ -1,7 +1,7 @@
 Index: libs/libmythtv/NuppelVideoRecorder.cpp
 ===================================================================
---- libs/libmythtv/NuppelVideoRecorder.cpp	(revision 18814)
-+++ libs/libmythtv/NuppelVideoRecorder.cpp	(working copy)
+--- a/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp	(revision 18814)
++++ b/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp	(working copy)
 @@ -981,7 +981,7 @@
              correct_bttv = true;
  
diff --git a/media-tv/mythtv/files/mythtv-0.21-mythflix-naming-collision.patch b/media-tv/mythtv/files/mythtv-0.21-mythflix-naming-collision.patch
index 49fa98fae5bc..582fbe48cb03 100644
--- a/media-tv/mythtv/files/mythtv-0.21-mythflix-naming-collision.patch
+++ b/media-tv/mythtv/files/mythtv-0.21-mythflix-naming-collision.patch
@@ -1,11 +1,11 @@
-Index: themes/default-wide/netflix-ui.xml

-===================================================================

---- themes/default-wide/netflix-ui.xml (revision 14295)

-+++ themes/default-wide/netflix-ui.xml (revision 19046)

-@@ -267,5 +267,5 @@

- 

-       <image name="background" draworder="0" fleximage="no">

--        <filename>news-info-bg.png</filename>

-+        <filename>mythflix_background.png</filename>

-         <position>0,0</position>

-       </image>

+Index: themes/default-wide/netflix-ui.xml
+===================================================================
+--- a/mythtv/themes/default-wide/netflix-ui.xml (revision 14295)
++++ b/mythtv/themes/default-wide/netflix-ui.xml (revision 19046)
+@@ -267,5 +267,5 @@
+ 
+       <image name="background" draworder="0" fleximage="no">
+-        <filename>news-info-bg.png</filename>
++        <filename>mythflix_background.png</filename>
+         <position>0,0</position>
+       </image>