General VCD related SVN ebuilds update.

Highlights: remove libtar dependency, add vcd/vstatd init scripts, cleanup.

svn path=/; revision=110

11 files changed, 143 insertions, 70 deletions

diff --git a/sys-cluster/vcd-svn/Manifest b/sys-cluster/vcd-svn/Manifest
index 1715ad1..6d30f0e 100644
--- a/sys-cluster/vcd-svn/Manifest
+++ b/sys-cluster/vcd-svn/Manifest
@@ -1,7 +1,11 @@
-EBUILD vcd-svn-9999.ebuild 1771 RMD160 635af40c5eb1da32823d3247b451081cf63db3b6 SHA1 6c9e84ae9e1edf59589f1240d11bfe5a737d132e SHA256 40c4aa7c531be74f0a9d6eca97105b97154a990802bd2466bb3dac2ac04c2d7a
-MD5 2e62f03635c5bc7aba1f664ee5f15b5b vcd-svn-9999.ebuild 1771
-RMD160 635af40c5eb1da32823d3247b451081cf63db3b6 vcd-svn-9999.ebuild 1771
-SHA256 40c4aa7c531be74f0a9d6eca97105b97154a990802bd2466bb3dac2ac04c2d7a vcd-svn-9999.ebuild 1771
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-vcd-svn-9999 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-vcd-svn-9999 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-vcd-svn-9999 1
+AUX vcd-initd 590 RMD160 4d5d03beba4d08d21966faf3987b5555e7ea11e9 SHA1 57e7840d48be928cdfd219726bbda8d3333101a8 SHA256 1c71e53786838d7c73cec4da767678ca29b8a34a09cb4899bd489d8804dedb8d
+MD5 049d830b203ed715686972231717cf7c files/vcd-initd 590
+RMD160 4d5d03beba4d08d21966faf3987b5555e7ea11e9 files/vcd-initd 590
+SHA256 1c71e53786838d7c73cec4da767678ca29b8a34a09cb4899bd489d8804dedb8d files/vcd-initd 590
+EBUILD vcd-svn-9999.ebuild 1752 RMD160 704844d2ea0fa8857fbcfe2d88783ff06e98414d SHA1 361acc965a4582865913bd25b5a5b1930f0cde33 SHA256 af10ad81367382737bbbaf858936b24be7057d27917f0b7733269391e0ca4b7a
+MD5 69ad6f1a15e4ac1d3b0643535e9d4844 vcd-svn-9999.ebuild 1752
+RMD160 704844d2ea0fa8857fbcfe2d88783ff06e98414d vcd-svn-9999.ebuild 1752
+SHA256 af10ad81367382737bbbaf858936b24be7057d27917f0b7733269391e0ca4b7a vcd-svn-9999.ebuild 1752
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-vcd-svn-9999 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-vcd-svn-9999 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-vcd-svn-9999 0
diff --git a/sys-cluster/vcd-svn/files/digest-vcd-svn-9999 b/sys-cluster/vcd-svn/files/digest-vcd-svn-9999
index 8b13789..e69de29 100644
--- a/sys-cluster/vcd-svn/files/digest-vcd-svn-9999
+++ b/sys-cluster/vcd-svn/files/digest-vcd-svn-9999
@@ -1 +0,0 @@
-
diff --git a/sys-cluster/vcd-svn/files/vcd-initd b/sys-cluster/vcd-svn/files/vcd-initd
new file mode 100644
index 0000000..fc2f4a2
--- /dev/null
+++ b/sys-cluster/vcd-svn/files/vcd-initd
@@ -0,0 +1,34 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+	use net
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+
+	if [[ -f "/var/run/${SVCNAME}.pid" ]] ; then
+		rm -f "/var/run/${SVCNAME}.pid"
+	fi
+
+	/usr/sbin/vprocunhide < /etc/vprocunhide.conf
+
+	start-stop-daemon \
+		--start \
+		--pidfile "/var/run/${SVCNAME}.pid" \
+		--exec /usr/sbin/vcd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+
+	start-stop-daemon \
+		--stop \
+		--pidfile "/var/run/${SVCNAME}.pid" \
+		--exec /usr/sbin/vcd
+	eend $?
+}
diff --git a/sys-cluster/vcd-svn/vcd-svn-9999.ebuild b/sys-cluster/vcd-svn/vcd-svn-9999.ebuild
index 6a605c3..59d9a45 100644
--- a/sys-cluster/vcd-svn/vcd-svn-9999.ebuild
+++ b/sys-cluster/vcd-svn/vcd-svn-9999.ebuild
@@ -1,42 +1,39 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.208-r5.ebuild,v 1.1 2005/10/27 17:20:36 hollow Exp $
+# $Header: $
 
-inherit autotools eutils toolchain-funcs subversion
+inherit autotools eutils subversion
 
-DESCRIPTION="Linux-VServer Control Daemon"
-HOMEPAGE="http://linux-vserver.org"
+DESCRIPTION="Linux-VServer Control Daemon."
+HOMEPAGE="http://svn.linux-vserver.org/projects/vcd/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~alpha ~ppc ~sparc ~x86"
-
+KEYWORDS="~amd64 ~x86"
 IUSE="client server"
 
 DEPEND="dev-libs/confuse
-	=dev-libs/lucid-svn-9999
-	=sys-libs/libvserver-svn-9999
-	>=dev-libs/xmlrpc-c-1.05
-	server? (
-		>=dev-db/sqlite-3
-		dev-libs/libtar
-	)"
+		=dev-libs/lucid-svn-9999
+		=sys-libs/libvserver-svn-9999
+		>=dev-libs/xmlrpc-c-1.05
+		server? ( >=dev-db/sqlite-3 )"
+RDEPEND="${DEPEND}"
 
 ESVN_REPO_URI="http://svn.linux-vserver.org/svn/vcd/trunk"
 ESVN_BOOTSTRAP="make -f Makefile.svn"
 
 pkg_setup() {
-	if built_with_use dev-libs/xmlrpc-c threads; then
-		eerror "You have thread support enabled in XMLRPC-C"
-		eerror "This is likely to cause problems in ${PN}"
-		eerror "Please remove thread USE flag from XMLRPC-C"
-		die "No thread support possible"
+	if built_with_use dev-libs/xmlrpc-c threads ; then
+		eerror "You have threads support enabled in XMLRPC-C."
+		eerror "This is likely to cause problems in ${PN}."
+		eerror "Please remove the 'threads' USE flag from XMLRPC-C!"
+		die "No threads support possible"
 	fi
 
 	if ! built_with_use dev-libs/xmlrpc-c curl &&
-	   ! built_with_use dev-libs/xmlrpc-c libwww; then
-		eerror "No client transport found in XMLRPC-C"
-		eerror "Please enable curl or libwww USE flag in XMLRPC-C"
+	   ! built_with_use dev-libs/xmlrpc-c libwww ; then
+		eerror "No client transport found in XMLRPC-C!"
+		eerror "Please enable the 'curl' or 'libwww' USE flags in XMLRPC-C."
 		die "No client transport found"
 	fi
 
@@ -51,16 +48,20 @@ pkg_setup() {
 src_compile() {
 	econf --with-vserverdir="${VSERVERDIR}" \
 		$(use_enable client) \
-		$(use_enable server) || die "econf failed"
+		$(use_enable server) \
+		|| die "econf failed"
 
 	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 
-	use server && keepdir "${VSERVERDIR}"
-	use server && keepdir /var/lib/vcd
+	if use server ; then
+		keepdir "${VSERVERDIR}"
+		keepdir /var/lib/vcd
+		newinitd "${FILESDIR}/vcd-initd" vcd || die "Inserting init.d-file failed"
+	fi
 
 	dodoc README ChangeLog AUTHORS
 }
diff --git a/sys-cluster/vstatd-svn/Manifest b/sys-cluster/vstatd-svn/Manifest
index 3b05b42..3af1ac5 100644
--- a/sys-cluster/vstatd-svn/Manifest
+++ b/sys-cluster/vstatd-svn/Manifest
@@ -1,7 +1,11 @@
-EBUILD vstatd-svn-9999.ebuild 864 RMD160 edf114273d7437d4b32f32546f00e9dd9ab570c5 SHA1 48cff927063112eb68398eb79f15efc82664e416 SHA256 0fe5787a809198ea7be6288367b66b786039d6e5adf3d141f00f2a1269b676ce
-MD5 28a0342f0a2fe8393169d15427477f93 vstatd-svn-9999.ebuild 864
-RMD160 edf114273d7437d4b32f32546f00e9dd9ab570c5 vstatd-svn-9999.ebuild 864
-SHA256 0fe5787a809198ea7be6288367b66b786039d6e5adf3d141f00f2a1269b676ce vstatd-svn-9999.ebuild 864
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-vstatd-svn-9999 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-vstatd-svn-9999 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-vstatd-svn-9999 1
+AUX vstatd-initd 550 RMD160 95d595495cf1305d1cd9c0dc41a23d419de8c376 SHA1 c0f4d63825b81f35de084be884655801b7a7d3cc SHA256 a2104470a579d062ca587ceb949787d019f861058de1729ec9fb3ca90193b6d9
+MD5 4318c072fe7f92d14b5e8699e195860d files/vstatd-initd 550
+RMD160 95d595495cf1305d1cd9c0dc41a23d419de8c376 files/vstatd-initd 550
+SHA256 a2104470a579d062ca587ceb949787d019f861058de1729ec9fb3ca90193b6d9 files/vstatd-initd 550
+EBUILD vstatd-svn-9999.ebuild 844 RMD160 cc6a39fde3c00f6a3b8b771716cd7edcfcb82688 SHA1 70474ecbe477529e9da8ce984e31eceed61a2a1c SHA256 838229b85bed6213c1d17331621c7058be573b9e256266ff143a45644ad0c369
+MD5 157703e841d8900e8b81ce9de578ed79 vstatd-svn-9999.ebuild 844
+RMD160 cc6a39fde3c00f6a3b8b771716cd7edcfcb82688 vstatd-svn-9999.ebuild 844
+SHA256 838229b85bed6213c1d17331621c7058be573b9e256266ff143a45644ad0c369 vstatd-svn-9999.ebuild 844
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-vstatd-svn-9999 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-vstatd-svn-9999 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-vstatd-svn-9999 0
diff --git a/sys-cluster/vstatd-svn/files/digest-vstatd-svn-9999 b/sys-cluster/vstatd-svn/files/digest-vstatd-svn-9999
index 8b13789..e69de29 100644
--- a/sys-cluster/vstatd-svn/files/digest-vstatd-svn-9999
+++ b/sys-cluster/vstatd-svn/files/digest-vstatd-svn-9999
@@ -1 +0,0 @@
-
diff --git a/sys-cluster/vstatd-svn/files/vstatd-initd b/sys-cluster/vstatd-svn/files/vstatd-initd
new file mode 100644
index 0000000..f7ae5d1
--- /dev/null
+++ b/sys-cluster/vstatd-svn/files/vstatd-initd
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+	after vcd
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+
+	if [[ -f "/var/run/${SVCNAME}.pid" ]] ; then
+		rm -f "/var/run/${SVCNAME}.pid"
+	fi
+
+	start-stop-daemon \
+		--start \
+		--pidfile "/var/run/${SVCNAME}.pid" \
+		--exec /usr/sbin/vstatd
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+
+	start-stop-daemon \
+		--stop \
+		--pidfile "/var/run/${SVCNAME}.pid" \
+		--exec /usr/sbin/vstatd
+	eend $?
+}
diff --git a/sys-cluster/vstatd-svn/vstatd-svn-9999.ebuild b/sys-cluster/vstatd-svn/vstatd-svn-9999.ebuild
index 7a23225..ceaccb0 100644
--- a/sys-cluster/vstatd-svn/vstatd-svn-9999.ebuild
+++ b/sys-cluster/vstatd-svn/vstatd-svn-9999.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.208-r5.ebuild,v 1.1 2005/10/27 17:20:36 hollow Exp $
+# $Header: $
 
-inherit autotools eutils toolchain-funcs subversion
+inherit autotools eutils subversion
 
-DESCRIPTION="Linux-VServer Statistics Daemon"
-HOMEPAGE="http://linux-vserver.org"
+DESCRIPTION="Linux-VServer Statistics Daemon."
+HOMEPAGE="http://svn.linux-vserver.org/projects/vstatd/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~alpha ~ppc ~sparc ~x86"
-
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-libs/confuse
-	=dev-libs/lucid-svn-9999
-	=sys-libs/libvserver-svn-9999
-	net-analyzer/rrdtool"
+		=dev-libs/lucid-svn-9999
+		=sys-libs/libvserver-svn-9999
+		net-analyzer/rrdtool"
+RDEPEND="${DEPEND}"
 
 ESVN_REPO_URI="http://svn.linux-vserver.org/svn/vstatd/trunk"
 ESVN_BOOTSTRAP="make -f Makefile.svn"
@@ -27,7 +27,8 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	keepdir /var/lib/vstatd
+	newinitd "${FILESDIR}/vstatd-initd" vstatd || die "Inserting init.d-file failed"
 	dodoc README ChangeLog AUTHORS
 }
diff --git a/sys-cluster/vwrappers-svn/Manifest b/sys-cluster/vwrappers-svn/Manifest
index 0241957..1725d5a 100644
--- a/sys-cluster/vwrappers-svn/Manifest
+++ b/sys-cluster/vwrappers-svn/Manifest
@@ -1,7 +1,7 @@
-EBUILD vwrappers-svn-9999.ebuild 800 RMD160 86dbf2f7c04876f72b8731150050e2e40f6e34c4 SHA1 06f2089e94367e426c025b43184e54fd5bda2c54 SHA256 06782e21ff289116369e4a316a5bb254438496701d883ed35543e7f070b0e0c1
-MD5 a099541d94a0be277219ca8819fb6494 vwrappers-svn-9999.ebuild 800
-RMD160 86dbf2f7c04876f72b8731150050e2e40f6e34c4 vwrappers-svn-9999.ebuild 800
-SHA256 06782e21ff289116369e4a316a5bb254438496701d883ed35543e7f070b0e0c1 vwrappers-svn-9999.ebuild 800
-MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-vwrappers-svn-9999 1
-RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-vwrappers-svn-9999 1
-SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-vwrappers-svn-9999 1
+EBUILD vwrappers-svn-9999.ebuild 699 RMD160 fe28800d98958965bb353d2dc87df0723c77f190 SHA1 a62eabbaf2697981fc4b9716e7e417cf0b3dc76c SHA256 08bc2eaaa3b7dfaab0ae8e3550506866532cca2ff80458ed7e45c2f4cf61b37d
+MD5 649a51441df4fef43663c7fcccd60368 vwrappers-svn-9999.ebuild 699
+RMD160 fe28800d98958965bb353d2dc87df0723c77f190 vwrappers-svn-9999.ebuild 699
+SHA256 08bc2eaaa3b7dfaab0ae8e3550506866532cca2ff80458ed7e45c2f4cf61b37d vwrappers-svn-9999.ebuild 699
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-vwrappers-svn-9999 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-vwrappers-svn-9999 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-vwrappers-svn-9999 0
diff --git a/sys-cluster/vwrappers-svn/files/digest-vwrappers-svn-9999 b/sys-cluster/vwrappers-svn/files/digest-vwrappers-svn-9999
index 8b13789..e69de29 100644
--- a/sys-cluster/vwrappers-svn/files/digest-vwrappers-svn-9999
+++ b/sys-cluster/vwrappers-svn/files/digest-vwrappers-svn-9999
@@ -1 +0,0 @@
-
diff --git a/sys-cluster/vwrappers-svn/vwrappers-svn-9999.ebuild b/sys-cluster/vwrappers-svn/vwrappers-svn-9999.ebuild
index f180ae7..db5ea1e 100644
--- a/sys-cluster/vwrappers-svn/vwrappers-svn-9999.ebuild
+++ b/sys-cluster/vwrappers-svn/vwrappers-svn-9999.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.208-r5.ebuild,v 1.1 2005/10/27 17:20:36 hollow Exp $
+# $Header: $
 
-inherit autotools eutils toolchain-funcs subversion
+inherit autotools eutils subversion
 
-DESCRIPTION="Linux-VServer Common Wrappers"
-HOMEPAGE="http://linux-vserver.org"
+DESCRIPTION="Linux-VServer Common Wrappers."
+HOMEPAGE="http://svn.linux-vserver.org/projects/vwrappers/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~alpha ~ppc ~sparc ~x86"
-
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="=dev-libs/lucid-svn-9999
-	=sys-libs/libvserver-svn-9999"
+		=sys-libs/libvserver-svn-9999"
+RDEPEND="${DEPEND}"
 
 ESVN_REPO_URI="http://svn.linux-vserver.org/svn/vwrappers/trunk"
 ESVN_BOOTSTRAP="make -f Makefile.svn"
@@ -25,6 +25,6 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc README ChangeLog AUTHORS
 }