From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B83A51382C5 for ; Wed, 9 May 2018 01:05:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EC5FEE0AEF; Wed, 9 May 2018 01:05:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AF9D1E0AEF for ; Wed, 9 May 2018 01:05:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E0A2E335C05 for ; Wed, 9 May 2018 01:05:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 241D537 for ; Wed, 9 May 2018 01:05:18 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1525827827.275d9c23c31ba3050cbaf5b50b31d254fe955cd7.grknight@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mariadb/mariadb-10.1.24-r1.ebuild dev-db/mariadb/mariadb-10.1.29.ebuild dev-db/mariadb/mariadb-10.1.31-r1.ebuild dev-db/mariadb/mariadb-10.1.32.ebuild dev-db/mariadb/mariadb-10.2.14.ebuild dev-db/mariadb/mariadb-10.3.6_rc.ebuild X-VCS-Directories: dev-db/mariadb/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 275d9c23c31ba3050cbaf5b50b31d254fe955cd7 X-VCS-Branch: master Date: Wed, 9 May 2018 01:05:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 89a911c0-f969-4a11-97e2-207b18b8c810 X-Archives-Hash: 609391443f4e7d80057fad0bc89bbf45 commit: 275d9c23c31ba3050cbaf5b50b31d254fe955cd7 Author: Brian Evans gentoo org> AuthorDate: Wed May 9 01:03:47 2018 +0000 Commit: Brian Evans gentoo 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