| 1 |
vapier 10/10/07 02:15:09 |
| 2 |
|
| 3 |
Modified: squashfs-tools-4.1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix by Martin Väth for IUSE=xattr handling #338671, and clean up general handling of the USE flags. |
| 6 |
|
| 7 |
(Portage version: 2.2_rc86/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 sys-fs/squashfs-tools/squashfs-tools-4.1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.1.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.1.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.1.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: squashfs-tools-4.1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.1.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- squashfs-tools-4.1.ebuild 20 Sep 2010 02:54:19 -0000 1.1 |
| 23 |
+++ squashfs-tools-4.1.ebuild 7 Oct 2010 02:15:09 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2010 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $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 $ |
| 28 |
+# $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 $ |
| 29 |
|
| 30 |
EAPI="2" |
| 31 |
|
| 32 |
@@ -19,7 +19,8 @@ |
| 33 |
RDEPEND="gzip? ( sys-libs/zlib ) |
| 34 |
lzma? ( app-arch/xz-utils ) |
| 35 |
lzo? ( dev-libs/lzo ) |
| 36 |
- !lzma? ( !lzo? ( sys-libs/zlib ) )" |
| 37 |
+ !lzma? ( !lzo? ( sys-libs/zlib ) ) |
| 38 |
+ xattr? ( sys-apps/attr )" |
| 39 |
DEPEND="${RDEPEND}" |
| 40 |
|
| 41 |
S=${WORKDIR}/squashfs${MY_PV}/squashfs-tools |
| 42 |
@@ -31,14 +32,20 @@ |
| 43 |
Makefile || die |
| 44 |
} |
| 45 |
|
| 46 |
+use_sed() { |
| 47 |
+ local u=$1 s="${2:-`echo $1 | tr '[:lower:]' '[:upper:]'`}_SUPPORT" |
| 48 |
+ printf '/^#?%s =/%s\n' "${s}" \ |
| 49 |
+ "$(use $u && echo s:.*:${s}=1: || echo d)" |
| 50 |
+} |
| 51 |
src_configure() { |
| 52 |
tc-export CC |
| 53 |
local def=`usev gzip || usev lzma || usev lzo || echo gzip` |
| 54 |
sed -i -r \ |
| 55 |
-e "/^COMP_DEFAULT =/s:=.*:= ${def}:" \ |
| 56 |
- -e "/^#?GZIP_SUPPORT =/`use gzip && echo s:.*:GZIP_SUPPORT=1: || echo d`" \ |
| 57 |
- -e "/^#?XZ_SUPPORT =/`use lzma && echo s:.*:XZ_SUPPORT=1: || echo d`" \ |
| 58 |
- -e "/^#?LZO_SUPPORT =/`use lzo && echo s:.*:LZO_SUPPORT=1 :|| echo d`" \ |
| 59 |
+ -e "$(use_sed gzip)" \ |
| 60 |
+ -e "$(use_sed lzma xz)" \ |
| 61 |
+ -e "$(use_sed lzo)" \ |
| 62 |
+ -e "$(use_sed xattr)" \ |
| 63 |
Makefile || die |
| 64 |
} |
| 65 |
|
| 66 |
|
| 67 |
|
| 68 |
|
| 69 |
1.71 sys-fs/squashfs-tools/ChangeLog |
| 70 |
|
| 71 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/squashfs-tools/ChangeLog?rev=1.71&view=markup |
| 72 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/squashfs-tools/ChangeLog?rev=1.71&content-type=text/plain |
| 73 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/squashfs-tools/ChangeLog?r1=1.70&r2=1.71 |
| 74 |
|
| 75 |
Index: ChangeLog |
| 76 |
=================================================================== |
| 77 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v |
| 78 |
retrieving revision 1.70 |
| 79 |
retrieving revision 1.71 |
| 80 |
diff -u -r1.70 -r1.71 |
| 81 |
--- ChangeLog 20 Sep 2010 02:54:19 -0000 1.70 |
| 82 |
+++ ChangeLog 7 Oct 2010 02:15:09 -0000 1.71 |
| 83 |
@@ -1,6 +1,10 @@ |
| 84 |
# ChangeLog for sys-fs/squashfs-tools |
| 85 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 86 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.70 2010/09/20 02:54:19 vapier Exp $ |
| 87 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.71 2010/10/07 02:15:09 vapier Exp $ |
| 88 |
+ |
| 89 |
+ 07 Oct 2010; Mike Frysinger <vapier@g.o> squashfs-tools-4.1.ebuild: |
| 90 |
+ Fix by Martin Väth for IUSE=xattr handling #338671, and clean up general |
| 91 |
+ handling of the USE flags. |
| 92 |
|
| 93 |
*squashfs-tools-4.1 (20 Sep 2010) |
Archives