1 |
commit: c248da7bd6b43092a2a3497c1a0a04313a183486 |
2 |
Author: Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net> |
3 |
AuthorDate: Wed Jul 30 06:33:06 2014 +0000 |
4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 30 06:33:06 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c248da7b |
7 |
|
8 |
Sync from main tree. |
9 |
|
10 |
Package-Manager: portage-2.2.10 |
11 |
|
12 |
--- |
13 |
virtual/mysql/ChangeLog | 3 +++ |
14 |
virtual/mysql/mysql-5.6.ebuild | 4 ++-- |
15 |
2 files changed, 5 insertions(+), 2 deletions(-) |
16 |
|
17 |
diff --git a/virtual/mysql/ChangeLog b/virtual/mysql/ChangeLog |
18 |
index ccfbce7..8ee9903 100644 |
19 |
--- a/virtual/mysql/ChangeLog |
20 |
+++ b/virtual/mysql/ChangeLog |
21 |
@@ -2,6 +2,9 @@ |
22 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
23 |
# $Header: $ |
24 |
|
25 |
+ 30 Jul 2014; Robin H. Johnson <robbat2@g.o> mysql-5.6.ebuild: |
26 |
+ Sync from main tree. |
27 |
+ |
28 |
29 Jul 2014; Robin H. Johnson <robbat2@g.o> mysql-5.5.ebuild: |
29 |
Bump EAPI per main tree. |
30 |
|
31 |
|
32 |
diff --git a/virtual/mysql/mysql-5.6.ebuild b/virtual/mysql/mysql-5.6.ebuild |
33 |
index d69911b..a9f63ab 100644 |
34 |
--- a/virtual/mysql/mysql-5.6.ebuild |
35 |
+++ b/virtual/mysql/mysql-5.6.ebuild |
36 |
@@ -1,6 +1,6 @@ |
37 |
# Copyright 1999-2014 Gentoo Foundation |
38 |
# Distributed under the terms of the GNU General Public License v2 |
39 |
-# $Header: $ |
40 |
+# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.6.ebuild,v 1.2 2014/07/30 06:30:25 robbat2 Exp $ |
41 |
|
42 |
EAPI="5" |
43 |
|
44 |
@@ -15,8 +15,8 @@ IUSE="embedded minimal static static-libs" |
45 |
|
46 |
DEPEND="" |
47 |
RDEPEND="|| ( |
48 |
- =dev-db/mariadb-10.1*[embedded=,minimal=,static=,static-libs=] |
49 |
=dev-db/mariadb-10.0*[embedded=,minimal=,static=,static-libs=] |
50 |
+ =dev-db/mariadb-10.1*[embedded=,minimal=,static=,static-libs=] |
51 |
=dev-db/mysql-${PV}*[embedded=,minimal=,static=,static-libs=] |
52 |
=dev-db/percona-server-${PV}*[embedded=,minimal=,static=,static-libs=] |
53 |
=dev-db/mariadb-galera-10.0*[embedded=,minimal=,static=,static-libs=] |