| 1 |
commit: 2ce7b6ec6d1a9874a99a26ad5d955f26e1e0026c |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 10 13:24:52 2017 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 10 13:25:29 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ce7b6ec |
| 7 |
|
| 8 |
dev-db/mariadb: 10.2.7-r2 - Fix minimum virtual/mysql revision |
| 9 |
|
| 10 |
This will help resolve blockers for users |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
| 13 |
|
| 14 |
dev-db/mariadb/mariadb-10.2.7-r2.ebuild | 11 ++++------- |
| 15 |
1 file changed, 4 insertions(+), 7 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-db/mariadb/mariadb-10.2.7-r2.ebuild b/dev-db/mariadb/mariadb-10.2.7-r2.ebuild |
| 18 |
index fe874e46415..e4dd19a02eb 100644 |
| 19 |
--- a/dev-db/mariadb/mariadb-10.2.7-r2.ebuild |
| 20 |
+++ b/dev-db/mariadb/mariadb-10.2.7-r2.ebuild |
| 21 |
@@ -3,10 +3,7 @@ |
| 22 |
|
| 23 |
EAPI="6" |
| 24 |
MY_EXTRAS_VER="20170803-1814Z" |
| 25 |
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number |
| 26 |
-WSREP_REVISION="25" |
| 27 |
SUBSLOT="18" |
| 28 |
-MYSQL_PV_MAJOR="5.6" |
| 29 |
|
| 30 |
JAVA_PKG_OPT_USE="jdbc" |
| 31 |
|
| 32 |
@@ -18,7 +15,7 @@ inherit eutils systemd flag-o-matic prefix toolchain-funcs \ |
| 33 |
SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz " |
| 34 |
|
| 35 |
# Gentoo patches to MySQL |
| 36 |
-if [[ ${MY_EXTRAS_VER} != "live" && ${MY_EXTRAS_VER} != "none" ]]; then |
| 37 |
+if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then |
| 38 |
SRC_URI="${SRC_URI} |
| 39 |
mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 |
| 40 |
https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 |
| 41 |
@@ -119,11 +116,11 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql ) |
| 42 |
abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) |
| 43 |
!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster |
| 44 |
server? ( !prefix? ( dev-db/mysql-init-scripts ) ) |
| 45 |
- !<virtual/mysql-5.6-r4 |
| 46 |
+ !<virtual/mysql-5.6-r9 |
| 47 |
${COMMON_DEPEND} |
| 48 |
server? ( galera? ( |
| 49 |
sys-apps/iproute2 |
| 50 |
- =sys-cluster/galera-${WSREP_REVISION}* |
| 51 |
+ =sys-cluster/galera-25* |
| 52 |
sst-rsync? ( sys-process/lsof ) |
| 53 |
sst-xtrabackup? ( net-misc/socat[ssl] ) |
| 54 |
) ) |
| 55 |
@@ -138,7 +135,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql ) |
| 56 |
# dev-perl/DBD-mysql is needed by some scripts installed by MySQL |
| 57 |
# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed |
| 58 |
PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 ) |
| 59 |
- server? ( ~virtual/mysql-${MYSQL_PV_MAJOR}[embedded=,static=] ) |
| 60 |
+ server? ( ~virtual/mysql-5.6[embedded=,static=] ) |
| 61 |
virtual/libmysqlclient:${SLOT}[${MULTILIB_USEDEP},static-libs=] |
| 62 |
server? ( galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )" |
Archives