From 23c5c6af71555985d38381b12cbaae6c132e4505 Mon Sep 17 00:00:00 2001 From: Michael Januszewski Date: Sat, 27 Jan 2007 15:40:40 +0000 Subject: [PATCH] Fix bug #163552. Package-Manager: portage-2.1.2-r4 --- media-gfx/splashutils/ChangeLog | 9 ++- media-gfx/splashutils/Manifest | 34 ++++++---- .../files/splashutils-1.3-initrd-chvt.patch | 68 +++++++++++++++++++ .../splashutils/splashutils-1.3-r2.ebuild | 9 ++- .../splashutils/splashutils-1.3-r3.ebuild | 9 ++- 5 files changed, 106 insertions(+), 23 deletions(-) create mode 100644 media-gfx/splashutils/files/splashutils-1.3-initrd-chvt.patch diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog index 3b41380b7a13..3c8c50e1afdb 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.70 2006/11/26 17:31:52 spock Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.71 2007/01/27 15:40:40 spock Exp $ + + 27 Jan 2007; Michał Januszewski + +files/splashutils-1.3-initrd-chvt.patch, splashutils-1.3-r2.ebuild, + splashutils-1.3-r3.ebuild: + Fix bug #163552. 26 Nov 2006; Michał Januszewski splashutils-1.3-r3.ebuild: diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest index a378de3492d8..85353fd99890 100644 --- a/media-gfx/splashutils/Manifest +++ b/media-gfx/splashutils/Manifest @@ -13,6 +13,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-initrd-chvt.patch 1780 RMD160 e71e8f5102ed7f5e00e3ca2b6e92a7fcbb840920 SHA1 9a813e192c03d6d041551efbf9fe0b68b094849b SHA256 bf86846bc90c2184b7d4fc02a85b9d909313036d9480859478b181f878f32c35 +MD5 18a70173c33159b9cac048486be50c8e files/splashutils-1.3-initrd-chvt.patch 1780 +RMD160 e71e8f5102ed7f5e00e3ca2b6e92a7fcbb840920 files/splashutils-1.3-initrd-chvt.patch 1780 +SHA256 bf86846bc90c2184b7d4fc02a85b9d909313036d9480859478b181f878f32c35 files/splashutils-1.3-initrd-chvt.patch 1780 AUX splashutils-1.3-r2-fbsplash.patch 412 RMD160 99458341f19af11f0c7782d46dbbde68c37dc802 SHA1 0b0603a7f471af2c9e6ebd478d50982c3bf39046 SHA256 ed4e3498daf3d6505e11c9b0b05b89aea2727dfa720f7573a25e4fd37c98b419 MD5 b20b7397cc53750256712a2732601843 files/splashutils-1.3-r2-fbsplash.patch 412 RMD160 99458341f19af11f0c7782d46dbbde68c37dc802 files/splashutils-1.3-r2-fbsplash.patch 412 @@ -48,18 +52,18 @@ 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-r2.ebuild 6987 RMD160 aa8562712252620bacbb71044e3866d0ca2636f6 SHA1 1fd4a10b82e52983361a21357621a05aff2e033e SHA256 d16c69bc5dbb8eed0ba61ae08376e65a365527aad6854919786be88810742779 -MD5 75f58b5a0dcc874defc4d5e05a3c4cf2 splashutils-1.3-r2.ebuild 6987 -RMD160 aa8562712252620bacbb71044e3866d0ca2636f6 splashutils-1.3-r2.ebuild 6987 -SHA256 d16c69bc5dbb8eed0ba61ae08376e65a365527aad6854919786be88810742779 splashutils-1.3-r2.ebuild 6987 -EBUILD splashutils-1.3-r3.ebuild 7102 RMD160 c6a3fe82db8744a9bd89321e7ac15c580f4b4173 SHA1 d39d5680fe4ec6ced103baff87995718b78c841b SHA256 c5e72370a054e726d9821afe712da4652520d528a28c5be7f5b84772b3a012ba -MD5 683f7b989112132389cd4860a104652c splashutils-1.3-r3.ebuild 7102 -RMD160 c6a3fe82db8744a9bd89321e7ac15c580f4b4173 splashutils-1.3-r3.ebuild 7102 -SHA256 c5e72370a054e726d9821afe712da4652520d528a28c5be7f5b84772b3a012ba splashutils-1.3-r3.ebuild 7102 -MISC ChangeLog 14708 RMD160 8cf64c37511f26e5993d1847f98c05a4779dc24e SHA1 719806a8ac279dfa6f272960c8b75116c827542e SHA256 6d07db73bfba723915e97741f5455848b5c9792c998667f575e9db7a4f9c316e -MD5 94e64aa08688f74e75c560982b1a63ec ChangeLog 14708 -RMD160 8cf64c37511f26e5993d1847f98c05a4779dc24e ChangeLog 14708 -SHA256 6d07db73bfba723915e97741f5455848b5c9792c998667f575e9db7a4f9c316e ChangeLog 14708 +EBUILD splashutils-1.3-r2.ebuild 7052 RMD160 fcf1f3592832e067cbda0036273d0efb3c662807 SHA1 84937122bd339e20375e364f4a844d6c5f822307 SHA256 471af753cb1335fa1769f7efbdbb3a75f3183d3735ac68e243b78275d9391f5c +MD5 ce0c9757df1f44b2536ba080afcf74a2 splashutils-1.3-r2.ebuild 7052 +RMD160 fcf1f3592832e067cbda0036273d0efb3c662807 splashutils-1.3-r2.ebuild 7052 +SHA256 471af753cb1335fa1769f7efbdbb3a75f3183d3735ac68e243b78275d9391f5c splashutils-1.3-r2.ebuild 7052 +EBUILD splashutils-1.3-r3.ebuild 7167 RMD160 db1eeda993d9f5b1e5b4f0436c6d18a80c538691 SHA1 a37e0454994d71522772fd669dc99b63aa83905a SHA256 e4d701a6eb8eba4582ff3a3fd1eb09767c5d57f0527eebe15b917fd3ba5e9947 +MD5 0ea144780a3b1d31dc2f39f78ecdb773 splashutils-1.3-r3.ebuild 7167 +RMD160 db1eeda993d9f5b1e5b4f0436c6d18a80c538691 splashutils-1.3-r3.ebuild 7167 +SHA256 e4d701a6eb8eba4582ff3a3fd1eb09767c5d57f0527eebe15b917fd3ba5e9947 splashutils-1.3-r3.ebuild 7167 +MISC ChangeLog 14882 RMD160 c2187a6e8d950c692e1316113d53633681e6b5f4 SHA1 c8baff4e4b4c7ed30698a496c887163e210097b1 SHA256 83e832f9939c6a4a9dae0019138878eeb8d83733f40aa60b3a87bfc082fabac5 +MD5 36043ad0f429169303fee163b4f650e3 ChangeLog 14882 +RMD160 c2187a6e8d950c692e1316113d53633681e6b5f4 ChangeLog 14882 +SHA256 83e832f9939c6a4a9dae0019138878eeb8d83733f40aa60b3a87bfc082fabac5 ChangeLog 14882 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d MD5 87131e5c56922624f8a0c7fe61cd28da metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 metadata.xml 220 @@ -79,7 +83,7 @@ SHA256 033b154e5cba7f58d9cce3d213a3b1f229e3750c78526e26cd04d9a5fac383a4 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFqWMbchej4aZK9/cRAnj1AJ9OJ6PUmYDnZV7krg0NAtfxhvK0FQCdH7nd -K9+xdba2KkV3PmRchgF9744= -=RCb9 +iD8DBQFFu3Kdchej4aZK9/cRArxIAJ9pwDALX2L6GQ+nSRTGiveG9V4uiwCfUHXo +KBfatIErMPTpYG48vl4XbUQ= +=stbI -----END PGP SIGNATURE----- diff --git a/media-gfx/splashutils/files/splashutils-1.3-initrd-chvt.patch b/media-gfx/splashutils/files/splashutils-1.3-initrd-chvt.patch new file mode 100644 index 000000000000..71220ea2e602 --- /dev/null +++ b/media-gfx/splashutils/files/splashutils-1.3-initrd-chvt.patch @@ -0,0 +1,68 @@ +diff --git a/gentoo/initrd.splash b/gentoo/initrd.splash +index 5871ba6..e16cba4 100644 +--- a/gentoo/initrd.splash ++++ b/gentoo/initrd.splash +@@ -7,23 +7,23 @@ + # This file is a part of splashutils. + # + # NOTE: The code here has to be compatible with ash and with the busybox +-# versions of all the standard system utilities. That means: no ++# versions of all the standard system utilities. That means: no + # extended regular expressions, no pattern substitution in variables, + # and no fancy GNU command line options. + + splash() { + local cmd="$1" + splash_setup +- ++ + [ ! -x /sbin/splash_helper ] && return + [ "${SPLASH_MODE_REQ}" != 'silent' ] && return + + case "${cmd}" in + set_msg) +- export BOOT_MSG="$2" ++ export BOOT_MSG="$2" + /sbin/splash_helper 2 'repaint' + ;; +- init) ++ init) + if [ -n "$2" ]; then + export BOOT_MSG="$2" + elif [ "${CDROOT}" -eq '1' ]; then +@@ -34,19 +34,23 @@ splash() { + /sbin/splash_helper 2 'repaint' + ;; + verbose) +- /bin/chvt 1 ++ if [ -x /bin/chvt ]; then ++ /bin/chvt 1 ++ elif [ -x /bin/busybox ]; then ++ /bin/busybox chvt 1 ++ fi + echo "verbose" + ;; + esac + } + + splash_setup() { +- # If it's already set up, let's not waste time on parsing the config ++ # If it's already set up, let's not waste time on parsing the config + # files again + if [ "${SPLASH_THEME}" != '' -a "${SPLASH_TTY}" != '' -a "$1" != 'force' ]; then + return 0 + fi +- ++ + export SPLASH_MODE_REQ="off" + export SPLASH_THEME="default" + export SPLASH_TTY="16" +@@ -54,7 +58,7 @@ splash_setup() { + + if [ -f /proc/cmdline ]; then + options=$(sed -e 's/.*splash=\([^ ]*\).*/\1/' -e 's/,/ /g' /proc/cmdline) +- ++ + for i in ${options} ; do + case ${i%:*} in + theme) SPLASH_THEME=${i#*:} ;; diff --git a/media-gfx/splashutils/splashutils-1.3-r2.ebuild b/media-gfx/splashutils/splashutils-1.3-r2.ebuild index 3efcbfe069aa..5aef54de0ef4 100644 --- a/media-gfx/splashutils/splashutils-1.3-r2.ebuild +++ b/media-gfx/splashutils/splashutils-1.3-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.3-r2.ebuild,v 1.5 2007/01/13 22:54:04 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.3-r2.ebuild,v 1.6 2007/01/27 15:40:40 spock Exp $ inherit eutils multilib toolchain-funcs @@ -63,8 +63,11 @@ src_unpack() { # is being configured. Either that, or we end up with a segfaulting kernel # helper. rm ${S}/libs/zlib-${V_ZLIB}/Makefile - cd ${S} + cd ${SG} + epatch ${FILESDIR}/splashutils-1.3-initrd-chvt.patch + + cd ${S} epatch ${FILESDIR}/splashutils-1.3-r2.patch epatch ${FILESDIR}/splashutils-1.3-r2-fbsplash.patch diff --git a/media-gfx/splashutils/splashutils-1.3-r3.ebuild b/media-gfx/splashutils/splashutils-1.3-r3.ebuild index 8d3aa1bf9ea1..f6049ab45082 100644 --- a/media-gfx/splashutils/splashutils-1.3-r3.ebuild +++ b/media-gfx/splashutils/splashutils-1.3-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.3-r3.ebuild,v 1.3 2006/11/26 17:34:49 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.3-r3.ebuild,v 1.4 2007/01/27 15:40:40 spock Exp $ inherit eutils multilib toolchain-funcs @@ -63,8 +63,11 @@ src_unpack() { # is being configured. Either that, or we end up with a segfaulting kernel # helper. rm ${S}/libs/zlib-${V_ZLIB}/Makefile - cd ${S} + cd ${SG} + epatch ${FILESDIR}/splashutils-1.3-initrd-chvt.patch + + cd ${S} epatch ${FILESDIR}/splashutils-1.3-r2.patch epatch ${FILESDIR}/splashutils-1.3-r2-fbsplash.patch -- 2.26.2