1 |
commit: e62e81aecd98897c67b0ca68310b83f7469204f5 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri May 28 15:32:00 2021 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 28 15:32:00 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e62e81ae |
7 |
|
8 |
net-print/hplip: update Python dependency on Avahi |
9 |
|
10 |
Avahi has changed Python eclasses and now guards all Python |
11 |
use behind USE=python. |
12 |
|
13 |
Closes: https://github.com/gentoo/gentoo/pull/20677 |
14 |
Bug: https://bugs.gentoo.org/710244 |
15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
16 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
17 |
|
18 |
net-print/hplip/{hplip-3.20.11-r1.ebuild => hplip-3.20.11-r2.ebuild} | 2 +- |
19 |
net-print/hplip/{hplip-3.21.2.ebuild => hplip-3.21.2-r1.ebuild} | 2 +- |
20 |
profiles/arch/arm64/package.use.stable.mask | 4 ---- |
21 |
3 files changed, 2 insertions(+), 6 deletions(-) |
22 |
|
23 |
diff --git a/net-print/hplip/hplip-3.20.11-r1.ebuild b/net-print/hplip/hplip-3.20.11-r2.ebuild |
24 |
similarity index 99% |
25 |
rename from net-print/hplip/hplip-3.20.11-r1.ebuild |
26 |
rename to net-print/hplip/hplip-3.20.11-r2.ebuild |
27 |
index f1f9e876d5e..e5fc267282c 100644 |
28 |
--- a/net-print/hplip/hplip-3.20.11-r1.ebuild |
29 |
+++ b/net-print/hplip/hplip-3.20.11-r2.ebuild |
30 |
@@ -37,7 +37,7 @@ COMMON_DEPEND=" |
31 |
snmp? ( |
32 |
dev-libs/openssl:0= |
33 |
net-analyzer/net-snmp:= |
34 |
- $(python_gen_cond_dep 'net-dns/avahi[dbus,${PYTHON_MULTI_USEDEP}]') |
35 |
+ net-dns/avahi[dbus,python,${PYTHON_SINGLE_USEDEP}] |
36 |
) |
37 |
) |
38 |
" |
39 |
|
40 |
diff --git a/net-print/hplip/hplip-3.21.2.ebuild b/net-print/hplip/hplip-3.21.2-r1.ebuild |
41 |
similarity index 99% |
42 |
rename from net-print/hplip/hplip-3.21.2.ebuild |
43 |
rename to net-print/hplip/hplip-3.21.2-r1.ebuild |
44 |
index 42d7bc86720..28aca19ebdb 100644 |
45 |
--- a/net-print/hplip/hplip-3.21.2.ebuild |
46 |
+++ b/net-print/hplip/hplip-3.21.2-r1.ebuild |
47 |
@@ -37,7 +37,7 @@ COMMON_DEPEND=" |
48 |
snmp? ( |
49 |
dev-libs/openssl:0= |
50 |
net-analyzer/net-snmp:= |
51 |
- $(python_gen_cond_dep 'net-dns/avahi[dbus,${PYTHON_MULTI_USEDEP}]') |
52 |
+ net-dns/avahi[dbus,python,${PYTHON_SINGLE_USEDEP}] |
53 |
) |
54 |
) |
55 |
" |
56 |
|
57 |
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask |
58 |
index e2458f26d0d..3da146e5237 100644 |
59 |
--- a/profiles/arch/arm64/package.use.stable.mask |
60 |
+++ b/profiles/arch/arm64/package.use.stable.mask |
61 |
@@ -125,10 +125,6 @@ sys-auth/pambase pam_krb5 pam_ssh |
62 |
sys-block/thin-provisioning-tools test |
63 |
sys-devel/distcc gssapi |
64 |
|
65 |
-# Michał Górny <mgorny@g.o> (2018-03-03) |
66 |
-# Requires masked dependent flags. |
67 |
-net-dns/avahi python |
68 |
- |
69 |
# Michał Górny <mgorny@g.o> (2018-02-28) |
70 |
# Requires masked dependent flags. |
71 |
net-fs/samba ads |