Fix relative paths in patch (bug #471818 by Aaron Pelton).

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 18 insertions, 26 deletions

diff --git a/media-tv/xawtv/ChangeLog b/media-tv/xawtv/ChangeLog
index 6dbe7e5bd1bf..90b1d281a5d8 100644
--- a/media-tv/xawtv/ChangeLog
+++ b/media-tv/xawtv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/xawtv
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.68 2012/10/24 19:18:50 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xawtv/ChangeLog,v 1.69 2013/05/31 15:30:35 jer Exp $
+
+  31 May 2013; Jeroen Roovers <jer@gentoo.org>
+  files/xawtv-3.95-pagemask-fix.patch:
+  Fix relative paths in patch (bug #471818 by Aaron Pelton).
 
   24 Oct 2012; Ulrich Müller <ulm@gentoo.org> xawtv-3.95-r2.ebuild:
   Update dependency after package move from x11-libs/openmotif to
diff --git a/media-tv/xawtv/Manifest b/media-tv/xawtv/Manifest
index 100333aed61b..09f97bec5a75 100644
--- a/media-tv/xawtv/Manifest
+++ b/media-tv/xawtv/Manifest
@@ -4,27 +4,17 @@ Hash: SHA256
 AUX webcamrc 597 SHA256 9cf61695be6b8005c663a6c73f90bd4b048f9e16f95ba659b6bc1087bc6e248e SHA512 9a0105ee984d87191ce5e808748a94dde939d932386201a7faa340a0c1de2c109129d3c41277802db7e9645c4a620885c6697d002334a35b569b0e5ce0cf11b2 WHIRLPOOL 36211dfda8da575ea7d749f2c3861f10bd4a7b10014d91eaa53ae4e069703b5503f286d92a636be19b87fd343c81d34948675876830270af5895d27412532507
 AUX xawtv-3.95-jpeg-7.patch 666 SHA256 65e015afbaebaf2f3a832ab4b6a19aeebe93e7cba2aaeee9f127a0d6d39a952e SHA512 8cbb07872c55ccc3fb5ffcc82d96e70546a27651cd94264a68b7aea13f9fe3f1236ccc783e7eccd12e724a01738aeb6f1013365be2b9070bb4be9bd979ba6245 WHIRLPOOL 3d3e4d2dc48b236ee5347351187c49ddca3e640070beb679344fc98aae7099f1766f8f91371de9e209703b2d5f60695cb0443329b42af88911432ccedf2f6e84
 AUX xawtv-3.95-libquicktime-compat.patch 1040 SHA256 e7c49e00e845d237478ba13b7afdfa4f8e59d49749a1f953464ae848b90454b3 SHA512 dec544d2c6df3543dab67057bd207b2169e19c09054977a2d990461aa53c2849cdfc9f51682ac0e7adcfca9bc9f9f19f6ce15055a7be34241d70d34cf45f2254 WHIRLPOOL 70bd697eb491ec3d343344f5c1a29655defdcf11e2f634e223736aabeee72bfa7a87fbffcac731429df03677e6ba34208f47ec19bc2abc63321b36cf7c48a868
-AUX xawtv-3.95-pagemask-fix.patch 1466 SHA256 9e47b5e49fd64bd5cf67452d5c010434bf43d4006b1ff946f9f198913e75eee5 SHA512 97eb5c3eacad33fd1fa70b4cde48825b0acd96e788ba6a8dbe46b0e770332c9de091c3626a7469003900a8d4b53f694abbec4bf81d5911de8387f2f2cdb3b03a WHIRLPOOL 354e420af4b340f14dcefa4000a99c2fab8017c818f66ddf1906c78816f4a8e152597b40bf81db8070621a17191d88fcdec2a9cdfd2e6cbc138ede33b4030ed8
-DIST tv-fonts-1.1.tar.bz2 80177 SHA256 0194dd03ac9b384951e7f5ed7d08c6fc5f6d94efcd08516732720a1a4704d9f6
-DIST xawtv-3.95.tar.gz 555731 SHA256 1204212c59d10df4e29a9a0ddce96cab78342859ec44bf6fd1c5f260b5c7216f
-DIST xawtv-patches-4.tar.bz2 3258 SHA256 0d1a6c386c9e3ea58e92ab26268f620a3e36d888dd8cbaa46441e38215a69e9e
+AUX xawtv-3.95-pagemask-fix.patch 1284 SHA256 9dae64739e359393d8c991b090f045bb8463a7170d4cd7c4c790636890c67570 SHA512 093157577239b02fb4d953cf888c04445b93a450564c379e341e7b1d7c0da15594244f01c76198ccf29bf359d244e444f8fb648ac3c6ce1faa005aa48f67b88c WHIRLPOOL bb123773b2712fbc1438a159215b5165bf3983c30850937997723f5776740008aea5928940fc3a668f3b6d14d5130f131fb9f2b5477cdcec39859dd003293351
+DIST tv-fonts-1.1.tar.bz2 80177 SHA256 0194dd03ac9b384951e7f5ed7d08c6fc5f6d94efcd08516732720a1a4704d9f6 SHA512 669e3c13ede19f62d69d099a57ca39fd3326608b5b794221d29b3abcc29b1098fd30e0dcde1d1420c9aec55f6ae16d0a262b606ab598f5b3ee522f8b5540c3e9 WHIRLPOOL 3503a868d558151657ddfbd2fba5768ef6377a08a9c16eb5e0bb4d6c0862c4af66fc36271a13093a5b5558980d46f3e83baaa034c763febd6b17199deaac5532
+DIST xawtv-3.95.tar.gz 555731 SHA256 1204212c59d10df4e29a9a0ddce96cab78342859ec44bf6fd1c5f260b5c7216f SHA512 9c793ee7fa233aafb12decbd9289f09cbad5aa828db1f4dd89a9999e71bebe5faacc4c361cd41cf928931f32310bdb0c24e52c2c7c8d5595c286c163727faa01 WHIRLPOOL a55089b733d34fa144e9e56f6ff856c3401206294d42d348a05b1128421884269cfb890d16718ac3f3cd70159d7d683b4b9375f92fa936ebeeb22b84d9fd1257
+DIST xawtv-patches-4.tar.bz2 3258 SHA256 0d1a6c386c9e3ea58e92ab26268f620a3e36d888dd8cbaa46441e38215a69e9e SHA512 4f7bf2ac7be1d487daaccaaf853e3ed6a388784d15e87413cbefa4fb2e04c324f5cdce498636d4bf83d70a698b343df877e1f3df9acd615932f361b4292f6dd5 WHIRLPOOL 8b8b72e7815c04470f430e2ba3c1e252782813af56cb9875b647b70e5379f2ce13d1fb5667a6274e472e6dbe1402069b20c36933e24312ab96fef4eb1847f09a
 EBUILD xawtv-3.95-r2.ebuild 3692 SHA256 41b71ad7740846016d0770982dfd94de913c67f311ff03d8d6e9ee99d508348d SHA512 b03f5343f1e5d63baec3b542b559c1504941fde29d1ba9597465a4c6659b64248bf1882fc0efcc51c129f07c3def994008cf70938f5930ca936f1d450f0c7a22 WHIRLPOOL d6afdf1ffbded9c70852eb656968e4bf25060b1733a9353f0389362ac7f25756271d2d9a984ed0de1faf9ceb622841c78d21d9f29f0e243ea8e9b8fd6fc25579
-MISC ChangeLog 15698 SHA256 d4dbd2f1fcc519bab50cf636617329e4863088c3bce228154b54e0b3fd12ab44 SHA512 e3c57e8abcbe5cf2dc60706c4190007cdacfaed96befa18ca24f41cf02627d45f894af88667887ad3026a81241355526561e2dfc8d4b524c9a183671a2ac1eb2 WHIRLPOOL dbb9729d9e5ba80c17143826b7d22ee67457b9e27398676f8b20a1951e6f6960058188d71e4536c4bd93645b8cf4c1cc6376bb055bd25223eb9afdf1e712f54a
+MISC ChangeLog 15846 SHA256 cd98ae0269c87d1f8a39bb2de9bbb3124d63092ca0652e674ef258a5974fe330 SHA512 688eb63698cedde7a488abb313f7750a55c21033e562c48fd61b5e0aec632b3a4280cc88ca0b25f1f885acd3422f2caf622bd8bb9a7d69b2a47244f15b736fa6 WHIRLPOOL 12bbff526b02f9e8b87a957306277d170900ec42490867cfc6733abc4001d3f21881da9d20a2273fada44c4fddd30e4e4d063d802aa9a0042970ac7ac7207355
 MISC metadata.xml 328 SHA256 96f627b19b6b8c71bf35895cbd63e4e355caa23579e5879ecaeace8c37f1a7c5 SHA512 8737036a68ee39c0127d936f3159db10f6ab18dbd60c99f64373a4f6906aa7cbbb8bfaa69329b0127673485bacae7ffeb5513eaa9cf019a365bf55d30fd1c001 WHIRLPOOL 15548da907b989cf27e9b575604719f26b51db63324e4e58185c0afa78c9d1c9a93cdf8115ebbcc52a0aae7ff7243dad5da4b0a4107c69b5237aa735c8400884
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQiD8lAAoJEDxpGckxwJCBaxAQAIPF1GYQJxUnWZZF9JpNvPrL
-J4AK9YQNv+/D19eb1lijBJ/nVd/oAGpHZEJxSRFipv/x50xnH0zEMKu9FSCLkEYE
-vO+LoevhSrvZtQsAhMhnpVHrGPTjkj5LF0ERFR8hDOiKwkht4qbROtRA0WLda1pm
-Z7HKx/bNmxyBAYiw/lO0Gldwn7GDh7JMpoef+wRbu4F4kFIEEh9hGbvWvzcJh0ss
-a30OIqKRhW/vQbneE7Ok4KzP/QRlt7in+EKzyRqUhlQm89IDaV2eS174m1CjjGl/
-lfO43jOZ0gpnyo5kWii3QIEOe+067fUlz1pv8gfFwVlSJH260TEXKDngUwYA7Qh6
-uk/emyZKYkfs6vc1rbRh+EYUs6lv+7lvYdmHpH3Qaoxqnja9iQXJqbWlWM2x1lfK
-pW2Wh/FBdIvWsz26DREb+ji8VJUG9XvnAjygjQbN9eFxssoHec8QdESgBf90VghX
-peQTs7tesaJmlPanNHOFIEWJW8ilrVVXHpUrk839Ev/z9haW5uVOkZdufqxBee/6
-2rqeXC6wAlZy/3XcgCkMdR6EffDKF2RDN3UxmrR9Dh1nEU/7NZe5c8ZMh6x8K/S3
-nwS4K/WvMxcFI3vIXFGVZvwxa6SoUgbSIJBj5ezTwCAR2d97ZBhxtKSKOKmjqc5N
-er+2lDya87orHqUeSgmZ
-=AGqY
+iEYEAREIAAYFAlGowh0ACgkQVWmRsqeSphNSzACcD3iSp7tJ0o9HDgOZNRz8mBJk
+33oAn2dgWWKcDV+TM8vza+nBrAtJe2ww
+=ggyw
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xawtv/files/xawtv-3.95-pagemask-fix.patch b/media-tv/xawtv/files/xawtv-3.95-pagemask-fix.patch
index ab635f73a9ac..7a1ff5e71f02 100644
--- a/media-tv/xawtv/files/xawtv-3.95-pagemask-fix.patch
+++ b/media-tv/xawtv/files/xawtv-3.95-pagemask-fix.patch
@@ -1,9 +1,8 @@
 Patch from Andreas Jochens
 http://lists.debian.org/debian-qa-packages/2006/08/msg00519.html
 
-diff -urN ../tmp-orig/xawtv-3.95/console/fbtools.c ./console/fbtools.c
---- ../tmp-orig/xawtv-3.95/console/fbtools.c	2003-02-14 14:14:04.000000000 +0000
-+++ ./console/fbtools.c	2006-08-23 10:57:40.000000000 +0000
+--- a/console/fbtools.c	2003-02-14 14:14:04.000000000 +0000
++++ b/console/fbtools.c	2006-08-23 10:57:40.000000000 +0000
 @@ -21,8 +21,6 @@
  #include <linux/vt.h>
  #include <linux/fb.h>
@@ -22,9 +21,8 @@ diff -urN ../tmp-orig/xawtv-3.95/console/fbtools.c ./console/fbtools.c
      fb_mem = mmap(NULL,fb_fix.smem_len+fb_mem_offset,
  		  PROT_READ|PROT_WRITE,MAP_SHARED,fb,0);
      if (-1L == (long)fb_mem) {
-diff -urN ../tmp-orig/xawtv-3.95/console/matrox.c ./console/matrox.c
---- ../tmp-orig/xawtv-3.95/console/matrox.c	2005-02-03 10:40:41.000000000 +0000
-+++ ./console/matrox.c	2006-08-23 11:09:51.000000000 +0000
+--- a/console/matrox.c	2005-02-03 10:40:41.000000000 +0000
++++ b/console/matrox.c	2006-08-23 11:09:51.000000000 +0000
 @@ -9,7 +9,6 @@
  #include <sys/ioctl.h>
  #include <sys/mman.h>