aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Shelton <stuart@shelton.me>2018-01-12 14:19:23 +0000
committerStuart Shelton <stuart@shelton.me>2018-01-12 14:19:23 +0000
commite613552cc927e9a663b393094bbc61009cd52f26 (patch)
tree4ca1561f0a059aee9aa9d8da757140579db73009 /net-dns
parentUpdate dev-lang/php-5.6.33, dev-lang/php-7.0.27, dev-lang/php-7.1.13 (diff)
downloadsrcshelton-e613552cc927e9a663b393094bbc61009cd52f26.tar.gz
srcshelton-e613552cc927e9a663b393094bbc61009cd52f26.tar.bz2
srcshelton-e613552cc927e9a663b393094bbc61009cd52f26.zip
Update net-dns/avahi-0.7
Diffstat (limited to 'net-dns')
-rw-r--r--net-dns/avahi/Manifest3
-rw-r--r--net-dns/avahi/avahi-0.7.ebuild5
-rw-r--r--net-dns/avahi/files/avahi-0.6.32-mocqt4.patch12
3 files changed, 18 insertions, 2 deletions
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 4fbf783c..bc24dd2f 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,4 +1,5 @@
AUX autoipd-openrc.sh 700 SHA256 9f9e8d751bc640491397c8a06cbb6f3dcbf9cdf1a083e274f4d802c9c925c6c0 SHA512 a5dbbac4d6d1959db3a07a63acb7569dbeba33d2274a1dd3253dc27687549371611cf08bad3998d89efb3ace63b5541a4d225e484274450e0c82661f5a1dbc32 WHIRLPOOL e6b256655f64f557338ae5f79eaf98ead572d39cf90c76ca270dc54cee4b5edfc087326e5f04166eb2ff232ec2a8a5b87adadc8b3bd8b2ec2e3b6503ca39bee6
AUX autoipd.sh 1271 SHA256 9582a49d0674fac714f448976065fd4e1f0423c08f645685160ed682a121f8c9 SHA512 0bff9ca7e32212aef0246db5baf10ee4f7e93a987b7c591b21ed9f116a1c662a84be9d784fc919205c1fecb5cd8421b81a0eb590c3cc066c6b1b9265b98f1ea3 WHIRLPOOL b33889de73f571b18da092342be6a47e71d608466aa0d94fa3f0d8d7e373265767a62bdfb82df31059549e4ec0d05aacef89f1778ea561152fd5e1970072584c
+AUX avahi-0.6.32-mocqt4.patch 537 SHA256 6b301812a092015f653c929c04b40ac0d566ae90c4b622a997c8466fa464f526 SHA512 047d1083f9bcf24ded0a8dcffc508dc465f490da72108b9ca1b88bb217a10bcbb0678c8e5cea47869c7e33deb639edcfea2da6e3902d97b0817a67a8b7572890 WHIRLPOOL d9c8b7cdeb1a991c2a8961225975cf7fddcb4ac70c61c53cae19517652d5cabf908689eee1a0b79c5a0350a85e9548b8002225e9222e80a32b329b28e1c6eb81
DIST avahi-0.7.tar.gz 940047 SHA256 fd45480cef0559b3eab965ea3ad4fe2d7a8f27db32c851a032ee0b487c378329 SHA512 61f656da7614d8cca1862180038f571db3474c84f05db4d3509f614cdbf8b1a1047661b7e24d63682d5b48ed1bfa1b08b3c9e6dbe9222bcd62d99bc168a11abe WHIRLPOOL bb6f2763309f8426bc65e81f41ac2205076d6f5f9e84f1bba6ed998595c5c2db126b30bf376286f5bd6e61605c3b219fbce9ee325585d2e463d3ef43bc6bcc1a
-EBUILD avahi-0.7.ebuild 5282 SHA256 7f190deb47688937517195951cd4d4014afdf85503341d6b9175d042bde1d65a SHA512 984c99629420248888effc712b87d438a50b80c70f0b5d1aab00312a55b37bb3ba5cba27b0d268fadd3fd9d901caf61ce39d0ac3fc5a9614f1dc430233d1f5ab WHIRLPOOL 282f819b8f353d3ad895e5f2fae2b6f5a8f318bfa4da9acb9bd80439805c51a462aff111091a718f150294265398dfa157e7134700578e772d00191210fd9eba
+EBUILD avahi-0.7.ebuild 5398 SHA256 a394717b366d434d65532bf2383baa2490aa34ea928bf54132e2fcef96a3e349 SHA512 557786b9621ff59e6de46ac7ab3a0f31557597e95c8d7e02e51a6e0783cd7ea1cc4004dff2ae37908d4d88ee5a7c4b23de7df3420e3ef1f0bfc81a1f16314ff4 WHIRLPOOL aae67922ae30f209b47f09ab4a18e4c3c3e1a151a5169312f08ff7afd1a6dede592ba14d762e47f41ffa02b9a1ea08ccb5400b99e7487539937317809fb4f6f4
diff --git a/net-dns/avahi/avahi-0.7.ebuild b/net-dns/avahi/avahi-0.7.ebuild
index 5e1f8de5..e5cfce2d 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"
@@ -101,6 +101,9 @@ src_prepare() {
-e '/^avahi_runtime_dir=/s|/run|/var/run|' \
configure.ac || 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 00000000..bba25e97
--- /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