virtual/mysql

diff --git a/eclass/php-sapi.eclass b/eclass/php-sapi.eclass
index 362c323cf45294e8e8d55dc2441f5c6fbac5bb97..6a1ddea0f13c0f213a81fbf75623b6b2065e4e03 100644 (file)
--- a/eclass/php-sapi.eclass
+++ b/eclass/php-sapi.eclass
@@ -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/eclass/php-sapi.eclass,v 1.90 2006/10/14 20:27:21 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.91 2006/11/23 14:02:50 vivo Exp $
 # Author: Robin H. Johnson <robbat2@gentoo.org>
 
 inherit eutils flag-o-matic multilib libtool
@@ -87,7 +87,7 @@ RDEPEND="${RDEPEND}
        !alpha? ( !amd64? ( java? ( =virtual/jdk-1.4* dev-java/java-config ) ) )
        jpeg? ( >=media-libs/jpeg-6b )
        ldap? ( >=net-nds/openldap-1.2.11 )
-       mysql? ( >=dev-db/mysql-3.23.26 )
+       mysql? ( virtual/mysql )
        nls? ( sys-devel/gettext )
        odbc? ( >=dev-db/unixODBC-1.8.13 )
        pam? ( >=sys-libs/pam-0.75 )

diff --git a/eclass/php4_4-sapi.eclass b/eclass/php4_4-sapi.eclass
index 92f1ff7da4e74217e53b2e20e231f9540802e07f..6f7a3af79d6595b4b68cac3e526a2f9498d1a199 100644 (file)
--- a/eclass/php4_4-sapi.eclass
+++ b/eclass/php4_4-sapi.eclass
@@ -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/eclass/php4_4-sapi.eclass,v 1.29 2006/10/27 11:45:28 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php4_4-sapi.eclass,v 1.30 2006/11/23 14:02:50 vivo Exp $
 #
 # ########################################################################
 #
@@ -73,7 +73,7 @@ DEPEND="adabas? ( >=dev-db/unixODBC-1.8.13 )
                mhash? ( app-crypt/mhash )
                ming? ( media-libs/ming )
                mssql? ( dev-db/freetds )
-               mysql? ( dev-db/mysql )
+               mysql? ( virtual/mysql )
                ncurses? ( sys-libs/ncurses )
                nls? ( sys-devel/gettext )
                oci8-instant-client? ( dev-db/oracle-instantclient-basic )

diff --git a/eclass/php5-sapi-r1.eclass b/eclass/php5-sapi-r1.eclass
index 65559db1e32bb6d53a6c9a9ea6452292978b0655..290d7081a3c2da4d0c91fb28b671bd5735156203 100644 (file)
--- a/eclass/php5-sapi-r1.eclass
+++ b/eclass/php5-sapi-r1.eclass
@@ -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/eclass/php5-sapi-r1.eclass,v 1.22 2006/01/26 06:06:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r1.eclass,v 1.23 2006/11/23 14:02:50 vivo Exp $
 #
 # eclass/php5-sapi-r1.eclass
 #               Eclass for building different php5 SAPI instances
@@ -47,7 +47,7 @@ DEPEND="$DEPEND
        mime? ( sys-apps/file )
        ming? ( media-libs/ming )
        mssql? ( dev-db/freetds )
-       mysql? ( >=dev-db/mysql-3.23.26 )
+       mysql? ( virtual/mysql )
        ncurses? ( sys-libs/ncurses )
        nls? ( sys-devel/gettext )
        odbc? ( >=dev-db/unixODBC-1.8.13 )

diff --git a/eclass/php5-sapi-r2.eclass b/eclass/php5-sapi-r2.eclass
index 53e5ae16590c2e259b67d253fd5147e4e8e6d8fe..45ce83193189a645c308a2ab665d89af2fc3f672 100644 (file)
--- a/eclass/php5-sapi-r2.eclass
+++ b/eclass/php5-sapi-r2.eclass
@@ -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/eclass/php5-sapi-r2.eclass,v 1.41 2006/10/14 20:27:21 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r2.eclass,v 1.42 2006/11/23 14:02:50 vivo Exp $
 #
 # eclass/php5-sapi-r2.eclass
 #               Eclass for building different php5 SAPI instances
@@ -64,7 +64,7 @@ DEPEND="$DEPEND
        mime? ( sys-apps/file )
        ming? ( media-libs/ming )
        mssql? ( dev-db/freetds )
-       mysql? ( dev-db/mysql )
+       mysql? ( virtual/mysql )
        ncurses? ( sys-libs/ncurses )
        nls? ( sys-devel/gettext )
        odbc? ( >=dev-db/unixODBC-1.8.13 )

diff --git a/eclass/php5-sapi-r3.eclass b/eclass/php5-sapi-r3.eclass
index 9e063496c33417a2d901f0ee25a81a3b1c2f12a6..417416d7c4135da85782818f648b5792ffa560c3 100644 (file)
--- a/eclass/php5-sapi-r3.eclass
+++ b/eclass/php5-sapi-r3.eclass
@@ -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/eclass/php5-sapi-r3.eclass,v 1.23 2006/01/26 06:06:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi-r3.eclass,v 1.24 2006/11/23 14:02:50 vivo Exp $
 #
 # ########################################################################
 #
@@ -64,8 +64,8 @@ DEPEND="$DEPEND
        mime? ( sys-apps/file )
        ming? ( media-libs/ming )
        mssql? ( dev-db/freetds )
-       mysql? ( dev-db/mysql )
-       mysqli? ( >=dev-db/mysql-4.1 )
+       mysql? ( virtual/mysql )
+       mysqli? ( >=virtual/mysql-4.1 )
        ncurses? ( sys-libs/ncurses )
        nls? ( sys-devel/gettext )
        odbc? ( >=dev-db/unixODBC-1.8.13 )

diff --git a/eclass/php5-sapi.eclass b/eclass/php5-sapi.eclass
index 0c206ba923122e79484c4f02d435c22cfc709e52..0752763b5cc72ae2186e5881855beb6cf63ed885 100644 (file)
--- a/eclass/php5-sapi.eclass
+++ b/eclass/php5-sapi.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi.eclass,v 1.56 2006/01/26 06:06:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5-sapi.eclass,v 1.57 2006/11/23 14:02:50 vivo Exp $
 #
 # eclass/php5-sapi.eclass
 #              Eclass for building different php5 SAPI instances
@@ -47,7 +47,7 @@ DEPEND="$DEPEND
        mime? ( sys-apps/file )
        ming? ( media-libs/ming )
        mssql? ( dev-db/freetds )
-       mysql? ( >=dev-db/mysql-3.23.26 )
+       mysql? ( virtual/mysql )
        ncurses? ( sys-libs/ncurses )
        nls? ( sys-devel/gettext )
        odbc? ( >=dev-db/unixODBC-1.8.13 )

diff --git a/eclass/php5_0-sapi.eclass b/eclass/php5_0-sapi.eclass
index c164783938515808762782f89939041b1dc42c5f..79f768a78127a0e062f2abebb4c6664a04a26c67 100644 (file)
--- a/eclass/php5_0-sapi.eclass
+++ b/eclass/php5_0-sapi.eclass
@@ -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/eclass/php5_0-sapi.eclass,v 1.28 2006/08/30 09:04:07 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_0-sapi.eclass,v 1.29 2006/11/23 14:02:50 vivo Exp $
 #
 # ########################################################################
 #
@@ -71,8 +71,8 @@ DEPEND="adabas? ( >=dev-db/unixODBC-1.8.13 )
                mhash? ( app-crypt/mhash )
                ming? ( media-libs/ming )
                mssql? ( dev-db/freetds )
-               mysql? ( dev-db/mysql )
-               mysqli? ( >=dev-db/mysql-4.1 )
+               mysql? ( virtual/mysql )
+               mysqli? ( >=virtual/mysql-4.1 )
                ncurses? ( sys-libs/ncurses )
                nls? ( sys-devel/gettext )
                oci8-instant-client? ( dev-db/oracle-instantclient-basic )

diff --git a/eclass/php5_1-sapi.eclass b/eclass/php5_1-sapi.eclass
index 3f221e74a286b9687a4eb2ca992f63ad25821cf3..28a6fe900a29cf7ef1d6ab035b435e9bef43982a 100644 (file)
--- a/eclass/php5_1-sapi.eclass
+++ b/eclass/php5_1-sapi.eclass
@@ -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/eclass/php5_1-sapi.eclass,v 1.34 2006/10/27 11:45:28 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php5_1-sapi.eclass,v 1.35 2006/11/23 14:02:50 vivo Exp $
 #
 # ########################################################################
 #
@@ -71,8 +71,8 @@ DEPEND="adabas? ( >=dev-db/unixODBC-1.8.13 )
                mhash? ( app-crypt/mhash )
                ming? ( media-libs/ming )
                mssql? ( dev-db/freetds )
-               mysql? ( dev-db/mysql )
-               mysqli? ( >=dev-db/mysql-4.1 )
+               mysql? ( virtual/mysql )
+               mysqli? ( >=virtual/mysql-4.1 )
                ncurses? ( sys-libs/ncurses )
                nls? ( sys-devel/gettext )
                oci8-instant-client? ( dev-db/oracle-instantclient-basic )

diff --git a/eclass/tetex.eclass b/eclass/tetex.eclass
index 9ae433fca23a51ab4bf5b5d40a15757a55768df3..c03e6ec6fd774b438ab7d473a3e4a7586aea9dbd 100644 (file)
--- a/eclass/tetex.eclass
+++ b/eclass/tetex.eclass
@@ -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/eclass/tetex.eclass,v 1.48 2006/11/14 17:34:06 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/tetex.eclass,v 1.49 2006/11/23 14:02:50 vivo Exp $
 #
 # Author: Jaromir Malenko <malenko@email.cz>
 # Author: Mamoru KOMACHI <usata@gentoo.org>
@@ -86,12 +86,12 @@ PROVIDE="virtual/tetex"
 tetex_pkg_setup() {
 
        # hundreds of bugs reporting "cannot find -lmysqlclient" :(
-       if ! has_version 'dev-db/mysql' && (libwww-config --libs | grep mysql >/dev/null 2>&1); then
+       if ! has_version 'virtual/mysql' && (libwww-config --libs | grep mysql >/dev/null 2>&1); then
                eerror
                eerror "Your libwww was compiled with MySQL but MySQL is missing from system."
                eerror "Please install MySQL or remerge libwww without mysql USE flag."
                eerror
-               die "libwww was compiled with mysql but mysql is not installed"
+               die "libwww was compiled with mysql but virtual/mysql is not installed"
        fi
 }