Updated ebuild for 0.30.213-rc5, mainly for testing purposes.

svn path=/; revision=115

7 files changed, 13 insertions, 381 deletions

diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index 55e445d..ecae00c 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -1,7 +1,3 @@
-AUX bash_completion 7568 RMD160 45feafa30f715fb287403518eee8c45fecfe418e SHA1 d281bcad111df21ab0f37703142dd102145d784e SHA256 2232166a5aed9857a7a5c30adfdd4ea944e0608a29fad05f229b8cef2d61795d
-MD5 20d9b2d8c50fe0ca9bb381d16daf2d7d files/bash_completion 7568
-RMD160 45feafa30f715fb287403518eee8c45fecfe418e files/bash_completion 7568
-SHA256 2232166a5aed9857a7a5c30adfdd4ea944e0608a29fad05f229b8cef2d61795d files/bash_completion 7568
 AUX init.d/vprocunhide 506 RMD160 b26000655f88eba51e2e80b5665f49b7698324a3 SHA1 f1bf6bc18f228c16090bbd8daec0b1e497ef75a8 SHA256 4e7f95b4bd0aca85383d0fc5ce9ffd78869a60e6f0f2dffaa4b1c8ec9d9b2c3d
 MD5 d5c496a8a3399c40a3c8b6d56de57aa2 files/init.d/vprocunhide 506
 RMD160 b26000655f88eba51e2e80b5665f49b7698324a3 files/init.d/vprocunhide 506
@@ -10,15 +6,11 @@ AUX init.d/vservers.default 328 RMD160 4ae796520847688da33befaa551faefd58be8184
 MD5 50181061681eac3cb085af7766987557 files/init.d/vservers.default 328
 RMD160 4ae796520847688da33befaa551faefd58be8184 files/init.d/vservers.default 328
 SHA256 cdab1911b6d13a3253c2744ee1b007eda16d28c24d9eeea732d63934a1bdaaba files/init.d/vservers.default 328
-AUX util-vserver-0.30.212-wrapper.patch 1349 RMD160 f8c4bfd740846c43e56a97db86302e81b8afa1c8 SHA1 2b5e04383bc3e5a52ae2fde86eb77a8f3cf8eeb5 SHA256 548b9732f12492f1ca58d72c3fd8634c99047d1619c19a1c9407a6864150c3fe
-MD5 bc15d959f59fbe0250e0be2f2ca9ee70 files/util-vserver-0.30.212-wrapper.patch 1349
-RMD160 f8c4bfd740846c43e56a97db86302e81b8afa1c8 files/util-vserver-0.30.212-wrapper.patch 1349
-SHA256 548b9732f12492f1ca58d72c3fd8634c99047d1619c19a1c9407a6864150c3fe files/util-vserver-0.30.212-wrapper.patch 1349
-DIST util-vserver-0.30.212.tar.bz2 643139 RMD160 e0bb7600204c99bf2192332b2fb5680cd647d226 SHA1 366e9aa56490de71dccebf7ee99a81e37a274267 SHA256 dad182f0c882f32d96cab8d9065e4417d9c2f8146e1e2c9f197580389cc4a484
-EBUILD util-vserver-0.30.212.ebuild 3835 RMD160 d17da1637252b2c9484f91bad9123046f97fef98 SHA1 e8a2c2a1e317280a7a85a044f3a7f7edf2d735e8 SHA256 33a7bcfa399bcd1d48da9ed1516b72470a2cd58860e415949d0d81ec43daca65
-MD5 d3703798d4c38e8983f51f22409144fb util-vserver-0.30.212.ebuild 3835
-RMD160 d17da1637252b2c9484f91bad9123046f97fef98 util-vserver-0.30.212.ebuild 3835
-SHA256 33a7bcfa399bcd1d48da9ed1516b72470a2cd58860e415949d0d81ec43daca65 util-vserver-0.30.212.ebuild 3835
-MD5 0f5d705e788b54f83af3531af62e739e files/digest-util-vserver-0.30.212 268
-RMD160 9e595c3a71440aede6174887c9cb093c123667c5 files/digest-util-vserver-0.30.212 268
-SHA256 d85b209f085a57250ac6312dc686ac3d1be5c43d491f0c4cc8fd300f74c3421b files/digest-util-vserver-0.30.212 268
+DIST util-vserver-0.30.213-rc5.tar.bz2 658971 RMD160 3dab9d82bbab865ed9321c8f3021e0db26a681ca SHA1 f6ddb295f5673b4456cdcadb1963c27ad4b4a6e4 SHA256 cab90fc33684362806908c2628afc7e54bac9262b900b9d5bfb0e7fb67ccdafe
+EBUILD util-vserver-0.30.213_rc5.ebuild 3828 RMD160 88729a4c7aedf1858326efccc063dd93f58d4803 SHA1 301ad6d70492243f5095d009124f1e067f073f51 SHA256 3ec9f9ab7ae6719ee05c314c7c0dc67fb93f5e19fbb707951577b82410518892
+MD5 8a8572aec1da6e06fbf0ca344cd6682a util-vserver-0.30.213_rc5.ebuild 3828
+RMD160 88729a4c7aedf1858326efccc063dd93f58d4803 util-vserver-0.30.213_rc5.ebuild 3828
+SHA256 3ec9f9ab7ae6719ee05c314c7c0dc67fb93f5e19fbb707951577b82410518892 util-vserver-0.30.213_rc5.ebuild 3828
+MD5 588379c10c34915c72c69e73eda1d92c files/digest-util-vserver-0.30.213_rc5 280
+RMD160 8e126af4d5bb5d387009a3ad5faa5ecab43f2de1 files/digest-util-vserver-0.30.213_rc5 280
+SHA256 a7315c2c3bf023bd69c9d1f9fc20abd07c9ea35eb4e46b8b7e22931ba4e95a1f files/digest-util-vserver-0.30.213_rc5 280
diff --git a/sys-cluster/util-vserver/files/bash_completion b/sys-cluster/util-vserver/files/bash_completion
deleted file mode 100644
index 73a9fef..0000000
--- a/sys-cluster/util-vserver/files/bash_completion
+++ /dev/null
@@ -1,300 +0,0 @@
-# Completion for the vserver command. Source this file (or on some systems
-# add it to ~/.bash_completion and start a new shell) and bash's completion
-# mechanism will know all about vserver's options!
-#
-# Copyright (C) Thomas Champagne <lafeuil@gmail.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# The latest version of this software can be obtained here:
-#
-# http://linux-vserver.org/Vserver+Completion
-#
-# version 0.4.0
-
-have vserver-info && {
-: ${UTIL_VSERVER_VARS:=$(vserver-info - SYSINFO |grep prefix: | awk '{ print $2}')/lib/util-vserver/util-vserver-vars}
-
-test -e "$UTIL_VSERVER_VARS" && {
-
-. "$UTIL_VSERVER_VARS"
-. "$_LIB_FUNCTIONS"
-
-_vserver() {
-	local cur cmds cmdOpts cmdMethodOpts helpCmds names names_pipe func i j method
-
-	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
-
-	# find available vServers:
-	# call function getAllVservers in vserver library
-	getAllVservers names
-	names_pipe=`echo ${names[@]} | sed 's/ /|/g'`
-
-	# available commands
-	cmds='start stop restart condrestart suexec exec enter chkconfig \
-	running status unify pkg apt-get apt-config apt-cache \
-	rpm pkgmgmt delete'
-
-	# options (long and short name)
-	cmdOpts='--help --version --debug --defaulttty -s --sync -v \
-	--verbose --silent --'
-
-	cmdMethodOpts='-m -n --context --confdir --lockfile \
-	--hostname --netdev --netbcast --netmask \
-	--netprefix --interface --cpuset \
-	--cpusetcpus --cpusetmems --cpusetvirt \
-	--initstyle --flags --help --'
-
-	# if the previous option is a single option
-	helpCmds='--help|--version'
-	if [[ ${COMP_WORDS[1]} == @($helpCmds) ]] ; then
-		return 0
-	fi
-
-	# lookup the vServer name
-	for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )); do
-		if [[ ${COMP_WORDS[i]} == @($names_pipe) ]] ; then
-			# found it!
-			break
-		fi
-	done
-
-	#a vserver has been found
-	if (( $i < ${#COMP_WORDS[@]}-1 )) ; then
-		# Show the vserver command without build
-		case "${COMP_WORDS[i+1]}" in
-			start)
-				COMPREPLY=( $( compgen -W "--rescue --rescue-cmd" -- $cur ) )
-				;;
-			# No completion for apt-config
-			stop|restart|condrestart|enter|running|status|apt-config|delete)
-				;;
-			suexec)
-				# I don't know how to do
-				COMPREPLY=( $( compgen -W  -- $cur ) )
-				;;
-			exec)
-				#I don't know how to do
-				COMPREPLY=( $( compgen -W "" -- $cur ) )
-				;;
-			unify)
-				COMPREPLY=( $( compgen -W "-R" -- $cur ) )
-				;;
-			apt-get|apt-cache)
-				func=${COMP_WORDS[i+1]}
-				COMP_WORDS=( ${COMP_WORDS[@]:$((i+1))} )
-				COMP_CWORD=$((COMP_CWORD-i-1))
-				declare -f _${func//-/_} > /dev/null && _${func//-/_}
-				;;
-			*)
-				COMPREPLY=( $( compgen -W "$cmds" -- $cur ) )
-				;;
-		esac
-		return 0
-	else
-		#no vserver name found
-		prev=${COMP_WORDS[COMP_CWORD-1]}
-
-		#search the new name of vserver
-		for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )) ; do
-			if [[ ${COMP_WORDS[i]} == !(vserver|-*) ]] ; then
-				# found it!
-				break
-			fi
-		done
-
-		if (( $i < ${#COMP_WORDS[@]}-1 )) ; then
-			j=$i
-			i=${#COMP_WORDS[@]}
-			for (( ; j < ${#COMP_WORDS[@]}-1; j++ )) ; do
-				if [[ ${COMP_WORDS[j]} == "--" ]];  then
-					# method's parameter
-					case "$method" in
-						legacy|copy)
-							;;
-						apt-rpm)
-							COMPREPLY=( $( compgen -W "-d" -- $cur ) )
-							;;
-						yum)
-							COMPREPLY=( $( compgen -W "-d" -- $cur ) )
-							;;
-						rpm)
-							COMPREPLY=( $( compgen -W "-d --empty --force --nodeps" -- $cur ) )
-							;;
-						skeleton)
-							;;
-						debootstrap)
-							COMPREPLY=( $( compgen -W "-d -m -s --" -- $cur ) )
-							;;
-						*)
-							;;
-					esac
-					return 0
-					break
-				fi
-
-				if [[ ${COMP_WORDS[j]} == @(build|-m) ]];  then
-					i=$j
-					if (( $j+1 < ${#COMP_WORDS[@]}-1 )) ; then
-						method=${COMP_WORDS[j+1]}
-					fi
-				fi
-			done
-
-			if (( $i < ${#COMP_WORDS[@]}-1 )) ; then
-				case $prev in
-					--help)
-						;;
-					-n|--context|--confdir|--lockfile|--hostname|--netdev|--netbcast|--netmask|--netprefix|--interface|--cpuset|--cpusetcpus|--cpusetmems|--cpusetvirt|--initstyle|--flags)
-						COMPREPLY=( $( compgen -W "" -- $cur ) )
-						;;
-					-m)
-						COMPREPLY=( $( compgen -W "legacy copy apt-rpm yum rpm skeleton debootstrap" -- $cur ) )
-						;;
-					*)
-						COMPREPLY=( $( compgen -W "$cmdMethodOpts" -- $cur ) )
-						;;
-				esac
-			else
-				COMPREPLY=( $( compgen -W "build" -- $cur ) )
-			fi
-		else
-			COMPREPLY=( $( compgen -W "${names[@]} $cmdOpts" -- $cur ) )
-		fi
-
-		return 0
-	fi
-
-	return 0
-}
-
-complete -F _vserver vserver
-
-_vapt_rpm_yum()
-{
-	local cur cmds cmdOpts helpCmds names func i
-
-	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
-
-	# options (long and short name)
-	cmdOpts='--help --version --quiet -q --all'
-
-	# if the previous option is a single option
-	helpCmds='--help|--version'
-
-	if [[ "${COMP_WORDS[1]}" == "@($helpCmds)" ]] ; then
-		return 0
-	fi
-
-	# search --
-	for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )) ; do
-		if [[ ${COMP_WORDS[i]} = "--" ]] ; then
-			# found it!
-			break
-		fi
-	done
-
-	# find available vServers
-	# call function getAllVservers in vserver library
-	getAllVservers names
-	names_pipe=`echo ${names[@]}" --all" | sed 's/ /|/g'`
-
-	if (( $i < ${#COMP_WORDS[@]}-1 )) && (( $i < $COMP_CWORD )) ; then
-		func=${COMP_WORDS[0]:1}
-		COMP_WORDS=( $func ${COMP_WORDS[@]:$((i+1))} )
-		COMP_CWORD=$((COMP_CWORD-i))
-		declare -f _${func//-/_} > /dev/null && _${func//-/_}
-	else
-		# search vServer name
-		for (( i=0; i <  ${#COMP_WORDS[@]}-1; i++ )) ; do
-			if [[ ${COMP_WORDS[i]} == @($names_pipe) ]] ; then
-				# found it!
-				break
-			fi
-		done
-
-		if (( $i < ${#COMP_WORDS[@]}-1 )) ; then
-			if [[ "${COMP_WORDS[i]}" = "--all"  ]] ; then
-				cmdOpts='--'
-				COMPREPLY=( $( compgen -W "$cmdOpts" -- $cur ) )
-			else
-				cmdOpts='--'
-				COMPREPLY=( $( compgen -W "${names[@]} $cmdOpts" -- $cur ) )
-			fi
-		else
-			COMPREPLY=( $( compgen -W "${names[@]} $cmdOpts" -- $cur ) )
-		fi
-	fi
-
-	return 0
-}
-
-_vserver_copy()
-{
-	local cur prev cmdOpts helpCmds confCmds names names_pipe i
-
-	COMPREPLY=()
-	cur=${COMP_WORDS[COMP_CWORD]}
-
-	# find available vServers
-	# call function getAllVservers in vserver library
-	getAllVservers names
-	names_pipe=`echo ${names[@]} | sed 's/ /|/g'`
-
-	# options (long and short name)
-	cmdOpts='--help -h --version -V --verbose -v --quiet -q \
-		 --vsroot -r --rsh -R --stopstart -s \
-		 --domain -d --ip -i'
-
-	# if the previous option is a single option
-	helpCmds='--help|-h|--version|-V'
-
-	if [[ ${COMP_WORDS[1]} == @($helpCmds) ]] ; then
-		return 0
-	fi
-
-	confCmds='--ip|-i|--domain|-d'
-	prev=${COMP_WORDS[COMP_CWORD-1]}
-
-	if [[ $prev == @($confCmds) ]] ; then
-		return 0
-	fi
-
-	# search a vServer name
-	for (( i=0; i <  ${#COMP_WORDS[@]}-1; i++ )); do
-		if [[ ${COMP_WORDS[i]} == @($names_pipe) ]] ; then
-			# found it!
-			break
-		fi
-	done
-
-	if (( $i < ${#COMP_WORDS[@]}-1 )) ; then
-		return 0
-	else
-		COMPREPLY=( $( compgen -W "${names[@]} $cmdOpts" -- $cur ) )
-	fi
-
-	return 0
-}
-
-complete -F _vapt_rpm_yum vapt-get
-complete -F _vapt_rpm_yum vrpm
-complete -F _vapt_rpm_yum vyum
-complete -F _vserver_copy vserver-copy
-
-}
-}
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.211-r1 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.211-r1
deleted file mode 100644
index 2470c6a..0000000
--- a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.211-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 b0e8d503ba1cf5a7014eb41a72ec8fe2 util-vserver-0.30.211.tar.bz2 638003
-RMD160 42856f7131756ffc278719831de9ae190943e532 util-vserver-0.30.211.tar.bz2 638003
-SHA256 992a2dd76994813508cc043bbaf7c1f903166d2b7fbcb7bd1320aa285234df59 util-vserver-0.30.211.tar.bz2 638003
-MD5 3832eef192482706fe94a7ff2611d6e8 util-vserver-patches-0.30.211-r1.tar.bz2 30732
-RMD160 d502c9cf3b5476833cfb19e7ff1f34e4ddfa4859 util-vserver-patches-0.30.211-r1.tar.bz2 30732
-SHA256 a169ce29ab2e31b951d39bc9c298e5f34ca541a2f09c83c0d0f6472a6a6c60a5 util-vserver-patches-0.30.211-r1.tar.bz2 30732
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.212 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.212
deleted file mode 100644
index 0babb2f..0000000
--- a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.212
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 386b91732b7f0f132b4e9d978389dcc2 util-vserver-0.30.212.tar.bz2 643139
-RMD160 e0bb7600204c99bf2192332b2fb5680cd647d226 util-vserver-0.30.212.tar.bz2 643139
-SHA256 dad182f0c882f32d96cab8d9065e4417d9c2f8146e1e2c9f197580389cc4a484 util-vserver-0.30.212.tar.bz2 643139
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.213_rc5 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.213_rc5
new file mode 100644
index 0000000..1945b52
--- /dev/null
+++ b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.213_rc5
@@ -0,0 +1,3 @@
+MD5 2ad983a295dc44e1fdb7e92a318f85ef util-vserver-0.30.213-rc5.tar.bz2 658971
+RMD160 3dab9d82bbab865ed9321c8f3021e0db26a681ca util-vserver-0.30.213-rc5.tar.bz2 658971
+SHA256 cab90fc33684362806908c2628afc7e54bac9262b900b9d5bfb0e7fb67ccdafe util-vserver-0.30.213-rc5.tar.bz2 658971
diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.212-wrapper.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.212-wrapper.patch
deleted file mode 100644
index b712c7c..0000000
--- a/sys-cluster/util-vserver/files/util-vserver-0.30.212-wrapper.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Index: /home/bene/work/vserver/util-vserver/scripts/vserver-wrapper
-===================================================================
---- scripts/vserver-wrapper	(revision 2423)
-+++ scripts/vserver-wrapper	(working copy)
-@@ -29,7 +29,7 @@
- 
- if test -e /etc/init.d/functions; then
-     . /etc/init.d/functions
--    _beginResult() { echo -n "$@"; }
-+    _beginResult() { echo -n "$@ ..."; }
-     lockfile=/var/lock/subsys/$LOCKFILE
- elif test -e /etc/gentoo-release; then
-     . /sbin/functions.sh
-@@ -39,7 +39,7 @@
-     failure() { eend "$@"; }
-     lockfile=/var/lock/vservers/$LOCKFILE
- else
--    _beginResult() { echo -n "$@"; }
-+    _beginResult() { echo -n "$@ ..."; }
-     success() { echo .; }
-     passed()  { echo .; }
-     failure() { echo ERROR; }
-@@ -54,13 +54,12 @@
- 	(2)	passed; rc=0;;
- 	(*)	failure;;
-     esac
--    echo
-     return $rc
- }
- 
- function start()
- {
--    _beginResult $"Starting vservers of type '$MARK'..."
-+    _beginResult $"Starting vservers of type '$MARK'"
-     $_START_VSERVERS -m "$MARK" -j "$NUMPARALLEL" --all --start
-     _tellResult $?
-     local rc=$?
-@@ -70,7 +69,7 @@
- 
- function stop()
- {
--    _beginResult $"Stopping vservers of type '$MARK'..."
-+    _beginResult $"Stopping vservers of type '$MARK'"
-     $_START_VSERVERS -m "$MARK" -j "$NUMPARALLEL" --all --stop
-     _tellResult $?
-     local rc=$?
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.212.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.213_rc5.ebuild
index c0d27e5..5c5da8b 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.212.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.213_rc5.ebuild
@@ -3,13 +3,12 @@
 # $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.212.ebuild,v 1.2 2006/12/21 22:37:48 phreak Exp $
 
 WANT_AUTOMAKE="1.9"
-WANT_AUTOCONF="latest"
 
 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"
+SRC_URI="http://people.linux-vserver.org/~dhozac/t/uv-testing/${P/_rc/-rc}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -42,13 +41,6 @@ pkg_setup() {
 	einfo
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-wrapper.patch
-}
-
 src_compile() {
 	econf --with-vrootdir=${VDIRBASE} \
 		--localstatedir=/var \
@@ -84,7 +76,7 @@ src_install() {
 	doinitd "${FILESDIR}"/init.d/vprocunhide
 
 	# bash-completion
-	dobashcompletion "${FILESDIR}"/bash_completion util-vserver
+#	dobashcompletion "${FILESDIR}"/bash_completion util-vserver
 
 	dodoc README ChangeLog NEWS AUTHORS THANKS util-vserver.spec
 }