Version bump, UPSTREAM accepted all our patches (so no need to use our seperate tarball)!

(Portage version: 2.1.2_rc2-r1)

5 files changed, 90 insertions, 21 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index 0bd37c504963..8404e05b331b 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/vzctl
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.36 2006/10/12 10:56:41 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.37 2006/11/29 22:17:20 phreak Exp $
+
+*vzctl-3.0.13 (29 Nov 2006)
+
+  29 Nov 2006; Christian Heim <phreak@gentoo.org> vzctl-3.0.12.ebuild,
+  +vzctl-3.0.13.ebuild:
+  Version bump, UPSTREAM accepted all our patches (so no need to use our
+  seperate tarball)!
 
 *vzctl-3.0.12 (12 Oct 2006)
 
diff --git a/sys-cluster/vzctl/files/digest-vzctl-3.0.12 b/sys-cluster/vzctl/files/digest-vzctl-3.0.12
index fc32606b6db6..4f62d67310fc 100644
--- a/sys-cluster/vzctl/files/digest-vzctl-3.0.12
+++ b/sys-cluster/vzctl/files/digest-vzctl-3.0.12
@@ -1,6 +1,3 @@
 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 2c63e918c4a4946d0ba752ad5081a57a vzctl-patches-3.0.12.tar.bz2 3307
-RMD160 6f504387ed20f25f9f10724e835a3207be0f49af vzctl-patches-3.0.12.tar.bz2 3307
-SHA256 0efd0c067743501dc12f96d58849717e1442e1b8e4a6763a9e3ee5d32c35ac41 vzctl-patches-3.0.12.tar.bz2 3307
diff --git a/sys-cluster/vzctl/files/digest-vzctl-3.0.13 b/sys-cluster/vzctl/files/digest-vzctl-3.0.13
new file mode 100644
index 000000000000..e96a7d077bb7
--- /dev/null
+++ b/sys-cluster/vzctl/files/digest-vzctl-3.0.13
@@ -0,0 +1,3 @@
+MD5 3931ceb56b22bf5e0ad1f9977fff4005 vzctl-3.0.13.tar.bz2 129562
+RMD160 8d161c1249c90d817044c0638da0bbae4d3041b1 vzctl-3.0.13.tar.bz2 129562
+SHA256 c087a6ac18249e9050825fc371b324757ef2ff26de747e25bcaacf591bbd8b76 vzctl-3.0.13.tar.bz2 129562
diff --git a/sys-cluster/vzctl/vzctl-3.0.12.ebuild b/sys-cluster/vzctl/vzctl-3.0.12.ebuild
index b2df99bef181..d167185a7bfd 100644
--- a/sys-cluster/vzctl/vzctl-3.0.12.ebuild
+++ b/sys-cluster/vzctl/vzctl-3.0.12.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.12.ebuild,v 1.1 2006/10/12 10:56:41 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.12.ebuild,v 1.2 2006/11/29 22:17:20 phreak Exp $
 
 inherit bash-completion eutils flag-o-matic multilib
 
 DESCRIPTION="OpenVZ VPS control utility"
 HOMEPAGE="http://openvz.org/"
-SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2
-	http://dev.gentoo.org/~phreak/distfiles/${PN}-patches-${PVR}.tar.bz2
-	http://dev.gentoo.org/~hollow/distfiles/${PN}-patches-${PVR}.tar.bz2"
+SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -25,12 +23,6 @@ RDEPEND="logrotate? ( app-admin/logrotate )
 
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-
-	epatch "${WORKDIR}/patches"/*.patch
-}
-
 src_compile() {
 	append-flags -Wall -g2
 	emake CFLAGS="${CFLAGS}" || die
@@ -54,13 +46,6 @@ src_install() {
 
 	# 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
-
-	# Remove cruftie sysconfig entries
-	# We can get rid of that once ovz #254 is solved
-	rm -rf "${D}"/etc/sysconfig
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/vzctl/vzctl-3.0.13.ebuild b/sys-cluster/vzctl/vzctl-3.0.13.ebuild
new file mode 100644
index 000000000000..41477361256e
--- /dev/null
+++ b/sys-cluster/vzctl/vzctl-3.0.13.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-3.0.13.ebuild,v 1.1 2006/11/29 22:17:20 phreak Exp $
+
+inherit bash-completion eutils flag-o-matic multilib
+
+DESCRIPTION="OpenVZ VPS control utility"
+HOMEPAGE="http://openvz.org/"
+SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
+#	http://dev.gentoo.org/~phreak/distfiles/${PN}-patches-${PVR}.tar.bz2
+#	http://dev.gentoo.org/~hollow/distfiles/${PN}-patches-${PVR}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bash-completion logrotate udev"
+
+RDEPEND="logrotate? ( app-admin/logrotate )
+	net-firewall/iptables
+	sys-apps/ed
+	sys-apps/iproute2
+	sys-fs/vzquota
+	udev? ( sys-fs/udev )
+	virtual/cron"
+
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+
+#	epatch "${WORKDIR}/patches"/*.patch
+}
+
+src_compile() {
+	append-flags -Wall -g2
+	emake CFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	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
+
+	# 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
+
+	# Remove cruftie sysconfig entries
+	# We can get rid of that once ovz #254 is solved
+	rm -rf "${D}"/etc/sysconfig
+}
+
+pkg_postinst() {
+	if has_version "<3.0.10"; then
+		ewarn
+		ewarn "The location of some vzctl files have changed. Most notably,"
+		ewarn "VE configuration files and samples directory has changed from"
+		ewarn "/etc/vz to /etc/vz/conf. In order to be able to work with"
+		ewarn "your VEs, please do the following:"
+		ewarn
+		ewarn "bash# mv /etc/vz/[0-9]*.conf /etc/vz/conf/"
+		ewarn
+	fi
+}