app-arch/xz-utils: Refactor myconf for new options

diff --git a/app-arch/xz-utils/xz-utils-5.2.3.ebuild b/app-arch/xz-utils/xz-utils-5.2.3.ebuild
index b074679f0e092f941433bac75b21ae22e273e5c4..f15ced82058d3827b08c049f471516ac9c85a033 100644 (file)
--- a/app-arch/xz-utils/xz-utils-5.2.3.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.3.ebuild
@@ -45,12 +45,16 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+       local myconf=(
+               $(use_enable nls)
+               $(use_enable threads)
+               $(use_enable static-libs static)
+       )
+       multilib_is_native_abi ||
+               myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} )
+
        use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
-       ECONF_SOURCE="${S}" econf \
-               $(use_enable nls) \
-               $(use_enable threads) \
-               $(use_enable static-libs static) \
-               $(multilib_is_native_abi || echo --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts})
+       ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 
 multilib_src_install() {

diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index cf2f6076d65b303c43ceb5a68e47346c29855537..e437466c00f93498121dcec34b11bf56dcee6061 100644 (file)
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -45,12 +45,16 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+       local myconf=(
+               $(use_enable nls)
+               $(use_enable threads)
+               $(use_enable static-libs static)
+       )
+       multilib_is_native_abi ||
+               myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} )
+
        use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
-       ECONF_SOURCE="${S}" econf \
-               $(use_enable nls) \
-               $(use_enable threads) \
-               $(use_enable static-libs static) \
-               $(multilib_is_native_abi || echo --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts})
+       ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 
 multilib_src_install() {