commit: 57df63dd15ee9141f688ba90d5224c5d0efeceb3
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 26 00:10:09 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 26 00:10:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57df63dd
dev-db/mysql: introduce slots
While we still don't support installing multiple dev-db/mysql
versions simultaneously, we need slots to support proper targeting in
GLSAs.
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
dev-db/mysql/{mysql-5.7.27-r1.ebuild => mysql-5.7.27-r2.ebuild} | 3 ++-
dev-db/mysql/{mysql-5.7.29.ebuild => mysql-5.7.29-r1.ebuild} | 3 ++-
dev-db/mysql/{mysql-5.7.30.ebuild => mysql-5.7.30-r1.ebuild} | 3 ++-
dev-db/mysql/{mysql-8.0.19-r1.ebuild => mysql-8.0.19-r2.ebuild} | 3 ++-
dev-db/mysql/{mysql-8.0.20.ebuild => mysql-8.0.20-r1.ebuild} | 3 ++-
5 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/dev-db/mysql/mysql-5.7.27-r1.ebuild
b/dev-db/mysql/mysql-5.7.27-r2.ebuild
similarity index 99%
rename from dev-db/mysql/mysql-5.7.27-r1.ebuild
rename to dev-db/mysql/mysql-5.7.27-r2.ebuild
index 39229edf052..5ebb1702d77 100644
--- a/dev-db/mysql/mysql-5.7.27-r1.ebuild
+++ b/dev-db/mysql/mysql-5.7.27-r2.ebuild
@@ -25,7 +25,7 @@ fi
HOMEPAGE="https://www.mysql.com/";
DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
LICENSE="GPL-2"
-SLOT="0/18"
+SLOT="5.7/18"
IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl
numa +perl profiling
selinux +server static static-libs systemtap tcmalloc test yassl"
@@ -119,6 +119,7 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server
!dev-db/mysql-cluster
+ !dev-db/mysql:8.0
client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat]
!dev-db/mysql-connector-c dev-libs/protobuf:= )
selinux? ( sec-policy/selinux-mysql )
server? (
diff --git a/dev-db/mysql/mysql-5.7.29.ebuild
b/dev-db/mysql/mysql-5.7.29-r1.ebuild
similarity index 99%
rename from dev-db/mysql/mysql-5.7.29.ebuild
rename to dev-db/mysql/mysql-5.7.29-r1.ebuild
index 1bab98a18ca..1ee7956a3d9 100644
--- a/dev-db/mysql/mysql-5.7.29.ebuild
+++ b/dev-db/mysql/mysql-5.7.29-r1.ebuild
@@ -25,7 +25,7 @@ fi
HOMEPAGE="https://www.mysql.com/";
DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
LICENSE="GPL-2"
-SLOT="0/18"
+SLOT="5.7/18"
IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl
numa +perl profiling
selinux +server static static-libs systemtap tcmalloc test"
@@ -115,6 +115,7 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server
!dev-db/mysql-cluster
+ !dev-db/mysql:8.0
client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat]
!dev-db/mysql-connector-c dev-libs/protobuf:= )
selinux? ( sec-policy/selinux-mysql )
server? (
diff --git a/dev-db/mysql/mysql-5.7.30.ebuild
b/dev-db/mysql/mysql-5.7.30-r1.ebuild
similarity index 99%
rename from dev-db/mysql/mysql-5.7.30.ebuild
rename to dev-db/mysql/mysql-5.7.30-r1.ebuild
index 71716b437ae..97e097b5c6d 100644
--- a/dev-db/mysql/mysql-5.7.30.ebuild
+++ b/dev-db/mysql/mysql-5.7.30-r1.ebuild
@@ -21,7 +21,7 @@
SRC_URI="https://cdn.mysql.com/Downloads/MySQL-5.7/${PN}-boost-${PV}.tar.gz
HOMEPAGE="https://www.mysql.com/";
DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
LICENSE="GPL-2"
-SLOT="0/18"
+SLOT="5.7/18"
IUSE="cjk client-libs cracklib debug experimental jemalloc latin1 libressl
numa +perl profiling
selinux +server static static-libs systemtap tcmalloc test"
@@ -90,6 +90,7 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server
!dev-db/mysql-cluster
+ !dev-db/mysql:8.0
client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat]
!dev-db/mysql-connector-c dev-libs/protobuf:= )
selinux? ( sec-policy/selinux-mysql )
server? (
diff --git a/dev-db/mysql/mysql-8.0.19-r1.ebuild
b/dev-db/mysql/mysql-8.0.19-r2.ebuild
similarity index 99%
rename from dev-db/mysql/mysql-8.0.19-r1.ebuild
rename to dev-db/mysql/mysql-8.0.19-r2.ebuild
index 827c57daf94..0e7bbeae0ad 100644
--- a/dev-db/mysql/mysql-8.0.19-r1.ebuild
+++ b/dev-db/mysql/mysql-8.0.19-r2.ebuild
@@ -28,7 +28,7 @@ fi
HOMEPAGE="https://www.mysql.com/";
DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
LICENSE="GPL-2"
-SLOT="0"
+SLOT="8.0"
IUSE="cjk cracklib debug jemalloc latin1 libressl numa +perl profiling
router selinux +server tcmalloc test"
@@ -102,6 +102,7 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server
!dev-db/mysql-cluster
+ !dev-db/mysql:5.7
selinux? ( sec-policy/selinux-mysql )
!prefix? (
acct-group/mysql acct-user/mysql
diff --git a/dev-db/mysql/mysql-8.0.20.ebuild
b/dev-db/mysql/mysql-8.0.20-r1.ebuild
similarity index 99%
rename from dev-db/mysql/mysql-8.0.20.ebuild
rename to dev-db/mysql/mysql-8.0.20-r1.ebuild
index 05585342435..aad606dfc68 100644
--- a/dev-db/mysql/mysql-8.0.20.ebuild
+++ b/dev-db/mysql/mysql-8.0.20-r1.ebuild
@@ -22,7 +22,7 @@
SRC_URI="https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-${MY_PV}.tar.gz
HOMEPAGE="https://www.mysql.com/";
DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
LICENSE="GPL-2"
-SLOT="0"
+SLOT="8.0"
IUSE="cjk cracklib debug jemalloc latin1 libressl numa +perl profiling
router selinux +server tcmalloc test"
@@ -77,6 +77,7 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server
!dev-db/mysql-cluster
+ !dev-db/mysql:5.7
selinux? ( sec-policy/selinux-mysql )
!prefix? (
acct-group/mysql acct-user/mysql
