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

avahi-qt5.patch (text/plain), 1.85 KB, created by Andreas Sturmlechner on 2017-12-04 22:58:46 UTC

--- avahi-0.7.ebuild	2017-11-28 01:19:54.244273276 +0100
+++ avahi-0.7-r1.ebuild	2017-12-04 23:48:31.988695405 +0100
@@ -20,7 +20,7 @@
 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"
+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,8 @@
 	selinux? ( sec-policy/selinux-avahi )
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt5.patch" )
+
 pkg_preinst() {
 	enewgroup netdev
 	enewgroup avahi
@@ -86,6 +88,8 @@
 }
 
 src_prepare() {
+	default
+
 	if ! use ipv6; then
 		sed -i \
 			-e s/use-ipv6=yes/use-ipv6=no/ \
@@ -96,8 +100,6 @@
 		-e "s:\\.\\./\\.\\./\\.\\./doc/avahi-docs/html/:../../../doc/${PF}/html/:" \
 		doxygen_to_devhelp.xsl || die
 
-	eapply_user
-
 	# Prevent .pyc files in DESTDIR
 	>py-compile
 
@@ -137,6 +139,8 @@
 		)
 	fi
 
+	myconf+=( $(multilib_native_use_enable qt5) )
+
 	econf \
 		--localstatedir="${EPREFIX}/var" \
 		--with-distro=gentoo \
@@ -159,7 +163,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[@]}"