lockfile fix; hardened fix; syscall updates; minor fixes; cleanup

(Portage version: 2.0.52-r1)

14 files changed, 113 insertions, 455 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index 6f4c062eb017..a309233bafe0 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-cluster/util-vserver
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.25 2005/08/30 06:05:36 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.26 2005/10/01 07:34:00 hollow Exp $
+
+*util-vserver-0.30.208-r3 (01 Oct 2005)
+
+  01 Oct 2005; Benedikt Boehm <hollow@gentoo.org>
+  -files/0.30.208-r1/vservers.confd, -files/0.30.208-r1/vservers.initd,
+  -util-vserver-0.30.207.ebuild, -util-vserver-0.30.208.ebuild,
+  -util-vserver-0.30.208-r1.ebuild, -util-vserver-0.30.208-r2.ebuild,
+  +util-vserver-0.30.208-r3.ebuild:
+  lockfile fix; hardened fix; syscall updates; new init script; cleanup
 
 *util-vserver-0.30.208-r2 (30 Aug 2005)
 
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index 723af88910fc..3ee44b177e8b 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -1,27 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7e09ae18b680cde9a65841825b5cca28 ChangeLog 5034
+MD5 567053d6cb94dadb089f7d23b6f7b8dc ChangeLog 5440
 MD5 b55bfb88b955107a0f0e6c5aaef21723 metadata.xml 162
 MD5 720b866e5950871ab9c672f678bb5909 util-vserver-0.30.205-r1.ebuild 1926
-MD5 f29aa933d0444049e1d84a00b0402ffc util-vserver-0.30.207.ebuild 1962
-MD5 fff43e39c76c24ff96f4c61e78878f64 util-vserver-0.30.208.ebuild 1962
-MD5 f2e84fd637169889eae9b5b971e619a9 util-vserver-0.30.208-r1.ebuild 2241
-MD5 2f744c909dd827973119520be84cec84 util-vserver-0.30.208-r2.ebuild 2124
+MD5 27f1abf281c42fb775d35d9e71e50803 util-vserver-0.30.208-r3.ebuild 2562
 MD5 b3c3f9e3c220a288d48c43ef109ddf2b files/vservers.confd 1560
 MD5 9f45fd567b0b82deb30b950b680d983a files/vservers.initd 1692
 MD5 09276c3e50cf5c0f8d30ef0422f05fd8 files/vprocunhide 570
 MD5 4bd7088cb72bd60e8ed7b7e562f3ea95 files/digest-util-vserver-0.30.205-r1 74
-MD5 e9f396453e3aeb9f364489b7baec4238 files/digest-util-vserver-0.30.207 74
-MD5 a71c848ecb606f355054a9fb34bb6970 files/digest-util-vserver-0.30.208-r1 154
-MD5 9bef009652d5bbb4ee70d04bc7adb4ba files/digest-util-vserver-0.30.208-r2 157
-MD5 0fb2840471aeb47987109d913eb11413 files/digest-util-vserver-0.30.208 74
-MD5 697cd56c9853cbbaff1920b1d2e4deb9 files/0.30.208-r1/vservers.confd 1697
-MD5 31e730ae55387d6a9638f2107524630b files/0.30.208-r1/vservers.initd 1838
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDM4ZMmPFBzbX68WERAnjZAJ9LTUzCEeGvSran7O4U5ELiCAH6WgCeMGgm
-aCXm9eAYpY5a5d/ZWOHa8MU=
-=cRQR
------END PGP SIGNATURE-----
+MD5 14608df972e2a679a7c99744366dbbe7 files/digest-util-vserver-0.30.208-r3 157
diff --git a/sys-cluster/util-vserver/files/0.30.208-r1/vservers.confd b/sys-cluster/util-vserver/files/0.30.208-r1/vservers.confd
deleted file mode 100644
index a97ee5478833..000000000000
--- a/sys-cluster/util-vserver/files/0.30.208-r1/vservers.confd
+++ /dev/null
@@ -1,40 +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.208-r1/vservers.confd,v 1.1 2005/08/03 18:33:37 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"
-
-# A space-delimited list of vservers to start
-# This can be used together with MARKS or as a replacement
-#START_VSERVERS=""
-
-# 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.208-r1/vservers.initd b/sys-cluster/util-vserver/files/0.30.208-r1/vservers.initd
deleted file mode 100644
index 02ae73bd2e95..000000000000
--- a/sys-cluster/util-vserver/files/0.30.208-r1/vservers.initd
+++ /dev/null
@@ -1,81 +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.208-r1/vservers.initd,v 1.1 2005/08/03 18:33:37 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
-		
-		for VSERVER in ${START_VSERVERS}; do
-			ebegin "Starting vserver '${VSERVER}'"
-			${_VSERVER} ${VSERVER} start
-			eend $?
-		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/digest-util-vserver-0.30.207 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.207
deleted file mode 100644
index ab1c1be3a449..000000000000
--- a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.207
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1c8457a687643ae8a7b1f1d34ebbdd68 util-vserver-0.30.207.tar.bz2 564286
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
deleted file mode 100644
index e2ca4d30db0d..000000000000
--- a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.208
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4453ad0ae7f351fec651d6904e00521f util-vserver-0.30.208.tar.bz2 580935
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.208-r1 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.208-r1
deleted file mode 100644
index 67b067fed4a0..000000000000
--- a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.208-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4453ad0ae7f351fec651d6904e00521f util-vserver-0.30.208.tar.bz2 580935
-MD5 cea3b3c8339fdd7c5329c0d6a9b43aa8 util-vserver-0.30.208-gentoo.tar.bz2 16191
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.208-r2 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.208-r2
deleted file mode 100644
index 34f354bb76cf..000000000000
--- a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.208-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4453ad0ae7f351fec651d6904e00521f util-vserver-0.30.208.tar.bz2 580935
-MD5 9449cfae19ae42439326286093a1f078 util-vserver-0.30.208-gentoo-r2.tar.bz2 18125
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.208-r3 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.208-r3
new file mode 100644
index 000000000000..91f5106243f0
--- /dev/null
+++ b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.208-r3
@@ -0,0 +1,2 @@
+MD5 4453ad0ae7f351fec651d6904e00521f util-vserver-0.30.208.tar.bz2 580935
+MD5 97ee5692ab45124f59ffa78f37cfdb2c util-vserver-0.30.208-gentoo-r3.tar.bz2 21957
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.207.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.207.ebuild
deleted file mode 100644
index 7f6b258365c2..000000000000
--- a/sys-cluster/util-vserver/util-vserver-0.30.207.ebuild
+++ /dev/null
@@ -1,72 +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.207.ebuild,v 1.7 2005/08/30 06:05:36 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
-}
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.208-r1.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.208-r1.ebuild
deleted file mode 100644
index 94d5ac5b9125..000000000000
--- a/sys-cluster/util-vserver/util-vserver-0.30.208-r1.ebuild
+++ /dev/null
@@ -1,83 +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.208-r1.ebuild,v 1.4 2005/08/30 06:05:36 hollow Exp $
-
-inherit eutils
-
-DESCRIPTION="Linux-VServer admin utilities"
-HOMEPAGE="http://www.nongnu.org/util-vserver/"
-SRC_URI="http://www.13thfloor.at/~ensc/util-vserver/files/alpha/${P}.tar.bz2 \
-	http://dev.gentoo.org/~hollow/vserver/${PN}/${P}-gentoo.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~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_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
-	epatch ${WORKDIR}/patches/*.patch
-}
-
-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}/0.30.208-r1/vservers.initd vservers
-	newexe ${FILESDIR}/vprocunhide vprocunhide
-
-	# install conf.d files
-	insinto /etc/conf.d
-	newins ${FILESDIR}/0.30.208-r1/vservers.confd vservers
-
-	# install vserver build script for gentoo guests
-	dosbin ${WORKDIR}/tools/vserver-new
-
-	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
-}
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.208-r2.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.208-r2.ebuild
deleted file mode 100644
index e6691b16ba2d..000000000000
--- a/sys-cluster/util-vserver/util-vserver-0.30.208-r2.ebuild
+++ /dev/null
@@ -1,79 +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.208-r2.ebuild,v 1.3 2005/09/23 04:34:58 hollow Exp $
-
-inherit eutils
-
-DESCRIPTION="Linux-VServer admin utilities"
-HOMEPAGE="http://www.nongnu.org/util-vserver/"
-SRC_URI="http://www.13thfloor.at/~ensc/util-vserver/files/alpha/${P}.tar.bz2 \
-	http://dev.gentoo.org/~hollow/vserver/${PN}/${P}-gentoo-${PR}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="glibc crypt"
-DEPEND="!glibc? ( >=dev-libs/dietlibc-0.27 )
-	glibc? ( sys-libs/glibc )
-	crypt? ( dev-libs/beecrypt )
-	sys-apps/iproute2
-	net-misc/vconfig
-	net-firewall/iptables
-	sys-process/procps"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-
-	epatch ${WORKDIR}/patches/*.patch
-}
-
-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:
-	doinitd ${WORKDIR}/init.d/{vservers,vprocunhide}
-	doconfd ${WORKDIR}/conf.d/vservers
-
-	# install vserver build script for gentoo guests
-	dosbin ${WORKDIR}/tools/vserver-new
-
-	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
-}
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.208-r3.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.208-r3.ebuild
new file mode 100644
index 000000000000..5729314a7692
--- /dev/null
+++ b/sys-cluster/util-vserver/util-vserver-0.30.208-r3.ebuild
@@ -0,0 +1,98 @@
+# 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-r3.ebuild,v 1.1 2005/10/01 07:34:00 hollow Exp $
+
+inherit autotools eutils toolchain-funcs
+
+DESCRIPTION="Linux-VServer admin utilities"
+HOMEPAGE="http://www.nongnu.org/util-vserver/"
+SRC_URI="http://www.13thfloor.at/~ensc/util-vserver/files/alpha/${P}.tar.bz2 \
+	http://dev.gentoo.org/~hollow/vserver/${PN}/${P}-gentoo-${PR}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+DEPEND=">=dev-libs/dietlibc-0.28
+	dev-libs/beecrypt
+	net-firewall/iptables
+	net-misc/vconfig
+	sys-apps/iproute2
+	sys-process/procps"
+
+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} || die
+	cd "${S}" || die
+
+	epatch "${WORKDIR}"/patches/*.patch
+
+	AT_M4DIR="-I m4" \
+	eautoreconf
+}
+
+src_compile() {
+	econf --localstatedir=/var \
+	      --with-initrddir=/etc/init.d \
+	      --with-vrootdir="${VDIRBASE}" || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make 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 "${VDIRBASE}"
+	fperms 000 "${VDIRBASE}"
+
+	# remove the non-gentoo init-scripts:
+	rm -f "${D}"/etc/init.d/*
+
+	# and install gentoo'ized ones:
+	doinitd "${WORKDIR}"/init.d/{vservers,vprocunhide}
+	doconfd "${WORKDIR}"/conf.d/vservers
+
+	# install some usefull gentoo vserver scripts
+	dosbin "${WORKDIR}"/tools/*
+
+	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 has been installed by this package."
+	einfo "To use it you should add it to a runlevel:"
+	einfo
+	einfo " rc-update add vserver default"
+	einfo
+	einfo "This init script will also help you to start/stop your vservers"
+	einfo "on reboot. See ${ROOT}etc/conf.d/vserver for details"
+	ewarn
+	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.208.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.208.ebuild
deleted file mode 100644
index 2f1756fa194f..000000000000
--- a/sys-cluster/util-vserver/util-vserver-0.30.208.ebuild
+++ /dev/null
@@ -1,72 +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.208.ebuild,v 1.3 2005/08/30 06:05:36 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
-}