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 2CBF3138334 for ; Mon, 25 Jun 2018 02:03:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2642FE0958; Mon, 25 Jun 2018 02:03:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 D911FE0958 for ; Mon, 25 Jun 2018 02:03:05 +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 9D9FA335C07 for ; Mon, 25 Jun 2018 02:03:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E5DAD348 for ; Mon, 25 Jun 2018 02:03:01 +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: <1529892176.22da60c8d1dcc041529ae3b8ee62eda2b336a029.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.2.15.ebuild dev-db/mariadb/mariadb-10.3.7.ebuild X-VCS-Directories: dev-db/mariadb/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 22da60c8d1dcc041529ae3b8ee62eda2b336a029 X-VCS-Branch: master Date: Mon, 25 Jun 2018 02:03:01 +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: 430b85c1-0607-4f47-af08-d3e6aabcb57a X-Archives-Hash: d50de457b8156d3ea680d46b34aac346 commit: 22da60c8d1dcc041529ae3b8ee62eda2b336a029 Author: Brian Evans gentoo org> AuthorDate: Mon Jun 25 02:00:43 2018 +0000 Commit: Brian Evans gentoo org> CommitDate: Mon Jun 25 02:02:56 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22da60c8 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 dev-db/mariadb/mariadb-10.2.15.ebuild | 2 +- dev-db/mariadb/mariadb-10.3.7.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-db/mariadb/mariadb-10.2.15.ebuild b/dev-db/mariadb/mariadb-10.2.15.ebuild index 50b76de9c54..d4065893621 100644 --- 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 d514af1ed2b..b1c9bd25b6d 100644 --- 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 ) ) ) )"