Make dev-lang/php the default virtual for PHP in base/virtuals, override it in MIPS profiles to still point to dev-php/mod_php to avoid breakage.

11 files changed, 19 insertions, 28 deletions

diff --git a/profiles/base/virtuals b/profiles/base/virtuals
index 8678bd5294f2..9aa994425da1 100644
--- a/profiles/base/virtuals
+++ b/profiles/base/virtuals
@@ -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/profiles/base/virtuals,v 1.84 2006/01/19 17:41:44 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/virtuals,v 1.85 2006/02/23 21:24:08 chtekk Exp $
 
 # This file describes the packages that by default satisfy a certain virtual
 # That this file exists in the base profile implies that these packages will
@@ -32,7 +32,7 @@ virtual/glu					x11-base/xorg-x11
 virtual/glut				media-libs/glut
 virtual/gnustep-back		gnustep-base/gnustep-back-art
 virtual/gzip				app-arch/gzip
-virtual/httpd-php			dev-php/mod_php
+virtual/httpd-php			dev-lang/php
 virtual/imap-c-client		net-libs/c-client
 virtual/imapd				net-mail/courier-imap
 virtual/inetd				sys-apps/xinetd
@@ -63,7 +63,7 @@ virtual/pager				sys-apps/less
 virtual/pam					>=sys-libs/pam-0.78
 virtual/pbs					sys-cluster/torque
 virtual/pdfviewer			app-text/xpdf
-virtual/php					dev-php/mod_php
+virtual/php					dev-lang/php
 virtual/portage				sys-apps/portage
 virtual/psviewer			app-text/gv
 virtual/python				dev-lang/python
diff --git a/profiles/default-linux/mips/virtuals b/profiles/default-linux/mips/virtuals
index 3211fb862553..42e897875127 100644
--- a/profiles/default-linux/mips/virtuals
+++ b/profiles/default-linux/mips/virtuals
@@ -1,7 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/virtuals,v 1.7 2005/11/19 03:18:44 redhatter Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/mips/virtuals,v 1.8 2006/02/23 21:24:08 chtekk Exp $
 
 virtual/alsa				sys-kernel/mips-sources
 virtual/linux-sources		sys-kernel/mips-sources
 virtual/os-headers			sys-kernel/mips-headers
+virtual/httpd-php			dev-php/mod_php
+virtual/php					dev-php/mod_php
diff --git a/profiles/default-linux/ppc/2005.1/ppc64/virtuals b/profiles/default-linux/ppc/2005.1/ppc64/virtuals
index 7933cd1a216e..e5133e7f1b51 100644
--- a/profiles/default-linux/ppc/2005.1/ppc64/virtuals
+++ b/profiles/default-linux/ppc/2005.1/ppc64/virtuals
@@ -1,9 +1,7 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/virtuals,v 1.5 2006/01/22 13:31:32 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.1/ppc64/virtuals,v 1.6 2006/02/23 21:24:08 chtekk Exp $
 
 virtual/bootloader     sys-boot/yaboot-static
 virtual/jdk            dev-java/ibm-jdk-bin
 virtual/jre            dev-java/ibm-jre-bin
-virtual/php            dev-lang/php
-virtual/httpd-php      dev-lang/php
diff --git a/profiles/default-linux/ppc/ppc64/virtuals b/profiles/default-linux/ppc/ppc64/virtuals
index 0561c6f9c97d..fb274afa5eb7 100644
--- a/profiles/default-linux/ppc/ppc64/virtuals
+++ b/profiles/default-linux/ppc/ppc64/virtuals
@@ -1,9 +1,7 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ppc64/virtuals,v 1.1 2006/02/22 10:44:12 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/ppc64/virtuals,v 1.2 2006/02/23 21:24:08 chtekk Exp $
 
 virtual/bootloader     sys-boot/yaboot-static
 virtual/jdk            dev-java/ibm-jdk-bin
 virtual/jre            dev-java/ibm-jre-bin
-virtual/php            dev-lang/php
-virtual/httpd-php      dev-lang/php
diff --git a/profiles/default-linux/ppc64/virtuals b/profiles/default-linux/ppc64/virtuals
index 8612a048a7d3..04379ac7ca71 100644
--- a/profiles/default-linux/ppc64/virtuals
+++ b/profiles/default-linux/ppc64/virtuals
@@ -1,11 +1,9 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/virtuals,v 1.6 2006/01/22 13:30:43 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/virtuals,v 1.7 2006/02/23 21:24:08 chtekk Exp $
 
 virtual/bootloader     sys-boot/yaboot-static
 virtual/jdk            dev-java/ibm-jdk-bin
 virtual/jre            dev-java/ibm-jre-bin
 virtual/linux-sources  sys-kernel/gentoo-sources
 virtual/x11            x11-base/xorg-x11
-virtual/php            dev-lang/php
-virtual/httpd-php      dev-lang/php
diff --git a/profiles/default-linux/x86/virtuals b/profiles/default-linux/x86/virtuals
index 0f9122c747d8..3e04ced78300 100644
--- a/profiles/default-linux/x86/virtuals
+++ b/profiles/default-linux/x86/virtuals
@@ -1,11 +1,9 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/virtuals,v 1.10 2006/01/22 13:24:20 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/x86/virtuals,v 1.11 2006/02/23 21:24:08 chtekk Exp $
 
 # This file is used to either override or extend the parent profile's
 # virtuals mappings.   In this case, this is for ARCHITECTURE SPECIFIC
 # mappings
 
 virtual/bootloader		sys-boot/grub
-virtual/php				dev-lang/php
-virtual/httpd-php		dev-lang/php
diff --git a/profiles/hardened/ppc64/virtuals b/profiles/hardened/ppc64/virtuals
index 94b1dc08d861..bd849f5b1fc0 100644
--- a/profiles/hardened/ppc64/virtuals
+++ b/profiles/hardened/ppc64/virtuals
@@ -1,11 +1,9 @@
 # Copyright 2005 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ppc64/virtuals,v 1.3 2006/01/22 13:30:06 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/ppc64/virtuals,v 1.4 2006/02/23 21:24:08 chtekk Exp $
 
 virtual/bootloader     sys-boot/yaboot-static
 virtual/jdk            dev-java/ibm-jdk-bin
 virtual/jre            dev-java/ibm-jre-bin
 virtual/linux-sources  sys-kernel/hardened-sources
 virtual/os-headers     sys-kernel/linux-headers
-virtual/php            dev-lang/php
-virtual/httpd-php      dev-lang/php
diff --git a/profiles/hardened/x86/virtuals b/profiles/hardened/x86/virtuals
index ae6b65c303bc..1fa5a59a56a6 100644
--- a/profiles/hardened/x86/virtuals
+++ b/profiles/hardened/x86/virtuals
@@ -1,9 +1,7 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/virtuals,v 1.9 2006/01/22 13:28:02 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/virtuals,v 1.10 2006/02/23 21:24:08 chtekk Exp $
 
 virtual/bootloader		sys-boot/grub
 virtual/linux-sources		sys-kernel/hardened-sources
 virtual/dev-manager		sys-fs/devfsd
-virtual/php				dev-lang/php
-virtual/httpd-php		dev-lang/php
diff --git a/profiles/selinux/2005.1/mips/virtuals b/profiles/selinux/2005.1/mips/virtuals
index 3ac6e490727a..27761a9a6232 100644
--- a/profiles/selinux/2005.1/mips/virtuals
+++ b/profiles/selinux/2005.1/mips/virtuals
@@ -1,9 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/mips/virtuals,v 1.4 2005/10/04 15:55:40 spb Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/selinux/2005.1/mips/virtuals,v 1.5 2006/02/23 21:24:08 chtekk Exp $
 
 virtual/linux-sources	sys-kernel/mips-sources
 virtual/os-headers	sys-kernel/mips-headers
 virtual/bootloader 	sys-boot/dvhtool
 virtual/editor		app-editors/vim
-
+virtual/httpd-php	dev-php/mod_php
+virtual/php			dev-php/mod_php
diff --git a/profiles/uclibc/mips/virtuals b/profiles/uclibc/mips/virtuals
index a214b61c978f..b60b7485213b 100644
--- a/profiles/uclibc/mips/virtuals
+++ b/profiles/uclibc/mips/virtuals
@@ -1,7 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/uclibc/mips/virtuals,v 1.3 2005/07/20 00:18:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/uclibc/mips/virtuals,v 1.4 2006/02/23 21:24:08 chtekk Exp $
 
 virtual/bootloader		sys-boot/dvhtool
 virtual/linux-sources	sys-kernel/mips-sources
 virtual/os-headers		sys-kernel/mips-headers
+virtual/httpd-php		dev-php/mod_php
+virtual/php				dev-php/mod_php
diff --git a/profiles/uclibc/x86/virtuals b/profiles/uclibc/x86/virtuals
index f693cc2a485b..27590ae7ac11 100644
--- a/profiles/uclibc/x86/virtuals
+++ b/profiles/uclibc/x86/virtuals
@@ -1,7 +1,5 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/uclibc/x86/virtuals,v 1.2 2006/01/22 13:25:42 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/uclibc/x86/virtuals,v 1.3 2006/02/23 21:24:08 chtekk Exp $
 
 virtual/bootloader			sys-boot/grub
-virtual/php					dev-lang/php
-virtual/httpd-php			dev-lang/php