version bump. fixes #446206

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 128 insertions, 2 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index a5ecc4fa5ce3..3c00e9006359 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,13 @@
 # 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.111 2012/12/05 06:03:49 patrick Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.112 2013/02/10 19:49:25 hollow Exp $
+
+*util-vserver-0.30.216_pre3038 (10 Feb 2013)
+
+  10 Feb 2013; Benedikt Böhm <hollow@gentoo.org>
+  +util-vserver-0.30.216_pre3038.ebuild,
+  +files/util-vserver-0.30.216-varlock.patch:
+  version bump. fixes #446206
 
   05 Dec 2012; Patrick Lauer <patrick@gentoo.org>
   util-vserver-0.30.216_pre3025.ebuild:
diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.216-varlock.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.216-varlock.patch
new file mode 100644
index 000000000000..2597ff5a63a0
--- /dev/null
+++ b/sys-cluster/util-vserver/files/util-vserver-0.30.216-varlock.patch
@@ -0,0 +1,19 @@
+commit 13a83fe9e08e8667ee42c62d0631ca8ebbed7e89
+Author: Benedikt Böhm <bb@xnull.de>
+Date:   Sun Feb 10 20:35:06 2013 +0100
+
+    gentoo: use /var/run for new /run compatibility
+
+diff --git a/scripts/vserver-init.functions b/scripts/vserver-init.functions
+index fef3c82..7feb27d 100755
+--- a/scripts/vserver-init.functions
++++ b/scripts/vserver-init.functions
+@@ -27,7 +27,7 @@ elif test -e /etc/gentoo-release; then
+     success() { eend 0; }
+     passed()  { eend 0; }
+     failure() { eend 1; }
+-    lockfile=/var/lock/vservers/$LOCKFILE
++    lockfile=/var/run/$LOCKFILE
+ else
+     _beginResult() { echo -n "$@..."; }
+     _postResult() { :; }
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3038.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3038.ebuild
new file mode 100644
index 000000000000..8167552e95bf
--- /dev/null
+++ b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3038.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2013 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_pre3038.ebuild,v 1.1 2013/02/10 19:49:25 hollow Exp $
+
+EAPI=4
+
+inherit eutils bash-completion-r1
+
+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 ~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.33_pre20110403
+	${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_prepare() {
+	epatch "${FILESDIR}"/util-vserver-0.30.216-varlock.patch
+}
+
+src_configure() {
+	econf --with-vrootdir=${VDIRBASE} \
+		--with-initscripts=gentoo \
+		--localstatedir=/var
+}
+
+src_compile() {
+	emake -j1 || die "emake failed!"
+}
+
+src_install() {
+	make DESTDIR="${D}" install install-distribution \
+		|| die "make install failed!"
+
+	# keep dirs
+	keepdir /var/cache/vservers
+	keepdir "${VDIRBASE}"
+	keepdir "${VDIRBASE}"/.pkg
+
+	# bash-completion
+	newbashcomp "${FILESDIR}"/bash_completion ${PN}
+
+	dodoc README ChangeLog NEWS AUTHORS THANKS util-vserver.spec
+}
+
+pkg_postinst() {
+	# Create VDIRBASE in postinst, so it is (a) not unmerged and (b) also
+	# present when merging.
+
+	mkdir -p "${VDIRBASE}"
+	setattr --barrier "${VDIRBASE}"
+
+	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
+}