[gentoo-dev] RFC: removal of virtual/php from depend.php

[Matti Bickel]

Hi,

in concert with bug 319623 the php team would like to remove virtual/php
from the depend.php eclass. This will change DEPEND and RDEPEND strings
for quite some packages.

The basic idea is:
virtual/php is only provided by dev-lang/php and has been for quite some
time now. There are no plans to split php again. So all ebuilds that
need a PHP installation should just depend on dev-lang/php.

For convenience we still provide virtual/httpd-php, which will give you
php and a webserver able to display your php sites.

So we're replacing virtual/php with dev-lang/php in depend.php.
Question is: do we need depend.php-r1 for this? Did I miss some
important point about the change?

Yes, this eclass requires EAPI=2 and I will not commit the change to
this eclass until every ebuild using it has migrated. If that's not
feasible, I'll use depend.php-r1.

Patch attached. Thanks to Ole Markus With, it's actually his work and
I'm just helping fleshing out ideas and directions here.

diff --git a/eclass/depend.php.eclass b/eclass/depend.php.eclass
index 003ac46..681e6dd 100644
--- a/eclass/depend.php.eclass
+++ b/eclass/depend.php.eclass
@@ -25,8 +25,8 @@ inherit eutils phpconfutils
 # Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild requires PHP4
 # with cli SAPI.
 need_php4_cli() {
-	DEPEND="${DEPEND} =virtual/php-4*"
-	RDEPEND="${RDEPEND} =virtual/php-4*"
+	DEPEND="${DEPEND} =dev-lang/php-4*[cli]"
+	RDEPEND="${RDEPEND} =dev-lang//php-4*[cli]"
 	PHP_VERSION="4"
 }
 
@@ -76,8 +76,8 @@ uses_php4() {
 # Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild requires PHP5
 # with cli SAPI.
 need_php5_cli() {
-	DEPEND="${DEPEND} =virtual/php-5*"
-	RDEPEND="${RDEPEND} =virtual/php-5*"
+	DEPEND="${DEPEND} =dev-lang/php-5*[cli]"
+	RDEPEND="${RDEPEND} =dev-lang/php-5*[cli]"
 	PHP_VERSION="5"
 }
 
@@ -127,8 +127,8 @@ uses_php5() {
 # Set this after setting DEPEND/RDEPEND in your ebuild if the ebuild requires PHP
 # (any version) with cli SAPI.
 need_php_cli() {
-	DEPEND="${DEPEND} virtual/php"
-	RDEPEND="${RDEPEND} virtual/php"
+	DEPEND="${DEPEND} dev-lang/php[cli]"
+	RDEPEND="${RDEPEND} dev-lang/php[cli]"
 }
 
 # @FUNCTION: need_php_httpd

signature.asc
Description: OpenPGP digital signature