mgorny 15/01/03 19:54:55 Modified: samba-4.1.14.ebuild samba-4.0.23.ebuild ChangeLog Log: Use python-single-r1. Add missing PYTHON_REQUIRED_USE and PYTHON_USEDEPs. Set PYTHON_REQ_USE for waf. (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.4 net-fs/samba/samba-4.1.14.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-4.1.14.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-4.1.14.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-4.1.14.ebuild?r1=1.3&r2=1.4 Index: samba-4.1.14.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.14.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- samba-4.1.14.ebuild 3 Jan 2015 18:36:21 -0000 1.3 +++ samba-4.1.14.ebuild 3 Jan 2015 19:54:54 -0000 1.4 @@ -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 @@ 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 @@ selinux? ( sec-policy/selinux-samba ) " -REQUIRED_USE="ads? ( acl ldap )" +REQUIRED_USE="ads? ( acl ldap ) + ${PYTHON_REQUIRED_USE}" RESTRICT="mirror" @@ -77,7 +79,7 @@ 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, " 1.2 net-fs/samba/samba-4.0.23.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-4.0.23.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-4.0.23.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/samba-4.0.23.ebuild?r1=1.1&r2=1.2 Index: samba-4.0.23.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.23.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- samba-4.0.23.ebuild 16 Dec 2014 14:00:40 -0000 1.1 +++ samba-4.0.23.ebuild 3 Jan 2015 19:54:54 -0000 1.2 @@ -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 @@ 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 @@ selinux? ( sec-policy/selinux-samba ) " -REQUIRED_USE="ads? ( acl ldap )" +REQUIRED_USE="ads? ( acl ldap ) + ${PYTHON_REQUIRED_USE}" RESTRICT="mirror" @@ -79,7 +81,7 @@ 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, " 1.705 net-fs/samba/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/ChangeLog?rev=1.705&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/ChangeLog?rev=1.705&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/samba/ChangeLog?r1=1.704&r2=1.705 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v retrieving revision 1.704 retrieving revision 1.705 diff -u -r1.704 -r1.705 --- ChangeLog 3 Jan 2015 18:44:41 -0000 1.704 +++ ChangeLog 3 Jan 2015 19:54:54 -0000 1.705 @@ -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 <mgo...@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 <mgo...@gentoo.org> -samba-4.0.22.ebuild, -samba-4.1.13.ebuild:
