[patch] Proposed ebuild update (diff)

avahi-0.6.32-r3.ebuild.patch (text/plain), 3.07 KB, created by Martin Cyr on 2017-06-13 01:49:32 UTC

--- /usr/portage/net-dns/avahi/avahi-0.6.32-r2.ebuild	2017-04-23 16:57:59.000000000 -0400
+++ /usr/local/portage/net-dns/avahi/avahi-0.6.32-r3.ebuild	2017-06-12 21:48:56.179118351 -0400
@@ -1,24 +1,19 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 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
+inherit autotools 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="https://github.com/lathiat/avahi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-S="${WORKDIR}/${P}"
-
 LICENSE="LGPL-2.1"
 SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86"
 IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test utils"
 
@@ -71,6 +66,8 @@
 	selinux? ( sec-policy/selinux-avahi )
 "
 
+HTML_DOCS="doxygen/html"
+
 pkg_preinst() {
 	enewgroup netdev
 	enewgroup avahi
@@ -99,21 +96,21 @@
 
 	# Make gtk utils optional
 	# https://github.com/lathiat/avahi/issues/24
-	epatch "${FILESDIR}"/${PN}-0.6.30-optional-gtk-utils.patch
+	eapply -p0 "${FILESDIR}"/${PN}-0.6.30-optional-gtk-utils.patch
 
 	# Don't install avahi-discover unless ENABLE_GTK_UTILS, bug #359575
 	# https://github.com/lathiat/avahi/issues/24
-	epatch "${FILESDIR}"/${PN}-0.6.31-fix-install-avahi-discover.patch
+	eapply "${FILESDIR}"/${PN}-0.6.31-fix-install-avahi-discover.patch
 
 	# Fix build under various locales, bug #501664
 	# https://github.com/lathiat/avahi/issues/27
-	epatch "${FILESDIR}"/${PN}-0.6.31-fix-locale-build.patch
+	eapply "${FILESDIR}"/${PN}-0.6.31-fix-locale-build.patch
 
 	# Update the init scripts for the new openrc, bug #594622
-	epatch "${FILESDIR}"/${PN}-0.6.32-openrc-0.21.7-fix-init-scripts.patch
+	eapply "${FILESDIR}"/${PN}-0.6.32-openrc-0.21.7-fix-init-scripts.patch
 
 	# Bug #525832
-	epatch_user
+	eapply_user
 
 	# Prevent .pyc files in DESTDIR
 	>py-compile
@@ -127,7 +124,7 @@
 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
+	use python && python_setup && python_export #python_export_best
 
 	# We need to unset DISPLAY, else the configure script might have problems detecting the pygtk module
 	unset DISPLAY
@@ -183,7 +180,7 @@
 		--disable-qt3 \
 		$(use_enable qt4) \
 		$(use_enable gdbm) \
-		$(systemd_with_unitdir) \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
 		"${myconf[@]}"
 }
 
@@ -203,7 +200,7 @@
 	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
+		dodoc -r doxygen/html/. || die
 		insinto /usr/share/devhelp/books/avahi
 		doins avahi.devhelp || die
 	fi