Fix compilation issues with 2.6.18 kernels.

Package-Manager: portage-2.1.2_pre1-r2

4 files changed, 41 insertions, 10 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index c5929a7b8c20..6f52418a06d1 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.67 2006/09/25 18:33:13 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.68 2006/09/27 15:06:52 spock Exp $
+
+  27 Sep 2006; Michał Januszewski <spock@gentoo.org>
+  +files/splashutils-1.1.9.10-2.6.18-vt-fix.patch,
+  splashutils-1.1.9.10-r1.ebuild:
+  Fix compilation issues with 2.6.18 kernels.
 
   25 Sep 2006; Michał Januszewski <spock@gentoo.org>
   +files/splashutils-1.3-r2-fbsplash.patch, splashutils-1.3-r2.ebuild:
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index aa89cd2df678..37387dadc7ba 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX splashutils-1.1.9.10-2.6.18-vt-fix.patch 361 RMD160 f311ccd16c7f9b6aa306018098dd264d5bc088c1 SHA1 173f6a0e5c945e7e62bf373f369d8d0cf0365191 SHA256 aaf437a9b48df6af5c818b5826851b6cfc63662c08071fac80823306f0fbb6d4
+MD5 f524ce13fc4ce817ea65dcc884e28c4e files/splashutils-1.1.9.10-2.6.18-vt-fix.patch 361
+RMD160 f311ccd16c7f9b6aa306018098dd264d5bc088c1 files/splashutils-1.1.9.10-2.6.18-vt-fix.patch 361
+SHA256 aaf437a9b48df6af5c818b5826851b6cfc63662c08071fac80823306f0fbb6d4 files/splashutils-1.1.9.10-2.6.18-vt-fix.patch 361
 AUX splashutils-1.1.9.10-makefile.patch 6258 RMD160 cd65e0feeefbaa053161959db5f1bb22120ee43c SHA1 b5a9afbcb97d8218f89926a3e53e8ac1dc6eeecb SHA256 777d5a6f59d49d00573cf4e99510abfc82865a16c27a67190b78b4e4a0e30d78
 MD5 38c4a990c2ad0581666c25da2029f08d files/splashutils-1.1.9.10-makefile.patch 6258
 RMD160 cd65e0feeefbaa053161959db5f1bb22120ee43c files/splashutils-1.1.9.10-makefile.patch 6258
@@ -42,10 +49,10 @@ DIST splashutils-lite-1.1.9.8.tar.bz2 55013 RMD160 377396b94562f4cde5e298170f762
 DIST splashutils-lite-1.3.tar.bz2 61079 RMD160 4d5296ed0b2a7a7783cfe5f9f25b53fa56307bc7 SHA1 22349164fc0512a698ae2f387bfd7845d3f8063e SHA256 4f94e91ee81acea4d6ef8d481b32cf15cd7987030e048e0e249eec995ef8a5d0
 DIST zlib-1.2.1.tar.bz2 284152 RMD160 aca88eb02d90b91c732f351e1b7efd4ce409ee25 SHA1 13bd164df955911c25342adfad805c1cad5e398e SHA256 9ea4bd04487e05254d05cebde539b3855af2899658e2da84487e86f7f400e0e1
 DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
-EBUILD splashutils-1.1.9.10-r1.ebuild 6815 RMD160 8d7e71f47c2ff811be3b22d17547aa31115a5fb5 SHA1 4f1047a5ae306fa44eecbd42a36a29b8b84f7e25 SHA256 ab8616f8be35dd2a935238d76c1d386cf5a7d5af6929d8b9f3bc9eb3f3e33e73
-MD5 4180e6e89214aa924a3ce023cb55dfdb splashutils-1.1.9.10-r1.ebuild 6815
-RMD160 8d7e71f47c2ff811be3b22d17547aa31115a5fb5 splashutils-1.1.9.10-r1.ebuild 6815
-SHA256 ab8616f8be35dd2a935238d76c1d386cf5a7d5af6929d8b9f3bc9eb3f3e33e73 splashutils-1.1.9.10-r1.ebuild 6815
+EBUILD splashutils-1.1.9.10-r1.ebuild 6873 RMD160 2669d3a1890b1086abaf32454c96d6bb7f58b2ef SHA1 406243677d40df826b5053621f4a0dfa53dbdb96 SHA256 a9c5b33e2583705ecbaf0066de51d77a7da0d4baea2b48186087cbfb81f32ff5
+MD5 a007b304b60ea0d122a7e5d153efb3ba splashutils-1.1.9.10-r1.ebuild 6873
+RMD160 2669d3a1890b1086abaf32454c96d6bb7f58b2ef splashutils-1.1.9.10-r1.ebuild 6873
+SHA256 a9c5b33e2583705ecbaf0066de51d77a7da0d4baea2b48186087cbfb81f32ff5 splashutils-1.1.9.10-r1.ebuild 6873
 EBUILD splashutils-1.1.9.8-r1.ebuild 6450 RMD160 ee8219564a3b039de20831eb52cb44d70fd8df87 SHA1 8cd9ff8737d7f40c2ffd7cde62c6b37df887539c SHA256 05085409393be9b3561dfa05fcbac6fea86bb2aaf1c82b0b11b31ba9ab8a590b
 MD5 e79713db9ac0cc2a97fcabab4fe83275 splashutils-1.1.9.8-r1.ebuild 6450
 RMD160 ee8219564a3b039de20831eb52cb44d70fd8df87 splashutils-1.1.9.8-r1.ebuild 6450
@@ -58,10 +65,10 @@ EBUILD splashutils-1.3-r2.ebuild 6985 RMD160 3478daeae7cadfb0270159e301ac0b59977
 MD5 d91de9d33486316103f638ed86f97e56 splashutils-1.3-r2.ebuild 6985
 RMD160 3478daeae7cadfb0270159e301ac0b59977f2948 splashutils-1.3-r2.ebuild 6985
 SHA256 78706bdd83e7bc0a562a394b5a84d81831b6b7542f35868416ac04b558c80f15 splashutils-1.3-r2.ebuild 6985
-MISC ChangeLog 14177 RMD160 78a8c05cb54f8e3f86b26233bf4cfd9dde1e5a42 SHA1 8679b95288354ccb1aadcf5264717f8b27b5cf4d SHA256 b86140b86527f6ab76d5b665d7a13ca832aabd88e0b094fbfbe762d59cea1b74
-MD5 ccbd60d23c35caa3b5fffb14553b2dc7 ChangeLog 14177
-RMD160 78a8c05cb54f8e3f86b26233bf4cfd9dde1e5a42 ChangeLog 14177
-SHA256 b86140b86527f6ab76d5b665d7a13ca832aabd88e0b094fbfbe762d59cea1b74 ChangeLog 14177
+MISC ChangeLog 14363 RMD160 3c5d719582221fe6ae2c64d1ecdfa9e389486d94 SHA1 70514d2333a92784a7b7ae4f9e55db14dcb1a67c SHA256 639f316d9c7b0274de0c98f9576d45e58f42f60534aceaa7d65c45275e34343d
+MD5 644e9095260cab581a4c93ec8e92ff18 ChangeLog 14363
+RMD160 3c5d719582221fe6ae2c64d1ecdfa9e389486d94 ChangeLog 14363
+SHA256 639f316d9c7b0274de0c98f9576d45e58f42f60534aceaa7d65c45275e34343d ChangeLog 14363
 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 MD5 87131e5c56922624f8a0c7fe61cd28da metadata.xml 220
 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 metadata.xml 220
@@ -78,3 +85,10 @@ SHA256 70ddd8f011a31dd68111a95d08c6ec04e4f0f2ed8aed0c0c566d28e13c5e2ec7 files/di
 MD5 4ca85a62e94c210cf461eb6ba2172e72 files/digest-splashutils-1.3-r2 1756
 RMD160 dd947b2bba697a47bb0f235139ea884809b74a1d files/digest-splashutils-1.3-r2 1756
 SHA256 11721d4526a8e9b47e1c29ec0d99ee2862e7543b1b0968aeba30e331acf70e2a files/digest-splashutils-1.3-r2 1756
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFGpOKchej4aZK9/cRAo6cAJ9fKorCh4h+nuPzVWJyiTGFvDIIigCff6L7
+oX3TJEI8c/e436qHRzDWzAo=
+=56yV
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/files/splashutils-1.1.9.10-2.6.18-vt-fix.patch b/media-gfx/splashutils/files/splashutils-1.1.9.10-2.6.18-vt-fix.patch
new file mode 100644
index 000000000000..a202190cb4e4
--- /dev/null
+++ b/media-gfx/splashutils/files/splashutils-1.1.9.10-2.6.18-vt-fix.patch
@@ -0,0 +1,11 @@
+diff -Naurp splashutils-1.1.9.10-orig/kernel.c splashutils-1.1.9.10/kernel.c
+--- splashutils-1.1.9.10-orig/kernel.c	2006-09-27 16:49:17.000000000 +0200
++++ splashutils-1.1.9.10/kernel.c	2006-09-27 16:49:57.000000000 +0200
+@@ -23,6 +23,7 @@
+ #include <linux/kd.h>
+ #include <linux/tty.h>
+ #include <linux/tiocl.h>
++#include <linux/vt.h>
+ 
+ #include "splash.h"
+ 
diff --git a/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild b/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild
index 73e163c17dc3..0b7afc9e564d 100644
--- a/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild
+++ b/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild,v 1.6 2006/08/21 19:41:36 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild,v 1.7 2006/09/27 15:06:52 spock Exp $
 
 inherit eutils multilib linux-mod
 
@@ -94,6 +94,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/splashutils-1.1.9.10-ppc-2.6.14.patch
 	epatch ${FILESDIR}/splashutils-1.1.9.10-makefile.patch
+	epatch ${FILESDIR}/splashutils-1.1.9.10-2.6.18-vt-fix.patch
 
 	# Check whether the kernel tree has been patched with fbsplash.
 	if [[ ! -e ${KV_DIR}/include/linux/console_splash.h ]]; then