Add two patches to fix bug #339767.

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

5 files changed, 62 insertions, 7 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 738ed80f1328..70f13d7f5f31 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,12 @@
 # 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.182 2010/09/30 08:15:33 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.183 2010/10/10 12:52:04 spock Exp $
+
+  10 Oct 2010; Michał Januszewski <spock@gentoo.org>
+  splashutils-1.5.4.3-r3.ebuild,
+  +files/splashutils-1.5.4.3-splash-functions.patch,
+  +files/splashutils-1.5.4.3-splash_util.patch:
+  Add two patches to fix bug #339767.
 
   30 Sep 2010; Michał Januszewski <spock@gentoo.org>
   splashutils-1.5.4.3-r3.ebuild:
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index be991839ab73..4fc5e540a895 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -9,7 +9,9 @@ AUX splashutils-1.5.4.3-makefile.patch 1257 RMD160 1fb565cb543efe438f5c47cf490aa
 AUX splashutils-1.5.4.3-nondefault-runlevel.patch 894 RMD160 7c337e018858e091106ed3dbc71212ebaa213d39 SHA1 dbf40c7ef79ea62e113a087b3784dfd8aaea3f31 SHA256 c462ef5e4c2514bad9a5aca78cce923109bcb0cff5a292286e74b2f1e8ec457f
 AUX splashutils-1.5.4.3-openrc-effects.patch 2261 RMD160 ad5b78025b1a2520a1b44a43f3afe1fc131ab54e SHA1 72d03fd782faf611399ea9e0217af6d6739731a8 SHA256 ea416ce53c805241b05bfff48439c4c26dbbb717001356ec08f8820ff8baec09
 AUX splashutils-1.5.4.3-openrc-umount-fix.patch 1152 RMD160 a5acc1c648ca41d1aabe823c6e44aad53a1bc965 SHA1 98c6233e367a54e137ef1637725924a8a2d32871 SHA256 56f48bd31c0d405abbb2d320c131f109fcf6ee7a2ef5bed00b024dd872ef31ea
+AUX splashutils-1.5.4.3-splash-functions.patch 680 RMD160 dfdb1754557d9590a060cb6103e154a5c1468605 SHA1 ba9d72fdb884e5966785bd5b9bde43a9806e454d SHA256 2ff9a645513187264af92b16e4ed10bf97edc1cc46b800ed8ae7b4027d407554
 AUX splashutils-1.5.4.3-splash_geninitramfs.patch 606 RMD160 cf5b1cb43bb39acf40b761bba700a742930e91b9 SHA1 c5844ce733f3da949f12ab0cd6dc5786dba5c7e4 SHA256 9fe2d8c232a58089e902af3aebeba569669310fc1219da5d2c8775d4e10929ca
+AUX splashutils-1.5.4.3-splash_util.patch 1335 RMD160 e7249f00c803ce04fcc3e6e6d202e63f9262953e SHA1 5721b7e2945a051fefff1205f60ed1180ed14594 SHA256 25b64a8bcb49f660a18dbd30bbd0e368675cf6cde122378a94521966d5b3f928
 AUX splashutils-openrc-0.4-fix.patch 2750 RMD160 b9e7694c7e2d2083e62f321f232be9054696f06b SHA1 1d3c6c7418a0ada751dec57dff075af709f0b383 SHA256 9da0e841d23b07b262b4f49e25986dce24f73f554f25bc4219024414ccdd9846
 AUX splashutils-openrc-0.4.3-runlevel-fix.patch 3472 RMD160 2e45065be3e8f670034df92a83e6c8ee9f8fb237 SHA1 a4d7bae4844070697091f84bd4a7602b8eabab26 SHA256 9e122dc031acee6996375170ae8954a0ea78cc99ba9265ab2e4ba540da25cb94
 DIST freetype-2.3.12.tar.bz2 1453034 RMD160 57437a2bc0d85859cff2ca1253b36e64629397a1 SHA1 ebf0438429c0bedd310059326d91646c3c91016b SHA256 3b96438f016a62b676c1d2089c00ca777f710d19f6aefa66ccf068d360db3e92
@@ -19,13 +21,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 7819 RMD160 7de5452ecef48c3e3362b8e485c05c976299ddd6 SHA1 6c6bc051e0ce415b05a71aa4d316d3334444974a SHA256 83a6a5df4b1248d063771d2093d2081ac0d0909e381234b6dfce0870a88712a5
-MISC ChangeLog 33197 RMD160 01b300baa8bdd8177e3101ee27c3e51a59843d02 SHA1 d69a8fd254630941bd1a25a9777fe6def3bcd0d4 SHA256 2229359bbf7232a40d3e49342a9f96c7416730f92f4065b318733db128797a45
+EBUILD splashutils-1.5.4.3-r3.ebuild 7944 RMD160 8db389a0185cd0b2932d54fb06e3de9e78313aaf SHA1 7f1cfb138b5b7a9157f38816b911005a119d5fd6 SHA256 9c0bd5549b8c4c692b916da3d028f1a1b99b2e25b2d5e02dd9f627082421d132
+MISC ChangeLog 33424 RMD160 03528aee2037026f2f7b20f534d15f7ee49a1f54 SHA1 475e00f643dbdeb1455f2990b5f3451978d557e0 SHA256 4e157f585d48252b54d47d291a02589c26302296dd0a0bb7eef18c527c65f420
 MISC metadata.xml 311 RMD160 77b41213be37a5c0c7d5822d480ae11acc1af542 SHA1 34dbe221785f338326999be3fdabc0a29df8cf31 SHA256 d548d0cef598c99abeeba18f5308fe482651ebea18746195d86e53ba334f3392
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkykRzUACgkQchej4aZK9/d0xQCfdIQK7sIfjO6zdmF25mYYDAt6
-/nEAnRVR1kri8NnqUmVxXlSGJ9+pdF9z
-=DGTk
+iEYEARECAAYFAkyxtv8ACgkQchej4aZK9/f3bwCfWeBwDZSF03qij1lJql9GjyV8
+f/8An3jc1n6E4L7FfrpmuESP1zTrr1Zn
+=qaJu
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.3-splash-functions.patch b/media-gfx/splashutils/files/splashutils-1.5.4.3-splash-functions.patch
new file mode 100644
index 000000000000..ad5aab914638
--- /dev/null
+++ b/media-gfx/splashutils/files/splashutils-1.5.4.3-splash-functions.patch
@@ -0,0 +1,21 @@
+commit 7077483874a842c607d6e877696891ba4d5f1dd7
+Author: Michał Januszewski <spock@gentoo.org>
+Date:   Sat Oct 9 21:07:37 2010 +0200
+
+    Fix a bug in splash-functions.sh.
+    
+    This problem was reported in Gentoo bug #339767.
+
+diff --git a/core/scripts/splash-functions.sh.in b/core/scripts/splash-functions.sh.in
+index 1a89486..2c39c6a 100644
+--- a/core/scripts/splash-functions.sh.in
++++ b/core/scripts/splash-functions.sh.in
+@@ -341,7 +341,7 @@ splash_comm_send() {
+ 
+ # Returns the current splash mode.
+ splash_get_mode() {
+-	local ctty="${spl_bindir}/fgconsole"
++	local ctty="$({spl_bindir}/fgconsole)"
+ 	local mode="$(${spl_util})"
+ 
+ 	if [ "${mode}" = "silent" ]; then
diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.3-splash_util.patch b/media-gfx/splashutils/files/splashutils-1.5.4.3-splash_util.patch
new file mode 100644
index 000000000000..a3566bdaf07f
--- /dev/null
+++ b/media-gfx/splashutils/files/splashutils-1.5.4.3-splash_util.patch
@@ -0,0 +1,24 @@
+diff -Naurp splashutils-1.5.4.3-orig//scripts/splash-functions.sh.in splashutils-1.5.4.3/scripts/splash-functions.sh.in
+--- splashutils-1.5.4.3-orig//scripts/splash-functions.sh.in	2010-10-09 21:44:39.127691474 +0200
++++ splashutils-1.5.4.3/scripts/splash-functions.sh.in	2010-10-09 21:44:54.678690080 +0200
+@@ -26,7 +26,7 @@ export spl_cachedir="@libdir@/splash/cac
+ export spl_tmpdir="@libdir@/splash/tmp"
+ export spl_fifo="${spl_cachedir}/.splash"
+ export spl_pidfile="${spl_cachedir}/daemon.pid"
+-export spl_util="@bindir@/splash_util.static"
++export spl_util="@sbindir@/splash_util.static"
+ export spl_daemon="@sbindir@/fbsplashd.static"
+ export spl_decor="@sbindir@/fbcondecor_ctl.static"
+ export spl_bindir="@libdir@/splash/bin"
+diff -Naurp splashutils-1.5.4.3-orig//src/Makefile.am splashutils-1.5.4.3/src/Makefile.am
+--- splashutils-1.5.4.3-orig//src/Makefile.am	2010-10-09 21:44:39.121691920 +0200
++++ splashutils-1.5.4.3/src/Makefile.am	2010-10-09 21:45:10.934689775 +0200
+@@ -166,7 +166,7 @@ if CONFIG_FBCON_DECOR
+ sbin_PROGRAMS += fbcondecor_ctl
+ endif
+ sbin_PROGRAMS += fbsplashd
+-bin_PROGRAMS  += splash_util
++sbin_PROGRAMS += fbsplashd splash_util
+ eexecsbin_PROGRAMS += fbsplashctl
+ 
+ fbcondecor_ctl_SOURCES      = fbcon_decor_ctl.c fbcon_decor.h ../include/console_decor.h ../include/fbcondecor.h common.h fbsplash.h
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 20b5cbd21aaa..e9802e70bc2d 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.7 2010/09/30 08:15:33 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.3-r3.ebuild,v 1.8 2010/10/10 12:52:04 spock Exp $
 
 EAPI="2"
 
@@ -90,6 +90,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/splashutils-1.5.4.3-splash_geninitramfs.patch
 	epatch "${FILESDIR}"/splashutils-1.5.4.3-libjpeg.patch
 	epatch "${FILESDIR}"/splashutils-1.5.4.3-daemon-exit-signal.patch
+	epatch "${FILESDIR}"/splashutils-1.5.4.3-splash-functions.patch
+	epatch "${FILESDIR}"/splashutils-1.5.4.3-splash_util.patch
 
 	cd "${SG}"
 	if has_version ">=sys-apps/openrc-0.4.0"; then