From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 55579138206 for ; Thu, 11 Jan 2018 22:32:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 71711E087A; Thu, 11 Jan 2018 22:32:16 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 429F8E087A for ; Thu, 11 Jan 2018 22:32:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0CF99335C3B for ; Thu, 11 Jan 2018 22:32:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C8A98193 for ; Thu, 11 Jan 2018 22:32:13 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1515709918.f97f8e63b790fb4507a613a6ca5d0c35392fe243.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/avahi/files/, net-dns/avahi/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dns/avahi/avahi-0.6.32-r2.ebuild net-dns/avahi/avahi-0.7.ebuild net-dns/avahi/files/avahi-0.6.32-mocqt4.patch X-VCS-Directories: net-dns/avahi/files/ net-dns/avahi/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: f97f8e63b790fb4507a613a6ca5d0c35392fe243 X-VCS-Branch: master Date: Thu, 11 Jan 2018 22:32:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: abff044c-5dfc-4a53-b6c8-cf25f6683373 X-Archives-Hash: 0a67bab12b9ad144abc13a59d6393c7f commit: f97f8e63b790fb4507a613a6ca5d0c35392fe243 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jan 11 22:26:56 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jan 11 22:31:58 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f97f8e63 net-dns/avahi: Don't call moc directly Closes: https://bugs.gentoo.org/587830 Package-Manager: Portage-2.3.19, Repoman-2.3.6 net-dns/avahi/avahi-0.6.32-r2.ebuild | 5 ++++- net-dns/avahi/avahi-0.7.ebuild | 5 ++++- net-dns/avahi/files/avahi-0.6.32-mocqt4.patch | 12 ++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/net-dns/avahi/avahi-0.6.32-r2.ebuild b/net-dns/avahi/avahi-0.6.32-r2.ebuild index 92aba59f400..876f83bcf2d 100644 --- 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 d77bb4af9a0..bfb9882d472 100644 --- 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 index 00000000000..bba25e97163 --- /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