diff options
| -rw-r--r-- | sys-fs/squashfs-tools/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/squashfs-tools/squashfs-tools-4.1.ebuild | 17 |
2 files changed, 17 insertions, 6 deletions
diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog index 4e7689dbddba..0e383256d3d4 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.70 2010/09/20 02:54:19 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.71 2010/10/07 02:15:09 vapier Exp $ + + 07 Oct 2010; Mike Frysinger <vapier@gentoo.org> squashfs-tools-4.1.ebuild: + Fix by Martin Väth for IUSE=xattr handling #338671, and clean up general + handling of the USE flags. *squashfs-tools-4.1 (20 Sep 2010) diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.1.ebuild index 8f0b59c9ff09..14887157e50b 100644 --- a/sys-fs/squashfs-tools/squashfs-tools-4.1.ebuild +++ b/sys-fs/squashfs-tools/squashfs-tools-4.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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.1.ebuild,v 1.1 2010/09/20 02:54:19 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.1.ebuild,v 1.2 2010/10/07 02:15:09 vapier Exp $ EAPI="2" @@ -19,7 +19,8 @@ IUSE="+gzip +lzma lzo xattr" RDEPEND="gzip? ( sys-libs/zlib ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) - !lzma? ( !lzo? ( sys-libs/zlib ) )" + !lzma? ( !lzo? ( sys-libs/zlib ) ) + xattr? ( sys-apps/attr )" DEPEND="${RDEPEND}" S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools @@ -31,14 +32,20 @@ src_prepare() { Makefile || die } +use_sed() { + local u=$1 s="${2:-`echo $1 | tr '[:lower:]' '[:upper:]'`}_SUPPORT" + printf '/^#?%s =/%s\n' "${s}" \ + "$(use $u && echo s:.*:${s}=1: || echo d)" +} src_configure() { tc-export CC local def=`usev gzip || usev lzma || usev lzo || echo gzip` sed -i -r \ -e "/^COMP_DEFAULT =/s:=.*:= ${def}:" \ - -e "/^#?GZIP_SUPPORT =/`use gzip && echo s:.*:GZIP_SUPPORT=1: || echo d`" \ - -e "/^#?XZ_SUPPORT =/`use lzma && echo s:.*:XZ_SUPPORT=1: || echo d`" \ - -e "/^#?LZO_SUPPORT =/`use lzo && echo s:.*:LZO_SUPPORT=1 :|| echo d`" \ + -e "$(use_sed gzip)" \ + -e "$(use_sed lzma xz)" \ + -e "$(use_sed lzo)" \ + -e "$(use_sed xattr)" \ Makefile || die } |