Fix bug #268784 (essential libdir not respected in splash_geninitramfs).

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

4 files changed, 34 insertions, 4 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 63fa8e6d6476..9ad2122bd7f4 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.157 2009/04/12 17:50:42 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.158 2009/05/11 20:14:15 spock Exp $
+
+  11 May 2009; Michał Januszewski <spock@gentoo.org>
+  splashutils-1.5.4.3.ebuild,
+  +files/splashutils-1.5.4.3-splash_geninitramfs.patch:
+  Fix bug #268784 (essential libdir not respected in splash_geninitramfs).
 
   12 Apr 2009; <solar@gentoo.org> splashutils-1.5.4.2.ebuild,
   splashutils-1.5.4.3.ebuild:
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 4b516e63cb4b..706bf126469e 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX splashutils-1.5.4.3-fix_rc_var.patch 1084 RMD160 d60bdea6625c9ce4d42d281c38888b8bcb823525 SHA1 31b831b79ea3944a52d0ca9fd45891c73170c758 SHA256 c51b29f3c6191ac6259db52f56050a34872f07a78463a1ac1e4fbaf89d2f81d8
 AUX splashutils-1.5.4.3-makefile.patch 1257 RMD160 1fb565cb543efe438f5c47cf490aa3cffe07d559 SHA1 011baf9ea9c1313edb3045dc7a52c28d3b84c83e SHA256 6ca31fc77f75bda368642da7effbaa0fd3c69bce86c9e04bfe55b9ab4d259cf3
 AUX splashutils-1.5.4.3-openrc-umount-fix.patch 1152 RMD160 a5acc1c648ca41d1aabe823c6e44aad53a1bc965 SHA1 98c6233e367a54e137ef1637725924a8a2d32871 SHA256 56f48bd31c0d405abbb2d320c131f109fcf6ee7a2ef5bed00b024dd872ef31ea
+AUX splashutils-1.5.4.3-splash_geninitramfs.patch 606 RMD160 cf5b1cb43bb39acf40b761bba700a742930e91b9 SHA1 c5844ce733f3da949f12ab0cd6dc5786dba5c7e4 SHA256 9fe2d8c232a58089e902af3aebeba569669310fc1219da5d2c8775d4e10929ca
 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.5.tar.bz2 1279861 RMD160 2a97cb1c3d93572c094d5d2890d12445ef2786d4 SHA1 45695d44c74be31944d807526a7e69a818e4afd2 SHA256 1b357a3a1106c78c80dfd25e3854c3faa9a3dfc7063a4a1e5404e70c241d677e
@@ -13,6 +17,13 @@ DIST splashutils-lite-1.5.4.2.tar.bz2 421894 RMD160 defb12e3cedccbfd3f3ebdf75305
 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.2.ebuild 6926 RMD160 7c9c5f33b3ce97998538be7ac579eff45cbd2f6b SHA1 83c80e9f98e826fbd3cc8e5f905d8635608ddadb SHA256 775f0e476693d3725aaa764193094668e1c022cf0fc8ed199d7f804bb618cdcd
-EBUILD splashutils-1.5.4.3.ebuild 7334 RMD160 085794d0a32edf6a5c258b18079216a6e9045f3f SHA1 40143c3c3d8d1e0ddb64f6411de90b91296265f6 SHA256 2aa9d21e13b83847115034651e1d182f662d1dbf4c91829a4776208304ee2904
-MISC ChangeLog 29566 RMD160 4d3abcdfd7ef11c93cd0d76bb193cf7ba59d11ba SHA1 02bea5774a6f02591f834dfa4533705f2862c4ae SHA256 77f533c480698a45ef3e9ea5614c8c568608c4b08c732f8edb9d325b73856764
+EBUILD splashutils-1.5.4.3.ebuild 7402 RMD160 15a791f9f42e62cf1b7e1e7f6a7f77c0f3893fb9 SHA1 b3c0ba87b68645915d9fab8dd8c8862f09fddc2b SHA256 c0997b7f0df319fd1498c5ce5cc94b2f983d012d45b30cf6e62354d693d3dab6
+MISC ChangeLog 29782 RMD160 44714952f493485b9c4125f8ff8a73fbe175b5db SHA1 136c8536cbc8448273778acc6254d8ade7911db0 SHA256 d6ab932b67086303b9cf4c499afa8da79225e2115dce8cdcf68a9483d1347d4c
 MISC metadata.xml 311 RMD160 77b41213be37a5c0c7d5822d480ae11acc1af542 SHA1 34dbe221785f338326999be3fdabc0a29df8cf31 SHA256 d548d0cef598c99abeeba18f5308fe482651ebea18746195d86e53ba334f3392
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoIhxQACgkQchej4aZK9/cPQQCfaiHftXQd8e82+ZS1yvw13sZL
+fqUAn1KjshCDctMMVxQrFyOYwrP+ILAc
+=jiH8
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/files/splashutils-1.5.4.3-splash_geninitramfs.patch b/media-gfx/splashutils/files/splashutils-1.5.4.3-splash_geninitramfs.patch
new file mode 100644
index 000000000000..c7e0cd26bc4e
--- /dev/null
+++ b/media-gfx/splashutils/files/splashutils-1.5.4.3-splash_geninitramfs.patch
@@ -0,0 +1,13 @@
+diff --git a/core/scripts/splash_geninitramfs.in b/core/scripts/splash_geninitramfs.in
+index 9d75d21..ff9b75b 100644
+--- a/core/scripts/splash_geninitramfs.in
++++ b/core/scripts/splash_geninitramfs.in
+@@ -149,7 +149,7 @@ if [ "$mode" == "a" ]; then
+ fi
+ 
+ printv "o Creating directory structure.."
+-mkdir -p ${imgdir}/{dev,dev/fb,dev/misc,dev/vc,$themedir,lib/splash/proc,root,sbin,lib/splash/sys}
++mkdir -p ${imgdir}/{dev,dev/fb,dev/misc,dev/vc,$themedir,@libdir@/splash/proc,root,sbin,@libdir@/splash/sys}
+ 
+ if [ $EUID == 0 ]; then
+ 	[[ ! -e "${imgdir}/dev/null" ]] 	&& mknod "${imgdir}/dev/null" c 1 3
diff --git a/media-gfx/splashutils/splashutils-1.5.4.3.ebuild b/media-gfx/splashutils/splashutils-1.5.4.3.ebuild
index 71b2924e2b1f..023aee24c847 100644
--- a/media-gfx/splashutils/splashutils-1.5.4.3.ebuild
+++ b/media-gfx/splashutils/splashutils-1.5.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.ebuild,v 1.10 2009/04/12 17:50:42 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.3.ebuild,v 1.11 2009/05/11 20:14:15 spock Exp $
 
 EAPI="1"
 
@@ -85,6 +85,7 @@ src_unpack() {
 	fi
 
 	epatch "${FILESDIR}"/splashutils-1.5.4.3-makefile.patch
+	epatch "${FILESDIR}"/splashutils-1.5.4.3-splash_geninitramfs.patch
 
 	cd "${SG}"
 	if has_version ">=sys-apps/openrc-0.4.0"; then