Add a patch for initrd.splash (by Amadeusz Żołnowski, bug #330107).

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 25 insertions, 7 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index f67308ab964c..70fdd042e270 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.180 2010/08/28 20:39:15 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.181 2010/08/28 20:52:22 spock Exp $
+
+  28 Aug 2010; Michał Januszewski <spock@gentoo.org>
+  splashutils-1.5.4.3-r3.ebuild,
+  +files/initrd.splash-cmp-str-instead-of-int.patch:
+  Add a patch for initrd.splash (by Amadeusz Żołnowski, bug #330107).
 
   28 Aug 2010; Michał Januszewski <spock@gentoo.org>
   -splashutils-1.5.4.3-r2.ebuild:
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 9d12af020747..b35e59a318cd 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX initrd.splash-cmp-str-instead-of-int.patch 452 RMD160 7748d8c9fba1fcfd28bd12a97fbff6bbb98d5f59 SHA1 a13535bece9be0810cb33d34635ff133c804655e SHA256 a87df58a23b12eee65058f9bd326e354cdccf32048cbc8446b2ad72942da2f30
 AUX splashutils-1.5.4.3-daemon-exit-signal.patch 2764 RMD160 cbfc7e4139fbf9f7b28a53da5ff53f5420c4c5fd SHA1 5e30fa7c4d76ad559f13795b022d45169a2bee71 SHA256 8d7d17ae6591f3de0bde18c537166710b1eac0f6aeb1507aecdf8d6a3d1553eb
 AUX splashutils-1.5.4.3-fix_rc_var.patch 1084 RMD160 d60bdea6625c9ce4d42d281c38888b8bcb823525 SHA1 31b831b79ea3944a52d0ca9fd45891c73170c758 SHA256 c51b29f3c6191ac6259db52f56050a34872f07a78463a1ac1e4fbaf89d2f81d8
 AUX splashutils-1.5.4.3-libjpeg.patch 1693 RMD160 d26031ef3f618bca870431dc1c2fdeba443dca23 SHA1 1c557e9db5a93470e8c6fcde6d63ade1f75fc3bc SHA256 83d9a0ededa96c213a3120c45969d6b8f00e97f2104a221541badd67f82259c7
@@ -18,13 +19,13 @@ DIST miscsplashutils-0.1.8.tar.bz2 91997 RMD160 5efe2bfb8ae409d3e59e82b473454d94
 DIST splashutils-gentoo-1.0.16.tar.bz2 15568 RMD160 f4831c381ac875b5bf9ad9ff527ae2e6cfd2b5d5 SHA1 6756807056c94f4dcc99f73489039dced6aecf4b SHA256 f9c51f442b5a638ac68a731925da57c3402d9506f160681fc01bf80e396d409d
 DIST splashutils-lite-1.5.4.3.tar.bz2 426935 RMD160 e15b1c52d8c9c2886951fa7a674a9fc1707a0316 SHA1 943ffaae0b96305809ffb52f417a0fca2651a742 SHA256 3f21bd57ac67bd7426caa3ff5791d3609567db3bcd4319da29867ec42cadb362
 DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
-EBUILD splashutils-1.5.4.3-r3.ebuild 7743 RMD160 eeba0543dc2c84eb683098d5162c3bf88455d88d SHA1 b0d6d438eb97843a8c54522d3ba0a4184225605e SHA256 dde1a5de274f22907d756a586c195c1ee1ede63fea9ecf4aecc274b747298701
-MISC ChangeLog 32821 RMD160 ee41adf0dca2aebd7742e52621ed5852090e88cc SHA1 2e441615fbe70c245d7c044642fc865533cc308a SHA256 f5de4c35efc4d193aa70721fd5b14302a6ceb33672bba577742fe8c9a63d3d65
+EBUILD splashutils-1.5.4.3-r3.ebuild 7808 RMD160 c4a3aae68f67b32ecf3f6f5dae783dae60d38a5c SHA1 c72294d7ce92314f45ceeb076e511d9a48c1f019 SHA256 3ba8bbf1d1d9424bbe17cda44618f59d2b931234ce6b9554e0cc2d44d1b9cd8b
+MISC ChangeLog 33034 RMD160 f9c7950c5f8b3beae39fbd05bbd826ac7985d92a SHA1 81c784eb2d58b88494eb6a0106287301bca918bc SHA256 f548d1a87d94e8706e7c124e29d40937072d04c22fc53d43662453c7491d9e3e
 MISC metadata.xml 311 RMD160 77b41213be37a5c0c7d5822d480ae11acc1af542 SHA1 34dbe221785f338326999be3fdabc0a29df8cf31 SHA256 d548d0cef598c99abeeba18f5308fe482651ebea18746195d86e53ba334f3392
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkx5c/gACgkQchej4aZK9/dhVgCZAT+c+5Tgc4exyhyBs7nDAvwf
-uT4AnjkOaWTYaIF8/kmcgi+g8fzdmrXO
-=Xtrs
+iEYEARECAAYFAkx5dxMACgkQchej4aZK9/cx7gCeKjbX8FZKSAu4yhFngRd83dyE
+05AAnRshjjGn55eI6Clx7zAUyocEcc6k
+=LWjf
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/files/initrd.splash-cmp-str-instead-of-int.patch b/media-gfx/splashutils/files/initrd.splash-cmp-str-instead-of-int.patch
new file mode 100644
index 000000000000..16bb2f5740fc
--- /dev/null
+++ b/media-gfx/splashutils/files/initrd.splash-cmp-str-instead-of-int.patch
@@ -0,0 +1,11 @@
+--- initrd.splash	2008-11-13 23:49:00.000000000 +0100
++++ initrd.splash.new	2010-07-27 21:35:24.647912782 +0200
+@@ -26,7 +26,7 @@
+ 		init)
+ 			if [ -n "$2" ]; then
+ 				export BOOT_MSG="$2"
+-			elif [ "${CDROOT}" -eq '1' ]; then
++			elif [ "${CDROOT}" = '1' ]; then
+ 				export BOOT_MSG="Preparing the LiveCD environment... Press Alt+F1 for verbose mode."
+ 			else
+ 				export BOOT_MSG="Preparing the system for boot... Press Alt+F1 for verbose mode."
diff --git a/media-gfx/splashutils/splashutils-1.5.4.3-r3.ebuild b/media-gfx/splashutils/splashutils-1.5.4.3-r3.ebuild
index 94c62d907168..a5004d4caad3 100644
--- a/media-gfx/splashutils/splashutils-1.5.4.3-r3.ebuild
+++ b/media-gfx/splashutils/splashutils-1.5.4.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.3-r3.ebuild,v 1.5 2010/08/28 20:37:37 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.3-r3.ebuild,v 1.6 2010/08/28 20:52:22 spock Exp $
 
 EAPI="2"
 
@@ -102,6 +102,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/splashutils-1.5.4.3-openrc-umount-fix.patch
 	epatch "${FILESDIR}"/splashutils-1.5.4.3-nondefault-runlevel.patch
 	epatch "${FILESDIR}"/splashutils-1.5.4.3-openrc-effects.patch
+	epatch "${FILESDIR}"/initrd.splash-cmp-str-instead-of-int.patch
 	cd "${S}"
 
 	rm -f m4/*