| 1 |
commit: 50b908503ff65ef2ea96b09b7a21c6b46935ffa2 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 28 15:31:56 2021 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 28 15:31:56 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50b90850 |
| 7 |
|
| 8 |
net-dns/avahi: use python-single-r1 instead of python-r1 |
| 9 |
|
| 10 |
* Only builds one Python implementation => python-single-r1 |
| 11 |
|
| 12 |
* Fix REQUIRED_USE logic. We need to have it all together |
| 13 |
for python_gen_cond_dep, so we move the bookmarks? (...) |
| 14 |
dep within the python? ( ... ) one. |
| 15 |
|
| 16 |
Closes: https://bugs.gentoo.org/705386 |
| 17 |
Closes: https://bugs.gentoo.org/710244 |
| 18 |
Closes: https://bugs.gentoo.org/788043 |
| 19 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 20 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 21 |
|
| 22 |
.../{avahi-0.8-r3.ebuild => avahi-0.8-r4.ebuild} | 24 +++++++++++++--------- |
| 23 |
1 file changed, 14 insertions(+), 10 deletions(-) |
| 24 |
|
| 25 |
diff --git a/net-dns/avahi/avahi-0.8-r3.ebuild b/net-dns/avahi/avahi-0.8-r4.ebuild |
| 26 |
similarity index 91% |
| 27 |
rename from net-dns/avahi/avahi-0.8-r3.ebuild |
| 28 |
rename to net-dns/avahi/avahi-0.8-r4.ebuild |
| 29 |
index 8c9e10456e2..b7310b994e3 100644 |
| 30 |
--- a/net-dns/avahi/avahi-0.8-r3.ebuild |
| 31 |
+++ b/net-dns/avahi/avahi-0.8-r4.ebuild |
| 32 |
@@ -5,7 +5,7 @@ EAPI="7" |
| 33 |
|
| 34 |
PYTHON_COMPAT=( python3_{7,8} ) |
| 35 |
PYTHON_REQ_USE="gdbm" |
| 36 |
-inherit autotools flag-o-matic multilib-minimal mono-env python-r1 systemd |
| 37 |
+inherit autotools flag-o-matic multilib-minimal mono-env python-single-r1 systemd |
| 38 |
|
| 39 |
DESCRIPTION="System which facilitates service discovery on a local network" |
| 40 |
HOMEPAGE="http://avahi.org/" |
| 41 |
@@ -18,6 +18,7 @@ IUSE="autoipd bookmarks +dbus doc gdbm gtk howl-compat +introspection ipv6 kerne |
| 42 |
|
| 43 |
REQUIRED_USE=" |
| 44 |
python? ( dbus gdbm ${PYTHON_REQUIRED_USE} ) |
| 45 |
+ bookmarks? ( python ) |
| 46 |
mono? ( dbus ) |
| 47 |
howl-compat? ( dbus ) |
| 48 |
mdnsresponder-compat? ( dbus ) |
| 49 |
@@ -40,12 +41,11 @@ DEPEND=" |
| 50 |
mono? ( dev-lang/mono ) |
| 51 |
python? ( |
| 52 |
${PYTHON_DEPS} |
| 53 |
- dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) |
| 54 |
- introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] ) |
| 55 |
- ) |
| 56 |
- bookmarks? ( |
| 57 |
- ${PYTHON_DEPS} |
| 58 |
- >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
| 59 |
+ $(python_gen_cond_dep ' |
| 60 |
+ bookmarks? ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] ) |
| 61 |
+ dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) |
| 62 |
+ introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] ) |
| 63 |
+ ') |
| 64 |
) |
| 65 |
" |
| 66 |
RDEPEND=" |
| 67 |
@@ -83,7 +83,7 @@ PATCHES=( |
| 68 |
|
| 69 |
pkg_setup() { |
| 70 |
use mono && mono-env_pkg_setup |
| 71 |
- use python || use bookmarks && python_setup |
| 72 |
+ use python && python-single-r1_pkg_setup |
| 73 |
} |
| 74 |
|
| 75 |
src_prepare() { |
| 76 |
@@ -166,8 +166,10 @@ multilib_src_compile() { |
| 77 |
|
| 78 |
multilib_src_install() { |
| 79 |
emake install DESTDIR="${D}" |
| 80 |
- use bookmarks && use python && use dbus || \ |
| 81 |
- rm -f "${ED}"/usr/bin/avahi-bookmarks |
| 82 |
+ |
| 83 |
+ if ! use bookmarks || ! use python || ! use dbus; then |
| 84 |
+ rm -f "${ED}"/usr/bin/avahi-bookmarks || die |
| 85 |
+ fi |
| 86 |
|
| 87 |
# https://github.com/lathiat/avahi/issues/28 |
| 88 |
use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc |
| 89 |
@@ -185,6 +187,8 @@ multilib_src_install() { |
| 90 |
} |
| 91 |
|
| 92 |
multilib_src_install_all() { |
| 93 |
+ use python && python_optimize |
| 94 |
+ |
| 95 |
if use autoipd; then |
| 96 |
insinto /lib/rcscripts/net |
| 97 |
doins "${FILESDIR}"/autoipd.sh |
Archives