10 files changed, 14 insertions, 76 deletions
diff --git a/virtual/mysql/mysql-4.0.ebuild b/virtual/mysql/mysql-4.0.ebuild
index 9ecbe43..eafdc3a 100644
--- a/virtual/mysql/mysql-4.0.ebuild
+++ b/virtual/mysql/mysql-4.0.ebuild
@@ -15,3 +15,4 @@ DEPEND=""
 RDEPEND="|| (
 	=dev-db/mysql-${PV}*
 )"
+PDEPEND="virtual/mysqldb"
diff --git a/virtual/mysql/mysql-4.1.ebuild b/virtual/mysql/mysql-4.1.ebuild
index d3f2f2c..0fdb7bc 100644
--- a/virtual/mysql/mysql-4.1.ebuild
+++ b/virtual/mysql/mysql-4.1.ebuild
@@ -13,3 +13,4 @@ IUSE=""
 
 DEPEND=""
 RDEPEND="=dev-db/mysql-${PV}*"
+PDEPEND="virtual/mysqldb"
diff --git a/virtual/mysql/mysql-5.0.ebuild b/virtual/mysql/mysql-5.0.ebuild
index ec5667c..90cbfee 100644
--- a/virtual/mysql/mysql-5.0.ebuild
+++ b/virtual/mysql/mysql-5.0.ebuild
@@ -15,3 +15,4 @@ DEPEND=""
 RDEPEND="|| (
 	=dev-db/mysql-${PV}*
 )"
+PDEPEND="virtual/mysqldb"
diff --git a/virtual/mysql/mysql-5.1.ebuild b/virtual/mysql/mysql-5.1-r1.ebuild
index a41eabc..2f40ed1 100644
--- a/virtual/mysql/mysql-5.1.ebuild
+++ b/virtual/mysql/mysql-5.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.1.ebuild,v 1.23 2011/04/20 12:26:25 jmbsvicetto Exp $
+# $Header: $
 
-EAPI="2"
+EAPI="5"
 
 DESCRIPTION="Virtual for MySQL client or database"
 HOMEPAGE=""
@@ -14,9 +14,5 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="embedded minimal static"
 
 DEPEND=""
-# TODO: add mysql-cluster here
-RDEPEND="|| (
-	=dev-db/mysql-${PV}*[embedded=,minimal=,static=]
-	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=]
-	=dev-db/mysql-cluster-7*[embedded=,minimal=,static=]
-)"
+RDEPEND="=dev-db/mysql-${PV}*[embedded=,minimal=,static=]"
+PDEPEND="virtual/mysqldb"
diff --git a/virtual/mysql/mysql-5.2.ebuild b/virtual/mysql/mysql-5.2.ebuild
deleted file mode 100644
index ae0e162..0000000
--- a/virtual/mysql/mysql-5.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.2.ebuild,v 1.1 2011/07/28 11:45:07 jmbsvicetto Exp $
-
-EAPI="2"
-
-DESCRIPTION="Virtual for MySQL client or database"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="embedded minimal static"
-
-DEPEND=""
-RDEPEND="|| (
-	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=]
-)"
diff --git a/virtual/mysql/mysql-5.3.ebuild b/virtual/mysql/mysql-5.3.ebuild
deleted file mode 100644
index 45e3e68..0000000
--- a/virtual/mysql/mysql-5.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.3.ebuild,v 1.1 2011/07/28 11:45:07 jmbsvicetto Exp $
-
-EAPI="2"
-
-DESCRIPTION="Virtual for MySQL client or database"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="embedded minimal static"
-
-DEPEND=""
-RDEPEND="|| (
-	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=]
-)"
diff --git a/virtual/mysql/mysql-10.0.ebuild b/virtual/mysql/mysql-5.5-r1.ebuild
index 8e28056..9517ed1 100644
--- a/virtual/mysql/mysql-10.0.ebuild
+++ b/virtual/mysql/mysql-5.5-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.5.ebuild,v 1.2 2010/03/23 14:48:06 darkside Exp $
+# $Header: $
 
-EAPI="2"
+EAPI="5"
 
 DESCRIPTION="Virtual for MySQL client or database"
 HOMEPAGE=""
@@ -14,7 +14,5 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 IUSE="embedded minimal static static-libs"
 
 DEPEND=""
-# TODO: add Drizzle here
-RDEPEND="|| (
-	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=,static-libs=]
-)"
+RDEPEND="=dev-db/mysql-${PV}*[embedded=,minimal=,static=,static-libs=]"
+PDEPEND="virtual/mysqldb"
diff --git a/virtual/mysql/mysql-5.5.ebuild b/virtual/mysql/mysql-5.5.ebuild
deleted file mode 100644
index c2ade9a..0000000
--- a/virtual/mysql/mysql-5.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.5.ebuild,v 1.5 2012/04/18 06:12:08 robbat2 Exp $
-
-EAPI="2"
-
-DESCRIPTION="Virtual for MySQL client or database"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="embedded minimal static static-libs"
-
-DEPEND=""
-# TODO: add Drizzle here
-RDEPEND="|| (
-	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=,static-libs=]
-	=dev-db/mysql-${PV}*[embedded=,minimal=,static=,static-libs=]
-	=dev-db/percona-server-${PV}*[embedded=,minimal=,static=,static-libs=]
-	=dev-db/mariadb-galera-${PV}*[embedded=,minimal=,static=,static-libs=]
-)"
diff --git a/virtual/mysql/mysql-5.6.ebuild b/virtual/mysql/mysql-5.6.ebuild
index 36f49c1..df4e8dd 100644
--- a/virtual/mysql/mysql-5.6.ebuild
+++ b/virtual/mysql/mysql-5.6.ebuild
@@ -19,3 +19,4 @@ RDEPEND="|| (
 	=dev-db/mysql-${PV}*[embedded=,minimal=,static=,static-libs=]
 	=dev-db/percona-server-${PV}*[embedded=,minimal=,static=,static-libs=]
 )"
+PDEPEND="virtual/mysqldb"
diff --git a/virtual/mysql/mysql-5.7.ebuild b/virtual/mysql/mysql-5.7.ebuild
index eeec7d1..242fcd0 100644
--- a/virtual/mysql/mysql-5.7.ebuild
+++ b/virtual/mysql/mysql-5.7.ebuild
@@ -17,3 +17,4 @@ DEPEND=""
 RDEPEND="|| (
 	=dev-db/mysql-${PV}*[embedded=,minimal=,static=,static-libs=]
 )"
+PDEPEND="virtual/mysqldb"