Fix the PROVIDE, inside vps/ve's there's no need for sys-apps/udev. So baselayout-vserver becomes our primary provider for virtual/dev-manager.

Package-Manager: portage-2.1.2_pre2-r4

6 files changed, 43 insertions, 33 deletions

diff --git a/sys-apps/baselayout-vserver/ChangeLog b/sys-apps/baselayout-vserver/ChangeLog
index 4a5e34ba17f9..b470883ae356 100644
--- a/sys-apps/baselayout-vserver/ChangeLog
+++ b/sys-apps/baselayout-vserver/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/baselayout-vserver
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/ChangeLog,v 1.39 2006/09/25 08:01:20 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/ChangeLog,v 1.40 2006/10/06 11:19:07 phreak Exp $
+
+  06 Oct 2006; Christian Heim <phreak@gentoo.org>
+  baselayout-vserver-1.11.14-r4.ebuild, baselayout-vserver-1.11.15.ebuild,
+  baselayout-vserver-1.12.1.ebuild, baselayout-vserver-1.12.2.ebuild:
+  Fix the PROVIDE, inside vps/ve's there's no need for sys-apps/udev. So
+  baselayout-vserver becomes our primary provider for virtual/dev-manager.
 
 *baselayout-vserver-1.12.2 (25 Sep 2006)
 
diff --git a/sys-apps/baselayout-vserver/Manifest b/sys-apps/baselayout-vserver/Manifest
index b77eb0877c97..33e3507a8551 100644
--- a/sys-apps/baselayout-vserver/Manifest
+++ b/sys-apps/baselayout-vserver/Manifest
@@ -41,26 +41,26 @@ DIST baselayout-vserver-1.12.1.tar.bz2 200131 RMD160 059dd044f1be59d96499e427a53
 DIST baselayout-vserver-1.12.2.tar.bz2 211801 RMD160 7759b189090113ee3287630800d53f9086b2c6b9 SHA1 904dff9f370921072da703252f3375e8d031586b SHA256 205c2d1d6f8aefef9fa1b00d6538c335b6fef0990670d8d019a384f28fbe8dcf
 DIST rc-scripts-vserver-1.6.14.tar.bz2 142704 RMD160 d4b7002d153116d6bdfb7ae4a1c9828d2f5b2eff SHA1 e238ee8feb4d8bdc4425fba6d2d2b9e0abd9b7f1 SHA256 0c89d5c8ac7fc9d202f20b1494e8e237e37ef11cfa73cc39f5090b2055701406
 DIST rc-scripts-vserver-1.6.15.tar.bz2 145322 RMD160 aed4999dc3f671d391c18069cadd030911c3ee29 SHA1 9739cf3e5d30bb8067de163a228d2ad058727e67 SHA256 2cf8cc9eed778ad48ca15a0ae6562545a85a462a7be37c9ef1bab1ea704f6f86
-EBUILD baselayout-vserver-1.11.14-r4.ebuild 15955 RMD160 2da129cdbab3b953b099552d16e68e15b8085f4a SHA1 c997585cdb3270e49ea96bd195f750c3c4805189 SHA256 9b42983666cdf06837bb7ecb53f8bb3b85ab7efc039d23b4974c778e9380384e
-MD5 6f0c19788c06583d952eb0a384ab105a baselayout-vserver-1.11.14-r4.ebuild 15955
-RMD160 2da129cdbab3b953b099552d16e68e15b8085f4a baselayout-vserver-1.11.14-r4.ebuild 15955
-SHA256 9b42983666cdf06837bb7ecb53f8bb3b85ab7efc039d23b4974c778e9380384e baselayout-vserver-1.11.14-r4.ebuild 15955
-EBUILD baselayout-vserver-1.11.15.ebuild 13673 RMD160 aaba4bc5484827765c1cadafa75aa4e04c186d76 SHA1 e40ff5c49f99743fb53a80770449488c5e67ab59 SHA256 d51aea74d4c0f8eff166a941192412cbe5d75ad2f2f731a8725f595f9565fc28
-MD5 95ad2a81daf6e1b050844aacdb8a9a92 baselayout-vserver-1.11.15.ebuild 13673
-RMD160 aaba4bc5484827765c1cadafa75aa4e04c186d76 baselayout-vserver-1.11.15.ebuild 13673
-SHA256 d51aea74d4c0f8eff166a941192412cbe5d75ad2f2f731a8725f595f9565fc28 baselayout-vserver-1.11.15.ebuild 13673
-EBUILD baselayout-vserver-1.12.1.ebuild 13494 RMD160 e83219ca1c53dd04c232e059e5eec90e4b89058f SHA1 849f419587213ff0d3089b8d00833d8bab89bb2f SHA256 1df21b1fa9470a6f768696592133d5f5b5e25b672825efefa82386933d779eb1
-MD5 75e13433d0267e3283c75f94a36ea176 baselayout-vserver-1.12.1.ebuild 13494
-RMD160 e83219ca1c53dd04c232e059e5eec90e4b89058f baselayout-vserver-1.12.1.ebuild 13494
-SHA256 1df21b1fa9470a6f768696592133d5f5b5e25b672825efefa82386933d779eb1 baselayout-vserver-1.12.1.ebuild 13494
-EBUILD baselayout-vserver-1.12.2.ebuild 13653 RMD160 fd464d3c8cc146d9985a020264ee6d7fb26eb744 SHA1 702b1b1daddc3d2d64ea1500cefaf21d6709d76b SHA256 2d746f16f1f0b87f5ae4d1c668ef777f968e314e2659547264c914f22ecad3dd
-MD5 b577c3edc3791a171b73176395383fbf baselayout-vserver-1.12.2.ebuild 13653
-RMD160 fd464d3c8cc146d9985a020264ee6d7fb26eb744 baselayout-vserver-1.12.2.ebuild 13653
-SHA256 2d746f16f1f0b87f5ae4d1c668ef777f968e314e2659547264c914f22ecad3dd baselayout-vserver-1.12.2.ebuild 13653
-MISC ChangeLog 8469 RMD160 4259ccd1a210ace67306600939897cd892c60ccf SHA1 4a9ff5dcca461d0c95f8553122235b5eb8949ed0 SHA256 1e3fae7f25d6d66a291c872a6897b17cea17a6e02a48de6756aaada7e7401481
-MD5 d1096b32de902e37a06ea14513cb730b ChangeLog 8469
-RMD160 4259ccd1a210ace67306600939897cd892c60ccf ChangeLog 8469
-SHA256 1e3fae7f25d6d66a291c872a6897b17cea17a6e02a48de6756aaada7e7401481 ChangeLog 8469
+EBUILD baselayout-vserver-1.11.14-r4.ebuild 15976 RMD160 86891ed097f18f9f2dccb28c941897d0547240c7 SHA1 7375eea94672b90a2623633e827d7d93cef9a61a SHA256 123209a0e9a6aff3e1c3bf25f0420161d9d1fe1620ca7638b0a3bd165c6956b0
+MD5 744b3a2a240b80a572d527f6d4b46806 baselayout-vserver-1.11.14-r4.ebuild 15976
+RMD160 86891ed097f18f9f2dccb28c941897d0547240c7 baselayout-vserver-1.11.14-r4.ebuild 15976
+SHA256 123209a0e9a6aff3e1c3bf25f0420161d9d1fe1620ca7638b0a3bd165c6956b0 baselayout-vserver-1.11.14-r4.ebuild 15976
+EBUILD baselayout-vserver-1.11.15.ebuild 13694 RMD160 b579de6294578d0fa614ddf716df87553e24a6e2 SHA1 e0dc377622b3f552b7df337f17d44b8bec70c444 SHA256 1ad0533711453b367ba7979e79a08ee88c135ba04e2071c7699d746e1efb3749
+MD5 38d8c49a79a68f2d4cc9a80419037d5c baselayout-vserver-1.11.15.ebuild 13694
+RMD160 b579de6294578d0fa614ddf716df87553e24a6e2 baselayout-vserver-1.11.15.ebuild 13694
+SHA256 1ad0533711453b367ba7979e79a08ee88c135ba04e2071c7699d746e1efb3749 baselayout-vserver-1.11.15.ebuild 13694
+EBUILD baselayout-vserver-1.12.1.ebuild 13515 RMD160 0208bea38ab8b09469afa6a012ca5e1520d0b803 SHA1 436287d08c8465747caef2276df22a2ac20d366f SHA256 64039f087a2b6a3b75cc6241363aa321baae15947412cda5b5552f6600d448b5
+MD5 b65b69a49eda824343838c5c97fe84ee baselayout-vserver-1.12.1.ebuild 13515
+RMD160 0208bea38ab8b09469afa6a012ca5e1520d0b803 baselayout-vserver-1.12.1.ebuild 13515
+SHA256 64039f087a2b6a3b75cc6241363aa321baae15947412cda5b5552f6600d448b5 baselayout-vserver-1.12.1.ebuild 13515
+EBUILD baselayout-vserver-1.12.2.ebuild 13687 RMD160 bd860f4b2ebb1b5dc636c5125e27560c684b924d SHA1 24ae8a2cc4c185b0ab4559d2acc7e78146cae5e0 SHA256 c387f3a31caf4f68646e552410e99ed643aae0e4d5ef5f4025f5dceaaf2570f5
+MD5 6e79f1ee975072bcd564b16872abaa95 baselayout-vserver-1.12.2.ebuild 13687
+RMD160 bd860f4b2ebb1b5dc636c5125e27560c684b924d baselayout-vserver-1.12.2.ebuild 13687
+SHA256 c387f3a31caf4f68646e552410e99ed643aae0e4d5ef5f4025f5dceaaf2570f5 baselayout-vserver-1.12.2.ebuild 13687
+MISC ChangeLog 8813 RMD160 33a51cf5c445ec77268e6e3a4a7ec84334e1d989 SHA1 1a80e88d490994ed92689366fbbde9db1750c472 SHA256 89fd68631930b151bf8a594aa239880834d3e22eb34e3a1d985edc6000c518d6
+MD5 cbe8ebaabb3221e6f04c36ad30f75540 ChangeLog 8813
+RMD160 33a51cf5c445ec77268e6e3a4a7ec84334e1d989 ChangeLog 8813
+SHA256 89fd68631930b151bf8a594aa239880834d3e22eb34e3a1d985edc6000c518d6 ChangeLog 8813
 MISC metadata.xml 231 RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 SHA1 5e2b3b183660e76e9a8d93b7aeab6ce5857581c1 SHA256 018942ba3f2ac5b93ec2576f55ff8d85b7808b35b751bfabb1879957f4f6c442
 MD5 e5ba31c20aa49371e645a8950abd1054 metadata.xml 231
 RMD160 532e75c33676f402571b5033faf42b7d0dbb9d28 metadata.xml 231
@@ -80,7 +80,7 @@ SHA256 37f39e48554595ae0bbd9e5c209c2867936383fa597b047886d1fd1339b8ff78 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFF4zWyuNVb5qfaOYRAvJ+AJ4ji5W/xB10/ipMwwU77NhuYXvXawCfT+tQ
-hIQwoACqiZaM2noYnWOPyJk=
-=Kk71
+iD8DBQFFJju0yuNVb5qfaOYRAqn2AKCATtvSZZQNyGUSv5F0SlyhcBaGwgCfU29/
+eJmXCCOQZZNg8S5H1hIfI0Y=
+=zLiw
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r4.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r4.ebuild
index 5827b8378d40..1ed709eb9956 100644
--- a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r4.ebuild
+++ b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.14-r4.ebuild,v 1.3 2006/03/17 12:48:01 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/baselayout-vserver-1.11.14-r4.ebuild,v 1.4 2006/10/06 11:19:07 phreak Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -29,7 +29,8 @@ RDEPEND=">=sys-apps/sysvinit-2.86-r3
 	) )"
 DEPEND="virtual/os-headers
 	>=sys-apps/portage-2.0.51"
-PROVIDE="virtual/baselayout"
+PROVIDE="virtual/baselayout
+	virtual/dev-manager"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.15.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.15.ebuild
index 991ce100424f..90e027fbb275 100644
--- a/sys-apps/baselayout-vserver/baselayout-vserver-1.11.15.ebuild
+++ b/sys-apps/baselayout-vserver/baselayout-vserver-1.11.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.15.ebuild,v 1.3 2006/06/05 20:19:28 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/baselayout-vserver-1.11.15.ebuild,v 1.4 2006/10/06 11:19:07 phreak Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -28,7 +28,8 @@ RDEPEND=">=sys-apps/sysvinit-2.86-r3
 	) )"
 DEPEND="virtual/os-headers
 	>=sys-apps/portage-2.0.51"
-PROVIDE="virtual/baselayout"
+PROVIDE="virtual/baselayout
+	virtual/dev-manager"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/baselayout-vserver/baselayout-vserver-1.12.1.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.12.1.ebuild
index 4c10439fa882..7f67d0ee44a4 100644
--- a/sys-apps/baselayout-vserver/baselayout-vserver-1.12.1.ebuild
+++ b/sys-apps/baselayout-vserver/baselayout-vserver-1.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.12.1.ebuild,v 1.2 2006/06/22 07:27:13 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/baselayout-vserver-1.12.1.ebuild,v 1.3 2006/10/06 11:19:07 phreak Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -25,7 +25,8 @@ RDEPEND=">=sys-apps/sysvinit-2.86-r3
 	) )"
 DEPEND="virtual/os-headers
 	>=sys-apps/portage-2.0.51"
-PROVIDE="virtual/baselayout"
+PROVIDE="virtual/baselayout
+	virtual/dev-manager"
 
 src_unpack() {
 	unpack ${A}
diff --git a/sys-apps/baselayout-vserver/baselayout-vserver-1.12.2.ebuild b/sys-apps/baselayout-vserver/baselayout-vserver-1.12.2.ebuild
index 60583ac39586..76fe00866475 100644
--- a/sys-apps/baselayout-vserver/baselayout-vserver-1.12.2.ebuild
+++ b/sys-apps/baselayout-vserver/baselayout-vserver-1.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.12.2.ebuild,v 1.1 2006/09/25 08:01:20 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-vserver/baselayout-vserver-1.12.2.ebuild,v 1.2 2006/10/06 11:19:07 phreak Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -30,7 +30,8 @@ RDEPEND=">=sys-apps/sysvinit-2.86-r3
 	!<net-misc/dhcpcd-2.0.0"
 DEPEND="virtual/os-headers
 	>=sys-apps/portage-2.0.51"
-PROVIDE="virtual/baselayout"
+PROVIDE="virtual/baselayout
+	virtual/dev-manager"
 
 src_unpack() {
 	unpack ${A}
@@ -313,7 +314,7 @@ src_install() {
 	# which is baad
 	cd ${D}/dev || die
 	ebegin "Populating /dev with safe device nodes..."
-	"${D}"/sbin/MAKEDEV generic-vserver
+	"${D}"/sbin/MAKEDEV generic-vserver &> /dev/null
 	eend $? || die
 
 	# Hack to fix bug 9849, continued in pkg_postinst