1 |
commit: b5bc3082872a0bcc33dd7e88f81837f47a83d63d |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 27 21:29:08 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 24 15:48:47 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5bc3082 |
7 |
|
8 |
net-dns/avahi: Drop 0.8-r2 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/769062 |
11 |
Package-Manager: Portage-3.0.17, Repoman-3.0.2 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
net-dns/avahi/avahi-0.8-r2.ebuild | 213 -------------------------------------- |
15 |
net-dns/avahi/metadata.xml | 3 +- |
16 |
2 files changed, 1 insertion(+), 215 deletions(-) |
17 |
|
18 |
diff --git a/net-dns/avahi/avahi-0.8-r2.ebuild b/net-dns/avahi/avahi-0.8-r2.ebuild |
19 |
deleted file mode 100644 |
20 |
index 9571bd2d62f..00000000000 |
21 |
--- a/net-dns/avahi/avahi-0.8-r2.ebuild |
22 |
+++ /dev/null |
23 |
@@ -1,213 +0,0 @@ |
24 |
-# Copyright 1999-2020 Gentoo Authors |
25 |
-# Distributed under the terms of the GNU General Public License v2 |
26 |
- |
27 |
-EAPI="7" |
28 |
- |
29 |
-PYTHON_COMPAT=( python3_{7,8} ) |
30 |
-PYTHON_REQ_USE="gdbm" |
31 |
-inherit autotools flag-o-matic multilib-minimal mono-env python-r1 systemd |
32 |
- |
33 |
-DESCRIPTION="System which facilitates service discovery on a local network" |
34 |
-HOMEPAGE="http://avahi.org/" |
35 |
-SRC_URI="https://github.com/lathiat/avahi/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
36 |
- |
37 |
-LICENSE="LGPL-2.1" |
38 |
-SLOT="0" |
39 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" |
40 |
-IUSE="autoipd bookmarks +dbus doc gdbm gtk gtk2 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt5 selinux systemd test" |
41 |
- |
42 |
-REQUIRED_USE=" |
43 |
- python? ( dbus gdbm ${PYTHON_REQUIRED_USE} ) |
44 |
- mono? ( dbus ) |
45 |
- howl-compat? ( dbus ) |
46 |
- mdnsresponder-compat? ( dbus ) |
47 |
- systemd? ( dbus ) |
48 |
-" |
49 |
- |
50 |
-RESTRICT="!test? ( test )" |
51 |
- |
52 |
-DEPEND=" |
53 |
- dev-libs/libdaemon |
54 |
- dev-libs/libevent:=[${MULTILIB_USEDEP}] |
55 |
- dev-libs/expat |
56 |
- dev-libs/glib:2[${MULTILIB_USEDEP}] |
57 |
- gdbm? ( sys-libs/gdbm:=[${MULTILIB_USEDEP}] ) |
58 |
- qt5? ( dev-qt/qtcore:5 ) |
59 |
- gtk2? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] ) |
60 |
- gtk? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] ) |
61 |
- dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) |
62 |
- kernel_linux? ( sys-libs/libcap ) |
63 |
- introspection? ( dev-libs/gobject-introspection:= ) |
64 |
- mono? ( |
65 |
- dev-lang/mono |
66 |
- gtk2? ( dev-dotnet/gtk-sharp:2 ) |
67 |
- ) |
68 |
- python? ( |
69 |
- ${PYTHON_DEPS} |
70 |
- dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) |
71 |
- introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] ) |
72 |
- ) |
73 |
- bookmarks? ( |
74 |
- ${PYTHON_DEPS} |
75 |
- >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
76 |
- ) |
77 |
-" |
78 |
-RDEPEND=" |
79 |
- acct-user/avahi |
80 |
- acct-group/avahi |
81 |
- acct-group/netdev |
82 |
- autoipd? ( |
83 |
- acct-user/avahi-autoipd |
84 |
- acct-group/avahi-autoipd |
85 |
- ) |
86 |
- ${DEPEND} |
87 |
- selinux? ( sec-policy/selinux-avahi ) |
88 |
-" |
89 |
-BDEPEND=" |
90 |
- dev-util/glib-utils |
91 |
- doc? ( app-doc/doxygen ) |
92 |
- app-doc/xmltoman |
93 |
- dev-util/intltool |
94 |
- virtual/pkgconfig |
95 |
-" |
96 |
- |
97 |
-MULTILIB_WRAPPED_HEADERS=( /usr/include/avahi-qt5/qt-watch.h ) |
98 |
- |
99 |
-# These patches do not apply cleanly but may need to be re-instated. |
100 |
-# I'll leave them commented out for now. |
101 |
-#PATCHES=( |
102 |
-# "${FILESDIR}/${PN}-0.7-qt5.patch" |
103 |
-# "${FILESDIR}/${PN}-0.7-CVE-2017-6519.patch" |
104 |
-# "${FILESDIR}/${PN}-0.7-remove-empty-avahi_discover.patch" |
105 |
-# "${FILESDIR}/${PN}-0.7-python3.patch" |
106 |
-# "${FILESDIR}/${PN}-0.7-python3-unittest.patch" |
107 |
-# "${FILESDIR}/${PN}-0.7-python3-gdbm.patch" |
108 |
-#) |
109 |
- |
110 |
-pkg_setup() { |
111 |
- use mono && mono-env_pkg_setup |
112 |
- use python || use bookmarks && python_setup |
113 |
-} |
114 |
- |
115 |
-src_prepare() { |
116 |
- default |
117 |
- |
118 |
- if ! use ipv6; then |
119 |
- sed -i \ |
120 |
- -e "s/use-ipv6=yes/use-ipv6=no/" \ |
121 |
- avahi-daemon/avahi-daemon.conf || die |
122 |
- fi |
123 |
- |
124 |
- sed -i \ |
125 |
- -e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \ |
126 |
- doxygen_to_devhelp.xsl || die |
127 |
- |
128 |
- eautoreconf |
129 |
- |
130 |
- # bundled manpages |
131 |
- multilib_copy_sources |
132 |
-} |
133 |
- |
134 |
-multilib_src_configure() { |
135 |
- local myconf=( |
136 |
- --disable-monodoc |
137 |
- --disable-python-dbus |
138 |
- --disable-qt3 |
139 |
- --disable-qt4 |
140 |
- --disable-static |
141 |
- --enable-manpages |
142 |
- --enable-glib |
143 |
- --enable-gobject |
144 |
- --enable-xmltoman |
145 |
- --localstatedir="${EPREFIX}/var" |
146 |
- --with-distro=gentoo |
147 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
148 |
- $(use_enable dbus) |
149 |
- $(use_enable gdbm) |
150 |
- $(use_enable gtk2 gtk) |
151 |
- $(use_enable gtk gtk3) |
152 |
- $(use_enable howl-compat compat-howl) |
153 |
- $(use_enable mdnsresponder-compat compat-libdns_sd) |
154 |
- $(use_enable nls) |
155 |
- $(multilib_native_use_enable autoipd) |
156 |
- $(multilib_native_use_enable doc doxygen-doc) |
157 |
- $(multilib_native_use_enable introspection) |
158 |
- $(multilib_native_use_enable mono) |
159 |
- $(multilib_native_use_enable python) |
160 |
- $(multilib_native_use_enable test tests) |
161 |
- ) |
162 |
- |
163 |
- if use python; then |
164 |
- myconf+=( |
165 |
- $(multilib_native_use_enable dbus python-dbus) |
166 |
- $(multilib_native_use_enable introspection pygobject) |
167 |
- ) |
168 |
- fi |
169 |
- |
170 |
- if use mono; then |
171 |
- myconf+=( $(multilib_native_use_enable doc monodoc) ) |
172 |
- fi |
173 |
- |
174 |
- if ! multilib_is_native_abi; then |
175 |
- myconf+=( |
176 |
- # used by daemons only |
177 |
- --disable-libdaemon |
178 |
- --with-xml=none |
179 |
- ) |
180 |
- fi |
181 |
- |
182 |
- myconf+=( $(multilib_native_use_enable qt5) ) |
183 |
- |
184 |
- econf "${myconf[@]}" |
185 |
-} |
186 |
- |
187 |
-multilib_src_compile() { |
188 |
- emake |
189 |
- |
190 |
- multilib_is_native_abi && use doc && emake avahi.devhelp |
191 |
-} |
192 |
- |
193 |
-multilib_src_install() { |
194 |
- emake install DESTDIR="${D}" |
195 |
- use bookmarks && use python && use dbus && use gtk2 || \ |
196 |
- rm -f "${ED}"/usr/bin/avahi-bookmarks |
197 |
- |
198 |
- # https://github.com/lathiat/avahi/issues/28 |
199 |
- use howl-compat && dosym avahi-compat-howl.pc /usr/$(get_libdir)/pkgconfig/howl.pc |
200 |
- use mdnsresponder-compat && dosym avahi-compat-libdns_sd/dns_sd.h /usr/include/dns_sd.h |
201 |
- |
202 |
- if multilib_is_native_abi && use doc; then |
203 |
- docinto html |
204 |
- dodoc -r doxygen/html/. |
205 |
- insinto /usr/share/devhelp/books/avahi |
206 |
- doins avahi.devhelp |
207 |
- fi |
208 |
- |
209 |
- # The build system creates an empty "/run" directory, so we clean it up here |
210 |
- rmdir "${ED}"/run || die |
211 |
-} |
212 |
- |
213 |
-multilib_src_install_all() { |
214 |
- if use autoipd; then |
215 |
- insinto /lib/rcscripts/net |
216 |
- doins "${FILESDIR}"/autoipd.sh |
217 |
- |
218 |
- insinto /lib/netifrc/net |
219 |
- newins "${FILESDIR}"/autoipd-openrc.sh autoipd.sh |
220 |
- fi |
221 |
- |
222 |
- dodoc docs/{AUTHORS,NEWS,README,TODO} |
223 |
- |
224 |
- find "${ED}" -name '*.la' -type f -delete || die |
225 |
-} |
226 |
- |
227 |
-pkg_postinst() { |
228 |
- if use autoipd; then |
229 |
- elog |
230 |
- elog "To use avahi-autoipd to configure your interfaces with IPv4LL (RFC3927)" |
231 |
- elog "addresses, just set config_<interface>=( autoipd ) in /etc/conf.d/net!" |
232 |
- elog |
233 |
- fi |
234 |
- |
235 |
- systemd_reenable avahi-daemon.service |
236 |
-} |
237 |
|
238 |
diff --git a/net-dns/avahi/metadata.xml b/net-dns/avahi/metadata.xml |
239 |
index 403d3fbd5a5..c357c4fa198 100644 |
240 |
--- a/net-dns/avahi/metadata.xml |
241 |
+++ b/net-dns/avahi/metadata.xml |
242 |
@@ -8,9 +8,8 @@ |
243 |
<use> |
244 |
<flag name="autoipd">Build and install the IPv4LL (RFC3927) network address configuration daemon</flag> |
245 |
<flag name="bookmarks">Install the avahi-bookmarks application (requires <pkg>dev-python/twisted</pkg>)</flag> |
246 |
+ <flag name="gtk">Use gtk3 for the avahi utilities to build the avahi-ui-gtk3 library</flag> |
247 |
<flag name="howl-compat">Enable compat libraries for howl</flag> |
248 |
- <flag name="gtk2">Use gtk2 for the avahi utilities (overridden by USE=gtk) and build the avahi-ui library</flag> |
249 |
- <flag name="gtk">Use gtk3 for the avahi utilities (overrides USE=gtk2) and build the avahi-ui-gtk3 library</flag> |
250 |
<flag name="mdnsresponder-compat">Enable compat libraries for mDNSResponder</flag> |
251 |
</use> |
252 |
<upstream> |