[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/

[Thomas Deutschmann]

commit:     13ad839836ca4d509b2c0662b582398aa80f86b0
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  6 09:56:43 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Aug  6 09:57:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13ad8398

dev-db/mariadb: drop PDEPEND on virtual/mysql to ease upgrades

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 .../{mariadb-10.2.32-r1.ebuild => mariadb-10.2.32-r2.ebuild}     | 9 +++++++--
 .../{mariadb-10.3.23-r1.ebuild => mariadb-10.3.23-r2.ebuild}     | 3 +--
 .../{mariadb-10.4.13-r1.ebuild => mariadb-10.4.13-r2.ebuild}     | 3 +--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/dev-db/mariadb/mariadb-10.2.32-r1.ebuild 
b/dev-db/mariadb/mariadb-10.2.32-r2.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-10.2.32-r1.ebuild
rename to dev-db/mariadb/mariadb-10.2.32-r2.ebuild
index 2226d6d2486..53176b07f91 100644
--- a/dev-db/mariadb/mariadb-10.2.32-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.32-r2.ebuild
@@ -124,8 +124,13 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
 # percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not 
already installed
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
-        server? ( ~virtual/mysql-5.6[static=]
-                galera? ( sst-xtrabackup? ( || ( 
>=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
+       server? (
+               galera? (
+                       sst-xtrabackup? (
+                               || ( >=dev-db/percona-xtrabackup-bin-2.2.4 
dev-db/percona-xtrabackup )
+                       )
+               )
+       )"
 
 mysql_init_vars() {
        MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}

diff --git a/dev-db/mariadb/mariadb-10.3.23-r1.ebuild 
b/dev-db/mariadb/mariadb-10.3.23-r2.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-10.3.23-r1.ebuild
rename to dev-db/mariadb/mariadb-10.3.23-r2.ebuild
index 505086d729e..4c1be6008b7 100644
--- a/dev-db/mariadb/mariadb-10.3.23-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.23-r2.ebuild
@@ -121,8 +121,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
 "
 # For other stuff to bring us in
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
-        server? ( ~virtual/mysql-5.6[static=] )"
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
 
 mysql_init_vars() {
        MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}

diff --git a/dev-db/mariadb/mariadb-10.4.13-r1.ebuild 
b/dev-db/mariadb/mariadb-10.4.13-r2.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-10.4.13-r1.ebuild
rename to dev-db/mariadb/mariadb-10.4.13-r2.ebuild
index 3dc70126551..50104fda1e2 100644
--- a/dev-db/mariadb/mariadb-10.4.13-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.13-r2.ebuild
@@ -121,8 +121,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
 "
 # For other stuff to bring us in
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
-        server? ( ~virtual/mysql-5.6[static=] )"
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
 
 mysql_init_vars() {
        MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"}