diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-10-07 02:15:09 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-10-07 02:15:09 +0000 |
| commit | 0d07b55e4c2e4a917693ad3c65e2075b5af01339 (patch) | |
| tree | 2c9f892707e4c99e45e034e2b7255f82a8483239 /sys-fs | |
| parent | Version bump #339956 by Lars Wendler. (diff) | |
| download | historical-0d07b55e4c2e4a917693ad3c65e2075b5af01339.tar.gz historical-0d07b55e4c2e4a917693ad3c65e2075b5af01339.tar.bz2 historical-0d07b55e4c2e4a917693ad3c65e2075b5af01339.zip | |
Fix by Martin Väth for IUSE=xattr handling #338671, and clean up general handling of the USE flags.
Package-Manager: portage-2.2_rc86/cvs/Linux x86_64
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/squashfs-tools/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/squashfs-tools/Manifest | 10 | ||||
| -rw-r--r-- | sys-fs/squashfs-tools/squashfs-tools-4.1.ebuild | 17 |
3 files changed, 22 insertions, 11 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/Manifest b/sys-fs/squashfs-tools/Manifest index 90b2dafe74f9..579c8a6d40c0 100644 --- a/sys-fs/squashfs-tools/Manifest +++ b/sys-fs/squashfs-tools/Manifest @@ -12,13 +12,13 @@ EBUILD squashfs-tools-3.2_p2.ebuild 1095 RMD160 183da75ffb969db6643876ac210b3da2 EBUILD squashfs-tools-3.4.ebuild 1095 RMD160 e08fe76143ca1af554806eb8eb3cd3f55021b651 SHA1 34b3e4eebf02b912f4dc7fa894239093037e2603 SHA256 5b66ce00377cd0d4e0cd1628de4cc9e1340e80685d41d6f36166e1f258cb3237 EBUILD squashfs-tools-4.0-r1.ebuild 1214 RMD160 b5651766c212798115cfbf4081b48e451916e065 SHA1 53c0fd207d2000d180f7f53776aafa639554cc53 SHA256 d8cea6efce7725cfec993dbc5eae1669b289f4b5fd85fd7f12fcdada0f828773 EBUILD squashfs-tools-4.0.ebuild 1089 RMD160 a80aba63e0cd09dc748ddcfa5211e3051f643397 SHA1 a3fa0234c2d8cc463ff6b49bcdf3607ffab0339b SHA256 8dbc239955176e66eac70075d0e581c0407bfea5b6ed2b4fe0c7e6a81ec78faf -EBUILD squashfs-tools-4.1.ebuild 1519 RMD160 c8a0b82c94fcba38d410e0b598d5aa7de0bd9d39 SHA1 59e2cd35f18c1705f7053ecc4be98cd8780edf81 SHA256 598acc54c2ea5bdcb32af19c5c52b529379a361393061ea2c67867d33afe740c -MISC ChangeLog 11503 RMD160 1b0bf572ed6f0b774c8f683fd06fe3628ff46c95 SHA1 716bc227cc39a288cd5425ce81f7fcbb6ab7dd67 SHA256 a029f91b1d40dd46c4943a15c2f83e63624299112371f3b0565e2d8d74c043bc +EBUILD squashfs-tools-4.1.ebuild 1582 RMD160 bc8eb14fe1d24bd041fc8cabe6354b05268481ae SHA1 cc68fa95ec4ba30666ccbcf714feebff56120325 SHA256 b6483aacec38ae871ff6dd20451975c4572f235e87071c199a43caf7792cad53 +MISC ChangeLog 11686 RMD160 099144c98616234d9e57e7c5058425c8957b79e3 SHA1 7e3f3dfd6e3990a4ccafd5534394f835ed9df57b SHA256 0c479b196022b6b3d3d958afee67f903090080142426787a4332c170d117641e MISC metadata.xml 223 RMD160 43b2b47bbb77575000db614e24a9432af94c34e5 SHA1 9794744a810f817a5abb31e781cc50d727eed5e5 SHA256 81637528b0885afa17c3579bc78faaeb1f0e4c79f9414f0ded76a5954b5d6978 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iF4EAREIAAYFAkyWzMwACgkQTwhj9JtAlp4e3gD+LC9z48F7lLLGX0gqP+reWmgR -y4KSwAWNXn0xp1SuLzoBAMVlBy27g+Jwd5oiysRiBtjG6bRAUCoEhpJDvldbw+RN -=XzC9 +iF4EAREIAAYFAkytLN8ACgkQTwhj9JtAlp6+cgD/TvaZxIAooW3kfcFAWdJuqCgc +gG4XpDzTYu7sChd7EVAA/28ZyAfZXB9exhr4oeXHDEflxv+m2iRYpxqOmm2Dim/h +=FDZB -----END PGP SIGNATURE----- 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 } |