Remove those annoying cvs-keywords from the patch, bug #233081

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.25-tuxonice-r6 i686

3 files changed, 17 insertions, 18 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index b585ef7e0fd6..24a7fd426447 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/lirc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.183 2008/07/26 11:32:18 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.184 2008/07/28 05:10:02 zzam Exp $
+
+  28 Jul 2008; Matthias Schwarzott <zzam@gentoo.org>
+  files/lirc-0.8.3-kernel-2.6.26.diff:
+  Remove those annoying cvs-keywords from the patch, bug #233081
 
   26 Jul 2008; Matthias Schwarzott <zzam@gentoo.org>
   +files/lirc-0.8.3-kernel-2.6.26.diff, lirc-0.8.3-r2.ebuild:
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index b5f5d8dce8ce..80816251c8a3 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX irexec-confd 280 RMD160 f669c7c98b9d7cac2010284ab6068d29d47ec811 SHA1 c6decc19a273d98d451de137a2ffbe16d5df28ae SHA256 c404ad3b624004cab25bd3a89593cdeb0abbc25771d6e52caf2f37cb4f7b2b79
 AUX irexec-initd 808 RMD160 06b02232f892ab032e2bf8b35bb2945a623a2610 SHA1 5c5630e5434c2430b9a74b725fc5350e29adaede SHA256 9325419aa45d80c205bc1cd47fe839b178da74bca5dd928cbe3ae17423b92493
 AUX lirc-0.8.0-conf-pixelview_bt878.diff 378 RMD160 e70daba96eb7097b20b73807a76ebd562ebb09dc SHA1 96b1976089c7a4e63d9435fb4f8bf8a19c53f4c6 SHA256 343c473210ad6fed27df49d8a93ced7e91fe0d5fc8d652b45b1ef7a7c3125ed6
@@ -16,7 +19,7 @@ AUX lirc-0.8.1-kernel-2.6.20.diff 5003 RMD160 89d3073e0f0c049c16ece750c06ba4f046
 AUX lirc-0.8.2-kernel-2.6.22.patch 550 RMD160 789e168d93a1f7c6c329cd0c6f858efef1d13e10 SHA1 03273362cd230f96beb1d0e1978b51cd582f5fa4 SHA256 1e934d597c2f6a918fabe8f54ee4afb4362da778d38a2f5ded0ac5104b906a4d
 AUX lirc-0.8.2-kernel-2.6.23.patch 1224 RMD160 6e780550ddeb24d2ef58702b01c263d6ab7b1695 SHA1 e90c105626a00f724b9444eae57250328154663d SHA256 7a3af1f27df60fdd6f281ea4064cd603e4e429f9989218bce262e954e709dcce
 AUX lirc-0.8.3-imon-pad2keys.patch 11556 RMD160 89a050f7099593000a40b15c46de6137f3b10dfa SHA1 019b1aa3d72df9e4b28796c173fb4fa1fc3e457d SHA256 347c6195d971f8d1a3f4c29a1ff4750d04cea297d16679aeda7529ac1720d42e
-AUX lirc-0.8.3-kernel-2.6.26.diff 3798 RMD160 994aefe121bf4c3199fe92ff2853073440d6e67f SHA1 4207b47bb1d8a97f5a6d4fe930e306295d76a9d6 SHA256 61757f98e1638a08a2286d6167a590684a76e4684ca32bcaf5bfc1cce7eaede2
+AUX lirc-0.8.3-kernel-2.6.26.diff 3233 RMD160 654d6375f8b0a4e45ce2c60d18581cb2dc7c38a3 SHA1 3465689927bd998fcd4e6875ccc004346c93c4cf SHA256 2e70c6806dc24e0c3288f55f5a20ad7484e05752ca8efd5254e3be3ff73cbefd
 AUX lirc-0.8.3-pa19.patch 1954 RMD160 bb90abc0c35fd5e9827ca993bca51d3075ccb3b8 SHA1 7cae24797dd132a226293bd1e47d87505be4c37a SHA256 d5c4959c78a4f83bc494788c45da2ec5fe7d5c1362f82136233068cc2e87ca8e
 AUX lirc-0.8.3_pre1-imon-pad2keys.patch 10312 RMD160 6f61031cd3035289b2d52797dd02d027f593873d SHA1 c59aab62c9b59e27b93d5613e050438fcf2c6eed SHA256 2f79f223d5d2e998321284c50edea044ad26ab8607eae1e9e79e7c0ea6a8f2cd
 AUX lirc-0.8.3_pre1-kernel-2.6.24.diff 3183 RMD160 f13264a2b4df668ad378a22258f911303da0ef47 SHA1 b9c3b3872841138a0bb484bdebcdedd5fd2b2db8 SHA256 7ef22b75da7740ef51ad2ae94571611684fce49953e32c4a58c7c9a17331716b
@@ -50,5 +53,12 @@ EBUILD lirc-0.8.3-r2.ebuild 8906 RMD160 b4d2e8477f56bcb2b125648a9c576ae98435ec9b
 EBUILD lirc-0.8.3.ebuild 8652 RMD160 fdc60c58f390233998f6ec6e1d6fd6086816f270 SHA1 e1aeadecc5e690b5bcd08c547c93e03c715c0524 SHA256 c8270e080d2b5f1cea016b5a9cf12589c11ce1e18d4480a981a93c6d94fdb844
 EBUILD lirc-0.8.3_pre1.ebuild 8413 RMD160 5c1aad354c21af1c0e59a7664a618b4f845e4807 SHA1 b60cfb14611ba87df67cde41070f7c3b90e467a5 SHA256 aa2c154981ed8998d701e74744a73f84a758c2cfb69b2a4a07e2b6d42d75e932
 EBUILD lirc-0.8.3_pre3.ebuild 8326 RMD160 126919dbe2680331d22682df852b5e5636c8709b SHA1 77751b8e0dc6b5661e4def741c7118aeef19baf8 SHA256 6669f8b4a107c1952c28bc56173540a4e2075eb652d8b7c81e7c99afac11dd2c
-MISC ChangeLog 28544 RMD160 8bcfc045ebdf336c50fc35d06041579f13c4167d SHA1 c725c8ec0efe6d7b5059a98eb9f1ba6640b3109d SHA256 3a2c5eb08dd51ae7c9fa28b245eed3c7c472166cbfdf45600f5ff39a02867bdc
+MISC ChangeLog 28702 RMD160 cbb1088ebc45badb1fb046a997c88ba2e657fe76 SHA1 3a51eea964462dc0025286c8804617338c5c7542 SHA256 b0cc3ba5f85186faa333d7d92ae7aa4fdfaf3ccd5ccb024de835d4c1f4bdfb13
 MISC metadata.xml 162 RMD160 8bd24f9f2805b005cef731c0cda868c72e6980af SHA1 7464d1657179a3f30c5ea2ad401590e4489ac945 SHA256 aaad144c69dd58781e1dc97b5fbad08a5b4db504bd3cbbb4ab27018a307d5d81
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiNVM0ACgkQt2vP6XvVdOdWnwCgw0mjQ3b7UjHl50S+zxHIcoZQ
+QQ4AoKNzssWG409GnGpb2NSOK44H95OC
+=vLyR
+-----END PGP SIGNATURE-----
diff --git a/app-misc/lirc/files/lirc-0.8.3-kernel-2.6.26.diff b/app-misc/lirc/files/lirc-0.8.3-kernel-2.6.26.diff
index 91f4db7dd1bb..130b6cbaeb1d 100644
--- a/app-misc/lirc/files/lirc-0.8.3-kernel-2.6.26.diff
+++ b/app-misc/lirc/files/lirc-0.8.3-kernel-2.6.26.diff
@@ -1,11 +1,5 @@
 --- a/drivers/kcompat.h	2008-01-13 11:26:28.000000000 +0100
 +++ b/drivers/kcompat.h	2008-05-14 18:37:49.000000000 +0200
-@@ -1,4 +1,4 @@
--/*      $Id: lirc-0.8.3-kernel-2.6.26.diff,v 1.1 2008/07/26 11:32:18 zzam Exp $      */
-+/*      $Id: lirc-0.8.3-kernel-2.6.26.diff,v 1.1 2008/07/26 11:32:18 zzam Exp $      */
- 
- #ifndef _KCOMPAT_H
- #define _KCOMPAT_H
 @@ -36,10 +36,10 @@
  	class_simple_destroy(cls);
  }
@@ -78,15 +72,6 @@
  {
 --- a/drivers/lirc_dev/lirc_dev.c	2008-01-13 11:45:02.000000000 +0100
 +++ b/drivers/lirc_dev/lirc_dev.c	2008-05-14 18:37:49.000000000 +0200
-@@ -17,7 +17,7 @@
-  *  along with this program; if not, write to the Free Software
-  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  *
-- * $Id: lirc-0.8.3-kernel-2.6.26.diff,v 1.1 2008/07/26 11:32:18 zzam Exp $
-+ * $Id: lirc-0.8.3-kernel-2.6.26.diff,v 1.1 2008/07/26 11:32:18 zzam Exp $
-  *
-  */
- 
 @@ -145,7 +145,8 @@
  #ifdef LIRC_HAVE_DEVFS_26
  	devfs_remove(DEV_LIRC "/%u", ir->p.minor);