[gentoo-commits] repo/gentoo:master commit in: sys-fs/squashfs-tools/

[Mike Frysinger]

commit:     ab7c08d07012cc807a506a10625b44e9fcb1cc97
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 13 18:28:18 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Apr 13 18:40:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab7c08d0

sys-fs/squashfs-tools: cleanup/fix configure options

 sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild 
b/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild
index dc96dda..ae89fac 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3.ebuild
@@ -27,21 +27,23 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/squashfs${PV}/${PN}"
 
+use10() { usex $1 1 2 ; }
+
 src_configure() {
        # set up make command line variables in EMAKE_SQUASHFS_CONF
        EMAKE_SQUASHFS_CONF=(
-               $(usex lzma LZMA_XZ_SUPPORT=1 LZMA_XS_SUPPORT=0)
-               $(usex lzo LZO_SUPPORT=1 LZO_SUPPORT=0)
-               $(usex lz4 LZ4_SUPPORT=1 LZ4_SUPPORT=0)
-               $(usex xattr XATTR_SUPPORT=1 XATTR_SUPPORT=0)
-               $(usex xz XZ_SUPPORT=1 XZ_SUPPORT=0)
+               LZMA_XZ_SUPPORT=$(use10 lzma)
+               LZO_SUPPORT=$(use10 lzo)
+               LZ4_SUPPORT=$(use10 lz4)
+               XATTR_SUPPORT=$(use10 xattr)
+               XZ_SUPPORT=$(use10 xz)
        )
 
        tc-export CC
 }
 
 src_compile() {
-       emake ${EMAKE_SQUASHFS_CONF[@]}
+       emake "${EMAKE_SQUASHFS_CONF[@]}"
 }
 
 src_install() {