From: Francesco Riosa <vivo@gentoo.org>
Date: Thu, 23 Nov 2006 14:02:50 +0000 (+0000)
Subject: virtual/mysql
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8830c7942e845194710d395764b3af69f84da82b;p=gentoo.git

virtual/mysql
---

diff --git a/eclass/php-sapi.eclass b/eclass/php-sapi.eclass
index 362c323cf452..6a1ddea0f13c 100644
--- 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 92f1ff7da4e7..6f7a3af79d65 100644
--- 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 65559db1e32b..290d7081a3c2 100644
--- 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 53e5ae16590c..45ce83193189 100644
--- 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 9e063496c334..417416d7c413 100644
--- 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 0c206ba92312..0752763b5cc7 100644
--- 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 c16478393851..79f768a78127 100644
--- 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 3f221e74a286..28a6fe900a29 100644
--- 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 9ae433fca23a..c03e6ec6fd77 100644
--- 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
 }