dev-db/mariadb: Fix up build condition syntax for 10.3.11
authorBrian Evans <grknight@gentoo.org>
Wed, 19 Dec 2018 18:30:44 +0000 (13:30 -0500)
committerBrian Evans <grknight@gentoo.org>
Wed, 19 Dec 2018 18:30:44 +0000 (13:30 -0500)
Closes: https://bugs.gentoo.org/660972
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Brian Evans <grknight@gentoo.org>
dev-db/mariadb/mariadb-10.3.11.ebuild

index 449df2423353155f8cb90091a178122ac5667504..f13182f68fa24d932d834397208464902aa36f46 100644 (file)
@@ -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: