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

Package-Manager: portage-2.2.0_alpha87/cvs/Linux x86_64
RepoMan-Options: --force

5 files changed, 14 insertions, 293 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/Manifest b/sys-cluster/util-vserver/Manifest
index d32fa4e27bbb..b461af67e669 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -5,12 +5,8 @@ AUX util-vserver-0.30.215-dietmmap.patch 2175 RMD160 30c191cb7a5e0b7a8fc667197a8
 AUX util-vserver-0.30.215-openrc.patch 1138 RMD160 936fe40430a9dcd0f8924d435952400bdfdbf858 SHA1 021d40edec6f602a050c01d1924ca990714face0 SHA256 f6a4d24c708ee882e506f63ad16cf259c06ef7840d860f77da74d8e970e9297c
 AUX util-vserver-0.30.215-typo.patch 564 RMD160 7b0619e24b9e30b4ba4bca2f0476a1f62206a3f4 SHA1 53d8d6e205175736280bafde41274501adbbfd9d SHA256 f0e809a33f32cf49e34f9c8c65803ba6bf96ecd2a233eb48338dbab3923a3c6b
 DIST util-vserver-0.30.216-pre2910.tar.bz2 714605 RMD160 b5e1c79207809bdc91700b5017a48fd08b4701e4 SHA1 bbfede97691778520d79be33e8e6a681146393b9 SHA256 a07b90442bb1de4cedac668fd505199eeb70aff53482e0bbd2535875cde46d06
-DIST util-vserver-0.30.216-pre2955.tar.bz2 720387 RMD160 c4fba92319338ff2806bf233bfdd20c5b32e2f23 SHA1 d707d5a64450e89152997dbd41afd32b1779ed09 SHA256 abe6405d12c0eb1675a2d0adf6a4c7b69e2aea4a6acb8eee41c4d614d75d7fa0
-DIST util-vserver-0.30.216-pre3004.tar.bz2 759801 RMD160 4923d93704c0d5c96a6816f6d5485741437abc68 SHA1 9d2565dde57ff583dda35357a2542b87a5817d61 SHA256 0ca56dede2f46db2b76a97f92ed7df85d015723e30171dc50adc793fe5026b70
-DIST util-vserver-0.30.216-pre3011.tar.bz2 760407 RMD160 657f805141ac252795a116921dfa52176b9b5525 SHA1 528afbb4c759bf41a6fd81043681f14adfc49d0f SHA256 15767e70c52e524bdc0fdff89f365606af97184eb7de88fe22528495b4761a98
+DIST util-vserver-0.30.216-pre3025.tar.bz2 760763 RMD160 9f67a4415031cc7b1d6ba0d0b22452a3b2472a2d SHA1 0108f2d121c0ec540d230fe3a33e27423487567d SHA256 6b6df2e96105361e7ede644d522e1cee60fd71ef72715b82e40a4a93ce7ea949
 EBUILD util-vserver-0.30.216_pre2910.ebuild 3573 RMD160 db376602c986be505745c75ab6e241fcb4afb41e SHA1 254d207c359282029933a643d7096ee54c33d47c SHA256 b296b6d0e7fc143045f652f6820cea10cbc204c90639cf0aa76d068afdf015bb
-EBUILD util-vserver-0.30.216_pre2955.ebuild 3718 RMD160 6b84ec959c93a1d759a464fba4e3ba5003bd006c SHA1 06c6cdcddd9e2add5a81c0c6d18526ed5a68da2f SHA256 3350ee35df322876b1c5bad8305948d09b9f16721af3c54b56130a4ad1e2b406
-EBUILD util-vserver-0.30.216_pre3004.ebuild 3714 RMD160 a0982d5c8dcfec90778a5bc093bf9940403b79f7 SHA1 7826a5f0803f1de87eafcd8b53f9683af9434d8c SHA256 a939d025376c3baea1826e50eb3dbe826aac948883ed00232f2dc83571482627
-EBUILD util-vserver-0.30.216_pre3011.ebuild 2768 RMD160 b6a020d5bf060e83241cb0d429604414a4e538ce SHA1 01c69cb9fafadd569b9ec3661a792dca71782164 SHA256 0d556b489027d1cc4d6c6d95ee432c46dd026fcc0c59553764279dc3f9c2537c
-MISC ChangeLog 22632 RMD160 3ab5bd5d8947f1a6ec9fa6a5a6151bd4215823b4 SHA1 c64e31f60a156f07d51cb634376cf12c9d619d63 SHA256 02eebe36ed88427296a4600d59241e80b8dcc0bcba20f31e317df98e7e86610e
+EBUILD util-vserver-0.30.216_pre3025.ebuild 2392 RMD160 d3d3375b5da462507c196dfcaf8638bc64c85074 SHA1 4b7f0b470f27bad430cb05085080cee467a23329 SHA256 8b6ce5f33b30aea2379f8bf91e6a2a7e75426c9be8fbcf25a366183dca1d3809
+MISC ChangeLog 23007 RMD160 03952aabb7211dca27c6f39bb3357201476a43cc SHA1 1946608e94e8f370de4f9d1bbe3dbb2e5b146530 SHA256 60f6fe950c45037ed098de00b27270379c10e579572a966c54d3931e32fb8b8b
 MISC metadata.xml 518 RMD160 62a73756fb710a0464dd24600e7ec70c82e13021 SHA1 78ee9f24180c1215ebe02ac3dbba80a7a0c4a82e SHA256 5a4f424248d873af9f0a66aca2e3e60c6165288fa649ef44de4d8418232c5ac0
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"