summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2005-10-04 14:45:14 +0000
committerBenedikt Boehm <hollow@gentoo.org>2005-10-04 14:45:14 +0000
commita2a243f0f6a010340e972fc31881c6d651ae7d19 (patch)
treeb72c45cfc5a7a0e8ef407153e223becae3d16a9e
parentstable on x86 (diff)
downloadgentoo-2-a2a243f0f6a010340e972fc31881c6d651ae7d19.tar.gz
gentoo-2-a2a243f0f6a010340e972fc31881c6d651ae7d19.tar.bz2
gentoo-2-a2a243f0f6a010340e972fc31881c6d651ae7d19.zip
drop support for downloading a default stage tar
(Portage version: 2.0.52-r1)
-rw-r--r--sys-cluster/util-vserver/ChangeLog6
-rw-r--r--sys-cluster/util-vserver/Manifest27
-rw-r--r--sys-cluster/util-vserver/files/vserver-new_drop-defaulttar.patch27
-rw-r--r--sys-cluster/util-vserver/util-vserver-0.30.208-r3.ebuild3
4 files changed, 43 insertions, 20 deletions
diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index e06d2a7ae1f3..df283d33bd55 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,10 @@
# 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.29 2005/10/02 19:19:08 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.30 2005/10/04 14:45:13 hollow Exp $
+
+ 04 Oct 2005; Benedikt Boehm <hollow@gentoo.org>
+ +files/vserver-new_drop-defaulttar.patch, util-vserver-0.30.208-r3.ebuild:
+ drop support for downloading a default stage tar
02 Oct 2005; Christian Heim <phreak@gentoo.org>
util-vserver-0.30.205-r1.ebuild:
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index abefa1f8127c..642d1d15ce14 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1b1c2c6d5c7b0b03d9c90712362c58d0 ChangeLog 5843
-MD5 4bd7088cb72bd60e8ed7b7e562f3ea95 files/digest-util-vserver-0.30.205-r1 74
-MD5 14608df972e2a679a7c99744366dbbe7 files/digest-util-vserver-0.30.208-r3 157
-MD5 09276c3e50cf5c0f8d30ef0422f05fd8 files/vprocunhide 570
-MD5 bb0aa3e0f3b2d4216d303bd8ff6ebcb4 files/vserver-new_dev-fix.patch 393
-MD5 b3c3f9e3c220a288d48c43ef109ddf2b files/vservers.confd 1560
-MD5 9f45fd567b0b82deb30b950b680d983a files/vservers.initd 1692
+MD5 e4527f6195e5377b1a04186dc8d46d2e ChangeLog 6022
MD5 493021fa14e20216e8ce772e9dc10a62 metadata.xml 588
MD5 c5f348ce535b90b26e953ef356181e1d util-vserver-0.30.205-r1.ebuild 1946
-MD5 550b4cf8087d4186b0330c834e1cf243 util-vserver-0.30.208-r3.ebuild 2647
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDQDL6flZ8QqxhrsMRAirUAKCHddE50yrlphs0zSbQY8/5ec/Q8gCaAmh3
-P2xjqjIIAYxdpHeY39ED3oY=
-=uyuR
------END PGP SIGNATURE-----
+MD5 ee5142c9ee44cc355b29eaa237ba1933 util-vserver-0.30.208-r3.ebuild 2703
+MD5 b3c3f9e3c220a288d48c43ef109ddf2b files/vservers.confd 1560
+MD5 9f45fd567b0b82deb30b950b680d983a files/vservers.initd 1692
+MD5 09276c3e50cf5c0f8d30ef0422f05fd8 files/vprocunhide 570
+MD5 bb0aa3e0f3b2d4216d303bd8ff6ebcb4 files/vserver-new_dev-fix.patch 393
+MD5 5e3714a49fe3701ba1d3e5a0c210f888 files/vserver-new_drop-defaulttar.patch 840
+MD5 4bd7088cb72bd60e8ed7b7e562f3ea95 files/digest-util-vserver-0.30.205-r1 74
+MD5 14608df972e2a679a7c99744366dbbe7 files/digest-util-vserver-0.30.208-r3 157
diff --git a/sys-cluster/util-vserver/files/vserver-new_drop-defaulttar.patch b/sys-cluster/util-vserver/files/vserver-new_drop-defaulttar.patch
new file mode 100644
index 000000000000..502583959e31
--- /dev/null
+++ b/sys-cluster/util-vserver/files/vserver-new_drop-defaulttar.patch
@@ -0,0 +1,27 @@
+--- tools/vserver-new.old 2005-10-04 16:34:08.818098750 +0200
++++ tools/vserver-new 2005-10-04 16:26:13.416388000 +0200
+@@ -186,9 +186,6 @@
+ # Target: stage3 #
+ #------------------------------------------------------------------------------#
+
+-STAGE3_DEFAULTTAR="stage3-i686-latest.tar.bz2"
+-STAGE3_DEFAULTURL="http://dev.gentoo.org/~hollow/vserver/stages/${STAGE3_DEFAULTTAR}"
+-
+ stage3_usage() {
+ echo "Usage: vserver-new <name> <globalopts> stage3 [<tar>]"
+ echo
+@@ -205,10 +202,10 @@
+ exit 0
+ fi
+
+- if [ -n "$1" ]; then
+- tarball=$1
+- [ "${tarball#/}" == "${tarball}" ] && tarball="`pwd`/${tarball}"
+- fi
++ [ -z "$1" ] && die "Missing required argument <tar>"
++
++ tarball=$1
++ [ "${tarball#/}" == "${tarball}" ] && tarball="`pwd`/${tarball}"
+
+ stage3_build
+ }
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
index 1e89e751b5cc..8fa048bd85d2 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.208-r3.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.208-r3.ebuild
@@ -1,6 +1,6 @@
# 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.4 2005/10/01 19:42:07 swegener Exp $
+# $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
@@ -44,6 +44,7 @@ src_unpack() {
cd "${WORKDIR}"
epatch "${FILESDIR}"/vserver-new_dev-fix.patch
+ epatch "${FILESDIR}"/vserver-new_drop-defaulttar.patch
cd - &>/dev/null
AT_M4DIR="-I m4" \