summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2018-12-19 13:30:44 -0500
committerBrian Evans <grknight@gentoo.org>2018-12-19 13:30:44 -0500
commitb19130e3a08427e6defb885b53d8341134d21f6a (patch)
tree1cf86035f7d0c8ea718733857661683924771ddd /dev-db/mariadb
parentdev-php/phpunit: Revbump to fix dependency blockers (diff)
downloadgentoo-b19130e3a08427e6defb885b53d8341134d21f6a.tar.gz
gentoo-b19130e3a08427e6defb885b53d8341134d21f6a.tar.bz2
gentoo-b19130e3a08427e6defb885b53d8341134d21f6a.zip
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@gentoo.org>
Diffstat (limited to 'dev-db/mariadb')
-rw-r--r--dev-db/mariadb/mariadb-10.3.11.ebuild11
1 files 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 449df2423353..f13182f68fa2 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: