commit: 275d9c23c31ba3050cbaf5b50b31d254fe955cd7
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed May 9 01:03:47 2018 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed May 9 01:03:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=275d9c23
dev-db/mariadb: Fix package moved xtrabackup-bin dep
Package-Manager: Portage-2.3.36, Repoman-2.3.9
dev-db/mariadb/mariadb-10.1.24-r1.ebuild | 4 ++--
dev-db/mariadb/mariadb-10.1.29.ebuild | 4 ++--
dev-db/mariadb/mariadb-10.1.31-r1.ebuild | 4 ++--
dev-db/mariadb/mariadb-10.1.32.ebuild | 4 ++--
dev-db/mariadb/mariadb-10.2.14.ebuild | 4 ++--
dev-db/mariadb/mariadb-10.3.6_rc.ebuild | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dev-db/mariadb/mariadb-10.1.24-r1.ebuild
b/dev-db/mariadb/mariadb-10.1.24-r1.ebuild
index 6340ea651b3..1e63d720f7b 100644
--- a/dev-db/mariadb/mariadb-10.1.24-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.24-r1.ebuild
@@ -74,8 +74,8 @@ RDEPEND="${RDEPEND} ${COMMON_DEPEND}
virtual/perl-Time-HiRes )
server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
"
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already
installed
-PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4
dev-db/percona-xtrabackup ) ) )"
+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not
already installed
+PDEPEND="galera? ( sst-xtrabackup? ( || (
>=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
/usr/include/mysql/private/probes_mysql_nodtrace.h
diff --git a/dev-db/mariadb/mariadb-10.1.29.ebuild
b/dev-db/mariadb/mariadb-10.1.29.ebuild
index 0d36f069a0e..4418e76ddbe 100644
--- a/dev-db/mariadb/mariadb-10.1.29.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.29.ebuild
@@ -76,8 +76,8 @@ RDEPEND="${RDEPEND} ${COMMON_DEPEND}
virtual/perl-Time-HiRes )
server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
"
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already
installed
-PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4
dev-db/percona-xtrabackup ) ) )"
+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not
already installed
+PDEPEND="galera? ( sst-xtrabackup? ( || (
>=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
/usr/include/mysql/private/probes_mysql_nodtrace.h
diff --git a/dev-db/mariadb/mariadb-10.1.31-r1.ebuild
b/dev-db/mariadb/mariadb-10.1.31-r1.ebuild
index c8a9ce24bc7..7b86ca62c03 100644
--- a/dev-db/mariadb/mariadb-10.1.31-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.31-r1.ebuild
@@ -79,8 +79,8 @@ RDEPEND="${RDEPEND} ${COMMON_DEPEND}
virtual/perl-Time-HiRes )
server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
"
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already
installed
-PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4
dev-db/percona-xtrabackup ) ) )"
+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not
already installed
+PDEPEND="galera? ( sst-xtrabackup? ( || (
>=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
/usr/include/mysql/private/probes_mysql_nodtrace.h
diff --git a/dev-db/mariadb/mariadb-10.1.32.ebuild
b/dev-db/mariadb/mariadb-10.1.32.ebuild
index b0ac461ad4d..c436772d9d7 100644
--- a/dev-db/mariadb/mariadb-10.1.32.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.32.ebuild
@@ -78,8 +78,8 @@ RDEPEND="${RDEPEND} ${COMMON_DEPEND}
virtual/perl-Time-HiRes )
server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) )
"
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already
installed
-PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4
dev-db/percona-xtrabackup ) ) )"
+# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not
already installed
+PDEPEND="galera? ( sst-xtrabackup? ( || (
>=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )"
MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
/usr/include/mysql/private/probes_mysql_nodtrace.h
diff --git a/dev-db/mariadb/mariadb-10.2.14.ebuild
b/dev-db/mariadb/mariadb-10.2.14.ebuild
index d866c8cf098..893927aa179 100644
--- a/dev-db/mariadb/mariadb-10.2.14.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.14.ebuild
@@ -140,11 +140,11 @@ 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
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already
installed
+# 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/xtrabackup-bin-2.2.4
dev-db/percona-xtrabackup ) ) ) )"
+ galera? ( sst-xtrabackup? ( || (
>=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
pkg_setup() {
if [[ ${MERGE_TYPE} != binary ]] ; then
diff --git a/dev-db/mariadb/mariadb-10.3.6_rc.ebuild
b/dev-db/mariadb/mariadb-10.3.6_rc.ebuild
index 420372960c2..1f583f11a9d 100644
--- a/dev-db/mariadb/mariadb-10.3.6_rc.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.6_rc.ebuild
@@ -149,11 +149,11 @@ 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
-# xtrabackup-bin causes a circular dependency if DBD-mysql is not already
installed
+# 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/xtrabackup-bin-2.2.4
dev-db/percona-xtrabackup ) ) ) )"
+ galera? ( sst-xtrabackup? ( || (
>=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
pkg_setup() {
if [[ ${MERGE_TYPE} != binary ]] ; then
