| 1 |
commit: 86a208c6f836d50478e24a38390a02fbd2c85838 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 26 18:17:23 2020 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 26 18:44:09 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=86a208c6 |
| 7 |
|
| 8 |
net-fs/samba: switch to PYTHON_MULTI_USEDEP API |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
| 11 |
RepoMan-Options: --force |
| 12 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 13 |
|
| 14 |
...{samba-4.10.2.ebuild => samba-4.10.2-r1.ebuild} | 22 +++++++++++--------- |
| 15 |
...{samba-4.5.16.ebuild => samba-4.5.16-r1.ebuild} | 10 +++++---- |
| 16 |
...samba-4.8.6-r2.ebuild => samba-4.8.6-r3.ebuild} | 24 ++++++++++++---------- |
| 17 |
.../{samba-4.9.6.ebuild => samba-4.9.6-r1.ebuild} | 24 ++++++++++++---------- |
| 18 |
4 files changed, 44 insertions(+), 36 deletions(-) |
| 19 |
|
| 20 |
diff --git a/net-fs/samba/samba-4.10.2.ebuild b/net-fs/samba/samba-4.10.2-r1.ebuild |
| 21 |
similarity index 93% |
| 22 |
rename from net-fs/samba/samba-4.10.2.ebuild |
| 23 |
rename to net-fs/samba/samba-4.10.2-r1.ebuild |
| 24 |
index c25e4d2..ac37e44 100644 |
| 25 |
--- a/net-fs/samba/samba-4.10.2.ebuild |
| 26 |
+++ b/net-fs/samba/samba-4.10.2-r1.ebuild |
| 27 |
@@ -45,26 +45,28 @@ CDEPEND=" |
| 28 |
dev-libs/libbsd[${MULTILIB_USEDEP}] |
| 29 |
dev-libs/iniparser:0 |
| 30 |
dev-libs/popt[${MULTILIB_USEDEP}] |
| 31 |
- dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 32 |
>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}] |
| 33 |
net-libs/libnsl:=[${MULTILIB_USEDEP}] |
| 34 |
sys-apps/attr[${MULTILIB_USEDEP}] |
| 35 |
- >=sys-libs/ldb-1.5.4[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 36 |
- <sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 37 |
+ >=sys-libs/ldb-1.5.4[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] |
| 38 |
+ <sys-libs/ldb-1.6.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] |
| 39 |
sys-libs/libcap |
| 40 |
sys-libs/ncurses:0=[${MULTILIB_USEDEP}] |
| 41 |
sys-libs/readline:0= |
| 42 |
- >=sys-libs/talloc-2.1.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 43 |
- >=sys-libs/tdb-1.3.18[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 44 |
- >=sys-libs/tevent-0.9.39[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 45 |
+ >=sys-libs/talloc-2.1.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] |
| 46 |
+ >=sys-libs/tdb-1.3.18[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] |
| 47 |
+ >=sys-libs/tevent-0.9.39[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] |
| 48 |
sys-libs/zlib[${MULTILIB_USEDEP}] |
| 49 |
virtual/libiconv |
| 50 |
pam? ( sys-libs/pam ) |
| 51 |
acl? ( virtual/acl ) |
| 52 |
- addns? ( |
| 53 |
- net-dns/bind-tools[gssapi] |
| 54 |
- dev-python/dnspython:=[${PYTHON_USEDEP}] |
| 55 |
- ) |
| 56 |
+ $(python_gen_cond_dep " |
| 57 |
+ dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}] |
| 58 |
+ addns? ( |
| 59 |
+ net-dns/bind-tools[gssapi] |
| 60 |
+ dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}] |
| 61 |
+ ) |
| 62 |
+ ") |
| 63 |
ceph? ( sys-cluster/ceph ) |
| 64 |
cluster? ( |
| 65 |
net-libs/rpcsvc-proto |
| 66 |
|
| 67 |
diff --git a/net-fs/samba/samba-4.5.16.ebuild b/net-fs/samba/samba-4.5.16-r1.ebuild |
| 68 |
similarity index 96% |
| 69 |
rename from net-fs/samba/samba-4.5.16.ebuild |
| 70 |
rename to net-fs/samba/samba-4.5.16-r1.ebuild |
| 71 |
index 1972b3d..4902bdb 100644 |
| 72 |
--- a/net-fs/samba/samba-4.5.16.ebuild |
| 73 |
+++ b/net-fs/samba/samba-4.5.16-r1.ebuild |
| 74 |
@@ -1,4 +1,4 @@ |
| 75 |
-# Copyright 1999-2018 Gentoo Foundation |
| 76 |
+# Copyright 1999-2020 Gentoo Authors |
| 77 |
# Distributed under the terms of the GNU General Public License v2 |
| 78 |
|
| 79 |
EAPI=6 |
| 80 |
@@ -52,7 +52,9 @@ CDEPEND="${PYTHON_DEPS} |
| 81 |
dev-libs/libbsd[${MULTILIB_USEDEP}] |
| 82 |
dev-libs/iniparser:0 |
| 83 |
dev-libs/popt[${MULTILIB_USEDEP}] |
| 84 |
- dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 85 |
+ $(python_gen_cond_dep " |
| 86 |
+ dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}] |
| 87 |
+ ") |
| 88 |
net-libs/libnsl:=[${MULTILIB_USEDEP}] |
| 89 |
sys-apps/attr[${MULTILIB_USEDEP}] |
| 90 |
>=sys-libs/ldb-1.1.27[ldap(+)?,python(+),${MULTILIB_USEDEP}] |
| 91 |
@@ -60,8 +62,8 @@ CDEPEND="${PYTHON_DEPS} |
| 92 |
sys-libs/libcap |
| 93 |
sys-libs/ncurses:0=[${MULTILIB_USEDEP}] |
| 94 |
sys-libs/readline:0= |
| 95 |
- >=sys-libs/talloc-2.1.8[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 96 |
- >=sys-libs/tdb-1.3.10[python,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 97 |
+ >=sys-libs/talloc-2.1.8[python,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] |
| 98 |
+ >=sys-libs/tdb-1.3.10[python,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] |
| 99 |
>=sys-libs/tevent-0.9.31-r1[${MULTILIB_USEDEP}] |
| 100 |
sys-libs/zlib[${MULTILIB_USEDEP}] |
| 101 |
virtual/libiconv |
| 102 |
|
| 103 |
diff --git a/net-fs/samba/samba-4.8.6-r2.ebuild b/net-fs/samba/samba-4.8.6-r3.ebuild |
| 104 |
similarity index 92% |
| 105 |
rename from net-fs/samba/samba-4.8.6-r2.ebuild |
| 106 |
rename to net-fs/samba/samba-4.8.6-r3.ebuild |
| 107 |
index a182d1d..569f23e 100644 |
| 108 |
--- a/net-fs/samba/samba-4.8.6-r2.ebuild |
| 109 |
+++ b/net-fs/samba/samba-4.8.6-r3.ebuild |
| 110 |
@@ -1,4 +1,4 @@ |
| 111 |
-# Copyright 1999-2019 Gentoo Authors |
| 112 |
+# Copyright 1999-2020 Gentoo Authors |
| 113 |
# Distributed under the terms of the GNU General Public License v2 |
| 114 |
|
| 115 |
EAPI=6 |
| 116 |
@@ -45,26 +45,28 @@ CDEPEND=" |
| 117 |
dev-libs/libbsd[${MULTILIB_USEDEP}] |
| 118 |
dev-libs/iniparser:0 |
| 119 |
dev-libs/popt[${MULTILIB_USEDEP}] |
| 120 |
- dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 121 |
>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}] |
| 122 |
net-libs/libnsl:=[${MULTILIB_USEDEP}] |
| 123 |
sys-apps/attr[${MULTILIB_USEDEP}] |
| 124 |
- >=sys-libs/ldb-1.3.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 125 |
- <sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 126 |
+ >=sys-libs/ldb-1.3.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] |
| 127 |
+ <sys-libs/ldb-1.4.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] |
| 128 |
sys-libs/libcap |
| 129 |
sys-libs/ncurses:0=[${MULTILIB_USEDEP}] |
| 130 |
sys-libs/readline:0= |
| 131 |
- >=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 132 |
- >=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 133 |
- >=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 134 |
+ >=sys-libs/talloc-2.1.11[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] |
| 135 |
+ >=sys-libs/tdb-1.3.15[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] |
| 136 |
+ >=sys-libs/tevent-0.9.36[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] |
| 137 |
sys-libs/zlib[${MULTILIB_USEDEP}] |
| 138 |
virtual/libiconv |
| 139 |
pam? ( sys-libs/pam ) |
| 140 |
acl? ( virtual/acl ) |
| 141 |
- addns? ( |
| 142 |
- net-dns/bind-tools[gssapi] |
| 143 |
- dev-python/dnspython:=[${PYTHON_USEDEP}] |
| 144 |
- ) |
| 145 |
+ $(python_gen_cond_dep " |
| 146 |
+ dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}] |
| 147 |
+ addns? ( |
| 148 |
+ net-dns/bind-tools[gssapi] |
| 149 |
+ dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}] |
| 150 |
+ ) |
| 151 |
+ ") |
| 152 |
ceph? ( sys-cluster/ceph ) |
| 153 |
cluster? ( |
| 154 |
net-libs/rpcsvc-proto |
| 155 |
|
| 156 |
diff --git a/net-fs/samba/samba-4.9.6.ebuild b/net-fs/samba/samba-4.9.6-r1.ebuild |
| 157 |
similarity index 93% |
| 158 |
rename from net-fs/samba/samba-4.9.6.ebuild |
| 159 |
rename to net-fs/samba/samba-4.9.6-r1.ebuild |
| 160 |
index d1fea0f..9e0f839 100644 |
| 161 |
--- a/net-fs/samba/samba-4.9.6.ebuild |
| 162 |
+++ b/net-fs/samba/samba-4.9.6-r1.ebuild |
| 163 |
@@ -1,4 +1,4 @@ |
| 164 |
-# Copyright 1999-2019 Gentoo Authors |
| 165 |
+# Copyright 1999-2020 Gentoo Authors |
| 166 |
# Distributed under the terms of the GNU General Public License v2 |
| 167 |
|
| 168 |
EAPI=6 |
| 169 |
@@ -45,26 +45,28 @@ CDEPEND=" |
| 170 |
dev-libs/libbsd[${MULTILIB_USEDEP}] |
| 171 |
dev-libs/iniparser:0 |
| 172 |
dev-libs/popt[${MULTILIB_USEDEP}] |
| 173 |
- dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 174 |
>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}] |
| 175 |
net-libs/libnsl:=[${MULTILIB_USEDEP}] |
| 176 |
sys-apps/attr[${MULTILIB_USEDEP}] |
| 177 |
- >=sys-libs/ldb-1.4.6[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 178 |
- <sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 179 |
+ >=sys-libs/ldb-1.4.6[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] |
| 180 |
+ <sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] |
| 181 |
sys-libs/libcap |
| 182 |
sys-libs/ncurses:0=[${MULTILIB_USEDEP}] |
| 183 |
sys-libs/readline:0= |
| 184 |
- >=sys-libs/talloc-2.1.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 185 |
- >=sys-libs/tdb-1.3.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 186 |
- >=sys-libs/tevent-0.9.37[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}] |
| 187 |
+ >=sys-libs/talloc-2.1.14[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] |
| 188 |
+ >=sys-libs/tdb-1.3.16[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] |
| 189 |
+ >=sys-libs/tevent-0.9.37[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}] |
| 190 |
sys-libs/zlib[${MULTILIB_USEDEP}] |
| 191 |
virtual/libiconv |
| 192 |
pam? ( sys-libs/pam ) |
| 193 |
acl? ( virtual/acl ) |
| 194 |
- addns? ( |
| 195 |
- net-dns/bind-tools[gssapi] |
| 196 |
- dev-python/dnspython:=[${PYTHON_USEDEP}] |
| 197 |
- ) |
| 198 |
+ $(python_gen_cond_dep " |
| 199 |
+ dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}] |
| 200 |
+ addns? ( |
| 201 |
+ net-dns/bind-tools[gssapi] |
| 202 |
+ dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}] |
| 203 |
+ ) |
| 204 |
+ ") |
| 205 |
ceph? ( sys-cluster/ceph ) |
| 206 |
cluster? ( |
| 207 |
net-libs/rpcsvc-proto |
Archives