Update the old-baselayout patch so that /usr/bin/stat is not used during boot.

Package-Manager: portage-2.1.2.2

3 files changed, 21 insertions, 17 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index d646e7be1def..6c7d2c4ed2fd 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.77 2007/03/15 13:27:28 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.78 2007/03/21 20:00:33 spock Exp $
+
+  21 Mar 2007; Michał Januszewski <spock@gentoo.org>
+  files/splashutils-gentoo-0.5.4-old-baselayout.patch:
+  Update the old-baselayout patch so that /usr/bin/stat is not used during boot.
 
   15 Mar 2007; Michał Januszewski <spock@gentoo.org>
   +files/splashutils-1.3.1-cachedir.patch, splashutils-1.3.1.ebuild:
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 6d83ea213212..42ed21cd2381 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -45,10 +45,10 @@ AUX splashutils-depscan.patch 2197 RMD160 044f771f4d971abc177a1da9563cba76bc101d
 MD5 d78ee27cab85b59044d8ef3e7e5be4af files/splashutils-depscan.patch 2197
 RMD160 044f771f4d971abc177a1da9563cba76bc101d71 files/splashutils-depscan.patch 2197
 SHA256 ea06dec56d412a30abe7da31ab3485ab9748cf58740aa1f08b128b0b5e1e6df9 files/splashutils-depscan.patch 2197
-AUX splashutils-gentoo-0.5.4-old-baselayout.patch 7139 RMD160 d82215a21b7fb8b723fe1511656e33a605d85d0f SHA1 781254eb66aca9458e21414675cec004e6b6043e SHA256 90a5d6ba57cfc696d07e22546ebaf3ba7e568dd03ab650bbe1744ec9e77ca337
-MD5 e873a94f512f1248b331b2cbb91bbb1b files/splashutils-gentoo-0.5.4-old-baselayout.patch 7139
-RMD160 d82215a21b7fb8b723fe1511656e33a605d85d0f files/splashutils-gentoo-0.5.4-old-baselayout.patch 7139
-SHA256 90a5d6ba57cfc696d07e22546ebaf3ba7e568dd03ab650bbe1744ec9e77ca337 files/splashutils-gentoo-0.5.4-old-baselayout.patch 7139
+AUX splashutils-gentoo-0.5.4-old-baselayout.patch 7243 RMD160 90d4c7cc45eaec8633e4d1421cd5e533d41a37f6 SHA1 0aa356dd7471a0bbf82936950d467c93dbcefb7a SHA256 5afb706bbcdaf430348140ae4ad619569a0986d60550e4f2b3c4a5948e8de375
+MD5 0a87d99a17fc34a9c184170132c9bbb2 files/splashutils-gentoo-0.5.4-old-baselayout.patch 7243
+RMD160 90d4c7cc45eaec8633e4d1421cd5e533d41a37f6 files/splashutils-gentoo-0.5.4-old-baselayout.patch 7243
+SHA256 5afb706bbcdaf430348140ae4ad619569a0986d60550e4f2b3c4a5948e8de375 files/splashutils-gentoo-0.5.4-old-baselayout.patch 7243
 DIST freetype-2.1.9.tar.bz2 992394 RMD160 1dd8fb6fda8b159ef0d2ebedeca99a67ed65dc72 SHA1 a3c3a0c0d5f8f6e62c774e24817748a941016990 SHA256 4dabc3b38405f5c5f03b8f14d8902a9d506713182baf2baec9dea509515d4b6f
 DIST jpegsrc.v6b.tar.gz 613261 RMD160 18892206014fbb8cae2a44e281f4ed53feaf7882 SHA1 7079f0d6c42fad0cfba382cf6ad322add1ace8f9 SHA256 75c3ec241e9996504fe02a9ed4d12f16b74ade713972f3db9e65ce95cd27e35d
 DIST klibc-1.0.8.tar.bz2 446138 RMD160 006511b5178fc32cebd801ee399cc792b545418c SHA1 74d51df90912e5997adb17e7169222d358dbc837 SHA256 3d39bb503e2fc0ac9782edd235e06015bd4f14fe8bd4318042b208f3a9ce529a
@@ -86,10 +86,10 @@ EBUILD splashutils-1.3.1.ebuild 7143 RMD160 c08055b999d7ebfa1cfd8cf52cbe58e75012
 MD5 2a52e2d99fbe524cfce0230cb85ff605 splashutils-1.3.1.ebuild 7143
 RMD160 c08055b999d7ebfa1cfd8cf52cbe58e750126798 splashutils-1.3.1.ebuild 7143
 SHA256 25745d5dad1162bf4ff55229c478c9ce83515b5dc2448204c92bc294d2c92a3e splashutils-1.3.1.ebuild 7143
-MISC ChangeLog 15951 RMD160 4267790d2798b7b1710451cc25e23086a0123eb9 SHA1 a190dac25b582b93ccaa8c34710bfd286dbf30a5 SHA256 8cd9ad0a9ed6f42202f840ac858eb6ea151b09374253877fc4630c4c53eb8491
-MD5 b8551239c00135c0090948a7571043da ChangeLog 15951
-RMD160 4267790d2798b7b1710451cc25e23086a0123eb9 ChangeLog 15951
-SHA256 8cd9ad0a9ed6f42202f840ac858eb6ea151b09374253877fc4630c4c53eb8491 ChangeLog 15951
+MISC ChangeLog 16142 RMD160 ed18e81ca05d0e3cdee38da1c5fb3d442fc6b230 SHA1 85e98c5cc1e15d3cc5a33e420bfe6affe4251a59 SHA256 e47c82d878b823cd986c73932047f8979b8b3e304cbd335536e73c16980cc6d0
+MD5 6a4e146281e48de75e668f6d6103acea ChangeLog 16142
+RMD160 ed18e81ca05d0e3cdee38da1c5fb3d442fc6b230 ChangeLog 16142
+SHA256 e47c82d878b823cd986c73932047f8979b8b3e304cbd335536e73c16980cc6d0 ChangeLog 16142
 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 MD5 87131e5c56922624f8a0c7fe61cd28da metadata.xml 220
 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 metadata.xml 220
@@ -112,7 +112,7 @@ SHA256 20dc274189e8c25ee3bf459573da4a263e9ada3eedbe816283c53c28f200e0c7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF+UnNchej4aZK9/cRArgfAJ0fl3f7eEdIqS+I9mys8r0BK4HjKwCeNUBj
-m/jaHbxSAUTei2ycnzvFyCU=
-=zkpV
+iD8DBQFGAY7qchej4aZK9/cRAsPtAJ9wmLLztwHaSmebEZkELYrzN+pnJACfVWUj
+FXLjo4hMtmNJXbLMmIgtW/0=
+=ppI0
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/files/splashutils-gentoo-0.5.4-old-baselayout.patch b/media-gfx/splashutils/files/splashutils-gentoo-0.5.4-old-baselayout.patch
index 02fed04fa279..252dab890c15 100644
--- a/media-gfx/splashutils/files/splashutils-gentoo-0.5.4-old-baselayout.patch
+++ b/media-gfx/splashutils/files/splashutils-gentoo-0.5.4-old-baselayout.patch
@@ -1,6 +1,6 @@
 diff -Naurp splashutils-gentoo-0.5.4-orig/splash-functions.sh splashutils-gentoo-0.5.4/splash-functions.sh
---- splashutils-gentoo-0.5.4-orig/splash-functions.sh	2007-03-13 14:24:42.000000000 +0100
-+++ splashutils-gentoo-0.5.4/splash-functions.sh	2007-03-13 14:30:14.000000000 +0100
+--- splashutils-gentoo-0.5.4-orig/splash-functions.sh	2007-03-21 20:51:46.000000000 +0100
++++ splashutils-gentoo-0.5.4/splash-functions.sh	2007-03-21 20:53:37.000000000 +0100
 @@ -489,10 +489,39 @@ splash_cache_prep() {
  		return "${retval}"
  	fi
@@ -13,7 +13,7 @@ diff -Naurp splashutils-gentoo-0.5.4-orig/splash-functions.sh splashutils-gentoo
 +	# Now that the data from the old cache is copied, move tmpdir to cachedir.
  	mount -n --move "${spl_tmpdir}" "${spl_cachedir}"
  
-+	h=$(stat -c '%y' ${spl_cachedir}/deptree 2>/dev/null)
++	h=$(ls -ld --full-time ${spl_cachedir}/deptree | cut -f6,7,8 -d' ' 2>/dev/null)
 +
 +	# Point depscan.sh to our cachedir
 +	/sbin/depscan.sh --svcdir "${spl_cachedir}"
@@ -33,8 +33,8 @@ diff -Naurp splashutils-gentoo-0.5.4-orig/splash-functions.sh splashutils-gentoo
 +			local lastlev timestamp
 +			{ read lastlev; read timestamp; } < ${spl_cachedir}/levels
 +			if [[ "${lastlev}" != "${BOOTLEVEL}/${DEFAULTLEVEL}" || \
-+				  "${timestamp}" != "$(stat -c '%y' /etc/runlevels/${BOOTLEVEL})/$(stat -c '%y' /etc/runlevels/${DEFAULTLEVEL})" || \
-+				  "$(stat -c '%y' ${spl_cachedir}/deptree)" != "${h}" ]]; then
++				  "${timestamp}" != "$(ls -ld --full-time /etc/runlevels/${BOOTLEVEL} | cut -f6,7,8 -d' ')/$(ls -ld --full-time /etc/runlevels/${DEFAULTLEVEL} | cut -f6,7,8 -d' ')" || \
++				  "$(ls -ld --full-time ${spl_cachedir}/deptree | cut -f6,7,8 -d' ')" != "${h}" ]]; then
 +				echo $(splash_svclist_update "start") > ${spl_cachedir}/svcs_start
 +			fi
 +		fi