| 1 |
commit: 13ad839836ca4d509b2c0662b582398aa80f86b0 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 6 09:56:43 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 6 09:57:08 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13ad8398 |
| 7 |
|
| 8 |
dev-db/mariadb: drop PDEPEND on virtual/mysql to ease upgrades |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
| 11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 12 |
|
| 13 |
.../{mariadb-10.2.32-r1.ebuild => mariadb-10.2.32-r2.ebuild} | 9 +++++++-- |
| 14 |
.../{mariadb-10.3.23-r1.ebuild => mariadb-10.3.23-r2.ebuild} | 3 +-- |
| 15 |
.../{mariadb-10.4.13-r1.ebuild => mariadb-10.4.13-r2.ebuild} | 3 +-- |
| 16 |
3 files changed, 9 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-db/mariadb/mariadb-10.2.32-r1.ebuild b/dev-db/mariadb/mariadb-10.2.32-r2.ebuild |
| 19 |
similarity index 99% |
| 20 |
rename from dev-db/mariadb/mariadb-10.2.32-r1.ebuild |
| 21 |
rename to dev-db/mariadb/mariadb-10.2.32-r2.ebuild |
| 22 |
index 2226d6d2486..53176b07f91 100644 |
| 23 |
--- a/dev-db/mariadb/mariadb-10.2.32-r1.ebuild |
| 24 |
+++ b/dev-db/mariadb/mariadb-10.2.32-r2.ebuild |
| 25 |
@@ -124,8 +124,13 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql ) |
| 26 |
# dev-perl/DBD-mysql is needed by some scripts installed by MySQL |
| 27 |
# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed |
| 28 |
PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 ) |
| 29 |
- server? ( ~virtual/mysql-5.6[static=] |
| 30 |
- galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )" |
| 31 |
+ server? ( |
| 32 |
+ galera? ( |
| 33 |
+ sst-xtrabackup? ( |
| 34 |
+ || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) |
| 35 |
+ ) |
| 36 |
+ ) |
| 37 |
+ )" |
| 38 |
|
| 39 |
mysql_init_vars() { |
| 40 |
MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"} |
| 41 |
|
| 42 |
diff --git a/dev-db/mariadb/mariadb-10.3.23-r1.ebuild b/dev-db/mariadb/mariadb-10.3.23-r2.ebuild |
| 43 |
similarity index 99% |
| 44 |
rename from dev-db/mariadb/mariadb-10.3.23-r1.ebuild |
| 45 |
rename to dev-db/mariadb/mariadb-10.3.23-r2.ebuild |
| 46 |
index 505086d729e..4c1be6008b7 100644 |
| 47 |
--- a/dev-db/mariadb/mariadb-10.3.23-r1.ebuild |
| 48 |
+++ b/dev-db/mariadb/mariadb-10.3.23-r2.ebuild |
| 49 |
@@ -121,8 +121,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql ) |
| 50 |
" |
| 51 |
# For other stuff to bring us in |
| 52 |
# dev-perl/DBD-mysql is needed by some scripts installed by MySQL |
| 53 |
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 ) |
| 54 |
- server? ( ~virtual/mysql-5.6[static=] )" |
| 55 |
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" |
| 56 |
|
| 57 |
mysql_init_vars() { |
| 58 |
MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"} |
| 59 |
|
| 60 |
diff --git a/dev-db/mariadb/mariadb-10.4.13-r1.ebuild b/dev-db/mariadb/mariadb-10.4.13-r2.ebuild |
| 61 |
similarity index 99% |
| 62 |
rename from dev-db/mariadb/mariadb-10.4.13-r1.ebuild |
| 63 |
rename to dev-db/mariadb/mariadb-10.4.13-r2.ebuild |
| 64 |
index 3dc70126551..50104fda1e2 100644 |
| 65 |
--- a/dev-db/mariadb/mariadb-10.4.13-r1.ebuild |
| 66 |
+++ b/dev-db/mariadb/mariadb-10.4.13-r2.ebuild |
| 67 |
@@ -121,8 +121,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql ) |
| 68 |
" |
| 69 |
# For other stuff to bring us in |
| 70 |
# dev-perl/DBD-mysql is needed by some scripts installed by MySQL |
| 71 |
-PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 ) |
| 72 |
- server? ( ~virtual/mysql-5.6[static=] )" |
| 73 |
+PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" |
| 74 |
|
| 75 |
mysql_init_vars() { |
| 76 |
MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mariadb"} |
Archives