commit: 7d2f77be318e1cf363dc2e10bda61b4eec32d92d
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 26 00:00:27 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 26 00:00:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d2f77be
dev-db/mariadb: introduce slots
While we still don't support installing multiple dev-db/mariadb
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>
.../{mariadb-10.1.38-r1.ebuild => mariadb-10.1.38-r2.ebuild} | 6 +++++-
.../mariadb/{mariadb-10.1.43.ebuild => mariadb-10.1.43-r1.ebuild} | 6 +++++-
.../mariadb/{mariadb-10.1.45.ebuild => mariadb-10.1.45-r1.ebuild} | 6 +++++-
.../{mariadb-10.2.22-r1.ebuild => mariadb-10.2.22-r2.ebuild} | 6 +++++-
.../mariadb/{mariadb-10.2.29.ebuild => mariadb-10.2.29-r1.ebuild} | 6 +++++-
.../mariadb/{mariadb-10.2.32.ebuild => mariadb-10.2.32-r1.ebuild} | 6 +++++-
.../mariadb/{mariadb-10.3.23.ebuild => mariadb-10.3.23-r1.ebuild} | 6 +++++-
.../mariadb/{mariadb-10.4.13.ebuild => mariadb-10.4.13-r1.ebuild} | 6 +++++-
dev-db/mariadb/{mariadb-5.5.68.ebuild => mariadb-5.5.68-r1.ebuild} | 6 +++++-
9 files changed, 45 insertions(+), 9 deletions(-)
diff --git a/dev-db/mariadb/mariadb-10.1.38-r1.ebuild
b/dev-db/mariadb/mariadb-10.1.38-r2.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-10.1.38-r1.ebuild
rename to dev-db/mariadb/mariadb-10.1.38-r2.ebuild
index 2cb40286d35..6db16af17a2 100644
--- a/dev-db/mariadb/mariadb-10.1.38-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.38-r2.ebuild
@@ -26,7 +26,7 @@ fi
HOMEPAGE="https://mariadb.org/";
DESCRIPTION="An enhanced, drop-in replacement for MySQL"
LICENSE="GPL-2"
-SLOT="0/${SUBSLOT:-0}"
+SLOT="10.1/${SUBSLOT:-0}"
IUSE="+backup bindist client-libs cracklib debug extraengine galera jdbc
jemalloc kerberos
innodb-lz4 innodb-lzo innodb-snappy latin1 libressl mroonga numa odbc
oqgraph pam
+perl profiling selinux +server sphinx sst-rsync sst-mariabackup
sst-xtrabackup
@@ -119,6 +119,10 @@ DEPEND="virtual/yacc
RDEPEND="selinux? ( sec-policy/selinux-mysql )
client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat]
!dev-db/mysql-connector-c )
!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server
!dev-db/mysql-cluster
+ !dev-db/mariadb:5.5
+ !dev-db/mariadb:10.2
+ !dev-db/mariadb:10.3
+ !dev-db/mariadb:10.4
server? ( !prefix? ( dev-db/mysql-init-scripts ) )
${COMMON_DEPEND}
server? ( galera? (
diff --git a/dev-db/mariadb/mariadb-10.1.43.ebuild
b/dev-db/mariadb/mariadb-10.1.43-r1.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-10.1.43.ebuild
rename to dev-db/mariadb/mariadb-10.1.43-r1.ebuild
index 22f52825640..c889ad42af8 100644
--- a/dev-db/mariadb/mariadb-10.1.43.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.43-r1.ebuild
@@ -26,7 +26,7 @@ fi
HOMEPAGE="https://mariadb.org/";
DESCRIPTION="An enhanced, drop-in replacement for MySQL"
LICENSE="GPL-2"
-SLOT="0/${SUBSLOT:-0}"
+SLOT="10.1/${SUBSLOT:-0}"
IUSE="+backup bindist client-libs cracklib debug extraengine galera jdbc
jemalloc kerberos
innodb-lz4 innodb-lzo innodb-snappy latin1 libressl mroonga numa odbc
oqgraph pam
+perl profiling selinux +server sphinx sst-rsync sst-mariabackup
sst-xtrabackup
@@ -119,6 +119,10 @@ DEPEND="virtual/yacc
RDEPEND="selinux? ( sec-policy/selinux-mysql )
client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat]
!dev-db/mysql-connector-c )
!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server
!dev-db/mysql-cluster
+ !dev-db/mariadb:5.5
+ !dev-db/mariadb:10.2
+ !dev-db/mariadb:10.3
+ !dev-db/mariadb:10.4
server? ( !prefix? ( dev-db/mysql-init-scripts ) )
${COMMON_DEPEND}
server? ( galera? (
diff --git a/dev-db/mariadb/mariadb-10.1.45.ebuild
b/dev-db/mariadb/mariadb-10.1.45-r1.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-10.1.45.ebuild
rename to dev-db/mariadb/mariadb-10.1.45-r1.ebuild
index 90bcfc0a3e0..e146098ee7a 100644
--- a/dev-db/mariadb/mariadb-10.1.45.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.45-r1.ebuild
@@ -20,7 +20,7 @@
SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz
HOMEPAGE="https://mariadb.org/";
DESCRIPTION="An enhanced, drop-in replacement for MySQL"
LICENSE="GPL-2"
-SLOT="0/${SUBSLOT:-0}"
+SLOT="10.1/${SUBSLOT:-0}"
IUSE="+backup bindist client-libs cracklib debug extraengine galera jdbc
jemalloc kerberos
innodb-lz4 innodb-lzo innodb-snappy latin1 libressl mroonga numa odbc
oqgraph pam
+perl profiling selinux +server sphinx sst-rsync sst-mariabackup
sst-xtrabackup
@@ -96,6 +96,10 @@ DEPEND="virtual/yacc
RDEPEND="selinux? ( sec-policy/selinux-mysql )
client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat]
!dev-db/mysql-connector-c )
!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server
!dev-db/mysql-cluster
+ !dev-db/mariadb:5.5
+ !dev-db/mariadb:10.2
+ !dev-db/mariadb:10.3
+ !dev-db/mariadb:10.4
${COMMON_DEPEND}
server? (
galera? (
diff --git a/dev-db/mariadb/mariadb-10.2.22-r1.ebuild
b/dev-db/mariadb/mariadb-10.2.22-r2.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-10.2.22-r1.ebuild
rename to dev-db/mariadb/mariadb-10.2.22-r2.ebuild
index 08fbaa17fe1..a77e8399844 100644
--- a/dev-db/mariadb/mariadb-10.2.22-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.22-r2.ebuild
@@ -27,7 +27,7 @@ fi
HOMEPAGE="https://mariadb.org/";
DESCRIPTION="An enhanced, drop-in replacement for MySQL"
LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0/${SUBSLOT:-0}"
+SLOT="10.2/${SUBSLOT:-0}"
IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
@@ -116,6 +116,10 @@ DEPEND="virtual/yacc
${COMMON_DEPEND}"
RDEPEND="selinux? ( sec-policy/selinux-mysql )
!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server
!dev-db/mysql-cluster
+ !dev-db/mariadb:5.5
+ !dev-db/mariadb:10.1
+ !dev-db/mariadb:10.3
+ !dev-db/mariadb:10.4
server? ( !prefix? ( dev-db/mysql-init-scripts ) )
!<virtual/mysql-5.6-r11
${COMMON_DEPEND}
diff --git a/dev-db/mariadb/mariadb-10.2.29.ebuild
b/dev-db/mariadb/mariadb-10.2.29-r1.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-10.2.29.ebuild
rename to dev-db/mariadb/mariadb-10.2.29-r1.ebuild
index c584779653e..91bfdfc69e1 100644
--- a/dev-db/mariadb/mariadb-10.2.29.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.29-r1.ebuild
@@ -27,7 +27,7 @@ fi
HOMEPAGE="https://mariadb.org/";
DESCRIPTION="An enhanced, drop-in replacement for MySQL"
LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0/${SUBSLOT:-0}"
+SLOT="10.2/${SUBSLOT:-0}"
IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
@@ -116,6 +116,10 @@ DEPEND="virtual/yacc
${COMMON_DEPEND}"
RDEPEND="selinux? ( sec-policy/selinux-mysql )
!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server
!dev-db/mysql-cluster
+ !dev-db/mariadb:5.5
+ !dev-db/mariadb:10.1
+ !dev-db/mariadb:10.3
+ !dev-db/mariadb:10.4
server? ( !prefix? ( dev-db/mysql-init-scripts ) )
!<virtual/mysql-5.6-r11
${COMMON_DEPEND}
diff --git a/dev-db/mariadb/mariadb-10.2.32.ebuild
b/dev-db/mariadb/mariadb-10.2.32-r1.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-10.2.32.ebuild
rename to dev-db/mariadb/mariadb-10.2.32-r1.ebuild
index 4efd5f7fe94..28e15c3a497 100644
--- a/dev-db/mariadb/mariadb-10.2.32.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.32-r1.ebuild
@@ -20,7 +20,7 @@
SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz
HOMEPAGE="https://mariadb.org/";
DESCRIPTION="An enhanced, drop-in replacement for MySQL"
LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0/${SUBSLOT:-0}"
+SLOT="10.2/${SUBSLOT:-0}"
IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
@@ -94,6 +94,10 @@ DEPEND="virtual/yacc
${COMMON_DEPEND}"
RDEPEND="selinux? ( sec-policy/selinux-mysql )
!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server
!dev-db/mysql-cluster
+ !dev-db/mariadb:5.5
+ !dev-db/mariadb:10.1
+ !dev-db/mariadb:10.3
+ !dev-db/mariadb:10.4
!<virtual/mysql-5.6-r11
${COMMON_DEPEND}
server? (
diff --git a/dev-db/mariadb/mariadb-10.3.23.ebuild
b/dev-db/mariadb/mariadb-10.3.23-r1.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-10.3.23.ebuild
rename to dev-db/mariadb/mariadb-10.3.23-r1.ebuild
index 68a567c3e57..d5adffc3296 100644
--- a/dev-db/mariadb/mariadb-10.3.23.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.23-r1.ebuild
@@ -20,7 +20,7 @@
SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz
HOMEPAGE="https://mariadb.org/";
DESCRIPTION="An enhanced, drop-in replacement for MySQL"
LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0/${SUBSLOT:-0}"
+SLOT="10.3/${SUBSLOT:-0}"
IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
@@ -94,6 +94,10 @@ DEPEND="virtual/yacc
${COMMON_DEPEND}"
RDEPEND="selinux? ( sec-policy/selinux-mysql )
!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server
!dev-db/mysql-cluster
+ !dev-db/mariadb:5.5
+ !dev-db/mariadb:10.1
+ !dev-db/mariadb:10.2
+ !dev-db/mariadb:10.4
!<virtual/mysql-5.6-r11
${COMMON_DEPEND}
server? (
diff --git a/dev-db/mariadb/mariadb-10.4.13.ebuild
b/dev-db/mariadb/mariadb-10.4.13-r1.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-10.4.13.ebuild
rename to dev-db/mariadb/mariadb-10.4.13-r1.ebuild
index dbde2aa2d74..acd2c9098ad 100644
--- a/dev-db/mariadb/mariadb-10.4.13.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.13-r1.ebuild
@@ -18,7 +18,7 @@
SRC_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz
HOMEPAGE="https://mariadb.org/";
DESCRIPTION="An enhanced, drop-in replacement for MySQL"
LICENSE="GPL-2 LGPL-2.1+"
-SLOT="0/${SUBSLOT:-0}"
+SLOT="10.4/${SUBSLOT:-0}"
IUSE="+backup bindist cracklib debug extraengine galera innodb-lz4
innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
@@ -93,6 +93,10 @@ DEPEND="static? ( sys-libs/ncurses[static-libs] )
${COMMON_DEPEND}"
RDEPEND="selinux? ( sec-policy/selinux-mysql )
!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server
!dev-db/mysql-cluster
+ !dev-db/mariadb:5.5
+ !dev-db/mariadb:10.1
+ !dev-db/mariadb:10.2
+ !dev-db/mariadb:10.3
!<virtual/mysql-5.6-r11
!<virtual/libmysqlclient-18-r1
${COMMON_DEPEND}
diff --git a/dev-db/mariadb/mariadb-5.5.68.ebuild
b/dev-db/mariadb/mariadb-5.5.68-r1.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-5.5.68.ebuild
rename to dev-db/mariadb/mariadb-5.5.68-r1.ebuild
index 87e9a50bd38..9444043d02b 100644
--- a/dev-db/mariadb/mariadb-5.5.68.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.68-r1.ebuild
@@ -24,7 +24,7 @@ fi
HOMEPAGE="https://mariadb.org/";
DESCRIPTION="An enhanced, drop-in replacement for MySQL"
LICENSE="GPL-2"
-SLOT="0/${SUBSLOT:-0}"
+SLOT="5.5/${SUBSLOT:-0}"
IUSE="bindist client-libs debug extraengine jemalloc latin1 libressl
oqgraph pam +perl profiling selinux +server sphinx
static static-libs systemtap tcmalloc
@@ -95,6 +95,10 @@ DEPEND="virtual/yacc
RDEPEND="selinux? ( sec-policy/selinux-mysql )
client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat]
!dev-db/mysql-connector-c )
!dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server
!dev-db/mysql-cluster
+ !dev-db/mariadb:10.1
+ !dev-db/mariadb:10.2
+ !dev-db/mariadb:10.3
+ !dev-db/mariadb:10.4
server? ( !prefix? ( dev-db/mysql-init-scripts ) )
${COMMON_DEPEND}
perl? ( !dev-db/mytop
