version bump wrt #401203. straight to stable since current stable openrc breaks any older version of util-vserver

(Portage version: 2.2.0_alpha87/cvs/Linux x86_64, RepoMan options: --force)

4 files changed, 11 insertions, 286 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index fb019323eef1..93f5ec5a6f99 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.109 2012/02/17 10:13:52 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.110 2012/02/18 16:57:17 hollow Exp $
+
+*util-vserver-0.30.216_pre3025 (18 Feb 2012)
+
+  18 Feb 2012; Benedikt Böhm <hollow@gentoo.org>
+  -util-vserver-0.30.216_pre2955.ebuild, -util-vserver-0.30.216_pre3004.ebuild,
+  -util-vserver-0.30.216_pre3011.ebuild, +util-vserver-0.30.216_pre3025.ebuild:
+  version bump wrt #401203. straight to stable since current stable openrc
+  breaks any older version of util-vserver
 
 *util-vserver-0.30.216_pre3011 (17 Feb 2012)
 
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.216_pre2955.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre2955.ebuild
deleted file mode 100644
index 5c4120f8e634..000000000000
--- a/sys-cluster/util-vserver/util-vserver-0.30.216_pre2955.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2011 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.216_pre2955.ebuild,v 1.2 2011/11/20 09:13:21 xarthisius Exp $
-
-EAPI=4
-
-inherit eutils bash-completion
-
-MY_P=${P/_/-}
-S="${WORKDIR}"/${MY_P}
-
-DESCRIPTION="Linux-VServer admin utilities"
-HOMEPAGE="http://www.nongnu.org/util-vserver/"
-SRC_URI="http://people.linux-vserver.org/~dhozac/t/uv-testing/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~sparc ~x86"
-
-IUSE=""
-
-CDEPEND="dev-libs/beecrypt
-	net-firewall/iptables
-	net-misc/vconfig
-	sys-apps/iproute2
-	|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp )"
-
-DEPEND=">=dev-libs/dietlibc-0.30-r2
-	${CDEPEND}"
-
-RDEPEND="${CDEPEND}"
-
-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_test() {
-	# do not use $D from portage by accident (#297982)
-	sed -i -e 's/^\$D //' "${S}"/src/testsuite/vunify-test.sh
-	default
-}
-
-src_configure() {
-	econf --with-vrootdir=${VDIRBASE} \
-		--with-initscripts=gentoo \
-		--localstatedir=/var
-}
-
-src_compile() {
-	emake || die "emake failed!"
-}
-
-src_install() {
-	make DESTDIR="${D}" install install-distribution \
-		|| die "make 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}"
-	keepdir "${VDIRBASE}"/.pkg
-
-	# remove legacy config file
-	rm -f "${D}"/etc/vservers.conf
-
-	# bash-completion
-	dobashcompletion "${FILESDIR}"/bash_completion util-vserver
-
-	dodoc README ChangeLog NEWS AUTHORS THANKS util-vserver.spec
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-0.30.211"
-	old_init_script_warn=$?
-}
-
-pkg_postinst() {
-	# Create VDIRBASE in postinst, so it is (a) not unmerged and (b) also
-	# present when merging.
-
-	[ ! -d "${VDIRBASE}" ] && mkdir -p "${VDIRBASE}" &> /dev/null
-	setattr --barrier "${VDIRBASE}" &> /dev/null
-
-	rm /etc/vservers/.defaults/vdirbase
-	ln -sf "${VDIRBASE}" /etc/vservers/.defaults/vdirbase
-
-	elog
-	elog "You have to run the vprocunhide command after every reboot"
-	elog "in order to setup /proc permissions correctly for vserver"
-	elog "use. An init script has been installed by this package."
-	elog "To use it you should add it to a runlevel:"
-	elog
-	elog " rc-update add vprocunhide default"
-	elog
-
-	if [[ $old_init_script_warn = 0 ]] ; then
-		ewarn "Please make sure, that you remove the old init-script from any"
-		ewarn "runlevel and remove it from your init.d dir!"
-		ewarn
-		ewarn "# rc-update del vservers"
-		ewarn "# rm -f ${ROOT}etc/init.d/vservers"
-		ewarn
-		ewarn "Since util-vserver-0.30.211 all Gentoo specific wrappers"
-		ewarn "have been merged upstream, and may now have a slightly"
-		ewarn "different syntax, i.e. you have to update scripts that"
-		ewarn "depend on these wrappers (vesync, vemerge, vupdateworld"
-		ewarn "and vdispatch-conf)"
-		ewarn
-		ewarn "Additionally the init scripts have changed and now use"
-		ewarn "upstream scripts as backend. An init script to start"
-		ewarn "virtual servers in the 'default' group/mark has been"
-		ewarn "installed by this ebuild:"
-		ewarn
-		ewarn "  rc-update add vservers.default default"
-		ewarn
-		ewarn "To start vservers in other groups/marks, you have to"
-		ewarn "symlink the default init script the same way you do"
-		ewarn "with net.* scripts:"
-		ewarn
-		ewarn "  ln -s /etc/init.d/vservers.default /etc/init.d/vservers.<mark>"
-		ewarn
-	fi
-}
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3004.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3004.ebuild
deleted file mode 100644
index 6a4fb4ad3b8a..000000000000
--- a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3004.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2012 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.216_pre3004.ebuild,v 1.1 2012/01/30 10:45:09 hollow Exp $
-
-EAPI=4
-
-inherit eutils bash-completion
-
-MY_P=${P/_/-}
-S="${WORKDIR}"/${MY_P}
-
-DESCRIPTION="Linux-VServer admin utilities"
-HOMEPAGE="http://www.nongnu.org/util-vserver/"
-SRC_URI="http://people.linux-vserver.org/~dhozac/t/uv-testing/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~sparc ~x86"
-
-IUSE=""
-
-CDEPEND="dev-libs/beecrypt
-	net-firewall/iptables
-	net-misc/vconfig
-	sys-apps/iproute2
-	|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp )"
-
-DEPEND=">=dev-libs/dietlibc-0.30-r2
-	${CDEPEND}"
-
-RDEPEND="${CDEPEND}"
-
-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_test() {
-	# do not use $D from portage by accident (#297982)
-	sed -i -e 's/^\$D //' "${S}"/src/testsuite/vunify-test.sh
-	default
-}
-
-src_configure() {
-	econf --with-vrootdir=${VDIRBASE} \
-		--with-initscripts=gentoo \
-		--localstatedir=/var
-}
-
-src_compile() {
-	emake || die "emake failed!"
-}
-
-src_install() {
-	make DESTDIR="${D}" install install-distribution \
-		|| die "make 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}"
-	keepdir "${VDIRBASE}"/.pkg
-
-	# remove legacy config file
-	rm -f "${D}"/etc/vservers.conf
-
-	# bash-completion
-	dobashcompletion "${FILESDIR}"/bash_completion util-vserver
-
-	dodoc README ChangeLog NEWS AUTHORS THANKS util-vserver.spec
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-0.30.211"
-	old_init_script_warn=$?
-}
-
-pkg_postinst() {
-	# Create VDIRBASE in postinst, so it is (a) not unmerged and (b) also
-	# present when merging.
-
-	[ ! -d "${VDIRBASE}" ] && mkdir -p "${VDIRBASE}" &> /dev/null
-	setattr --barrier "${VDIRBASE}" &> /dev/null
-
-	rm /etc/vservers/.defaults/vdirbase
-	ln -sf "${VDIRBASE}" /etc/vservers/.defaults/vdirbase
-
-	elog
-	elog "You have to run the vprocunhide command after every reboot"
-	elog "in order to setup /proc permissions correctly for vserver"
-	elog "use. An init script has been installed by this package."
-	elog "To use it you should add it to a runlevel:"
-	elog
-	elog " rc-update add vprocunhide default"
-	elog
-
-	if [[ $old_init_script_warn = 0 ]] ; then
-		ewarn "Please make sure, that you remove the old init-script from any"
-		ewarn "runlevel and remove it from your init.d dir!"
-		ewarn
-		ewarn "# rc-update del vservers"
-		ewarn "# rm -f ${ROOT}etc/init.d/vservers"
-		ewarn
-		ewarn "Since util-vserver-0.30.211 all Gentoo specific wrappers"
-		ewarn "have been merged upstream, and may now have a slightly"
-		ewarn "different syntax, i.e. you have to update scripts that"
-		ewarn "depend on these wrappers (vesync, vemerge, vupdateworld"
-		ewarn "and vdispatch-conf)"
-		ewarn
-		ewarn "Additionally the init scripts have changed and now use"
-		ewarn "upstream scripts as backend. An init script to start"
-		ewarn "virtual servers in the 'default' group/mark has been"
-		ewarn "installed by this ebuild:"
-		ewarn
-		ewarn "  rc-update add vservers.default default"
-		ewarn
-		ewarn "To start vservers in other groups/marks, you have to"
-		ewarn "symlink the default init script the same way you do"
-		ewarn "with net.* scripts:"
-		ewarn
-		ewarn "  ln -s /etc/init.d/vservers.default /etc/init.d/vservers.<mark>"
-		ewarn
-	fi
-}
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3011.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3025.ebuild
index fd597715fbba..f8a2f5e720ba 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3011.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3025.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.216_pre3011.ebuild,v 1.1 2012/02/17 10:13:52 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.216_pre3025.ebuild,v 1.1 2012/02/18 16:57:17 hollow Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ SRC_URI="http://people.linux-vserver.org/~dhozac/t/uv-testing/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~sparc x86"
 
 IUSE=""
 
@@ -64,10 +64,6 @@ src_install() {
 	make DESTDIR="${D}" install install-distribution \
 		|| die "make install failed!"
 
-	# make sure cgroup is mounted in the right place
-	mkdir -p "${D}"/etc/vservers/.defaults/cgroup
-	echo /sys/fs/cgroup > "${D}"/etc/vservers/.defaults/cgroup/mnt
-
 	# keep dirs
 	keepdir /var/run/vservers
 	keepdir /var/run/vservers.rev
@@ -77,9 +73,6 @@ src_install() {
 	keepdir "${VDIRBASE}"
 	keepdir "${VDIRBASE}"/.pkg
 
-	# remove legacy config file
-	rm -f "${D}"/etc/vservers.conf
-
 	# bash-completion
 	newbashcomp "${FILESDIR}"/bash_completion ${PN}
 
@@ -96,10 +89,6 @@ pkg_postinst() {
 	rm /etc/vservers/.defaults/vdirbase
 	ln -sf "${VDIRBASE}" /etc/vservers/.defaults/vdirbase
 
-	# make sure cgroup is mounted in the right place
-	mkdir -p /etc/vservers/.defaults/cgroup
-	echo /sys/fs/cgroup > /etc/vservers/.defaults/cgroup/mnt
-
 	elog
 	elog "You have to run the vprocunhide command after every reboot"
 	elog "in order to setup /proc permissions correctly for vserver"