stable on x86

Package-Manager: portage-2.0.52-r1

4 files changed, 13 insertions, 29 deletions

diff --git a/sys-apps/baselayout-vserver/ChangeLog b/sys-apps/baselayout-vserver/ChangeLog
index 89524efb423f..54ba88dc33b7 100644
--- a/sys-apps/baselayout-vserver/ChangeLog
+++ b/sys-apps/baselayout-vserver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/baselayout-vserver
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/ChangeLog,v 1.14 2005/09/30 14:02:47 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/ChangeLog,v 1.15 2005/10/04 13:51:26 hollow Exp $
+
+  03 Oct 2005; Benedikt Boehm <hollow@gentoo.org>
+  baselayout-vserver-1.11.13-r1.ebuild:
+  1.11.13-r1 to stable
 
   30 Sep 2005; Benedikt Boehm <hollow@gentoo.org>
   +files/baselayout-vserver-1.11.13-cleanup.patch,
diff --git a/sys-apps/baselayout-vserver/Manifest b/sys-apps/baselayout-vserver/Manifest
index ceff1d6b94b7..71096d1772d7 100644
--- a/sys-apps/baselayout-vserver/Manifest
+++ b/sys-apps/baselayout-vserver/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8b3f490eb3185eeb4b4cbe754e3aa2f9 ChangeLog 2900
+MD5 46e247600447ce78388ecfd354e97fb4 ChangeLog 3014
 MD5 62648662d2305c044a9c92f90c624098 baselayout-vserver-1.11.13.ebuild 12918
 MD5 61e88d37b9d7a2ab226edbbfe3b94180 baselayout-vserver-1.12.0_pre8-r2.ebuild 12599
 MD5 e5ba31c20aa49371e645a8950abd1054 metadata.xml 231
-MD5 63f20868c3d2988043352911ae17ee6a baselayout-vserver-1.11.13-r1.ebuild 13180
+MD5 3378cf09f1593e8249dfbe25239ec005 baselayout-vserver-1.11.13-r1.ebuild 13179
 MD5 cd1ba3815d5592a3c65f185cc7585107 files/baselayout-vserver-1.12.0_pre8-init-timeout-fix.patch 339
 MD5 645ee27aa823d5fb836b8f160326201e files/baselayout-vserver-1.12.0_pre8-whitelist-fixes.patch 1236
 MD5 7c0cd50e4ac1dc062f5e6ab578e95659 files/copyright 2099
 MD5 51a97031d54d767b45fb247d60727e9d files/fakelog.initd 449
 MD5 76a9437d29bd77c416f76fbcf0cf2af2 files/vserver-changes 1642
-MD5 561934d6077d4acbbf74c8bd9191a357 files/baselayout-vserver-1.11.13-cleanup.patch 19193
+MD5 cf693ea87e77c1dc6f72cf58c32b7143 files/baselayout-vserver-1.11.13-cleanup.patch 18552
 MD5 a551ddae4bfb1b2bd7cbc16c57f481d3 files/digest-baselayout-vserver-1.11.13-r1 78
 MD5 a551ddae4bfb1b2bd7cbc16c57f481d3 files/digest-baselayout-vserver-1.11.13 78
 MD5 d1b600f26f783320972a6692720df0d3 files/digest-baselayout-vserver-1.12.0_pre8-r2 83
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDPoslmPFBzbX68WERAr5GAJ9URWLGAjGDO5gotBM6Bh914u9/qwCePbrr
-Ai/Ed6CmWHBcUo2z4HOPXlY=
-=QZH9
+iD8DBQFDQolzmPFBzbX68WERAhnlAJ9Ne3gNzC+9ZNrX81V0gSWxhIN3PgCfUNuT
+rlExHZhHbJ+a2Ys4bLaGvfA=
+=hA33
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.13-r1.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.13-r1.ebuild
index 67c49b5f0774..50d6e3272bdf 100644
--- a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.13-r1.ebuild
+++ b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.13-r1.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-apps/baselayout-vserver/baselayout-vserver-1.11.13-r1.ebuild,v 1.2 2005/09/30 14:02:47 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/baselayout-vserver-1.11.13-r1.ebuild,v 1.3 2005/10/04 13:51:26 hollow Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -14,7 +14,7 @@ SRC_URI="${HOMEPAGE}/baselayout/rc-scripts-${SV}${SVREV}-vserver.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="bootstrap build fakelog static"
 
 # This version of baselayout needs gawk in /bin, but as we do not have
diff --git a/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.13-cleanup.patch b/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.13-cleanup.patch
index b85d4ea2e27e..6de3c5f1c8eb 100644
--- a/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.13-cleanup.patch
+++ b/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.13-cleanup.patch
@@ -194,26 +194,6 @@ diff -NurpP rc-scripts-1.6.13-vserver/init.d/bootmisc rc-scripts-1.6.13-vserver2
  
 +
  # vim:ts=4
-diff -NurpP rc-scripts-1.6.13-vserver/init.d/dummy rc-scripts-1.6.13-vserver2/init.d/dummy
---- rc-scripts-1.6.13-vserver/init.d/dummy	2005-06-11 15:11:23.000000000 +0200
-+++ rc-scripts-1.6.13-vserver2/init.d/dummy	2005-09-03 20:13:45.000000000 +0200
-@@ -1,14 +1,13 @@
- #!/sbin/runscript
- # Copyright 1999-2005 Gentoo Foundation
- # Distributed under the terms of the GNU General Public License v2
--# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/files/baselayout-vserver-1.11.13-cleanup.patch,v 1.1 2005/09/30 14:02:47 hollow Exp $
- 
- start() {
--	return 0
-+    return 0
- }
- 
- stop() {
--	return 0
-+    return 0
- }
- 
- # vim:ts=4
 diff -NurpP rc-scripts-1.6.13-vserver/init.d/halt.sh rc-scripts-1.6.13-vserver2/init.d/halt.sh
 --- rc-scripts-1.6.13-vserver/init.d/halt.sh	1970-01-01 01:00:00.000000000 +0100
 +++ rc-scripts-1.6.13-vserver2/init.d/halt.sh	2005-09-30 15:06:54.672505500 +0200