Fixing SRC_URI; cleaning up old ebuilds

(Portage version: 2.0.53_rc7)

8 files changed, 18 insertions, 224 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index 37c853e198de..4891c7eda248 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/util-vserver
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.33 2005/11/12 16:49:51 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.34 2005/11/26 09:25:02 phreak Exp $
+
+  26 Nov 2005; Christian Heim <phreak@gentoo.org>
+  -util-vserver-0.30.208-r3.ebuild, -util-vserver-0.30.208-r4.ebuild,
+  util-vserver-0.30.208-r5.ebuild, util-vserver-0.30.209.ebuild:
+  Fixing SRC_URI; cleaning up old ebuilds
 
 *util-vserver-0.30.209 (12 Nov 2005)
 
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index 616ec59bc4e9..7e518b3c6a7f 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 fe9d50d80cdd9f335d1f11d9578e3aa7 ChangeLog 6508
 MD5 4bd7088cb72bd60e8ed7b7e562f3ea95 files/digest-util-vserver-0.30.205-r1 74
 MD5 fa04b4cbc865fd7ef34386bee737b4e6 files/digest-util-vserver-0.30.208-r3 157
@@ -14,14 +11,7 @@ MD5 b3c3f9e3c220a288d48c43ef109ddf2b files/vservers.confd 1560
 MD5 9f45fd567b0b82deb30b950b680d983a files/vservers.initd 1692
 MD5 493021fa14e20216e8ce772e9dc10a62 metadata.xml 588
 MD5 c5f348ce535b90b26e953ef356181e1d util-vserver-0.30.205-r1.ebuild 1946
-MD5 4ad677a3bd9403ff6243365f42fd5250 util-vserver-0.30.208-r3.ebuild 2701
-MD5 ab43eabdf469de7dff04968715e60859 util-vserver-0.30.208-r4.ebuild 2542
-MD5 684b6fb370d6611653e553c9c8fcb559 util-vserver-0.30.208-r5.ebuild 2542
-MD5 90fe6ccb91be17f3502c102146df99d8 util-vserver-0.30.209.ebuild 2525
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDdh0uflZ8QqxhrsMRAvp0AJsGYXIRMtdzdDI1dSssmK/h6aABUACbBHaA
-SNatwAVOKqVXHhWe8dwH8Hc=
-=Sy6Q
------END PGP SIGNATURE-----
+MD5 65fa976cb1ad27224af3e64ccdefec9b util-vserver-0.30.208-r3.ebuild 2762
+MD5 35b8f2a176c193c3e3513ced155d1338 util-vserver-0.30.208-r4.ebuild 2603
+MD5 782f7c01d2b3898f837587a9755df8c6 util-vserver-0.30.208-r5.ebuild 2603
+MD5 350e0fa6e91e1edb59a32f1fa8a1f2da util-vserver-0.30.209.ebuild 2588
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.208-r3 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.208-r3
deleted file mode 100644
index 3ee9f7d79ede..000000000000
--- a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.208-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 97ee5692ab45124f59ffa78f37cfdb2c util-vserver-0.30.208-gentoo-r3.tar.bz2 21957
-MD5 4453ad0ae7f351fec651d6904e00521f util-vserver-0.30.208.tar.bz2 580935
diff --git a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.208-r4 b/sys-cluster/util-vserver/files/digest-util-vserver-0.30.208-r4
deleted file mode 100644
index 084842326b05..000000000000
--- a/sys-cluster/util-vserver/files/digest-util-vserver-0.30.208-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 fabea5c55977e1c9d95a2b1e248bd1bc util-vserver-0.30.208-gentoo-r4.tar.bz2 23238
-MD5 4453ad0ae7f351fec651d6904e00521f util-vserver-0.30.208.tar.bz2 580935
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.208-r3.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.208-r3.ebuild
deleted file mode 100644
index 8fa048bd85d2..000000000000
--- a/sys-cluster/util-vserver/util-vserver-0.30.208-r3.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2005 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-r3.ebuild,v 1.5 2005/10/04 14:45:14 hollow Exp $
-
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="Linux-VServer admin utilities"
-HOMEPAGE="http://www.nongnu.org/util-vserver/"
-SRC_URI="http://www.13thfloor.at/~ensc/util-vserver/files/alpha/${P}.tar.bz2 \
-	http://dev.gentoo.org/~hollow/vserver/${PN}/${P}-gentoo-${PR}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND=">=dev-libs/dietlibc-0.28
-	dev-libs/beecrypt
-	net-firewall/iptables
-	net-misc/vconfig
-	sys-apps/iproute2
-	sys-process/procps"
-
-pkg_setup() {
-	if [[ -z "${VDIRBASE}" ]]; then
-		einfo
-		einfo "You can change the default vserver base directory (/vservers)"
-		einfo "by setting the VDIRBASE environment variable."
-	fi
-
-	: ${VDIRBASE:=/vservers}
-
-	einfo
-	einfo "Using \"${VDIRBASE}\" as vserver base directory"
-	einfo
-}
-
-src_unpack() {
-	unpack ${A} || die
-	cd "${S}" || die
-
-	epatch "${WORKDIR}"/patches/*.patch
-
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}"/vserver-new_dev-fix.patch
-	epatch "${FILESDIR}"/vserver-new_drop-defaulttar.patch
-	cd - &>/dev/null
-
-	AT_M4DIR="-I m4" \
-	eautoreconf
-}
-
-src_compile() {
-	econf --localstatedir=/var \
-	      --with-initrddir=/etc/init.d \
-	      --with-vrootdir="${VDIRBASE}" || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-
-	# keep dirs
-	keepdir /var/run/vservers
-	keepdir /var/run/vservers.rev
-	keepdir /var/run/vshelper
-	keepdir /var/lock/vservers
-
-	keepdir "${VDIRBASE}"
-	fperms 000 "${VDIRBASE}"
-
-	# remove the non-gentoo init-scripts:
-	rm -f "${D}"/etc/init.d/*
-
-	# and install gentoo'ized ones:
-	doinitd "${WORKDIR}"/init.d/{vservers,vprocunhide}
-	doconfd "${WORKDIR}"/conf.d/vservers
-
-	# install some usefull gentoo vserver scripts
-	dosbin "${WORKDIR}"/tools/*
-
-	dodoc README ChangeLog NEWS AUTHORS INSTALL THANKS util-vserver.spec
-}
-
-pkg_postinst() {
-	einfo
-	einfo "You have to run the vprocunhide command after every reboot"
-	einfo "in order to setup /proc permissions correctly for vserver"
-	einfo "use. An init script has been installed by this package."
-	einfo "To use it you should add it to a runlevel:"
-	einfo
-	einfo " rc-update add vserver default"
-	einfo
-	einfo "This init script will also help you to start/stop your vservers"
-	einfo "on reboot. See ${ROOT}etc/conf.d/vserver for details"
-	ewarn
-	ewarn "You should definitly fix up the barrier of your vserver"
-	ewarn "base directory by using the following command in a root shell:"
-	ewarn
-	ewarn " setattr --barrier ${VDIRBASE}"
-	ewarn
-}
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.208-r4.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.208-r4.ebuild
deleted file mode 100644
index 6b8e59c05cdd..000000000000
--- a/sys-cluster/util-vserver/util-vserver-0.30.208-r4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2005 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-r4.ebuild,v 1.1 2005/10/13 20:07:55 hollow Exp $
-
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="Linux-VServer admin utilities"
-HOMEPAGE="http://www.nongnu.org/util-vserver/"
-SRC_URI="http://www.13thfloor.at/~ensc/util-vserver/files/alpha/${P}.tar.bz2 \
-	http://dev.gentoo.org/~hollow/vserver/${PN}/${P}-gentoo-${PR}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND=">=dev-libs/dietlibc-0.28
-	dev-libs/beecrypt
-	net-firewall/iptables
-	net-misc/vconfig
-	sys-apps/iproute2
-	sys-process/procps"
-
-pkg_setup() {
-	if [[ -z "${VDIRBASE}" ]]; then
-		einfo
-		einfo "You can change the default vserver base directory (/vservers)"
-		einfo "by setting the VDIRBASE environment variable."
-	fi
-
-	: ${VDIRBASE:=/vservers}
-
-	einfo
-	einfo "Using \"${VDIRBASE}\" as vserver base directory"
-	einfo
-}
-
-src_unpack() {
-	unpack ${A} || die
-	cd "${S}" || die
-
-	cp "${WORKDIR}"/tools/* scripts/ || die "failed to copy gentoo tools"
-	epatch "${WORKDIR}"/patches/*.patch
-
-	AT_M4DIR="-I m4" \
-	eautoreconf
-}
-
-src_compile() {
-	econf --localstatedir=/var \
-	      --with-initrddir=/etc/init.d \
-	      --with-vrootdir="${VDIRBASE}" || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-
-	# keep dirs
-	keepdir /var/run/vservers
-	keepdir /var/run/vservers.rev
-	keepdir /var/run/vshelper
-	keepdir /var/lock/vservers
-
-	keepdir "${VDIRBASE}"
-	fperms 000 "${VDIRBASE}"
-
-	# remove the non-gentoo init-scripts:
-	rm -f "${D}"/etc/init.d/*
-
-	# and install gentoo'ized ones:
-	doinitd "${WORKDIR}"/init.d/vservers
-	doconfd "${WORKDIR}"/conf.d/vservers
-
-	dodoc README ChangeLog NEWS AUTHORS INSTALL THANKS util-vserver.spec
-}
-
-pkg_postinst() {
-	einfo
-	einfo "You have to run the vprocunhide command after every reboot"
-	einfo "in order to setup /proc permissions correctly for vserver"
-	einfo "use. An init script has been installed by this package."
-	einfo "To use it you should add it to a runlevel:"
-	einfo
-	einfo " rc-update add vservers default"
-	einfo
-	einfo "This init script will also help you to start/stop your vservers"
-	einfo "on reboot. See ${ROOT}etc/conf.d/vserver for details"
-	ewarn
-	ewarn "You should definitly fix up the barrier of your vserver"
-	ewarn "base directory by using the following command in a root shell:"
-	ewarn
-	ewarn " setattr --barrier ${VDIRBASE}"
-	ewarn
-}
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.208-r5.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.208-r5.ebuild
index 0b3fd488fe4f..75fd1abc5185 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.208-r5.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.208-r5.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2005 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: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.208-r5.ebuild,v 1.2 2005/11/26 09:25:02 phreak Exp $
 
 inherit autotools eutils toolchain-funcs
 
 DESCRIPTION="Linux-VServer admin utilities"
 HOMEPAGE="http://www.nongnu.org/util-vserver/"
-SRC_URI="http://www.13thfloor.at/~ensc/util-vserver/files/alpha/${P}.tar.bz2 \
-	http://dev.gentoo.org/~hollow/vserver/${PN}/${P}-gentoo-${PR}.tar.bz2"
+SRC_URI="http://www.13thfloor.at/~ensc/util-vserver/files/alpha/${P}.tar.bz2
+	http://dev.gentoo.org/~hollow/distfiles/${P}-gentoo-${PR}.tar.bz2
+	http://dev.gentoo.org/~phreak/distfiles/${P}-gentoo-${PR}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.209.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.209.ebuild
index 9cab460c2df7..803ac130c586 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.209.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.209.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2005 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.209.ebuild,v 1.1 2005/11/12 16:49:51 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.209.ebuild,v 1.2 2005/11/26 09:25:02 phreak Exp $
 
 inherit autotools eutils toolchain-funcs
 
 DESCRIPTION="Linux-VServer admin utilities"
 HOMEPAGE="http://www.nongnu.org/util-vserver/"
-SRC_URI="http://www.13thfloor.at/~ensc/util-vserver/files/alpha/${P}.tar.bz2 \
-	http://dev.gentoo.org/~phreak/${PN}/${P}-gentoo.tar.bz2"
+SRC_URI="http://www.13thfloor.at/~ensc/util-vserver/files/alpha/${P}.tar.bz2
+	http://dev.gentoo.org/~hollow/distfiles/${P}-gentoo.tar.bz2
+	http://dev.gentoo.org/~phreak/distfiles/${P}-gentoo.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"