Version bump

(Portage version: 2.1.1_pre1-r1)

5 files changed, 183 insertions, 1 deletions

diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog
index 7c55ffe5fe23..da9a890e772c 100644
--- a/sys-cluster/vzctl/ChangeLog
+++ b/sys-cluster/vzctl/ChangeLog
@@ -1,6 +1,18 @@
 # 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.24 2006/04/24 14:53:35 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.25 2006/06/19 20:29:50 phreak Exp $
+
+*vzctl-3.0.10 (19 Jun 2006)
+
+  19 Jun 2006; Christian Heim <phreak@gentoo.org>
+  +files/vzctl-3.0.10-Makefile.patch, +files/vzctl-3.0.10-as-needed.patch,
+  +vzctl-3.0.10.ebuild:
+  Version bump, the OpenVZ finally decided to use a sane version scheme,
+  reworked the ebuild (fixed the quoting on user-influence-able variables) and
+  also added a patch to remove all those nifty unneeded things from the
+  Makefile. Another addition is the --as-needed patch from Igor Sukhih
+  <igor@openvz.org>. For a detailed ChangeLog see
+  http://openvz.org/news/updates/vzctl-3.0.10-1!
 
 *vzctl-3.0.0.8 (24 Apr 2006)
 
diff --git a/sys-cluster/vzctl/files/digest-vzctl-3.0.10 b/sys-cluster/vzctl/files/digest-vzctl-3.0.10
new file mode 100644
index 000000000000..d1e71e8f4e47
--- /dev/null
+++ b/sys-cluster/vzctl/files/digest-vzctl-3.0.10
@@ -0,0 +1,3 @@
+MD5 790dc15a779764a453b11c2368bccc40 vzctl-3.0.10.tar.bz2 124070
+RMD160 e3a1ae0846a5b7b8a054fb416c20eb7ae57d0008 vzctl-3.0.10.tar.bz2 124070
+SHA256 5509857493533cf68b55a2183154aac12d23ab65d555db3b4328c0619ca8080f vzctl-3.0.10.tar.bz2 124070
diff --git a/sys-cluster/vzctl/files/vzctl-3.0.10-Makefile.patch b/sys-cluster/vzctl/files/vzctl-3.0.10-Makefile.patch
new file mode 100644
index 000000000000..2e85cb0143da
--- /dev/null
+++ b/sys-cluster/vzctl/files/vzctl-3.0.10-Makefile.patch
@@ -0,0 +1,59 @@
+Index: vzctl-3.0.10/src/Makefile
+===================================================================
+--- vzctl-3.0.10.orig/src/Makefile
++++ vzctl-3.0.10/src/Makefile
+@@ -23,7 +23,6 @@
+   VPSCONFDIR = /etc/vz/conf
+ LIBSCRIPTSDIR = /usr/lib/vzctl/scripts/
+   SCRIPTSDIR = /usr/share/vzctl/scripts
+-NETSCRIPTDIR = /etc/sysconfig/network-scripts
+     CRONDDIR = /etc/cron.d
+     INITDDIR = /etc/init.d
+        VZDIR = /vz
+@@ -70,10 +69,8 @@ LIBSCRIPTS = vps-create vps-postcreate v
+ PROGS = vzctl vzlist arpsend vzsplit vzcfgvalidate vzmemcheck vzcalc
+ LIBS = $(LIB_vzctl) $(LIB_simfs)
+ 
+-INITSCRIPTS = vz
+ CRONSCRIPTS = vpsreboot vpsnetclean
+ SCRIPTS = vpsreboot vpsnetclean
+-NETSCRIPTS = ifcfg-venet0 ifdown-venet ifup-venet
+ VE0CONFIG = 0.conf
+ VECONFIG = ve-light.conf-sample ve-vps.basic.conf-sample 
+ VECONFIG_IA64 = ve-light.conf-sample ve-vps.basic.conf-sample
+@@ -155,13 +152,6 @@ inst-scripts:
+ 	for file in $(SCRIPTS); do \
+ 		$(INSTALL) -m755 ../etc/$$file $(DESTDIR)$(SCRIPTSDIR)/$$file; \
+ 	done
+-inst-netscripts:
+-ifneq "" "$(NETSCRIPTS)"
+-	$(INSTALL) -d $(DESTDIR)$(NETSCRIPTDIR)
+-	for file in $(NETSCRIPTS); do \
+-		$(INSTALL) -m 755 ../etc/$$file $(DESTDIR)$(NETSCRIPTDIR)/$$file; \
+-	done
+-endif
+ inst-configs:
+ 	$(INSTALL) -m 644 ../etc/vz.conf $(DESTDIR)$(GLBCONFIG)
+ ifeq ($(ARCH),ia64)
+@@ -182,11 +172,6 @@ else
+ 	$(INSTALL) -m 644 ../etc/$(VE0CONFIG) $(DESTDIR)$(VPSCONFDIR)/$(VE0CONFIG)
+ endif
+ endif
+-inst-initd:
+-	for file in $(INITSCRIPTS); do \
+-		$(INSTALL) -m 755 ../etc/init.d/$$file $(DESTDIR)$(INITDDIR)/$$file; \
+-	done
+-
+ inst-cron:
+ 	for file in $(CRONSCRIPTS); do \
+ 		$(INSTALL) -m 644 ../etc/cron.d/$$file $(DESTDIR)$(CRONDDIR)/$$file; \
+@@ -208,8 +193,7 @@ inst-dirs:
+ 	$(INSTALL) -d $(DESTDIR)$(IPSTATEDIR)
+ 	$(INSTALL) -m 644 ../etc/logrotate.d/vzctl $(DESTDIR)$(LOGRDIR)/vzctl
+ 
+-install: $(PROGS) inst-dirs install-lib inst-sbin inst-scripts \
+-	inst-netscripts inst-configs inst-initd inst-cron 
++install: $(PROGS) inst-dirs install-lib inst-sbin inst-configs inst-cron
+ clean:
+ 	rm -f *.o lib/*.lo $(PROGS) $(LIB_vzctl) $(LIB_fs) $(LIB_simfs) .depend
+ 
diff --git a/sys-cluster/vzctl/files/vzctl-3.0.10-as-needed.patch b/sys-cluster/vzctl/files/vzctl-3.0.10-as-needed.patch
new file mode 100644
index 000000000000..afe717e34402
--- /dev/null
+++ b/sys-cluster/vzctl/files/vzctl-3.0.10-as-needed.patch
@@ -0,0 +1,66 @@
+From: Igor Sukhih <igor@openvz.org>
+Date: Wed, 14 Jun 2006 13:28:00 +0000 (+0400)
+Subject: Move LDFLAGS after libraries list for workaround for Wl,--as-needed
+X-Git-Url: http://git.openvz.org/?p=vzctl;a=commitdiff;h=1da5df6aedd33b141374bf3c738d9fb6589f0d0d
+
+Move LDFLAGS after libraries list for workaround for Wl,--as-needed
+---
+
+Index: vzctl-3.0.10/src/Makefile
+===================================================================
+--- vzctl-3.0.10.orig/src/Makefile
++++ vzctl-3.0.10/src/Makefile
+@@ -102,7 +102,7 @@ check-version:
+ 	$(CC) -c $(CFLAGS) $(SHAREDLIB_CFLAGS) $(INC) $< -o $@
+ 
+ $(LIB_simfs) : $(OBJ_simfs)
+-	$(CC) $(CFLAGS) $(INC) $(LDFLAGS) $(OBJ_simfs) -shared -o $@
++	$(CC) $(CFLAGS) $(INC) $(OBJ_simfs)  $(LDFLAGS) -shared -o $@
+ 
+ $(LIB_fs): $(LIB_simfs)
+ 	ln -sf $(LIB_simfs) $(LIB_fs)
+@@ -112,16 +112,16 @@ libvzctl.a: $(OBJ_libvzctl)
+ 	ranlib $@
+ 
+ $(LIB_vzctl) : $(LIB_simfs) $(OBJ_libvzctl)
+-	$(CC) $(CFLAGS) $(INC) $(LDFLAGS) $(OBJ_libvzctl) $(LD_FLAGS) -shared -o $@
++	$(CC) $(CFLAGS) $(INC) $(OBJ_libvzctl) $(LD_FLAGS) $(LDFLAGS) -shared -o $@
+ 
+ vzctl-static: $(OBJ_vzctl) libvzctl.a
+ 	$(CC) $(CFLAGS) $(INC) $(LDFLAGS) $(OBJ_vzctl) $(OBJ_simfs) libvzctl.a -rdynamic -ldl -lutil -o $@
+ 
+ vzctl: check-version $(LIB_vzctl) $(OBJ_vzctl) $(LIB_fs)
+-	$(CC) $(CFLAGS) $(INC) $(LDFLAGS) $(OBJ_vzctl) $(LD_FLAGS) $(LIB_vzctl) $(LIB_fs) -lutil -o $@
++	$(CC) $(CFLAGS) $(INC) $(OBJ_vzctl) $(LD_FLAGS) $(LIB_vzctl) $(LIB_fs) $(LDFLAGS) -lutil -o $@
+ 
+ vzlist: $(OBJ_vzlist) $(LIB_vzctl) $(LIB_fs)
+-	$(CC) $(CFLAGS) $(INC) $(LDFLAGS) $(OBJ_vzlist) $(LD_FLAGS) $(LIB_fs) $(LIB_vzctl) -o $@
++	$(CC) $(CFLAGS) $(INC) $(OBJ_vzlist) $(LD_FLAGS) $(LIB_fs) $(LIB_vzctl) $(LDFLAGS) -o $@
+ 
+ arpsend: $(OBJ_arp)
+ 	$(CC) $(CFLAGS) $(INC) $(LDFLAGS) $^ -o $@
+@@ -130,13 +130,13 @@ vzsplit: $(OBJ_split)
+ 	$(CC) $(CFLAGS) $(INC) $(LDFLAGS) $^ -o $@
+ 
+ vzmemcheck: $(OBJ_memcheck) $(LIB_vzctl) $(LIB_fs)
+-	$(CC) $(CFLAGS) $(INC) $(LDFLAGS) $(LD_FLAGS) $(LIB_fs) $(LIB_vzctl) $^ -o $@
++	$(CC) $(CFLAGS) $(INC) $(LD_FLAGS) $(LIB_fs) $(LDFLAGS) $(LIB_vzctl) $^ -o $@
+ 
+ vzcfgvalidate: $(OBJ_cfgvalidate) $(LIB_vzctl) $(LIB_fs)
+-	$(CC) $(CFLAGS) $(INC) $(LDFLAGS) $^ $(LD_FLAGS) $(LIB_fs) $(LIB_vzctl) -o $@
++	$(CC) $(CFLAGS) $(INC) $^ $(LD_FLAGS) $(LIB_fs) $(LIB_vzctl) $(LDFLAGS) -o $@
+ 
+ vzcalc: $(OBJ_calc) $(LIB_vzctl) $(LIB_fs)
+-	$(CC) $(CFLAGS) $(INC) $(LDFLAGS) $^ $(LD_FLAGS) $(LIB_fs) $(LIB_vzctl) -o $@
++	$(CC) $(CFLAGS) $(INC) $^ $(LD_FLAGS) $(LIB_fs) $(LIB_vzctl) $(LDFLAGS) -o $@
+ 
+ inst-sbin :$(PROGS)
+ 	for file in $(PROGS); do \
+@@ -205,7 +205,6 @@ inst-dirs:
+ 	$(INSTALL) -d $(DESTDIR)$(LOGRDIR)
+ 	$(INSTALL) -d $(DESTDIR)$(CACHEDIR)
+ 	$(INSTALL) -d $(DESTDIR)$(VEIPDUMPDIR)
+-	$(INSTALL) -d $(DESTDIR)$(IPSTATEDIR)
+ 	$(INSTALL) -m 644 ../etc/logrotate.d/vzctl $(DESTDIR)$(LOGRDIR)/vzctl
+ 
+ install: $(PROGS) inst-dirs install-lib inst-sbin inst-scripts \
diff --git a/sys-cluster/vzctl/vzctl-3.0.10.ebuild b/sys-cluster/vzctl/vzctl-3.0.10.ebuild
new file mode 100644
index 000000000000..9a8df00f467d
--- /dev/null
+++ b/sys-cluster/vzctl/vzctl-3.0.10.ebuild
@@ -0,0 +1,42 @@
+# 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.10.ebuild,v 1.1 2006/06/19 20:29:50 phreak Exp $
+
+inherit eutils
+
+DESCRIPTION="OpenVZ VPS control utility"
+HOMEPAGE="http://openvz.org/"
+SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-admin/logrotate
+	app-shells/bash
+	sys-apps/sed
+	sys-apps/ed
+	sys-apps/grep
+	sys-apps/gawk
+	sys-apps/coreutils
+	net-firewall/iptables
+	app-arch/tar
+	sys-fs/vzquota
+	sys-process/procps
+	sys-apps/iproute2"
+
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	# Install gentoo specific init script
+	newinitd "${FILESDIR}"/vz.initd vz
+}