net-dns/avahi: Don't call moc directly

Closes: https://bugs.gentoo.org/587830
Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/net-dns/avahi/avahi-0.6.32-r2.ebuild b/net-dns/avahi/avahi-0.6.32-r2.ebuild
index 92aba59f400ca553ff224a750663426277c62d2b..876f83bcf2d8b86af332996fbcbfb778efe3e31a 100644 (file)
--- a/net-dns/avahi/avahi-0.6.32-r2.ebuild
+++ b/net-dns/avahi/avahi-0.6.32-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -112,6 +112,9 @@ src_prepare() {
        # Update the init scripts for the new openrc, bug #594622
        epatch "${FILESDIR}"/${PN}-0.6.32-openrc-0.21.7-fix-init-scripts.patch
 
+       # Don't pick up wrong moc based on qtchooser default, bug #587830
+       epatch "${FILESDIR}"/${PN}-0.6.32-mocqt4.patch
+
        # Bug #525832
        epatch_user
 

diff --git a/net-dns/avahi/avahi-0.7.ebuild b/net-dns/avahi/avahi-0.7.ebuild
index d77bb4af9a0da990e243e8ec3aa03e149c2d61be..bfb9882d4725b37ec4637aba5bed83df69cd6c52 100644 (file)
--- a/net-dns/avahi/avahi-0.7.ebuild
+++ b/net-dns/avahi/avahi-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -96,6 +96,9 @@ src_prepare() {
                -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

diff --git a/net-dns/avahi/files/avahi-0.6.32-mocqt4.patch b/net-dns/avahi/files/avahi-0.6.32-mocqt4.patch
new file mode 100644 (file)
index 0000000..bba25e9
--- /dev/null
+++ b/net-dns/avahi/files/avahi-0.6.32-mocqt4.patch
@@ -0,0 +1,12 @@
+--- a/configure.ac     2018-01-11 23:00:47.503309612 +0100
++++ b/configure.ac     2018-01-11 23:10:04.373295395 +0100
+@@ -516,8 +516,7 @@
+         PKG_CHECK_MODULES( QT4, [ QtCore >= 4.0.0 ])
+         AC_SUBST(QT4_CFLAGS)
+         AC_SUBST(QT4_LIBS)
+-          QT4_PREFIX="`$PKG_CONFIG --variable=prefix QtCore`/bin"
+-        AC_PATH_PROGS(MOC_QT4, [moc-qt4 moc], no, [$QT4_PREFIX])
++        MOC_QT4="`$PKG_CONFIG --variable=moc_location QtCore`"
+         if test "$MOC_QT4" = no; then
+             AC_MSG_ERROR([Could not find QT4 moc])
+         fi