fix diet, add r2

(Portage version: 2.0.51.22-r2)

8 files changed, 158 insertions, 69 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index 383fcafcb8d7..6f4c062eb017 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,14 @@
 # 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.24 2005/08/28 06:14:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.25 2005/08/30 06:05:36 hollow Exp $
+
+*util-vserver-0.30.208-r2 (30 Aug 2005)
+
+  30 Aug 2005; Benedikt Boehm <hollow@gentoo.org>
+  util-vserver-0.30.205-r1.ebuild, 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:
+  add back dietlibc support; add -r2 with a new tar (includes new fixes)
 
   28 Aug 2005; Mike Frysinger <vapier@gentoo.org>
   util-vserver-0.30.205-r1.ebuild, util-vserver-0.30.207.ebuild,
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index a41b391aca62..ad166f7bf8e2 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -1,25 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2bd4dc4af2a55c7050ad853514862377 util-vserver-0.30.207.ebuild 1840
-MD5 6b5ca9f04c208c69aecc6ba087fca4cd util-vserver-0.30.205-r1.ebuild 1807
+MD5 9bfd1d87b6973e53af3f282e5c390f73 ChangeLog 5034
 MD5 b55bfb88b955107a0f0e6c5aaef21723 metadata.xml 162
-MD5 4e83e418413ba50811f143e02f9dea80 util-vserver-0.30.208.ebuild 1840
-MD5 5acefc9da7007be9b4bb109699e4b6d9 util-vserver-0.30.208-r1.ebuild 2108
-MD5 6239c67aca93a3edc1ad59a30a0a218c ChangeLog 4703
+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 d45a304a36c8277861e93d12a8623464 util-vserver-0.30.208-r1.ebuild 2240
+MD5 1bfac761d3d8f0e3be0ac1d460777718 util-vserver-0.30.208-r2.ebuild 2102
 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 0fb2840471aeb47987109d913eb11413 files/digest-util-vserver-0.30.208 74
 MD5 a71c848ecb606f355054a9fb34bb6970 files/digest-util-vserver-0.30.208-r1 154
-MD5 4bd7088cb72bd60e8ed7b7e562f3ea95 files/digest-util-vserver-0.30.205-r1 74
+MD5 a71c848ecb606f355054a9fb34bb6970 files/digest-util-vserver-0.30.208-r2 154
+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)
-
-iD8DBQFDEVZJgIKl8Uu19MoRAg/iAJ9XwGanqyEoM6CPDfIST2xwrDn7vgCfQDYs
-0FHKDW9zJUyHa/tWXQLmVk8=
-=kx33
------END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..67b067fed4a0
--- /dev/null
+++ b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.208-r2
@@ -0,0 +1,2 @@
+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/util-vserver-0.30.205-r1.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.205-r1.ebuild
index 25047e233e60..8b5b2214fd23 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,33 +1,35 @@
 # 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.5 2005/08/28 06:14:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.205-r1.ebuild,v 1.6 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"
+HOMEPAGE="http://www.nongnu.org/util-vserver/"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
-IUSE=""
 
-DEPEND="sys-apps/iproute2
+IUSE="glibc"
+DEPEND="!glibc? ( >=dev-libs/dietlibc-0.26-r1 )
+	glibc? ( sys-libs/glibc )
+	sys-apps/iproute2
 	net-misc/vconfig
 	net-firewall/iptables"
 
 src_compile() {
-	econf \
-		--localstatedir=/var \
-		--with-initrddir=/etc/init.d \
-		--disable-dietlibc \
-		|| die "econf failed"
+	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() {
-	make DESTDIR=${D} install || die "install failed"
+	emake DESTDIR=${D} install || die "install failed"
 
 	# keep dirs
 	keepdir /var/run/vservers
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 b8986f25e5ec..7f6b258365c2 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.207.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.207.ebuild
@@ -1,34 +1,36 @@
 # 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.6 2005/08/28 06:14:11 vapier Exp $
+# $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"
-HOMEPAGE="http://www.nongnu.org/util-vserver/"
 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="crypt"
 
-DEPEND="sys-apps/iproute2
-	net-misc/vconfig
-	crypt? ( dev-libs/beecrypt )
-	net-firewall/iptables"
+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() {
-	econf \
-		--localstatedir=/var \
-		--with-initrddir=/etc/init.d \
-		--disable-dietlibc \
-		|| die "econf failed"
+	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() {
-	make DESTDIR=${D} install || die "install failed"
+	emake DESTDIR=${D} install || die "install failed"
 
 	# keep dirs
 	keepdir /var/run/vservers
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
index f5e6f3828979..94d5ac5b9125 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.208-r1.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.208-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.208-r1.ebuild,v 1.3 2005/08/28 06:14:11 vapier Exp $
+# $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
 
@@ -12,30 +12,33 @@ SRC_URI="http://www.13thfloor.at/~ensc/util-vserver/files/alpha/${P}.tar.bz2 \
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="crypt"
 
-DEPEND="sys-apps/iproute2
-	net-misc/vconfig
-	crypt? ( dev-libs/beecrypt )
-	net-firewall/iptables"
+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}
-	cd "${S}"
-	epatch "${WORKDIR}"/patches/*.patch
+	unpack ${A} || die
+	cd ${S} || die
+
+	epatch ${WORKDIR}/patches/*.patch
 }
 
 src_compile() {
-	econf \
-		--localstatedir=/var \
-		--with-initrddir=/etc/init.d \
-		--disable-dietlibc \
-		|| die "econf failed"
+	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() {
-	make DESTDIR=${D} install || die "install failed"
+	emake DESTDIR=${D} install || die "install failed"
 
 	# keep dirs
 	keepdir /var/run/vservers
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
new file mode 100644
index 000000000000..125d3dc7e81c
--- /dev/null
+++ b/sys-cluster/util-vserver/util-vserver-0.30.208-r2.ebuild
@@ -0,0 +1,78 @@
+# 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.1 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:
+	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.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.208.ebuild
index 6d1557a97762..2f1756fa194f 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.208.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.208.ebuild
@@ -1,34 +1,36 @@
 # 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.2 2005/08/28 06:14:11 vapier Exp $
+# $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"
-HOMEPAGE="http://www.nongnu.org/util-vserver/"
 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="crypt"
 
-DEPEND="sys-apps/iproute2
-	net-misc/vconfig
-	crypt? ( dev-libs/beecrypt )
-	net-firewall/iptables"
+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() {
-	econf \
-		--localstatedir=/var \
-		--with-initrddir=/etc/init.d \
-		--disable-dietlibc \
-		|| die "econf failed"
+	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() {
-	make DESTDIR=${D} install || die "install failed"
+	emake DESTDIR=${D} install || die "install failed"
 
 	# keep dirs
 	keepdir /var/run/vservers