Version bump; 205-r1 to stable; cleanup

Package-Manager: portage-2.0.51.22-r1

17 files changed, 125 insertions, 313 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index 53787e94515d..2fc00544a584 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for sys-cluster/util-vserver
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.20 2005/06/12 09:43:54 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.21 2005/07/18 15:27:15 hollow Exp $
+
+*util-vserver-0.30.208 (18 Jul 2005)
+
+  18 Jul 2005; Benedikt Boehm <hollow@gentoo.org>
+  -files/0.30.205/vprocunhide, -files/0.30.205/vservers.confd,
+  -files/0.30.205/vservers.initd, -files/0.30.205/vshelper-shutdown-hack,
+  +files/vprocunhide, files/vservers.initd, -util-vserver-0.30.196.ebuild,
+  -util-vserver-0.30.204.ebuild, -util-vserver-0.30.205.ebuild,
+  util-vserver-0.30.205-r1.ebuild, util-vserver-0.30.207.ebuild,
+  +util-vserver-0.30.208.ebuild:
+  Version bump; 205-r1 to stable; cleanup
+
+  15 Jun 2005; Benedikt Boehm <hollow@gentoo.org>
+  util-vserver-0.30.207.ebuild:
+  fixed vshelper hack
 
   12 Jun 2005; Benedikt Boehm <hollow@gentoo.org>
   +files/0.30.205/vshelper-shutdown-hack, util-vserver-0.30.207.ebuild:
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index 2d325fcb01bb..f9f9f5a48806 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -1,28 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 cfb26bc3d642e861226c0ba046394f44 ChangeLog 3553
+MD5 2f6a05c20b55e64025ca50105c9b792c ChangeLog 4163
 MD5 3d4dfb4356f56ee83e0f426163e3b6cf metadata.xml 231
-MD5 3d6eec0e3d10c7a6e4a95e448c03a06e util-vserver-0.30.196.ebuild 1268
-MD5 5eb10d9678fd96a1f56d1eb157b3994a util-vserver-0.30.204.ebuild 1285
-MD5 48ce588c1f3255fa31e1a4cee82c1d27 util-vserver-0.30.205-r1.ebuild 1763
-MD5 5460093cd5050c0938518baa9a56cb55 util-vserver-0.30.205.ebuild 1284
-MD5 85072d17078116476bbf1d4a642c1231 util-vserver-0.30.207.ebuild 2287
-MD5 7bae473a0bf1ad73103118220c3fa924 files/vservers.confd 1739
-MD5 8de53dd957127f3ba125f733c1b7389b files/vservers.initd 1792
-MD5 0f34731a7d8119fc5e3f9322bf727521 files/digest-util-vserver-0.30.196 74
-MD5 12cd58b1dedc5d8f583cf66aad57ac51 files/digest-util-vserver-0.30.204 74
+MD5 63305730c069d9dbe9776caaf1a4150e util-vserver-0.30.205-r1.ebuild 1926
+MD5 a7c1cab65b8e8af19ee8951c484e4948 util-vserver-0.30.207.ebuild 1962
+MD5 fa2efdab74039371d79f859843ac0f1f util-vserver-0.30.208.ebuild 1962
+MD5 30d0e165963778b642e6b52a6fd8a341 files/vservers.confd 1569
+MD5 9f45fd567b0b82deb30b950b680d983a files/vservers.initd 1692
+MD5 09276c3e50cf5c0f8d30ef0422f05fd8 files/vprocunhide 570
 MD5 4bd7088cb72bd60e8ed7b7e562f3ea95 files/digest-util-vserver-0.30.205-r1 74
-MD5 4bd7088cb72bd60e8ed7b7e562f3ea95 files/digest-util-vserver-0.30.205 74
 MD5 e9f396453e3aeb9f364489b7baec4238 files/digest-util-vserver-0.30.207 74
-MD5 4096356a4cb49d0ec50eee25c925d24f files/0.30.205/vprocunhide 579
-MD5 30d0e165963778b642e6b52a6fd8a341 files/0.30.205/vservers.confd 1569
-MD5 acd935ab2632dfa0f2213d11b0025f97 files/0.30.205/vservers.initd 1701
-MD5 16d2c34a9a86dbb4ffa033a2969c6c39 files/0.30.205/vshelper-shutdown-hack 12
+MD5 0fb2840471aeb47987109d913eb11413 files/digest-util-vserver-0.30.208 74
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCrBWgmPFBzbX68WERAvQnAJwIkZQID4/WPAYgBl6+q8RObZnZfwCeNr/n
-KrERyVfaVnhpPdrCxAH8vQw=
-=AkRL
+iD8DBQFC28pymPFBzbX68WERAqinAJ99ByiDDy4tHMikDLFtzPcoQYSN4QCeMp9m
+6UYoMxF2CSpD3rGJt0hEQxc=
+=PEy/
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/util-vserver/files/0.30.205/vservers.confd b/sys-cluster/util-vserver/files/0.30.205/vservers.confd
deleted file mode 100644
index 79e46aabdc4b..000000000000
--- a/sys-cluster/util-vserver/files/0.30.205/vservers.confd
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/files/0.30.205/vservers.confd,v 1.2 2005/06/12 09:43:54 hollow Exp $
-
-# A space-delimited list of vserver MARKS to start. 
-# Identification of vservers happens by
-# putting the flavor into /etc/vservers/<vserver-id>/apps/init/mark.
-MARKS="default"
-
-# Wether to start all vservers by default (supersedes MARKS)
-# This will be enabled if STARTALL is set regardless of its content
-# i.e. you have to comment to disable it
-#STARTALL=yes
-
-# Wether to stop all vservers by default (supersedes MARKS)
-# This will be enabled if STOPALL is set regardless of its content
-# i.e. you have to comment to disable it
-STOPALL=yes
-
-# Number of vservers which shall be started in parallel; since most
-# initmethods are spending much time in sleeps, it is safe to
-# use a high number here, though you should pay attention if you make 
-# use of depends in /etc/vservers as some services may not be up if
-# started in parallel
-#NUMPARALLEL=6
-
-# The name of the vserver lock directory which is used by the init script
-# to determine which MARKS have already been started (used within
-# vstatus() to show the status of MARKS). Default should be good
-# for everyone. Change at your own risk
-#LOCKDIR=/var/lock/vservers
-
-# The location of util-vserver-vars
-# This file contains variables to util-vserver scripts used within the
-# init script. Change at your own risk.
-#UTIL_VSERVER_VARS=/usr/lib/util-vserver/util-vserver-vars
diff --git a/sys-cluster/util-vserver/files/0.30.205/vservers.initd b/sys-cluster/util-vserver/files/0.30.205/vservers.initd
deleted file mode 100644
index 10a5aae896ab..000000000000
--- a/sys-cluster/util-vserver/files/0.30.205/vservers.initd
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/files/0.30.205/vservers.initd,v 1.1 2005/04/07 14:23:52 hollow Exp $
-
-opts="${opts} vstatus"
-
-checkconfig() {
-	: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
-	if [[ ! -e ${UTIL_VSERVER_VARS} ]]; then
-		eerror "Cannot find util-vserver installation"
-		eerror "(the file '$UTIL_VSERVER_VARS' would be expected)"
-		exit 1
-	fi
-	. ${UTIL_VSERVER_VARS}
-	
-	: ${MARKS:=default}
-	: ${NUMPARALLEL:=1}
-	: ${LOCKDIR:=/var/lock/vservers}
-}
-
-start() {
-	checkconfig
-	
-	if [[ -n ${STARTALL} ]]; then
-		ebegin "Starting all vservers"
-		${_START_VSERVERS} -j ${NUMPARALLEL} --all --start
-		local rc=$?
-		[[ $rc -eq 0 ]] && touch ${LOCKDIR}/all
-		eend $rc
-	else
-		for MARK in ${MARKS}; do
-			ebegin "Starting vservers of type '${MARK}'"
-			${_START_VSERVERS} -m ${MARK} -j ${NUMPARALLEL} --all --start
-			local rc=$?
-			[[ $rc -eq 0 ]] && touch ${LOCKDIR}/${MARK}
-			eend $rc
-		done
-	fi
-}
-
-stop() {
-	checkconfig
-	
-	if [[ -n ${STOPALL} ]]; then
-		ebegin "Stopping all vservers"
-		${_START_VSERVERS} -j ${NUMPARALLEL} --all --stop
-		local rc=$?
-		rm -f ${LOCKDIR}/all
-		eend $rc
-	else
-		for MARK in ${MARKS}; do
-			ebegin "Stopping vservers of type '${MARK}'"
-			${_START_VSERVERS} -m ${MARK} -j ${NUMPARALLEL} --all --stop
-			local rc=$?
-			rm ${LOCKDIR}/${MARK}
-			eend $rc
-		done
-	fi
-
-}
-
-vstatus() {
-	checkconfig
-
-	einfo "${LOCKDIR} shows the follwing types of vservers running:"
-	for i in ${LOCKDIR}/*; do
-		einfo "  ${i}"
-		local running="true"
-	done
-	
-	if [[ "${running}" != "true" ]]; then
-		einfo "  none"
-	fi
-}
diff --git a/sys-cluster/util-vserver/files/0.30.205/vshelper-shutdown-hack b/sys-cluster/util-vserver/files/0.30.205/vshelper-shutdown-hack
deleted file mode 100644
index b23e55619b2f..000000000000
--- a/sys-cluster/util-vserver/files/0.30.205/vshelper-shutdown-hack
+++ /dev/null
@@ -1 +0,0 @@
-#!/bin/true
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.196 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.196
deleted file mode 100644
index c97631be2d85..000000000000
--- a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.196
+++ /dev/null
@@ -1 +0,0 @@
-MD5 84e966a7e657ea1bb7bc35a8d369882b util-vserver-0.30.196.tar.bz2 497922
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.204 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.204
deleted file mode 100644
index 6dce9cd0c7e1..000000000000
--- a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.204
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c97c78fa4a085639499b582cdf827c3a util-vserver-0.30.204.tar.bz2 519199
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.205 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.205
deleted file mode 100644
index 67554560bf5b..000000000000
--- a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.205
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9d509327744fd5dfa84faa68531853c3 util-vserver-0.30.205.tar.bz2 556725
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.208 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.208
new file mode 100644
index 000000000000..e2ca4d30db0d
--- /dev/null
+++ b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.208
@@ -0,0 +1 @@
+MD5 4453ad0ae7f351fec651d6904e00521f util-vserver-0.30.208.tar.bz2 580935
diff --git a/sys-cluster/util-vserver/files/0.30.205/vprocunhide b/sys-cluster/util-vserver/files/vprocunhide
index 6175b0abbecd..aa8e3b667700 100644
--- a/sys-cluster/util-vserver/files/0.30.205/vprocunhide
+++ b/sys-cluster/util-vserver/files/vprocunhide
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/files/0.30.205/vprocunhide,v 1.1 2005/04/07 14:23:52 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/files/vprocunhide,v 1.3 2005/07/18 15:27:15 hollow Exp $
 
 start() {
 	: ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars}
diff --git a/sys-cluster/util-vserver/files/vservers.initd b/sys-cluster/util-vserver/files/vservers.initd
index ce98ee2e3d5c..a8cab109f24d 100644
--- a/sys-cluster/util-vserver/files/vservers.initd
+++ b/sys-cluster/util-vserver/files/vservers.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/files/vservers.initd,v 1.2 2005/03/30 11:43:40 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/files/vservers.initd,v 1.3 2005/07/18 15:27:15 hollow Exp $
 
 opts="${opts} vstatus"
 
@@ -22,12 +22,6 @@ checkconfig() {
 start() {
 	checkconfig
 	
-	if [[ -n ${UNHIDEPROC} ]]; then
-		ebegin "Unhiding /proc entries"
-		${_VPROCUNHIDE}
-		eend $?
-	fi
-	
 	if [[ -n ${STARTALL} ]]; then
 		ebegin "Starting all vservers"
 		${_START_VSERVERS} -j ${NUMPARALLEL} --all --start
@@ -68,6 +62,7 @@ stop() {
 
 vstatus() {
 	checkconfig
+
 	einfo "${LOCKDIR} shows the follwing types of vservers running:"
 	for i in ${LOCKDIR}/*; do
 		einfo "  ${i}"
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.196.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.196.ebuild
deleted file mode 100644
index ac244bece7bc..000000000000
--- a/sys-cluster/util-vserver/util-vserver-0.30.196.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2005 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.196.ebuild,v 1.5 2005/03/30 11:43:40 hollow Exp $
-
-inherit eutils
-
-DESCRIPTION="vserver admin utilities (alpha version)"
-SRC_URI="http://www-user.tu-chemnitz.de/~ensc/util-vserver/alpha/${P}.tar.bz2"
-HOMEPAGE="http://www-user.tu-chemnitz.de/~ensc/util-vserver/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-
-IUSE=""
-DEPEND=">=dev-libs/dietlibc-0.24
-	sys-apps/iproute2
-	net-firewall/iptables"
-
-src_compile() {
-	local myconf="--localstatedir=/var --with-initrddir=/etc/init.d"
-
-	econf ${myconf} || die "econf failed"
-	emake || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "install failed"
-
-	# keep dirs
-	keepdir /var/run/vservers
-	keepdir /var/lock/vservers
-	keepdir /var/run/vshelper
-	keepdir /vservers
-	fperms 000 /vservers
-
-	# remove the non-gentoo init-scripts:
-	rm -f ${D}/etc/init.d/*
-
-	# and install gentoo'ized ones:
-	exeinto /etc/init.d/
-	newexe ${FILESDIR}/vservers.initd vservers
-
-	# install conf.d files
-	insinto /etc/conf.d
-	newins ${FILESDIR}/vservers.confd vservers
-
-	dodoc README ChangeLog NEWS AUTHORS INSTALL THANKS util-vserver.spec
-}
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.204.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.204.ebuild
deleted file mode 100644
index 0eccc5852c4e..000000000000
--- a/sys-cluster/util-vserver/util-vserver-0.30.204.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2005 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.204.ebuild,v 1.4 2005/03/30 11:43:40 hollow Exp $
-
-inherit eutils
-
-DESCRIPTION="vserver admin utilities (alpha version)"
-SRC_URI="http://www-user.tu-chemnitz.de/~ensc/util-vserver/alpha/${P}.tar.bz2"
-HOMEPAGE="http://www-user.tu-chemnitz.de/~ensc/util-vserver/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE=""
-DEPEND=">=dev-libs/dietlibc-0.26-r1
-	sys-apps/iproute2
-	net-misc/vconfig
-	net-firewall/iptables"
-
-src_compile() {
-	local myconf="--localstatedir=/var --with-initrddir=/etc/init.d"
-
-	econf ${myconf} || die "econf failed"
-	emake || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "install failed"
-
-	# keep dirs
-	keepdir /var/run/vservers
-	keepdir /var/lock/vservers
-	keepdir /var/run/vshelper
-	keepdir /vservers
-	fperms 000 /vservers
-
-	# remove the non-gentoo init-scripts:
-	rm -f ${D}/etc/init.d/*
-
-	# and install gentoo'ized ones:
-	exeinto /etc/init.d/
-	newexe ${FILESDIR}/vservers.initd vservers
-
-	# install conf.d files
-	insinto /etc/conf.d
-	newins ${FILESDIR}/vservers.confd vservers
-
-	dodoc README ChangeLog NEWS AUTHORS INSTALL THANKS util-vserver.spec
-}
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.205-r1.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.205-r1.ebuild
index 14794835cd3a..722f2839bd19 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.205-r1.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.205-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.205-r1.ebuild,v 1.3 2005/06/12 09:43:54 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.205-r1.ebuild,v 1.4 2005/07/18 15:27:15 hollow Exp $
 
 inherit eutils
 
@@ -10,14 +10,14 @@ HOMEPAGE="http://www.nongnu.org/util-vserver/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 IUSE="glibc"
 DEPEND="!glibc? ( >=dev-libs/dietlibc-0.26-r1 )
-		glibc? ( sys-libs/glibc )
-		sys-apps/iproute2
-		net-misc/vconfig
-		net-firewall/iptables"
+	glibc? ( sys-libs/glibc )
+	sys-apps/iproute2
+	net-misc/vconfig
+	net-firewall/iptables"
 
 src_compile() {
 	local myconf="--localstatedir=/var --with-initrddir=/etc/init.d"
@@ -43,12 +43,12 @@ src_install() {
 
 	# and install gentoo'ized ones:
 	exeinto /etc/init.d/
-	newexe ${FILESDIR}/${PV}/vservers.initd vservers
-	newexe ${FILESDIR}/${PV}/vprocunhide vprocunhide
+	newexe ${FILESDIR}/vservers.initd vservers
+	newexe ${FILESDIR}/vprocunhide vprocunhide
 
 	# install conf.d files
 	insinto /etc/conf.d
-	newins ${FILESDIR}/${PV}/vservers.confd vservers
+	newins ${FILESDIR}/vservers.confd vservers
 
 	dodoc README ChangeLog NEWS AUTHORS INSTALL THANKS util-vserver.spec
 }
@@ -57,9 +57,15 @@ pkg_postinst() {
 	einfo
 	einfo "You have to run the vprocunhide command after every reboot"
 	einfo "in order to setup /proc permissions correctly for vserver"
-	einfo "use. A init script is provided by this package. To use it"
+	einfo "use. An init script is provided by this package. To use it"
 	einfo "you should add it to a runlevel:"
 	einfo
 	einfo " rc-update add vprocunhide default"
 	einfo
+
+	ewarn "You should definitly fix up the barrier of your /vserver"
+	ewarn "basedir by using the following command in a root shell: "
+	ewarn
+	ewarn " setattr --barrier /vservers"
+	ewarn
 }
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.205.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.205.ebuild
deleted file mode 100644
index 080368d37966..000000000000
--- a/sys-cluster/util-vserver/util-vserver-0.30.205.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2005 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.205.ebuild,v 1.1 2005/03/30 11:43:40 hollow Exp $
-
-inherit eutils
-
-DESCRIPTION="vserver admin utilities (alpha version)"
-SRC_URI="http://www.13thfloor.at/~ensc/util-vserver/files/alpha/${P}.tar.bz2"
-HOMEPAGE="http://www-user.tu-chemnitz.de/~ensc/util-vserver/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE=""
-DEPEND=">=dev-libs/dietlibc-0.26-r1
-	sys-apps/iproute2
-	net-misc/vconfig
-	net-firewall/iptables"
-
-src_compile() {
-	local myconf="--localstatedir=/var --with-initrddir=/etc/init.d"
-
-	econf ${myconf} || die "econf failed"
-	emake || die "compile failed"
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "install failed"
-
-	# keep dirs
-	keepdir /var/run/vservers
-	keepdir /var/lock/vservers
-	keepdir /var/run/vshelper
-	keepdir /vservers
-	fperms 000 /vservers
-
-	# remove the non-gentoo init-scripts:
-	rm -f ${D}/etc/init.d/*
-
-	# and install gentoo'ized ones:
-	exeinto /etc/init.d/
-	newexe ${FILESDIR}/vservers.initd vservers
-
-	# install conf.d files
-	insinto /etc/conf.d
-	newins ${FILESDIR}/vservers.confd vservers
-
-	dodoc README ChangeLog NEWS AUTHORS INSTALL THANKS util-vserver.spec
-}
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.207.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.207.ebuild
index 362b9c9a71ac..b44fcc69f005 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.207.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.207.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.207.ebuild,v 1.4 2005/06/12 10:58:32 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.207.ebuild,v 1.5 2005/07/18 15:27:15 hollow Exp $
 
 inherit eutils
 
@@ -44,18 +44,12 @@ src_install() {
 
 	# and install gentoo'ized ones:
 	exeinto /etc/init.d/
-	newexe ${FILESDIR}/0.30.205/vservers.initd vservers
-	newexe ${FILESDIR}/0.30.205/vprocunhide vprocunhide
+	newexe ${FILESDIR}/vservers.initd vservers
+	newexe ${FILESDIR}/vprocunhide vprocunhide
 
 	# install conf.d files
 	insinto /etc/conf.d
-	newins ${FILESDIR}/0.30.205/vservers.confd vservers
-
-	# Under some conditions there is a race between two vshelpers and the vps
-	# stop doesn't end. So we add a cheap workaround to bypass this until
-	# this is fixed in util-vserver itself
-	exeinto /etc/vservers/.defaults/apps/vserver-delegate
-	newexe ${FILESDIR}/0.30.205/vshelper-shutdown-hack shutdown
+	newins ${FILESDIR}/vservers.confd vservers
 
 	dodoc README ChangeLog NEWS AUTHORS INSTALL THANKS util-vserver.spec
 }
@@ -64,14 +58,14 @@ pkg_postinst() {
 	einfo
 	einfo "You have to run the vprocunhide command after every reboot"
 	einfo "in order to setup /proc permissions correctly for vserver"
-	einfo "use. A init script is provided by this package. To use it"
+	einfo "use. An init script is provided by this package. To use it"
 	einfo "you should add it to a runlevel:"
 	einfo
 	einfo " rc-update add vprocunhide default"
 	einfo
 
 	ewarn "You should definitly fix up the barrier of your /vserver"
-	ewarn "basedir by entering the following in a root window: "
+	ewarn "basedir by using the following command in a root shell: "
 	ewarn
 	ewarn " setattr --barrier /vservers"
 	ewarn
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.208.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.208.ebuild
new file mode 100644
index 000000000000..e20e405e2263
--- /dev/null
+++ b/sys-cluster/util-vserver/util-vserver-0.30.208.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2005 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.208.ebuild,v 1.1 2005/07/18 15:27:15 hollow Exp $
+
+inherit eutils
+
+DESCRIPTION="Linux-VServer admin utilities"
+SRC_URI="http://www.13thfloor.at/~ensc/util-vserver/files/alpha/${P}.tar.bz2"
+HOMEPAGE="http://www.nongnu.org/util-vserver/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE="glibc crypt"
+DEPEND="!glibc? ( >=dev-libs/dietlibc-0.27 )
+		glibc? ( sys-libs/glibc )
+		sys-apps/iproute2
+		net-misc/vconfig
+		crypt? ( dev-libs/beecrypt )
+		net-firewall/iptables"
+
+src_compile() {
+	local myconf="--localstatedir=/var --with-initrddir=/etc/init.d"
+
+	use glibc && myconf="${myconf} --disable-dietlibc"
+
+	econf ${myconf} || die "econf failed"
+	emake || die "compile failed"
+}
+
+src_install() {
+	emake DESTDIR=${D} install || die "install failed"
+
+	# keep dirs
+	keepdir /var/run/vservers
+	keepdir /var/run/vservers.rev
+	keepdir /var/run/vshelper
+	keepdir /var/lock/vservers
+	keepdir /vservers
+
+	# remove the non-gentoo init-scripts:
+	rm -f ${D}/etc/init.d/*
+
+	# and install gentoo'ized ones:
+	exeinto /etc/init.d/
+	newexe ${FILESDIR}/vservers.initd vservers
+	newexe ${FILESDIR}/vprocunhide vprocunhide
+
+	# install conf.d files
+	insinto /etc/conf.d
+	newins ${FILESDIR}/vservers.confd vservers
+
+	dodoc README ChangeLog NEWS AUTHORS INSTALL THANKS util-vserver.spec
+}
+
+pkg_postinst() {
+	einfo
+	einfo "You have to run the vprocunhide command after every reboot"
+	einfo "in order to setup /proc permissions correctly for vserver"
+	einfo "use. An init script is provided by this package. To use it"
+	einfo "you should add it to a runlevel:"
+	einfo
+	einfo " rc-update add vprocunhide default"
+	einfo
+
+	ewarn "You should definitly fix up the barrier of your /vserver"
+	ewarn "basedir by using the following command in a root shell: "
+	ewarn
+	ewarn " setattr --barrier /vservers"
+	ewarn
+}