Add support for baselayout 1.13.0.

Package-Manager: portage-2.1.2.2

4 files changed, 47 insertions, 14 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index 294e34ffa3c6..d646e7be1def 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.76 2007/03/14 23:02:25 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.77 2007/03/15 13:27:28 spock Exp $
+
+  15 Mar 2007; Michał Januszewski <spock@gentoo.org>
+  +files/splashutils-1.3.1-cachedir.patch, splashutils-1.3.1.ebuild:
+  Add support for baselayout 1.13.0.
 
   14 Mar 2007; Michał Januszewski <spock@gentoo.org>
   +files/splashutils-1.3.1-boot_message-fix.patch, splashutils-1.3.1.ebuild:
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 5c4beb5dd51c..6d83ea213212 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -37,6 +37,10 @@ AUX splashutils-1.3.1-boot_msg.patch 732 RMD160 286014c8892b7b72adfec00f61a1b1f8
 MD5 c9394fe1e181acf24303e0baa1d97fcf files/splashutils-1.3.1-boot_msg.patch 732
 RMD160 286014c8892b7b72adfec00f61a1b1f8cbabf887 files/splashutils-1.3.1-boot_msg.patch 732
 SHA256 d5821315a98e6ed5c9fe6bab47d26114b0714dfba0159a0bdbb29dd47e47b70b files/splashutils-1.3.1-boot_msg.patch 732
+AUX splashutils-1.3.1-cachedir.patch 746 RMD160 8d509f0bcb2baae9683a7e15ea4d1b1ce3dfdfaf SHA1 85990ba0d370b39e92dc31a1d5737333b78f16c2 SHA256 da84d2580bbc616f6a24159d7ece32bd2d90351a631f78f4219bfcfdc1510266
+MD5 d19150ceba17461cf87c403fd685f0c6 files/splashutils-1.3.1-cachedir.patch 746
+RMD160 8d509f0bcb2baae9683a7e15ea4d1b1ce3dfdfaf files/splashutils-1.3.1-cachedir.patch 746
+SHA256 da84d2580bbc616f6a24159d7ece32bd2d90351a631f78f4219bfcfdc1510266 files/splashutils-1.3.1-cachedir.patch 746
 AUX splashutils-depscan.patch 2197 RMD160 044f771f4d971abc177a1da9563cba76bc101d71 SHA1 6e8406a714b71446089b4337f329c9eeeff0465e SHA256 ea06dec56d412a30abe7da31ab3485ab9748cf58740aa1f08b128b0b5e1e6df9
 MD5 d78ee27cab85b59044d8ef3e7e5be4af files/splashutils-depscan.patch 2197
 RMD160 044f771f4d971abc177a1da9563cba76bc101d71 files/splashutils-depscan.patch 2197
@@ -78,14 +82,14 @@ EBUILD splashutils-1.3-r3.ebuild 7153 RMD160 57e8f24564ec6bf98e635111c7354ee7ec2
 MD5 d67227ec2dc3875326716e83d57ee513 splashutils-1.3-r3.ebuild 7153
 RMD160 57e8f24564ec6bf98e635111c7354ee7ec24c270 splashutils-1.3-r3.ebuild 7153
 SHA256 5af03ce2260a32161d71868233f706dec96a8b99c58ba9159f9fa773d48623c1 splashutils-1.3-r3.ebuild 7153
-EBUILD splashutils-1.3.1.ebuild 7027 RMD160 3a70efeb8d1cf3000500849344790294d769badc SHA1 7ea029354f009a1ee2d3d65723cd5390e6647350 SHA256 a9540fa99b2c73f4fd19cfbbe5cd69bc58f2c8c02249faff23dcbbbc5793a147
-MD5 2aee8b0362725938339a6037dfc76b27 splashutils-1.3.1.ebuild 7027
-RMD160 3a70efeb8d1cf3000500849344790294d769badc splashutils-1.3.1.ebuild 7027
-SHA256 a9540fa99b2c73f4fd19cfbbe5cd69bc58f2c8c02249faff23dcbbbc5793a147 splashutils-1.3.1.ebuild 7027
-MISC ChangeLog 15790 RMD160 a938522ce1d1a9813c2757348d17a95e23941d57 SHA1 a35992f0ae7d003fef4cd553705a1acff131dc0d SHA256 419c231efe3c0f186cced33f3e1aac304ef3cfa91af7a7437dc2a1da53114f61
-MD5 9d4879ab6a0d9fc473fa4c182ccfc3a4 ChangeLog 15790
-RMD160 a938522ce1d1a9813c2757348d17a95e23941d57 ChangeLog 15790
-SHA256 419c231efe3c0f186cced33f3e1aac304ef3cfa91af7a7437dc2a1da53114f61 ChangeLog 15790
+EBUILD splashutils-1.3.1.ebuild 7143 RMD160 c08055b999d7ebfa1cfd8cf52cbe58e750126798 SHA1 7e756002441baac6998a25632cf29202a634da68 SHA256 25745d5dad1162bf4ff55229c478c9ce83515b5dc2448204c92bc294d2c92a3e
+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 metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 MD5 87131e5c56922624f8a0c7fe61cd28da metadata.xml 220
 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 metadata.xml 220
@@ -108,7 +112,7 @@ SHA256 20dc274189e8c25ee3bf459573da4a263e9ada3eedbe816283c53c28f200e0c7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF+H8Hchej4aZK9/cRAjUfAJ9v4N4sK24mAeyLn2Zcf5L9tavwAACePD00
-jU8Z8P8CZpFafOdbHQNKkVI=
-=1e/l
+iD8DBQFF+UnNchej4aZK9/cRArgfAJ0fl3f7eEdIqS+I9mys8r0BK4HjKwCeNUBj
+m/jaHbxSAUTei2ycnzvFyCU=
+=zkpV
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/files/splashutils-1.3.1-cachedir.patch b/media-gfx/splashutils/files/splashutils-1.3.1-cachedir.patch
new file mode 100644
index 000000000000..5bca5df48c24
--- /dev/null
+++ b/media-gfx/splashutils/files/splashutils-1.3.1-cachedir.patch
@@ -0,0 +1,19 @@
+diff --git a/gentoo/splash-functions.sh b/gentoo/splash-functions.sh
+index 38216f1..c7c805e 100644
+--- a/gentoo/splash-functions.sh
++++ b/gentoo/splash-functions.sh
+@@ -523,7 +523,13 @@ splash_cache_cleanup() {
+ 	# writable, update it to avoid stale mtab entries (bug #121827).
+ 	local mntopt=""
+ 	[[ -w /etc/mtab ]] || mntopt="-n"
+-	umount ${mntopt} -l "${spl_tmpdir}" 2>/dev/null
++	mount ${mntopt} --move "${spl_cachedir}" "${spl_tmpdir}" 2>/dev/null
++
++	# Don't try to copy anything if the cachedir is not writable.
++	[[ -w "${spl_cachedir}" ]] || return;
++
++	cp -a "${spl_tmpdir}"/profile "${spl_cachedir}" 2>/dev/null
++	umount -l "${spl_tmpdir}" 2>/dev/null
+  }
+ 
+ ###########################################################################
diff --git a/media-gfx/splashutils/splashutils-1.3.1.ebuild b/media-gfx/splashutils/splashutils-1.3.1.ebuild
index 428dc7d665cd..7ee425d6398f 100644
--- a/media-gfx/splashutils/splashutils-1.3.1.ebuild
+++ b/media-gfx/splashutils/splashutils-1.3.1.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.3.1.ebuild,v 1.3 2007/03/14 23:02:25 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.3.1.ebuild,v 1.4 2007/03/15 13:27:28 spock Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -65,7 +65,13 @@ src_unpack() {
 	rm ${S}/libs/zlib-${V_ZLIB}/Makefile
 
 	cd ${SG}
-	epatch ${FILESDIR}/${GENTOOSPLASH}-old-baselayout.patch
+
+	if has_version '>=sys-apps/baselayout-1.13.0_alpha12' ; then
+		epatch ${FILESDIR}/${P}-cachedir.patch
+	else
+		epatch ${FILESDIR}/${GENTOOSPLASH}-old-baselayout.patch
+	fi
+
 	epatch ${FILESDIR}/${P}-boot_msg.patch
 
 	cd ${S}