Removing the dosym stuff to create the vshelper link, as the Makefile does that now. Also removing the custom init-scripts, their are now shipped with util-vserver. bash_completion still didn't manage to get into the upstream distribution. Also adding --with-initscripts=gentoo to install the right init-scripts.

svn path=/; revision=118

2 files changed, 8 insertions, 17 deletions

diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index 55d4287..978486b 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -7,10 +7,10 @@ MD5 50181061681eac3cb085af7766987557 files/init.d/vservers.default 328
 RMD160 4ae796520847688da33befaa551faefd58be8184 files/init.d/vservers.default 328
 SHA256 cdab1911b6d13a3253c2744ee1b007eda16d28c24d9eeea732d63934a1bdaaba files/init.d/vservers.default 328
 DIST util-vserver-0.30.213-rc5.tar.bz2 658971 RMD160 3dab9d82bbab865ed9321c8f3021e0db26a681ca SHA1 f6ddb295f5673b4456cdcadb1963c27ad4b4a6e4 SHA256 cab90fc33684362806908c2628afc7e54bac9262b900b9d5bfb0e7fb67ccdafe
-EBUILD util-vserver-0.30.213_rc5.ebuild 3774 RMD160 86380aecd704596e9cde44d62f20c3f1f03c2440 SHA1 7dfc05c30e956af0c5b867362e824adbecb5ca86 SHA256 89426a242b244c519be93855ee17b23620e53ce8ebd7fae571fd14d1c41a4e78
-MD5 87aae86a8f0395b276925d482faa36cd util-vserver-0.30.213_rc5.ebuild 3774
-RMD160 86380aecd704596e9cde44d62f20c3f1f03c2440 util-vserver-0.30.213_rc5.ebuild 3774
-SHA256 89426a242b244c519be93855ee17b23620e53ce8ebd7fae571fd14d1c41a4e78 util-vserver-0.30.213_rc5.ebuild 3774
+EBUILD util-vserver-0.30.213_rc5.ebuild 3419 RMD160 f7404cf35e0b2bb3d34ca2af82b7bbfac91a4d37 SHA1 cdbf805705499486ef1e3ec8899279d9c5166173 SHA256 c4d840296413d77600d93563861cb299cafd9dce5d2a8e689d7f58e8d6da6661
+MD5 228830a7b6f9acc4f3648b8e51686613 util-vserver-0.30.213_rc5.ebuild 3419
+RMD160 f7404cf35e0b2bb3d34ca2af82b7bbfac91a4d37 util-vserver-0.30.213_rc5.ebuild 3419
+SHA256 c4d840296413d77600d93563861cb299cafd9dce5d2a8e689d7f58e8d6da6661 util-vserver-0.30.213_rc5.ebuild 3419
 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/util-vserver-0.30.213_rc5.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.213_rc5.ebuild
index 658eb30..ce3e555 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.213_rc5.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.213_rc5.ebuild
@@ -45,8 +45,8 @@ pkg_setup() {
 
 src_compile() {
 	econf --with-vrootdir=${VDIRBASE} \
-		--localstatedir=/var \
-		--with-initrddir=/etc/init.d || die "econf failed!"
+		--with-initscripts=gentoo \
+		--localstatedir=/var || die "econf failed!"
 	emake || die "emake failed!"
 }
 
@@ -54,11 +54,6 @@ src_install() {
 	make DESTDIR="${D}" install install-distribution \
 		|| die "make install failed!"
 
-	# create the /sbin/vshelper symlink so we don't have to mess around with
-	# (a) echoing stuff to /etc/sysctl.conf
-	# (b) changing the default vshelper in the kernel sources.
-	dosym /usr/lib/util-vserver/vshelper /sbin/vshelper
-
 	# keep dirs
 	keepdir /var/run/vservers
 	keepdir /var/run/vservers.rev
@@ -71,14 +66,10 @@ src_install() {
 	rm -f "${D}"/etc/vservers.conf
 
 	# remove the non-gentoo init-scripts:
-	rm -f "${D}"/etc/init.d/*
-
-	# and install gentoo'ized ones:
-	doinitd "${FILESDIR}"/init.d/vservers.default
-	doinitd "${FILESDIR}"/init.d/vprocunhide
+	#rm -f "${D}"/etc/init.d/*
 
 	# bash-completion
-#	dobashcompletion "${FILESDIR}"/bash_completion util-vserver
+	dobashcompletion "${FILESDIR}"/bash_completion util-vserver
 
 	dodoc README ChangeLog NEWS AUTHORS THANKS util-vserver.spec
 }