commit: 74514528e0d6d167860199fe8cb9797bc592354c
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 14 13:18:03 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Jul 14 13:18:03 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=74514528
Fix subslot deps for virtual/libmysqlclient
dev-db/mariadb-galera/mariadb-galera-10.0.20-r1.ebuild | 1 +
dev-db/mariadb-galera/mariadb-galera-10.0.20.ebuild | 1 +
dev-db/mariadb/mariadb-10.0.20-r1.ebuild | 1 +
dev-db/mariadb/mariadb-10.0.20.ebuild | 1 +
dev-db/mariadb/mariadb-10.1.5_beta.ebuild | 1 +
dev-db/mysql-cluster/mysql-cluster-7.3.9.ebuild | 1 +
dev-db/mysql/mysql-5.6.25-r1.ebuild | 1 +
dev-db/mysql/mysql-5.6.25.ebuild | 1 +
dev-db/mysql/mysql-5.7.7_rc.ebuild | 1 +
dev-db/percona-server/percona-server-5.6.25.73.0-r1.ebuild | 1 +
dev-db/percona-server/percona-server-5.6.25.73.0.ebuild | 1 +
eclass/mysql-multilib.eclass | 2 +-
virtual/libmysqlclient/libmysqlclient-18.ebuild | 13 ++++++-------
13 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.20-r1.ebuild
b/dev-db/mariadb-galera/mariadb-galera-10.0.20-r1.ebuild
index acc9002..2003698 100644
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.20-r1.ebuild
+++ b/dev-db/mariadb-galera/mariadb-galera-10.0.20-r1.ebuild
@@ -6,6 +6,7 @@ EAPI="5"
MY_EXTRAS_VER="20141215-0144Z"
WSREP_REVISION="25"
HAS_TOOLS_PATCH="1"
+SUBSLOT="18"
inherit toolchain-funcs mysql-multilib
# only to make repoman happy. it is really set in the eclass
diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.20.ebuild
b/dev-db/mariadb-galera/mariadb-galera-10.0.20.ebuild
index 71b4908..49bb220 100644
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.20.ebuild
+++ b/dev-db/mariadb-galera/mariadb-galera-10.0.20.ebuild
@@ -5,6 +5,7 @@
EAPI="5"
MY_EXTRAS_VER="20141215-0144Z"
WSREP_REVISION="25"
+SUBSLOT="18"
inherit toolchain-funcs mysql-multilib
# only to make repoman happy. it is really set in the eclass
diff --git a/dev-db/mariadb/mariadb-10.0.20-r1.ebuild
b/dev-db/mariadb/mariadb-10.0.20-r1.ebuild
index a47c4af..a7d4a2c 100644
--- a/dev-db/mariadb/mariadb-10.0.20-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.20-r1.ebuild
@@ -5,6 +5,7 @@
EAPI="5"
MY_EXTRAS_VER="20141215-0144Z"
HAS_TOOLS_PATCH="1"
+SUBSLOT="18"
inherit toolchain-funcs mysql-multilib
IUSE="${IUSE}"
diff --git a/dev-db/mariadb/mariadb-10.0.20.ebuild
b/dev-db/mariadb/mariadb-10.0.20.ebuild
index 0fd88bd..5c110b3 100644
--- a/dev-db/mariadb/mariadb-10.0.20.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.20.ebuild
@@ -4,6 +4,7 @@
EAPI="5"
MY_EXTRAS_VER="20141215-0144Z"
+SUBSLOT="18"
inherit toolchain-funcs mysql-multilib
# only to make repoman happy. it is really set in the eclass
diff --git a/dev-db/mariadb/mariadb-10.1.5_beta.ebuild
b/dev-db/mariadb/mariadb-10.1.5_beta.ebuild
index 5c21fdd..6f62135 100644
--- a/dev-db/mariadb/mariadb-10.1.5_beta.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.5_beta.ebuild
@@ -5,6 +5,7 @@
EAPI="5"
MY_EXTRAS_VER="live"
WSREP_REVISION="25"
+SUBSLOT="18"
inherit toolchain-funcs mysql-multilib
# only to make repoman happy. it is really set in the eclass
diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.9.ebuild
b/dev-db/mysql-cluster/mysql-cluster-7.3.9.ebuild
index 2293a34..2432986 100644
--- a/dev-db/mysql-cluster/mysql-cluster-7.3.9.ebuild
+++ b/dev-db/mysql-cluster/mysql-cluster-7.3.9.ebuild
@@ -4,6 +4,7 @@
EAPI=5
MY_EXTRAS_VER="20150710-1911Z"
+SUBSLOT="18"
inherit toolchain-funcs java-pkg-opt-2 mysql-multilib
# only to make repoman happy. it is really set in the eclass
diff --git a/dev-db/mysql/mysql-5.6.25-r1.ebuild
b/dev-db/mysql/mysql-5.6.25-r1.ebuild
index 8572ff1..227e8c6 100644
--- a/dev-db/mysql/mysql-5.6.25-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.25-r1.ebuild
@@ -8,6 +8,7 @@ MY_EXTRAS_VER="20150410-1944Z"
MY_PV="${PV//_alpha_pre/-m}"
MY_PV="${MY_PV//_/-}"
HAS_TOOLS_PATCH="1"
+SUBSLOT="18"
inherit toolchain-funcs mysql-multilib
# only to make repoman happy. it is really set in the eclass
diff --git a/dev-db/mysql/mysql-5.6.25.ebuild b/dev-db/mysql/mysql-5.6.25.ebuild
index 731106a..00a9159 100644
--- a/dev-db/mysql/mysql-5.6.25.ebuild
+++ b/dev-db/mysql/mysql-5.6.25.ebuild
@@ -7,6 +7,7 @@ EAPI="5"
MY_EXTRAS_VER="20150410-1944Z"
MY_PV="${PV//_alpha_pre/-m}"
MY_PV="${MY_PV//_/-}"
+SUBSLOT="18"
inherit toolchain-funcs mysql-multilib
# only to make repoman happy. it is really set in the eclass
diff --git a/dev-db/mysql/mysql-5.7.7_rc.ebuild
b/dev-db/mysql/mysql-5.7.7_rc.ebuild
index 6d930d2..516c2ac 100644
--- a/dev-db/mysql/mysql-5.7.7_rc.ebuild
+++ b/dev-db/mysql/mysql-5.7.7_rc.ebuild
@@ -7,6 +7,7 @@ EAPI=5
MY_EXTRAS_VER="live"
MY_PV="${PV//_alpha_pre/-m}"
MY_PV="${MY_PV//_/-}"
+SUBSLOT="20"
inherit toolchain-funcs mysql-multilib
# only to make repoman happy. it is really set in the eclass
diff --git a/dev-db/percona-server/percona-server-5.6.25.73.0-r1.ebuild
b/dev-db/percona-server/percona-server-5.6.25.73.0-r1.ebuild
index d089f8c..b5ae51a 100644
--- a/dev-db/percona-server/percona-server-5.6.25.73.0-r1.ebuild
+++ b/dev-db/percona-server/percona-server-5.6.25.73.0-r1.ebuild
@@ -5,6 +5,7 @@
EAPI="5"
MY_EXTRAS_VER="20150113-1853Z"
HAS_TOOLS_PATCH="1"
+SUBSLOT="18"
inherit toolchain-funcs mysql-multilib
# only to make repoman happy. it is really set in the eclass
diff --git a/dev-db/percona-server/percona-server-5.6.25.73.0.ebuild
b/dev-db/percona-server/percona-server-5.6.25.73.0.ebuild
index ef154e2..85e8045 100644
--- a/dev-db/percona-server/percona-server-5.6.25.73.0.ebuild
+++ b/dev-db/percona-server/percona-server-5.6.25.73.0.ebuild
@@ -4,6 +4,7 @@
EAPI="5"
MY_EXTRAS_VER="20150113-1853Z"
+SUBSLOT="18"
inherit toolchain-funcs mysql-multilib
# only to make repoman happy. it is really set in the eclass
diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass
index 3e90096..2c1b96e 100644
--- a/eclass/mysql-multilib.eclass
+++ b/eclass/mysql-multilib.eclass
@@ -178,7 +178,7 @@ if [[ ${PN} == "percona-server" ]]; then
DESCRIPTION="An enhanced, drop-in replacement for MySQL from the
Percona team"
fi
LICENSE="GPL-2"
-SLOT="0"
+SLOT="0/${SUBSLOT:=0}"
IUSE="+community cluster debug embedded extraengine jemalloc latin1
+perl profiling selinux ssl systemtap static static-libs tcmalloc test"
diff --git a/virtual/libmysqlclient/libmysqlclient-18.ebuild
b/virtual/libmysqlclient/libmysqlclient-18.ebuild
index 93201dd..c5d3272 100644
--- a/virtual/libmysqlclient/libmysqlclient-18.ebuild
+++ b/virtual/libmysqlclient/libmysqlclient-18.ebuild
@@ -18,11 +18,10 @@ IUSE="static-libs"
DEPEND=""
RDEPEND="
|| (
- dev-db/mysql-connector-c:0/18[${MULTILIB_USEDEP}]
-
=dev-db/mariadb-10.1*[client-libs,static-libs=,${MULTILIB_USEDEP}]
-
=dev-db/mariadb-10.0*[client-libs,static-libs=,${MULTILIB_USEDEP}]
-
=dev-db/mysql-${PV}*[client-libs,static-libs=,${MULTILIB_USEDEP}]
-
=dev-db/percona-server-${PV}*[client-libs,static-libs=,${MULTILIB_USEDEP}]
-
=dev-db/mariadb-galera-10.0*[client-libs,static-libs=,${MULTILIB_USEDEP}]
-
=dev-db/mysql-cluster-7.3*[client-libs,static-libs=,${MULTILIB_USEDEP}]
+ dev-db/mysql-connector-c:${SLOT}[${MULTILIB_USEDEP}]
+
dev-db/mariadb:${SLOT}[client-libs,static-libs=,${MULTILIB_USEDEP}]
+
dev-db/mysql:${SLOT}[client-libs,static-libs=,${MULTILIB_USEDEP}]
+
dev-db/percona-server:${SLOT}[client-libs,static-libs=,${MULTILIB_USEDEP}]
+
dev-db/mariadb-galera:${SLOT}[client-libs,static-libs=,${MULTILIB_USEDEP}]
+
dev-db/mysql-cluster:${SLOT}[client-libs,static-libs=,${MULTILIB_USEDEP}]
)"
