Another bump, updating Manifest/digest.

svn path=/; revision=68

3 files changed, 35 insertions, 26 deletions

diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index d78cc9f..4f64369 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -7,11 +7,11 @@ MD5 dd1a13b6cca0095ae5be9730545ba91c files/vzctl-3.0.12-libdir64.patch 1291
 RMD160 07cd8baf2082db77945bbe5f60cbe15c819f0c0f files/vzctl-3.0.12-libdir64.patch 1291
 SHA256 c2c2bc56ca52f483b0a5cfc3d74bd2d997e653ab157d99bab193953824e8ed29 files/vzctl-3.0.12-libdir64.patch 1291
 DIST vzctl-3.0.12.tar.bz2 127309 RMD160 9e94be2d61a8e1c9c9be1947d45677c24f763649 SHA1 14cecffd1b28d319553d68327b82aa9b494c1270 SHA256 d165f551c2004211d4001d5f8764dbe0249d61fe61632f4ce5b26c01b99897f9
-DIST vzctl-patches-3.0.12.tar.bz2 3476 RMD160 78f7425c8c18e6d80be020075a5214493444f417 SHA1 3e22f2a742420d2e6215e90c355164f7199c3747 SHA256 0455b3ac1078d2889fbeef452afb8dde5971e43ef66691d13649dcc197d765af
-EBUILD vzctl-3.0.12.ebuild 1954 RMD160 c7fcacdde04e6f2ab77d2c10113a89db016c3377 SHA1 f195715829ef66ab3e0f8332f88679584ee90164 SHA256 ed5993116373f29eac1017f6e0d1c9bf2231ee17fcb07abb4c2ea2532706ba1b
-MD5 8858852d97e737b0de74ddcb296a08de vzctl-3.0.12.ebuild 1954
-RMD160 c7fcacdde04e6f2ab77d2c10113a89db016c3377 vzctl-3.0.12.ebuild 1954
-SHA256 ed5993116373f29eac1017f6e0d1c9bf2231ee17fcb07abb4c2ea2532706ba1b vzctl-3.0.12.ebuild 1954
-MD5 12292af6653341aae9508faa428f413f files/digest-vzctl-3.0.12 500
-RMD160 8ee22fcf4eefda4b044d54f3148952d4464ca4cf files/digest-vzctl-3.0.12 500
-SHA256 c45c2eac0362d83d04195fecaa12be0b5c09821e482e4b70516d5a01b2a7ceef files/digest-vzctl-3.0.12 500
+DIST vzctl-patches-3.0.12.tar.bz2 3689 RMD160 bc465938074023598d71f7ed3af3124a1f44ec15 SHA1 848216dfc16c63962bf205415f960dedf1a7b05c SHA256 bf4e0e20821b812360974111140ed3e51ee3415ae24097a31ec13a1559b35b84
+EBUILD vzctl-3.0.12.ebuild 2306 RMD160 8fea90c6ac9158fa557650f9ff870e22dedff4e5 SHA1 f6e584906c21e72f17306d06d1133016ba459810 SHA256 0760a8194ee472c23933224b05942c25da467f5cd6ac3ea99c316cbfc4d4c74e
+MD5 78abfe4d9332fb63ed2d563881bae9d1 vzctl-3.0.12.ebuild 2306
+RMD160 8fea90c6ac9158fa557650f9ff870e22dedff4e5 vzctl-3.0.12.ebuild 2306
+SHA256 0760a8194ee472c23933224b05942c25da467f5cd6ac3ea99c316cbfc4d4c74e vzctl-3.0.12.ebuild 2306
+MD5 c003563d62b5cae5dd65c13a2b5dfd3a files/digest-vzctl-3.0.12 500
+RMD160 1e77ac564f2f0e5ceefcdb0923cf831150e7f623 files/digest-vzctl-3.0.12 500
+SHA256 bbf51c8913397d0891371f7a147e8864e76f38e619df105551004c1ab276485b files/digest-vzctl-3.0.12 500
diff --git a/sys-cluster/vzctl/files/digest-vzctl-3.0.12 b/sys-cluster/vzctl/files/digest-vzctl-3.0.12
index a41c087..06e239c 100644
--- a/sys-cluster/vzctl/files/digest-vzctl-3.0.12
+++ b/sys-cluster/vzctl/files/digest-vzctl-3.0.12
@@ -1,6 +1,6 @@
 MD5 ba83f2b8949d9c1ed469bd325fb47840 vzctl-3.0.12.tar.bz2 127309
 RMD160 9e94be2d61a8e1c9c9be1947d45677c24f763649 vzctl-3.0.12.tar.bz2 127309
 SHA256 d165f551c2004211d4001d5f8764dbe0249d61fe61632f4ce5b26c01b99897f9 vzctl-3.0.12.tar.bz2 127309
-MD5 9880aea30f9fdd0a0d31fd0f656f4fbc vzctl-patches-3.0.12.tar.bz2 3476
-RMD160 78f7425c8c18e6d80be020075a5214493444f417 vzctl-patches-3.0.12.tar.bz2 3476
-SHA256 0455b3ac1078d2889fbeef452afb8dde5971e43ef66691d13649dcc197d765af vzctl-patches-3.0.12.tar.bz2 3476
+MD5 2bd8270b25dc5f04cf9705a77b7f3de3 vzctl-patches-3.0.12.tar.bz2 3689
+RMD160 bc465938074023598d71f7ed3af3124a1f44ec15 vzctl-patches-3.0.12.tar.bz2 3689
+SHA256 bf4e0e20821b812360974111140ed3e51ee3415ae24097a31ec13a1559b35b84 vzctl-patches-3.0.12.tar.bz2 3689
diff --git a/sys-cluster/vzctl/vzctl-3.0.12.ebuild b/sys-cluster/vzctl/vzctl-3.0.12.ebuild
index b321744..7195d7e 100644
--- a/sys-cluster/vzctl/vzctl-3.0.12.ebuild
+++ b/sys-cluster/vzctl/vzctl-3.0.12.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils flag-o-matic multilib
+inherit bash-completion eutils flag-o-matic multilib
 
 DESCRIPTION="OpenVZ VPS control utility"
 HOMEPAGE="http://openvz.org/"
@@ -13,14 +13,15 @@ SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="udev"
+IUSE="bash-completion logrotate udev"
 
-RDEPEND="app-admin/logrotate
-	sys-apps/ed
+RDEPEND="logrotate? ( app-admin/logrotate )
 	net-firewall/iptables
-	sys-fs/vzquota
+	sys-apps/ed
 	sys-apps/iproute2
-	udev? ( sys-fs/udev )"
+	sys-fs/vzquota
+	udev? ( sys-fs/udev )
+	virtual/cron"
 
 DEPEND="${RDEPEND}"
 
@@ -36,26 +37,34 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/vzctl" install || die "make install failed"
-#	make DESTDIR="${D}" install || die "make install failed"
+	make DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/vzctl" install install-gentoo || die "make install failed"
 
 	# the get_libdir in `make install' breaks src/Makefile's logic (and thus all
 	# contained tools), so we have to create a env.d entry for vzctl's LDPATH.
-#	dodir /etc/env.d
-#	echo "LDPATH=\"/usr/$(get_libdir)/vzctl\"" > "${D}"/etc/env.d/05vzctl
+	dodir /etc/env.d
+	echo "LDPATH=\"/usr/$(get_libdir)/vzctl\"" > "${D}"/etc/env.d/05vzctl
+
+	# Remove udev files unless USE=udev
+	use udev || rm -rf "${D}"/etc/udev
+
+	# Remove the bash-completion and use dobashcompletion to install it in the
+	# right place!
+	rm -rf "${D}"/etc/bash_completion.d
+	dobashcompletion "${S}"/etc/bash_completion.d/vzctl.sh vzctl
+
+	# Remove the logrotate entr unless USE=logrotate
+	use logrotate || rm -rf "${D}"/etc/logrotate.d
 
 	# Provide a symlink for vz.conf (fixing #138462)
-	dosym /etc/vz/vz.conf /etc/conf.d/vz
+#	dosym /etc/vz/vz.conf /etc/conf.d/vz
 
 	# Remove cruftie sysconfig entries
 	# We can get rid of that once ovz #254 is solved
 	rm -rf "${D}"/etc/sysconfig
 
 	# Install gentoo specific init script
-	rm -f "${D}"/etc/init.d/*
-	newinitd "${WORKDIR}"/init.d/vz.initd vz
-
-#	dodoc "${WORKDIR}/patches/000_README"
+#	rm -f "${D}"/etc/init.d/*
+#	newinitd "${WORKDIR}"/init.d/vz.initd vz
 }
 
 pkg_postinst() {