dev-db/mariadb: Reorder dependencies on 5.7.22

The transitional dependency is brought in at the wrong time
causing	a status message to be skipped for rebuilding.

Does not affect	installed machines

Package-Manager: Portage-2.3.40, Repoman-2.3.9

diff --git a/dev-db/mariadb/mariadb-10.2.15.ebuild b/dev-db/mariadb/mariadb-10.2.15.ebuild
index 50b76de9c542a6e574cbbba27874d03716e8141f..d4065893621dfca445d3e650a18423b9898006e0 100644 (file)
--- a/dev-db/mariadb/mariadb-10.2.15.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.15.ebuild
@@ -118,6 +118,7 @@ COMMON_DEPEND="
                tokudb? ( app-arch/snappy )
        )
        >=dev-libs/libpcre-8.41-r1:3=
+       !client-libs? ( dev-db/mariadb-connector-c[${MULTILIB_USEDEP}] dev-db/mysql-connector-c[${MULTILIB_USEDEP}] )
 "
 DEPEND="virtual/yacc
        static? ( sys-libs/ncurses[static-libs] )
@@ -148,7 +149,6 @@ 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 )
-       !client-libs? ( dev-db/mariadb-connector-c[${MULTILIB_USEDEP}] dev-db/mysql-connector-c[${MULTILIB_USEDEP}] )
         server? ( ~virtual/mysql-5.6[static=]
                 galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
 

diff --git a/dev-db/mariadb/mariadb-10.3.7.ebuild b/dev-db/mariadb/mariadb-10.3.7.ebuild
index d514af1ed2bdc977cefc120486d6c67bbb48ab83..b1c9bd25b6dbe89833432b0f84163a3e98c92028 100644 (file)
--- a/dev-db/mariadb/mariadb-10.3.7.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.7.ebuild
@@ -110,6 +110,7 @@ COMMON_DEPEND="
                tokudb? ( app-arch/snappy )
        )
        >=dev-libs/libpcre-8.41-r1:3=
+       dev-db/mariadb-connector-c[${MULTILIB_USEDEP},static-libs?] dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?]
 "
 DEPEND="virtual/yacc
        static? ( sys-libs/ncurses[static-libs] )
@@ -139,7 +140,6 @@ 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 )
-        dev-db/mariadb-connector-c[${MULTILIB_USEDEP},static-libs?] dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?]
         server? ( ~virtual/mysql-5.6[static=]
                 galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"