0.30.215 stable on amd64/x86; fix mktemp dependency; fix functions.sh location for openrc; remove old version

(Portage version: 2.1.5_rc2)

6 files changed, 61 insertions, 276 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index 44183e09bba1..75006cfb7ecf 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.89 2008/03/17 09:16:31 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.90 2008/04/13 10:24:11 hollow Exp $
+
+  13 Apr 2008; Benedikt Böhm <hollow@gentoo.org>
+  -files/util-vserver-0.30.214-openrc.patch,
+  +files/util-vserver-0.30.215-openrc.patch, util-vserver-0.30.214.ebuild,
+  -util-vserver-0.30.214-r1.ebuild, util-vserver-0.30.215.ebuild:
+  0.30.215 stable on amd64/x86; fix mktemp dependency; fix functions.sh
+  location for openrc; remove old version
 
 *util-vserver-0.30.215 (17 Mar 2008)
 
diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.214-openrc.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.214-openrc.patch
deleted file mode 100644
index 247f36537b42..000000000000
--- a/sys-cluster/util-vserver/files/util-vserver-0.30.214-openrc.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -NurpP util-vserver-0.30.214.orig/distrib/gentoo/initpost util-vserver-0.30.214/distrib/gentoo/initpost
---- util-vserver-0.30.214.orig/distrib/gentoo/initpost	2007-09-02 22:06:42.000000000 +0200
-+++ util-vserver-0.30.214/distrib/gentoo/initpost	2008-03-11 10:39:53.955478789 +0100
-@@ -51,6 +51,11 @@ $_CHROOT_SH mkdir /usr/portage 2>/dev/nu
- $_CHROOT_SH mkdir /usr/portage/distfiles 2>/dev/null || :
- 
- 
-+# check if we have openrc
-+have_openrc=0
-+$_CHROOT_SH testfile /lib/rc/bin/is_older_than && have_openrc=1
-+
-+
- # gentoo initstyle magic
- initstyle=sysv
- test -e "$cfgdir"/apps/init/style && initstyle=$(<"$cfgdir"/apps/init/style)
-@@ -59,8 +64,8 @@ if test "$initstyle" == "gentoo"; then
- 	echo ">>> Installing special init-style magic ... "
- 
- 	$_CAT "$__DISTRIBDIR"/gentoo/init-vserver.sh | \
--	$_CHROOT_SH truncate   /lib/rcscripts/sh/init-vserver.sh
--	$_CHROOT_SH chmod 0755 /lib/rcscripts/sh/init-vserver.sh
-+	$_CHROOT_SH truncate   /lib/rc/sh/init-vserver.sh
-+	$_CHROOT_SH chmod 0755 /lib/rc/sh/init-vserver.sh
- 
- 	$_CAT "$__DISTRIBDIR"/gentoo/reboot.sh | \
- 	$_CHROOT_SH truncate   /etc/init.d/reboot.sh
-@@ -78,23 +83,29 @@ if test "$initstyle" == "gentoo"; then
- 	echo "!!! Consult the Gentoo Handbook on how to chroot and install"
- 	echo "!!! packages into the guest environment."
- 	echo "!!!"
-+else
-+	# fix gettys in inittab
-+	if $_CHROOT_SH testfile /etc/inittab; then
-+		echo ">>> Fixing inittab ... "
-+		chrootsed /etc/inittab \
-+			-e 's/\(^[^#].*getty.*$\)/#\1/'
-+	fi
- fi
- 
--
- # unneeded runlevel scripts
--echo ">>> Fixing default runlevel scripts ... "
--$_CHROOT_SH rm /etc/runlevels/boot/{clock,consolefont,keymaps,modules,net.lo} 2>/dev/null || :
--$_CHROOT_SH rm /etc/runlevels/default/{hdparm,netmount} 2>/dev/null || :
--
-+if test $have_openrc -ne 1; then
-+	echo ">>> Fixing default runlevel scripts ... "
-+	$_CHROOT_SH rm /etc/runlevels/boot/{clock,consolefont,keymaps,modules,net.lo} 2>/dev/null || :
-+	$_CHROOT_SH rm /etc/runlevels/default/{hdparm,netmount} 2>/dev/null || :
-+fi
- 
- # setting hostname
- if test -r "$cfgdir"/uts/nodename && $_CHROOT_SH testfile /etc/conf.d/hostname; then
- 	echo ">>> Setting hostname ... "
- 	chrootsed /etc/conf.d/hostname \
--		-e "s:HOSTNAME=\"\(.*\)\":HOSTNAME=\"$(< "$cfgdir"/uts/nodename)\":"
-+		-e "s:\(HOSTNAME\)=\"\(.*\)\":\1=\"$(< "$cfgdir"/uts/nodename)\":i"
- fi
- 
--
- # fix syslog-ng.conf
- if $_CHROOT_SH testfile /etc/syslog-ng/syslog-ng.conf; then
- 	echo ">>> Fixing syslog-ng.conf ... "
-@@ -103,27 +114,21 @@ if $_CHROOT_SH testfile /etc/syslog-ng/s
- 		-e 's:\(.*console_all.*\):#\1:g'
- fi
- 
--
--# fix gettys in inittab
--if $_CHROOT_SH testfile /etc/inittab; then
--	echo ">>> Fixing inittab ... "
--	chrootsed /etc/inittab \
--		-e 's/\(^[^#].*getty.*$\)/#\1/'
--fi
--
--
- # fix fstab for checkfs/localmount in baselayout-2
- # (does not affect any previous versions)
--echo ">>> Fixing fstab ... "
--echo "/dev/hdv1 / ufs defaults 0 0" | $_CHROOT_SH truncate /etc/fstab
--
-+if test $have_openrc -ne 1; then
-+	echo ">>> Fixing fstab ... "
-+	echo "/dev/hdv1 / ufs defaults 0 0" | $_CHROOT_SH truncate /etc/fstab
-+fi
- 
- # always satisfy net dependency in baselayout-2
- # (does not affect any previous versions)
--echo ">>> Providing dummy net dependency ... "
--$_CAT "$__DISTRIBDIR"/gentoo/net.vserver | \
--$_CHROOT_SH truncate /etc/init.d/net.vserver
--$_CHROOT_SH chmod 0755 /etc/init.d/net.vserver
--$_CHROOT_SH link /etc/init.d/net.vserver /etc/runlevels/boot/net.vserver
-+if test $have_openrc -ne 1; then
-+	echo ">>> Providing dummy net dependency ... "
-+	$_CAT "$__DISTRIBDIR"/gentoo/net.vserver | \
-+	$_CHROOT_SH truncate /etc/init.d/net.vserver
-+	$_CHROOT_SH chmod 0755 /etc/init.d/net.vserver
-+	$_CHROOT_SH link /etc/init.d/net.vserver /etc/runlevels/boot/net.vserver
-+fi
- 
- popd &>/dev/null
-diff -NurpP util-vserver-0.30.214.orig/scripts/vserver.functions util-vserver-0.30.214/scripts/vserver.functions
---- util-vserver-0.30.214.orig/scripts/vserver.functions	2007-09-02 22:06:41.000000000 +0200
-+++ util-vserver-0.30.214/scripts/vserver.functions	2008-03-11 10:31:41.758515991 +0100
-@@ -314,9 +314,18 @@ function _generateInitOptions
- 
- 	(xgentoo)
- 	    test -n "$RUNLEVEL_START" || RUNLEVEL_START="default"
-+	    RC_PATH=/usr/sbin:/usr/bin:/sbin:/bin
- 
--	    INITCMD_START=( env TERM=$TERM /lib/rcscripts/sh/init-vserver.sh "$RUNLEVEL_START" )
--	    INITCMD_STOP=( env -i TERM=$TERM RUNLEVEL=0 /sbin/rc shutdown )
-+	    if test -x "$vdir/vdir/lib/rcscripts/sh/init-vserver.sh"; then
-+	    	RC_WRAP=/lib/rcscripts/sh/init-vserver.sh
-+	    elif test -x "$vdir/vdir/lib/rc/sh/init-vserver.sh"; then
-+	    	RC_WRAP=/lib/rc/sh/init-vserver.sh
-+	    else
-+	    	panic "init-vserver.sh not found; aborting"
-+	    fi
-+
-+	    INITCMD_START=( env TERM=$TERM $RC_WRAP "$RUNLEVEL_START" )
-+	    INITCMD_STOP=( env -i PATH=$RC_PATH TERM=$TERM RUNLEVEL=0 /sbin/rc shutdown )
- 	    INITCMD_PREPARE=( $_FAKE_RUNLEVEL 3 /var/run/utmp )
- 	    ;;
- 
diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.215-openrc.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.215-openrc.patch
new file mode 100644
index 000000000000..db4cf4b32f16
--- /dev/null
+++ b/sys-cluster/util-vserver/files/util-vserver-0.30.215-openrc.patch
@@ -0,0 +1,29 @@
+Index: scripts/vserver-init.functions
+===================================================================
+--- scripts/vserver-init.functions	(revision 2711)
++++ scripts/vserver-init.functions	(revision 2712)
+@@ -21,7 +21,7 @@
+     _postResult() { echo; }
+     lockfile=/var/lock/subsys/$LOCKFILE
+ elif test -e /etc/gentoo-release; then
+-    . /sbin/functions.sh
++    . /etc/init.d/functions.sh
+     _beginResult() { ebegin "$@"; }
+     _postResult() { :; }
+     success() { eend 0; }
+Index: distrib/gentoo/initpost
+===================================================================
+--- distrib/gentoo/initpost	(revision 2711)
++++ distrib/gentoo/initpost	(revision 2712)
+@@ -63,6 +63,11 @@
+ if test "$initstyle" == "gentoo"; then
+ 	echo ">>> Installing special init-style magic ... "
+ 
++	# force /lib/rc/sh even if we don't have it in older stages
++	$_CHROOT_SH mkdir /lib 2>/dev/null || :
++	$_CHROOT_SH mkdir /lib/rc 2/dev/null || :
++	$_CHROOT_SH mkdir /lib/rc/sh 2/dev/null || :
++
+ 	$_CAT "$__DISTRIBDIR"/gentoo/init-vserver.sh | \
+ 	$_CHROOT_SH truncate   /lib/rc/sh/init-vserver.sh
+ 	$_CHROOT_SH chmod 0755 /lib/rc/sh/init-vserver.sh
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.214-r1.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.214-r1.ebuild
deleted file mode 100644
index d50ba865b6bf..000000000000
--- a/sys-cluster/util-vserver/util-vserver-0.30.214-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2008 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.214-r1.ebuild,v 1.1 2008/03/11 10:19:34 hollow Exp $
-
-WANT_AUTOMAKE="1.9"
-
-inherit autotools eutils bash-completion
-
-DESCRIPTION="Linux-VServer admin utilities"
-HOMEPAGE="http://www.nongnu.org/util-vserver/"
-SRC_URI="http://ftp.linux-vserver.org/pub/utils/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-IUSE=""
-
-DEPEND=">=dev-libs/dietlibc-0.30-r2
-	dev-libs/beecrypt
-	net-firewall/iptables
-	net-misc/vconfig
-	sys-apps/iproute2"
-
-RDEPEND="sys-apps/iproute2
-	net-misc/vconfig
-	net-firewall/iptables
-	dev-libs/beecrypt"
-
-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}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-openrc.patch
-}
-
-src_compile() {
-	econf --with-vrootdir=${VDIRBASE} \
-		--with-initscripts=gentoo \
-		--localstatedir=/var || die "econf failed!"
-	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_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 has_version "<${CATEGORY}/${PN}-0.30.211" ; 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
-
-	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
-}
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.214.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.214.ebuild
index ecc34fcfd288..668539b8b564 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.214.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.214.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.214.ebuild,v 1.3 2007/11/17 21:50:34 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.214.ebuild,v 1.4 2008/04/13 10:24:11 hollow Exp $
 
 WANT_AUTOMAKE="1.9"
 
@@ -16,16 +16,16 @@ KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
 
 IUSE=""
 
-DEPEND=">=dev-libs/dietlibc-0.30-r2
-	dev-libs/beecrypt
+CDEPEND="dev-libs/beecrypt
 	net-firewall/iptables
 	net-misc/vconfig
-	sys-apps/iproute2"
+	sys-apps/iproute2
+	|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp )"
 
-RDEPEND="sys-apps/iproute2
-	net-misc/vconfig
-	net-firewall/iptables
-	dev-libs/beecrypt"
+DEPEND=">=dev-libs/dietlibc-0.30-r2
+	${CDEPEND}"
+
+RDEPEND="${CDEPEND}"
 
 pkg_setup() {
 	if [[ -z "${VDIRBASE}" ]]; then
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.215.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.215.ebuild
index 9f4badae4cdb..c7aea21d334d 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.215.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.215.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.215.ebuild,v 1.1 2008/03/17 09:16:31 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.215.ebuild,v 1.2 2008/04/13 10:24:11 hollow Exp $
 
 WANT_AUTOMAKE="1.9"
 
@@ -12,20 +12,20 @@ SRC_URI="http://ftp.linux-vserver.org/pub/utils/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
 
 IUSE=""
 
-DEPEND=">=dev-libs/dietlibc-0.30-r2
-	dev-libs/beecrypt
+CDEPEND="dev-libs/beecrypt
 	net-firewall/iptables
 	net-misc/vconfig
-	sys-apps/iproute2"
+	sys-apps/iproute2
+	|| ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp )"
 
-RDEPEND="sys-apps/iproute2
-	net-misc/vconfig
-	net-firewall/iptables
-	dev-libs/beecrypt"
+DEPEND=">=dev-libs/dietlibc-0.30-r2
+	${CDEPEND}"
+
+RDEPEND="${CDEPEND}"
 
 pkg_setup() {
 	if [[ -z "${VDIRBASE}" ]]; then
@@ -41,6 +41,12 @@ pkg_setup() {
 	einfo
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-openrc.patch
+}
+
 src_compile() {
 	econf --with-vrootdir=${VDIRBASE} \
 		--with-initscripts=gentoo \