| 1 |
commit: f6843e30ac099f62bd722c481acd3a8631d71a6f |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 17 09:36:59 2021 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 17 09:36:59 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6843e30 |
| 7 |
|
| 8 |
net-fs/samba: conditionalise dependency on dev-python/subunit |
| 9 |
|
| 10 |
Samba seems to configure + build + install fine without subunit |
| 11 |
installed. |
| 12 |
|
| 13 |
Revbumping to allow users to depclean subunit itself but also |
| 14 |
a bunch of assorted Python dependencies. Also, to ensure that |
| 15 |
users upgrading without dynamic deps enabled don't get stuck |
| 16 |
on the "EAPI 8" trap discussed in the bug. |
| 17 |
|
| 18 |
Closes: https://github.com/gentoo/gentoo/pull/21683 |
| 19 |
Closes: https://bugs.gentoo.org/801637 |
| 20 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 21 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 22 |
|
| 23 |
net-fs/samba/{samba-4.13.10.ebuild => samba-4.13.10-r1.ebuild} | 2 +- |
| 24 |
net-fs/samba/{samba-4.13.9-r1.ebuild => samba-4.13.9-r2.ebuild} | 2 +- |
| 25 |
net-fs/samba/{samba-4.14.6.ebuild => samba-4.14.4-r2.ebuild} | 2 +- |
| 26 |
net-fs/samba/{samba-4.14.4-r1.ebuild => samba-4.14.5-r2.ebuild} | 2 +- |
| 27 |
net-fs/samba/{samba-4.14.5-r1.ebuild => samba-4.14.6-r1.ebuild} | 2 +- |
| 28 |
net-fs/samba/{samba-4.15.0_rc1.ebuild => samba-4.15.0_rc1-r1.ebuild} | 2 +- |
| 29 |
6 files changed, 6 insertions(+), 6 deletions(-) |
| 30 |
|
| 31 |
diff --git a/net-fs/samba/samba-4.13.10.ebuild b/net-fs/samba/samba-4.13.10-r1.ebuild |
| 32 |
similarity index 99% |
| 33 |
rename from net-fs/samba/samba-4.13.10.ebuild |
| 34 |
rename to net-fs/samba/samba-4.13.10-r1.ebuild |
| 35 |
index 91be7c012ce..11a2973e57f 100644 |
| 36 |
--- a/net-fs/samba/samba-4.13.10.ebuild |
| 37 |
+++ b/net-fs/samba/samba-4.13.10-r1.ebuild |
| 38 |
@@ -81,7 +81,6 @@ COMMON_DEPEND=" |
| 39 |
virtual/libcrypt:=[${MULTILIB_USEDEP}] |
| 40 |
virtual/libiconv |
| 41 |
$(python_gen_cond_dep " |
| 42 |
- dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}] |
| 43 |
addns? ( |
| 44 |
dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}] |
| 45 |
net-dns/bind-tools[gssapi] |
| 46 |
@@ -120,6 +119,7 @@ DEPEND="${COMMON_DEPEND} |
| 47 |
) |
| 48 |
spotlight? ( dev-libs/glib ) |
| 49 |
test? ( |
| 50 |
+ $(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" ) |
| 51 |
!system-mitkrb5? ( |
| 52 |
>=net-dns/resolv_wrapper-1.1.4 |
| 53 |
>=net-libs/socket_wrapper-1.1.9 |
| 54 |
|
| 55 |
diff --git a/net-fs/samba/samba-4.13.9-r1.ebuild b/net-fs/samba/samba-4.13.9-r2.ebuild |
| 56 |
similarity index 99% |
| 57 |
rename from net-fs/samba/samba-4.13.9-r1.ebuild |
| 58 |
rename to net-fs/samba/samba-4.13.9-r2.ebuild |
| 59 |
index b63fcec649a..4f9c3873ee6 100644 |
| 60 |
--- a/net-fs/samba/samba-4.13.9-r1.ebuild |
| 61 |
+++ b/net-fs/samba/samba-4.13.9-r2.ebuild |
| 62 |
@@ -81,7 +81,6 @@ COMMON_DEPEND=" |
| 63 |
virtual/libcrypt:=[${MULTILIB_USEDEP}] |
| 64 |
virtual/libiconv |
| 65 |
$(python_gen_cond_dep " |
| 66 |
- dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}] |
| 67 |
addns? ( |
| 68 |
dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}] |
| 69 |
net-dns/bind-tools[gssapi] |
| 70 |
@@ -120,6 +119,7 @@ DEPEND="${COMMON_DEPEND} |
| 71 |
) |
| 72 |
spotlight? ( dev-libs/glib ) |
| 73 |
test? ( |
| 74 |
+ $(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" ) |
| 75 |
!system-mitkrb5? ( |
| 76 |
>=net-dns/resolv_wrapper-1.1.4 |
| 77 |
>=net-libs/socket_wrapper-1.1.9 |
| 78 |
|
| 79 |
diff --git a/net-fs/samba/samba-4.14.6.ebuild b/net-fs/samba/samba-4.14.4-r2.ebuild |
| 80 |
similarity index 99% |
| 81 |
rename from net-fs/samba/samba-4.14.6.ebuild |
| 82 |
rename to net-fs/samba/samba-4.14.4-r2.ebuild |
| 83 |
index 64232a3a2cd..fb2a26e35c4 100644 |
| 84 |
--- a/net-fs/samba/samba-4.14.6.ebuild |
| 85 |
+++ b/net-fs/samba/samba-4.14.4-r2.ebuild |
| 86 |
@@ -81,7 +81,6 @@ COMMON_DEPEND=" |
| 87 |
virtual/libcrypt:=[${MULTILIB_USEDEP}] |
| 88 |
virtual/libiconv |
| 89 |
$(python_gen_cond_dep " |
| 90 |
- dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}] |
| 91 |
addc? ( |
| 92 |
dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}] |
| 93 |
dev-python/markdown[\${PYTHON_MULTI_USEDEP}] |
| 94 |
@@ -124,6 +123,7 @@ DEPEND="${COMMON_DEPEND} |
| 95 |
) |
| 96 |
spotlight? ( dev-libs/glib ) |
| 97 |
test? ( |
| 98 |
+ $(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" ) |
| 99 |
!system-mitkrb5? ( |
| 100 |
>=net-dns/resolv_wrapper-1.1.4 |
| 101 |
>=net-libs/socket_wrapper-1.1.9 |
| 102 |
|
| 103 |
diff --git a/net-fs/samba/samba-4.14.4-r1.ebuild b/net-fs/samba/samba-4.14.5-r2.ebuild |
| 104 |
similarity index 99% |
| 105 |
rename from net-fs/samba/samba-4.14.4-r1.ebuild |
| 106 |
rename to net-fs/samba/samba-4.14.5-r2.ebuild |
| 107 |
index 64232a3a2cd..fb2a26e35c4 100644 |
| 108 |
--- a/net-fs/samba/samba-4.14.4-r1.ebuild |
| 109 |
+++ b/net-fs/samba/samba-4.14.5-r2.ebuild |
| 110 |
@@ -81,7 +81,6 @@ COMMON_DEPEND=" |
| 111 |
virtual/libcrypt:=[${MULTILIB_USEDEP}] |
| 112 |
virtual/libiconv |
| 113 |
$(python_gen_cond_dep " |
| 114 |
- dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}] |
| 115 |
addc? ( |
| 116 |
dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}] |
| 117 |
dev-python/markdown[\${PYTHON_MULTI_USEDEP}] |
| 118 |
@@ -124,6 +123,7 @@ DEPEND="${COMMON_DEPEND} |
| 119 |
) |
| 120 |
spotlight? ( dev-libs/glib ) |
| 121 |
test? ( |
| 122 |
+ $(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" ) |
| 123 |
!system-mitkrb5? ( |
| 124 |
>=net-dns/resolv_wrapper-1.1.4 |
| 125 |
>=net-libs/socket_wrapper-1.1.9 |
| 126 |
|
| 127 |
diff --git a/net-fs/samba/samba-4.14.5-r1.ebuild b/net-fs/samba/samba-4.14.6-r1.ebuild |
| 128 |
similarity index 99% |
| 129 |
rename from net-fs/samba/samba-4.14.5-r1.ebuild |
| 130 |
rename to net-fs/samba/samba-4.14.6-r1.ebuild |
| 131 |
index 64232a3a2cd..fb2a26e35c4 100644 |
| 132 |
--- a/net-fs/samba/samba-4.14.5-r1.ebuild |
| 133 |
+++ b/net-fs/samba/samba-4.14.6-r1.ebuild |
| 134 |
@@ -81,7 +81,6 @@ COMMON_DEPEND=" |
| 135 |
virtual/libcrypt:=[${MULTILIB_USEDEP}] |
| 136 |
virtual/libiconv |
| 137 |
$(python_gen_cond_dep " |
| 138 |
- dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}] |
| 139 |
addc? ( |
| 140 |
dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}] |
| 141 |
dev-python/markdown[\${PYTHON_MULTI_USEDEP}] |
| 142 |
@@ -124,6 +123,7 @@ DEPEND="${COMMON_DEPEND} |
| 143 |
) |
| 144 |
spotlight? ( dev-libs/glib ) |
| 145 |
test? ( |
| 146 |
+ $(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" ) |
| 147 |
!system-mitkrb5? ( |
| 148 |
>=net-dns/resolv_wrapper-1.1.4 |
| 149 |
>=net-libs/socket_wrapper-1.1.9 |
| 150 |
|
| 151 |
diff --git a/net-fs/samba/samba-4.15.0_rc1.ebuild b/net-fs/samba/samba-4.15.0_rc1-r1.ebuild |
| 152 |
similarity index 99% |
| 153 |
rename from net-fs/samba/samba-4.15.0_rc1.ebuild |
| 154 |
rename to net-fs/samba/samba-4.15.0_rc1-r1.ebuild |
| 155 |
index bac64c86588..1921330d5a3 100644 |
| 156 |
--- a/net-fs/samba/samba-4.15.0_rc1.ebuild |
| 157 |
+++ b/net-fs/samba/samba-4.15.0_rc1-r1.ebuild |
| 158 |
@@ -79,7 +79,6 @@ COMMON_DEPEND=" |
| 159 |
virtual/libcrypt:=[${MULTILIB_USEDEP}] |
| 160 |
virtual/libiconv |
| 161 |
$(python_gen_cond_dep " |
| 162 |
- dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}] |
| 163 |
addc? ( |
| 164 |
dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}] |
| 165 |
dev-python/markdown[\${PYTHON_MULTI_USEDEP}] |
| 166 |
@@ -122,6 +121,7 @@ DEPEND="${COMMON_DEPEND} |
| 167 |
) |
| 168 |
spotlight? ( dev-libs/glib ) |
| 169 |
test? ( |
| 170 |
+ $(python_gen_cond_dep "dev-python/subunit[\${PYTHON_USEDEP},${MULTILIB_USEDEP}]" ) |
| 171 |
!system-mitkrb5? ( |
| 172 |
>=net-dns/resolv_wrapper-1.1.4 |
| 173 |
>=net-libs/socket_wrapper-1.1.9 |
Archives