virtual/mysql: rebase to mysql overlay

This rebases the virtual/mysql ebuilds with those from the mysql overlay.

This time, I didn't bother adding ${MULTILIB_USEDEP} to the ebuilds other
than virtual/mysql-5.5-r1, as this only would have served to confuse
the end-user with a face full of pointless ABI use_expand gobbldey-gook,
so the remaining files are unmodified copies of the overlay's versions.

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

11 files changed, 108 insertions, 56 deletions

diff --git a/virtual/mysql/Manifest b/virtual/mysql/Manifest
index 53f7dfa..50cc4b5 100644
--- a/virtual/mysql/Manifest
+++ b/virtual/mysql/Manifest
@@ -1,9 +1,12 @@
-EBUILD mysql-4.0-r1.ebuild 354 SHA256 5135d7124598960a169a88d7e41f7170c52c27da2aa3f2329cc4547700da76e8 SHA512 67d9d0e78fa6068eab8b22e9fa71020bc2990c95af0f3e5af73fe5c35ddc60d2d90b9c1f3acd4b2fdb9c2f9ba0f046b48f399b885ec5ed88c0bf2b31109621a5 WHIRLPOOL 4b4b3e9c2d000463e0acd4d98dd94c04f37fd372c4ec190e65d2ea978d104e54d3dbb4835787c001736c033911194b6b69655beed53aaf4f67d74ddca4cb70dd
-EBUILD mysql-4.1-r1.ebuild 345 SHA256 cca2b2d52956f420fad4b43da617cd681488bcf156e524a3a285b52099970d33 SHA512 20566838e689ee27e0db64ff0f4ec62268e989e172ccb30432dd3d9304d2fabc64284e6b5cdc8e7e214addeca6c4677594d7b3b7df01036baef2cdbad4b51951 WHIRLPOOL 5dbd667e786c20101711a91f1000f8758b75184e19571b0e5ab1e1319205a8206439c05d43fdae8db495e84e862d654aca82fdeb7de73c0e9b861c931510bae0
-EBUILD mysql-5.0-r1.ebuild 353 SHA256 b3148f0b10d385230de6012f7b6bcbd8e91eff72e271e3314b2d73937ddcdf0b SHA512 56ba628ec15d903e4fc4782d4ada5e5c44ed74179c934195f096fdc77873bbcea8cad817210139a3eca64ae06f2a77b0cc9037b7abf9e3dfc56cd99ff5e87ebc WHIRLPOOL 1a00234707e0facb755f53b2c4a0c481e2b6a92a6318a146f6a9ce4476260d9f0e5bae4484cac523699f44e13f0abf3e0d02d037178600dee871f1434b635ea4
-EBUILD mysql-5.1-r1.ebuild 507 SHA256 bf96c19de98432a3c8df9a723dbf790d8ec9d84ca5e4b6d1ec069c5caff97ba3 SHA512 ea9783d89c4cd7bb5acc4f9275a2efe9aae4b9cd103b579694c1d900d5821af305ce70a0d9c89bb00d409177e6cc38b96837b299313f93c038ec36bafa9fe96e WHIRLPOOL 6eaf1497e1189d93e6a1307a3d7f5cdeb4f93a8354c9de5d28078402b467634a0dd7b82153236d406a5eaaca16ce31abf85860c40317660e5dd118c01396d76d
-EBUILD mysql-5.2-r1.ebuild 407 SHA256 e7f83d75455cbb0136ffde822702badffeb2bd538466992b5e19637feb020b22 SHA512 8ad4480f4d41c02be71e2efc7a38161bfa27b73aea2593768457507923add86c2f0a02671bd8dc5cc0cf99d2debec5bb0c323ce17eb36fab60e583e19aef85ac WHIRLPOOL ce09118de07d8f5f21fd616322e1499062e7a32bffff54f6292fb21cdd9a40053ce271d79027be3b12153fc0336b4eda593f9510269f162ad87d0fd43213013a
-EBUILD mysql-5.3-r1.ebuild 407 SHA256 e7f83d75455cbb0136ffde822702badffeb2bd538466992b5e19637feb020b22 SHA512 8ad4480f4d41c02be71e2efc7a38161bfa27b73aea2593768457507923add86c2f0a02671bd8dc5cc0cf99d2debec5bb0c323ce17eb36fab60e583e19aef85ac WHIRLPOOL ce09118de07d8f5f21fd616322e1499062e7a32bffff54f6292fb21cdd9a40053ce271d79027be3b12153fc0336b4eda593f9510269f162ad87d0fd43213013a
-EBUILD mysql-5.5-r1.ebuild 514 SHA256 38ad5f72a34a00bed449149df77271b0693ee1c0bce65d0324f3aa716d7dc7e5 SHA512 907e35d1eda7643aa9dac1eb8da4ea0476bdc06af7d54838e6a135ca041c66a9b629c64074326e4530cedd031029aa8c0831ffd00a54f134b3bbb159b05a9e29 WHIRLPOOL 52c1287fc345d260b6991293e943aabe165c5378d669432487bdb5f056b089b0cc608908a90ba8bfe7f4d1709360f736f71b0a54acc8fdd6d5f6119fb5d96072
+EBUILD mysql-10.0-r1.ebuild 656 SHA256 1d0ab66329ad9f5c0293e3723323d3aa53ad5e608b17bf0401a192acdbb44a1f SHA512 2f9e910580c558df11a82fc12c551a11ce6f71ad3f99bb57ccf64edfeb2864d339a079a4600f848d38e79e001364ba4f1bccd3fe1c8ab8d4e68e8dcd84e039fc WHIRLPOOL 36caa65cf74e6ba319312075445cefd1ee50acf83cc55d53c849d764e841144f5a1f8ef442a7755ed355535ee758a858ac9a79ebea2a5b99a963c24258976542
+EBUILD mysql-4.0-r1.ebuild 542 SHA256 ba282fc3990574245c1d5fb9f8f2c35854d6cdec309a10c0a9f47baa175a9c1d SHA512 0b4446880993eacef984619ba469af9381dfb011898adb542d188bac0579e088b0c2556a34a938acd65d27042c31394d05fe0fd06430400eebebe8fad10bf84f WHIRLPOOL ffaa3430d9dc01a66483380e60885b95ecc4f2db1f184bdf0824de47951f5f93bc2f23c675eca9e5241684376da6e6bd1e092eccfb44c3aa74ab9668f0ca1555
+EBUILD mysql-4.1-r1.ebuild 544 SHA256 8a954f2516153767d6c225d31b4a99fac4e234e9addd6c09d54a26fa10315993 SHA512 21cbc9b7b33922188339a8c0e2c007c08ba33c836a376a6e6a0afcafaee078afdf3ea3ce7720656ca8be5297a4554bb9e715339f9208f08cabe1a0d57e3a11ae WHIRLPOOL 25c49f9a7f05fdf462ab2bbf4ae1e906343de860da4a0285cfeca58da87756444c1ec6cff145fd2f2de1a5c3686e59a47e76a3b169390e38158bda148a6580af
+EBUILD mysql-5.0-r1.ebuild 567 SHA256 fbcd098a2291900fc3c1d681aa42e116d9a69cb8cc24ddd99b456d8d9a3d18b3 SHA512 9ed1c714a6f2a2cd3038abd161dc4f6002973ecf1aeb3e0239db68585ffe0c0e638e3ffa79c8c185a1ad2268ff8dd8ca02c8fea0c73a06b4940398dbb8bb11df WHIRLPOOL 915b70aecefe447847173f50cddbc6218a27957bc6e713f760898dc8e4535aa1f61db183450b45eec569f5f62f7fbc427b957293dcd0efb0aa10029b5668e083
+EBUILD mysql-5.1-r1.ebuild 770 SHA256 58aa298cc49457c7b6474b3eb5f90754e121ad87583a6baf33cb94fcaf4041ef SHA512 adebd8dcaa42ba5cc3ee5c4b65dc130cf6caaf658f7e01368dbd3f5408c804e19c2a42fd48b7ec6d744519c0becaac917abce493af67ea277dfa3cfe39ea0cc9 WHIRLPOOL 07a09bc7f81ba99764945d76f02a071e7adab2e58650bf3a7dc82c09e7366fd29ab7fdf07f1c67a39e33ffebc39930d35a02f2a184186f23037a649b425ede1d
+EBUILD mysql-5.2-r1.ebuild 628 SHA256 cad035a8d626c37e1eae251c57b5375978de7bf86de11c5c5b6979c97b92a3d2 SHA512 4d2538a09c0602bcf1ceeddbc1f748ccd629f9ba917e1dbd8fa52b157ed16fb8cf661d8a871a710c257e1f0b59a004b671c7026d794f5b823bbc7b1d3e7042aa WHIRLPOOL b31dfe44567da76496e82638acbe47049f69a355c22d736db22c13650324ae48b84c817fffdd70ad7e31857157d57df04b95edf47985ad581330018f9a91751f
+EBUILD mysql-5.3-r1.ebuild 628 SHA256 d5a723d0bb33caa3abb979ce3524084cc8d8a806d78e93e89496276b06478f5d SHA512 59cb150e907b23aca21bfe2a5ea83f1c69717a6db3281e83fa936ba78bd8ef62cf0a0dd40ad0e19ac66ace2bd72cf41170f0d4f452e347ff1f8e10183d67c88d WHIRLPOOL 8edae30b3f481f83ff26dffd9831e4232a6be67bafc91d07f7a0263d0a3756957fa07ac4361e6376acabe0214795c1f833cd8aec6715e6375400bb9fd0045c2a
+EBUILD mysql-5.5-r1.ebuild 671 SHA256 882bfacf5d47c7aed1dd35c125a688a09385f2f80c140dabb80cbdae2c56af05 SHA512 cd0a46e9d4b029ac7de135cfa4555ba062e8a0878653a863d294b1de262b05886914b75b813687c60d7fefd59e479015c5219cbe3bb904c735b4051f0f51fcac WHIRLPOOL d4207e41fc655047390d99710a9fdae747fe18d59401ddbe708df7c4567682b082efec72d4ac9e9da864838f0c3e35d8fbe78dd7d2927cf47cb478020f215758
+EBUILD mysql-5.6-r1.ebuild 725 SHA256 8562a493cd5696cbb9984f3455fabefdca915b846e7b025e9e1e511961dd69e3 SHA512 c45f0c80928fb83960bd7b089a79f58332b7df0ef83fdb81fb7942f465e626259593934e063ce3f6ee8e5871a750bbab826840246fd02270201273e66c70a424 WHIRLPOOL f7d234eaeacfec4a58d54b06a37d1018b7ab080f35ef967b6238e6a5734f8cdb5acd091d011417cdf17532eb999c5e545641dd88f820804a216bf6abd0c8339f
+EBUILD mysql-5.7-r1.ebuild 535 SHA256 01d1f344d825b1a2b3660729f4d834502851348cf52f5cfde146a009fb138744 SHA512 1bc984ce24b6688e2c55ecf3c2cd05dbc4e0955331ad417f8f1cee5c316245bc2e4f9284235dcbf9eca28038f1085f4e52ab22e45af8c9522fca2e6d7877c7ae WHIRLPOOL a80582845f014442b6bb785df138e68731428b483acf93e0e9462d30e5255250249066294d0bbf818ca2e5463eb2694e5cc98c5bcfae4fd46ee4583488da60b2
 MISC ChangeLog 4563 SHA256 00666f2178d18cda11479482e5a25af3bdb6ae5368ffe7aed379bc9fc2ad40d5 SHA512 21d15ff02eaf3b20ac051641155f3f9487c7c4b90d85612a0c4372c6636f8a336404386e3828fa0185895df68ac1dc2b95da7cfa4e6e92efdebdefbc6b0cd95d WHIRLPOOL f990c0c96c22eefcb190daa733ac807080ba17391e221c58a05a6a4451653e1dd1eed50a808b31aa348951dc74b3bc131a8b9c129f30dc042ffcd6cc47c296af
 MISC metadata.xml 244 SHA256 4d47eee187cd72bea30c9ab80aa89d7cf128e8643b8b986e3781fa123f9144aa SHA512 c9cb9d6bc4e44e18eb54801af8b9cbb698bcb905524e02bfa72a03111955377c4e9b507db52b929a47e740bf1be0d025910f310f334a1c1c6531313231d39289 WHIRLPOOL 369f2a18e230171ecef8d67e7c5d419943e8e026111e2736b4d858760705bfc24e85e16ab8800a1681fae625ce74342b4b01e961c418b242cc2d1229ff67ba0a
diff --git a/virtual/mysql/mysql-10.0-r1.ebuild b/virtual/mysql/mysql-10.0-r1.ebuild
new file mode 100644
index 0000000..d3137a4
--- /dev/null
+++ b/virtual/mysql/mysql-10.0-r1.ebuild
@@ -0,0 +1,20 @@
+# 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.5.ebuild,v 1.2 2010/03/23 14:48:06 darkside 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"
+
+DEPEND=""
+# TODO: add Drizzle here
+RDEPEND="|| (
+	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=]
+)"
diff --git a/virtual/mysql/mysql-4.0-r1.ebuild b/virtual/mysql/mysql-4.0-r1.ebuild
index a082ffb..9ecbe43 100644
--- a/virtual/mysql/mysql-4.0-r1.ebuild
+++ b/virtual/mysql/mysql-4.0-r1.ebuild
@@ -1,10 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit multilib-build
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-4.0.ebuild,v 1.5 2010/11/06 19:21:13 leio Exp $
 
 DESCRIPTION="Virtual for MySQL client or database"
 HOMEPAGE=""
@@ -12,10 +8,10 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
+DEPEND=""
 RDEPEND="|| (
-	=dev-db/mysql-${PV}*[${MULTILIB_USEDEP}]
+	=dev-db/mysql-${PV}*
 )"
-DEPEND="${RDEPEND}"
diff --git a/virtual/mysql/mysql-4.1-r1.ebuild b/virtual/mysql/mysql-4.1-r1.ebuild
index af660bb..d3f2f2c 100644
--- a/virtual/mysql/mysql-4.1-r1.ebuild
+++ b/virtual/mysql/mysql-4.1-r1.ebuild
@@ -1,9 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit multilib-build
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-4.1.ebuild,v 1.7 2010/11/06 19:21:13 leio Exp $
 
 DESCRIPTION="Virtual for MySQL client or database"
 HOMEPAGE=""
@@ -11,8 +8,8 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
-RDEPEND="=dev-db/mysql-${PV}*[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
+DEPEND=""
+RDEPEND="=dev-db/mysql-${PV}*"
diff --git a/virtual/mysql/mysql-5.0-r1.ebuild b/virtual/mysql/mysql-5.0-r1.ebuild
index c4edaec..ec5667c 100644
--- a/virtual/mysql/mysql-5.0-r1.ebuild
+++ b/virtual/mysql/mysql-5.0-r1.ebuild
@@ -1,9 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-inherit multilib-build
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.0.ebuild,v 1.9 2011/01/07 23:57:45 robbat2 Exp $
 
 DESCRIPTION="Virtual for MySQL client or database"
 HOMEPAGE=""
@@ -11,10 +8,10 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64"
+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=""
 
+DEPEND=""
 RDEPEND="|| (
-	=dev-db/mysql-${PV}*[${MULTILIB_USEDEP}]
+	=dev-db/mysql-${PV}*
 )"
-DEPEND="${RDEPEND}"
diff --git a/virtual/mysql/mysql-5.1-r1.ebuild b/virtual/mysql/mysql-5.1-r1.ebuild
index 88319f8..a41eabc 100644
--- a/virtual/mysql/mysql-5.1-r1.ebuild
+++ b/virtual/mysql/mysql-5.1-r1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.1.ebuild,v 1.23 2011/04/20 12:26:25 jmbsvicetto Exp $
 
-EAPI="5"
-inherit multilib-build
+EAPI="2"
 
 DESCRIPTION="Virtual for MySQL client or database"
 HOMEPAGE=""
@@ -11,12 +10,13 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64"
+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"
 
+DEPEND=""
 # TODO: add mysql-cluster here
 RDEPEND="|| (
-	=dev-db/mysql-${PV}*[embedded=,minimal=,static=,${MULTILIB_USEDEP}]
-	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=,${MULTILIB_USEDEP}]
+	=dev-db/mysql-${PV}*[embedded=,minimal=,static=]
+	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=]
+	=dev-db/mysql-cluster-7*[embedded=,minimal=,static=]
 )"
-DEPEND="${RDEPEND}"
diff --git a/virtual/mysql/mysql-5.2-r1.ebuild b/virtual/mysql/mysql-5.2-r1.ebuild
index e04ac9a..ae0e162 100644
--- a/virtual/mysql/mysql-5.2-r1.ebuild
+++ b/virtual/mysql/mysql-5.2-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.2.ebuild,v 1.1 2011/07/28 11:45:07 jmbsvicetto Exp $
 
-EAPI="5"
-inherit multilib-build
+EAPI="2"
 
 DESCRIPTION="Virtual for MySQL client or database"
 HOMEPAGE=""
@@ -11,10 +10,10 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64"
+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=,${MULTILIB_USEDEP}]
+	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=]
 )"
-DEPEND="${RDEPEND}"
diff --git a/virtual/mysql/mysql-5.3-r1.ebuild b/virtual/mysql/mysql-5.3-r1.ebuild
index e04ac9a..45e3e68 100644
--- a/virtual/mysql/mysql-5.3-r1.ebuild
+++ b/virtual/mysql/mysql-5.3-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.3.ebuild,v 1.1 2011/07/28 11:45:07 jmbsvicetto Exp $
 
-EAPI="5"
-inherit multilib-build
+EAPI="2"
 
 DESCRIPTION="Virtual for MySQL client or database"
 HOMEPAGE=""
@@ -11,10 +10,10 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64"
+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=,${MULTILIB_USEDEP}]
+	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=]
 )"
-DEPEND="${RDEPEND}"
diff --git a/virtual/mysql/mysql-5.5-r1.ebuild b/virtual/mysql/mysql-5.5-r1.ebuild
index c51f3e5..5ad2bc8 100644
--- a/virtual/mysql/mysql-5.5-r1.ebuild
+++ b/virtual/mysql/mysql-5.5-r1.ebuild
@@ -14,10 +14,11 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="embedded minimal static"
 
-# TODO: add Drizzle and MariaDB here
-DEPEND=" || (
-	=dev-db/mysql-${PV}*[embedded=,minimal=,static=,${MULTILIB_USEDEP}]
-	=dev-db/mariadb-${PV}*[embedded=,minimal=,static=,${MULTILIB_USEDEP}]
+DEPEND=""
+# TODO: add Drizzle here
+RDEPEND="|| (
+       =dev-db/mariadb-${PV}*[embedded=,minimal=,static=,${MULTILIB_USEDEP}]
+       =dev-db/mysql-${PV}*[embedded=,minimal=,static=,${MULTILIB_USEDEP}]
+       =dev-db/percona-server-${PV}*[embedded=,minimal=,static=,${MULTILIB_USEDEP}]
+       =dev-db/mariadb-galera-${PV}*[embedded=,minimal=,static=,${MULTILIB_USEDEP}]
 )"
-RDEPEND="${DEPEND}"
-
diff --git a/virtual/mysql/mysql-5.6-r1.ebuild b/virtual/mysql/mysql-5.6-r1.ebuild
new file mode 100644
index 0000000..0c05089
--- /dev/null
+++ b/virtual/mysql/mysql-5.6-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2011 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 $
+
+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"
+
+DEPEND=""
+# TODO: add Drizzle and MariaDB here
+RDEPEND="|| (
+	=dev-db/mysql-${PV}*[embedded=,minimal=,static=]
+	=dev-db/percona-server-${PV}*[embedded=,minimal=,static=]
+)"
diff --git a/virtual/mysql/mysql-5.7-r1.ebuild b/virtual/mysql/mysql-5.7-r1.ebuild
new file mode 100644
index 0000000..06aa544
--- /dev/null
+++ b/virtual/mysql/mysql-5.7-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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"
+
+DEPEND=""
+RDEPEND="|| (
+	=dev-db/mysql-${PV}*[embedded=,minimal=,static=]
+)"