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 9167E138335 for ; Wed, 13 Mar 2019 13:33:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97B6BE0943; Wed, 13 Mar 2019 13:33:45 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 6F46FE0943 for ; Wed, 13 Mar 2019 13:33:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 BEDCF335C8E for ; Wed, 13 Mar 2019 13:33:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 980DA565 for ; Wed, 13 Mar 2019 13:33:41 +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: <1552483955.f5b77e77b2b050172c66999091c41b8b1fdf7065.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.3.13.ebuild X-VCS-Directories: dev-db/mariadb/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: f5b77e77b2b050172c66999091c41b8b1fdf7065 X-VCS-Branch: master Date: Wed, 13 Mar 2019 13:33:41 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7ae905b0-a791-4878-81db-1e955e14fad5 X-Archives-Hash: b959c768c87d86847f29ac3bfce1ec44 commit: f5b77e77b2b050172c66999091c41b8b1fdf7065 Author: Brian Evans gentoo org> AuthorDate: Wed Mar 13 13:32:35 2019 +0000 Commit: Brian Evans gentoo org> CommitDate: Wed Mar 13 13:32:35 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5b77e77 dev-db/mariadb: Drop sst-xtrabackup from 10.3 Closes: https://bugs.gentoo.org/677674 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Brian Evans gentoo.org> dev-db/mariadb/mariadb-10.3.13.ebuild | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dev-db/mariadb/mariadb-10.3.13.ebuild b/dev-db/mariadb/mariadb-10.3.13.ebuild index 809bf7c23eb..8d049d3508e 100644 --- a/dev-db/mariadb/mariadb-10.3.13.ebuild +++ b/dev-db/mariadb/mariadb-10.3.13.ebuild @@ -31,7 +31,7 @@ SLOT="0/${SUBSLOT:-0}" IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4 innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx - sst-rsync sst-mariabackup sst-xtrabackup static systemd systemtap tcmalloc + sst-rsync sst-mariabackup static systemd systemtap tcmalloc test tokudb xml yassl" # Tests always fail when libressl is enabled due to hard-coded ciphers in the tests @@ -124,7 +124,6 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql ) =sys-cluster/galera-25* sst-rsync? ( sys-process/lsof ) sst-mariabackup? ( net-misc/socat[ssl] ) - sst-xtrabackup? ( net-misc/socat[ssl] ) ) ) perl? ( !dev-db/mytop virtual/perl-Getopt-Long @@ -135,10 +134,8 @@ 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 -# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 ) - server? ( ~virtual/mysql-5.6[static=] - galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )" + server? ( ~virtual/mysql-5.6[static=] )" pkg_setup() { if [[ ${MERGE_TYPE} != binary ]] ; then @@ -583,6 +580,14 @@ src_install() { if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die fi + + # Remove broken SST scripts that are incompatible + local scriptremove + for scriptremove in wsrep_sst_xtrabackup wsrep_sst_xtrabackup-v2 ; do + if [[ -e "${ED}/usr/bin/${scriptremove}" ]] ; then + rm "${ED}/usr/bin/${scriptremove}" || die + fi + done } # Official test instructions: