commit: b19130e3a08427e6defb885b53d8341134d21f6a Author: Brian Evans <grknight <AT> gentoo <DOT> org> AuthorDate: Wed Dec 19 18:30:44 2018 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Wed Dec 19 18:30:44 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b19130e3
dev-db/mariadb: Fix up build condition syntax for 10.3.11 Closes: https://bugs.gentoo.org/660972 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Brian Evans <grknight <AT> gentoo.org> dev-db/mariadb/mariadb-10.3.11.ebuild | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dev-db/mariadb/mariadb-10.3.11.ebuild b/dev-db/mariadb/mariadb-10.3.11.ebuild index 449df242335..f13182f68fa 100644 --- a/dev-db/mariadb/mariadb-10.3.11.ebuild +++ b/dev-db/mariadb/mariadb-10.3.11.ebuild @@ -573,12 +573,15 @@ src_install() { doexe "${BUILD_DIR}/extra/my_print_defaults" "${BUILD_DIR}/extra/perror" fi - #Remove mytop if perl is not selected - [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop" + # Remove mytop if perl is not selected + if [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl ; then + rm -f "${ED}/usr/bin/mytop" || die + fi # Fix a dangling symlink when galera is not built - [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera \ - && rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die + if [[ -L "${ED}/usr/bin/wsrep_sst_rsync_wan" ]] && ! use galera ; then + rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die + fi } # Official test instructions:
