Bump patched 2.0.18

Package-Manager: portage-2.2.15/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x65E309F2189DB0B8

diff --git a/dev-util/catalyst/ChangeLog b/dev-util/catalyst/ChangeLog
index 8ca41254950057c1e452747548f41750127256ec..1deb7179e511709ad5aa041404d8ea49b89dcb87 100644 (file)
--- a/dev-util/catalyst/ChangeLog
+++ b/dev-util/catalyst/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/catalyst
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.275 2015/01/09 05:01:28 dolsen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/ChangeLog,v 1.276 2015/01/30 17:40:20 dolsen Exp $
+
+*catalyst-2.0.18-r1 (30 Jan 2015)
+
+  30 Jan 2015; Brian Dolbec <dolsen@gentoo.org> +catalyst-2.0.18-r1.ebuild,
+  +files/catalyst-2.0.18-Do-notuntarwith--acls.patch:
+  Bump 2.0.18 with the Do-notuntarwith--acls patch.
 
 *catalyst-2.0.18 (09 Jan 2015)
 

diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index ad95eea647cf52e9a5312158200ed4a9049361e1..a9896f0ac09e10a0392207a845f635c835596b71 100644 (file)
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,33 +1,35 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX catalyst-2.0.18-Do-notuntarwith--acls.patch 6156 SHA256 2b8160bba1207cf45412a8133b6ed3b039d6705f76074651b6d42c4488b9bc1e SHA512 500d72f7e11f99eb53275aac3e1b94394826cfa271312ee268092d12a70128b46455c5da1122fb70e21459f56ded3e3ad2752c33516cd3dc4ea4ac70cd0ec32f WHIRLPOOL f348eb0507d9fed5d5e05ba27b4b662fa1fd25e5d87afd886732a45173d2c3b27fee18ad4435c0fdefdb92d6606d0b11a9c54dff459692eff5db3aeb05f2c459
 DIST catalyst-2.0.16.tar.bz2 878929 SHA256 4578cbbc36a5d913b51967faad6feb9b8bb10a04794fe44e73b71790fa389142 SHA512 460ee4c996a7197f2d3e2504ef5ff205c74c0e7ca763a67dc57932a8df6199334fef3b234d90da1717d3f59b36081a29c768a864efa82129cd4f6e2de34ac3a8 WHIRLPOOL e43861bcb7286f85e8d0857d32f4e0ba9f39eea5bae2eac05e0b9e782ee2edad2a8171e1a0ea451c7ee67b21f2210f8ff3f2a9e37c16d16552c6c46e74637233
 DIST catalyst-2.0.17.tar.bz2 861341 SHA256 5f4142598d921e5174ff06f9571856760a324e79db5f3b63caf0d1a16adc813c SHA512 9d7b9ad383dcc5d4ba058596c0b607eb9601b28025d9300f63e68d78cbd5bca8fa3f3e03a81dc6b233021e773ba4301df0bf5cec51ca4368eb3577a68d33a92c WHIRLPOOL e97fc120141cc4f9f5c297652d8b43313780f615429c0eb3d9b85cba40aeca01dcbc6efb0f8d388cc5e7debabb2563cfc9b5a5aa00e3d00d306aed0f799fc642
 DIST catalyst-2.0.18.tar.bz2 861398 SHA256 f3c2583fb8da425a9c57d3a00aac559e6bfde5951f1c7ef30ddf4fa00d6bedbd SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a WHIRLPOOL 73abb541bd9984e26e43dbeee3156ca84104aedfe16a027b97790274aaffa8678a29677da4ada908fe9c2184268eb9c266a8961a5e0681fccc463c47a6d83542
 EBUILD catalyst-2.0.16.ebuild 3155 SHA256 96330cb79d0a318eb8e71c12832b71e06d8f01483fc3042da809caf16c0577f4 SHA512 b2e5438f39a7627d03d79b7062cb039a5b4cb8c9dbef9f836ca7d34e37ed530c95ba4a288e987a06141b7b61f9c928ea95fa425d2bd03a195000189a2a66d8fe WHIRLPOOL 1264383ed4eb1b31fe647c3ec4f7fed5944b76638669f1473d28d2dcfc5bf5fcf04fa032014f11fd4dd1e024c3fd7a57031ffd9f0ce01ef2865e90e96cdf3f31
 EBUILD catalyst-2.0.17.ebuild 3149 SHA256 b764e9f01aa95ed08169775ce267a4fa1edff43903f864934ed37f4685330e2d SHA512 c672617d6325a43d0a1975ee6875d6368b939ee11d374cc5355cc3a2771d6dbd523c0ac02c657161f27bc7ff95821ccbb8ab9682ce88d866458dbaff9af81fdb WHIRLPOOL 4c97e1ccf4749dc019091f477193e426ca6cc3210f6af1b62e357db1fe6b552ef27e05b180fc00058df9ff74e0776d5e82b5e97e0202192b057f996f9c1a3a41
+EBUILD catalyst-2.0.18-r1.ebuild 3259 SHA256 56167d35ff3d7162e7a099ac1d29041f60ce2aa405fad326284266280defba3b SHA512 372a9f67573d3be636ec2aff025ece7aaa70f0840cb22f021f638efd1d025901f593c1fd9a45066eb934ae6d6c1c2002a9abf34af0f279c27d2fff5f14851cdb WHIRLPOOL c980f23f8297a6d982450bc88742aceb7b6a559714f6d2e161a8e3b6766ecf849f0d0987659cfe0ae6bc7c6b1f6e39568ff4712d570db3a44afecc3971f1996f
 EBUILD catalyst-2.0.18.ebuild 3149 SHA256 8abd7949cdd36dd1eabb6cc9a46e01cb87646b436e4a6c7a9ecbc7b9bfa55a70 SHA512 fb2c5ff404a4a8aae5c74da830b1412c09512f70dd0388082e536da92cf9c373024f1e2337defe9f11a4c306d9b900f742b807312f4545602d7b391cad6a513c WHIRLPOOL ac006173d8491763e61644323258319256fcd46bd8be04915434039d686a199d74a140c521646f7e1b85cbcee26441462f0746d2541adbde172cd97947f5942a
 EBUILD catalyst-2.0.9999.ebuild 3056 SHA256 ca0a13dc03a936b54b0e6bfe64122ed653dcb1bc60976ed2612f4b6a305a91b8 SHA512 c6aa7faba3821edba40612b86ecb265339edf466798d297b251dd1af1e4b51e512c769d271fbb714c9ab72ed3dce55cda2462003b5e8ba4b26dbfda7b6cf82cf WHIRLPOOL 285670aa406f7f7f7f73cef9a7950d276429c10a6cb39796ffac369b9d68f4a53a28adf5122fc2bba56916a9b64c3ed7ce7a20994591c97afeed92dfe7dfa5de
 EBUILD catalyst-2.9999.ebuild 1632 SHA256 124adf991b51763910ee64979a9d4c17aa2a742d811648011047798f6d7b2c2b SHA512 54f2232cc559dc07edcc5fae49d27e35feba74d79b0ca88113747293654eac0714b75e8ce89fa2f35fe53638d40cc8d07b8c672dee7e829c306150c3a7f4183b WHIRLPOOL d08748d7864942924aaad5d52aad98119918d492f20716307429d72b5ddad25354ba6b43968ae7a529ff372ed443dd18eaea3b33a40dc641c2b39cf29cd8f750
 EBUILD catalyst-9999.ebuild 1611 SHA256 af96e44b2c122d4f98b268c2da788511faa8308098a7dc8a5261fc9dd3d31050 SHA512 643f4827189b3ef2f56bdfccdd6df2368e51da030e1088e481c358bb9474b4ca7101d597b5429ea998c98b3f41792809037fff82720081e5c51ba93f13581635 WHIRLPOOL a718b1c5d9ca40845e621a9583f63b1e7eda03de2f39ff513df9729bafce8bfd2a37f1aa7d9c172aff3ac4d39aca0211ff972032a7b701192cd970431a830760
-MISC ChangeLog 59005 SHA256 8a733a747319cf7c07342827be5d845f772062b854b95e0a5833928539ee1a0f SHA512 7bd775e682b05a6a39657af93ba2366ab59944c110ba08e1384b36e53b519f8a4aed6fec02bd6d95c074fb693cdef18daae97feb5a80e73f14ce12af45cdd880 WHIRLPOOL fd71c0da1f13abb8468d9f64edfc680e850c619f81953b9120f64bafce1fb98b8365df98e8d95615c39d3c1ed4efe9aa46313d41f07c30d6b410f1e9fe1f2bf2
+MISC ChangeLog 59223 SHA256 fb21426ab766beb60a35fbe6449d67970f66028546646c8962c7fbed55c90c0e SHA512 cb53eb12345fb63a0a3c7bc10af2544154fd74304e1e1fc7170f345c8e29da77efa8b72cc99b330852e022408d4d9a70aa3a52aa19ee34b4341c76ab01e2c987 WHIRLPOOL ae7fb8c7132203871cbe10241bf974b6d4e705c7298ba99b433a21f30dc4f721072bcf78669a00c1f1b72ce4fe07f180c4313592b71e3ddda485ac3c4f2bf7a4
 MISC metadata.xml 302 SHA256 52c8f4e22cff9920c9a11b04ee574b28cd6fbf71a8212259d9d19122e0ddf955 SHA512 bd15682c5b17cde8b9b0ffe4559839eb2419b070659c388a21f3bba6b94d4a3861cbb76328c996c107e5fde9e4e4fd09e1f54d99e6d76df1ef25f1f52e557a2a WHIRLPOOL 5951e4d293d63763c8d1b922b6e7a88b3b8c3db0a3db5cae5bd4457920a8e14c338ff202d5d074e1893facddc8a04b83d83cefd6bd13d65029364d905f2c1450
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUr2CuXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUy8IGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2OUZEQTI0MjY5QzhCNUE3RTlFMjMxRTkw
-MTg2ODIyMzFCOTI2RTRGAAoJEAGGgiMbkm5PzMMQALeoCJOZaIrqJWWSLYThcXTf
-4EdD7gp1WJid4Bx3R3vNgxHnohGnEsl1UEGbhDXtxdFfOBS8WK6PW0SuGd2ZVxGx
-6gRfoTnouUSyW8JDaxe6St5ZN9CgedtBs9JHBTMEpbjmLj4zFdj24xJWaVUK4h8y
-mL6DkZB4hJZpbGLlRxW6XwEnVuW/4W+Pk8qSuvEdgbYNTKEwBMqAXKs9/iiExjIk
-pqz42S/k/wJ+zcGDtVu4AN1sqPqTQC+YtKb4arKu9QiRKd/9tdn1pkI76l//nXEo
-kmFlqhA51To4IAzgGs/2vWuj6gHMrP2IicXyZL/LRo9xw/Y9BeKmfQ+oXPAs4cCm
-G/WerpRg3Sp1yAhUpnR7AVFij/vBCYUxouWmcQtB0WZJRff1b3r3pHp1Rd5Q/7i8
-QJXhz6CSyMTx5GZNfv+F2u2Milh8O3njesCknpy0kA2GGLiPys5/nH5wivZ1c8ZN
-Zq14mfG36FtcAz3mA41gI/f+3E9FrF14rh0bxPlyLzcWvHd0TVZs+dFcY7ZQEoBo
-X/51EzghcU9KeMuuv+hH4xojFj8gM3jQLnePT5KblddQs1g8SjWTP2wv8W7zXu8h
-rVa67png+f13iHS2brvPXWDZzF2252POBoplvCXNbzcUwBz42SGf2DSR/m9kapEp
-tANB2tp1Xe++M8mG2wDU
-=7y4F
+MTg2ODIyMzFCOTI2RTRGAAoJEAGGgiMbkm5PPg4P/in5uJY1biyjm1lEkCIz+hJN
+HbzuCX9hn0pSpV9VuJ0cwdXDwjoay1MMOlWUhbg0JS0OwtxdXb6a+SKiW/Zzclx3
+zbyG6gMDHnsBRC6p3jVhr0zrQDVY6H4Zx6w5k5Y2hw08z5W7olI2njvPX3Ic4kwH
+tgVrov+yzGs8uxh6jrIq3JLKkR0o6r65Rneow2Qo5kqpS3MYNLwdrtNo/dzcLjy8
+2KjOMX31duXFXG+2tq9UwDLni+VMQXdmVlLdgO8XgJGvGCEmH+M1Z1v6oLrhTKKT
+1BcqtLMEicPBHC8ynQVWrskxmvwD4t7xP7ZgJds1wYl1EZ4elWYZtG8LcvU7zegv
+KCiDcVCTyxAcukTB33HdfknO2rfNfQ3zbn4+TwlM3Wz/yEk4/2xQBYGqBqTz5hKB
+Unuqbls8Jry/Y+QBghDLSHosU7CUlXFmG6wP8mBSp4Ln7f3xH05dX5VZev8A76SV
+PQ1igIL6oSYL2vZXBiwnCGryKuhsAtOjdyGC5KSv8hjgFmby85V/PYCFUfaDKEXZ
+PYappqbBdU2y78e42xQhnEUfdAb/DUoZTogCEeSvdeKf/aoVJCF2Ah8mRz59PFVW
+THKXo1+edQLbEhoXQRZLq+Pg5s8wcev7QDx9Fmc3lx/ac2/SlySJzZiA1xGV6PSb
+6NQEYZyOcZAssgdtM2P8
+=4ZBU
 -----END PGP SIGNATURE-----

diff --git a/dev-util/catalyst/catalyst-2.0.18-r1.ebuild b/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
new file mode 100644 (file)
index 0000000..65164ce
--- /dev/null
+++ b/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/catalyst/catalyst-2.0.18-r1.ebuild,v 1.1 2015/01/30 17:40:20 dolsen Exp $
+
+EAPI=5
+
+if [[ ${PV} == *9999* ]]; then
+       SRC_ECLASS="git-2"
+       EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/catalyst.git"
+       EGIT_MASTER="master"
+       SRC_URI=""
+       KEYWORDS=""
+       S="${WORKDIR}/${PN}"
+else
+       SRC_URI="mirror://gentoo/${P}.tar.bz2
+               http://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
+               http://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
+               http://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
+               http://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
+       KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils multilib python-single-r1 ${SRC_ECLASS}
+
+DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
+HOMEPAGE="http://www.gentoo.org/proj/en/releng/catalyst/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ccache kernel_linux"
+
+DEPEND="
+       app-text/asciidoc
+       ${PYTHON_DEPS}
+"
+RDEPEND="
+       app-arch/lbzip2
+       app-crypt/shash
+       virtual/cdrtools
+       amd64? ( >=sys-boot/syslinux-3.72 )
+       ia64? ( sys-fs/dosfstools )
+       x86? ( >=sys-boot/syslinux-3.72 )
+       ccache? ( dev-util/ccache )
+       kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
+       ${PYTHON_DEPS}
+"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+PATCHES=( "${FILESDIR}/catalyst-2.0.18-Do-notuntarwith--acls.patch" )
+
+pkg_setup() {
+       if use ccache ; then
+               einfo "Enabling ccache support for catalyst."
+       else
+               ewarn "By default, ccache support for catalyst is disabled."
+               ewarn "If this is not what you intended,"
+               ewarn "then you should add ccache to your USE."
+       fi
+
+       echo
+       einfo "The template spec files are now installed by default.  You can find"
+       einfo "them under /usr/share/doc/${PF}/examples"
+       einfo "and they are considered to be the authorative source of information"
+       einfo "on catalyst."
+       echo
+
+       python-single-r1_pkg_setup
+}
+
+src_prepare() {
+       epatch $PATCHES
+}
+
+src_install() {
+       insinto /usr/$(get_libdir)/${PN}
+       exeinto /usr/$(get_libdir)/${PN}
+       doexe catalyst || die "copying catalyst"
+
+       if [[ ${PV} == 3.9999* ]]; then
+               doins -r modules files || die "copying files"
+       else
+               doins -r arch modules livecd || die "copying files"
+       fi
+
+       for x in targets/*; do
+               exeinto /usr/$(get_libdir)/${PN}/$x
+               doexe $x/* || die "copying ${x}"
+       done
+
+       # Here is where we actually enable ccache
+       use ccache && \
+               sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \
+                       files/catalyst.conf
+
+       sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
+               files/catalyst.conf
+
+       make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
+       insinto /etc/catalyst
+       doins files/catalyst.conf files/catalystrc || die "copying configuration"
+       insinto /usr/share/doc/${PF}/examples
+       doins examples/* || die
+       dodoc README AUTHORS
+       doman files/catalyst.1 files/catalyst-spec.5
+
+       python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst"
+       python_optimize "${ED}"
+}
+
+pkg_postinst() {
+       einfo "You can find more information about catalyst by checking out the"
+       einfo "catalyst project page at:"
+       einfo "http://www.gentoo.org/proj/en/releng/catalyst/index.xml"
+}

diff --git a/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch b/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch
new file mode 100644 (file)
index 0000000..f4cbcfb
--- /dev/null
+++ b/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch
@@ -0,0 +1,95 @@
+From 45286727a63d16d0688a88bf7cf68289efd26861 Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <blueness@gentoo.org>
+Date: Sun, 18 Jan 2015 22:21:16 -0500
+Subject: [PATCH] Do not untar with --acls, fixes bug #536762
+To: gentoo-catalyst@lists.gentoo.org
+
+---
+ modules/catalyst_support.py     |  6 +++---
+ modules/generic_stage_target.py | 18 +++++++++---------
+ 2 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py
+index 0e9faac..702887d 100644
+--- a/modules/catalyst_support.py
++++ b/modules/catalyst_support.py
+@@ -108,9 +108,9 @@ contents_map={
+       # 'find' is disabled because it requires the source path, which is not
+       # always available
+       #"find"         :[calc_contents,"find %(path)s"],
+-      "tar-tv":[calc_contents,"tar --xattrs --acls tvf %(file)s"],
+-      "tar-tvz":[calc_contents,"tar --xattrs --acls tvzf %(file)s"],
+-      "tar-tvj":[calc_contents,"tar --xattrs --acls -I lbzip2 -tvf %(file)s"],
++      "tar-tv":[calc_contents,"tar --xattrs tvf %(file)s"],
++      "tar-tvz":[calc_contents,"tar --xattrs tvzf %(file)s"],
++      "tar-tvj":[calc_contents,"tar --xattrs -I lbzip2 -tvf %(file)s"],
+       "isoinfo-l":[calc_contents,"isoinfo -l -i %(file)s"],
+       # isoinfo-f should be a last resort only
+       "isoinfo-f":[calc_contents,"isoinfo -f -i %(file)s"],
+diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
+index c7db027..cc24c63 100644
+--- a/modules/generic_stage_target.py
++++ b/modules/generic_stage_target.py
+@@ -660,10 +660,10 @@ class generic_stage_target(generic_target):
+                                       self.settings["chroot_path"]+\
+                                               " (This may take some time) ...\n"
+                               if "bz2" == self.settings["chroot_path"][-3:]:
+-                                      unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
++                                      unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+                                               self.settings["chroot_path"]
+                               else:
+-                                      unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
++                                      unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+                                               self.settings["chroot_path"]
+                               error_msg="Tarball extraction of "+\
+                                       self.settings["source_path"]+" to "+\
+@@ -675,10 +675,10 @@ class generic_stage_target(generic_target):
+                               self.settings["chroot_path"]+\
+                               " (This may take some time) ...\n"
+                       if "bz2" == self.settings["chroot_path"][-3:]:
+-                              unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
++                              unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+                                       self.settings["chroot_path"]
+                       else:
+-                              unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags  --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
++                              unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+                                       self.settings["chroot_path"]
+                       error_msg="Tarball extraction of "+self.settings["source_path"]+\
+                               " to "+self.settings["chroot_path"]+" failed."
+@@ -777,9 +777,9 @@ class generic_stage_target(generic_target):
+                               "catalyst-hash")
+                       destdir=self.settings["snapshot_cache_path"]
+                       if "bz2" == self.settings["chroot_path"][-3:]:
+-                              unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
++                              unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
+                       else:
+-                              unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir
++                              unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir
+                       unpack_errmsg="Error unpacking snapshot"
+                       cleanup_msg="Cleaning up invalid snapshot cache at \n\t"+\
+                               self.settings["snapshot_cache_path"]+\
+@@ -796,10 +796,10 @@ class generic_stage_target(generic_target):
+                       cleanup_msg=\
+                               "Cleaning up existing portage tree (This can take a long time)..."
+                       if "bz2" == self.settings["chroot_path"][-3:]:
+-                              unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
++                              unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
+                                       self.settings["chroot_path"]+"/usr"
+                       else:
+-                              unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\
++                              unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\
+                                       self.settings["chroot_path"]+"/usr"
+                       unpack_errmsg="Error unpacking snapshot"
+ 
+@@ -1224,7 +1224,7 @@ class generic_stage_target(generic_target):
+ 
+                       print "Creating stage tarball..."
+ 
+-                      cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\
++                      cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\
+                               self.settings["stage_path"]+" .",\
+                               "Couldn't create stage tarball",env=self.env)
+ 
+-- 
+2.2.2
+