Added a fix for bug #140470.

Package-Manager: portage-2.1.1_pre2-r8

4 files changed, 43 insertions, 13 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 68da833feb3e..4c00d681d585 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,10 @@
 # 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.59 2006/07/15 10:07:04 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.60 2006/07/15 13:01:02 spock Exp $
+
+  15 Jul 2006; Michał Januszewski <spock@gentoo.org>
+  +files/splashutils-1.3-fdset.patch, splashutils-1.3-r1.ebuild:
+  Added a fix for bug #140470.
 
 *splashutils-1.3-r1 (15 Jul 2006)
 
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 600958863bf1..1cf0dc7b6e85 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -9,6 +9,10 @@ AUX splashutils-1.1.9.10-ppc-2.6.14.patch 749 RMD160 0642a987ff97cc18294840c37a2
 MD5 6b70ab6899c37465a35de0f0a89c6365 files/splashutils-1.1.9.10-ppc-2.6.14.patch 749
 RMD160 0642a987ff97cc18294840c37a2f88aa4f252450 files/splashutils-1.1.9.10-ppc-2.6.14.patch 749
 SHA256 3995fd9d153a80f709882cbafc9c2330061eb0c8b6187b136ce79e956617f000 files/splashutils-1.1.9.10-ppc-2.6.14.patch 749
+AUX splashutils-1.3-fdset.patch 373 RMD160 120858f4ba1f70d9c94214204b12ba973336a9e3 SHA1 34cdbb332468a900f2204d31f2ef6e497560601f SHA256 a6c177ef2703b413ef8449182b00dd3619033dfdc3b43901858a675f91f55fa0
+MD5 440a1a6ed07852e0f4ddae55fb566ca1 files/splashutils-1.3-fdset.patch 373
+RMD160 120858f4ba1f70d9c94214204b12ba973336a9e3 files/splashutils-1.3-fdset.patch 373
+SHA256 a6c177ef2703b413ef8449182b00dd3619033dfdc3b43901858a675f91f55fa0 files/splashutils-1.3-fdset.patch 373
 AUX splashutils-depscan.patch 2197 RMD160 044f771f4d971abc177a1da9563cba76bc101d71 SHA1 6e8406a714b71446089b4337f329c9eeeff0465e SHA256 ea06dec56d412a30abe7da31ab3485ab9748cf58740aa1f08b128b0b5e1e6df9
 MD5 d78ee27cab85b59044d8ef3e7e5be4af files/splashutils-depscan.patch 2197
 RMD160 044f771f4d971abc177a1da9563cba76bc101d71 files/splashutils-depscan.patch 2197
@@ -35,14 +39,14 @@ EBUILD splashutils-1.1.9.8-r1.ebuild 6450 RMD160 ee8219564a3b039de20831eb52cb44d
 MD5 e79713db9ac0cc2a97fcabab4fe83275 splashutils-1.1.9.8-r1.ebuild 6450
 RMD160 ee8219564a3b039de20831eb52cb44d70fd8df87 splashutils-1.1.9.8-r1.ebuild 6450
 SHA256 05085409393be9b3561dfa05fcbac6fea86bb2aaf1c82b0b11b31ba9ab8a590b splashutils-1.1.9.8-r1.ebuild 6450
-EBUILD splashutils-1.3-r1.ebuild 6199 RMD160 178e75a3d7468acd659fbc067a8c60203fb6af9d SHA1 a738e7c58892bef55e00482b8531121c7aa4df21 SHA256 1e05e25bc7a860fb0276ec54cfdde465ea0051799355c367b753f1b9e6992962
-MD5 c84ebcfba18e2c7ae02e8e0f08ead5a8 splashutils-1.3-r1.ebuild 6199
-RMD160 178e75a3d7468acd659fbc067a8c60203fb6af9d splashutils-1.3-r1.ebuild 6199
-SHA256 1e05e25bc7a860fb0276ec54cfdde465ea0051799355c367b753f1b9e6992962 splashutils-1.3-r1.ebuild 6199
-MISC ChangeLog 12773 RMD160 2e4125496f12b1477ab68a401a0ed0dc9ad28806 SHA1 f892708a3a0313b8627e75e566920527eb8595eb SHA256 c4dad5e18889f9ee39b224012e51ba59cb6d34949e18205629854936b6f87450
-MD5 2578c45300b98c14495e935e75b09226 ChangeLog 12773
-RMD160 2e4125496f12b1477ab68a401a0ed0dc9ad28806 ChangeLog 12773
-SHA256 c4dad5e18889f9ee39b224012e51ba59cb6d34949e18205629854936b6f87450 ChangeLog 12773
+EBUILD splashutils-1.3-r1.ebuild 6248 RMD160 44bab1a5254bc8de8cc4e814196053e33b8b4efd SHA1 d35863703c93fcc3306349db6d3b9627f589c6c1 SHA256 77e307cf5cd2ed8180517d7f24f9420fdabdda3cc378edfd968a026c6487bb57
+MD5 2e1741ea7bda1257243e1f3b31c945ff splashutils-1.3-r1.ebuild 6248
+RMD160 44bab1a5254bc8de8cc4e814196053e33b8b4efd splashutils-1.3-r1.ebuild 6248
+SHA256 77e307cf5cd2ed8180517d7f24f9420fdabdda3cc378edfd968a026c6487bb57 splashutils-1.3-r1.ebuild 6248
+MISC ChangeLog 12924 RMD160 3e803871b1e46be99baa910ac16edffe46bde47d SHA1 7a47535879de180b2e6165178a63b882b1eb2ef9 SHA256 f05e7f4909d98bf9f765da15e38c50f0a20f5298428e5028a456368c67a25a97
+MD5 62761ac253bb1605fe17ad1913d36d87 ChangeLog 12924
+RMD160 3e803871b1e46be99baa910ac16edffe46bde47d ChangeLog 12924
+SHA256 f05e7f4909d98bf9f765da15e38c50f0a20f5298428e5028a456368c67a25a97 ChangeLog 12924
 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 MD5 87131e5c56922624f8a0c7fe61cd28da metadata.xml 220
 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 metadata.xml 220
@@ -59,7 +63,7 @@ SHA256 70ddd8f011a31dd68111a95d08c6ec04e4f0f2ed8aed0c0c566d28e13c5e2ec7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEuL5achej4aZK9/cRAkNRAJ9gMaA4Q4j6eXTfBIDPVG0uYC8eagCfcuvq
-+u0nFi48r2KBF7n7NSooV8U=
-=XWLD
+iD8DBQFEuOcdchej4aZK9/cRArhgAJ9rsvInWdREbY4PEAPiSfIL/18AlgCfXdJO
+PSClNCQc7fF6+kanoIwPigU=
+=PGt0
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/files/splashutils-1.3-fdset.patch b/media-gfx/splashutils/files/splashutils-1.3-fdset.patch
new file mode 100644
index 000000000000..38d636521f63
--- /dev/null
+++ b/media-gfx/splashutils/files/splashutils-1.3-fdset.patch
@@ -0,0 +1,20 @@
+diff --git a/core/render.c b/core/render.c
+index 290ea97..47319a8 100644
+--- a/core/render.c
++++ b/core/render.c
+@@ -9,8 +9,15 @@
+  *
+  */
+ 
++/* 
++ * HACK WARNING: 
++ * This is necessary to get FD_SET and FD_ZERO on platforms other than x86. 
++ */
++
+ #ifdef TARGET_KERNEL
++#define __KERNEL__
+ #include <linux/posix_types.h>
++#undef __KERNEL__
+ #endif
+ 
+ #include <stdio.h>
diff --git a/media-gfx/splashutils/splashutils-1.3-r1.ebuild b/media-gfx/splashutils/splashutils-1.3-r1.ebuild
index 69efbdce62dd..902ca0660cad 100644
--- a/media-gfx/splashutils/splashutils-1.3-r1.ebuild
+++ b/media-gfx/splashutils/splashutils-1.3-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.3-r1.ebuild,v 1.1 2006/07/15 10:07:04 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.3-r1.ebuild,v 1.2 2006/07/15 13:01:02 spock Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -64,6 +64,8 @@ src_unpack() {
 	rm ${S}/libs/zlib-${V_ZLIB}/Makefile
 	cd ${S}
 
+	epatch ${FILESDIR}/splashutils-1.3-fdset.patch
+
 	# Check whether the kernel tree has been patched with fbsplash.
 	if [[ ! -e ${ROOT}/usr/lib/klibc/include/linux/console_splash.h ]]; then
 		ewarn "The kernel tree against which dev-libs/klibc was built was not patched"