finally fix vsomething patch

Package-Manager: portage-2.1.2-r8

3 files changed, 71 insertions, 67 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index cfa7a70e3562..e270a922926d 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/util-vserver
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.74 2007/02/07 10:51:54 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.75 2007/02/09 15:41:33 hollow Exp $
+
+  09 Feb 2007; Benedikt Böhm <hollow@gentoo.org>
+  files/util-vserver-0.30.212-vsomething-fix.patch:
+  finally fix vsomething patch
 
   07 Feb 2007; Benedikt Böhm <hollow@gentoo.org>
   files/util-vserver-0.30.212-vsomething-fix.patch:
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index 59f8c721c1ea..350a5984911d 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -17,10 +17,10 @@ AUX util-vserver-0.30.212-initpost.patch 2066 RMD160 70194e005c573eba073d9541518
 MD5 793e69e656b487e92db95a258049413b files/util-vserver-0.30.212-initpost.patch 2066
 RMD160 70194e005c573eba073d95415188c9ed779511e9 files/util-vserver-0.30.212-initpost.patch 2066
 SHA256 231c86e9f2ce2aa2ac1643662162c9e064fbeff620b6781fd13e5edb2439d527 files/util-vserver-0.30.212-initpost.patch 2066
-AUX util-vserver-0.30.212-vsomething-fix.patch 2229 RMD160 1918e6467d586f329f708ac1803fef6207d18637 SHA1 f0a1a1ebf75ddb04e69ae2abae7b328f2bc7c237 SHA256 52fa3f60dbf570959914f0e1a98025869a3f288c5d568c35ff1ac71f530bcfb0
-MD5 85d55bcd9a00eaaca67a948f6bb8fe65 files/util-vserver-0.30.212-vsomething-fix.patch 2229
-RMD160 1918e6467d586f329f708ac1803fef6207d18637 files/util-vserver-0.30.212-vsomething-fix.patch 2229
-SHA256 52fa3f60dbf570959914f0e1a98025869a3f288c5d568c35ff1ac71f530bcfb0 files/util-vserver-0.30.212-vsomething-fix.patch 2229
+AUX util-vserver-0.30.212-vsomething-fix.patch 2174 RMD160 d56ccb5406ceb37e6139158a353af8c318afd76d SHA1 8d86c976e8968b5d0ae055260b590fd29a78c7e4 SHA256 2316404887b69095ff1090e5ed4e612286423b68886a66c16e6e9de99713e2f2
+MD5 2bc2a029192a8bd9cd4c92a6f440a216 files/util-vserver-0.30.212-vsomething-fix.patch 2174
+RMD160 d56ccb5406ceb37e6139158a353af8c318afd76d files/util-vserver-0.30.212-vsomething-fix.patch 2174
+SHA256 2316404887b69095ff1090e5ed4e612286423b68886a66c16e6e9de99713e2f2 files/util-vserver-0.30.212-vsomething-fix.patch 2174
 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
@@ -34,10 +34,10 @@ EBUILD util-vserver-0.30.212-r2.ebuild 3805 RMD160 0458dbb0559ffd332f313caed2548
 MD5 052cc36651d1aa8595583af1a85a315d util-vserver-0.30.212-r2.ebuild 3805
 RMD160 0458dbb0559ffd332f313caed2548dfb7c97a891 util-vserver-0.30.212-r2.ebuild 3805
 SHA256 9202e553354bf78d90b8f2675521722591a08b500be15732c1b013a5943af676 util-vserver-0.30.212-r2.ebuild 3805
-MISC ChangeLog 15431 RMD160 822b7ad65623414fadddadef5f8de88c23ffa2cf SHA1 2f95877d0aabdf752d8415d03db6b0d0ff5f7a42 SHA256 e35fe961557d0fa4c44bcb0a8fc4db0e64845fbc94115b8f32a541c78d122775
-MD5 d3c4b68e28f209a49a683fce51e0a127 ChangeLog 15431
-RMD160 822b7ad65623414fadddadef5f8de88c23ffa2cf ChangeLog 15431
-SHA256 e35fe961557d0fa4c44bcb0a8fc4db0e64845fbc94115b8f32a541c78d122775 ChangeLog 15431
+MISC ChangeLog 15565 RMD160 ca11741bd83a2b24d4feacf036805f23777284ae SHA1 6818830b96c3516930d073bf06dbce4175f0b873 SHA256 809e1c1319c32c9d99338d2142356e7089c6ad814773b2f3713f3375a2307aa7
+MD5 844a8851c9a7359227a8a6f7e5ed8dc5 ChangeLog 15565
+RMD160 ca11741bd83a2b24d4feacf036805f23777284ae ChangeLog 15565
+SHA256 809e1c1319c32c9d99338d2142356e7089c6ad814773b2f3713f3375a2307aa7 ChangeLog 15565
 MISC metadata.xml 588 RMD160 43bd819942f6f0c03bec0bcf67601a7099b59a2b SHA1 d0e5af40193886066bbe1060324dede1f0fd367f SHA256 798e87b6d5fb379322178e9f8b7432371f630caaf3fd6ff369e35056483cc31d
 MD5 493021fa14e20216e8ce772e9dc10a62 metadata.xml 588
 RMD160 43bd819942f6f0c03bec0bcf67601a7099b59a2b metadata.xml 588
@@ -51,7 +51,7 @@ SHA256 d85b209f085a57250ac6312dc686ac3d1be5c43d491f0c4cc8fd300f74c3421b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFya9WmPFBzbX68WERAjUfAKCOj81lIiu/bMeQy+yubAx6M6Th2gCfXHFb
-/cko4wlegOK1XD4nJdHYOoQ=
-=JzIL
+iD8DBQFFzJY3mPFBzbX68WERAlIfAJ9YOh79Y+lJ5sTz1L+nBve9YpvjZgCgkXe+
+9vjtII4NdC9hljcNuIEjd5s=
+=6IqJ
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.212-vsomething-fix.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.212-vsomething-fix.patch
index de1841837359..ead3fff73ecf 100644
--- a/sys-cluster/util-vserver/files/util-vserver-0.30.212-vsomething-fix.patch
+++ b/sys-cluster/util-vserver/files/util-vserver-0.30.212-vsomething-fix.patch
@@ -1,55 +1,55 @@
-Index: util-vserver-0.30.212/scripts/vupdateworld

-===================================================================

---- util-vserver-0.30.212/scripts/vupdateworld (revision 2452)

-+++ util-vserver-0.30.212/scripts/vupdateworld (revision 2486)

-@@ -65,4 +65,14 @@

- done

- 

-+declare -a vserver_names

-+

-+while [ $# -gt 0 ]; do

-+    case "$1" in

-+	(--)		shift; break;;

-+	(*)	   	vserver_names=( "${vserver_names[@]}" "$1" );;

-+    esac

-+    shift

-+done

-+

- VSOMETHING_TITLE=vemerge

- VSOMETHING_PKGMGMT=1

-@@ -71,3 +81,3 @@

- 

- test ${#vsomething_opts[@]} -eq 0 || vsomething_opts=( "${vsomething_opts[@]}" -- )

--exec $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" --update --deep --newuse "$@"

-+exec $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" "${vserver_names[@]}" -- world --update --deep --newuse "$@"

-Index: util-vserver-0.30.212/scripts/vdispatch-conf

-===================================================================

---- util-vserver-0.30.212/scripts/vdispatch-conf (revision 2363)

-+++ util-vserver-0.30.212/scripts/vdispatch-conf (revision 2486)

-@@ -70,3 +70,3 @@

- export VSOMETHING_TITLE VSOMETHING_PKGMGMT

- 

--exec $_VSOMETHING "${send_through[@]}" dispatch-conf "${vsomething_opts[@]}"

-+exec $_VSOMETHING "${send_through[@]}" dispatch-conf "${vsomething_opts[@]}" "$@"

-Index: util-vserver-0.30.212/scripts/vesync

-===================================================================

---- util-vserver-0.30.212/scripts/vesync (revision 2363)

-+++ util-vserver-0.30.212/scripts/vesync (revision 2486)

-@@ -76,15 +76,13 @@

- export VSOMETHING_TITLE VSOMETHING_PKGMGMT

- 

--test ${#vsomething_opts[@]} -eq 0 || vsomething_opts=( "${vsomething_opts[@]}" -- )

--

- ret=0

- 

- test $overlay_only -eq 0 && \

--	$_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" --metadata

-+	$_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" "$@" -- --metadata

- 

- ret=$?

- 

- test -n "$overlay" -a -n "$overlay_host" && \

--	$_VSOMETHING "${send_through[@]}" rsync "${vsomething_opts[@]}" \

-+	$_VSOMETHING "${send_through[@]}" rsync "${vsomething_opts[@]}" "$@" -- \

- 	-rtW --progress --delete --delete-after "${overlay_host}/" "${overlay}/"

- 

+Index: util-vserver-0.30.212/scripts/vupdateworld
+===================================================================
+--- util-vserver-0.30.212/scripts/vupdateworld (revision 2452)
++++ util-vserver-0.30.212/scripts/vupdateworld (revision 2486)
+@@ -65,4 +65,14 @@
+ done
+ 
++declare -a vserver_names
++
++while [ $# -gt 0 ]; do
++    case "$1" in
++	(--)		shift; break;;
++	(*)	   	vserver_names=( "${vserver_names[@]}" "$1" );;
++    esac
++    shift
++done
++
+ VSOMETHING_TITLE=vemerge
+ VSOMETHING_PKGMGMT=1
+@@ -71,3 +81,3 @@
+ 
+ test ${#vsomething_opts[@]} -eq 0 || vsomething_opts=( "${vsomething_opts[@]}" -- )
+-exec $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" --update --deep --newuse "$@"
++exec $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" "${vserver_names[@]}" -- world --update --deep --newuse "$@"
+Index: util-vserver-0.30.212/scripts/vdispatch-conf
+===================================================================
+--- util-vserver-0.30.212/scripts/vdispatch-conf (revision 2363)
++++ util-vserver-0.30.212/scripts/vdispatch-conf (revision 2486)
+@@ -70,3 +70,3 @@
+ export VSOMETHING_TITLE VSOMETHING_PKGMGMT
+ 
+-exec $_VSOMETHING "${send_through[@]}" dispatch-conf "${vsomething_opts[@]}"
++exec $_VSOMETHING "${send_through[@]}" dispatch-conf "${vsomething_opts[@]}" "$@"
+Index: util-vserver-0.30.212/scripts/vesync
+===================================================================
+--- util-vserver-0.30.212/scripts/vesync (revision 2363)
++++ util-vserver-0.30.212/scripts/vesync (revision 2486)
+@@ -76,15 +76,13 @@
+ export VSOMETHING_TITLE VSOMETHING_PKGMGMT
+ 
+-test ${#vsomething_opts[@]} -eq 0 || vsomething_opts=( "${vsomething_opts[@]}" -- )
+-
+ ret=0
+ 
+ test $overlay_only -eq 0 && \
+-	$_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" --metadata
++	$_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" "$@" -- --metadata
+ 
+ ret=$?
+ 
+ test -n "$overlay" -a -n "$overlay_host" && \
+-	$_VSOMETHING "${send_through[@]}" rsync "${vsomething_opts[@]}" \
++	$_VSOMETHING "${send_through[@]}" rsync "${vsomething_opts[@]}" "$@" -- \
+ 	-rtW --progress --delete --delete-after "${overlay_host}/" "${overlay}/"
+