Fixed splash-themes livecd to work with baselayout2 by using /etc/init.d/functions.sh instead of /sbin/functions.sh, bug #177626.

Package-Manager: portage-2.1.3.5

7 files changed, 66 insertions, 34 deletions

diff --git a/media-gfx/splash-themes-livecd/ChangeLog b/media-gfx/splash-themes-livecd/ChangeLog
index aa9a1e9428bf..7fd083284970 100644
--- a/media-gfx/splash-themes-livecd/ChangeLog
+++ b/media-gfx/splash-themes-livecd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/splash-themes-livecd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splash-themes-livecd/ChangeLog,v 1.14 2007/05/08 23:05:37 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splash-themes-livecd/ChangeLog,v 1.15 2007/08/15 10:01:40 zzam Exp $
+
+  15 Aug 2007; Matthias Schwarzott <zzam@gentoo.org>
+  splash-themes-livecd-2005.0.ebuild, splash-themes-livecd-2005.1.ebuild,
+  splash-themes-livecd-2006.0.ebuild, splash-themes-livecd-2006.1.ebuild,
+  splash-themes-livecd-2007.0.ebuild:
+  Fixed splash-themes livecd to work with baselayout2 by using
+  /etc/init.d/functions.sh instead of /sbin/functions.sh, bug #177626.
 
   08 May 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   splash-themes-livecd-2007.0.ebuild:
diff --git a/media-gfx/splash-themes-livecd/Manifest b/media-gfx/splash-themes-livecd/Manifest
index e028f8698526..07a308ea3505 100644
--- a/media-gfx/splash-themes-livecd/Manifest
+++ b/media-gfx/splash-themes-livecd/Manifest
@@ -11,30 +11,30 @@ EBUILD splash-themes-livecd-2004.3.ebuild 640 RMD160 2472e2246ca16494fa109e5590d
 MD5 ea816a56305548983380ae3e24b01b4f splash-themes-livecd-2004.3.ebuild 640
 RMD160 2472e2246ca16494fa109e5590d605d839dc65e7 splash-themes-livecd-2004.3.ebuild 640
 SHA256 01bb1f7733ef28edb40543d488163c730f55372bee3b64a665e1f6426414acf7 splash-themes-livecd-2004.3.ebuild 640
-EBUILD splash-themes-livecd-2005.0.ebuild 703 RMD160 c2cb5770227167603308c263e4fe405c24753932 SHA1 bc24f1832c61c50453b3ba76618650381409ea2a SHA256 7742f1a04fb5b827f2cc0f477e65997f46dc6a60f0e4a0ed7e6a9dad4f5784e4
-MD5 8cd6418d7772ba780b48c301c4834941 splash-themes-livecd-2005.0.ebuild 703
-RMD160 c2cb5770227167603308c263e4fe405c24753932 splash-themes-livecd-2005.0.ebuild 703
-SHA256 7742f1a04fb5b827f2cc0f477e65997f46dc6a60f0e4a0ed7e6a9dad4f5784e4 splash-themes-livecd-2005.0.ebuild 703
-EBUILD splash-themes-livecd-2005.1.ebuild 861 RMD160 19a3c4faef333728d4f4e97b848b701442f4a883 SHA1 a6eac41298c9cd9ce0141527affc8776ac29f2ce SHA256 ea7638b80e18fa4537a76fc22449d0be2201b7d7ad9001cbd3559557bf483135
-MD5 ba6194233a81be9efe390737fee3f56a splash-themes-livecd-2005.1.ebuild 861
-RMD160 19a3c4faef333728d4f4e97b848b701442f4a883 splash-themes-livecd-2005.1.ebuild 861
-SHA256 ea7638b80e18fa4537a76fc22449d0be2201b7d7ad9001cbd3559557bf483135 splash-themes-livecd-2005.1.ebuild 861
-EBUILD splash-themes-livecd-2006.0.ebuild 704 RMD160 4adf5f4e5bd7172e15b777f84e723587f51e1ee8 SHA1 edaeaa47617f3e2134d510bc4b35030537d5a74b SHA256 dfdd08e104c6a2467f944a2dee9e9c1cd91c36d76332a73532b49705884d2bfe
-MD5 ab8c7cbf38cadbbf5498d5f3480200ab splash-themes-livecd-2006.0.ebuild 704
-RMD160 4adf5f4e5bd7172e15b777f84e723587f51e1ee8 splash-themes-livecd-2006.0.ebuild 704
-SHA256 dfdd08e104c6a2467f944a2dee9e9c1cd91c36d76332a73532b49705884d2bfe splash-themes-livecd-2006.0.ebuild 704
-EBUILD splash-themes-livecd-2006.1.ebuild 708 RMD160 225bfee78094c7602c74209cd62d2482621941a1 SHA1 536c47cac7624f7cc82e6fb5c6bd68ceb7cc0382 SHA256 3886389f84fe8d6e07882c90527fe4f9828cfc163abf285c41f1bcb039b63129
-MD5 4a07d7794e8f94c374d26083bec57de2 splash-themes-livecd-2006.1.ebuild 708
-RMD160 225bfee78094c7602c74209cd62d2482621941a1 splash-themes-livecd-2006.1.ebuild 708
-SHA256 3886389f84fe8d6e07882c90527fe4f9828cfc163abf285c41f1bcb039b63129 splash-themes-livecd-2006.1.ebuild 708
-EBUILD splash-themes-livecd-2007.0.ebuild 915 RMD160 8043ac317dfec4c77ed99233a85fdc9acc8750c9 SHA1 cc3e7b92a26f630741c9cdd6625267fb736c3a5f SHA256 323a089e6387980168f0006a6042d141c7688bf716d18c06054822b115034cf4
-MD5 1b2b72a7de081f7b674576cf0e917319 splash-themes-livecd-2007.0.ebuild 915
-RMD160 8043ac317dfec4c77ed99233a85fdc9acc8750c9 splash-themes-livecd-2007.0.ebuild 915
-SHA256 323a089e6387980168f0006a6042d141c7688bf716d18c06054822b115034cf4 splash-themes-livecd-2007.0.ebuild 915
-MISC ChangeLog 2792 RMD160 e364c4618a61abdaf402548d97269e8a70dda5a7 SHA1 02b7798b5219e8141fbbda2d681c170042452b0a SHA256 f9f87f8633197c63421914f4c90f1afd2682fb0e2a490bae562f37c05d7ace7d
-MD5 4ffe5b7357cf5ce42dc7eeb1abbb1d2a ChangeLog 2792
-RMD160 e364c4618a61abdaf402548d97269e8a70dda5a7 ChangeLog 2792
-SHA256 f9f87f8633197c63421914f4c90f1afd2682fb0e2a490bae562f37c05d7ace7d ChangeLog 2792
+EBUILD splash-themes-livecd-2005.0.ebuild 841 RMD160 94a00c44cdb2e3dfd8dbada6e8cb767416f92f0a SHA1 ff2dedad17f3073660f4d9cad6330aca75c1f867 SHA256 8d415d0c502a212aef6bd52a1321d122efaf7e0b7d703d3ac4bfd36f10eda670
+MD5 af5b2e55337d9a85005e456506b22121 splash-themes-livecd-2005.0.ebuild 841
+RMD160 94a00c44cdb2e3dfd8dbada6e8cb767416f92f0a splash-themes-livecd-2005.0.ebuild 841
+SHA256 8d415d0c502a212aef6bd52a1321d122efaf7e0b7d703d3ac4bfd36f10eda670 splash-themes-livecd-2005.0.ebuild 841
+EBUILD splash-themes-livecd-2005.1.ebuild 937 RMD160 4a37ccfd609795dfdb98dca6db4f20ee7b595697 SHA1 25f0a87e7ee452aa285b04c42aaf5b63bbbc293e SHA256 1499df7c327edf33f24dedd9204b6af8e198460065d34d59820b50d8a104350b
+MD5 78e8a2b8f75fe87229530964aaaf2d07 splash-themes-livecd-2005.1.ebuild 937
+RMD160 4a37ccfd609795dfdb98dca6db4f20ee7b595697 splash-themes-livecd-2005.1.ebuild 937
+SHA256 1499df7c327edf33f24dedd9204b6af8e198460065d34d59820b50d8a104350b splash-themes-livecd-2005.1.ebuild 937
+EBUILD splash-themes-livecd-2006.0.ebuild 820 RMD160 b6bdef49d56118ff68c4bc569ae2ac908694baa7 SHA1 d006421355a304d51d5030fab0726faf6da8f35e SHA256 db89da8df417668c50fa2a0e83b89f28c1de36b7d971990af9fdeb71c8f8f35b
+MD5 9ba74d23a3a2fed68400f941b0f7093d splash-themes-livecd-2006.0.ebuild 820
+RMD160 b6bdef49d56118ff68c4bc569ae2ac908694baa7 splash-themes-livecd-2006.0.ebuild 820
+SHA256 db89da8df417668c50fa2a0e83b89f28c1de36b7d971990af9fdeb71c8f8f35b splash-themes-livecd-2006.0.ebuild 820
+EBUILD splash-themes-livecd-2006.1.ebuild 824 RMD160 e7dc8358c393d75bdfba974dd49f4f097c583228 SHA1 197a3c6fa7a7b9b0f10e774b0b962d2a62131241 SHA256 d2f08caaa450d61f1e49883d06b35635b2803d4d0265b3d855cbd159a4cd00cc
+MD5 d7f2c859572267f01181e1614792cc56 splash-themes-livecd-2006.1.ebuild 824
+RMD160 e7dc8358c393d75bdfba974dd49f4f097c583228 splash-themes-livecd-2006.1.ebuild 824
+SHA256 d2f08caaa450d61f1e49883d06b35635b2803d4d0265b3d855cbd159a4cd00cc splash-themes-livecd-2006.1.ebuild 824
+EBUILD splash-themes-livecd-2007.0.ebuild 1031 RMD160 c411d3d392a08e02b68d6256ba52c371e3e45c22 SHA1 74a74d929ce46f4e84f08dc85e8101aca4fd37da SHA256 47ef5ce5424b8c8e8188509eddf07c5c993434af544e2940dad0280ba23f3510
+MD5 45711fd56545f16fb48549c3731400e6 splash-themes-livecd-2007.0.ebuild 1031
+RMD160 c411d3d392a08e02b68d6256ba52c371e3e45c22 splash-themes-livecd-2007.0.ebuild 1031
+SHA256 47ef5ce5424b8c8e8188509eddf07c5c993434af544e2940dad0280ba23f3510 splash-themes-livecd-2007.0.ebuild 1031
+MISC ChangeLog 3162 RMD160 8125d2c4d29db6cfbdb65b927788128a0b7f0eab SHA1 e9c68547531b9f784ab945914403a8b37081f3dc SHA256 e8807773cc7595764d4a8f2be7fef0331e9d2e00070237b5eb46aa946f10d79a
+MD5 9c6a986e38395c139c2add1a93ec8e2e ChangeLog 3162
+RMD160 8125d2c4d29db6cfbdb65b927788128a0b7f0eab ChangeLog 3162
+SHA256 e8807773cc7595764d4a8f2be7fef0331e9d2e00070237b5eb46aa946f10d79a ChangeLog 3162
 MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d
 MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 metadata.xml 159
@@ -58,9 +58,9 @@ MD5 a5ea0bf777495f1859f64a14d7ae9cf3 files/digest-splash-themes-livecd-2007.0 28
 RMD160 c5450fc1de08e30a9682ed3f8b269ff8237038b4 files/digest-splash-themes-livecd-2007.0 286
 SHA256 9da7e234c6ceab2011a564092768d7e8e70e0b7884fd0de7d504ac33aa77bce6 files/digest-splash-themes-livecd-2007.0 286
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGQQJPkT4lNIS36YERAmH5AKCsSYayPRbDcEIjHJEfui9BYv+r+wCgi9HO
-7iv3Csh0j56hWNBlxnOZ5+Q=
-=qM9X
+iD8DBQFGws8Pt2vP6XvVdOcRAoVeAJ0R5wK6CRfSgW6oHdeiwpsZPTTZgQCdEAKm
+r+fpwukSBXjA3/0fLRFONKw=
+=jlhH
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.0.ebuild b/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.0.ebuild
index 1c158c062f3f..5bff31fffa36 100644
--- a/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.0.ebuild
+++ b/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.0.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/splash-themes-livecd/splash-themes-livecd-2005.0.ebuild,v 1.4 2007/02/15 15:23:20 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.0.ebuild,v 1.5 2007/08/15 10:01:40 zzam Exp $
 
 MY_P="gentoo-livecd-${PV}"
 MY_REV="0.9.1"
@@ -18,6 +18,12 @@ DEPEND=">=media-gfx/splashutils-0.9.1"
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e 's-/sbin/functions.sh-/etc/init.d/functions.sh-' scripts/rc_init-pre scripts/list_svc.sh
+}
+
 src_install() {
 	dodir /etc/splash/livecd-${PV}
 	cp -r ${S}/* ${D}/etc/splash/livecd-${PV}
diff --git a/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.1.ebuild b/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.1.ebuild
index cb1f2e19b641..c63569b77177 100644
--- a/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.1.ebuild
+++ b/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.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/splash-themes-livecd/splash-themes-livecd-2005.1.ebuild,v 1.4 2007/02/15 15:23:20 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splash-themes-livecd/splash-themes-livecd-2005.1.ebuild,v 1.5 2007/08/15 10:01:40 zzam Exp $
 
 MY_P="gentoo-livecd-${PV}"
 MY_REV="0.9.2"
@@ -22,6 +22,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	sed -i -e '/^\/bin\/umount -l "\/etc\/splash\/${SPLASH_THEME}"$/s/^\(.*\)$/\1 \&>\/dev\/null/' scripts/rc_exit-post
+	sed -i -e 's-/sbin/functions.sh-/etc/init.d/functions.sh-' scripts/rc_init-pre
 }
 
 src_install() {
diff --git a/media-gfx/splash-themes-livecd/splash-themes-livecd-2006.0.ebuild b/media-gfx/splash-themes-livecd/splash-themes-livecd-2006.0.ebuild
index 3a8474a99b97..b80acc2c5294 100644
--- a/media-gfx/splash-themes-livecd/splash-themes-livecd-2006.0.ebuild
+++ b/media-gfx/splash-themes-livecd/splash-themes-livecd-2006.0.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/splash-themes-livecd/splash-themes-livecd-2006.0.ebuild,v 1.2 2007/02/15 15:23:20 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splash-themes-livecd/splash-themes-livecd-2006.0.ebuild,v 1.3 2007/08/15 10:01:40 zzam Exp $
 
 MY_P="gentoo-livecd-${PV}"
 MY_REV="0.9.3"
@@ -18,6 +18,12 @@ DEPEND=">=media-gfx/splashutils-1.1.9.7"
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i -e 's-/sbin/functions.sh-/etc/init.d/functions.sh-' scripts/rc_init-pre
+}
+
 src_install() {
 	dodir /etc/splash/livecd-${PV}
 	cp -r ${S}/* ${D}/etc/splash/livecd-${PV}
diff --git a/media-gfx/splash-themes-livecd/splash-themes-livecd-2006.1.ebuild b/media-gfx/splash-themes-livecd/splash-themes-livecd-2006.1.ebuild
index 65e02f313148..3251e1c69839 100644
--- a/media-gfx/splash-themes-livecd/splash-themes-livecd-2006.1.ebuild
+++ b/media-gfx/splash-themes-livecd/splash-themes-livecd-2006.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/splash-themes-livecd/splash-themes-livecd-2006.1.ebuild,v 1.2 2007/02/15 15:23:20 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splash-themes-livecd/splash-themes-livecd-2006.1.ebuild,v 1.3 2007/08/15 10:01:40 zzam Exp $
 
 MY_P="gentoo-livecd-${PV}"
 MY_REV="0.9.4"
@@ -18,6 +18,12 @@ DEPEND=">=media-gfx/splashutils-1.1.9.10-r1"
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i -e 's-/sbin/functions.sh-/etc/init.d/functions.sh-' scripts/rc_init-pre
+}
+
 src_install() {
 	dodir /etc/splash/livecd-${PV}
 	cp -r ${S}/* ${D}/etc/splash/livecd-${PV}
diff --git a/media-gfx/splash-themes-livecd/splash-themes-livecd-2007.0.ebuild b/media-gfx/splash-themes-livecd/splash-themes-livecd-2007.0.ebuild
index eb4e089dcb59..221a21854f80 100644
--- a/media-gfx/splash-themes-livecd/splash-themes-livecd-2007.0.ebuild
+++ b/media-gfx/splash-themes-livecd/splash-themes-livecd-2007.0.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/splash-themes-livecd/splash-themes-livecd-2007.0.ebuild,v 1.2 2007/05/08 23:05:37 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splash-themes-livecd/splash-themes-livecd-2007.0.ebuild,v 1.3 2007/08/15 10:01:40 zzam Exp $
 
 inherit eutils
 
@@ -28,6 +28,12 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i -e 's-/sbin/functions.sh-/etc/init.d/functions.sh-' scripts/rc_init-pre
+}
+
 src_install() {
 	dodir /etc/splash/livecd-${PV}
 	cp -r ${S}/* ${D}/etc/splash/livecd-${PV}