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 C2C8313997D for ; Tue, 12 Nov 2019 14:11:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DF49E0844; Tue, 12 Nov 2019 14:11:23 +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 6A10DE0844 for ; Tue, 12 Nov 2019 14:11:23 +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 3CEA734CC28 for ; Tue, 12 Nov 2019 14:11:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7596F8A6 for ; Tue, 12 Nov 2019 14:11:19 +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: <1573567683.163c38d6672e4004836561f564437dc74d0b3e4c.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.20.ebuild dev-db/mariadb/mariadb-10.4.10.ebuild X-VCS-Directories: dev-db/mariadb/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 163c38d6672e4004836561f564437dc74d0b3e4c X-VCS-Branch: master Date: Tue, 12 Nov 2019 14:11:19 +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: 55a7bbfa-a4b2-4869-85f7-89d8c93638dc X-Archives-Hash: 4fffc7def5c7646fa138095c96f8a8ca commit: 163c38d6672e4004836561f564437dc74d0b3e4c Author: Brian Evans gentoo org> AuthorDate: Tue Nov 12 14:08:03 2019 +0000 Commit: Brian Evans gentoo org> CommitDate: Tue Nov 12 14:08:03 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=163c38d6 dev-db/mariadb: Fix galera_recovery script location Closes: https://bugs.gentoo.org/699424 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Brian Evans gentoo.org> dev-db/mariadb/mariadb-10.3.20.ebuild | 4 ++++ dev-db/mariadb/mariadb-10.4.10.ebuild | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/dev-db/mariadb/mariadb-10.3.20.ebuild b/dev-db/mariadb/mariadb-10.3.20.ebuild index 35694b80036..7fb13269e69 100644 --- a/dev-db/mariadb/mariadb-10.3.20.ebuild +++ b/dev-db/mariadb/mariadb-10.3.20.ebuild @@ -300,6 +300,10 @@ src_prepare() { -e 's/ perror.1//' \ "${S}"/man/CMakeLists.txt || die + # Fix galera_recovery.sh script + sed -i -e "s~@bindir@/my_print_defaults~${EPREFIX}/usr/libexec/mariadb/my_print_defaults~" \ + scripts/galera_recovery.sh || die + cmake-utils_src_prepare java-pkg-opt-2_src_prepare } diff --git a/dev-db/mariadb/mariadb-10.4.10.ebuild b/dev-db/mariadb/mariadb-10.4.10.ebuild index 70ab47d3b62..c479a1ae70d 100644 --- a/dev-db/mariadb/mariadb-10.4.10.ebuild +++ b/dev-db/mariadb/mariadb-10.4.10.ebuild @@ -307,6 +307,10 @@ src_prepare() { -e 's/ perror.1//' \ "${S}"/man/CMakeLists.txt || die + # Fix galera_recovery.sh script + sed -i -e "s~@bindir@/my_print_defaults~${EPREFIX}/usr/libexec/mariadb/my_print_defaults~" \ + scripts/galera_recovery.sh || die + sed -i -e 's~ \$basedir/lib/\*/mariadb19/plugin~~' \ "${S}"/scripts/mysql_install_db.sh || die