[gentoo-commits] proj/mysql:master commit in: virtual/mysql/

2018-03-12 Thread Brian Evans 
commit: 1bde194e76ba8ea4b97c4b9435e2869c84d8dacd
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Mar 12 13:26:16 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Mar 12 13:26:16 2018 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=1bde194e

virtual/mysql: Remove sparc-fbsd

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Manifest-Sign-Key: D1F781EFF9F4A3B6

 virtual/mysql/mysql-5.0.ebuild| 4 ++--
 virtual/mysql/mysql-5.1.ebuild| 4 ++--
 virtual/mysql/mysql-5.2.ebuild| 4 ++--
 virtual/mysql/mysql-5.3.ebuild| 4 ++--
 virtual/mysql/mysql-5.5-r1.ebuild | 4 ++--
 virtual/mysql/mysql-5.7-r1.ebuild | 4 ++--
 virtual/mysql/mysql-5.7-r2.ebuild | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/virtual/mysql/mysql-5.0.ebuild b/virtual/mysql/mysql-5.0.ebuild
index 56233b1..1cc67eb 100644
--- a/virtual/mysql/mysql-5.0.ebuild
+++ b/virtual/mysql/mysql-5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 DESCRIPTION="Virtual for MySQL client or database"
@@ -7,7 +7,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 
~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris 
~x86-solaris"
 IUSE=""
 
 DEPEND=""

diff --git a/virtual/mysql/mysql-5.1.ebuild b/virtual/mysql/mysql-5.1.ebuild
index 91b4f29..f136ffd 100644
--- a/virtual/mysql/mysql-5.1.ebuild
+++ b/virtual/mysql/mysql-5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 
~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris 
~x86-solaris"
 IUSE="embedded minimal static"
 
 DEPEND=""

diff --git a/virtual/mysql/mysql-5.2.ebuild b/virtual/mysql/mysql-5.2.ebuild
index 61bd6d5..f0bbd6e 100644
--- a/virtual/mysql/mysql-5.2.ebuild
+++ b/virtual/mysql/mysql-5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 
~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris 
~x86-solaris"
 IUSE="embedded minimal static"
 
 DEPEND=""

diff --git a/virtual/mysql/mysql-5.3.ebuild b/virtual/mysql/mysql-5.3.ebuild
index 61bd6d5..f0bbd6e 100644
--- a/virtual/mysql/mysql-5.3.ebuild
+++ b/virtual/mysql/mysql-5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="2"
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 
~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris 
~x86-solaris"
 IUSE="embedded minimal static"
 
 DEPEND=""

diff --git a/virtual/mysql/mysql-5.5-r1.ebuild 
b/virtual/mysql/mysql-5.5-r1.ebuild
index 57be40a..8d6711d 100644
--- a/virtual/mysql/mysql-5.5-r1.ebuild
+++ b/virtual/mysql/mysql-5.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris ~x86-solaris"
 IUSE="embedded minimal static static-libs"
 
 DEPEND=""

diff --git a/virtual/mysql/mysql-5.7-r1.ebuild 
b/virtual/mysql/mysql-5.7-r1.ebuild
index f280eb7..e4cb285 100644
---

[gentoo-commits] proj/mysql:master commit in: virtual/mysql/

2017-05-28 Thread Brian Evans 
commit: c8c5210734e3736dc48869a1cd00bef8cbf055b5
Author: Brian Evans  gentoo  org>
AuthorDate: Mon May 29 02:32:54 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon May 29 02:32:54 2017 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=c8c52107

virtual/mysql: Make repoman happy for virtual/mysql

Package-Manager: Portage-2.3.6, Repoman-2.3.2
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6

 virtual/mysql/ChangeLog   |  7 +++
 virtual/mysql/mysql-4.0.ebuild|  5 ++---
 virtual/mysql/mysql-4.1.ebuild|  5 ++---
 virtual/mysql/mysql-5.0.ebuild|  5 ++---
 virtual/mysql/mysql-5.1.ebuild|  5 ++---
 virtual/mysql/mysql-5.2.ebuild|  5 ++---
 virtual/mysql/mysql-5.3.ebuild|  5 ++---
 virtual/mysql/mysql-5.5-r1.ebuild |  5 ++---
 virtual/mysql/mysql-5.6-r2.ebuild | 25 -
 virtual/mysql/mysql-5.6-r3.ebuild | 39 ---
 virtual/mysql/mysql-5.6-r4.ebuild | 28 
 virtual/mysql/mysql-5.6-r8.ebuild | 25 -
 virtual/mysql/mysql-5.7-r1.ebuild |  5 ++---
 virtual/mysql/mysql-5.7-r2.ebuild |  2 +-
 virtual/mysql/mysql-.ebuild   | 11 +--
 15 files changed, 29 insertions(+), 148 deletions(-)

diff --git a/virtual/mysql/ChangeLog b/virtual/mysql/ChangeLog
index ee69d28..44f24b8 100644
--- a/virtual/mysql/ChangeLog
+++ b/virtual/mysql/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  29 May 2017; Brian Evans  -mysql-5.6-r2.ebuild,
+  -mysql-5.6-r3.ebuild, -mysql-5.6-r4.ebuild, -mysql-5.6-r8.ebuild,
+  mysql-4.0.ebuild, mysql-4.1.ebuild, mysql-5.0.ebuild, mysql-5.1.ebuild,
+  mysql-5.2.ebuild, mysql-5.3.ebuild, mysql-5.5-r1.ebuild, mysql-5.7-r1.ebuild,
+  mysql-5.7-r2.ebuild, mysql-.ebuild:
+  virtual/mysql: Make repoman happy for virtual/mysql
+
 *mysql-5.7-r2 (29 May 2017)
 
   29 May 2017; Brian Evans  +mysql-5.7-r2.ebuild:

diff --git a/virtual/mysql/mysql-4.0.ebuild b/virtual/mysql/mysql-4.0.ebuild
index 00bcc03..8a0da4e 100644
--- a/virtual/mysql/mysql-4.0.ebuild
+++ b/virtual/mysql/mysql-4.0.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 DESCRIPTION="Virtual for MySQL client or database"
 HOMEPAGE=""
@@ -8,7 +7,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="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"
+KEYWORDS="amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""

diff --git a/virtual/mysql/mysql-4.1.ebuild b/virtual/mysql/mysql-4.1.ebuild
index 8ea9acf..b5b0195 100644
--- a/virtual/mysql/mysql-4.1.ebuild
+++ b/virtual/mysql/mysql-4.1.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 DESCRIPTION="Virtual for MySQL client or database"
 HOMEPAGE=""
@@ -8,7 +7,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="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"
+KEYWORDS="amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd 
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris 
~x86-solaris"
 IUSE=""
 
 DEPEND=""

diff --git a/virtual/mysql/mysql-5.0.ebuild b/virtual/mysql/mysql-5.0.ebuild
index b7f66f3..56233b1 100644
--- a/virtual/mysql/mysql-5.0.ebuild
+++ b/virtual/mysql/mysql-5.0.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 DESCRIPTION="Virtual for MySQL client or database"
 HOMEPAGE=""
@@ -8,7 +7,7 @@ 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"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 
~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""

diff --git a/virtual/mysql/mysql-5.1.ebuild b/virtual/mysql/mysql-5.1.ebuild
index 3030625..91b4f29 100644
--- a/virtual/mysql/mysql-5.1.ebuild
+++ b/virtual/mysql/mysql-5.1.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="2"
 
@@ -10,7 +9,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips

[gentoo-commits] proj/mysql:master commit in: virtual/mysql/

2017-05-28 Thread Brian Evans 
commit: f5c1ee22497b4db0cbd941120bd082c9f0b85388
Author: Brian Evans  gentoo  org>
AuthorDate: Mon May 29 02:24:55 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon May 29 02:24:55 2017 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=f5c1ee22

virtual/mysql: Add new revision for 5.7 compatible servers

Package-Manager: Portage-2.3.6, Repoman-2.3.2
RepoMan-Options: --force
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6

 virtual/mysql/ChangeLog   |  7 ++-
 virtual/mysql/mysql-5.7-r2.ebuild | 22 ++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/virtual/mysql/ChangeLog b/virtual/mysql/ChangeLog
index 4f99aac..ee69d28 100644
--- a/virtual/mysql/ChangeLog
+++ b/virtual/mysql/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for virtual/mysql
-# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2017 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*mysql-5.7-r2 (29 May 2017)
+
+  29 May 2017; Brian Evans  +mysql-5.7-r2.ebuild:
+  virtual/mysql: Add new revision for 5.7 compatible servers
+
   09 Mar 2016; Brian Evans  mysql-5.6-r8.ebuild:
   virtual/mysql: Drop unused inherit; Add server required USE
 

diff --git a/virtual/mysql/mysql-5.7-r2.ebuild 
b/virtual/mysql/mysql-5.7-r2.ebuild
new file mode 100644
index 000..d627e47
--- /dev/null
+++ b/virtual/mysql/mysql-5.7-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Virtual for MySQL database server"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/20"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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 static"
+
+DEPEND=""
+RDEPEND="
+   || (
+   =dev-db/mariadb-10.3*[embedded?,server,static?]
+   =dev-db/mariadb-10.2*[embedded?,server,static?]
+   =dev-db/mysql-${PV}*[embedded?,server,static?]
+   =dev-db/percona-server-${PV}*[embedded?,server,static?]
+   )"

[gentoo-commits] proj/mysql:master commit in: virtual/mysql/

2016-03-09 Thread Brian Evans 
commit: c7c6588b407a748e20b3c8f763994b70dc6009c5
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Mar  9 20:27:55 2016 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Mar  9 20:27:55 2016 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=c7c6588b

virtual/mysql: Drop unused inherit; Add server required USE

Package-Manager: portage-2.2.27
Manifest-Sign-Key: D1F781EFF9F4A3B6

 virtual/mysql/ChangeLog   |  3 +++
 virtual/mysql/mysql-5.6-r8.ebuild | 14 ++
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/virtual/mysql/ChangeLog b/virtual/mysql/ChangeLog
index c09a10e..4f99aac 100644
--- a/virtual/mysql/ChangeLog
+++ b/virtual/mysql/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  09 Mar 2016; Brian Evans  mysql-5.6-r8.ebuild:
+  virtual/mysql: Drop unused inherit; Add server required USE
+
 *mysql-5.6-r8 (09 Mar 2016)
 
   09 Mar 2016; Brian Evans  +mysql-5.6-r8.ebuild:

diff --git a/virtual/mysql/mysql-5.6-r8.ebuild 
b/virtual/mysql/mysql-5.6-r8.ebuild
index 40184b6..4d8fe17 100644
--- a/virtual/mysql/mysql-5.6-r8.ebuild
+++ b/virtual/mysql/mysql-5.6-r8.ebuild
@@ -4,8 +4,6 @@
 
 EAPI="6"
 
-inherit multilib-build
-
 DESCRIPTION="Virtual for MySQL database server"
 HOMEPAGE=""
 SRC_URI=""
@@ -17,11 +15,11 @@ IUSE="embedded static"
 
 DEPEND=""
 RDEPEND="|| (
-   =dev-db/mariadb-10.1*[embedded?,static?]
-   =dev-db/mariadb-10.0*[embedded?,static?]
-   =dev-db/mysql-${PV}*[embedded?,static?]
-   =dev-db/percona-server-${PV}*[embedded?,static?]
-   =dev-db/mariadb-galera-10.0*[embedded?,static?]
-   =dev-db/mysql-cluster-7.3*[embedded?,static?]
+   =dev-db/mariadb-10.1*[embedded?,server,static?]
+   =dev-db/mariadb-10.0*[embedded?,server,static?]
+   =dev-db/mysql-${PV}*[embedded?,server,static?]
+   =dev-db/percona-server-${PV}*[embedded?,server,static?]
+   =dev-db/mariadb-galera-10.0*[embedded?,server,static?]
+   =dev-db/mysql-cluster-7.3*[embedded?,server,static?]
)
 "

[gentoo-commits] proj/mysql:master commit in: virtual/mysql/

2016-03-09 Thread Brian Evans 
commit: cf616500ad3535069c8d93fb1077e9daceb40c61
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Mar  9 20:21:56 2016 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Mar  9 20:21:56 2016 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=cf616500

virtual/mysql: Revbump to fix dependencies

Move virtual/libmysqlclient PDEPEND to the providers
Remove the failed client-libs USE dependency

Package-Manager: portage-2.2.27
Manifest-Sign-Key: D1F781EFF9F4A3B6

 virtual/mysql/ChangeLog   |  8 +++-
 virtual/mysql/mysql-5.6-r8.ebuild | 27 +++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/virtual/mysql/ChangeLog b/virtual/mysql/ChangeLog
index a1d4e46..c09a10e 100644
--- a/virtual/mysql/ChangeLog
+++ b/virtual/mysql/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for virtual/mysql
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+*mysql-5.6-r8 (09 Mar 2016)
+
+  09 Mar 2016; Brian Evans  +mysql-5.6-r8.ebuild:
+  virtual/mysql: Revbump to fix dependencies  Move virtual/libmysqlclient
+  PDEPEND to the providers Remove the failed client-libs USE dependency
+
   30 Jul 2014; Robin H. Johnson  mysql-5.1.ebuild:
   Bump header.
 

diff --git a/virtual/mysql/mysql-5.6-r8.ebuild 
b/virtual/mysql/mysql-5.6-r8.ebuild
new file mode 100644
index 000..40184b6
--- /dev/null
+++ b/virtual/mysql/mysql-5.6-r8.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for MySQL database server"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/18"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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 static"
+
+DEPEND=""
+RDEPEND="|| (
+   =dev-db/mariadb-10.1*[embedded?,static?]
+   =dev-db/mariadb-10.0*[embedded?,static?]
+   =dev-db/mysql-${PV}*[embedded?,static?]
+   =dev-db/percona-server-${PV}*[embedded?,static?]
+   =dev-db/mariadb-galera-10.0*[embedded?,static?]
+   =dev-db/mysql-cluster-7.3*[embedded?,static?]
+   )
+"

[gentoo-commits] proj/mysql:master commit in: virtual/mysql/

2014-12-04 Thread Brian Evans 
commit: e095bde9234e6a13a89869cbc84adafa2e176a55
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Thu Dec  4 21:27:47 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Thu Dec  4 21:27:47 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=e095bde9

Bump subslot of 5.7 virtual since Oracle did

---
 virtual/mysql/mysql-5.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/virtual/mysql/mysql-5.7.ebuild b/virtual/mysql/mysql-5.7.ebuild
index 87ccee7..0842b43 100644
--- a/virtual/mysql/mysql-5.7.ebuild
+++ b/virtual/mysql/mysql-5.7.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE=
 SRC_URI=
 
 LICENSE=
-SLOT=0/18
+SLOT=0/20
 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

[gentoo-commits] proj/mysql:master commit in: virtual/mysql/

2014-09-16 Thread Brian Evans 
commit: 811e905d5e1f80ef3feb0dfb37b4d702ce890c66
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Tue Sep 16 16:50:39 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Tue Sep 16 16:50:39 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=811e905d

[virtual] Add in minimal connectors to test installations

---
 virtual/mysql/mysql-5.6-r3.ebuild | 39 +++
 1 file changed, 39 insertions(+)

diff --git a/virtual/mysql/mysql-5.6-r3.ebuild 
b/virtual/mysql/mysql-5.6-r3.ebuild
new file mode 100644
index 000..6bec02b
--- /dev/null
+++ b/virtual/mysql/mysql-5.6-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit multilib-build
+
+DESCRIPTION=Virtual for MySQL client or database
+HOMEPAGE=
+SRC_URI=
+
+LICENSE=
+SLOT=0/18
+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=
+RDEPEND=
+   minimal? (
+   || (
+   dev-db/mariadb-connector-c:0=[${MULTILIB_USEDEP}]
+   dev-db/mysql-connector-c:0/18[${MULTILIB_USEDEP}]
+   
=dev-db/mariadb-10.0*[embedded=,minimal=,static=,static-libs=,${MULTILIB_USEDEP}]
+   
=dev-db/mysql-${PV}*[embedded=,minimal=,static=,static-libs=,${MULTILIB_USEDEP}]
+   
=dev-db/percona-server-${PV}*[embedded=,minimal=,static=,static-libs=,${MULTILIB_USEDEP}]
+   
=dev-db/mariadb-galera-10.0*[embedded=,minimal=,static=,static-libs=,${MULTILIB_USEDEP}]
+   
=dev-db/mysql-cluster-7.3*[embedded=,minimal=,static=,static-libs=,${MULTILIB_USEDEP}]
+   )
+   )
+   !minimal? (
+   || (
+   
=dev-db/mariadb-10.0*[embedded=,minimal=,static=,static-libs=,${MULTILIB_USEDEP}]
+   
=dev-db/mysql-${PV}*[embedded=,minimal=,static=,static-libs=,${MULTILIB_USEDEP}]
+   
=dev-db/percona-server-${PV}*[embedded=,minimal=,static=,static-libs=,${MULTILIB_USEDEP}]
+   
=dev-db/mariadb-galera-10.0*[embedded=,minimal=,static=,static-libs=,${MULTILIB_USEDEP}]
+   
=dev-db/mysql-cluster-7.3*[embedded=,minimal=,static=,static-libs=,${MULTILIB_USEDEP}]
+   )
+   )

[gentoo-commits] proj/mysql:master commit in: virtual/mysql/, dev-db/mysql/

2014-09-04 Thread Brian Evans 
commit: ef57178b608d64708b71d718615fef5e5a6f
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Fri Sep  5 01:13:37 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Fri Sep  5 01:13:37 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=ef57178b

Sync stable versions to overlay

---
 dev-db/mysql/mysql-5.5.39.ebuild | 4 ++--
 virtual/mysql/mysql-5.5.ebuild   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-db/mysql/mysql-5.5.39.ebuild b/dev-db/mysql/mysql-5.5.39.ebuild
index 3503ffe..6044dd5 100644
--- a/dev-db/mysql/mysql-5.5.39.ebuild
+++ b/dev-db/mysql/mysql-5.5.39.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.39.ebuild,v 1.1 
2014/08/02 00:23:41 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.5.39.ebuild,v 1.10 
2014/08/13 15:26:18 maekke Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ IUSE=$IUSE
 EGIT_REPO_URI=git://git.overlays.gentoo.org/proj/mysql-extras.git
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~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
+KEYWORDS=alpha amd64 arm hppa ia64 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
 
 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
 EPATCH_EXCLUDE=''

diff --git a/virtual/mysql/mysql-5.5.ebuild b/virtual/mysql/mysql-5.5.ebuild
index 626bb6e..bd97372 100644
--- a/virtual/mysql/mysql-5.5.ebuild
+++ b/virtual/mysql/mysql-5.5.ebuild
@@ -1,6 +1,6 @@
 # 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.5 
2012/04/18 06:12:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.5.ebuild,v 1.16 
2014/08/13 15:25:36 maekke Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ 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
+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=

[gentoo-commits] proj/mysql:master commit in: virtual/mysql/

2014-08-31 Thread Brian Evans 
commit: cb5beca2ea8b3aba452e96b63c12a943bf1b6c0a
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Sun Aug 31 22:31:26 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Sun Aug 31 22:31:26 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=cb5beca2

Add multilib enabled virtual

---
 virtual/mysql/mysql-5.6-r2.ebuild | 25 +
 1 file changed, 25 insertions(+)

diff --git a/virtual/mysql/mysql-5.6-r2.ebuild 
b/virtual/mysql/mysql-5.6-r2.ebuild
new file mode 100644
index 000..d5dc5b2
--- /dev/null
+++ b/virtual/mysql/mysql-5.6-r2.ebuild
@@ -0,0 +1,25 @@
+# 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.6-r2.ebuild,v 1.1 
2014/08/31 21:44:50 grknight Exp $
+
+EAPI=5
+
+inherit multilib-build
+
+DESCRIPTION=Virtual for MySQL client or database
+HOMEPAGE=
+SRC_URI=
+
+LICENSE=
+SLOT=0/18
+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=
+RDEPEND=|| (
+   
=dev-db/mariadb-10.0*[embedded=,minimal=,static=,static-libs=,${MULTILIB_USEDEP}]
+   
=dev-db/mysql-${PV}*[embedded=,minimal=,static=,static-libs=,${MULTILIB_USEDEP}]
+   
=dev-db/percona-server-${PV}*[embedded=,minimal=,static=,static-libs=,${MULTILIB_USEDEP}]
+   
=dev-db/mariadb-galera-10.0*[embedded=,minimal=,static=,static-libs=,${MULTILIB_USEDEP}]
+   
=dev-db/mysql-cluster-7.3*[embedded=,minimal=,static=,static-libs=,${MULTILIB_USEDEP}]
+)

[gentoo-commits] proj/mysql:master commit in: virtual/mysql/

2014-08-19 Thread Brian Evans 
commit: 50e22b664d1337b7b03f18633cb2737e04f78e13
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Thu Aug 14 17:38:52 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Thu Aug 14 17:38:52 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=50e22b66

Make repoman happy for 4.0 and 4.1 virtual

---
 virtual/mysql/mysql-4.0.ebuild | 2 +-
 virtual/mysql/mysql-4.1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/virtual/mysql/mysql-4.0.ebuild b/virtual/mysql/mysql-4.0.ebuild
index d59b01c..b1ef71a 100644
--- a/virtual/mysql/mysql-4.0.ebuild
+++ b/virtual/mysql/mysql-4.0.ebuild
@@ -8,7 +8,7 @@ SRC_URI=
 
 LICENSE=
 SLOT=0
-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
+KEYWORDS=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=

diff --git a/virtual/mysql/mysql-4.1.ebuild b/virtual/mysql/mysql-4.1.ebuild
index d409870..de26e2a 100644
--- a/virtual/mysql/mysql-4.1.ebuild
+++ b/virtual/mysql/mysql-4.1.ebuild
@@ -8,7 +8,7 @@ SRC_URI=
 
 LICENSE=
 SLOT=0
-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
+KEYWORDS=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=
 
 DEPEND=

[gentoo-commits] proj/mysql:master commit in: virtual/mysql/, eclass/

2014-08-19 Thread Brian Evans 
commit: f6bdc6875d0c2445a403f0283493b8b01ef8c903
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Thu Aug 14 15:34:16 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Thu Aug 14 15:34:16 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f6bdc687

Move mariadb-10.1* to the 5.7 virtual

---
 eclass/mysql-multilib.eclass| 3 ++-
 virtual/mysql/{mysql-5.6.ebuild = mysql-5.6-r1.ebuild} | 5 ++---
 virtual/mysql/mysql-5.7.ebuild  | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 58aba05..41312a8 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -73,7 +73,8 @@ fi
 # MariaDB has left the numbering schema but keeping compatibility
 if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]; then
case ${PV} in
-   10.0*|10.1*) MYSQL_PV_MAJOR=5.6 ;;
+   10.0*) MYSQL_PV_MAJOR=5.6 ;;
+   10.1*) MYSQL_PV_MAJOR=5.7 ;;
esac
 fi
 

diff --git a/virtual/mysql/mysql-5.6.ebuild b/virtual/mysql/mysql-5.6-r1.ebuild
similarity index 81%
rename from virtual/mysql/mysql-5.6.ebuild
rename to virtual/mysql/mysql-5.6-r1.ebuild
index a9f63ab..5b2d2a9 100644
--- a/virtual/mysql/mysql-5.6.ebuild
+++ b/virtual/mysql/mysql-5.6-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.6.ebuild,v 1.2 
2014/07/30 06:30:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.6-r1.ebuild,v 1.1 
2014/08/14 14:26:59 grknight Exp $
 
 EAPI=5
 
@@ -9,14 +9,13 @@ HOMEPAGE=
 SRC_URI=
 
 LICENSE=
-SLOT=0
+SLOT=0/18
 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=
 RDEPEND=|| (
=dev-db/mariadb-10.0*[embedded=,minimal=,static=,static-libs=]
-   =dev-db/mariadb-10.1*[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-10.0*[embedded=,minimal=,static=,static-libs=]

diff --git a/virtual/mysql/mysql-5.7.ebuild b/virtual/mysql/mysql-5.7.ebuild
index eeec7d1..87ccee7 100644
--- a/virtual/mysql/mysql-5.7.ebuild
+++ b/virtual/mysql/mysql-5.7.ebuild
@@ -2,18 +2,19 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=5
 
 DESCRIPTION=Virtual for MySQL client or database
 HOMEPAGE=
 SRC_URI=
 
 LICENSE=
-SLOT=0
+SLOT=0/18
 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=
 RDEPEND=|| (
+   =dev-db/mariadb-10.1*[embedded=,minimal=,static=,static-libs=]
=dev-db/mysql-${PV}*[embedded=,minimal=,static=,static-libs=]
 )

[gentoo-commits] proj/mysql:master commit in: virtual/mysql/, dev-db/mariadb/

2014-08-19 Thread Brian Evans 
commit: b14052951c13bcfd2f4ef4072a6d313518ae3d8a
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Thu Aug 14 17:30:45 2014 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Thu Aug 14 17:30:45 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b1405295

Add live version of mariadb

---
 dev-db/mariadb/mariadb-.ebuild | 116 +
 virtual/mysql/mysql-.ebuild|  19 ++
 2 files changed, 135 insertions(+)

diff --git a/dev-db/mariadb/mariadb-.ebuild 
b/dev-db/mariadb/mariadb-.ebuild
new file mode 100644
index 000..0a47c74
--- /dev/null
+++ b/dev-db/mariadb/mariadb-.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+MY_EXTRAS_VER=none
+SERVER_URI= 
+EGIT_REPO_URI=https://github.com/MariaDB/server.git;
+
+inherit toolchain-funcs mysql-multilib git-r3
+# only to make repoman happy. it is really set in the eclass
+IUSE=$IUSE
+KEYWORDS=
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND=|| ( =sys-devel/gcc-3.4.6 =sys-devel/gcc-apple-4.0 )
+RDEPEND=${RDEPEND}
+
+# This is a special unpack for the VCS version
+src_unpack() {
+   git-r3_src_unpack
+
+   mv -f ${WORKDIR}/${P} ${S}
+}
+
+# Official test instructions:
+# USE='-cluster embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+   local TESTDIR=${BUILD_DIR}/mysql-test
+   local retstatus_unit
+   local retstatus_tests
+
+   multilib_is_native_abi || return
+
+   # Bug #213475 - MySQL _will_ object strenously if your machine is named
+   # localhost. Also causes weird failures.
+   [[ ${HOSTNAME} == localhost ]]  die Your machine must NOT be 
named localhost
+
+   if ! use minimal ; then
+
+   if [[ $UID -eq 0 ]]; then
+   die Testing with FEATURES=-userpriv is no longer 
supported by upstream. Tests MUST be run as non-root.
+   fi
+   has usersandbox $FEATURES  eerror Some tests may fail with 
FEATURES=usersandbox
+
+   einfo  Test phase [test]: ${CATEGORY}/${PF}
+   addpredict /this-dir-does-not-exist/t9.MYI
+
+   # Run CTest (test-units)
+   cmake-utils_src_test
+   retstatus_unit=$?
+   [[ $retstatus_unit -eq 0 ]] || eerror test-unit failed
+
+   # Ensure that parallel runs don't die
+   export MTR_BUILD_THREAD=$((${RANDOM} % 100))
+
+   # create directories because mysqladmin might right out of order
+   mkdir -p ${S}/mysql-test/var-tests{,/log}
+
+   # These are failing in MariaDB 10.0 for now and are believed to 
be
+   # false positives:
+   #
+   # main.information_schema, 
binlog.binlog_statement_insert_delayed,
+   # main.mysqld--help, funcs_1.is_triggers, 
funcs_1.is_tables_mysql,
+   # funcs_1.is_columns_mysql
+   # fails due to USE=-latin1 / utf8 default
+   #
+   # main.mysql_client_test, main.mysql_client_test_nonblock:
+   # segfaults at random under Portage only, suspect resource 
limits.
+   #
+   # plugins.unix_socket
+   # fails because portage strips out the USER enviornment variable
+   #
+
+   for t in main.mysql_client_test main.mysql_client_test_nonblock 
\
+   binlog.binlog_statement_insert_delayed 
main.information_schema \
+   main.mysqld--help plugins.unix_socket \
+   funcs_1.is_triggers funcs_1.is_tables_mysql 
funcs_1.is_columns_mysql ; do
+   mysql-multilib_disable_test  $t False 
positives in Gentoo
+   done
+
+   # Run mysql tests
+   pushd ${TESTDIR} || die
+
+   # run mysql-test tests
+   # Skip all CONNECT engine tests until upstream respondes to how 
to reference data files
+   perl mysql-test-run.pl --force 
--vardir=${S}/mysql-test/var-tests --skip-test=connect
+   retstatus_tests=$?
+   [[ $retstatus_tests -eq 0 ]] || eerror tests failed
+   has usersandbox $FEATURES  eerror Some tests may fail with 
FEATURES=usersandbox
+
+   popd || die
+
+   # Cleanup is important for these testcases.
+   pkill -9 -f ${S}/ndb 2/dev/null
+   pkill -9 -f ${S}/sql 2/dev/null
+
+   failures=
+   [[ $retstatus_unit -eq 0 ]] || failures=${failures} test-unit
+   [[ $retstatus_tests -eq 0 ]] || failures=${failures} tests
+   has usersandbox

[gentoo-commits] proj/mysql:master commit in: virtual/mysql/, eclass/

2014-08-14 Thread Brian Evans 
commit: f6bdc6875d0c2445a403f0283493b8b01ef8c903
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Thu Aug 14 15:34:16 2014 +
Commit: Brian Evans grknight AT tuffmail DOT com
CommitDate: Thu Aug 14 15:34:16 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f6bdc687

Move mariadb-10.1* to the 5.7 virtual

---
 eclass/mysql-multilib.eclass| 3 ++-
 virtual/mysql/{mysql-5.6.ebuild = mysql-5.6-r1.ebuild} | 5 ++---
 virtual/mysql/mysql-5.7.ebuild  | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 58aba05..41312a8 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -73,7 +73,8 @@ fi
 # MariaDB has left the numbering schema but keeping compatibility
 if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]; then
case ${PV} in
-   10.0*|10.1*) MYSQL_PV_MAJOR=5.6 ;;
+   10.0*) MYSQL_PV_MAJOR=5.6 ;;
+   10.1*) MYSQL_PV_MAJOR=5.7 ;;
esac
 fi
 

diff --git a/virtual/mysql/mysql-5.6.ebuild b/virtual/mysql/mysql-5.6-r1.ebuild
similarity index 81%
rename from virtual/mysql/mysql-5.6.ebuild
rename to virtual/mysql/mysql-5.6-r1.ebuild
index a9f63ab..5b2d2a9 100644
--- a/virtual/mysql/mysql-5.6.ebuild
+++ b/virtual/mysql/mysql-5.6-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.6.ebuild,v 1.2 
2014/07/30 06:30:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.6-r1.ebuild,v 1.1 
2014/08/14 14:26:59 grknight Exp $
 
 EAPI=5
 
@@ -9,14 +9,13 @@ HOMEPAGE=
 SRC_URI=
 
 LICENSE=
-SLOT=0
+SLOT=0/18
 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=
 RDEPEND=|| (
=dev-db/mariadb-10.0*[embedded=,minimal=,static=,static-libs=]
-   =dev-db/mariadb-10.1*[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-10.0*[embedded=,minimal=,static=,static-libs=]

diff --git a/virtual/mysql/mysql-5.7.ebuild b/virtual/mysql/mysql-5.7.ebuild
index eeec7d1..87ccee7 100644
--- a/virtual/mysql/mysql-5.7.ebuild
+++ b/virtual/mysql/mysql-5.7.ebuild
@@ -2,18 +2,19 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=5
 
 DESCRIPTION=Virtual for MySQL client or database
 HOMEPAGE=
 SRC_URI=
 
 LICENSE=
-SLOT=0
+SLOT=0/18
 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=
 RDEPEND=|| (
+   =dev-db/mariadb-10.1*[embedded=,minimal=,static=,static-libs=]
=dev-db/mysql-${PV}*[embedded=,minimal=,static=,static-libs=]
 )

[gentoo-commits] proj/mysql:master commit in: virtual/mysql/, dev-db/mariadb/

2014-08-14 Thread Brian Evans 
commit: b14052951c13bcfd2f4ef4072a6d313518ae3d8a
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Thu Aug 14 17:30:45 2014 +
Commit: Brian Evans grknight AT tuffmail DOT com
CommitDate: Thu Aug 14 17:30:45 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b1405295

Add live version of mariadb

---
 dev-db/mariadb/mariadb-.ebuild | 116 +
 virtual/mysql/mysql-.ebuild|  19 ++
 2 files changed, 135 insertions(+)

diff --git a/dev-db/mariadb/mariadb-.ebuild 
b/dev-db/mariadb/mariadb-.ebuild
new file mode 100644
index 000..0a47c74
--- /dev/null
+++ b/dev-db/mariadb/mariadb-.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+MY_EXTRAS_VER=none
+SERVER_URI= 
+EGIT_REPO_URI=https://github.com/MariaDB/server.git;
+
+inherit toolchain-funcs mysql-multilib git-r3
+# only to make repoman happy. it is really set in the eclass
+IUSE=$IUSE
+KEYWORDS=
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND=|| ( =sys-devel/gcc-3.4.6 =sys-devel/gcc-apple-4.0 )
+RDEPEND=${RDEPEND}
+
+# This is a special unpack for the VCS version
+src_unpack() {
+   git-r3_src_unpack
+
+   mv -f ${WORKDIR}/${P} ${S}
+}
+
+# Official test instructions:
+# USE='-cluster embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+multilib_src_test() {
+
+   local TESTDIR=${BUILD_DIR}/mysql-test
+   local retstatus_unit
+   local retstatus_tests
+
+   multilib_is_native_abi || return
+
+   # Bug #213475 - MySQL _will_ object strenously if your machine is named
+   # localhost. Also causes weird failures.
+   [[ ${HOSTNAME} == localhost ]]  die Your machine must NOT be 
named localhost
+
+   if ! use minimal ; then
+
+   if [[ $UID -eq 0 ]]; then
+   die Testing with FEATURES=-userpriv is no longer 
supported by upstream. Tests MUST be run as non-root.
+   fi
+   has usersandbox $FEATURES  eerror Some tests may fail with 
FEATURES=usersandbox
+
+   einfo  Test phase [test]: ${CATEGORY}/${PF}
+   addpredict /this-dir-does-not-exist/t9.MYI
+
+   # Run CTest (test-units)
+   cmake-utils_src_test
+   retstatus_unit=$?
+   [[ $retstatus_unit -eq 0 ]] || eerror test-unit failed
+
+   # Ensure that parallel runs don't die
+   export MTR_BUILD_THREAD=$((${RANDOM} % 100))
+
+   # create directories because mysqladmin might right out of order
+   mkdir -p ${S}/mysql-test/var-tests{,/log}
+
+   # These are failing in MariaDB 10.0 for now and are believed to 
be
+   # false positives:
+   #
+   # main.information_schema, 
binlog.binlog_statement_insert_delayed,
+   # main.mysqld--help, funcs_1.is_triggers, 
funcs_1.is_tables_mysql,
+   # funcs_1.is_columns_mysql
+   # fails due to USE=-latin1 / utf8 default
+   #
+   # main.mysql_client_test, main.mysql_client_test_nonblock:
+   # segfaults at random under Portage only, suspect resource 
limits.
+   #
+   # plugins.unix_socket
+   # fails because portage strips out the USER enviornment variable
+   #
+
+   for t in main.mysql_client_test main.mysql_client_test_nonblock 
\
+   binlog.binlog_statement_insert_delayed 
main.information_schema \
+   main.mysqld--help plugins.unix_socket \
+   funcs_1.is_triggers funcs_1.is_tables_mysql 
funcs_1.is_columns_mysql ; do
+   mysql-multilib_disable_test  $t False 
positives in Gentoo
+   done
+
+   # Run mysql tests
+   pushd ${TESTDIR} || die
+
+   # run mysql-test tests
+   # Skip all CONNECT engine tests until upstream respondes to how 
to reference data files
+   perl mysql-test-run.pl --force 
--vardir=${S}/mysql-test/var-tests --skip-test=connect
+   retstatus_tests=$?
+   [[ $retstatus_tests -eq 0 ]] || eerror tests failed
+   has usersandbox $FEATURES  eerror Some tests may fail with 
FEATURES=usersandbox
+
+   popd || die
+
+   # Cleanup is important for these testcases.
+   pkill -9 -f ${S}/ndb 2/dev/null
+   pkill -9 -f ${S}/sql 2/dev/null
+
+   failures=
+   [[ $retstatus_unit -eq 0 ]] || failures=${failures} test-unit
+   [[ $retstatus_tests -eq 0 ]] || failures=${failures} tests
+   has usersandbox

[gentoo-commits] proj/mysql:master commit in: virtual/mysql/

2014-08-14 Thread Brian Evans 
commit: 50e22b664d1337b7b03f18633cb2737e04f78e13
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Thu Aug 14 17:38:52 2014 +
Commit: Brian Evans grknight AT tuffmail DOT com
CommitDate: Thu Aug 14 17:38:52 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=50e22b66

Make repoman happy for 4.0 and 4.1 virtual

---
 virtual/mysql/mysql-4.0.ebuild | 2 +-
 virtual/mysql/mysql-4.1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/virtual/mysql/mysql-4.0.ebuild b/virtual/mysql/mysql-4.0.ebuild
index d59b01c..b1ef71a 100644
--- a/virtual/mysql/mysql-4.0.ebuild
+++ b/virtual/mysql/mysql-4.0.ebuild
@@ -8,7 +8,7 @@ SRC_URI=
 
 LICENSE=
 SLOT=0
-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
+KEYWORDS=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=

diff --git a/virtual/mysql/mysql-4.1.ebuild b/virtual/mysql/mysql-4.1.ebuild
index d409870..de26e2a 100644
--- a/virtual/mysql/mysql-4.1.ebuild
+++ b/virtual/mysql/mysql-4.1.ebuild
@@ -8,7 +8,7 @@ SRC_URI=
 
 LICENSE=
 SLOT=0
-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
+KEYWORDS=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=
 
 DEPEND=

[gentoo-commits] proj/mysql:master commit in: virtual/mysql/

2014-07-30 Thread Robin H. Johnson 
commit: c58d0694a8fd531aa97d7971b06d3d6a0554c7fb
Author: Robin H. Johnson robbat2 AT orbis-terrarum DOT net
AuthorDate: Wed Jul 30 06:36:32 2014 +
Commit: Robin H. Johnson robbat2 AT gentoo DOT org
CommitDate: Wed Jul 30 06:36:32 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c58d0694

Bump header.

Package-Manager: portage-2.2.10

---
 virtual/mysql/ChangeLog| 3 +++
 virtual/mysql/mysql-5.1.ebuild | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/virtual/mysql/ChangeLog b/virtual/mysql/ChangeLog
index ced6fe9..5fda69c 100644
--- a/virtual/mysql/ChangeLog
+++ b/virtual/mysql/ChangeLog
@@ -3,6 +3,9 @@
 # $Header: $
 
   30 Jul 2014; Robin H. Johnson robb...@gentoo.org mysql-5.1.ebuild:
+  Bump header.
+
+  30 Jul 2014; Robin H. Johnson robb...@gentoo.org mysql-5.1.ebuild:
   Fix cluster versioning.
 
   30 Jul 2014; Robin H. Johnson robb...@gentoo.org mysql-5.6.ebuild:

diff --git a/virtual/mysql/mysql-5.1.ebuild b/virtual/mysql/mysql-5.1.ebuild
index 6296a84..9d8bf13 100644
--- a/virtual/mysql/mysql-5.1.ebuild
+++ b/virtual/mysql/mysql-5.1.ebuild
@@ -1,6 +1,6 @@
 # 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: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.1.ebuild,v 1.24 
2014/07/30 06:35:52 robbat2 Exp $
 
 EAPI=2

[gentoo-commits] proj/mysql:master commit in: virtual/mysql/

2014-07-30 Thread Robin H. Johnson 
commit: d0295432f5222cb47f7a507b1072547e8005
Author: Robin H. Johnson robbat2 AT orbis-terrarum DOT net
AuthorDate: Wed Jul 30 06:35:04 2014 +
Commit: Robin H. Johnson robbat2 AT gentoo DOT org
CommitDate: Wed Jul 30 06:35:04 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=d029

Fix cluster versioning.

Package-Manager: portage-2.2.10

---
 virtual/mysql/ChangeLog| 3 +++
 virtual/mysql/mysql-5.1.ebuild | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/virtual/mysql/ChangeLog b/virtual/mysql/ChangeLog
index 8ee9903..ced6fe9 100644
--- a/virtual/mysql/ChangeLog
+++ b/virtual/mysql/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Jul 2014; Robin H. Johnson robb...@gentoo.org mysql-5.1.ebuild:
+  Fix cluster versioning.
+
   30 Jul 2014; Robin H. Johnson robb...@gentoo.org mysql-5.6.ebuild:
   Sync from main tree.
 

diff --git a/virtual/mysql/mysql-5.1.ebuild b/virtual/mysql/mysql-5.1.ebuild
index 4106ce0..6296a84 100644
--- a/virtual/mysql/mysql-5.1.ebuild
+++ b/virtual/mysql/mysql-5.1.ebuild
@@ -14,9 +14,8 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh 
sparc x86 ~sparc-fbs
 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=]
+   =dev-db/mysql-cluster-7.2*[embedded=,minimal=,static=]
 )

[gentoo-commits] proj/mysql:master commit in: virtual/mysql/

2014-07-30 Thread Robin H. Johnson 
commit: c248da7bd6b43092a2a3497c1a0a04313a183486
Author: Robin H. Johnson robbat2 AT orbis-terrarum DOT net
AuthorDate: Wed Jul 30 06:33:06 2014 +
Commit: Robin H. Johnson robbat2 AT gentoo DOT org
CommitDate: Wed Jul 30 06:33:06 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c248da7b

Sync from main tree.

Package-Manager: portage-2.2.10

---
 virtual/mysql/ChangeLog| 3 +++
 virtual/mysql/mysql-5.6.ebuild | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/virtual/mysql/ChangeLog b/virtual/mysql/ChangeLog
index ccfbce7..8ee9903 100644
--- a/virtual/mysql/ChangeLog
+++ b/virtual/mysql/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Jul 2014; Robin H. Johnson robb...@gentoo.org mysql-5.6.ebuild:
+  Sync from main tree.
+
   29 Jul 2014; Robin H. Johnson robb...@gentoo.org mysql-5.5.ebuild:
   Bump EAPI per main tree.
 

diff --git a/virtual/mysql/mysql-5.6.ebuild b/virtual/mysql/mysql-5.6.ebuild
index d69911b..a9f63ab 100644
--- a/virtual/mysql/mysql-5.6.ebuild
+++ b/virtual/mysql/mysql-5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.6.ebuild,v 1.2 
2014/07/30 06:30:25 robbat2 Exp $
 
 EAPI=5
 
@@ -15,8 +15,8 @@ IUSE=embedded minimal static static-libs
 
 DEPEND=
 RDEPEND=|| (
-   =dev-db/mariadb-10.1*[embedded=,minimal=,static=,static-libs=]
=dev-db/mariadb-10.0*[embedded=,minimal=,static=,static-libs=]
+   =dev-db/mariadb-10.1*[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-10.0*[embedded=,minimal=,static=,static-libs=]

[gentoo-commits] proj/mysql:master commit in: virtual/mysql/, eclass/

2014-07-02 Thread Brian Evans 
commit: 43935eb67f906ea2fd12f54b3923b04561be3604
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Wed Jul  2 13:16:19 2014 +
Commit: Brian Evans grknight AT lavabit DOT com
CommitDate: Wed Jul  2 13:16:19 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=43935eb6

Experiment with placing MariaDB 10.0.X and 10.1.X into virutal 5.6.  This is 
the compatible versions as stated by upstream

---
 eclass/mysql-multilib.eclass|  7 +++
 eclass/mysql-v2.eclass  | 14 +++---
 virtual/mysql/mysql-10.0.ebuild | 20 
 virtual/mysql/mysql-5.6.ebuild  | 11 +++
 4 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 1c352aa..870ba79 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -69,6 +69,13 @@ if [[ ${PN} == mysql-cluster ]]; then
esac
 fi
 
+# MariaDB has left the numbering schema but keeping compatibility
+if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]; then
+   case ${PV} in
+   10.0*|10.1*) MYSQL_PV_MAJOR=5.6 ;;
+   esac
+fi
+
 # @ECLASS-VARIABLE: MYSQL_VERSION_ID
 # @DESCRIPTION:
 # MYSQL_VERSION_ID will be:

diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass
index 6df339a..bbbc150 100644
--- a/eclass/mysql-v2.eclass
+++ b/eclass/mysql-v2.eclass
@@ -83,10 +83,18 @@ fi
 MYSQL_PV_MAJOR=$(get_version_component_range 1-2 ${PV})
 
 # Cluster is a special case...
-if [[ ${PN} == mysql-cluster ]]; then
-   case $PV in
+if [[ ${PN} == mysql-cluster ]]; then
+   case ${PV} in
6.1*|7.0*|7.1*) MYSQL_PV_MAJOR=5.1 ;;
-   7.2*|7.3*) MYSQL_PV_MAJOR=5.5 ;;
+   7.2*) MYSQL_PV_MAJOR=5.5 ;;
+   7.3*) MYSQL_PV_MAJOR=5.6 ;;
+   esac
+fi
+
+# MariaDB has left the numbering schema but keeping compatibility
+if [[ ${PN} == mariadb || ${PN} == mariadb-galera ]]; then
+   case ${PV} in
+   10.0*|10.1*) MYSQL_PV_MAJOR=5.6 ;;
esac
 fi
 

diff --git a/virtual/mysql/mysql-10.0.ebuild b/virtual/mysql/mysql-10.0.ebuild
deleted file mode 100644
index 8e28056..000
--- a/virtual/mysql/mysql-10.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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 $
-
-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=]
-)

diff --git a/virtual/mysql/mysql-5.6.ebuild b/virtual/mysql/mysql-5.6.ebuild
index 36f49c1..d69911b 100644
--- a/virtual/mysql/mysql-5.6.ebuild
+++ b/virtual/mysql/mysql-5.6.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.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,8 +14,11 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86
 IUSE=embedded minimal static static-libs
 
 DEPEND=
-# TODO: add Drizzle and MariaDB here
 RDEPEND=|| (
+   =dev-db/mariadb-10.1*[embedded=,minimal=,static=,static-libs=]
+   =dev-db/mariadb-10.0*[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-10.0*[embedded=,minimal=,static=,static-libs=]
+   =dev-db/mysql-cluster-7.3*[embedded=,minimal=,static=,static-libs=]
 )