fix PATH for baselayout2

Package-Manager: portage-2.1.3.19

4 files changed, 49 insertions, 10 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index e47a9a73a785..df38bb197f23 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/util-vserver
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.84 2007/10/10 22:19:46 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.85 2007/11/17 21:50:34 hollow Exp $
+
+  17 Nov 2007; Benedikt Böhm <hollow@gentoo.org>
+  +files/util-vserver-0.30.214-baselayout2_path.patch,
+  util-vserver-0.30.214.ebuild:
+  fix PATH for baselayout2
 
   10 Oct 2007; Benedikt Böhm <hollow@gentoo.org>
   -files/util-vserver-0.30.213-init-vserver.sh.patch,
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index 6497863199aa..4d874e0a0a55 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX bash_completion 7568 RMD160 45feafa30f715fb287403518eee8c45fecfe418e SHA1 d281bcad111df21ab0f37703142dd102145d784e SHA256 2232166a5aed9857a7a5c30adfdd4ea944e0608a29fad05f229b8cef2d61795d
 MD5 20d9b2d8c50fe0ca9bb381d16daf2d7d files/bash_completion 7568
 RMD160 45feafa30f715fb287403518eee8c45fecfe418e files/bash_completion 7568
@@ -22,20 +25,24 @@ AUX util-vserver-0.30.212-wrapper.patch 1349 RMD160 f8c4bfd740846c43e56a97db8630
 MD5 bc15d959f59fbe0250e0be2f2ca9ee70 files/util-vserver-0.30.212-wrapper.patch 1349
 RMD160 f8c4bfd740846c43e56a97db86302e81b8afa1c8 files/util-vserver-0.30.212-wrapper.patch 1349
 SHA256 548b9732f12492f1ca58d72c3fd8634c99047d1619c19a1c9407a6864150c3fe files/util-vserver-0.30.212-wrapper.patch 1349
+AUX util-vserver-0.30.214-baselayout2_path.patch 678 RMD160 b159ea0e9017ae10aaf4f287752453582c08fa24 SHA1 6a529d9b9bc2369cf19ababb0e3ca6186e35af69 SHA256 16a306ff495eaad606550b105d44891e06ab6a7f6980d896474a13ecdf818148
+MD5 9a8a8bd58b55de4769c1d5f9abb3abf7 files/util-vserver-0.30.214-baselayout2_path.patch 678
+RMD160 b159ea0e9017ae10aaf4f287752453582c08fa24 files/util-vserver-0.30.214-baselayout2_path.patch 678
+SHA256 16a306ff495eaad606550b105d44891e06ab6a7f6980d896474a13ecdf818148 files/util-vserver-0.30.214-baselayout2_path.patch 678
 DIST util-vserver-0.30.212.tar.bz2 643139 RMD160 e0bb7600204c99bf2192332b2fb5680cd647d226 SHA1 366e9aa56490de71dccebf7ee99a81e37a274267 SHA256 dad182f0c882f32d96cab8d9065e4417d9c2f8146e1e2c9f197580389cc4a484
 DIST util-vserver-0.30.214.tar.bz2 676250 RMD160 fbcf8b23719af991443d59f6c8670e99e2b746d6 SHA1 d0996cd6415db91c869912680e9b9798edd57228 SHA256 c88a27ccd1593f4396e1cf4aca37c715c7618a77d709ad63c7cc744ca1557c45
 EBUILD util-vserver-0.30.212-r2.ebuild 3825 RMD160 55abe18531b899dd143610f67baa9f4f36bea357 SHA1 1d633e3b7b51f9be305166cf7333633399a5b7c0 SHA256 f135b163663292611ec8f7b0448833bbfa38d279a784ea3c92715e0642c79e12
 MD5 b84dbc71e5351f8fc93d233aa67f3d1a util-vserver-0.30.212-r2.ebuild 3825
 RMD160 55abe18531b899dd143610f67baa9f4f36bea357 util-vserver-0.30.212-r2.ebuild 3825
 SHA256 f135b163663292611ec8f7b0448833bbfa38d279a784ea3c92715e0642c79e12 util-vserver-0.30.212-r2.ebuild 3825
-EBUILD util-vserver-0.30.214.ebuild 3650 RMD160 bd53ff8852ffcd24e452a6f33499be141e7636f1 SHA1 b5a45ac75522d8138440b9ddaaefa3416418fa9b SHA256 5d1c62c1158ec98f20b8806d48762ebb9100d05477cf5a2b6c4e1fb5f2e439b3
-MD5 0c2ae05534d191fde891b9612838a390 util-vserver-0.30.214.ebuild 3650
-RMD160 bd53ff8852ffcd24e452a6f33499be141e7636f1 util-vserver-0.30.214.ebuild 3650
-SHA256 5d1c62c1158ec98f20b8806d48762ebb9100d05477cf5a2b6c4e1fb5f2e439b3 util-vserver-0.30.214.ebuild 3650
-MISC ChangeLog 17210 RMD160 62485d4548b5a10ef0bde21e72cbefe26824ba70 SHA1 643bfbc85d068c411a804df1f38e29f8776d12b2 SHA256 cc9de8ef11e8a7e0992280b6c4897d73931943efd6b66394f6e40efa9136f7cd
-MD5 514172d7794d913726d08d8c5881bd2a ChangeLog 17210
-RMD160 62485d4548b5a10ef0bde21e72cbefe26824ba70 ChangeLog 17210
-SHA256 cc9de8ef11e8a7e0992280b6c4897d73931943efd6b66394f6e40efa9136f7cd ChangeLog 17210
+EBUILD util-vserver-0.30.214.ebuild 3742 RMD160 81da7567905875d7b97a1823505300630a0443bf SHA1 b5b8f513d43aea27ac40b3b8738bcd5d71c85b91 SHA256 b2270da4758be3a2407dc6a8a82dda6f5217aa9372d5fe05fc4a5dc5b85fe309
+MD5 f6dc4593fdbf9c002d9b3fc8d28c94af util-vserver-0.30.214.ebuild 3742
+RMD160 81da7567905875d7b97a1823505300630a0443bf util-vserver-0.30.214.ebuild 3742
+SHA256 b2270da4758be3a2407dc6a8a82dda6f5217aa9372d5fe05fc4a5dc5b85fe309 util-vserver-0.30.214.ebuild 3742
+MISC ChangeLog 17375 RMD160 cdc52d621b44cfeabc7c6d9399385893d13c6fdc SHA1 ec16a6025039a7783ac7e72416744184b7009253 SHA256 a2daaea18c521560b4450edb2e9c9ccd00cbb9d8b60252e5c140abbca961730f
+MD5 d22393d2111dfcfc151cbcf5bfbba336 ChangeLog 17375
+RMD160 cdc52d621b44cfeabc7c6d9399385893d13c6fdc ChangeLog 17375
+SHA256 a2daaea18c521560b4450edb2e9c9ccd00cbb9d8b60252e5c140abbca961730f ChangeLog 17375
 MISC metadata.xml 588 RMD160 43bd819942f6f0c03bec0bcf67601a7099b59a2b SHA1 d0e5af40193886066bbe1060324dede1f0fd367f SHA256 798e87b6d5fb379322178e9f8b7432371f630caaf3fd6ff369e35056483cc31d
 MD5 493021fa14e20216e8ce772e9dc10a62 metadata.xml 588
 RMD160 43bd819942f6f0c03bec0bcf67601a7099b59a2b metadata.xml 588
@@ -46,3 +53,10 @@ SHA256 d85b209f085a57250ac6312dc686ac3d1be5c43d491f0c4cc8fd300f74c3421b files/di
 MD5 cbe06c5acf3df5f6ed3395c8ed754e67 files/digest-util-vserver-0.30.214 268
 RMD160 7b087e1c12808d53cf9fba1d3c50a6b087e836bf files/digest-util-vserver-0.30.214 268
 SHA256 f3f5dd7a1b9d36d793c46afdf257236d1d75876a59b9d337e55e019652f78241 files/digest-util-vserver-0.30.214 268
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHP2I0mPFBzbX68WERAiEUAJ0aZ1SnhJhiyrlghCC5Ddj/uitobwCdHyfD
+LwqMpz+7Z63+3PHKwC3nDBE=
+=9IP0
+-----END PGP SIGNATURE-----
diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.214-baselayout2_path.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.214-baselayout2_path.patch
new file mode 100644
index 000000000000..2898d6bc85f1
--- /dev/null
+++ b/sys-cluster/util-vserver/files/util-vserver-0.30.214-baselayout2_path.patch
@@ -0,0 +1,14 @@
+Index: /trunk/scripts/vserver.functions

+===================================================================

+--- /trunk/scripts/vserver.functions (revision 2626)

++++ /trunk/scripts/vserver.functions (revision 2634)

+@@ -316,7 +316,8 @@

+ 	(xgentoo)

+ 	    test -n "$RUNLEVEL_START" || RUNLEVEL_START="default"

++	    RC_PATH=/usr/sbin:/usr/bin:/sbin:/bin

+ 

+ 	    INITCMD_START=( env TERM=$TERM /lib/rcscripts/sh/init-vserver.sh "$RUNLEVEL_START" )

+-	    INITCMD_STOP=( env -i TERM=$TERM RUNLEVEL=0 /sbin/rc shutdown )

++	    INITCMD_STOP=( env -i PATH=$RC_PATH TERM=$TERM RUNLEVEL=0 /sbin/rc shutdown )

+ 	    INITCMD_PREPARE=( $_FAKE_RUNLEVEL 3 /var/run/utmp )

+ 	    ;;

diff --git a/sys-cluster/util-vserver/util-vserver-0.30.214.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.214.ebuild
index b984819950e4..ecc34fcfd288 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.214.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.214.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/sys-cluster/util-vserver/util-vserver-0.30.214.ebuild,v 1.2 2007/10/10 22:19:46 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.214.ebuild,v 1.3 2007/11/17 21:50:34 hollow Exp $
 
 WANT_AUTOMAKE="1.9"
 
@@ -41,6 +41,12 @@ pkg_setup() {
 	einfo
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-baselayout2_path.patch
+}
+
 src_compile() {
 	econf --with-vrootdir=${VDIRBASE} \
 		--with-initscripts=gentoo \