gentoo resync : 23.12.2017

6 files changed, 2 insertions, 88 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 7c8ebe9dbd8d..e8f6acf04cbd 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index 09bf4ec91a8e..6a856339de82 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -5,5 +5,5 @@ AUX geoclue-2.4.1-fix-GLIBC-features.patch 1449 BLAKE2B d3411ef1d35b7dc902d2d18a
 DIST geoclue-0.12.99.tar.gz 608074 BLAKE2B af0c8141ade57791159f87ee7725134f18ba07cfdf9207c26c1ce77fd46a41aabfec4ba37882816bd70341964db2a89c2bc327292c097ea2e413dcb4bd7385c8 SHA512 32f946c9ee66cff2a6564b275d5f7bdf0d42832166c9fbeccb0aa55f3c3370fd8de114ad26477df6a2ee9d22250a5b104ec384032b28c3a62c356baea05d1bc2
 DIST geoclue-2.4.7.tar.xz 368472 BLAKE2B c083f0694a90292b7b0834075e4fe15d29f07cc04157ad339bb2c93e0ca17a04916713c9284bf35e9dccbd8b3d66de1d0d88fb378aa5f33dd59ab57bfc72f570 SHA512 472cf923abfd40dee296eee2e6888c47f273ad709e1bdcce534bd794cf9f7073ceabd6addf918277e10498e094af5a6e9539b5cf24171577e78bc3b0b2d17b72
 EBUILD geoclue-0.12.99.ebuild 1976 BLAKE2B ed7a3e5561e9437c99fdd802496f8a88e9346bbe4c37cd5c58bb59ccbd9424483bb6faa24ccb15bbd66c7512fd2fe7bc7c9f761f3e7bcbaf674825953a9fefbf SHA512 ded60d1f1045cf6d05963fcb49eba167445526833651c095874c01b5dba837075b0ae4a0e4586f31a3dcaf56dcd4b2ee6019e926608f4e5218d0bea7db9eddc8
-EBUILD geoclue-2.4.7.ebuild 1569 BLAKE2B 313e7e19553b4f0cbfa29c7efa6f1caa9e9c118f70733499c0d4f709bb746bcdeb72f979a3a54824da5eb2e513f1d8ee49787b1a63b694b97e007887a316803c SHA512 5cd0ecc2e692bac02e46686eb77ce6a0bba96086f6b353615ea474e99eae12e53d0aedd98541754bedf724f6b723e82de97598f6dcf8200d031b541b52d07320
+EBUILD geoclue-2.4.7.ebuild 1575 BLAKE2B c11bb62da829bff6334da9dee337b28aa6285268a17f7426ccc92c85cf5bb610140428d110257714ee1dca8c6026e863e626f677cdd8923c1e45aec091d84b05 SHA512 1f7a3dc12b1904cdcbe8dbdd01a4bd66d24e0ff0892351208aac3b6985225c4185a87aae5828a9fb69730add7b3efab7ab6545fa3020e72f383a01454257da38
 MISC metadata.xml 1252 BLAKE2B 19af081815ecc62a145bd3839b4822498c5f689665adf6cc46b7ff7e1615d5d22ce54d2bc551a2f619f9d7ebc020400e795ec5962295a88288546a7ed24af492 SHA512 809d9b3afe58bf9e00bc826dbc7e2253461426084f8290d2b53ff0785666ec7b3626997b453a36a8eefcbae220f2f273008c3c51a7071a13da54e4e897d5c5ae
diff --git a/app-misc/geoclue/geoclue-2.4.7.ebuild b/app-misc/geoclue/geoclue-2.4.7.ebuild
index 4748e7b60d88..a14ed58d9f3b 100644
--- a/app-misc/geoclue/geoclue-2.4.7.ebuild
+++ b/app-misc/geoclue/geoclue-2.4.7.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	sys-apps/dbus
 	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
 	modemmanager? ( >=net-misc/modemmanager-1 )
-	zeroconf? ( >=net-dns/avahi-0.6.10 )
+	zeroconf? ( >=net-dns/avahi-0.6.10[dbus] )
 	!<sci-geosciences/geocode-glib-3.10.0
 "
 DEPEND="${RDEPEND}
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index dad30942db10..acc1f3b726f4 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -1,7 +1,5 @@
 AUX mosquitto 559 BLAKE2B 16a34850c13d9fd6007b5fbd26b4db9e31caa0ee91b8eee8dbca605c273756bf6c92458d5093eee56f603cce7f10956ee084403e188d49693a759538976f411f SHA512 0bb0e648484269c2a5396118340177af10fae9ccbe4973371f7c8f5e31c96ff97c5146680415c450bad63397baa5c076e7c994f897fd3af2fcce0d1e0965ee22
 AUX mosquitto-1.4.10-conditional-tests.patch 1142 BLAKE2B 66be5988681be543a1c9d61bbd47baa528be1d8d8b1206e7d711b0d7789aba41ae8bd28e2729d084c6bb64fc43386e31a426717b0719c5c26219d3fa0a166455 SHA512 d07a081830fe7d23db380033c0c68d366bf60652f86c43a39074faa9bbcc6286485aad225226b64ef3055b4bd7a6c6969fa9ddd97eb2e6d8d98e815a881e634c
-AUX mosquitto-1.4.8-conditional-tests.patch 1080 BLAKE2B 63799137a502cb94af78e2bf6e2eb9781fba5d20d3582f9ddd7c37da4d271ae53860bf217a127b6f5e88a8235cd0d1954e682f93157df9d3684c00f8bb7d122a SHA512 f31bb648ded33dc8d151743ebbc84ed4be634e20fe2938eecd4fa9e2cdea50951ae11ae674a43cb7683862aa5feec4907f00b9dedeba88cd2711d34d4f7d697a
-AUX mosquitto-1.4.9-conditional-tests.patch 1142 BLAKE2B 66be5988681be543a1c9d61bbd47baa528be1d8d8b1206e7d711b0d7789aba41ae8bd28e2729d084c6bb64fc43386e31a426717b0719c5c26219d3fa0a166455 SHA512 d07a081830fe7d23db380033c0c68d366bf60652f86c43a39074faa9bbcc6286485aad225226b64ef3055b4bd7a6c6969fa9ddd97eb2e6d8d98e815a881e634c
 AUX mosquitto.service 261 BLAKE2B 6ea8059914acf8730f2e7d04bfd5f79c59a335b65ddecb4773bb4418260c6ed6d0120eaa2e3f7ba4842fc7014e5b51d1ba376cf1db2009b7a55a53a4e6747221 SHA512 3552618733fc106705375c5a1126db72e356694705312072f27f18e21c142cd75ae3ff1f17854ce54cdee092ff9e01fd75c1a8a12d68f75ead8a3697c69623e9
 DIST mosquitto-1.4.14.tar.gz 365596 BLAKE2B 92bcb1fd9e67711d6ce8db5e767be31a1321866205cf4cad684d8b77a8b14a2eaf5e4367a74d5dd8f814f0d229dc77ce878879632c0c34c6a23f7975bf6ae8c7 SHA512 dc75a971354f87deeb79f32435acfae9bc561a1a24a75ee4940a35176ff91758071930d2105d8dee2a090e07527dbfaa5692bece67e03cc87e8b4b8b46f846c2
 EBUILD mosquitto-1.4.14.ebuild 2453 BLAKE2B e8785e9f2dcd4d8d1a627dff29a895b0ff1f149b0a63454371b31ff241a42e7bbb7288c7a5becf3175cafe29c4da11e5fd656f8bb311cb892909929e62e93034 SHA512 a7ce7e5f393cf6508415c044a51518891f7a953ecdaa680f952cfbfdb8905561a017b0a7dad5281d9fee41c909331b26712c0466a33e345a232d538ffafb2a7f
diff --git a/app-misc/mosquitto/files/mosquitto-1.4.8-conditional-tests.patch b/app-misc/mosquitto/files/mosquitto-1.4.8-conditional-tests.patch
deleted file mode 100644
index 811cee645c9a..000000000000
--- a/app-misc/mosquitto/files/mosquitto-1.4.8-conditional-tests.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/test/broker/Makefile	2016-02-14 14:36:55.000000000 +0000
-+++ b/test/broker/Makefile	2016-05-05 09:53:30.548519257 +0100
-@@ -63,11 +63,13 @@
- 	./05-clean-session-qos1.py 
- 
- 06 :
-+ifeq ($(WITH_BRIDGE),yes)
- 	./06-bridge-reconnect-local-out.py
- 	./06-bridge-br2b-disconnect-qos1.py
- 	./06-bridge-br2b-disconnect-qos2.py
- 	./06-bridge-b2br-disconnect-qos1.py
- 	./06-bridge-b2br-disconnect-qos2.py
-+endif
- 
- 07 :
- 	./07-will-qos0.py
-@@ -85,10 +87,12 @@
- 	./08-ssl-connect-cert-auth-crl.py
- 	./08-ssl-connect-identity.py
- 	./08-ssl-connect-no-identity.py
-+ifeq ($(WITH_BRIDGE),yes)
- 	./08-ssl-bridge.py
- 	./08-tls-psk-pub.py
- 	./08-tls-psk-bridge.py
- endif
-+endif
- 
- 09 :
- 	./09-plugin-auth-unpwd-success.py
---- a/test/broker/c/Makefile	2016-02-14 14:36:55.000000000 +0000
-+++ b/test/broker/c/Makefile	2016-05-05 09:40:31.440608209 +0100
-@@ -13,7 +13,9 @@
- 	$(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1
- 
- 08-tls-psk-bridge.test : 08-tls-psk-bridge.c
-+ifeq ($(WITH_BRIDGE),yes)
- 	$(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1
-+endif
- 
- 
- reallyclean : clean
diff --git a/app-misc/mosquitto/files/mosquitto-1.4.9-conditional-tests.patch b/app-misc/mosquitto/files/mosquitto-1.4.9-conditional-tests.patch
deleted file mode 100644
index 12b4fc56bc3c..000000000000
--- a/app-misc/mosquitto/files/mosquitto-1.4.9-conditional-tests.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/test/broker/Makefile	2016-06-02 22:20:22.000000000 +0100
-+++ b/test/broker/Makefile	2016-07-08 14:17:33.772666865 +0100
-@@ -63,6 +63,7 @@
- 	./05-clean-session-qos1.py 
- 
- 06 :
-+ifeq ($(WITH_BRIDGE),yes)
- 	./06-bridge-reconnect-local-out.py
- 	./06-bridge-br2b-disconnect-qos1.py
- 	./06-bridge-br2b-disconnect-qos2.py
-@@ -70,6 +71,7 @@
- 	./06-bridge-b2br-disconnect-qos2.py
- 	./06-bridge-fail-persist-resend-qos1.py
- 	./06-bridge-fail-persist-resend-qos2.py
-+endif
- 
- 07 :
- 	./07-will-qos0.py
-@@ -87,10 +89,12 @@
- 	./08-ssl-connect-cert-auth-crl.py
- 	./08-ssl-connect-identity.py
- 	./08-ssl-connect-no-identity.py
-+ifeq ($(WITH_BRIDGE),yes)
- 	./08-ssl-bridge.py
- 	./08-tls-psk-pub.py
- 	./08-tls-psk-bridge.py
- endif
-+endif
- 
- 09 :
- 	./09-plugin-auth-unpwd-success.py
---- a/test/broker/c/Makefile	2016-02-14 14:36:55.000000000 +0000
-+++ b/test/broker/c/Makefile	2016-05-05 09:40:31.440608209 +0100
-@@ -13,7 +13,9 @@
- 	$(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1
- 
- 08-tls-psk-bridge.test : 08-tls-psk-bridge.c
-+ifeq ($(WITH_BRIDGE),yes)
- 	$(CC) ${CFLAGS} $^ -o $@ ../../../lib/libmosquitto.so.1
-+endif
- 
- 
- reallyclean : clean