From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 34ECD138350 for ; Wed, 26 Feb 2020 18:49:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2978EE099F; Wed, 26 Feb 2020 18:49:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E0D2CE099F for ; Wed, 26 Feb 2020 18:49:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A3B7D34F209 for ; Wed, 26 Feb 2020 18:49:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5FC0714F for ; Wed, 26 Feb 2020 18:49:20 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1582742649.86a208c6f836d50478e24a38390a02fbd2c85838.gyakovlev@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: net-fs/samba/ X-VCS-Repository: proj/musl X-VCS-Files: net-fs/samba/samba-4.10.2-r1.ebuild net-fs/samba/samba-4.10.2.ebuild net-fs/samba/samba-4.5.16-r1.ebuild net-fs/samba/samba-4.5.16.ebuild net-fs/samba/samba-4.8.6-r2.ebuild net-fs/samba/samba-4.8.6-r3.ebuild net-fs/samba/samba-4.9.6-r1.ebuild net-fs/samba/samba-4.9.6.ebuild X-VCS-Directories: net-fs/samba/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 86a208c6f836d50478e24a38390a02fbd2c85838 X-VCS-Branch: master Date: Wed, 26 Feb 2020 18:49:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c19d3575-127f-4d05-97d0-e5f485645560 X-Archives-Hash: 397f697b39b3d4a96c93f83a5d98504b commit: 86a208c6f836d50478e24a38390a02fbd2c85838 Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Feb 26 18:17:23 2020 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Wed Feb 26 18:44:09 2020 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=86a208c6 net-fs/samba: switch to PYTHON_MULTI_USEDEP API Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --force Signed-off-by: Georgy Yakovlev gentoo.org> ...{samba-4.10.2.ebuild => samba-4.10.2-r1.ebuild} | 22 +++++++++++--------- ...{samba-4.5.16.ebuild => samba-4.5.16-r1.ebuild} | 10 +++++---- ...samba-4.8.6-r2.ebuild => samba-4.8.6-r3.ebuild} | 24 ++++++++++++---------- .../{samba-4.9.6.ebuild => samba-4.9.6-r1.ebuild} | 24 ++++++++++++---------- 4 files changed, 44 insertions(+), 36 deletions(-) diff --git a/net-fs/samba/samba-4.10.2.ebuild b/net-fs/samba/samba-4.10.2-r1.ebuild similarity index 93% rename from net-fs/samba/samba-4.10.2.ebuild rename to net-fs/samba/samba-4.10.2-r1.ebuild index c25e4d2..ac37e44 100644 --- a/net-fs/samba/samba-4.10.2.ebuild +++ b/net-fs/samba/samba-4.10.2-r1.ebuild @@ -45,26 +45,28 @@ CDEPEND=" dev-libs/libbsd[${MULTILIB_USEDEP}] dev-libs/iniparser:0 dev-libs/popt[${MULTILIB_USEDEP}] - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}] net-libs/libnsl:=[${MULTILIB_USEDEP}] sys-apps/attr[${MULTILIB_USEDEP}] - >=sys-libs/ldb-1.5.4[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - =sys-libs/ldb-1.5.4[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] + =sys-libs/talloc-2.1.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.3.18[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tevent-0.9.39[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] + >=sys-libs/talloc-2.1.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] + >=sys-libs/tdb-1.3.18[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] + >=sys-libs/tevent-0.9.39[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) - addns? ( - net-dns/bind-tools[gssapi] - dev-python/dnspython:=[${PYTHON_USEDEP}] - ) + $(python_gen_cond_dep " + dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}] + addns? ( + net-dns/bind-tools[gssapi] + dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}] + ) + ") ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto diff --git a/net-fs/samba/samba-4.5.16.ebuild b/net-fs/samba/samba-4.5.16-r1.ebuild similarity index 96% rename from net-fs/samba/samba-4.5.16.ebuild rename to net-fs/samba/samba-4.5.16-r1.ebuild index 1972b3d..4902bdb 100644 --- a/net-fs/samba/samba-4.5.16.ebuild +++ b/net-fs/samba/samba-4.5.16-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -52,7 +52,9 @@ CDEPEND="${PYTHON_DEPS} dev-libs/libbsd[${MULTILIB_USEDEP}] dev-libs/iniparser:0 dev-libs/popt[${MULTILIB_USEDEP}] - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] + $(python_gen_cond_dep " + dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}] + ") net-libs/libnsl:=[${MULTILIB_USEDEP}] sys-apps/attr[${MULTILIB_USEDEP}] >=sys-libs/ldb-1.1.27[ldap(+)?,python(+),${MULTILIB_USEDEP}] @@ -60,8 +62,8 @@ CDEPEND="${PYTHON_DEPS} sys-libs/libcap sys-libs/ncurses:0=[${MULTILIB_USEDEP}] sys-libs/readline:0= - >=sys-libs/talloc-2.1.8[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.3.10[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}] + >=sys-libs/talloc-2.1.8[python,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] + >=sys-libs/tdb-1.3.10[python,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] >=sys-libs/tevent-0.9.31-r1[${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}] virtual/libiconv diff --git a/net-fs/samba/samba-4.8.6-r2.ebuild b/net-fs/samba/samba-4.8.6-r3.ebuild similarity index 92% rename from net-fs/samba/samba-4.8.6-r2.ebuild rename to net-fs/samba/samba-4.8.6-r3.ebuild index a182d1d..569f23e 100644 --- a/net-fs/samba/samba-4.8.6-r2.ebuild +++ b/net-fs/samba/samba-4.8.6-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -45,26 +45,28 @@ CDEPEND=" dev-libs/libbsd[${MULTILIB_USEDEP}] dev-libs/iniparser:0 dev-libs/popt[${MULTILIB_USEDEP}] - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}] net-libs/libnsl:=[${MULTILIB_USEDEP}] sys-apps/attr[${MULTILIB_USEDEP}] - >=sys-libs/ldb-1.3.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - =sys-libs/ldb-1.3.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] + =sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] + >=sys-libs/talloc-2.1.11[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] + >=sys-libs/tdb-1.3.15[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] + >=sys-libs/tevent-0.9.36[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) - addns? ( - net-dns/bind-tools[gssapi] - dev-python/dnspython:=[${PYTHON_USEDEP}] - ) + $(python_gen_cond_dep " + dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}] + addns? ( + net-dns/bind-tools[gssapi] + dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}] + ) + ") ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto diff --git a/net-fs/samba/samba-4.9.6.ebuild b/net-fs/samba/samba-4.9.6-r1.ebuild similarity index 93% rename from net-fs/samba/samba-4.9.6.ebuild rename to net-fs/samba/samba-4.9.6-r1.ebuild index d1fea0f..9e0f839 100644 --- a/net-fs/samba/samba-4.9.6.ebuild +++ b/net-fs/samba/samba-4.9.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -45,26 +45,28 @@ CDEPEND=" dev-libs/libbsd[${MULTILIB_USEDEP}] dev-libs/iniparser:0 dev-libs/popt[${MULTILIB_USEDEP}] - dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}] net-libs/libnsl:=[${MULTILIB_USEDEP}] sys-apps/attr[${MULTILIB_USEDEP}] - >=sys-libs/ldb-1.4.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - =sys-libs/ldb-1.4.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] + =sys-libs/talloc-2.1.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.3.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] - >=sys-libs/tevent-0.9.37[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] + >=sys-libs/talloc-2.1.14[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] + >=sys-libs/tdb-1.3.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] + >=sys-libs/tevent-0.9.37[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) - addns? ( - net-dns/bind-tools[gssapi] - dev-python/dnspython:=[${PYTHON_USEDEP}] - ) + $(python_gen_cond_dep " + dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}] + addns? ( + net-dns/bind-tools[gssapi] + dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}] + ) + ") ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto