version bump, cleanup

(Portage version: 2.1.2.2)

4 files changed, 24 insertions, 33 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index 236e78148378..5b8193c3bc6d 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,10 @@
 # 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.76 2007/03/29 21:14:00 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.77 2007/04/05 17:37:57 hollow Exp $
+
+  05 Apr 2007; Benedikt Böhm <hollow@gentoo.org>
+  -util-vserver-0.30.212-r1.ebuild, +util-vserver-0.30.213_rc6.ebuild:
+  version bump, cleanup
 
   29 Mar 2007; Benedikt Böhm <hollow@gentoo.org>
   +util-vserver-0.30.213_rc5.ebuild:
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.212-r1 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.212-r1
deleted file mode 100644
index 0babb2f87de0..000000000000
--- a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.212-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 386b91732b7f0f132b4e9d978389dcc2 util-vserver-0.30.212.tar.bz2 643139
-RMD160 e0bb7600204c99bf2192332b2fb5680cd647d226 util-vserver-0.30.212.tar.bz2 643139
-SHA256 dad182f0c882f32d96cab8d9065e4417d9c2f8146e1e2c9f197580389cc4a484 util-vserver-0.30.212.tar.bz2 643139
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.213_rc6 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.213_rc6
new file mode 100644
index 000000000000..15bdf76c26b6
--- /dev/null
+++ b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.213_rc6
@@ -0,0 +1,3 @@
+MD5 01d74784652ba339ac3b7a56317416aa util-vserver-0.30.213-rc6.tar.bz2 659195
+RMD160 ebd8c8c12b3556ceaad7267aa6e1ce4fe069f545 util-vserver-0.30.213-rc6.tar.bz2 659195
+SHA256 c7a8d1a3f0285cd73743b7cf887135ff8a0817e04db40e42ea483e5d7d1d5ee4 util-vserver-0.30.213-rc6.tar.bz2 659195
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.212-r1.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.213_rc6.ebuild
index 4779107ed1b1..a80cf321fb6f 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.212-r1.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.213_rc6.ebuild
@@ -1,26 +1,33 @@
 # 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.212-r1.ebuild,v 1.2 2007/01/21 14:09:20 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.213_rc6.ebuild,v 1.1 2007/04/05 17:37:57 hollow Exp $
 
-inherit eutils bash-completion
+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"
+SRC_URI="http://people.linux-vserver.org/~dhozac/t/uv-testing/${P/_rc/-rc}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 
 IUSE=""
 
-RDEPEND="dev-libs/beecrypt
+DEPEND=">=dev-libs/dietlibc-0.30-r2
+	dev-libs/beecrypt
 	net-firewall/iptables
 	net-misc/vconfig
 	sys-apps/iproute2"
 
-DEPEND="${RDEPEND}
-	>=dev-libs/dietlibc-0.30-r2"
+RDEPEND="sys-apps/iproute2
+	net-misc/vconfig
+	net-firewall/iptables
+	dev-libs/beecrypt"
+
+S="${WORKDIR}/${P/_rc/-rc}"
 
 pkg_setup() {
 	if [[ -z "${VDIRBASE}" ]]; then
@@ -36,18 +43,10 @@ pkg_setup() {
 	einfo
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-wrapper.patch
-	epatch "${FILESDIR}"/${P}-initpost.patch
-}
-
 src_compile() {
 	econf --with-vrootdir=${VDIRBASE} \
-		--localstatedir=/var \
-		--with-initrddir=/etc/init.d || die "econf failed!"
+		--with-initscripts=gentoo \
+		--localstatedir=/var || die "econf failed!"
 	emake || die "emake failed!"
 }
 
@@ -55,11 +54,6 @@ src_install() {
 	make DESTDIR="${D}" install install-distribution \
 		|| die "make install failed!"
 
-	# create the /sbin/vshelper symlink so we don't have to mess around with
-	# (a) echoing stuff to /etc/sysctl.conf
-	# (b) changing the default vshelper in the kernel sources.
-	dosym /usr/lib/util-vserver/vshelper /sbin/vshelper
-
 	# keep dirs
 	keepdir /var/run/vservers
 	keepdir /var/run/vservers.rev
@@ -71,13 +65,6 @@ src_install() {
 	# remove legacy config file
 	rm -f "${D}"/etc/vservers.conf
 
-	# remove the non-gentoo init-scripts:
-	rm -f "${D}"/etc/init.d/*
-
-	# and install gentoo'ized ones:
-	doinitd "${FILESDIR}"/init.d/vservers.default
-	doinitd "${FILESDIR}"/init.d/vprocunhide
-
 	# bash-completion
 	dobashcompletion "${FILESDIR}"/bash_completion util-vserver