Remove unused #include in fbtools.c (bug #171927).

Package-Manager: portage-2.1.2.2

4 files changed, 36 insertions, 14 deletions

diff --git a/media-gfx/fbida/ChangeLog b/media-gfx/fbida/ChangeLog
index eb1e7d916596..5509c5f9d8e3 100644
--- a/media-gfx/fbida/ChangeLog
+++ b/media-gfx/fbida/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/fbida
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.27 2007/03/04 16:06:33 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.28 2007/03/27 13:08:50 spock Exp $
+
+  27 Mar 2007; Michał Januszewski <spock@gentoo.org>
+  +files/fbida-2.05-asmpage-fix.patch, fbida-2.05.ebuild:
+  Remove unused #include in fbtools.c (bug #171927).
 
   04 Mar 2007; Michał Januszewski <spock@gentoo.org> fbida-2.03-r4.ebuild,
   fbida-2.05.ebuild:
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index f56e888eebcf..ea670d7b66af 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -5,20 +5,24 @@ AUX fbida-2.03-fbgs.patch 371 RMD160 942f4eed3fcde7d98776d289427adc461d43aad2 SH
 MD5 77f2d2a9e9fbc765f318ae88e910efe0 files/fbida-2.03-fbgs.patch 371
 RMD160 942f4eed3fcde7d98776d289427adc461d43aad2 files/fbida-2.03-fbgs.patch 371
 SHA256 d55ce254f37ad104a17c49d3d40d92726b3f9131e5221795e10660edcfe50820 files/fbida-2.03-fbgs.patch 371
+AUX fbida-2.05-asmpage-fix.patch 377 RMD160 b4419c260a94fa12a596badaec9af0e1c647ced7 SHA1 1a40e35781dc6b385aea7175a4239345f2cdf2a2 SHA256 d3540536a84e3bceb4c82ce0835fcf62ee6bc36a94ef813c7f603ea908f5b4c3
+MD5 0dcebfee75b96c96f89b70e333b20675 files/fbida-2.05-asmpage-fix.patch 377
+RMD160 b4419c260a94fa12a596badaec9af0e1c647ced7 files/fbida-2.05-asmpage-fix.patch 377
+SHA256 d3540536a84e3bceb4c82ce0835fcf62ee6bc36a94ef813c7f603ea908f5b4c3 files/fbida-2.05-asmpage-fix.patch 377
 DIST fbida-2.03.tar.gz 205955 RMD160 f2ee360dd7f86c69c9bf482d79ec921dfdf3c65a SHA1 1c42169f22c666d1de522c028deb8559c932732a SHA256 457ab582926337924b4de1b6d022193e6995340f838915f3d44c332f2bde54e6
 DIST fbida-2.05.tar.gz 205879 RMD160 02ea326853a7f57ea7dd1cff26b9693522059ef0 SHA1 27dc4b8d46068ddfab1b64dd88b90a11e7ad2c14 SHA256 8ef43996b4b9315652ef690e5b1f670ba585ccfb0a1dbb59a44ff7af0aa2787c
 EBUILD fbida-2.03-r4.ebuild 2102 RMD160 29bc7ac59f12f3fa2bd5cc764c947ab7ab5499c9 SHA1 587fe28c3403e04a7f44a6d0ab37c36bb2f930ba SHA256 0d8e3f5f262156896507ee17dc790eb1067341b7997756b06ff814b3bc374fba
 MD5 2230ca8b36c026b8c0a23767a47b388f fbida-2.03-r4.ebuild 2102
 RMD160 29bc7ac59f12f3fa2bd5cc764c947ab7ab5499c9 fbida-2.03-r4.ebuild 2102
 SHA256 0d8e3f5f262156896507ee17dc790eb1067341b7997756b06ff814b3bc374fba fbida-2.03-r4.ebuild 2102
-EBUILD fbida-2.05.ebuild 2147 RMD160 7bb55f5f5ca0f05d26c8c3e02323e63525801e99 SHA1 7c157285f14c6df8f3a4671d3eeb9695c6dacc9c SHA256 ac105da61a12b4d582434757ab91308d5cbf0bff4a5b41bb7899c47dab0b5967
-MD5 0dfc804003eba2dde0fc59439d784f96 fbida-2.05.ebuild 2147
-RMD160 7bb55f5f5ca0f05d26c8c3e02323e63525801e99 fbida-2.05.ebuild 2147
-SHA256 ac105da61a12b4d582434757ab91308d5cbf0bff4a5b41bb7899c47dab0b5967 fbida-2.05.ebuild 2147
-MISC ChangeLog 3860 RMD160 3ffb4ff830a999550fe77c35ccfc16e0d6040464 SHA1 ad3a5c9ebaecf5c0790db17917decfd1dad9eedb SHA256 3c754f4a577af926cebd4ae708d507b2ac8d2bd610498f71a97d9fcd6262283f
-MD5 43fb93dde6485b51393f7bac968b2e79 ChangeLog 3860
-RMD160 3ffb4ff830a999550fe77c35ccfc16e0d6040464 ChangeLog 3860
-SHA256 3c754f4a577af926cebd4ae708d507b2ac8d2bd610498f71a97d9fcd6262283f ChangeLog 3860
+EBUILD fbida-2.05.ebuild 2197 RMD160 fc535c4d4cc4c2d14b7514c7311f827b67256296 SHA1 3a7a36972ff1d5ee5c5dee0a801af783ca891475 SHA256 26bc86ce84d73065c00fcba861c0ac9fbfc1438ee672507b7cfa95473fdeb6d8
+MD5 c1f251489772289176293c1dc9b0a709 fbida-2.05.ebuild 2197
+RMD160 fc535c4d4cc4c2d14b7514c7311f827b67256296 fbida-2.05.ebuild 2197
+SHA256 26bc86ce84d73065c00fcba861c0ac9fbfc1438ee672507b7cfa95473fdeb6d8 fbida-2.05.ebuild 2197
+MISC ChangeLog 4026 RMD160 ee031b20080a14dd8be49fbc6860bf9f54fb7723 SHA1 8b59df2e207e93e3334aeed1b082bafa4fa416eb SHA256 c8316dae23634cd272bda282b5809fab6aec71b7438c7bf438cfe4c56dedf333
+MD5 251d6a6b7ce08a9612b3a0f3b4a8a7ee ChangeLog 4026
+RMD160 ee031b20080a14dd8be49fbc6860bf9f54fb7723 ChangeLog 4026
+SHA256 c8316dae23634cd272bda282b5809fab6aec71b7438c7bf438cfe4c56dedf333 ChangeLog 4026
 MISC metadata.xml 221 RMD160 90fef1dff5d0b3945073e90bb7ffec583ff1bbe8 SHA1 f35d1b1858e1223f4dc7b2c03fdf17e50091f1ca SHA256 fd573abb9cf89f320d00d1c107a25a46a5dfba633087d4179d0b8bd9aa539c8e
 MD5 cfe1b5f88cc51ac6ffc42809178d2a06 metadata.xml 221
 RMD160 90fef1dff5d0b3945073e90bb7ffec583ff1bbe8 metadata.xml 221
@@ -30,9 +34,9 @@ MD5 92ba2a8c5d13532b1275acd02c4716e3 files/digest-fbida-2.05 232
 RMD160 32e603063177199d6c9b1e1536ef4b4086238c1c files/digest-fbida-2.05 232
 SHA256 690425ca41453cb44146960b094ccae704ede6d74b73379fae6e17f230437991 files/digest-fbida-2.05 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF6u6Rchej4aZK9/cRAiMCAJwKDo5HjsitbL0J7Znjh171DpWawwCeNVEj
-grXBCUdBlv4Cx+84lwF8o6A=
-=snvc
+iD8DBQFGCRduchej4aZK9/cRAkSnAJ9zM8mopEobJKIzNZFh02xyppZGVQCfaf+5
+qt0d8wKkm10Db/gUIyXfZck=
+=41YT
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/fbida/fbida-2.05.ebuild b/media-gfx/fbida/fbida-2.05.ebuild
index a314032c68af..190de7ead1a4 100644
--- a/media-gfx/fbida/fbida-2.05.ebuild
+++ b/media-gfx/fbida/fbida-2.05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.05.ebuild,v 1.3 2007/03/04 16:06:33 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.05.ebuild,v 1.4 2007/03/27 13:08:50 spock Exp $
 
 inherit eutils toolchain-funcs
 
@@ -42,6 +42,8 @@ src_unpack() {
 	if [[ `gcc-major-version` -lt 4 ]]; then
 		sed	-e 's/-Wno-pointer-sign//' -i ${S}/GNUmakefile
 	fi
+
+	epatch ${FILESDIR}/fbida-2.05-asmpage-fix.patch
 }
 
 src_compile() {
diff --git a/media-gfx/fbida/files/fbida-2.05-asmpage-fix.patch b/media-gfx/fbida/files/fbida-2.05-asmpage-fix.patch
new file mode 100644
index 000000000000..d48d4eb8700a
--- /dev/null
+++ b/media-gfx/fbida/files/fbida-2.05-asmpage-fix.patch
@@ -0,0 +1,12 @@
+diff -Naurp fbida-2.05-orig/fbtools.c fbida-2.05/fbtools.c
+--- fbida-2.05-orig/fbtools.c	2007-03-27 15:02:08.000000000 +0200
++++ fbida-2.05/fbtools.c	2007-03-27 15:02:56.000000000 +0200
+@@ -21,8 +21,6 @@
+ #include <linux/vt.h>
+ #include <linux/fb.h>
+ 
+-#include <asm/page.h>
+-
+ #include "fbtools.h"
+ 
+ /* -------------------------------------------------------------------- */