summaryrefslogtreecommitdiff
path: root/net-dns/avahi
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-05-31 20:59:14 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-05-31 20:59:14 +0100
commite748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /net-dns/avahi
parent908778078736bd36f7a60a2d576d415cb8e000fa (diff)
gentoo resync : 31.05.2021
Diffstat (limited to 'net-dns/avahi')
-rw-r--r--net-dns/avahi/Manifest2
-rw-r--r--net-dns/avahi/avahi-0.8-r4.ebuild (renamed from net-dns/avahi/avahi-0.8-r3.ebuild)28
2 files changed, 17 insertions, 13 deletions
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index e2c7cf60c178..b9c396352c14 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -2,5 +2,5 @@ AUX autoipd-openrc.sh 700 BLAKE2B e71e5583db890f8ee1bbe9c03fc42285871089b2ea2d45
AUX autoipd.sh 1271 BLAKE2B 815c5776afff71489826eb8338535df1af6fbf02f3d42eedb6ebb69e5fff181e7252060818dd2dd67141a40c097ded8b7ac4210cb9929bab4b68ea99533bcf26 SHA512 0bff9ca7e32212aef0246db5baf10ee4f7e93a987b7c591b21ed9f116a1c662a84be9d784fc919205c1fecb5cd8421b81a0eb590c3cc066c6b1b9265b98f1ea3
AUX avahi-0.8-disable-avahi-ui-sharp.patch 1397 BLAKE2B b04324648b09fdd69f017d0be068556ed443f888b56a0567c3f9647c80f959ddcaa7d2ee0022d6a9a8d6bdd60673ffe7086ae4f5065a47d7b62f5aa287931306 SHA512 1d824f16fffcc41015b507e8210f4daa127c9915387b0695d2e27a46a2d480783b679735ea1ffdd198f52470300e4ae9cfc731c62496ad6a3d7c8408c3ffd8dd
DIST avahi-0.8.tar.gz 953319 BLAKE2B ddede1b8790ff3057ea5f4bb710e95578229e078a7abac83121e043017dda1ab3d971c723f920fdd4f3d98b88bd2cf21f9645bec1b7bbd2ea194cb399a5f5b46 SHA512 27bba9a551152dfc7e721f326042e7bfce55d227044a6cbaee04d6fb0e3f59c36e159c2b7a4dd42d1c955cdf37cc1c303e91991c08928bbded91d796e9a22abe
-EBUILD avahi-0.8-r3.ebuild 5223 BLAKE2B bc45ca99ac5ba317aa20c23ac301982fd64aa682f9873e7231723a883d09feebfacb90851b46c5afea52feb141ebb1d9eb268aba5bb4d025afac3817ac12cfd9 SHA512 74eda66378f9437f9fe1b793ff3b5bf6d03c9f05bb5fef36811d8a682cc4d5fef8e49d66592f791d3ea589b70e9667244270dbb0c974aff69dbc4ef5e65a532c
+EBUILD avahi-0.8-r4.ebuild 5321 BLAKE2B 7e0ac27b77e71fe48ec8c8b471cde036c5318dfee7f43e34492eb074ad8a0a090c79153956eb5c2e34852d3165c767b658afa4519ca9a5d99b10a6bf2ec92d18 SHA512 db72faabd6760682ed8b8b8f77ea834d997f9e3dd7f6185548f1443a778a2aa4f80bd6687ae60cf1b602f1f6cdba2d6ac1901b8e388801aab75c7bd05e973bdd
MISC metadata.xml 865 BLAKE2B 59950f0a850c79160f02f7a0d8f5af6a7b1f6813982bdc39244bd435d5f098d79a77fe918dfb6c81ac0d6673f90c70aa7378194f7086c6d6a89cae69590ea667 SHA512 ab1aefa11c59add17cabe4693ff44594ead164cb8d5cb3aa1193f48350bb74ffbb8f7a520d605ed52d3bd83e08d7b3a4a42a59cf55d8336c8fb4db431e8e28f1
diff --git a/net-dns/avahi/avahi-0.8-r3.ebuild b/net-dns/avahi/avahi-0.8-r4.ebuild
index 8c9e10456e2d..ec5bc43d804f 100644
--- a/net-dns/avahi/avahi-0.8-r3.ebuild
+++ b/net-dns/avahi/avahi-0.8-r4.ebuild
@@ -3,12 +3,12 @@
EAPI="7"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
PYTHON_REQ_USE="gdbm"
-inherit autotools flag-o-matic multilib-minimal mono-env python-r1 systemd
+inherit autotools flag-o-matic multilib-minimal mono-env python-single-r1 systemd
DESCRIPTION="System which facilitates service discovery on a local network"
-HOMEPAGE="http://avahi.org/"
+HOMEPAGE="https://avahi.org/"
SRC_URI="https://github.com/lathiat/avahi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1"
@@ -18,6 +18,7 @@ IUSE="autoipd bookmarks +dbus doc gdbm gtk howl-compat +introspection ipv6 kerne
REQUIRED_USE="
python? ( dbus gdbm ${PYTHON_REQUIRED_USE} )
+ bookmarks? ( python )
mono? ( dbus )
howl-compat? ( dbus )
mdnsresponder-compat? ( dbus )
@@ -40,12 +41,11 @@ DEPEND="
mono? ( dev-lang/mono )
python? (
${PYTHON_DEPS}
- dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
- introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )
- )
- bookmarks? (
- ${PYTHON_DEPS}
- >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ bookmarks? ( >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] )
+ dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+ introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )
+ ')
)
"
RDEPEND="
@@ -83,7 +83,7 @@ PATCHES=(
pkg_setup() {
use mono && mono-env_pkg_setup
- use python || use bookmarks && python_setup
+ use python && python-single-r1_pkg_setup
}
src_prepare() {
@@ -166,8 +166,10 @@ multilib_src_compile() {
multilib_src_install() {
emake install DESTDIR="${D}"
- use bookmarks && use python && use dbus || \
- rm -f "${ED}"/usr/bin/avahi-bookmarks
+
+ if ! use bookmarks || ! use python || ! use dbus; then
+ rm -f "${ED}"/usr/bin/avahi-bookmarks || die
+ fi
# https://github.com/lathiat/avahi/issues/28
use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc
@@ -185,6 +187,8 @@ multilib_src_install() {
}
multilib_src_install_all() {
+ use python && python_optimize
+
if use autoipd; then
insinto /lib/rcscripts/net
doins "${FILESDIR}"/autoipd.sh