Use python-single-r1. Add missing PYTHON_REQUIRED_USE and PYTHON_USEDEPs. Set PYTHON_REQ_USE for waf.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

4 files changed, 45 insertions, 36 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 783ae12eeb71..c8a57136c7d1 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.704 2015/01/03 18:44:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.705 2015/01/03 19:54:54 mgorny Exp $
+
+  03 Jan 2015; Michał Górny <mgorny@gentoo.org> samba-4.0.23.ebuild,
+  samba-4.1.14.ebuild:
+  Use python-single-r1. Add missing PYTHON_REQUIRED_USE and PYTHON_USEDEPs. Set
+  PYTHON_REQ_USE for waf.
 
   03 Jan 2015; Michał Górny <mgorny@gentoo.org> -samba-4.0.22.ebuild,
   -samba-4.1.13.ebuild:
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 9c33bdb524e4..38f833c9b4d6 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -54,27 +54,27 @@ EBUILD samba-3.5.21.ebuild 12311 SHA256 2a849451f886614315680b28b944840d1c670a2b
 EBUILD samba-3.5.22.ebuild 12309 SHA256 dc195567858dc0c11b2b86fc42427e1066c5efeef29bfe047bdbac413a62007d SHA512 82125fe1d5ba33f57ca06e513090eb0f2cedcda3242773b8734b4b0a18c68ab12f9149651908ddffbe3b2687b9876491a6cbbee7dc4f1e0584a5eef218ff8a57 WHIRLPOOL 9e87a5fb631fd519c2fc89da8a1a591fc9a4eb58eee63052f09321a6f115dbd82e8dd383843b6e6feffe68edaacb4de5c6ba6e9e66a098fa0cddc480988776c8
 EBUILD samba-3.6.23-r1.ebuild 13522 SHA256 3e4452a67d2a2ce512de937a3c1dd14ca96a77e7c83bde3aa1f7f43e280d99f9 SHA512 9fdf54f62f0ff4a069ba754ffd10505de2d8cfac84ee29abbe0ba5d10773aa5e34b8b19799f0892009ad3f5e5547811be7cde06537c8a4c4ff7f4862c6c3e5a3 WHIRLPOOL 5ea53b769dbee0ddb373d566ad2ee187f5f213c9ff42ff3b83aa3c064f3d58e4aec4fce8025952834fd76c74713377fa50835dc1414ba36992e16bd9d9077b4e
 EBUILD samba-3.6.24.ebuild 13517 SHA256 34686659fa4f283611d0469bf778aed6160a79100745dee23e05f14a13021db8 SHA512 3a614416b770a1ff19e1ccf604b2b6e7a8777c73cf662ddd9606e34125187a5e681774ee496b5de44f36e99973c906da019fbec6a17534859972884c3be1618c WHIRLPOOL 78dca5f9e07afb61308b40a3da1a6fcfea80969d6f08098b2b66bd5fceb4d84f77d8fcb939e0fcf64c94efa43640c973b01b416f191e17011d2fb9c8de584ebd
-EBUILD samba-4.0.23.ebuild 4756 SHA256 1d7cead76a54c2dbdb406a1f3a124406a1b37393aefac081602f7f9cc5c7a8e7 SHA512 0bf396d8089cc98f3419775246db482bd8ab4da300064471e3a7fba95bbd6eb678e5929f07b074a33c81301e60776a21888968acc799e3558ab0c9721c872d6f WHIRLPOOL 688a81ff0ec14c09f54e85bcad1415fc8760ae0f0275d67f79d37fbb51c9c9e97c989cfb9729dcdb2607826b7f54f1270495e36c05d38d7f76ca2cce25df0e64
-EBUILD samba-4.1.14.ebuild 4793 SHA256 136952154b5f16735bebcdb7e4636079d46c3b49c0287d70950148c7d87cb084 SHA512 3c88ab57fed4c13f188c1301f41ceb88a423690c2220f4db98ae29070fcf02dfbb37d76f28f19b8fa5bc97228388ac5d72f3170c890237e2da398c0eb3b80e04 WHIRLPOOL e605ef7a9d9b1ec8f771faf6270add767e261df68fe22c07a9dbb18c5d3ca9db99d1aab29fd44880fc98c1aa0cc7991e75ba42976f59d46627b77d63777016c4
-MISC ChangeLog 8684 SHA256 552b75bbe271365d856a6725805f7b4c4b1b71792ac2898d3ac78bb503f0ee73 SHA512 8d4777a7283cd01ee6004097c5cf6f93c26546288539b5dbace494319979a8ddcfd1ad0d42ab3b37566b33c2b2b27a8050af26f5b2f40fd7fa1872045edf6934 WHIRLPOOL e9ed400d1f04994d34ff9cd12a2c903e3a8d2ca7f888efe798802a9ac0905e7d388a5f2ad2546d375929894486f5e72b9959fb05f4e5cb78b5407ad8fd75a590
+EBUILD samba-4.0.23.ebuild 4865 SHA256 dead19aa152bf9f217914618bdbb1b0a5d1a7357cf5a655496e5c7439fa73c22 SHA512 0b58d4826b29d158901985396c11ce0cf545fbfd43fb4bf5b80a43afff3427707bfecd59585f7f15bce8677ef0fc8dd6176f12cc210c831efb6d2a78f3521c0e WHIRLPOOL 7d49a8459b97f3370b32b12c85e0e026cbf5baa62ea15e6a6cfde6b180f59d32f3407186e46fcc1596c62248744b789671e09477b478f84554c15ef846028207
+EBUILD samba-4.1.14.ebuild 4925 SHA256 8be0a03d5e6f0668ba2eee46673873630645b22d188f9c36616d535c73617d3c SHA512 c86b90d949120df62aedfbb8f4ef9dda7da22c78214557b4daf537b096cd32e76b94e86617ebbd4ef6000970778ecd9378c6e5bb328032ec0f670e739ea88d16 WHIRLPOOL b65f7ca5de7403de17e8aa302cbd2bf515ce74381ae1d484bf418bfe01092ce7dd9397f486521adb6b8c09f999c932ebfb48ad0129da35d4d2d9bab00ff84918
+MISC ChangeLog 8885 SHA256 02215fa2e9ea82e83626c4c3ffc0c994f849c6a0ac30e22ad68abfdcebd53b79 SHA512 959ac86d37f019afe11d2975a251791a47cacd84410a0494da757e08075bed7c753b725f2de9eee7c3c005b0fc8ece20dd08ba1294bc1b2f22367bd0f8bef679 WHIRLPOOL 9519bf9674894c3f0f94f11abe175aa5a96723b74b351ecc8e000d0bd290c825229049f0b80b789829d0680322a62257a9ae33df0fb4769a1b80dfc3b5ddf849
 MISC ChangeLog-2013 106689 SHA256 00ac832a137c7ce1d21be794b45339e1f4e9c51eb1b796cbcac90a03e1cf5453 SHA512 9dc4e4e22042db7f5ff3a474eb7a454044ea6958ffc3ba5c5de6f09608cfbbcaed8db00763a38995276de03a5f1c728fc783d4addaca7da16f4be76a4e49fd6f WHIRLPOOL 85a746ae34c0386ecb151f5f323b92615cce971b1e46f249cccfdc682bdddd7dad080dd4ffbe5748f093ee11db3f5182cae6d85191a37014639a56040eff9644
 MISC metadata.xml 1514 SHA256 c10deb71703017ec67f4e5bac297d9b4581fec3d8b5549b6aea2a43bda642bc0 SHA512 9e67e8f7e0c972046e32bf4539142559c24183d6c3469e5af2f901728a3c02a9fbfd50e948a9fd414107fd0cb2a8de709ffe3fc5bf3372c77a4a3db6dc622ecc WHIRLPOOL ec92ea6a1b03e70c791670e97e7d9e07e6bdb82c24ed08c186e786afcd009ab63fbee7d481a4cdc394632ad312e58a2048dae3ff333f6f7a1ad19add55e2c8f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUqDiaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUqEkRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZODngP/10pHkkkph/3meCrhTlXbO/J
-tqkqceH3hKQRhd6kB5gKryqUuYxJPPGBqMdxR5izLcqNpOvcNNSYHBI/G204H6D7
-joN0mG5USigcFJzWb619CUfErdUFhy8v+0+fv1Ur3beaVV7eDlL2O5o5je3YZg87
-SWYWERIPJiCAmiPdXoEVaNHwRckfPCG70iLWhL+Cgggkj0QZJBxViHCd6domB62E
-TMw5cOdEydzddcrRaqxgVstrNmPay3BEFpZZKoSEYQBn6ut2MBtrGGfbXBB4B5v9
-us2XZsmtYInhuQuoFfFckjlhr8/2Lk9JNeuDoZXjzYbn137QUHIkoAX0vJo5nOar
-V2dWu/HYd9u/e4QmNKwBVKDEBS5nEbHzlFS49BFHMHAu6Is9vgE2MVkh8wIcSTSl
-rfD+wrwLPtTc39aKkSqiauTX7UHhs/RKQ7RqwTU3E4PPAmDzWrK0s0ETRqBnI6dG
-7u7+rtqSMEKUaXBvLiq7BP9H0K/wy06AC0hU5nHOSgfKmgMajb9j+xAkVoPY7T/I
-fwlobx5MQMQXVuvH1f7oXp+OaGs8gjOTdD7PbsoISmhDlG6QETPmaG4q6aarD4aX
-3NY+XiHSEjjacHvqe8W0t4blQbOeZxhT3Du28lHcCHl6RkAPvWyRKnw43ra7f0A9
-gFqmDm96Hj0jSuh5wGy+
-=vi/V
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO+3gP/0akonYPv1O3N7c4hYJnh3hH
+d4h8dOcrSF1sW/YLK0Unm6iwtGPWPWR2E/WFciakoyeaLN6ZP8AkxjdWn7ZJnrG7
+POfPWCuqvqFVCqCWLzHtwzMYE8Ym8tm/PkcgrZSiIi0kDjlWXLbqEZ9rbfHsa02A
+sn26M23V/H9gd2bN2JHZdwsYPSeif/MajsldIl6VS/Z18jiDV5rWL5/vodIdmWI2
+Y/too4UYVs0ziXqwt3CAJXHHmYrr8Mt75j3wh1Uf1iiEOzsC6Cy97aIR0XEIzP6x
+ReyVdbwsHfRfpwyUE8NCTtS/qpKzecih3zPkHFedpIjKKPl8BkAQDbFT1uHEjPR5
+7e1FJqdS6jbnF55o4GMWLp4YwVgkxP6sS8zib4rI4AfMyLwYvsrtFzSQBR42bsOK
+WLwzR81A/D0LnWilFl+wu0lled0KaahEocJ8CoWoOLMS0uq8ZyaR27nySvS/PPyH
+KN/6v0c7qtLo+oUSvgReDqOiBxz9WkcLhcqiIvLaFErT3aGOKe0IqVOoY6qnoeRM
+IONSwd+6buR1V3yh/zDXiiOwKvbgpJSXJj0GqPbW7ymtqXPYC7V+SuhuPKBrVBaC
+ZF+OR5OFjmRfIeKlWPuEgKN6uoHBAXVqi+GzG2dW1uPdU/yRb0VhwJj28Vf6vT1s
+4nDXwSviJFUntFkKEYhg
+=qv/F
 -----END PGP SIGNATURE-----
diff --git a/net-fs/samba/samba-4.0.23.ebuild b/net-fs/samba/samba-4.0.23.ebuild
index 497eb27e6de2..9fba5f51feab 100644
--- a/net-fs/samba/samba-4.0.23.ebuild
+++ b/net-fs/samba/samba-4.0.23.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.23.ebuild,v 1.1 2014/12/16 14:00:40 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.23.ebuild,v 1.2 2015/01/03 19:54:54 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
 
-inherit python-r1 waf-utils multilib linux-info systemd
+inherit python-single-r1 waf-utils multilib linux-info systemd
 
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
@@ -36,12 +37,12 @@ CDEPEND="${PYTHON_DEPS}
 	dev-libs/popt
 	sys-libs/readline
 	virtual/libiconv
-	dev-python/subunit
+	dev-python/subunit[${PYTHON_USEDEP}]
 	sys-apps/attr
 	sys-libs/libcap
 	>=sys-libs/ldb-1.1.16
-	>=sys-libs/tdb-1.2.11[python]
-	>=sys-libs/talloc-2.0.8[python]
+	>=sys-libs/tdb-1.2.11[python,${PYTHON_USEDEP}]
+	>=sys-libs/talloc-2.0.8[python,${PYTHON_USEDEP}]
 	>=sys-libs/tevent-0.9.18
 	sys-libs/zlib
 	virtual/pam
@@ -62,7 +63,8 @@ RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-samba )
 "
 
-REQUIRED_USE="ads? ( acl ldap )"
+REQUIRED_USE="ads? ( acl ldap )
+	${PYTHON_REQUIRED_USE}"
 
 RESTRICT="mirror"
 
@@ -79,7 +81,7 @@ PATCHES=(
 WAF_BINARY="${S}/buildtools/bin/waf"
 
 pkg_setup() {
-	python_export_best
+	python-single-r1_pkg_setup
 	if use aio; then
 		if ! linux_config_exists || ! linux_chkconfig_present AIO; then
 				ewarn "You must enable AIO support in your kernel config, "
diff --git a/net-fs/samba/samba-4.1.14.ebuild b/net-fs/samba/samba-4.1.14.ebuild
index b9a3d90c8522..87c4f32ecde1 100644
--- a/net-fs/samba/samba-4.1.14.ebuild
+++ b/net-fs/samba/samba-4.1.14.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.14.ebuild,v 1.3 2015/01/03 18:36:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.14.ebuild,v 1.4 2015/01/03 19:54:54 mgorny Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
 
-inherit python-r1 waf-utils multilib linux-info systemd
+inherit python-single-r1 waf-utils multilib linux-info systemd
 
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
@@ -30,13 +31,13 @@ CDEPEND="${PYTHON_DEPS}
 	dev-libs/popt
 	sys-libs/readline
 	virtual/libiconv
-	dev-python/subunit
+	dev-python/subunit[${PYTHON_USEDEP}]
 	sys-apps/attr
 	sys-libs/libcap
-	>=sys-libs/ntdb-1.0[python]
+	>=sys-libs/ntdb-1.0[python,${PYTHON_USEDEP}]
 	>=sys-libs/ldb-1.1.17
-	>=sys-libs/tdb-1.2.12[python]
-	>=sys-libs/talloc-2.0.8[python]
+	>=sys-libs/tdb-1.2.12[python,${PYTHON_USEDEP}]
+	>=sys-libs/talloc-2.0.8[python,${PYTHON_USEDEP}]
 	>=sys-libs/tevent-0.9.18
 	sys-libs/zlib
 	virtual/pam
@@ -58,7 +59,8 @@ RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-samba )
 "
 
-REQUIRED_USE="ads? ( acl ldap )"
+REQUIRED_USE="ads? ( acl ldap )
+	${PYTHON_REQUIRED_USE}"
 
 RESTRICT="mirror"
 
@@ -77,7 +79,7 @@ PATCHES=(
 WAF_BINARY="${S}/buildtools/bin/waf"
 
 pkg_setup() {
-	python_export_best
+	python-single-r1_pkg_setup
 	if use aio; then
 		if ! linux_config_exists || ! linux_chkconfig_present AIO; then
 				ewarn "You must enable AIO support in your kernel config, "