gentoo resync : 13.01.2018

4 files changed, 23 insertions, 4 deletions

diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 81e971b0d6b3..46bbbaaee6cf 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -8,6 +8,7 @@ AUX avahi-0.6.31-host-name-from-machine-id.patch 3001 BLAKE2B 9ea5e9c26c3603517d
 AUX avahi-0.6.31-install-exec-hook.patch 507 BLAKE2B 06e1da7773299f903658a24d4bf412ed8e08c59e62786b6d91ec0b76d7bcf8c43748945a0779b880a54878f4dde0262277b8809a359daf2af42e4648c25c049a SHA512 c25802f78b5c2f6cc15705c6e426b6590dbcdf30d33e239bd919e9592c5e72c7fb244726e74addfeff4b81fa41cc62afb3ddb880232fea66f3cc9470bb5940b1
 AUX avahi-0.6.31-invalid_packet.patch 1073 BLAKE2B a6ae5008e20f620c2314616483cc97f0b41b9bbcfee1f84721c31fb960b8446151260f1fa0a18265cbdb6eb5314b490e1aca6592dc2bf9cd64e84ffb06c30ef4 SHA512 1582efd8c3474e7f675d86449974ae29db6ee28bd61642d37ae3efbe3903183e5f005051de400d28c116d791a6be00d90c61f3eb1d74e0650119269ca04dab4d
 AUX avahi-0.6.31-so_reuseport-may-not-exist-in-running-kernel.patch 1265 BLAKE2B 093a68402eee840ea72b9c09e1cfff5ba9c2c75df385dc483bca0381bdff4e5e01b6a64aff988448b71e5bb50e4dbcf28c96b10932be1964469ec8755a03f301 SHA512 f575e3ba1c704ec3bf92ffd8344a104f35026e6738720955caa23549f602f491c5e209188c5c00189b269e79e6120021d02cc07fbdea22a7c99ce7682f017fe7
+AUX avahi-0.6.32-mocqt4.patch 537 BLAKE2B f03ad497d4d94989a61b38e99cd74977760bd6046dc8c5bf5336062fd3327bbcae8df4c2d5c4d3c613f593ed7cd63075dc861b44aa627940228f6440a8365e37 SHA512 047d1083f9bcf24ded0a8dcffc508dc465f490da72108b9ca1b88bb217a10bcbb0678c8e5cea47869c7e33deb639edcfea2da6e3902d97b0817a67a8b7572890
 AUX avahi-0.6.32-openrc-0.21.7-fix-init-scripts.patch 918 BLAKE2B 3ed83f437b82bc98253df8a72dbd9e5a2d018e3b3e7711f04919b4926d6c8e8b0ec9531c9021453ae576cbb9919a8daaec85b721b5858355f9f6fd2fd609bffd SHA512 c62167c538af81362abba5a4012336f5d12aa20edc3cbb69f305ba89be90e4c62e1ce1613779d3ad0cbfba99e4ff46b803e4a26fe72cefefd628827a610318a3
 AUX avahi-0.6.x-openrc-0.9.x-init-scripts-fixes.patch 633 BLAKE2B 900926dbe6a0716ef37d95bc37c0115d02e48d3cfdda26ce86dc020ae0ab3b5fedbe6f5a50631b17fb210621839ac25a1bd43bfdd95a908e248a226670153d95 SHA512 c2d11b243acdc058cde03b872dccbbbd44a7a584adf168f16016f29c7a5d9d8668095b781f53102feba8b9c80b2cbbd788c9b327d9d1e2e552fbdcf3c2960517
 DIST avahi-0.6.31.tar.gz 1268686 BLAKE2B 959526c69855495948222709227c7c0d07653bb91f223d80e3d1b6ee16b03952015634984fe754c2c828f76035cd966131eeb047fe4c922493c129a77b14d2be SHA512 53eb00d570a274d841e1e6ad07da077950089ae39b4f7aa21fcd21cc5320b30b506b43e7e57e56198e155cc7bd289b779a48b2b2fc002dc6194a946110451858
@@ -16,7 +17,7 @@ DIST avahi-0.7.tar.gz 940047 BLAKE2B 8299577bf27ee65fad5d743dbf94202b148a6fc8682
 EBUILD avahi-0.6.31-r10.ebuild 6444 BLAKE2B deee480926a554f671ba7d6a3425ac1292b429581952c377f440fae12da2f0896037dbe885a8c7991b8c55329098d07c2fcbf87bca8a1bb2c1ef9427378003b2 SHA512 231567dcc74fbe09a4d18cc52074430b2f8c552c2e1212207af5879d6234f0067eebef495872c0c589d77f8fad177d05247f9927dc648963ee9f1e792335da81
 EBUILD avahi-0.6.31-r11.ebuild 6261 BLAKE2B a11de83cced8adec29e5a3df8ad09fc2dd16d8247dc2e72b208ddb3de86a695d8d164920e2f3e96086d5ead5b251a49c380f2a61764bbdb6b3500dd39e98c7d4 SHA512 0a0645d1c38fcde7d34dfdd38f21ab177cfac21bbc01def180ec9fb0f311ce0273565f425c096c6ee29ec20651818136da166d4c3b26d29c8d7f8473a0cd4ed1
 EBUILD avahi-0.6.32-r1.ebuild 5732 BLAKE2B 6b17c7e9d223e288e309ef3f51326bff5d3e895e12a1db585f0fe3a086ba0a80bfaccb0d9ef79b769200fe985be92826efb64eb071ca93c79d82a4addde91b98 SHA512 d26256a031d5d7ce6cf58ff4c98d5a88ed93498d0383e1a425e88bc9f1de4ee18c0b2ab6e987163b5a27acc807199c8f91276e449dc6d951607c1dfddfaa74c4
-EBUILD avahi-0.6.32-r2.ebuild 5855 BLAKE2B bf094e3aafa5e289cd9f36290b649c2d152598583d90c19f1cb92c5a5a8c3d0d40c238fa428ac3beb355a6c7e7ed8e8584c19c7af8fc4dfaafb8cb234fa65534 SHA512 44aef809779706e5f0e8c5e047b69a795a7d450a59e7fed174c2f7cb5043f6c9d547daff6699ee9e28e9af3ba02caa54a5293ec8ef11219c35bda4b9f3cfdb00
+EBUILD avahi-0.6.32-r2.ebuild 5971 BLAKE2B 97aa22378ee9791dddb866a097b4c1fe69152e90939d67b1a95c890488b297dcf80e2df1f4435af0d69f798c9fc7d6365329ff481b6f24af50dbe37dcf2fe1d5 SHA512 e25666354328ba52955b938d4cfd1d0ff661cd6c536fddfc8cfc84afdaaebdafc8091bd99d17d737e79242c45b858df23a3cfbed8cf0c5491bb70ff7ed192b93
 EBUILD avahi-0.6.32.ebuild 5584 BLAKE2B 48672b141bd86b76838acae05f4d6e3f4fffeb686e42e058b8b8c3c771568df7ca12bee6a215079729d585d6415c30146787e73aeb1b84abafbff5da00ec9b48 SHA512 031b6ea7962717de7f984c78a2814312610b86ce391a2474117b34b2e8c542a6de49b75998c99639f866f415b878ed58f807a12ea713d3b1d15ef0657013e4a0
-EBUILD avahi-0.7.ebuild 5075 BLAKE2B b4cf614d01a33cdb187679e982ed5a2618ece26072dd392c2339267ca9f30922b09bd90b6495e1e9528ab1837ae38160dd6c612bb82b968df1957f4445195146 SHA512 5d52a7ac1a9d7c5aa2626f42bfeb1195126f20a54cf4bcd2e48b2ef7efe037bd5d254e08d993f7a2c777ca5b35525228deecff307189890708b39e3b730161c5
+EBUILD avahi-0.7.ebuild 5191 BLAKE2B 21ee99f003cdd0801183bac280b1862e5e431cbea49bd5d5449675eb7119edc165b3c92ba65fc98f7e8a62d813d7c47e05268d4d2f0d0a78e4db8ad399e52c5a SHA512 2bb37573bb68d89b66c8d3369ccfd883b4f5238bd3a15ac74cb8b56fc1751000eafce0a3bca30d29ba5da193c5cdff25e743c0a59f5fac4e6aeb8716bad75b57
 MISC metadata.xml 970 BLAKE2B 26904ceb3a89833caa77e2315d99be8ef729277a021faa3800a1cd0abe94c516d53176e65668d00687a6bb6ee807a2011106268f14a4d5012c27132e4fca4f3c SHA512 b9498d4757b6bd793846e4cbdd5c37da601a8e1430cafd1a6039ff54f8ff10576684c58801ebc679061f975cefa5909c94c30976e84354a5fcc7d2a586f7fa8e
diff --git a/net-dns/avahi/avahi-0.6.32-r2.ebuild b/net-dns/avahi/avahi-0.6.32-r2.ebuild
index 92aba59f400c..876f83bcf2d8 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 d77bb4af9a0d..bfb9882d4725 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 000000000000..bba25e971630
--- /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