diff options
Diffstat (limited to 'sys-fs/squashfs-tools')
| -rw-r--r-- | sys-fs/squashfs-tools/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-fs/squashfs-tools/squashfs-tools-4.3_pre20130621-r1.ebuild (renamed from sys-fs/squashfs-tools/squashfs-tools-4.3_pre20130621.ebuild) | 28 |
2 files changed, 20 insertions, 17 deletions
diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog index d89adea989c1..879127933c6d 100644 --- a/sys-fs/squashfs-tools/ChangeLog +++ b/sys-fs/squashfs-tools/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-fs/squashfs-tools # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.91 2014/01/21 10:25:49 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.92 2014/01/21 20:58:25 jer Exp $ + +*squashfs-tools-4.3_pre20130621-r1 (21 Jan 2014) + + 21 Jan 2014; Jeroen Roovers <jer@gentoo.org> + -squashfs-tools-4.3_pre20130621.ebuild, + +squashfs-tools-4.3_pre20130621-r1.ebuild: + Fix USE=-xattr. Drop the horrible use_sed in favour of usex. *squashfs-tools-4.3_pre20130621 (21 Jan 2014) diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_pre20130621.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_pre20130621-r1.ebuild index 0a3419514566..63a02836da31 100644 --- a/sys-fs/squashfs-tools/squashfs-tools-4.3_pre20130621.ebuild +++ b/sys-fs/squashfs-tools/squashfs-tools-4.3_pre20130621-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.3_pre20130621.ebuild,v 1.1 2014/01/21 10:25:49 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.3_pre20130621-r1.ebuild,v 1.1 2014/01/21 20:58:25 jer Exp $ EAPI=5 @@ -26,24 +26,20 @@ DEPEND="${RDEPEND}" S="${WORKDIR}/${P}/squashfs-tools" -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() { + # set up make command line variables in EMAKE_SQUASHFS_CONF + EMAKE_SQUASHFS_CONF=( + $(usex lzma LZMA_XZ_SUPPORT= LZMA_XS_SUPPORT= 1 0) + $(usex lzo LZO_SUPPORT= LZO_SUPPORT= 1 0) + $(usex xattr XATTR_DEFAULT= XATTR_DEFAULT= 1 0) + $(usex xz XZ_SUPPORT= XZ_SUPPORT= 1 0) + ) -_src_prepare() { - epatch "${WORKDIR}"/${P}.patch + tc-export CC } -src_configure() { - tc-export CC - sed -i -r \ - -e "$(use_sed xz XZ)" \ - -e "$(use_sed lzo)" \ - -e "$(use_sed xattr)" \ - -e "$(use_sed lzma LZMA_XZ)" \ - Makefile || die +src_compile() { + emake ${EMAKE_SQUASHFS_CONF[@]} } src_install() { |