Clean up patches.

Package-Manager: portage-2.2.0_alpha19/cvs/Linux i686

4 files changed, 9 insertions, 37 deletions

diff --git a/sys-power/nvclock/ChangeLog b/sys-power/nvclock/ChangeLog
index 0fa3694221d2..ce600c04484e 100644
--- a/sys-power/nvclock/ChangeLog
+++ b/sys-power/nvclock/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-power/nvclock
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/nvclock/ChangeLog,v 1.4 2011/01/03 23:49:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/nvclock/ChangeLog,v 1.5 2011/01/22 18:00:17 jer Exp $
+
+  22 Jan 2011; Jeroen Roovers <jer@gentoo.org>
+  files/nvclock-0.8_beta4-as-needed.patch,
+  files/nvclock-0.8_beta4-headers.patch:
+  Clean up patches.
 
 *nvclock-0.8_p20110102-r1 (03 Jan 2011)
 
diff --git a/sys-power/nvclock/Manifest b/sys-power/nvclock/Manifest
index 1fc45a57274b..d5e9f7d689b3 100644
--- a/sys-power/nvclock/Manifest
+++ b/sys-power/nvclock/Manifest
@@ -1,6 +1,6 @@
-AUX nvclock-0.8_beta4-as-needed.patch 624 RMD160 db6e09c48be35cd4a24c53a11639b20c74baedd9 SHA1 cfbfc9669561d95c840582442584a26bcb33b776 SHA256 6c2feb6aab30ffb2ec76095b5563637c9a9e37ada0594a840de68a8fab6c0028
+AUX nvclock-0.8_beta4-as-needed.patch 552 RMD160 6ba2cce38b7a965fc635ec4680c28eaa81698021 SHA1 720cfd4a131c4f6d4694fa3c547a0a5ebee275f3 SHA256 3aa0b03fa8bbb0ef3d4266d0d26d9049554b3e4b499f31ab17a1f7b0974fc90b
 AUX nvclock-0.8_beta4-flags.patch 3346 RMD160 7c8f21b30703255b3c8d4fcd99ddd81fe114d81d SHA1 5789a70ba77ea63f3a56823d0fca6dd69ba39f18 SHA256 94e847927cf6c7fe662ef9b03455d690fca9b18f82ae624af13d64a1fcd3797a
-AUX nvclock-0.8_beta4-headers.patch 2618 RMD160 93160c603311366acc9a4e741cbe81aae21427c2 SHA1 830a7f221fe59c02f080e7cc959262dbbad8b95a SHA256 5919ff5b01eda0f96dedaad90a9aced82e94129f8ff9ef7c242913e7e2a0af74
+AUX nvclock-0.8_beta4-headers.patch 1280 RMD160 ea73b4ead3b3965b761c36679cd46bbe2c0152f9 SHA1 d2ba522cdca5c8903a7d5588894cb022c5cfc7f1 SHA256 a095d7741a6c1e7cf812a56be97ec94debc263e1d8aa2f6bbd51643bebf02cbc
 AUX nvclock-0.8_p20110102-make.patch 2332 RMD160 2bde92fbdba404490ecaf474ec0f94d4dda7a598 SHA1 88b7089704e08a750d2c123aa2630aaa1cdfe271 SHA256 985899ababe790d0d8b9a5ad5c148d6ce54473bd839ae3375029714816596f90
 AUX nvclock_confd 360 RMD160 a793577e43a9a66bb0eb8b4d22e8ddb39b6ac30c SHA1 c9da108dbe24f5c1a42f859b6d28b83031fcb8ce SHA256 2bbf36faa3b78425471275f70c4d8abdff4720dc854152e4ad7b2da68810bdca
 AUX nvclock_initd 144 RMD160 a0b6f2b8c9932902136d580e3084fe82e09f8a1f SHA1 16a9e5aa3278d90e76e232048bd624acc6ee3a18 SHA256 5db21835535d48564417a58a92a646c0f5b8e672779978892094556b7650c140
@@ -8,5 +8,5 @@ DIST nvclock-0.8_p20110102.tar.bz2 285043 RMD160 f988c0541b4286108f2e7c405b0054f
 DIST nvclock0.8b4.tar.gz 336999 RMD160 02dbfde37514b34c7f0e5a8b71e8205e32575dcc SHA1 758b3848b036e2b3e25368cfec4c6cd82a963dc9 SHA256 bdb695e869822c4740c361bcace81b5527b774002d42785c986da9a92d7a9b0b
 EBUILD nvclock-0.8_beta4-r4.ebuild 1667 RMD160 ffe2b7d52bcb997bd4c2d251706973f3e66741ed SHA1 5923f348d3e8273e5bad11b9fc418b019ed3e072 SHA256 c2c64e4f36ae4e2994743a93e9aaafe7508895eef3dc779e8600bbee73b70a68
 EBUILD nvclock-0.8_p20110102-r1.ebuild 1183 RMD160 8839e7b7655838cc75b55de961fbcf7b6a9a9990 SHA1 ab972168ac944341a73c284b34ddbe6bfca04833 SHA256 8574ac460c4fc0720301c35cdf25c5d92ef0915a92faefe673568189e944240b
-MISC ChangeLog 7863 RMD160 624e5e26b56b91993cffc58e89c8f1424b5e1ed4 SHA1 cf67aa4795f55b3b1ac72bd8cb18bad6718fdeba SHA256 2d48093a8fd659d7d6c5cb4371d69c1af78242413928086671064e1057aae1ff
+MISC ChangeLog 8015 RMD160 54d8cfd449d60b41f255444a8c918b6940085378 SHA1 8c2e58b5e1ec5889feee3c0f8880a516c1b94c69 SHA256 be4159a66b5474bf6c6ed7b3330ed0986219e6e4d4b174d09f02d8d4a6c5ce72
 MISC metadata.xml 336 RMD160 9f23751790d0f622dc0f0c96961ea5e618542c20 SHA1 8a10d1f48537909fe3d4857f6ecf74ae35d3de17 SHA256 7045abb398fdbbf41bcfdea62eb5a8264569a8a65cf61519f0f8b8ce8ed0afe9
diff --git a/sys-power/nvclock/files/nvclock-0.8_beta4-as-needed.patch b/sys-power/nvclock/files/nvclock-0.8_beta4-as-needed.patch
index 783174cee010..de02a67e8ea6 100644
--- a/sys-power/nvclock/files/nvclock-0.8_beta4-as-needed.patch
+++ b/sys-power/nvclock/files/nvclock-0.8_beta4-as-needed.patch
@@ -1,6 +1,5 @@
 Change linking order to make it possible to use -Wl,--as-needed in LDFLAGS
 
-diff -ru nvclock0.8b4.orig/src/Makefile.in nvclock0.8b4/src/Makefile.in
 --- a/src/Makefile.in	2009-01-03 12:02:54.000000000 -0500
 +++ b/src/Makefile.in	2009-04-02 20:04:12.678271229 -0400
 @@ -15,7 +15,7 @@
diff --git a/sys-power/nvclock/files/nvclock-0.8_beta4-headers.patch b/sys-power/nvclock/files/nvclock-0.8_beta4-headers.patch
index 1ec76eea780e..006d99daeb7b 100644
--- a/sys-power/nvclock/files/nvclock-0.8_beta4-headers.patch
+++ b/sys-power/nvclock/files/nvclock-0.8_beta4-headers.patch
@@ -1,9 +1,3 @@
-bios.c: In function ‘dump_bios’:
-bios.c:909: warning: implicit declaration of function ‘load_bios_pramin’
-bios.c:911: warning: implicit declaration of function ‘load_bios_prom’
-
-diff --git a/src/backend/bios.c b/src/backend/bios.c
-index 3266b57..20fadc8 100644
 --- a/src/backend/bios.c
 +++ b/src/backend/bios.c
 @@ -891,6 +891,8 @@ int main(int argc, char **argv)
@@ -16,11 +10,6 @@ index 3266b57..20fadc8 100644
  {
  	int i;
 
-libc_wrapper.c: In function ‘xf86usleep’:
-libc_wrapper.c:53: warning: implicit declaration of function ‘usleep’
-
-diff --git a/src/backend/libc_wrapper.c b/src/backend/libc_wrapper.c
-index 4787205..9e490cd 100644
 --- a/src/backend/libc_wrapper.c
 +++ b/src/backend/libc_wrapper.c
 @@ -25,6 +25,7 @@
@@ -32,11 +21,6 @@ index 4787205..9e490cd 100644
  #include "xfree.h"
  
 
-nv40.c: In function ‘nv43_get_gpu_temp’:
-nv40.c:393: warning: implicit declaration of function ‘usleep’
-
-diff --git a/src/backend/nv40.c b/src/backend/nv40.c
-index 73472fa..63c9609 100644
 --- a/src/backend/nv40.c
 +++ b/src/backend/nv40.c
 @@ -68,6 +68,7 @@
@@ -48,11 +32,6 @@ index 73472fa..63c9609 100644
  
  /*
 
-banner.c: In function ‘banner_set_text’:
-banner.c:115: warning: format not a string literal and no format arguments
-
-diff --git a/src/gtk/banner.c b/src/gtk/banner.c
-index df2eb55..69851ae 100644
 --- a/src/gtk/banner.c
 +++ b/src/gtk/banner.c
 @@ -112,7 +112,7 @@ void banner_set_text(Banner *banner, char *text, int type)
@@ -65,12 +44,6 @@ index df2eb55..69851ae 100644
  	/* Refresh the banner */
  	banner_expose(GTK_WIDGET(banner), NULL, banner);
 
-main.c: In function ‘gui_init’:
-main.c:235: warning: implicit declaration of function ‘XOpenDisplay’
-main.c:235: warning: cast to pointer from integer of different size
-
-diff --git a/src/gtk/main.c b/src/gtk/main.c
-index b3bbacb..df7e5b1 100644
 --- a/src/gtk/main.c
 +++ b/src/gtk/main.c
 @@ -25,6 +25,7 @@
@@ -82,11 +55,6 @@ index b3bbacb..df7e5b1 100644
  #include "banner.h"
  #include "interface.h"
 
-smartdimmer.c: In function ‘main’:
-smartdimmer.c:107: warning: implicit declaration of function ‘isdigit’
-
-diff --git a/src/smartdimmer.c b/src/smartdimmer.c
-index 295cd49..769c1bc 100644
 --- a/src/smartdimmer.c
 +++ b/src/smartdimmer.c
 @@ -38,6 +38,7 @@