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

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 34 insertions, 11 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/Manifest b/sys-fs/squashfs-tools/Manifest
index a9c0800be1a9..ba841c0e962a 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX squashfs-tools-3.3-posix.patch 1596 SHA256 9e75c5d8aec9c36dd4096347cd258d957903d1c8f6bec36d98654bb42f868ed8 SHA512 6f934c3b20ada2ba689cc791fe5d1eaa570050653049604c50f712df7455aab228e93e3e378740f1d8f67e273dc9f6ebd8784004bd3a6806c3ee675f8efb2630 WHIRLPOOL 957bc352bcb49eb10d8c4ab730a000f2502a5209c75988959415536767d1976a5a6667a81dec2742e6a7927fb31486224f375f47d408b11b888d1a678725490b
 AUX squashfs-tools-4.0-progress-bar.patch 1178 SHA256 c9dcfb9fda91f55bc379e5d55c2fa3f5b869b54a3dd25c80df17157dca6781fa SHA512 9024dfbc8b7a617739af3844fdb7566432c44b43db6650b53a81703e2e6c72711a3551ba0886a25d1aa53074f038db5b9d27140e82e8972e12c1ddedc5eb46d9 WHIRLPOOL 31e7d2f8d8d5353556466ce3d9da4cc958717b9b1b62db92eae03dcd354c5a2a0d6dac77dab63dc3e97b8f87283a6dc0c9d282f323f77481439a665cceb4d966
 AUX squashfs-tools-4.0-read-ret.patch 846 SHA256 ca968e8a2b4d59c1745a2ec1c076b988d675655abd47297bb83a076dfb7fc555 SHA512 5d619bbdebfe5162493bf6866de59cf828e2817a46ba9004527f37be8ac30bcc6f9a86264aeaa83d8649652b765805e1a9350955c817129d2addbe74e05305d2 WHIRLPOOL df3a43b40ade09c0552e26389eb2f0546ddb91749103f6b83fe097a896e4a387a1dfbaff8c4cbe099b5ee59d0c0f7f74ed08917644e737fea49d5f3859ce34a0
+AUX squashfs-tools-4.3_pre20130621-xattr.patch 232 SHA256 106d89efa4715552a4e5ab916c4ce2e7228ad9add9908c9f37068aa42bafbf72 SHA512 6a00288ea270f4e20fd531e65233de1d122b519f81043545b7b653b64d96d227a89fa4200613f7579500dd1bc58a6e3b94f986ead38a6d9c32b649ecffd72d61 WHIRLPOOL 93df5e0373a135299eec0775d949d30f236982996cbaa82dca4e982ddcf655ce93427605f6887e21dc5a317dc06021686180ce1bde27d0e692e686be70c28438
 DIST squashfs-tools-4.2_p20121216.patch.bz2 36444 SHA256 1c5b9e1e6662e9c4fa08aaa990263003f1bf32d5a5656a341ed4d642a0c01fe5 SHA512 e5d9df92631ac58228673d76e7ec062aaff9af61574aff0d29d4c30cf025239685fac045b5ea60dbfb7a68e822dc075e1eae6f3c3ed40a522c5955999f652994 WHIRLPOOL c5ef44d0ee2becdfeb76767b7bc230be68b75454db632257b2d93f7a247e169173ddfd03f66404caf51b66abbddb6bb9e3cfce80c3f873ac8d4ed625e27b620f
 DIST squashfs-tools-4.3_pre20130621.tar.xz 115988 SHA256 aa734ba5d4558e91f21233ad375ab43635fda319b3bd033f1556ecf27cbd503a SHA512 14f91bc512c01b459f764866ac0f5f26e6aea85ebc90e6d86141fa0078264f13bfdf4a2d0e054d0ea028278c14a38affea9342aa01d22bc5e688ace0a8127139 WHIRLPOOL a5f0ee4aa681128ace588f2ef0b2883cd0cb67f724f8930aec1a9ecd03f08c5cc721c6bee03b912c3bf7a403ba424f968ce4d0c0678da4d292212cc3347bd7ce
 DIST squashfs3.2-r2.tar.gz 314764 SHA256 8482465d58d78099c608b32fc034921f7c8c3cf7934b5edc68c463cd450b40a7
@@ -14,13 +15,13 @@ EBUILD squashfs-tools-3.4.ebuild 1101 SHA256 152e87091c76d2312057319cf1f0250154d
 EBUILD squashfs-tools-4.2-r1.ebuild 1469 SHA256 07a7963e89e3785c164f276e42fe5e01e94c7dc255ae34427a9bd7bc7124d452 SHA512 cbd8c215301e0d063f5dcf3049242fd7f2f2c79df17efca71e377dec57605ed21381edcd944474ff21c9da13bcf748242a141947151ffc4b15fb3c142b14671b WHIRLPOOL 297658a6eec918b03040f9a785c9f3f6d1d09484d1328510591c73cb38005469da8ed53b93749be466cf3a70e14a8e29a71576ac03f17c909b23eacc4c9f50c0
 EBUILD squashfs-tools-4.2.ebuild 1396 SHA256 7fed23bab94b6b41c70a7ccb5ab57d22eb8fad9ebe191bade48a292eee2b5d5e SHA512 d2a857c4c7cc04268a906f77afbd82d5f13f4faf42a3a574352a9ee403e8716277499d0fb29bf2caeaa782f5352ad4acbb8bd29ddcb10747f705f61c1a83ba78 WHIRLPOOL c37f0cf29938e081bf01e3badc6a5e41f29af77e6ef33c955af14c54f9c53e187a4ddad22f46782ae86da7feaa166999109546d42cf59ab010ee5a846af31634
 EBUILD squashfs-tools-4.2_p20121216.ebuild 1586 SHA256 e162fcd2728de82f8eb3ec2a52e9c7b00786e07df4e6a982bf964cedfd147458 SHA512 c2b0e229effc88af10319d5179ffe81d2949ed4397513d510fb54611bd7472838e02935b6f53956b51cb3d4f320ea9539be991f9abf530cecac629326330e9ab WHIRLPOOL bd6bb9f5aa282ed8774ff7a9731adc596f8c6b6546b4f62b34f0b5e5a0772ad786159b30e92d83f0a743eb4d56f66ba9791b052682c82a2f520c8bf64fbf163a
-EBUILD squashfs-tools-4.3_pre20130621-r1.ebuild 1420 SHA256 070964550f24c3f8cc596a88c7c9191986269c0ec847fcacb60e036fe2860fb4 SHA512 0d45c38ba84088485528b9093e4209b804d22231fb9356f398a8db6d95d76deeb3515d2e31ae7179e4af7740e33a07605d4508ec95159a4160873f8c20a3d012 WHIRLPOOL fbab6c495ff05864cb231029d1baa73027efdc709d5bb5a9afa8697d1be2777a2d47ff3c0283e966d670f3cb1f895781960fb6fcd825fccd4dd8d2820104c5cd
-MISC ChangeLog 15173 SHA256 2d5cba2be9a96d6fb962c897e316c25815bc38f84be58f6049ec530f9786b65e SHA512 34a82afac36e5f6d728c2d8dbf95de09c4a1a9fab1b66098429f8680a29067de09215d8e8400b32e98e59f983b1739872890ade685e5e1c21e8280189a727c86 WHIRLPOOL da3a675cf3c24ddbcbca55f51be2315e40b571979bc241555ea89db9be67d808aca884a106e49aececcf32094818b1f9d2cf419a61ad186b8e2fb1e3626346fc
-MISC metadata.xml 367 SHA256 1c9ef6e815b084787a2e5e3cd9e678ecc30b4c3b319d4c892c547c4b2153ce35 SHA512 a918792f1052bdc0f1b78c5c1cf8809a019aaa60a44dda5c796fef24f9f806caf6406bbc5d76194cda9b24e2449a952da1ce873063d7b0a85a21d1da1e1dcbda WHIRLPOOL 4842bbf602f229fef186825ff3ea9a48bdd0856143885525b2ad9bb7cb3ff0587b5ed8e14e420f00eefb948525f2afb2f3a75d164ffd62eef2886ff7a32035a1
+EBUILD squashfs-tools-4.3_pre20130621-r2.ebuild 1489 SHA256 18457487be8a3f190d7cca6505297d25b4eabc1b4331e64ac043ca648290e687 SHA512 304a4cc7128eb422ba4032adc2bb29e4af14863762b2fc77cb17188e8b3f8b77562e43027fe7d672aeb882707950a482563f0a2cc71a2021a1a8152a53f01160 WHIRLPOOL d27d1b7128587c17cdd002ae7f50257feb118e17de0c764431982637e7ab287778b33b3f2caed136e73d92572e8e17fe8dcecdb61c7f85e6e1a3f76af19fd2cf
+MISC ChangeLog 15487 SHA256 7d0d4e5b7991d8678128782221f6ef3c1faa2414aa9201e8ce896ee90fd0a027 SHA512 8e880a9ea253d08a45c66220c52e79594ffa5cd064c83cd2c322c08bc6bb0e4a793c85d69a5698a90f8624a868ffbc666c1043430e0a7d07811025a5080e9b33 WHIRLPOOL 9e77b868195c4002d477926ad70e655932edbee3b394dced4f995a7a3b3ca3cbeabe09b19aef8c8f0d61f65313e928e2f6843348b5452f84a4dd01b07a384ed6
+MISC metadata.xml 284 SHA256 f61a80ede0dd7d1044c5112f9e484ab6debc7fbf6bf3da8755e6e30063141622 SHA512 3bc31499e8734e371a5a062f599e4c61be8af09fda0bc5c06827aa50bec7e0349a86f35f200550e531cd9ab519b9370e717b9fc0550efb272d2007924faa6c82 WHIRLPOOL f3644be42c30edfd27e7e4a7e8fab00019939f564b9cbfa8dfe4606cd4004706444b6c12bda7adc1b7148652ad8cc8ba824e3bf5436a8de3b49cf2c61bd01165
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLe4bYACgkQVWmRsqeSphNTeACbBP41oGDgJ0XST85Ubr4UqOFT
-SCQAnjb0XRFxFet1rXzxLw3Ic2Zym+Mh
-=vhVM
+iEYEAREIAAYFAlLe6FUACgkQVWmRsqeSphM5UgCfdI8udZPpCLc6gWRlsjifssE3
+i1gAmQF5gmQgirRku/aqqvr2SupltLM3
+=Qpve
 -----END PGP SIGNATURE-----
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)
 	)