209-r1 to stable amd64 and x86

(Portage version: 2.1_pre1)

5 files changed, 9 insertions, 125 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index f312ce6393c5..123da1e81456 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.37 2005/12/12 10:08:58 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.38 2005/12/24 21:13:20 hollow Exp $
+
+  24 Dec 2005; Benedikt Boehm <hollow@gentoo.org>
+  -util-vserver-0.30.209.ebuild, util-vserver-0.30.209-r1.ebuild:
+  209-r1 to stable amd64 and x86
 
   12 Dec 2005; Christian Heim <phreak@gentoo.org>
   util-vserver-0.30.208-r5.ebuild, util-vserver-0.30.209.ebuild,
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index 9e77156249a3..d9d84810f782 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 be0ff973617be374e425826d6f1b6826 ChangeLog 7440
+MD5 99aadfdfa0e8bbfa0f322ec40e5f222f ChangeLog 7590
 MD5 0722ed435a03b8e1c03b0b319045891c files/digest-util-vserver-0.30.208-r5 157
-MD5 2c8a53015c77a0f7222ab5e18ca59246 files/digest-util-vserver-0.30.209 154
 MD5 d12341fed81bbbfc770dbdb5cf953bd2 files/digest-util-vserver-0.30.209-r1 157
 MD5 493021fa14e20216e8ce772e9dc10a62 metadata.xml 588
 MD5 d0c4b41a161f741058f84b411d84ed98 util-vserver-0.30.208-r5.ebuild 2908
-MD5 ea619e476df18b02824f289cbd298c5d util-vserver-0.30.209-r1.ebuild 2909
-MD5 e6d43589c105f41cb1a6e6d9d78ee916 util-vserver-0.30.209.ebuild 2894
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDnUxuflZ8QqxhrsMRAk7cAJ9bYE/nW8WhxBeW277VabEVgb1AogCgi4zC
-yTBZVP6aD47HY4p8P1MoH8Q=
-=rFJG
------END PGP SIGNATURE-----
+MD5 59c62cc9accef59ac0f80d663a841e11 util-vserver-0.30.209-r1.ebuild 2907
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.209 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.209
deleted file mode 100644
index 069e9ad6b4b5..000000000000
--- a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.209
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4bb30253297cfdae7fb8b5700422d405 util-vserver-0.30.209-gentoo.tar.bz2 11777
-MD5 674b122824292c20d3c53245b91f6088 util-vserver-0.30.209.tar.bz2 585233
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.209-r1.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.209-r1.ebuild
index 160961ea6b24..ecde080e6f71 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.209-r1.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.209-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.209-r1.ebuild,v 1.3 2005/12/12 10:08:58 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.209-r1.ebuild,v 1.4 2005/12/24 21:13:20 hollow Exp $
 
 inherit autotools eutils toolchain-funcs
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.13thfloor.at/~ensc/util-vserver/files/alpha/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE=""
 
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.209.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.209.ebuild
deleted file mode 100644
index 365afd9725d4..000000000000
--- a/sys-cluster/util-vserver/util-vserver-0.30.209.ebuild
+++ /dev/null
@@ -1,106 +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.209.ebuild,v 1.5 2005/12/12 10:08:58 phreak 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/distfiles/${P}-gentoo.tar.bz2
-	http://dev.gentoo.org/~phreak/distfiles/${P}-gentoo.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
-
-	cp "${WORKDIR}"/tools/* scripts/ || die "failed to copy gentoo tools"
-	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
-	doconfd "${WORKDIR}"/conf.d/vservers
-
-	dodoc README ChangeLog NEWS AUTHORS 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 vservers 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
-	ewarn "IMPORTANT UPGRADE WARNING:"
-	ewarn
-	ewarn "Since 0.30.208-r3 the vprocunhide init-script has been merged"
-	ewarn "with the vservers init script. The following steps are"
-	ewarn "required to keep current behaviour:"
-	ewarn
-	ewarn " rc-update del vprocunhide"
-	ewarn " rc-update add vservers default"
-	ewarn
-}