fix start-vservers, update keywords

Package-Manager: portage-2.1.1_pre1

3 files changed, 19 insertions, 132 deletions

diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index 599db66f7bfb..3e7544d8a0db 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -1,35 +1,35 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST util-vserver-0.30.210-patches-r12.tar.bz2 27463 RMD160 0dfaabc5bdf16f52d821749fa5b6b3710e34a0a7 SHA256 43e5365aeb6588344dfabe25e7a2e204354b1d934e1bf1bea817cac45bf7d354 size 27463
-DIST util-vserver-0.30.210-patches-r13.tar.bz2 26978 RMD160 440aa77df60dccaceea9cd3bad7bb902c4252632 SHA256 26000063103fe822ede1f8ce0c14d6f79b4757f76863420d06f3164dc167ad9e size 26978
-DIST util-vserver-0.30.210.tar.bz2 600032 RMD160 b8f426e319feeafc9be91315947c10a147586f1f SHA256 6ae5be2557f4659d260c68d239a8e879b0625201688807fd9baa4bdcc4580d04 size 600032
-EBUILD util-vserver-0.30.210-r12.ebuild 2939 RMD160 dc65f30f5290b30243fa9f9b46ab151f48679852 SHA1 2f89f055793bd8c83212288ab45ceedbcd14c53e SHA256 07abe4883b7a63cd5a457261df1c7a3e1a81735a846f22771b7ddb26146c4dcc size 2939
-MD5 51c094aa8c81874cf1116202f8d2eeca util-vserver-0.30.210-r12.ebuild 2939
-RMD160 dc65f30f5290b30243fa9f9b46ab151f48679852 util-vserver-0.30.210-r12.ebuild 2939
-SHA256 07abe4883b7a63cd5a457261df1c7a3e1a81735a846f22771b7ddb26146c4dcc util-vserver-0.30.210-r12.ebuild 2939
-EBUILD util-vserver-0.30.210-r13.ebuild 2939 RMD160 1b5b780c7667cc92b003f385b845b447a4615739 SHA1 6b49509f8a6b7ffd815daede6d711ae5a996383f SHA256 4b29196f4d64529f8ed06e98dc9f62b542ebca2081de80d227149fc14cae016e size 2939
+DIST util-vserver-0.30.210-patches-r13.tar.bz2 26978 RMD160 440aa77df60dccaceea9cd3bad7bb902c4252632 SHA1 6746c583f4b7018093050d0ed1e5df5857bdd9fb SHA256 26000063103fe822ede1f8ce0c14d6f79b4757f76863420d06f3164dc167ad9e
+DIST util-vserver-0.30.210-patches-r14.tar.bz2 27322 RMD160 8a10a48728f7cd09732e064b51cb6c0f40628873 SHA1 b4a462139e6863aab4a1441854045985b2110394 SHA256 8f2e4fd22e03cba4920c675ba95c07f97e781e251a59bcddc0573e29a4ec489d
+DIST util-vserver-0.30.210.tar.bz2 600032 RMD160 b8f426e319feeafc9be91315947c10a147586f1f SHA1 1075dc239277c7ecc76a644e7bbfeee869864595 SHA256 6ae5be2557f4659d260c68d239a8e879b0625201688807fd9baa4bdcc4580d04
+EBUILD util-vserver-0.30.210-r13.ebuild 2939 RMD160 1b5b780c7667cc92b003f385b845b447a4615739 SHA1 6b49509f8a6b7ffd815daede6d711ae5a996383f SHA256 4b29196f4d64529f8ed06e98dc9f62b542ebca2081de80d227149fc14cae016e
 MD5 a697d995f3c1b833f493edcbe30f7301 util-vserver-0.30.210-r13.ebuild 2939
 RMD160 1b5b780c7667cc92b003f385b845b447a4615739 util-vserver-0.30.210-r13.ebuild 2939
 SHA256 4b29196f4d64529f8ed06e98dc9f62b542ebca2081de80d227149fc14cae016e util-vserver-0.30.210-r13.ebuild 2939
-MISC ChangeLog 11225 RMD160 2983eaff2d5edc8aec99c61803a2bf1563e5a554 SHA1 9d468b8985f941fdf7a0c89775f529760eebaf61 SHA256 79264db83d7e157645972dae3ee5673f19bfa7b99d1137baddfe409c829165a0 size 11225
-MD5 3b80cad7b56f6139e7aa65cf6a43c509 ChangeLog 11225
-RMD160 2983eaff2d5edc8aec99c61803a2bf1563e5a554 ChangeLog 11225
-SHA256 79264db83d7e157645972dae3ee5673f19bfa7b99d1137baddfe409c829165a0 ChangeLog 11225
-MISC metadata.xml 588 RMD160 43bd819942f6f0c03bec0bcf67601a7099b59a2b SHA1 d0e5af40193886066bbe1060324dede1f0fd367f SHA256 798e87b6d5fb379322178e9f8b7432371f630caaf3fd6ff369e35056483cc31d size 588
+EBUILD util-vserver-0.30.210-r14.ebuild 2960 RMD160 696f9d518296210058cee71aee46af771a209f9a SHA1 87c9b7f71f64ce5bc5122cf50b9867875866ba7e SHA256 15b36587c74dd3c7d03fa036e77fccc7473035fe7ff163423acd4e8d5d4d7948
+MD5 728ad1a6982ad6dd9be76db80ae3c29b util-vserver-0.30.210-r14.ebuild 2960
+RMD160 696f9d518296210058cee71aee46af771a209f9a util-vserver-0.30.210-r14.ebuild 2960
+SHA256 15b36587c74dd3c7d03fa036e77fccc7473035fe7ff163423acd4e8d5d4d7948 util-vserver-0.30.210-r14.ebuild 2960
+MISC ChangeLog 11428 RMD160 e1091b39888ac5e37db490feda75717a803a7536 SHA1 33e2d5e11ad1a37f23228a18103248a054a90e94 SHA256 2824f868d5256331bd2f448404a869b93e8474c1424043b9bb766338e27a0275
+MD5 e3f0f06fcb4dc9062742cd6002240012 ChangeLog 11428
+RMD160 e1091b39888ac5e37db490feda75717a803a7536 ChangeLog 11428
+SHA256 2824f868d5256331bd2f448404a869b93e8474c1424043b9bb766338e27a0275 ChangeLog 11428
+MISC metadata.xml 588 RMD160 43bd819942f6f0c03bec0bcf67601a7099b59a2b SHA1 d0e5af40193886066bbe1060324dede1f0fd367f SHA256 798e87b6d5fb379322178e9f8b7432371f630caaf3fd6ff369e35056483cc31d
 MD5 493021fa14e20216e8ce772e9dc10a62 metadata.xml 588
 RMD160 43bd819942f6f0c03bec0bcf67601a7099b59a2b metadata.xml 588
 SHA256 798e87b6d5fb379322178e9f8b7432371f630caaf3fd6ff369e35056483cc31d metadata.xml 588
-MD5 6395d5c7448190c6fab531ac9715089b files/digest-util-vserver-0.30.210-r12 569
-RMD160 0b98c67583c59a723c29766bf41197d2aabfb065 files/digest-util-vserver-0.30.210-r12 569
-SHA256 41ff17f47f0db569fdb623a74df1e1817739accb1903e5abdf6fc8e612d28dd3 files/digest-util-vserver-0.30.210-r12 569
 MD5 0aec3bb8905993fbfdfea185685b14ff files/digest-util-vserver-0.30.210-r13 569
 RMD160 efac97c6e2e183aecebedb51641c161dc72400c6 files/digest-util-vserver-0.30.210-r13 569
 SHA256 79be461cd53fcb5001642cba8bb6209721985b5ded8d0a1069a5fa5b00ac77f0 files/digest-util-vserver-0.30.210-r13 569
+MD5 4466cca95361e1ff23c495b9eb9c5e3b files/digest-util-vserver-0.30.210-r14 569
+RMD160 8d1ecf7cd73d66a85937d1f6bdde8915eb89f3af files/digest-util-vserver-0.30.210-r14 569
+SHA256 2e7a110df6205960c2122c72bd0688c6f00acc53aca555031344434f262e29a2 files/digest-util-vserver-0.30.210-r14 569
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEXFIzmPFBzbX68WERAq7dAJ9hEH+tbzmjap0R9T57uEsht+YJhwCfQcji
-cIp2x1KyznZ53sNmo8+2viw=
-=4fDw
+iD8DBQFEnedEmPFBzbX68WERAuDsAJ4rvULHKZwikyTJFobLqINpBNV/WQCfWlTc
+NPmWMZoSpFnc2KO+wqEkRJk=
+=GOAL
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.210-r12 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.210-r12
deleted file mode 100644
index a5755e8101ce..000000000000
--- a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.210-r12
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 aee33917dd04580f2007574f7b2c572a util-vserver-0.30.210-patches-r12.tar.bz2 27463
-RMD160 0dfaabc5bdf16f52d821749fa5b6b3710e34a0a7 util-vserver-0.30.210-patches-r12.tar.bz2 27463
-SHA256 43e5365aeb6588344dfabe25e7a2e204354b1d934e1bf1bea817cac45bf7d354 util-vserver-0.30.210-patches-r12.tar.bz2 27463
-MD5 1e8fff7cb6246d21ed029f082123019b util-vserver-0.30.210.tar.bz2 600032
-RMD160 b8f426e319feeafc9be91315947c10a147586f1f util-vserver-0.30.210.tar.bz2 600032
-SHA256 6ae5be2557f4659d260c68d239a8e879b0625201688807fd9baa4bdcc4580d04 util-vserver-0.30.210.tar.bz2 600032
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.210-r12.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.210-r12.ebuild
deleted file mode 100644
index e7f498329923..000000000000
--- a/sys-cluster/util-vserver/util-vserver-0.30.210-r12.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2006 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.210-r12.ebuild,v 1.2 2006/04/14 11:17:59 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/distfiles/${P}-patches-${PR}.tar.bz2
-	http://dev.gentoo.org/~phreak/distfiles/${P}-patches-${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
-
-	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 /var/cache/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
-}