gentoo resync : 29.01.2021

3 files changed, 16 insertions, 18 deletions

diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index d346934fe74b..970478bb2d9f 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -4,11 +4,11 @@ AUX conky-1.10.8-libical-3.patch 1395 BLAKE2B a42403799854d0c96e37b654ab1a72897e
 AUX conky-1.10.8-portmon.patch 551 BLAKE2B 6b69ebb6c8ec194e51d616f487ab8d736062636b12c11b1beb6ae5d599a34c2598a0bc96563fa9e01e55a7187597b78b311ce729a0bdbe3f0c7c7135372aa764 SHA512 2a793c9b297c9ff13eba4cff37af0699c30f30e58edd3c73243090d26235db45a554b9f5751878937606ac6a1bb1759edc2507372412c25ff4df613327aedc03
 AUX conky-1.10.8-use-pkgconfig.patch 1115 BLAKE2B d951bdd32ee0e6eace1444d3b8a6453c6ba25c15df2cb5ca4e1ccbb2f7f86fb860e4b43e75d76b62f7d1d12e91018bb03fb3b0237ce1b1af239c53f0bffc832b SHA512 e4b73aa8c0cc917a87e1eaecc3a2e55058fa4ea0acee9c76e409cda29de0c430df3a13f8a6c3ac922dd0a11b6c4cfca781bef39c6d508e903ae81423144c86d4
 AUX conky-1.10.8-virtual-sinks.patch 2054 BLAKE2B e047348df61b00dec0de151422a891feede717007e552ffb8fde0f390c0c3208e2c03bb1a615c89f7f4bfaaa8fdb603dd0eb75b4e6bdffe718c9eb6702787c2e SHA512 fe07eb460165bba0521071e7b5c452d4dc5626c7bb8e0c559ac4b275e09e8484a21eec275cfc02ca2162b6461a4198704fd806d6ba3c72504f8d007310a60ccb
-AUX conky-1.11.6-fpermissive.patch 1517 BLAKE2B 6f0c0fc9370955786f74c9a707fd63eb9ead7b5889ab57fe8c6a9326a1ff0253b90c7ccd3f38baa837404787bcded00de46d8132cc0d013ad70910b3fd64f91c SHA512 df645d30e4d6f88348af5dc1c782f6146fab86d744f54d77b0c6561f0f0c2491472e72b55f075a22bc3d16e87a01303955d0a0bffc6495dae390c9904e1f783f
+AUX conky-1.11.6-fpermissive.patch 1397 BLAKE2B 8200932639a6e0366d2c1426747d7de3939f21791c3a252cbe67f336555a9dc98e050114c5298e4d8b62e5b40f4a7a4bec82e1d38746f5a8bba5dba5295bd8c4 SHA512 e8063b7c567aa3aeae8ceab26895b124b865fe2815101d46593359d52f8ca9e830b6caaf2506e86550620df58230c507fb51f643bd0f61d92c232904f483b605
 AUX conky-1.11.6-ipv6.patch 503 BLAKE2B 896cfc76a858981438cecf83db5b2b4fe32d7d6a0749524ac4c4d8dba3fd124a0b7de5d89329280b5c50e9de6cc4e182c23c2813575be6fceb97615e2acda4ca SHA512 3ea5247723676812a07d9ecc129d63cc75e51626a23c202da50bd3172403a24b93f6cbcc5c5e743a9acfe87b6d087ba510381c6157e1995b54d28a6dadbcf08a
 DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a
 DIST conky-1.11.6.tar.gz 2402216 BLAKE2B 573e2a16781ffb246041052796fd2e2f02937e0e1399edb6b8d0a16b90bbd73f84b3332d7dfba4d8bf53becc05b907efaf33fc48d4efda425c87756d44fe35f4 SHA512 f7bffcef33680d61d0171ba50b29ddda011c1c1989fc847cd4b5b60d46bed4772294eec34fd27c4d642a9c03e3cedaa31855ffc0f3b60791f4bed14ffdf7490a
 EBUILD conky-1.10.8-r10.ebuild 4860 BLAKE2B bfa7ab46f34c8fac5a395869ad3ce175c75b748d87cabacac03a39f7d19ac904f5fd1fbb989fe4dbb6aee947b6d775c06d7941f7eecdbc566e09c17087bd7299 SHA512 b2160e9147005b2cc90020c07f8a7c4c0de7641a88f87ff983e573d24d52edd04ab3cefcea96cceb6579a48e021975248cb8f066b9137542def3c801ba57b587
 EBUILD conky-1.10.8-r9.ebuild 4777 BLAKE2B 42eff9a8b3bb93f1620b301c6b4c313415c39ca4c4f9c81ee860fd15314ab4d12b2a1cbc1b58b58cd533f6dd9c69ce45a527a6e00c337aae9108ed73f9729b08 SHA512 612d3d918499ad3c51816256fb826d432e45be4634cd810d623a26a3138e7feef80639fb98206a8f590ab37f4a90e08bc3352627f5fce2abda0579f75f551d65
-EBUILD conky-1.11.6-r2.ebuild 4795 BLAKE2B 470cf78bbf13773cfaab634587ae7d03b9c41e89aaccfa02586173ec367a52167df7f35f60931c5dceac8be0138f4c9430c911c8c054c46c08c94f90d9fa149d SHA512 474153c6501ecf562ae7a92b65e40dbe125269d4b25fb98426117ea61f2d4c018f74ccd6b932e0b21872ed36539ebfaf0b26a16b5092b036114af4e6402f6b53
+EBUILD conky-1.11.6-r2.ebuild 4790 BLAKE2B c72c8455185a0125cf63262d97b7fcbf95fb7469eda6bd64a6a436d3b99128ed77987d6e9be6c456c07ea31f2f4b959e545e5a4e501947912ce4e63cf0109f65 SHA512 70dabc73ad704df62433683df9ae7b8ec38abf4dca63a76f7f32a580b1cbff3d02c1dbbb14486dbcd60b9780226a9625948843c0eadefda3581e429fcc54adf4
 MISC metadata.xml 2469 BLAKE2B 15947c03593a9d5215a9c1dd142458aeb84f61c77a669bbfa4abe256c94e28650516a0226350323f56bbc225c5edc5e9b9e3310d7957e072b6701e77e40623ce SHA512 75e2d5bd8f4848779c03fd983d995d8216f4bc35ca1d3af47cf004d1d43e36c2924523d286e13ea82c720a51a63d91e03af795e6c31471af71716b4c5ce46c4e
diff --git a/app-admin/conky/conky-1.11.6-r2.ebuild b/app-admin/conky/conky-1.11.6-r2.ebuild
index 827e39e30975..02b12b482a5c 100644
--- a/app-admin/conky/conky-1.11.6-r2.ebuild
+++ b/app-admin/conky/conky-1.11.6-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86"
 IUSE="apcupsd bundled-toluapp cmus curl doc hddtemp ical iconv imlib iostats
 	ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax
 	ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype
diff --git a/app-admin/conky/files/conky-1.11.6-fpermissive.patch b/app-admin/conky/files/conky-1.11.6-fpermissive.patch
index 1ac1173ba646..f608769b6433 100644
--- a/app-admin/conky/files/conky-1.11.6-fpermissive.patch
+++ b/app-admin/conky/files/conky-1.11.6-fpermissive.patch
@@ -1,17 +1,15 @@
-From 16be0e1571a586168855bedb6da1ddc732b0bbf4 Mon Sep 17 00:00:00 2001
-From: Brenden Matthews <brenden@brndn.io>
-Date: Thu, 22 Oct 2020 13:02:00 -0400
-Subject: [PATCH] Build fix for libmicrohttpd.
-
----
- src/conky.cc | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/src/conky.cc b/src/conky.cc
-index 79633a40..b1743466 100644
---- a/src/conky.cc
-+++ b/src/conky.cc
-@@ -322,12 +322,13 @@ struct MHD_Daemon *httpd;
+--- old/src/conky.cc	2021-01-24 17:05:43.361378726 +0100
++++ new/src/conky.cc	2021-01-24 17:05:49.055378611 +0100
+@@ -317,17 +321,22 @@
+ static FILE *append_fpointer = nullptr;
+ 
+ #ifdef BUILD_HTTP
++#ifdef MHD_YES
++/* older API */
++#define MHD_Result int
++#endif /* MHD_YES */
+ std::string webpage;
+ struct MHD_Daemon *httpd;
  static conky::simple_config_setting<bool> http_refresh("http_refresh", false,
                                                         true);
  
@@ -20,7 +18,7 @@ index 79633a40..b1743466 100644
 -               size_t *upload_data_size, void **con_cls) {
 +MHD_Result sendanswer(void *cls, struct MHD_Connection *connection,
 +                      const char *url, const char *method, const char *version,
-+                      const char *upload_data, unsigned long *upload_data_size,
++                      const char *upload_data, size_t *upload_data_size,
 +                      void **con_cls) {
    struct MHD_Response *response = MHD_create_response_from_buffer(
        webpage.length(), (void *)webpage.c_str(), MHD_RESPMEM_PERSISTENT);