From 7d2f77be318e1cf363dc2e10bda61b4eec32d92d Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Sun, 26 Jul 2020 02:00:27 +0200 Subject: [PATCH] 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 --- ...{mariadb-10.1.38-r1.ebuild => mariadb-10.1.38-r2.ebuild} | 6 +++++- .../{mariadb-10.1.43.ebuild => mariadb-10.1.43-r1.ebuild} | 6 +++++- .../{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-10.2.29.ebuild => mariadb-10.2.29-r1.ebuild} | 6 +++++- .../{mariadb-10.2.32.ebuild => mariadb-10.2.32-r1.ebuild} | 6 +++++- .../{mariadb-10.3.23.ebuild => mariadb-10.3.23-r1.ebuild} | 6 +++++- .../{mariadb-10.4.13.ebuild => mariadb-10.4.13-r1.ebuild} | 6 +++++- .../{mariadb-5.5.68.ebuild => mariadb-5.5.68-r1.ebuild} | 6 +++++- 9 files changed, 45 insertions(+), 9 deletions(-) rename dev-db/mariadb/{mariadb-10.1.38-r1.ebuild => mariadb-10.1.38-r2.ebuild} (99%) rename dev-db/mariadb/{mariadb-10.1.43.ebuild => mariadb-10.1.43-r1.ebuild} (99%) rename dev-db/mariadb/{mariadb-10.1.45.ebuild => mariadb-10.1.45-r1.ebuild} (99%) rename dev-db/mariadb/{mariadb-10.2.22-r1.ebuild => mariadb-10.2.22-r2.ebuild} (99%) rename dev-db/mariadb/{mariadb-10.2.29.ebuild => mariadb-10.2.29-r1.ebuild} (99%) rename dev-db/mariadb/{mariadb-10.2.32.ebuild => mariadb-10.2.32-r1.ebuild} (99%) rename dev-db/mariadb/{mariadb-10.3.23.ebuild => mariadb-10.3.23-r1.ebuild} (99%) rename dev-db/mariadb/{mariadb-10.4.13.ebuild => mariadb-10.4.13-r1.ebuild} (99%) rename dev-db/mariadb/{mariadb-5.5.68.ebuild => mariadb-5.5.68-r1.ebuild} (99%) 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 2cb40286d3532..6db16af17a2e1 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 22f52825640cb..c889ad42af8ea 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 90bcfc0a3e0d8..e146098ee7a1d 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 08fbaa17fe17c..a77e8399844c1 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 ) ) !