From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1274535-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id C232A1382C5
for <garchives@archives.gentoo.org>; Sat, 24 Apr 2021 15:49:34 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 2719FE0828;
Sat, 24 Apr 2021 15:49:34 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 03612E0828
for <gentoo-commits@lists.gentoo.org>; Sat, 24 Apr 2021 15:49:34 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 83F593412B1
for <gentoo-commits@lists.gentoo.org>; Sat, 24 Apr 2021 15:49:32 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 9C24372D
for <gentoo-commits@lists.gentoo.org>; Sat, 24 Apr 2021 15:49:29 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1619279327.b5bc3082872a0bcc33dd7e88f81837f47a83d63d.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/avahi/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-dns/avahi/avahi-0.8-r2.ebuild net-dns/avahi/metadata.xml
X-VCS-Directories: net-dns/avahi/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: b5bc3082872a0bcc33dd7e88f81837f47a83d63d
X-VCS-Branch: master
Date: Sat, 24 Apr 2021 15:49:29 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 3313cf07-1d58-4804-8170-e10fa91afc92
X-Archives-Hash: aeb68113f812a3cac76e7e081d0037e6
commit: b5bc3082872a0bcc33dd7e88f81837f47a83d63d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 27 21:29:08 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 24 15:48:47 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5bc3082
net-dns/avahi: Drop 0.8-r2
Closes: https://bugs.gentoo.org/769062
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-dns/avahi/avahi-0.8-r2.ebuild | 213 --------------------------------------
net-dns/avahi/metadata.xml | 3 +-
2 files changed, 1 insertion(+), 215 deletions(-)
diff --git a/net-dns/avahi/avahi-0.8-r2.ebuild b/net-dns/avahi/avahi-0.8-r2.ebuild
deleted file mode 100644
index 9571bd2d62f..00000000000
--- a/net-dns/avahi/avahi-0.8-r2.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2020 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="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="autoipd bookmarks +dbus doc gdbm gtk gtk2 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python 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}] )
- 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-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-qt4
- --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 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
-
- myconf+=( $(multilib_native_use_enable qt5) )
-
- 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 403d3fbd5a5..c357c4fa198 100644
--- a/net-dns/avahi/metadata.xml
+++ b/net-dns/avahi/metadata.xml
@@ -8,9 +8,8 @@
<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="gtk">Use gtk3 for the avahi utilities to build the avahi-ui-gtk3 library</flag>
<flag name="howl-compat">Enable compat libraries for howl</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="mdnsresponder-compat">Enable compat libraries for mDNSResponder</flag>
</use>
<upstream>