Fix USE=-xattr properly. Restore old USE flag behaviour.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 27 insertions, 5 deletions

diff --git a/sys-fs/squashfs-tools/ChangeLog b/sys-fs/squashfs-tools/ChangeLog
index 6ad290a3198b..71ee5f36cd80 100644
--- a/sys-fs/squashfs-tools/ChangeLog
+++ b/sys-fs/squashfs-tools/ChangeLog
@@ -1,6 +1,14 @@
 # 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.93 2014/01/21 21:08:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/ChangeLog,v 1.94 2014/01/21 21:36:20 jer Exp $
+
+*squashfs-tools-4.3_pre20130621-r2 (21 Jan 2014)
+
+  21 Jan 2014; Jeroen Roovers <jer@gentoo.org>
+  -squashfs-tools-4.3_pre20130621-r1.ebuild,
+  +squashfs-tools-4.3_pre20130621-r2.ebuild,
+  +files/squashfs-tools-4.3_pre20130621-xattr.patch, metadata.xml:
+  Fix USE=-xattr properly. Restore old USE flag behaviour.
 
   21 Jan 2014; Jeroen Roovers <jer@gentoo.org>
   squashfs-tools-4.3_pre20130621-r1.ebuild, metadata.xml:
diff --git a/sys-fs/squashfs-tools/files/squashfs-tools-4.3_pre20130621-xattr.patch b/sys-fs/squashfs-tools/files/squashfs-tools-4.3_pre20130621-xattr.patch
new file mode 100644
index 000000000000..5d9731a39bb6
--- /dev/null
+++ b/sys-fs/squashfs-tools/files/squashfs-tools-4.3_pre20130621-xattr.patch
@@ -0,0 +1,11 @@
+--- a/xattr.h
++++ b/xattr.h
+@@ -124,7 +124,7 @@
+ }
+ 
+ 
+-static inline struct xattr_list *get_xattr(int i, unsigned int *count, int)
++static inline struct xattr_list *get_xattr(int i, unsigned int *count, int j)
+ {
+ 	return NULL;
+ }
diff --git a/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml
index 9e80c3b2e3ea..e1c66a45635b 100644
--- a/sys-fs/squashfs-tools/metadata.xml
+++ b/sys-fs/squashfs-tools/metadata.xml
@@ -4,6 +4,5 @@
   <herd>livecd</herd>
   <use>
     <flag name="xz">Enable support for XZ ("LZMA2") compression using <pkg>app-arch/xz-utils</pkg></flag>
-    <flag name="xattr">Enable (re)storing of extended attributes by default</flag>
   </use>
 </pkgmetadata>
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_pre20130621-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_pre20130621-r2.ebuild
index 88c2116f27b6..0dd437b19fce 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3_pre20130621-r1.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3_pre20130621-r2.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-r1.ebuild,v 1.2 2014/01/21 21:08:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/squashfs-tools/squashfs-tools-4.3_pre20130621-r2.ebuild,v 1.1 2014/01/21 21:36:20 jer Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE="+xz lzma lzo xattr"
 
 RDEPEND="
-	sys-apps/attr
+	xattr? ( sys-apps/attr )
 	sys-libs/zlib
 	!xz? ( !lzo? ( sys-libs/zlib ) )
 	lzma? ( app-arch/xz-utils )
@@ -27,12 +27,16 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${P}/squashfs-tools"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-xattr.patch
+}
+
 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 xattr XATTR_SUPPORT= XATTR_SUPPORT= 1 0)
 		$(usex xz XZ_SUPPORT= XZ_SUPPORT= 1 0)
 	)