Fix bug #173830.

Package-Manager: portage-2.1.2.3

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 0e86276499554c84fba7934eeed75e367c1c9918..a8323fbb4db2ae4781e668da8bb52ba1b9cbc5df 100644 (file)
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,11 @@
 # 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.80 2007/04/06 09:02:01 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.81 2007/04/09 11:11:48 spock Exp $
+
+  09 Apr 2007; Michał Januszewski <spock@gentoo.org>
+  +files/splashutils-gentoo-0.1.14-stat.patch,
+  splashutils-1.1.9.10-r1.ebuild:
+  Fix bug #173830.
 
   06 Apr 2007; Michał Januszewski <spock@gentoo.org>
   +files/splashutils-1.4-remove-debug-msgs.patch, splashutils-1.4.ebuild:

diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index dc46597173bf39d6ac0941bd5a061b6a8e00fe0b..da3edaac533e160be5974020d0494d0b8d3ec3d3 100644 (file)
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -49,6 +49,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.1.14-stat.patch 1347 RMD160 0d0f54c8b636df771a4e48f8a1d01fabb2d7703c SHA1 d2f29244d7f360816355e73e697b93bd8c5b1c19 SHA256 7818956d0829196699eb8ed538720065e34e9ecfd01b5994830f289c7423768b
+MD5 5cc018b179c4ed31a3f3bce766646763 files/splashutils-gentoo-0.1.14-stat.patch 1347
+RMD160 0d0f54c8b636df771a4e48f8a1d01fabb2d7703c files/splashutils-gentoo-0.1.14-stat.patch 1347
+SHA256 7818956d0829196699eb8ed538720065e34e9ecfd01b5994830f289c7423768b files/splashutils-gentoo-0.1.14-stat.patch 1347
 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
@@ -72,10 +76,10 @@ DIST splashutils-lite-1.3.tar.bz2 61079 RMD160 4d5296ed0b2a7a7783cfe5f9f25b53fa5
 DIST splashutils-lite-1.4.tar.bz2 66484 RMD160 a4348f47a64f3e04121c4589e45f4122fd3da08d SHA1 61be0d4df3b7727d16721ee0937d9b291c3a2413 SHA256 dac6706df0415c05a799540ac38ab9b6bb20980e66414f271820d3af4a4ed3e3
 DIST zlib-1.2.1.tar.bz2 284152 RMD160 aca88eb02d90b91c732f351e1b7efd4ce409ee25 SHA1 13bd164df955911c25342adfad805c1cad5e398e SHA256 9ea4bd04487e05254d05cebde539b3855af2899658e2da84487e86f7f400e0e1
 DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
-EBUILD splashutils-1.1.9.10-r1.ebuild 6864 RMD160 123a3c1b3789a5d90d461811e3589a356c5c81b9 SHA1 10d82a4d88d2bbd7683a700009769a30a6a8cbf3 SHA256 4be9e32911aa265931a061ebb0767e26fcb0ee752464140f2e7797f712820784
-MD5 8666dcdb6e527b71f6cbdb2624160193 splashutils-1.1.9.10-r1.ebuild 6864
-RMD160 123a3c1b3789a5d90d461811e3589a356c5c81b9 splashutils-1.1.9.10-r1.ebuild 6864
-SHA256 4be9e32911aa265931a061ebb0767e26fcb0ee752464140f2e7797f712820784 splashutils-1.1.9.10-r1.ebuild 6864
+EBUILD splashutils-1.1.9.10-r1.ebuild 6921 RMD160 ed8ac4cb70af7525e15066aa5408c319e3389940 SHA1 c0b14a845145ba17d04e25b526a9ca609d19c09a SHA256 3932adb7d7471e92949d6fec72406c1f941b8af42180ed7d103635cfb612af5f
+MD5 ecc4bd9fb85e90f61fd67d9624de1fba splashutils-1.1.9.10-r1.ebuild 6921
+RMD160 ed8ac4cb70af7525e15066aa5408c319e3389940 splashutils-1.1.9.10-r1.ebuild 6921
+SHA256 3932adb7d7471e92949d6fec72406c1f941b8af42180ed7d103635cfb612af5f splashutils-1.1.9.10-r1.ebuild 6921
 EBUILD splashutils-1.1.9.8-r1.ebuild 6450 RMD160 ee8219564a3b039de20831eb52cb44d70fd8df87 SHA1 8cd9ff8737d7f40c2ffd7cde62c6b37df887539c SHA256 05085409393be9b3561dfa05fcbac6fea86bb2aaf1c82b0b11b31ba9ab8a590b
 MD5 e79713db9ac0cc2a97fcabab4fe83275 splashutils-1.1.9.8-r1.ebuild 6450
 RMD160 ee8219564a3b039de20831eb52cb44d70fd8df87 splashutils-1.1.9.8-r1.ebuild 6450
@@ -96,10 +100,10 @@ EBUILD splashutils-1.4.ebuild 6539 RMD160 c20df54bddc39e5b3136312617c681bd0949dd
 MD5 0d0ecd3ad699f122420bb8abc7213b13 splashutils-1.4.ebuild 6539
 RMD160 c20df54bddc39e5b3136312617c681bd0949dd2b splashutils-1.4.ebuild 6539
 SHA256 a081bc05df5d4980be28537afd1acbd3f04c96552b49d441153a654a3de29337 splashutils-1.4.ebuild 6539
-MISC ChangeLog 16450 RMD160 68ca8642cdd7f476ffd8dfdfc3de0d3748d253ad SHA1 539054c8a4b313d4ac47b587788a449c38675890 SHA256 982d3584bfa1d763e963a893d296e675bb810fa7922c61676068ca97ef970c35
-MD5 ccd8589697ced707107af1d54259d495 ChangeLog 16450
-RMD160 68ca8642cdd7f476ffd8dfdfc3de0d3748d253ad ChangeLog 16450
-SHA256 982d3584bfa1d763e963a893d296e675bb810fa7922c61676068ca97ef970c35 ChangeLog 16450
+MISC ChangeLog 16605 RMD160 cb992f0418bf957b49aa048bb4099cf4a9ef5076 SHA1 35631986663ed0cff13dc2654fec5ebde42062fa SHA256 82f785ba45846f73e6612bd330d9197c7c781643e7b18c866a8c0d18d182fff9
+MD5 206cbac9c4c2899a8c8d5b5fe0b3a501 ChangeLog 16605
+RMD160 cb992f0418bf957b49aa048bb4099cf4a9ef5076 ChangeLog 16605
+SHA256 82f785ba45846f73e6612bd330d9197c7c781643e7b18c866a8c0d18d182fff9 ChangeLog 16605
 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 MD5 87131e5c56922624f8a0c7fe61cd28da metadata.xml 220
 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 metadata.xml 220
@@ -125,7 +129,7 @@ SHA256 08f814d0b8340fbda15e2cbfeac683314c4c0e8376776da2f98c495b8613c7f3 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGFgygchej4aZK9/cRArLRAJ4kcEZexRaoP5qQMQAj/U99uCZJewCfQwCV
-otk3zaPRgizXFzxJ4jLtMy8=
-=az0D
+iD8DBQFGGh96chej4aZK9/cRAgSbAJ0df7tGtEUhlV4PoOxAVwaC6ufB1gCdHa6C
+xe5T07pcOnLYOd/YO/JqPqQ=
+=B2+Q
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/splashutils/files/splashutils-gentoo-0.1.14-stat.patch b/media-gfx/splashutils/files/splashutils-gentoo-0.1.14-stat.patch
new file mode 100644 (file)
index 0000000..6e8ef66
--- /dev/null
+++ b/media-gfx/splashutils/files/splashutils-gentoo-0.1.14-stat.patch
@@ -0,0 +1,23 @@
+diff -Naurp splashutils-gentoo-0.1.14-orig/splash-functions.sh splashutils-gentoo-0.1.14/splash-functions.sh
+--- splashutils-gentoo-0.1.14-orig/splash-functions.sh 2007-04-09 12:45:01.000000000 +0200
++++ splashutils-gentoo-0.1.14/splash-functions.sh      2007-04-09 12:46:32.000000000 +0200
+@@ -207,7 +207,7 @@ splash_cache_prep() {
+ 
+       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
+       spl_cache_depscan="yes" /sbin/depscan.sh -u
+@@ -226,8 +226,8 @@ splash_cache_prep() {
+                       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

diff --git a/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild b/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild
index 4d4af9214662fac447c6f998e43e850b094819f0..d23dadbad1af6e1e4dd788e8831528839bdf406e 100644 (file)
--- a/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild
+++ b/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.9.10-r1.ebuild,v 1.8 2007/02/10 14:23:37 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.1.9.10-r1.ebuild,v 1.9 2007/04/09 11:11:48 spock Exp $
 
 inherit eutils multilib linux-mod
 
@@ -84,14 +84,15 @@ src_unpack() {
        # Ensure that we call depscan with --svcdir
        cd "${WORKDIR}/${GENTOOSPLASH}"
        epatch "${FILESDIR}/splashutils-depscan.patch"
+       epatch ${FILESDIR}/splashutils-gentoo-0.1.14-stat.patch
 
        mv ${WORKDIR}/{libpng-${V_PNG},jpeg-${V_JPEG},zlib-${V_ZLIB},freetype-${V_FT}} ${S}/libs
        # We need to delete the Makefile and let it be rebuilt when splashutils
        # is being configured. Either that, or we end up with a segfaulting kernel
        # helper.
        rm ${S}/libs/zlib-${V_ZLIB}/Makefile
-       cd ${S}
 
+       cd ${S}
        epatch ${FILESDIR}/${P}-ppc-2.6.14.patch
        epatch ${FILESDIR}/${P}-makefile.patch
        epatch ${FILESDIR}/${P}-2.6.18-vt-fix.patch