gentoo resync : 20.03.2022

4 files changed, 3 insertions, 63 deletions

diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 98c6b9049140..cf9ec5c8742d 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,5 +1,3 @@
-AUX conky-1.11.6-ipv6.patch 503 BLAKE2B 896cfc76a858981438cecf83db5b2b4fe32d7d6a0749524ac4c4d8dba3fd124a0b7de5d89329280b5c50e9de6cc4e182c23c2813575be6fceb97615e2acda4ca SHA512 3ea5247723676812a07d9ecc129d63cc75e51626a23c202da50bd3172403a24b93f6cbcc5c5e743a9acfe87b6d087ba510381c6157e1995b54d28a6dadbcf08a
-AUX conky-1.12.1-network-speed.patch 1439 BLAKE2B f736c986528f9a205d325170b7f1c83653304249be7a2742dbb9d50ca4b58a02fe59796c4c3a39001716ce0c44ed107f51c2db8933bc644472b2f45d607c88af SHA512 f1768dbda3698699bfd7473fed7dbe7ab57e53dc7b3599edcbad0105d140673b1111752eaeb7e83b3e42c7684316a788ac3b1f27c6c71b8f7560a02f1ecec8bc
 DIST conky-1.12.2.tar.gz 2407428 BLAKE2B b8d1b40dc4b547679b5ab4bf0328aabaac868025433729f48baf572c536da4a527a073a6d47f36c179851aecef58535dccb956e3a695700f06bf8e6ab170ae1f SHA512 55280953da437efe36320e4c12f74d95b8406bd7d8b7d93c6582f9b346c1c80a94b71d1c27860f6274de9171865fca91e330dfc39feb80bb2f453a538bc5ce1a
-EBUILD conky-1.12.2.ebuild 4789 BLAKE2B 970c1549f95279193373a2e33a76abf5fdbf61acf33e1f72135db810dcb5286066a723b31bb21a640f6b37a19d14d3260f183f528de126058a3b5e0f0648c684 SHA512 d6c1dc998d639ba38078db07e7182c9123826df4e65b6babde863669ff7473d027b8653d24d1fc877118deb96f115ae725c9ad1da63f544285c29e61d676c43a
+EBUILD conky-1.12.2.ebuild 4790 BLAKE2B 233fd89ef019a015d1ebad697126bd2417410241cc377a81d5bdebd85cbe1ee664ca61db8b5a83d39a8dea05c63b8dbbf7b4bf7fed3ac0b76c7ae349d477b625 SHA512 36f90f9eae1c783a02dfca917ffcdc48694f8ec9175832c95b6867bbc94def480be40abeca1d172a2a7f4cb944ec827c3dd1766b5ae8310a2aa4ef700283a4e5
 MISC metadata.xml 2469 BLAKE2B fb62625e8125ba31a3c6800befd22973f6b4d0b007f49aaa20ef55fd9a7cc5551bdd1554f4afeb749d263b062388aa5a058c3be7025c8727c008e80e360623c4 SHA512 c0daa5a1a24556a59940849478505fadc8ea5195623f9ca57e45943265c0f35117170bd2b9ddcfa9e0edae9a8084a53219a535db8b2ffdd9ba15c0c0ea853860
diff --git a/app-admin/conky/conky-1.12.2.ebuild b/app-admin/conky/conky-1.12.2.ebuild
index 3e8b0f815933..79a82febb401 100644
--- a/app-admin/conky/conky-1.12.2.ebuild
+++ b/app-admin/conky/conky-1.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~arm64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ppc64 ~riscv sparc x86"
 IUSE="apcupsd bundled-toluapp cmus curl doc hddtemp ical iconv imlib
 	intel-backlight iostats ipv6 irc lua-cairo lua-imlib lua-rsvg math moc
 	mpd mysql nano-syntax ncurses nvidia +portmon pulseaudio rss systemd
diff --git a/app-admin/conky/files/conky-1.11.6-ipv6.patch b/app-admin/conky/files/conky-1.11.6-ipv6.patch
deleted file mode 100644
index 65066270a750..000000000000
--- a/app-admin/conky/files/conky-1.11.6-ipv6.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix no-ipv6
-From https://github.com/brndnmtthws/conky/issues/1033#issue-748414180
-
-diff '--color=auto' -aur a/src/linux.cc b/src/linux.cc
---- a/src/linux.cc	2019-08-12 14:53:54.000000000 -0700
-+++ b/src/linux.cc	2020-11-22 18:44:04.394329722 -0700
-@@ -667,6 +667,7 @@
-   }
- }
- 
-+#ifdef BUILD_IPV6
- void update_ipv6_net_stats() {
-   FILE *file;
-   char v6addr[33];
-@@ -731,6 +732,7 @@
- 
-   fclose(file);
- }
-+#endif /* BUILD_IPV6 */
- 
- /**
-  * Parses information from /proc/net/dev and stores them in ???
diff --git a/app-admin/conky/files/conky-1.12.1-network-speed.patch b/app-admin/conky/files/conky-1.12.1-network-speed.patch
deleted file mode 100644
index 46a7615c589a..000000000000
--- a/app-admin/conky/files/conky-1.12.1-network-speed.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 415c730133476d6652f479242b0638496b5f673b Mon Sep 17 00:00:00 2001
-From: Steven Xu <stevenxxiu@gmail.com>
-Date: Tue, 23 Mar 2021 20:12:52 +1100
-Subject: [PATCH] fix: update `update last_update_time` earlier, so the network
- speed is correctly displayed, otherwise the speed shown is much lower than
- the actual speed (resolves #863)
-
----
- src/conky.cc | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/conky.cc b/src/conky.cc
-index b116b2bed..af5602c5b 100644
---- a/src/conky.cc
-+++ b/src/conky.cc
-@@ -766,6 +766,12 @@ static void generate_text() {
-    * some info.mem entries */
-   update_stuff();
- 
-+  /* Update `last_update_time` before `generate_text_internal()`, as the latter
-+   * calls `evaluate()` -> `update_net_stats()`, which needs `last_update_time`
-+   * to be set correctly. If this is not done, than the network speed being
-+   * shown will be much lower than the actual speed.*/
-+  last_update_time = current_update_time;
-+
-   /* populate the text buffer; generate_text_internal() iterates through
-    * global_root_object (an instance of the text_object struct) and calls
-    * any callbacks that were set on startup by construct_text_object(). */
-@@ -822,7 +828,6 @@ static void generate_text() {
-   if (next_update_time < time || next_update_time > time + ui) {
-     next_update_time = time - fmod(time, ui) + ui;
-   }
--  last_update_time = current_update_time;
-   total_updates++;
- }
-