diff options
Diffstat (limited to 'sys-fs/squashfs-tools')
| -rw-r--r-- | sys-fs/squashfs-tools/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/squashfs-tools/metadata.xml | 3 | ||||
| -rw-r--r-- | sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild | 16 |
3 files changed, 16 insertions, 9 deletions
diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog index 8aa19e1a9a8d..68e29d86b5e6 100644 --- a/sys-fs/squashfs-tools/ChangeLog +++ b/sys-fs/squashfs-tools/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-fs/squashfs-tools # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.78 2012/02/08 18:11:32 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.79 2012/02/08 18:25:08 jer Exp $ + + 08 Feb 2012; Jeroen Roovers <jer@gentoo.org> squashfs-tools-4.2.ebuild, + metadata.xml: + Change USE=lzma to USE=xz now that upstream calls it that way (bug #400939). 08 Feb 2012; Jeroen Roovers <jer@gentoo.org> squashfs-tools-4.2.ebuild: Stable for HPPA (bug #400937). diff --git a/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml index 88653ddd7172..4fa39b668ac7 100644 --- a/sys-fs/squashfs-tools/metadata.xml +++ b/sys-fs/squashfs-tools/metadata.xml @@ -2,4 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>livecd</herd> +<use> +<flag name="xz">Enable support for XZ compression using <pkg>app-arch/xz-utils</pkg></flag> +</use> </pkgmetadata> diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild index 7bab0bb6f055..69408f5d8843 100644 --- a/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild +++ b/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild,v 1.4 2012/02/08 18:11:32 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.2.ebuild,v 1.5 2012/02/08 18:25:08 jer Exp $ EAPI="2" @@ -14,13 +14,13 @@ SRC_URI="mirror://sourceforge/squashfs/squashfs${MY_PV}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux" -IUSE="+gzip +lzma lzo xattr" +IUSE="+gzip +xz lzo xattr" RDEPEND=" gzip? ( sys-libs/zlib ) - lzma? ( app-arch/xz-utils ) + xz? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) - !lzma? ( !lzo? ( sys-libs/zlib ) ) + !xz? ( !lzo? ( sys-libs/zlib ) ) xattr? ( sys-apps/attr )" DEPEND="${RDEPEND}" @@ -41,12 +41,12 @@ src_configure() { einfo "You can set the default compression (gzip, xz or lzo) by exporting SQUASH_FS_DEFAULT_COMP" if use gzip; then def="gzip" - elif use lzma; then + elif use xz; then def="xz" elif use lzo; then def="lzo" else - die "Please set at least one of the gzip, lzma and lzo USE flags as compression algorithm." + die "Please set at least one of the gzip, xz and lzo USE flags as compression algorithm." fi fi @@ -55,7 +55,7 @@ src_configure() { sed -i -r \ -e "/^COMP_DEFAULT =/s:=.*:= ${def}:" \ -e "$(use_sed gzip)" \ - -e "$(use_sed lzma XZ)" \ + -e "$(use_sed xz XZ)" \ -e "$(use_sed lzo)" \ -e "$(use_sed xattr)" \ Makefile || die @@ -69,6 +69,6 @@ src_install() { pkg_postinst() { ewarn "This version of mksquashfs requires a 2.6.29 kernel or better" - use lzma && + use xz && ewarn "XZ support requires a 2.6.38 kernel or better" } |