From 163c38d6672e4004836561f564437dc74d0b3e4c Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Tue, 12 Nov 2019 09:08:03 -0500 Subject: [PATCH] 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 --- 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 35694b80036fb..7fb13269e69d3 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 70ab47d3b626a..c479a1ae70d56 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