commit: 81618f5dd4d4f04e95c48cdae33fc08e9be34122 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Feb 1 20:15:12 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Feb 1 20:21:54 2021 +0000 URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=81618f5d
net-dns/avahi: 0.8-r2 version bump re-enabled with IUSE=qt4 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> net-dns/avahi/avahi-0.6.31-r6.ebuild | 234 ----------------------------------- net-dns/avahi/avahi-0.8-r2.ebuild | 216 ++++++++++++++++++++++++++++++++ net-dns/avahi/metadata.xml | 20 ++- 3 files changed, 223 insertions(+), 247 deletions(-) diff --git a/net-dns/avahi/avahi-0.6.31-r6.ebuild b/net-dns/avahi/avahi-0.6.31-r6.ebuild deleted file mode 100644 index 9ed29766..00000000 --- a/net-dns/avahi/avahi-0.6.31-r6.ebuild +++ /dev/null @@ -1,234 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="gdbm" -WANT_AUTOMAKE=1.11 -inherit autotools eutils flag-o-matic multilib multilib-minimal mono-env python-r1 systemd user - -DESCRIPTION="System which facilitates service discovery on a local network" -HOMEPAGE="http://avahi.org/"; -SRC_URI="http://avahi.org/download/${P}.tar.gz"; - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm ~hppa m68k ~mips ~ppc ~ppc64 s390 ~sparc x86 ~x86-linux" -IUSE="autoipd bookmarks dbus doc gdbm gtk howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils" - -REQUIRED_USE=" - utils? ( gtk ) - python? ( ${PYTHON_REQUIRED_USE} dbus gdbm ) - mono? ( dbus ) - howl-compat? ( dbus ) - mdnsresponder-compat? ( dbus ) -" - -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - dev-libs/libdaemon - dev-libs/expat - >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] - gdbm? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] ) - qt4? ( dev-qt/qtcore:4 ) - gtk? ( x11-libs/gtk+:3 ) - dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) - kernel_linux? ( sys-libs/libcap ) - introspection? ( dev-libs/gobject-introspection ) - mono? ( dev-lang/mono ) - python? ( - ${PYTHON_DEPS} - dbus? ( dev-python/dbus-python ) - ) - bookmarks? ( dev-python/twisted ) -" - -DEPEND="${COMMON_DEPEND} - dev-util/intltool - >=virtual/pkgconfig-0-r1 - doc? ( app-doc/doxygen ) -" - -RDEPEND="${COMMON_DEPEND} - howl-compat? ( !net-misc/howl ) - mdnsresponder-compat? ( !net-misc/mDNSResponder ) - selinux? ( sec-policy/selinux-avahi ) -" - -MULTILIB_WRAPPED_HEADERS=( - # necessary until the UI libraries are ported - /usr/include/avahi-qt4/qt-watch.h - /usr/include/avahi-ui/avahi-ui.h -) - -pkg_preinst() { - enewgroup netdev - enewgroup avahi - enewuser avahi -1 -1 -1 avahi - - if use autoipd; then - enewgroup avahi-autoipd - enewuser avahi-autoipd -1 -1 -1 avahi-autoipd - fi -} - -pkg_setup() { - use mono && mono-env_pkg_setup -} - -src_prepare() { - if use ipv6; then - sed -i \ - -e s/use-ipv6=no/use-ipv6=yes/ \ - avahi-daemon/avahi-daemon.conf || die - fi - - sed -i\ - -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \ - doxygen_to_devhelp.xsl || die - - # Make gtk utils optional - epatch "${FILESDIR}"/${PN}-0.6.30-optional-gtk-utils.patch - - # Fix init scripts for >=openrc-0.9.0, bug #383641 - epatch "${FILESDIR}"/${PN}-0.6.x-openrc-0.9.x-init-scripts-fixes.patch - - # install-exec-local -> install-exec-hook - epatch "${FILESDIR}"/${P}-install-exec-hook.patch - - # Backport host-name-from-machine-id patch, bug #466134 - epatch "${FILESDIR}"/${P}-host-name-from-machine-id.patch - - # Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575 - epatch "${FILESDIR}"/${P}-fix-install-avahi-discover.patch - - epatch "${FILESDIR}"/${P}-so_reuseport-may-not-exist-in-running-kernel.patch - - # allow building client without the daemon - epatch "${FILESDIR}"/${P}-build-client-without-daemon.patch - - # Fix build under various locales, bug #501664 - epatch "${FILESDIR}"/${P}-fix-locale-build.patch - - # Drop DEPRECATED flags, bug #384743 - sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED=1::g' avahi-ui/Makefile.am || die - - # Fix references to Lennart's home directory, bug #466210 - sed -i -e 's/\/home\/lennart\/tmp\/avahi//g' man/* || die - - # Prevent .pyc files in DESTDIR - >py-compile - - eautoreconf - - # bundled manpages - multilib_copy_sources -} - -src_configure() { - # those steps should be done once-per-ebuild rather than per-ABI - use sh && replace-flags -O? -O0 - use python && python_export_best - - # We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module - unset DISPLAY - - multilib-minimal_src_configure -} - -multilib_src_configure() { - local myconf=( --disable-static ) - - if use python; then - myconf+=( - $(multilib_native_use_enable dbus python-dbus) - --disable-pygtk - ) - fi - - if use mono; then - myconf+=( $(multilib_native_use_enable doc monodoc) ) - fi - - if ! multilib_is_native_abi; then - myconf+=( - # used by daemons only - --disable-libdaemon - --with-xml=none - ) - fi - - econf \ - --localstatedir="${EPREFIX}/var" \ - --with-distro=gentoo \ - --disable-python-dbus \ - --disable-pygtk \ - --disable-xmltoman \ - --disable-monodoc \ - --enable-glib \ - --enable-gobject \ - $(multilib_native_use_enable test tests) \ - $(multilib_native_use_enable autoipd) \ - $(use_enable mdnsresponder-compat compat-libdns_sd) \ - $(use_enable howl-compat compat-howl) \ - $(multilib_native_use_enable doc doxygen-doc) \ - $(multilib_native_use_enable mono) \ - $(use_enable dbus) \ - $(multilib_native_use_enable python) \ - --disable-gtk \ - $(multilib_native_use_enable gtk gtk3) \ - $(use_enable nls) \ - $(multilib_native_use_enable introspection) \ - $(multilib_native_use_enable utils gtk-utils) \ - --disable-qt3 \ - $(multilib_native_use_enable qt4) \ - $(use_enable gdbm) \ - $(systemd_with_unitdir) \ - "${myconf[@]}" -} - -multilib_src_compile() { - emake - - multilib_is_native_abi && use doc && emake avahi.devhelp -} - -multilib_src_install() { - emake install DESTDIR="${D}" - use bookmarks && use python && use dbus || \ - rm -f "${ED}"/usr/bin/avahi-bookmarks - - use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc - use mdnsresponder-compat && dosym avahi-compat-libdns_sd/dns_sd.h /usr/include/dns_sd.h - - if multilib_is_native_abi && use doc; then - dohtml -r doxygen/html/. || die - insinto /usr/share/devhelp/books/avahi - doins avahi.devhelp || die - fi -} - -multilib_src_install_all() { - if use autoipd; then - insinto /$(get_libdir)/rcscripts/net - doins "${FILESDIR}"/autoipd.sh - - insinto /$(get_libdir)/netifrc/net - newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh - fi - - dodoc docs/{AUTHORS,NEWS,README,TODO} - - prune_libtool_files --all -} - -pkg_postinst() { - if use autoipd; then - elog - elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)" - elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!" - elog - fi -} diff --git a/net-dns/avahi/avahi-0.8-r2.ebuild b/net-dns/avahi/avahi-0.8-r2.ebuild new file mode 100644 index 00000000..71213619 --- /dev/null +++ b/net-dns/avahi/avahi-0.8-r2.ebuild @@ -0,0 +1,216 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_REQ_USE="gdbm" +inherit autotools flag-o-matic multilib-minimal mono-env python-r1 systemd + +DESCRIPTION="System which facilitates service discovery on a local network" +HOMEPAGE="http://avahi.org/"; +SRC_URI="https://github.com/lathiat/avahi/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-linux" +IUSE="autoipd bookmarks +dbus doc gdbm gtk gtk2 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 qt5 selinux systemd test" + +REQUIRED_USE=" + python? ( dbus gdbm ${PYTHON_REQUIRED_USE} ) + mono? ( dbus ) + howl-compat? ( dbus ) + mdnsresponder-compat? ( dbus ) + systemd? ( dbus ) +" + +RESTRICT="!test? ( test )" + +DEPEND=" + dev-libs/libdaemon + dev-libs/libevent:=[${MULTILIB_USEDEP}] + dev-libs/expat + dev-libs/glib:2[${MULTILIB_USEDEP}] + gdbm? ( sys-libs/gdbm:=[${MULTILIB_USEDEP}] ) + qt4? ( dev-qt/qtcore:4 ) + qt5? ( dev-qt/qtcore:5 ) + gtk2? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] ) + gtk? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] ) + dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) + kernel_linux? ( sys-libs/libcap ) + introspection? ( dev-libs/gobject-introspection:= ) + mono? ( + dev-lang/mono + gtk2? ( dev-dotnet/gtk-sharp:2 ) + ) + 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}] + ) +" +RDEPEND=" + acct-user/avahi + acct-group/avahi + acct-group/netdev + autoipd? ( + acct-user/avahi-autoipd + acct-group/avahi-autoipd + ) + ${DEPEND} + selinux? ( sec-policy/selinux-avahi ) +" +BDEPEND=" + dev-util/glib-utils + doc? ( app-doc/doxygen ) + app-doc/xmltoman + dev-util/intltool + virtual/pkgconfig +" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/avahi-qt4/qt-watch.h + /usr/include/avahi-qt5/qt-watch.h +) + +# These patches do not apply cleanly but may need to be re-instated. +# I'll leave them commented out for now. +#PATCHES=( +# "${FILESDIR}/${PN}-0.7-qt5.patch" +# "${FILESDIR}/${PN}-0.7-CVE-2017-6519.patch" +# "${FILESDIR}/${PN}-0.7-remove-empty-avahi_discover.patch" +# "${FILESDIR}/${PN}-0.7-python3.patch" +# "${FILESDIR}/${PN}-0.7-python3-unittest.patch" +# "${FILESDIR}/${PN}-0.7-python3-gdbm.patch" +#) + +pkg_setup() { + use mono && mono-env_pkg_setup + use python || use bookmarks && python_setup +} + +src_prepare() { + default + + if ! use ipv6; then + sed -i \ + -e "s/use-ipv6=yes/use-ipv6=no/" \ + avahi-daemon/avahi-daemon.conf || die + fi + + sed -i \ + -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \ + doxygen_to_devhelp.xsl || die + + eautoreconf + + # bundled manpages + multilib_copy_sources +} + +multilib_src_configure() { + local myconf=( + --disable-monodoc + --disable-python-dbus + --disable-qt3 + --disable-static + --enable-manpages + --enable-glib + --enable-gobject + --enable-xmltoman + --localstatedir="${EPREFIX}/var" + --with-distro=gentoo + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_enable dbus) + $(use_enable gdbm) + $(use_enable gtk2 gtk) + $(use_enable gtk gtk3) + $(use_enable howl-compat compat-howl) + $(use_enable mdnsresponder-compat compat-libdns_sd) + $(use_enable nls) + $(multilib_native_use_enable autoipd) + $(multilib_native_use_enable doc doxygen-doc) + $(multilib_native_use_enable introspection) + $(multilib_native_use_enable mono) + $(multilib_native_use_enable python) + $(multilib_native_use_enable qt4) + $(multilib_native_use_enable qt5) + $(multilib_native_use_enable test tests) + ) + + if use python; then + myconf+=( + $(multilib_native_use_enable dbus python-dbus) + $(multilib_native_use_enable introspection pygobject) + ) + fi + + if use mono; then + myconf+=( $(multilib_native_use_enable doc monodoc) ) + fi + + if ! multilib_is_native_abi; then + myconf+=( + # used by daemons only + --disable-libdaemon + --with-xml=none + ) + fi + + econf "${myconf[@]}" +} + +multilib_src_compile() { + emake + + multilib_is_native_abi && use doc && emake avahi.devhelp +} + +multilib_src_install() { + emake install DESTDIR="${D}" + use bookmarks && use python && use dbus && use gtk2 || \ + rm -f "${ED}"/usr/bin/avahi-bookmarks + + # https://github.com/lathiat/avahi/issues/28 + use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc + use mdnsresponder-compat && dosym avahi-compat-libdns_sd/dns_sd.h /usr/include/dns_sd.h + + if multilib_is_native_abi && use doc; then + docinto html + dodoc -r doxygen/html/. + insinto /usr/share/devhelp/books/avahi + doins avahi.devhelp + fi + + # The build system creates an empty "/run" directory, so we clean it up here + rmdir "${ED}"/run || die +} + +multilib_src_install_all() { + if use autoipd; then + insinto /lib/rcscripts/net + doins "${FILESDIR}"/autoipd.sh + + insinto /lib/netifrc/net + newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh + fi + + dodoc docs/{AUTHORS,NEWS,README,TODO} + + find "${ED}" -name '*.la' -type f -delete || die +} + +pkg_postinst() { + if use autoipd; then + elog + elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)" + elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!" + elog + fi + + systemd_reenable avahi-daemon.service +} diff --git a/net-dns/avahi/metadata.xml b/net-dns/avahi/metadata.xml index 626558ea..14001602 100644 --- a/net-dns/avahi/metadata.xml +++ b/net-dns/avahi/metadata.xml @@ -3,18 +3,12 @@ <pkgmetadata> <!-- maintainer-needed --> <use> - <flag name='autoipd'>Build and install the IPv4LL (RFC3927) network address - configuration daemon</flag> - <flag name='bookmarks'>Install the avahi-bookmarks application (requires - <pkg>dev-python/twisted</pkg>)</flag> - <flag name='howl-compat'>Enable compat libraries for howl</flag> - <flag name="gtk">Build the avahi-ui-gtk3 library, and use gtk3 for the - avahi utilities under USE=utils</flag> - <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> - for introspection</flag> - <flag name='mdnsresponder-compat'>Enable compat libraries for - mDNSResponder</flag> - <flag name="utils">Install the avahi gtk+ utils avahi-discover, bssh, and - bvnc</flag> + <flag name="autoipd">Build and install the IPv4LL (RFC3927) network address configuration daemon</flag> + <flag name="bookmarks">Install the avahi-bookmarks application (requires <pkg>dev-python/twisted</pkg>)</flag> + <flag name="gtk2">Use gtk2 for the avahi utilities (overridden by USE=gtk) and build the avahi-ui library</flag> + <flag name="gtk">Use gtk3 for the avahi utilities (overrides USE=gtk2) and build the avahi-ui-gtk3 library</flag> + <flag name="howl-compat">Enable compat libraries for howl</flag> + <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag> + <flag name="mdnsresponder-compat">Enable compat libraries for mDNSResponder</flag> </use> </pkgmetadata>
