Fix USE=-xattr. Drop the horrible use_sed in favour of usex.

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

3 files changed, 26 insertions, 33 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/Manifest b/sys-fs/squashfs-tools/Manifest
index ed6588f2a067..253b6b622178 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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
@@ -14,23 +14,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.ebuild 1458 SHA256 9dde48030c07cd23c9061bac7d1d2df4bdf68b629e3d2b89812b77de364eb970 SHA512 7048316f28fb047102e22dfd034295497761081d4107c41160be093a34d2ac8682257af6965d1091cd59e2748a4eee7b05627daa0c26b73a1e0f7867c6b66e57 WHIRLPOOL 723745cd3d349d654ca3cad1a5f774b7d1f40570a88fabe02707bc2fdf08b44bbfbf6263a756416d23a6f464bfdf4cbdc1e47bbb6541642d32c0800e917c2858
-MISC ChangeLog 14743 SHA256 bb969bae947e1ab43d7ab12ab09304a8e5a640aeb5b4ac98b5030040a219753f SHA512 57ec11f88c7b2162e7819b664c44f16a6f00dbef291dafa3e434d1ed9d13c52777ee2fda4893e7059dc59027b282a12ae3ab8d9f563106feeba435072c043be9 WHIRLPOOL faf3bfddb0f3c9c7cd760308c15767b52b43cbec6cf9a4af89c911185c05a1f6b684971532f7e5aee173508983a0914e371cf425893e74e73b25501b3ea607af
+EBUILD squashfs-tools-4.3_pre20130621-r1.ebuild 1430 SHA256 bed7de92f8951ed13642ce0d02868b41fbe555dcdc2216ecf8b4eb630b62ec46 SHA512 de9df1888563f8a7e919a70e0f92db5fd0cacae5d47df9634fba3d1308b5de47c667128d90c13569cd9366c20814d6692a76825a7af7dd814021d870a198b9a1 WHIRLPOOL 5a68d0879ae0e4b71426f587d690e1748163827fc43d37f81a1e18230ec22e614f99ae0a672d44d17e0a95a212582feab53b10e5603adafb86a3efc9a3871f49
+MISC ChangeLog 14990 SHA256 1a46c3efa80f40b0fc5ef6d7ee6144b5a3632157d5451813e80b7c53d6ce686b SHA512 6d7a741e9a42c2da926883c6dff3dc4b73d5fb28a7380d8dcb8b2948ef3e45d27e0082e72f23ed54cee06124519fe7e74a6237df6a51931fcfeb67e4aab6c3ca WHIRLPOOL 90eb6786623879d75ded127b6bf6defc657a81e70ced8189d46f46976106ecd8a70e2d4b1dadcf9988413f3bbf9299c812a399ab991e684a83ea6e6819db3708
 MISC metadata.xml 284 SHA256 f61a80ede0dd7d1044c5112f9e484ab6debc7fbf6bf3da8755e6e30063141622 SHA512 3bc31499e8734e371a5a062f599e4c61be8af09fda0bc5c06827aa50bec7e0349a86f35f200550e531cd9ab519b9370e717b9fc0550efb272d2007924faa6c82 WHIRLPOOL f3644be42c30edfd27e7e4a7e8fab00019939f564b9cbfa8dfe4606cd4004706444b6c12bda7adc1b7148652ad8cc8ba824e3bf5436a8de3b49cf2c61bd01165
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJS3ksuAAoJELnU8jG9FVirfrgP/i/eWj7kG5M9ol+Hpz2Q+GWD
-eZdeB4CbOAX34xRhTE98MGO7dBS9q7lW1oPoOjAB5U+COIuUOUFZkP48ixFhPCwk
-r8WkWvuoJanZnrCgeEadAoEC7MbPwWGnZffnGCO2pbXMR/8Le/hcQ2Qs1Pu7XZ6o
-4HriY9iHkL0Q27TOrxp53rZ56M7w8sE/pN5WB5rCcD+gWraB4YYD3WiwE8bmaiIa
-JQL5e6y3R0HmjePaOjlTc6eQGpMCNdlv9B6BXGrU1njXZJ7DW4+aG9bkP/GP5Fez
-rwTos6ukQtFhM5BwrUUv2NSEMvZh5r+TfxakVARyvkL8yE4ha8VDrNDYWJhKrvvM
-GaZriNj0E7iog/sN3EUg/WXuaAeCvkXHSNVQymfaet7t+l/SY0gVjRDB42S0xNQ8
-sS+abmq/e6Kf2BYVHGudsB2JTtkUrbd/rfrOUolVtsqcKVkVGXp9PmXuS1BfNFQG
-5HVhwU06tfCIt7LO3o/3Raot80F2LiRxlP+uAsTyTZ9UJxRnBBif78mxmxiIt1oc
-IdiPYhf6GVV7IIJjZaN+v/5mFiddC3QOI6Wa041hiDAh4VlCx4Ias6AdA5VULYuH
-V7aeiQbiHqyYcVR4Z1k9Caxhu+30XMQkWmcs8qRwpoPpUiBFzGTvz/2sZZt1XyB6
-/lgF6RRCtWIpQWD1DuMM
-=ifK0
+iEYEAREIAAYFAlLe33IACgkQVWmRsqeSphOT5wCfRYDVTGGZmg601BKDznAD7RFs
+TkUAnR66hK6pU0Mh6qeK+UbcJcRuhPRL
+=aUIv
 -----END PGP SIGNATURE-----
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() {