0.30.215 stable on amd64/x86; fix mktemp dependency; fix functions.sh location for openrc; remove old version

Package-Manager: portage-2.1.5_rc2

7 files changed, 69 insertions, 285 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index 44183e09bba1..75006cfb7ecf 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/util-vserver
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.89 2008/03/17 09:16:31 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.90 2008/04/13 10:24:11 hollow Exp $
+
+  13 Apr 2008; Benedikt Böhm <hollow@gentoo.org>
+  -files/util-vserver-0.30.214-openrc.patch,
+  +files/util-vserver-0.30.215-openrc.patch, util-vserver-0.30.214.ebuild,
+  -util-vserver-0.30.214-r1.ebuild, util-vserver-0.30.215.ebuild:
+  0.30.215 stable on amd64/x86; fix mktemp dependency; fix functions.sh
+  location for openrc; remove old version
 
 *util-vserver-0.30.215 (17 Mar 2008)
 
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index 894b022e174f..12851350835d 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -3,18 +3,17 @@ Hash: SHA1
 
 AUX bash_completion 7568 RMD160 45feafa30f715fb287403518eee8c45fecfe418e SHA1 d281bcad111df21ab0f37703142dd102145d784e SHA256 2232166a5aed9857a7a5c30adfdd4ea944e0608a29fad05f229b8cef2d61795d
 AUX util-vserver-0.30.214-baselayout2_path.patch 648 RMD160 7775e5bc109774f9f253a88157739b5eb88ffc87 SHA1 fe8a94e8e0c76989b6d7268f9c9a07183a63b183 SHA256 59ad64c7b5356c16f500dc328eec989844301adeeefd4fe968955a03e9eb2630
-AUX util-vserver-0.30.214-openrc.patch 4903 RMD160 12681cb3ed9904cbb99c7ad7411325b5856f45cf SHA1 530fb6e8077c5f4f4323811f06b8124a5e211419 SHA256 2abe4a75c33944205e0ba2f93009c45c1886c365ea141901df45af633b4c462b
+AUX util-vserver-0.30.215-openrc.patch 1138 RMD160 936fe40430a9dcd0f8924d435952400bdfdbf858 SHA1 021d40edec6f602a050c01d1924ca990714face0 SHA256 f6a4d24c708ee882e506f63ad16cf259c06ef7840d860f77da74d8e970e9297c
 DIST util-vserver-0.30.214.tar.bz2 676250 RMD160 fbcf8b23719af991443d59f6c8670e99e2b746d6 SHA1 d0996cd6415db91c869912680e9b9798edd57228 SHA256 c88a27ccd1593f4396e1cf4aca37c715c7618a77d709ad63c7cc744ca1557c45
 DIST util-vserver-0.30.215.tar.bz2 695414 RMD160 62d34d2149fc949f27f7e08e8f4077919dfac838 SHA1 798fb71752420d1dd3d4807eeae37d3d8076662a SHA256 40686ac0652b245fcbb34e52ac8d80ae6b4ea3f73150ebc1ce7c69660ccaa35e
-EBUILD util-vserver-0.30.214-r1.ebuild 3737 RMD160 a51767e5866e4676fc2e3efbb508dd96aed6b871 SHA1 34b230de4438bf8601094a7aa36c6fd95d80bd73 SHA256 2d4f6920f19f348356893253993fe798dec0711f5e84882e88adac8120dceee2
-EBUILD util-vserver-0.30.214.ebuild 3742 RMD160 81da7567905875d7b97a1823505300630a0443bf SHA1 b5b8f513d43aea27ac40b3b8738bcd5d71c85b91 SHA256 b2270da4758be3a2407dc6a8a82dda6f5217aa9372d5fe05fc4a5dc5b85fe309
-EBUILD util-vserver-0.30.215.ebuild 3652 RMD160 906ded6b35fe11bd137dab8ef6070cfe2df97592 SHA1 e202a98af1823f3b70cf841d909ee683a09d43b6 SHA256 89c3b60b671e6c398ce2fce0f8a3b139f0303d2be282fdeaf2e43cf8d5261e9d
-MISC ChangeLog 18207 RMD160 9769ffef735790789793482e9a99d6925c3c7d40 SHA1 b4568bd1601ea88fcad8f854808023156b8d3fd1 SHA256 d91157892236401fb2a7e8f33fe153eb3994edc949d82edc9a123af4bd24cebf
+EBUILD util-vserver-0.30.214.ebuild 3750 RMD160 62ba84efe3897339f4bcd486fc47749996a59606 SHA1 0aa3ded0a867d5bf42a582e9083f965595692d97 SHA256 7917b6808fb452fed465a8dee3efe3f2090f188bb5b157c3432c74aa77792830
+EBUILD util-vserver-0.30.215.ebuild 3740 RMD160 edae5a0a0f3ebb9c20a548eb8dcc7c8090578187 SHA1 b0693d100c37c36889f11bd410c9fe5aab830aad SHA256 c168630a33c1b794fa48f76ac2bc00f88d2d96ecd380d66c67395f103a1b461c
+MISC ChangeLog 18558 RMD160 b870817ccbe1fc47ac96f1eedf6796403d3d762d SHA1 c486feb052761f101deb324afd0af03c165ca81b SHA256 7478090a6e8a790fcef673795692d6fc7d5a9cb8f6b3f2a8f6e694ca20c7e7f9
 MISC metadata.xml 518 RMD160 62a73756fb710a0464dd24600e7ec70c82e13021 SHA1 78ee9f24180c1215ebe02ac3dbba80a7a0c4a82e SHA256 5a4f424248d873af9f0a66aca2e3e60c6165288fa649ef44de4d8418232c5ac0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH3jb6mPFBzbX68WERAqtGAJ9FXNrBMcUSQGDIVurq7r9TBlwAQwCdEX3u
-pG9gLDnXoCTEIDK2zYooFUM=
-=Slrd
+iEYEARECAAYFAkgB31UACgkQmPFBzbX68WEvgwCfZHgoQKWBHTK4pBjbwvq/YbSA
+TVwAn21MVsvLxlrvCQTliX+gDYqVN58N
+=NAyH
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.214-openrc.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.214-openrc.patch
deleted file mode 100644
index 247f36537b42..000000000000
--- a/sys-cluster/util-vserver/files/util-vserver-0.30.214-openrc.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -NurpP util-vserver-0.30.214.orig/distrib/gentoo/initpost util-vserver-0.30.214/distrib/gentoo/initpost
---- util-vserver-0.30.214.orig/distrib/gentoo/initpost	2007-09-02 22:06:42.000000000 +0200
-+++ util-vserver-0.30.214/distrib/gentoo/initpost	2008-03-11 10:39:53.955478789 +0100
-@@ -51,6 +51,11 @@ $_CHROOT_SH mkdir /usr/portage 2>/dev/nu
- $_CHROOT_SH mkdir /usr/portage/distfiles 2>/dev/null || :
- 
- 
-+# check if we have openrc
-+have_openrc=0
-+$_CHROOT_SH testfile /lib/rc/bin/is_older_than && have_openrc=1
-+
-+
- # gentoo initstyle magic
- initstyle=sysv
- test -e "$cfgdir"/apps/init/style && initstyle=$(<"$cfgdir"/apps/init/style)
-@@ -59,8 +64,8 @@ if test "$initstyle" == "gentoo"; then
- 	echo ">>> Installing special init-style magic ... "
- 
- 	$_CAT "$__DISTRIBDIR"/gentoo/init-vserver.sh | \
--	$_CHROOT_SH truncate   /lib/rcscripts/sh/init-vserver.sh
--	$_CHROOT_SH chmod 0755 /lib/rcscripts/sh/init-vserver.sh
-+	$_CHROOT_SH truncate   /lib/rc/sh/init-vserver.sh
-+	$_CHROOT_SH chmod 0755 /lib/rc/sh/init-vserver.sh
- 
- 	$_CAT "$__DISTRIBDIR"/gentoo/reboot.sh | \
- 	$_CHROOT_SH truncate   /etc/init.d/reboot.sh
-@@ -78,23 +83,29 @@ if test "$initstyle" == "gentoo"; then
- 	echo "!!! Consult the Gentoo Handbook on how to chroot and install"
- 	echo "!!! packages into the guest environment."
- 	echo "!!!"
-+else
-+	# fix gettys in inittab
-+	if $_CHROOT_SH testfile /etc/inittab; then
-+		echo ">>> Fixing inittab ... "
-+		chrootsed /etc/inittab \
-+			-e 's/\(^[^#].*getty.*$\)/#\1/'
-+	fi
- fi
- 
--
- # unneeded runlevel scripts
--echo ">>> Fixing default runlevel scripts ... "
--$_CHROOT_SH rm /etc/runlevels/boot/{clock,consolefont,keymaps,modules,net.lo} 2>/dev/null || :
--$_CHROOT_SH rm /etc/runlevels/default/{hdparm,netmount} 2>/dev/null || :
--
-+if test $have_openrc -ne 1; then
-+	echo ">>> Fixing default runlevel scripts ... "
-+	$_CHROOT_SH rm /etc/runlevels/boot/{clock,consolefont,keymaps,modules,net.lo} 2>/dev/null || :
-+	$_CHROOT_SH rm /etc/runlevels/default/{hdparm,netmount} 2>/dev/null || :
-+fi
- 
- # setting hostname
- if test -r "$cfgdir"/uts/nodename && $_CHROOT_SH testfile /etc/conf.d/hostname; then
- 	echo ">>> Setting hostname ... "
- 	chrootsed /etc/conf.d/hostname \
--		-e "s:HOSTNAME=\"\(.*\)\":HOSTNAME=\"$(< "$cfgdir"/uts/nodename)\":"
-+		-e "s:\(HOSTNAME\)=\"\(.*\)\":\1=\"$(< "$cfgdir"/uts/nodename)\":i"
- fi
- 
--
- # fix syslog-ng.conf
- if $_CHROOT_SH testfile /etc/syslog-ng/syslog-ng.conf; then
- 	echo ">>> Fixing syslog-ng.conf ... "
-@@ -103,27 +114,21 @@ if $_CHROOT_SH testfile /etc/syslog-ng/s
- 		-e 's:\(.*console_all.*\):#\1:g'
- fi
- 
--
--# fix gettys in inittab
--if $_CHROOT_SH testfile /etc/inittab; then
--	echo ">>> Fixing inittab ... "
--	chrootsed /etc/inittab \
--		-e 's/\(^[^#].*getty.*$\)/#\1/'
--fi
--
--
- # fix fstab for checkfs/localmount in baselayout-2
- # (does not affect any previous versions)
--echo ">>> Fixing fstab ... "
--echo "/dev/hdv1 / ufs defaults 0 0" | $_CHROOT_SH truncate /etc/fstab
--
-+if test $have_openrc -ne 1; then
-+	echo ">>> Fixing fstab ... "
-+	echo "/dev/hdv1 / ufs defaults 0 0" | $_CHROOT_SH truncate /etc/fstab
-+fi
- 
- # always satisfy net dependency in baselayout-2
- # (does not affect any previous versions)
--echo ">>> Providing dummy net dependency ... "
--$_CAT "$__DISTRIBDIR"/gentoo/net.vserver | \
--$_CHROOT_SH truncate /etc/init.d/net.vserver
--$_CHROOT_SH chmod 0755 /etc/init.d/net.vserver
--$_CHROOT_SH link /etc/init.d/net.vserver /etc/runlevels/boot/net.vserver
-+if test $have_openrc -ne 1; then
-+	echo ">>> Providing dummy net dependency ... "
-+	$_CAT "$__DISTRIBDIR"/gentoo/net.vserver | \
-+	$_CHROOT_SH truncate /etc/init.d/net.vserver
-+	$_CHROOT_SH chmod 0755 /etc/init.d/net.vserver
-+	$_CHROOT_SH link /etc/init.d/net.vserver /etc/runlevels/boot/net.vserver
-+fi
- 
- popd &>/dev/null
-diff -NurpP util-vserver-0.30.214.orig/scripts/vserver.functions util-vserver-0.30.214/scripts/vserver.functions
---- util-vserver-0.30.214.orig/scripts/vserver.functions	2007-09-02 22:06:41.000000000 +0200
-+++ util-vserver-0.30.214/scripts/vserver.functions	2008-03-11 10:31:41.758515991 +0100
-@@ -314,9 +314,18 @@ function _generateInitOptions
- 
- 	(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 )
-+	    if test -x "$vdir/vdir/lib/rcscripts/sh/init-vserver.sh"; then
-+	    	RC_WRAP=/lib/rcscripts/sh/init-vserver.sh
-+	    elif test -x "$vdir/vdir/lib/rc/sh/init-vserver.sh"; then
-+	    	RC_WRAP=/lib/rc/sh/init-vserver.sh
-+	    else
-+	    	panic "init-vserver.sh not found; aborting"
-+	    fi
-+
-+	    INITCMD_START=( env TERM=$TERM $RC_WRAP "$RUNLEVEL_START" )
-+	    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/files/util-vserver-0.30.215-openrc.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.215-openrc.patch
new file mode 100644
index 000000000000..db4cf4b32f16
--- /dev/null
+++ b/sys-cluster/util-vserver/files/util-vserver-0.30.215-openrc.patch
@@ -0,0 +1,29 @@
+Index: scripts/vserver-init.functions
+===================================================================
+--- scripts/vserver-init.functions	(revision 2711)
++++ scripts/vserver-init.functions	(revision 2712)
+@@ -21,7 +21,7 @@
+     _postResult() { echo; }
+     lockfile=/var/lock/subsys/$LOCKFILE
+ elif test -e /etc/gentoo-release; then
+-    . /sbin/functions.sh
++    . /etc/init.d/functions.sh
+     _beginResult() { ebegin "$@"; }
+     _postResult() { :; }
+     success() { eend 0; }
+Index: distrib/gentoo/initpost
+===================================================================
+--- distrib/gentoo/initpost	(revision 2711)
++++ distrib/gentoo/initpost	(revision 2712)
+@@ -63,6 +63,11 @@
+ if test "$initstyle" == "gentoo"; then
+ 	echo ">>> Installing special init-style magic ... "
+ 
++	# force /lib/rc/sh even if we don't have it in older stages
++	$_CHROOT_SH mkdir /lib 2>/dev/null || :
++	$_CHROOT_SH mkdir /lib/rc 2/dev/null || :
++	$_CHROOT_SH mkdir /lib/rc/sh 2/dev/null || :
++
+ 	$_CAT "$__DISTRIBDIR"/gentoo/init-vserver.sh | \
+ 	$_CHROOT_SH truncate   /lib/rc/sh/init-vserver.sh
+ 	$_CHROOT_SH chmod 0755 /lib/rc/sh/init-vserver.sh
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.214-r1.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.214-r1.ebuild
deleted file mode 100644
index d50ba865b6bf..000000000000
--- a/sys-cluster/util-vserver/util-vserver-0.30.214-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2008 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-r1.ebuild,v 1.1 2008/03/11 10:19:34 hollow Exp $
-
-WANT_AUTOMAKE="1.9"
-
-inherit autotools eutils bash-completion
-
-DESCRIPTION="Linux-VServer admin utilities"
-HOMEPAGE="http://www.nongnu.org/util-vserver/"
-SRC_URI="http://ftp.linux-vserver.org/pub/utils/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-IUSE=""
-
-DEPEND=">=dev-libs/dietlibc-0.30-r2
-	dev-libs/beecrypt
-	net-firewall/iptables
-	net-misc/vconfig
-	sys-apps/iproute2"
-
-RDEPEND="sys-apps/iproute2
-	net-misc/vconfig
-	net-firewall/iptables
-	dev-libs/beecrypt"
-
-pkg_setup() {
-	if [[ -z "${VDIRBASE}" ]]; then
-		einfo
-		einfo "You can change the default vserver base directory (/vservers)"
-		einfo "by setting the VDIRBASE environment variable."
-	fi
-
-	: ${VDIRBASE:=/vservers}
-
-	einfo
-	einfo "Using \"${VDIRBASE}\" as vserver base directory"
-	einfo
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-openrc.patch
-}
-
-src_compile() {
-	econf --with-vrootdir=${VDIRBASE} \
-		--with-initscripts=gentoo \
-		--localstatedir=/var || die "econf failed!"
-	emake || die "emake failed!"
-}
-
-src_install() {
-	make DESTDIR="${D}" install install-distribution \
-		|| die "make install failed!"
-
-	# keep dirs
-	keepdir /var/run/vservers
-	keepdir /var/run/vservers.rev
-	keepdir /var/run/vshelper
-	keepdir /var/lock/vservers
-	keepdir /var/cache/vservers
-	keepdir "${VDIRBASE}"
-	keepdir "${VDIRBASE}"/.pkg
-
-	# remove legacy config file
-	rm -f "${D}"/etc/vservers.conf
-
-	# bash-completion
-	dobashcompletion "${FILESDIR}"/bash_completion util-vserver
-
-	dodoc README ChangeLog NEWS AUTHORS THANKS util-vserver.spec
-}
-
-pkg_postinst() {
-	# Create VDIRBASE in postinst, so it is (a) not unmerged and (b) also
-	# present when merging.
-
-	[ ! -d "${VDIRBASE}" ] && mkdir -p "${VDIRBASE}" &> /dev/null
-	setattr --barrier "${VDIRBASE}" &> /dev/null
-
-	rm /etc/vservers/.defaults/vdirbase
-	ln -sf "${VDIRBASE}" /etc/vservers/.defaults/vdirbase
-
-	elog
-	elog "You have to run the vprocunhide command after every reboot"
-	elog "in order to setup /proc permissions correctly for vserver"
-	elog "use. An init script has been installed by this package."
-	elog "To use it you should add it to a runlevel:"
-	elog
-	elog " rc-update add vprocunhide default"
-	elog
-
-	if has_version "<${CATEGORY}/${PN}-0.30.211" ; then
-		ewarn "Please make sure, that you remove the old init-script from any"
-		ewarn "runlevel and remove it from your init.d dir!"
-		ewarn
-		ewarn "# rc-update del vservers"
-		ewarn "# rm -f ${ROOT}etc/init.d/vservers"
-		ewarn
-		ewarn "Since util-vserver-0.30.211 all Gentoo specific wrappers"
-		ewarn "have been merged upstream, and may now have a slightly"
-		ewarn "different syntax, i.e. you have to update scripts that"
-		ewarn "depend on these wrappers (vesync, vemerge, vupdateworld"
-		ewarn "and vdispatch-conf)"
-		ewarn
-		ewarn "Additionally the init scripts have changed and now use"
-		ewarn "upstream scripts as backend. An init script to start"
-		ewarn "virtual servers in the 'default' group/mark has been"
-		ewarn "installed by this ebuild:"
-		ewarn
-		ewarn "  rc-update add vservers.default default"
-		ewarn
-		ewarn "To start vservers in other groups/marks, you have to"
-		ewarn "symlink the default init script the same way you do"
-		ewarn "with net.* scripts:"
-		ewarn
-		ewarn "  ln -s /etc/init.d/vservers.default /etc/init.d/vservers.<mark>"
-		ewarn
-	fi
-
-	ewarn "You should definitly fix up the barrier of your vserver"
-	ewarn "base directory by using the following command in a root shell:"
-	ewarn
-	ewarn " setattr --barrier ${VDIRBASE}"
-	ewarn
-}
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 ecc34fcfd288..668539b8b564 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
+# Copyright 1999-2008 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.3 2007/11/17 21:50:34 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.214.ebuild,v 1.4 2008/04/13 10:24:11 hollow Exp $
 
 WANT_AUTOMAKE="1.9"
 
@@ -16,16 +16,16 @@ KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
 
 IUSE=""
 
-DEPEND=">=dev-libs/dietlibc-0.30-r2
-	dev-libs/beecrypt
+CDEPEND="dev-libs/beecrypt
 	net-firewall/iptables
 	net-misc/vconfig
-	sys-apps/iproute2"
+	sys-apps/iproute2
+	|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp )"
 
-RDEPEND="sys-apps/iproute2
-	net-misc/vconfig
-	net-firewall/iptables
-	dev-libs/beecrypt"
+DEPEND=">=dev-libs/dietlibc-0.30-r2
+	${CDEPEND}"
+
+RDEPEND="${CDEPEND}"
 
 pkg_setup() {
 	if [[ -z "${VDIRBASE}" ]]; then
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.215.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.215.ebuild
index 9f4badae4cdb..c7aea21d334d 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.215.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.215.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.215.ebuild,v 1.1 2008/03/17 09:16:31 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.215.ebuild,v 1.2 2008/04/13 10:24:11 hollow Exp $
 
 WANT_AUTOMAKE="1.9"
 
@@ -12,20 +12,20 @@ SRC_URI="http://ftp.linux-vserver.org/pub/utils/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
 
 IUSE=""
 
-DEPEND=">=dev-libs/dietlibc-0.30-r2
-	dev-libs/beecrypt
+CDEPEND="dev-libs/beecrypt
 	net-firewall/iptables
 	net-misc/vconfig
-	sys-apps/iproute2"
+	sys-apps/iproute2
+	|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp )"
 
-RDEPEND="sys-apps/iproute2
-	net-misc/vconfig
-	net-firewall/iptables
-	dev-libs/beecrypt"
+DEPEND=">=dev-libs/dietlibc-0.30-r2
+	${CDEPEND}"
+
+RDEPEND="${CDEPEND}"
 
 pkg_setup() {
 	if [[ -z "${VDIRBASE}" ]]; then
@@ -41,6 +41,12 @@ pkg_setup() {
 	einfo
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-openrc.patch
+}
+
 src_compile() {
 	econf --with-vrootdir=${VDIRBASE} \
 		--with-initscripts=gentoo \