Updating the ebuild. Excluding the tools/ folder, its no longer needed. Also warning about the behaviour change introduced by the seperate init-scripts.

svn path=/; revision=84

3 files changed, 16 insertions, 18 deletions

diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index 02e22e4..754df7d 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -1,9 +1,9 @@
 DIST util-vserver-0.30.211.tar.bz2 638003 RMD160 42856f7131756ffc278719831de9ae190943e532 SHA1 c4b28b10b38ba88d003ea45ab1b784e1b0b31324 SHA256 992a2dd76994813508cc043bbaf7c1f903166d2b7fbcb7bd1320aa285234df59
-DIST util-vserver-patches-0.30.211-r1.tar.bz2 16779 RMD160 4ef73897df3209e4eddac85360c838a532c5f13e SHA1 2ddf70bacd2094efca6faf453ee1d88af0cafac9 SHA256 e9d5b28da16bf93a5fd9a709c0dd8023342310ce8f01e76cb8b7bf703f573401
+DIST util-vserver-patches-0.30.211-r1.tar.bz2 30953 RMD160 42f386afc970fc713d691c9984e48eea6cb569c5 SHA1 db766ecafcc4db81d0769a9c86eae9fd67281bc7 SHA256 de06424ef0bb26cdeaa4a27f7f406af702d62ad2a0f2e4e407a3c1b78ea88ad7
 EBUILD util-vserver-0.30.211-r1.ebuild 3697 RMD160 d9635d0db85d50202d028bebcf519eba7df27518 SHA1 f542fa445467bf0f882b7bc502d857774b164527 SHA256 49f59e5b9428da4feb51b94ce84c2205f8a37825b6ae5d6d54e1c6517bfae2b5
 MD5 811a696f8f14199084f0d7870c342fcc util-vserver-0.30.211-r1.ebuild 3697
 RMD160 d9635d0db85d50202d028bebcf519eba7df27518 util-vserver-0.30.211-r1.ebuild 3697
 SHA256 49f59e5b9428da4feb51b94ce84c2205f8a37825b6ae5d6d54e1c6517bfae2b5 util-vserver-0.30.211-r1.ebuild 3697
-MD5 77937bb08a50ba48e642629c7d3b54dd files/digest-util-vserver-0.30.211-r1 566
-RMD160 a59916559f436aa675d588499d439ef1170d7bf6 files/digest-util-vserver-0.30.211-r1 566
-SHA256 410ff4c38c27031cab826fe559e83140a8090cd31343412509173eee38bceb87 files/digest-util-vserver-0.30.211-r1 566
+MD5 78b5a324b382e679bcf57cbd5abc9d18 files/digest-util-vserver-0.30.211-r1 566
+RMD160 0afdf47b1d7f10d12d7f0333e6fe6578d2f2fa46 files/digest-util-vserver-0.30.211-r1 566
+SHA256 48d9257b794ebdf05ec0599ed793c810e8c77134d40b301b03c039a881bdcbac files/digest-util-vserver-0.30.211-r1 566
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
index 282db36..583f758 100644
--- 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
@@ -1,6 +1,6 @@
 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 f6d0788910ed5f8bc4419461a2afcd8c util-vserver-patches-0.30.211-r1.tar.bz2 16779
-RMD160 4ef73897df3209e4eddac85360c838a532c5f13e util-vserver-patches-0.30.211-r1.tar.bz2 16779
-SHA256 e9d5b28da16bf93a5fd9a709c0dd8023342310ce8f01e76cb8b7bf703f573401 util-vserver-patches-0.30.211-r1.tar.bz2 16779
+MD5 db1d35dc3059ade8019bb757392bc0f4 util-vserver-patches-0.30.211-r1.tar.bz2 30953
+RMD160 42f386afc970fc713d691c9984e48eea6cb569c5 util-vserver-patches-0.30.211-r1.tar.bz2 30953
+SHA256 de06424ef0bb26cdeaa4a27f7f406af702d62ad2a0f2e4e407a3c1b78ea88ad7 util-vserver-patches-0.30.211-r1.tar.bz2 30953
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.211-r1.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.211-r1.ebuild
index 10e7e10..4abe9c9 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.211-r1.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.211-r1.ebuild
@@ -58,7 +58,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	cp "${WORKDIR}"/tools/* scripts/ || die "failed to copy gentoo tools"
 	epatch "${WORKDIR}"/patches/*.patch
 
 	eautomake
@@ -92,7 +91,7 @@ src_install() {
 	rm -f "${D}"/etc/init.d/*
 
 	# and install branded/customized init-scripts:
-	doinitd "${WORKDIR}"/init.d/vservers || die "Failed to ins init.d/vservers"
+	doinitd "${WORKDIR}"/init.d/v* || die "Failed to ins init.d/v*"
 	doconfd "${WORKDIR}"/conf.d/vservers || die "Failed to ins conf.d/vservers"
 
 	# bash-completion
@@ -108,25 +107,24 @@ pkg_postinst() {
 	einfo "use. An init script has been installed by this package."
 	einfo "To use it you should add it to a runlevel:"
 	einfo
-	einfo " rc-update add vservers default"
+	einfo " rc-update add vprocunhide default"
 	einfo
-	einfo "This init script will also help you to start/stop your vservers"
-	einfo "on reboot. See ${ROOT}etc/conf.d/vserver for details"
 	ewarn
 	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
-	if has_version "<0.30.208-r8" ; then
+	if has_version "<0.30.211-r1" ; then
 		ewarn "IMPORTANT UPGRADE WARNING:"
 		ewarn
-		ewarn "Since 0.30.208-r3 the vprocunhide init-script has been merged"
-		ewarn "with the vservers init script. The following steps are"
-		ewarn "required to keep current behaviour:"
+		ewarn "Since 0.30.211-r1 the vservers init-script has been split"
+		ewarn "into vprocunhide and vserver.defaults. The following steps"
+		ewarn "are required to keep current behaviour:"
 		ewarn
-		ewarn " rc-update del vprocunhide"
-		ewarn " rc-update add vservers default"
+		ewarn " rc-update del vservers"
+		ewarn " rc-update add vprocunhide default"
+		ewarn " rc-update add vservers.default default"
 		ewarn
 	fi
 }