Removing the src_install magic for the gentoo related tools again, as they should be done in src_unpack already. Fixing the shell_completion patch, it added the bash_completion file into the wrong directory.

svn path=/; revision=61

4 files changed, 18 insertions, 40 deletions

diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index b4e1550..b0538cb 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -2,10 +2,10 @@ AUX 210_all_gentoo-tools.patch 2711 RMD160 fe002bca926d63eda9189a13fdeb91782275e
 MD5 554686ab3a343db1a2af83224f418208 files/210_all_gentoo-tools.patch 2711
 RMD160 fe002bca926d63eda9189a13fdeb91782275e8ee files/210_all_gentoo-tools.patch 2711
 SHA256 a23b42f7aadac8c7f14bb2cc0f3a1c05add46b917dc3b31c7ecc954e7afd1710 files/210_all_gentoo-tools.patch 2711
-AUX 215_all_shell-completion.patch 12784 RMD160 62be0af2d1fe0db1100ed489f2f155219624ac56 SHA1 399bbdda4cefdef99a667893f4079bd2fb883e86 SHA256 d479014ceb13641a8c85f548b23c38391ddcaed62807f681e728424e25cb0366
-MD5 06c58107961869adcab5f3f687d66ba8 files/215_all_shell-completion.patch 12784
-RMD160 62be0af2d1fe0db1100ed489f2f155219624ac56 files/215_all_shell-completion.patch 12784
-SHA256 d479014ceb13641a8c85f548b23c38391ddcaed62807f681e728424e25cb0366 files/215_all_shell-completion.patch 12784
+AUX 215_all_shell-completion.patch 12852 RMD160 147007a88d09307153bc774df506ace15457080e SHA1 4cbabe486821e39c3a094b2b240cb1742b811227 SHA256 a632c4ae61302630a8132b9d71d0ad53af99a0a3144edab2edaa557cbdcbe8ee
+MD5 d02b19d861f12eb129978b93da0e8d36 files/215_all_shell-completion.patch 12852
+RMD160 147007a88d09307153bc774df506ace15457080e files/215_all_shell-completion.patch 12852
+SHA256 a632c4ae61302630a8132b9d71d0ad53af99a0a3144edab2edaa557cbdcbe8ee files/215_all_shell-completion.patch 12852
 AUX README 437 RMD160 6cf4e053f1646decb9763c4f8cb119a045753044 SHA1 6e8250f11e433ba80d2ab2d42020602072554df2 SHA256 cc541bc6f45bc8cd0f7008ec2e3c78008f045e184687bb0fe3b5fcd3836bed5a
 MD5 ab15ca5582528cb0f5de8889eaf27cdd files/README 437
 RMD160 6cf4e053f1646decb9763c4f8cb119a045753044 files/README 437
@@ -14,14 +14,14 @@ DIST util-vserver-0.30.211-rc1.tar.bz2 625758 RMD160 d6c5df8bcf3129663d85e4aab3b
 DIST util-vserver-0.30.211-rc2.tar.bz2 630830 RMD160 cc11f7feb8388f3bbaff1500d978078f6c181328 SHA1 3354e512415c60b3a8b95a9f4a91be8148ab9de8 SHA256 e0556d51c5a4374cb64bfd55a5455308f00b7f053b0938c06da2073d73bf6ca9
 DIST util-vserver-patches-0.30.211-rc1.tar.bz2 8455 RMD160 94b42ea50a7124f2534d9c9208893069a419eebd SHA1 1547988dff3f97cf449f85e5539b86a40cc29e5b SHA256 80177d2fceed3dae7ab58efda8b7ff102096297db4b61e2f6e85befe011237a6
 DIST util-vserver-patches-0.30.211-rc2.tar.bz2 8455 RMD160 324afb36ef1a096c043698964efa4ebb414ff694 SHA1 d2bbfd950cd0fbbea6702fa302070fad1094fa81 SHA256 48ef909a048a8abc1667de5f102bdb759cdb330e9292bc126f00f5708f09e549
-EBUILD util-vserver-0.30.211_rc1.ebuild 3648 RMD160 21c2a4d7e7a16087fa535b59379d6565c20ef6b8 SHA1 8d2315f039856500388d1bbc8581e58eaef002e1 SHA256 3eab2d9e4633a0e93e69f2571a98ed2f00509108ad7343e68394b9b665fd711c
-MD5 2ce46b3b5c72d09b9771b8b0e1f057ee util-vserver-0.30.211_rc1.ebuild 3648
-RMD160 21c2a4d7e7a16087fa535b59379d6565c20ef6b8 util-vserver-0.30.211_rc1.ebuild 3648
-SHA256 3eab2d9e4633a0e93e69f2571a98ed2f00509108ad7343e68394b9b665fd711c util-vserver-0.30.211_rc1.ebuild 3648
-EBUILD util-vserver-0.30.211_rc2.ebuild 3648 RMD160 844cc3e21eea58d52beac38ecde0dc19b417ea99 SHA1 31b37d037922601b8743799c9b99265b07e136d8 SHA256 cc9356666ef66ce811c97d57e96160d83f00ddcca0173a5a1520ead90706cdf3
-MD5 5a050d64e0e351758808ab05dda230a4 util-vserver-0.30.211_rc2.ebuild 3648
-RMD160 844cc3e21eea58d52beac38ecde0dc19b417ea99 util-vserver-0.30.211_rc2.ebuild 3648
-SHA256 cc9356666ef66ce811c97d57e96160d83f00ddcca0173a5a1520ead90706cdf3 util-vserver-0.30.211_rc2.ebuild 3648
+EBUILD util-vserver-0.30.211_rc1.ebuild 3399 RMD160 22c2b9bc97fd277c041f6980ad0d214c06079161 SHA1 85eab3cad107c3ff9053e424c29bd76760d06b2f SHA256 ac9f49addf43529da7683844e0346d467a4687d094d2f329c7ee3bf817b223f7
+MD5 08060126ff85e47764f7c9cfbad8dfc7 util-vserver-0.30.211_rc1.ebuild 3399
+RMD160 22c2b9bc97fd277c041f6980ad0d214c06079161 util-vserver-0.30.211_rc1.ebuild 3399
+SHA256 ac9f49addf43529da7683844e0346d467a4687d094d2f329c7ee3bf817b223f7 util-vserver-0.30.211_rc1.ebuild 3399
+EBUILD util-vserver-0.30.211_rc2.ebuild 3399 RMD160 ed65689009671980d2dd00005b5e1bc544cfeb4d SHA1 80de42f6b5db58835843f830e7346ffc51a3530e SHA256 30db44d54df59759cbe1cab41aa34adf64cf3c4cd6740bf96f5cf2f6cc7eb291
+MD5 9eab592f0801d690b3e0e72a139fc157 util-vserver-0.30.211_rc2.ebuild 3399
+RMD160 ed65689009671980d2dd00005b5e1bc544cfeb4d util-vserver-0.30.211_rc2.ebuild 3399
+SHA256 30db44d54df59759cbe1cab41aa34adf64cf3c4cd6740bf96f5cf2f6cc7eb291 util-vserver-0.30.211_rc2.ebuild 3399
 MD5 7357caca90e5b3432ee31105c0c8ee08 files/digest-util-vserver-0.30.211_rc1 578
 RMD160 0c2bc903c1b70e07555a524556b214bdd5e95b61 files/digest-util-vserver-0.30.211_rc1 578
 SHA256 b0cc34e26110753abb1dce2cefa71edc20e192a253fcc14835f76987500239e3 files/digest-util-vserver-0.30.211_rc1 578
diff --git a/sys-cluster/util-vserver/files/215_all_shell-completion.patch b/sys-cluster/util-vserver/files/215_all_shell-completion.patch
index 0eda118..6820376 100644
--- a/sys-cluster/util-vserver/files/215_all_shell-completion.patch
+++ b/sys-cluster/util-vserver/files/215_all_shell-completion.patch
@@ -1,7 +1,5 @@
-Index: util-vserver/bash_completion
-===================================================================
---- /dev/null
-+++ util-vserver/bash_completion
+--- util-vserver-0.30.211-rc2.orig/contrib/bash_completion	1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.211-rc2/contrib/bash_completion	2006-09-28 14:39:49.883492639 +0200
 @@ -0,0 +1,300 @@
 +# 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
@@ -303,10 +301,8 @@ Index: util-vserver/bash_completion
 +
 +}
 +}
-Index: util-vserver/zsh_completion
-===================================================================
---- /dev/null
-+++ util-vserver/zsh_completion
+--- util-vserver-0.30.211-rc2.orig/contrib/zsh_completion	1970-01-01 01:00:00.000000000 +0100
++++ util-vserver-0.30.211-rc2/contrib/zsh_completion	2006-09-28 14:39:49.883492639 +0200
 @@ -0,0 +1,188 @@
 +#compdef vserver
 +
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.211_rc1.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.211_rc1.ebuild
index 62f00bf..56a54ab 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.211_rc1.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.211_rc1.ebuild
@@ -60,7 +60,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	cp "${WORKDIR}"/tools/* scripts/ || die "failed to copy gentoo tools"
+	cp "${WORKDIR}/tools/"* scripts/ || die "failed to copy gentoo tools"
 	epatch "${FILESDIR}"/*.patch
 }
 
@@ -89,15 +89,6 @@ src_install() {
 	doinitd "${WORKDIR}/init.d/vservers"
 	doconfd "${WORKDIR}/conf.d/vservers"
 
-	# insert gentoo-functions.sh into /usr/lib/util-vserver
-	insinto /usr/lib/util-vserver
-	doins "${WORKDIR}"/tools/gentoo-functions.sh
-	rm -f "${WORKDIR}"/tools/gentoo-functions.sh
-
-	# insert our tools
-	exeinto /usr/sbin
-	doexe "${WORKDIR}"/tools/*
-
 	# bash-completion
 	dobashcompletion "${S}"/contrib/bash_completion util-vserver
 
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.211_rc2.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.211_rc2.ebuild
index 0f5f273..fed1fd9 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.211_rc2.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.211_rc2.ebuild
@@ -60,7 +60,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	cp "${WORKDIR}"/tools/* scripts/ || die "failed to copy gentoo tools"
+	cp "${WORKDIR}/tools/"* scripts/ || die "failed to copy gentoo tools"
 	epatch "${FILESDIR}"/*.patch
 }
 
@@ -89,15 +89,6 @@ src_install() {
 	doconfd "${WORKDIR}/conf.d/vservers"
 	doinitd "${WORKDIR}/init.d/vservers"
 
-	# insert gentoo-functions.sh into /usr/lib/util-vserver
-	insinto /usr/lib/util-vserver
-	doins "${WORKDIR}"/tools/gentoo-functions.sh
-	rm -f "${WORKDIR}"/tools/gentoo-functions.sh
-
-	# insert our tools
-	exeinto /usr/sbin
-	doexe "${WORKDIR}"/tools/*
-
 	# bash-completion
 	dobashcompletion "${S}"/contrib/bash_completion util-vserver