commit:     948123ac1484eb76e20e13d38b8bbd9138880b2d
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  8 05:10:25 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Jul 20 16:42:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=948123ac

sys-fs/squashfs-tools-ng: Rename IUSE=xz->lzma

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 sys-fs/squashfs-tools-ng/metadata.xml                   | 1 -
 sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.1.ebuild | 6 +++---
 sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.2.ebuild | 4 ++--
 sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild  | 6 +++---
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/sys-fs/squashfs-tools-ng/metadata.xml 
b/sys-fs/squashfs-tools-ng/metadata.xml
index 9d251701516..024d650b54f 100644
--- a/sys-fs/squashfs-tools-ng/metadata.xml
+++ b/sys-fs/squashfs-tools-ng/metadata.xml
@@ -7,7 +7,6 @@
        </maintainer>
        <use>
                <flag name="tools">Build the gensquashfs, rdsquashfs, sqfs2tar, 
sqfsdiff, and tar2sqfs tools</flag>
-               <flag name="xz">Enable support for XZ ("LZMA2") compression 
using <pkg>app-arch/xz-utils</pkg></flag>
        </use>
        <upstream>
                <remote-id type="github">AgentD/squashfs-tools-ng</remote-id>

diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.1.ebuild 
b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.1.ebuild
index 22a2dbc93b6..26bca0bda38 100644
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.1.ebuild
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,13 +15,13 @@ fi
 
 LICENSE="LGPL-3+ tools? ( GPL-3+ )"
 SLOT="0"
-IUSE="lz4 lzo selinux +tools +xz zstd"
+IUSE="lz4 +lzma lzo selinux +tools zstd"
 
 DEPEND="
        sys-libs/zlib:=
        lz4?     ( app-arch/lz4:= )
+       lzma?    ( app-arch/xz-utils:= )
        lzo?     ( dev-libs/lzo:= )
-       xz?      ( app-arch/xz-utils:= )
        selinux? ( sys-libs/libselinux:= )
        zstd?    ( app-arch/zstd:= )
 "

diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.2.ebuild 
b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.2.ebuild
index 3e96fd1fdfe..26bca0bda38 100644
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.2.ebuild
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.2.ebuild
@@ -15,13 +15,13 @@ fi
 
 LICENSE="LGPL-3+ tools? ( GPL-3+ )"
 SLOT="0"
-IUSE="lz4 lzo selinux +tools +xz zstd"
+IUSE="lz4 +lzma lzo selinux +tools zstd"
 
 DEPEND="
        sys-libs/zlib:=
        lz4?     ( app-arch/lz4:= )
+       lzma?    ( app-arch/xz-utils:= )
        lzo?     ( dev-libs/lzo:= )
-       xz?      ( app-arch/xz-utils:= )
        selinux? ( sys-libs/libselinux:= )
        zstd?    ( app-arch/zstd:= )
 "

diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild 
b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
index 22a2dbc93b6..26bca0bda38 100644
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,13 +15,13 @@ fi
 
 LICENSE="LGPL-3+ tools? ( GPL-3+ )"
 SLOT="0"
-IUSE="lz4 lzo selinux +tools +xz zstd"
+IUSE="lz4 +lzma lzo selinux +tools zstd"
 
 DEPEND="
        sys-libs/zlib:=
        lz4?     ( app-arch/lz4:= )
+       lzma?    ( app-arch/xz-utils:= )
        lzo?     ( dev-libs/lzo:= )
-       xz?      ( app-arch/xz-utils:= )
        selinux? ( sys-libs/libselinux:= )
        zstd?    ( app-arch/zstd:= )
 "

Reply via email to