[patch] net-dns/avahi-0.7-r1.ebuild.diff

avahi-0.7-qt5.ebuild (text/plain), 2.15 KB, created by Andreas Sturmlechner on 2018-01-20 19:24:30 UTC

--- a/net-dns/avahi/avahi-0.7.ebuild	2018-01-20 18:35:55.570223289 +0100
+++ b/net-dns/avahi/avahi-0.7.ebuild	2018-01-20 20:22:10.778435112 +0100
@@ -19,8 +19,8 @@
 LICENSE="LGPL-2.1"
 SLOT="0"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc x86"
-IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt4 selinux test"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc x86"
+IUSE="autoipd bookmarks dbus doc gdbm gtk gtk3 howl-compat +introspection ipv6 kernel_linux mdnsresponder-compat mono nls python qt5 selinux test"
 
 REQUIRED_USE="
 	python? ( dbus gdbm ${PYTHON_REQUIRED_USE} )
@@ -34,7 +34,7 @@
 	dev-libs/expat
 	dev-libs/glib:2[${MULTILIB_USEDEP}]
 	gdbm? ( sys-libs/gdbm[${MULTILIB_USEDEP}] )
-	qt4? ( dev-qt/qtcore:4[${MULTILIB_USEDEP}] )
+	qt5? ( dev-qt/qtcore:5 )
 	gtk? ( x11-libs/gtk+:2[${MULTILIB_USEDEP}] )
 	gtk3? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )
 	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
@@ -70,6 +70,10 @@
 	selinux? ( sec-policy/selinux-avahi )
 "
 
+MULTILIB_WRAPPED_HEADERS=( /usr/include/avahi-qt5/qt-watch.h )
+
+PATCHES=( "${FILESDIR}/${P}-qt5.patch" )
+
 pkg_preinst() {
 	enewgroup netdev
 	enewgroup avahi
@@ -86,6 +90,8 @@
 }
 
 src_prepare() {
+	default
+
 	if ! use ipv6; then
 		sed -i \
 			-e s/use-ipv6=yes/use-ipv6=no/ \
@@ -96,11 +102,6 @@
 		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
 		doxygen_to_devhelp.xsl || die
 
-	# Don't pick up wrong moc based on qtchooser default, bug #587830
-	eapply "${FILESDIR}"/${PN}-0.6.32-mocqt4.patch
-
-	eapply_user
-
 	# Prevent .pyc files in DESTDIR
 	>py-compile
 
@@ -140,6 +141,8 @@
 		)
 	fi
 
+	myconf+=( $(multilib_native_use_enable qt5) )
+
 	econf \
 		--localstatedir="${EPREFIX}/var" \
 		--with-distro=gentoo \
@@ -162,7 +165,7 @@
 		$(use_enable nls) \
 		$(multilib_native_use_enable introspection) \
 		--disable-qt3 \
-		$(use_enable qt4) \
+		--disable-qt4 \
 		$(use_enable gdbm) \
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
 		"${myconf[@]}"