Add USE=xattr and corresponding deps.

Package-Manager: portage-2.2.0_alpha79_p44/cvs/Linux i686

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 957e45214900b8ebefd3bcaaec77c69016ca9fc3..5d3d735bce932698c3748c0b9af806867a3dd1fd 100644 (file)
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.923 2011/12/09 20:29:45 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.924 2011/12/10 00:50:04 zmedico Exp $
+
+  10 Dec 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
+  Add USE=xattr and corresponding deps.
 
   09 Dec 2011; Zac Medico <zmedico@gentoo.org> portage-9999.ebuild:
   Adjust SYNC in make.globals for prefix installs.

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 847b8b66ecdda0c299acb0242914daefdd3d3f1e..721a83762b887cd3cf8b73418ba307dfe689a392 100644 (file)
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -19,13 +19,13 @@ EBUILD portage-2.1.6.7.ebuild 8574 RMD160 b7d3514fa7042b756c3b9d4bb91f5c696abd27
 EBUILD portage-2.1.9.42.ebuild 10122 RMD160 04081079c4b31d0a17fec1baae9707ded83adfd9 SHA1 ad9bcaa30ad2dd93f0b92e61161e9d19fdb5f317 SHA256 29a246ddf895613410c30e9d1f43ee123e852b21b19904dfd053c563648b7cc9
 EBUILD portage-2.2.0_alpha51.ebuild 12569 RMD160 06fd93ba44e0477a2caaead573621adead90db63 SHA1 13c52b8df1b6cb30e8ef8ad1586c16393e515a27 SHA256 58a0b18d8cb971504b34c3666ceb09536ad91bc6f29f6aa02443eaa76f6c0691
 EBUILD portage-2.2.0_alpha79.ebuild 12669 RMD160 09b7a25498b5d366ca147fc2329cb418687e2dc7 SHA1 2fd323dc6f3008f9c50e3883527f249b7e731cbd SHA256 0ef068435e4baf492472415f181071ae4edb3ca1e1f0bcf55e51f7da0cc523fb
-EBUILD portage-9999.ebuild 12707 RMD160 8e9b95d0045bae2e542d22b06f91e30a0dcba2b7 SHA1 881e1a5a4df73beb0a21bedfaf2fd3588d45cc78 SHA256 028c4299387e94773aaaec02a1a866ae7d2b76bce530e76595e460232e10b416
-MISC ChangeLog 68648 RMD160 f1bb557131f5681fe40aca4f8c1a01fb891c248a SHA1 99b6214aeffa8ae31b196e8ae3018fbafc81aa1f SHA256 0b54ea730b362670e5fba5ea41b720d0eba050297c5064876cdf1551aabad682
+EBUILD portage-9999.ebuild 13300 RMD160 0bdd88729023a60508f8fc6b9146154ecb698047 SHA1 b2ed9f06ee2c27d3140b9acc529d91eb75890bb9 SHA256 60594df6eb12649f220b02336a61efa6df8d201fefa5c7cb88720085241e1270
+MISC ChangeLog 68757 RMD160 3a0c55f73ff83a5d19627a87247ba3abad2e01e5 SHA1 c4fd6f3db1bfea9a08e2cb24df1dbcf86c361238 SHA256 396ba58cbcbceeacb89e5cc507cda615352ece4213aa79c184afac270144b273
 MISC metadata.xml 859 RMD160 e1a193ff07810cbcb5c7b3678164d3339187dc1c SHA1 b3edbe35c41d34ada1a2284e47d4e7019546486a SHA256 da1fb9571919aa3b23bea0879a4fb6fee69c97a77a7097d5fbbd2fb04169f57f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7ib78ACgkQ/ejvha5XGaPCkQCfeu7psBEK630LbHnqqwEgTHuc
-O4MAn1tTP62Htougjs0NpclGg33N7PKX
-=FGU5
+iEYEARECAAYFAk7irMIACgkQ/ejvha5XGaPrywCfYaAsC4dMKywhgFx30R8po6Yv
+mtgAoOwRWCd99Wxrf01soWgwSLRvijqS
+=0zd5
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index e24eb0079cdb6a1f311714e5004efe2a48a649e4..581c5248d41d61b0a1a5f998a8ff4416b9eacdcd 100644 (file)
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.37 2011/12/09 20:29:45 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-9999.ebuild,v 1.38 2011/12/10 00:50:04 zmedico Exp $
 
 EAPI=3
 inherit git-2 eutils multilib python
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
 LICENSE="GPL-2"
 KEYWORDS=""
 SLOT="0"
-IUSE="build doc epydoc +ipc python2 python3 selinux"
+IUSE="build doc epydoc +ipc python2 python3 selinux xattr"
 
 # Import of the io module in python-2.6 raises ImportError for the
 # thread module if threading is disabled.
@@ -27,6 +27,10 @@ DEPEND="${python_dep}
        doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
        epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
 # Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
 RDEPEND="${python_dep}
        !build? ( >=sys-apps/sed-4.0.5
                >=app-shells/bash-3.2_p17
@@ -35,6 +39,7 @@ RDEPEND="${python_dep}
        elibc_glibc? ( >=sys-apps/sandbox-2.2 )
        elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
        >=app-misc/pax-utils-0.1.17
+       xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) )
        selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
        !<app-shells/bash-3.2_p17
        !<app-admin/logrotate-3.8.0"
@@ -118,6 +123,12 @@ src_prepare() {
                        die "failed to patch AbstractEbuildProcess.py"
        fi
 
+       if use xattr && use kernel_linux ; then
+               einfo "Adding FEATURES=xattr to make.globals ..."
+               echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+                       || die "failed to append to make.globals"
+       fi
+
        if use python3; then
                einfo "Converting shebangs for python3..."
                python_convert_shebangs -r 3 .