diff --git a/Manifest.files.gz b/Manifest.files.gz
index 276222c00ac1..184ad7e71fa6 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index b295da73e2e2..0467a09e7ed8 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/mcelog/metadata.xml b/app-admin/mcelog/metadata.xml
index 12e16a23806d..589217c72ce0 100644
--- a/app-admin/mcelog/metadata.xml
+++ b/app-admin/mcelog/metadata.xml
@@ -1,10 +1,6 @@
-
- mattst88@gentoo.org
- Matt Turner
-
bkohler@gentoo.org
Ben Kohler
diff --git a/app-admin/radmind/radmind-1.15.3-r1.ebuild b/app-admin/radmind/radmind-1.15.3-r1.ebuild
index a7be00694979..75d9ba668d26 100644
--- a/app-admin/radmind/radmind-1.15.3-r1.ebuild
+++ b/app-admin/radmind/radmind-1.15.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/voretaq7/radmind/releases/download/${P}/${P}.tar.gz"
LICENSE="HPND"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
DEPEND="dev-libs/openssl:0="
RDEPEND="${DEPEND}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index e86ece2cc83f..1bab68ae5d2a 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/aescrypt/aescrypt-3.14.ebuild b/app-crypt/aescrypt/aescrypt-3.14.ebuild
index 78142e9a9dcb..c40e124664a5 100644
--- a/app-crypt/aescrypt/aescrypt-3.14.ebuild
+++ b/app-crypt/aescrypt/aescrypt-3.14.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.aescrypt.com/"
SRC_URI="https://www.aescrypt.com/download/v$(ver_cut 1)/linux/${P}.tgz"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
IUSE="static X"
RDEPEND="X? (
|| ( gnome-extra/zenity kde-apps/kdialog )
diff --git a/app-crypt/sign/Manifest b/app-crypt/sign/Manifest
deleted file mode 100644
index 3ac332087c04..000000000000
--- a/app-crypt/sign/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sign-1.0.7.tar.gz 28535 BLAKE2B e75811aa60f5408af8272503b7b6909eb03e58ab2f70a72efc73a9827af39aa9d5587e2366bc4be4eb67ca88b583d3c75927a0ab94f9f3441ffc60fb6e0e9d6f SHA512 9adb9e520da654e7196451e20501be8e1b84ee750a26344cb7e1816e56e4e8b88773a76a2707a6428faa7828658807eaaef2073b6940e212435ed915881885c0
diff --git a/app-crypt/sign/files/1.0.7-as-needed.patch b/app-crypt/sign/files/1.0.7-as-needed.patch
deleted file mode 100644
index 56574d7131d7..000000000000
--- a/app-crypt/sign/files/1.0.7-as-needed.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -Nur sign-1.0.7.orig/src/Makefile sign-1.0.7/src/Makefile
---- sign-1.0.7.orig/src/Makefile 2004-08-07 07:15:00.000000000 +0000
-+++ sign-1.0.7/src/Makefile 2006-09-16 17:21:12.400977608 +0000
-@@ -1,5 +1,5 @@
- CFLAGS += -Wall -DNDEBUG -g
--LDFLAGS += -lcrypto
-+LDLIBS += -lcrypto
-
- OBJS = buf.o die.o msg.o digest.o uue.o pki.o str.o system-nix.o \
- system-nix-readpass.o util.o
diff --git a/app-crypt/sign/files/1.0.7-openssl-0.9.8.patch b/app-crypt/sign/files/1.0.7-openssl-0.9.8.patch
deleted file mode 100644
index 179efbe77ef5..000000000000
--- a/app-crypt/sign/files/1.0.7-openssl-0.9.8.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur sign-1.0.7.orig/src/pki.c sign-1.0.7/src/pki.c
---- sign-1.0.7.orig/src/pki.c 2004-08-04 04:10:35.000000000 +0000
-+++ sign-1.0.7/src/pki.c 2006-09-16 17:17:34.335535125 +0000
-@@ -286,7 +286,7 @@
-
- /* if it's not a decryption problem - bail out */
- if (ERR_get_error() != ERR_PACK(ERR_LIB_EVP,
-- EVP_F_EVP_DECRYPTFINAL,
-+ EVP_F_EVP_DECRYPTFINAL_EX,
- EVP_R_BAD_DECRYPT))
- goto cleanup;
-
diff --git a/app-crypt/sign/metadata.xml b/app-crypt/sign/metadata.xml
deleted file mode 100644
index 15e7b65be77a..000000000000
--- a/app-crypt/sign/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
- alicef@gentoo.org
- Alice Ferrazzi
-
-
-sign is a file signing and signature verification utility. It's main purpose is
-to be a simple and convenient extension to a tar/gz/bzip2 line of tools to check
-file integrity and authenticity. It's small and simple, it does just one thing
-and hopefully does it well.
-
-
diff --git a/app-crypt/sign/sign-1.0.7.ebuild b/app-crypt/sign/sign-1.0.7.ebuild
deleted file mode 100644
index a1e2bbeaf1d0..000000000000
--- a/app-crypt/sign/sign-1.0.7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="File signing and signature verification utility"
-HOMEPAGE="http://swapped.cc/sign/"
-SRC_URI="http://swapped.cc/${PN}/files/${P}.tar.gz"
-
-LICENSE="BZIP2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="libressl"
-
-RDEPEND="
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PV}-openssl-0.9.8.patch
- epatch "${FILESDIR}"/${PV}-as-needed.patch
- # remove -g from CFLAGS, it happens to break the build on ppc-macos
- sed -i -e 's/-g//' src/Makefile || die
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
-
-src_install() {
- dobin ${PN}
- doman man/${PN}.1
- dodoc README
- dosym ${PN} /usr/bin/un${PN}
-}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 4806050635bd..7a6ee28d3ab1 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index e32ffbe83249..224eabbe48b5 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,4 +1,3 @@
-DIST nano-4.9.3.tar.gz 2999198 BLAKE2B a96f707936934a965a9a41dfe13ac1ebbe1a5e38db714df6d219b2c6539f24924d4c4f0451508718f66259854806032b84dc89850a7fd55d157f28ae23531d0e SHA512 233e6ed103441bd2c85ed21c50547f85dc0838cc750a5e9b16ecfb393e3b7b978e971af4a4164062c7c267c98895ecb696c02cbd2e4c2eb1ceee657fd026c30a
DIST nano-5.3.tar.gz 2874796 BLAKE2B d266018f2508153369e10c6f9cf4c53eaeafdf0efe88da6de19efd76ef13fedebe4b9339ae594b751a12cf18a8c4dcd57466ceedfabf61406f63b69c75fceff1 SHA512 019b58779f5a7d9a9472b415715876d0daac313a02b794900339469ee0b5a27ce202e397c00ad6396b7e26a7c303e52c28d981fff85cf774c79a5a8a9835836d
-DIST nano-5.4.tar.gz 2898561 BLAKE2B 7e5e48f1e85253a7a4a9be2be2b7663e8798655d9e9e2505df1d1752512058734062af953652c1d11dca464ca06d7c90faf2e54cdb65ba01d0f76cfca0282c18 SHA512 711b1a890649e3a2b62c778e6d54813ed98a8261c47a92aa6d7baa690f86d8563813a764f5dffcc6c259fe9b05f8fe76cf48a3178b09666ba55ee035c91cbe28
DIST nano-5.5.tar.gz 2943973 BLAKE2B cecc4b3bb74c6ca35a249052cc58df618b6a0445781813d1b06164afb3d119bedf49bdb0a04c327d4db968eeb5b0f1087b84184b83d4b92548c3146a4400389d SHA512 968eac59db2889ba1cb75bc83a30fd0c0ae370a05c668da0f3a20768158f3be0962034737924ea49f06e696e68625bc6841f41aae86aebbe8ba7c00b2627c056
+DIST nano-5.6.tar.gz 2956090 BLAKE2B 753c49e67403577ac272438b2a577f29978f621cb1823f3ccc4fb5df229b805c72a7123d5e5632cb9e1d4b50c7cf90675d748e7e88709703be44126e11231974 SHA512 fff8a558b435b9f372f19306e63c3bad34a60b4b1979ddf2a5724f96ca69fd7fd5850e841f714fad2e382ffc8e5c3f5085f6a6e965ff30f44bf12b8ac865fe6b
diff --git a/app-editors/nano/files/nano-4.9.3-disable-speller_build_fix.patch b/app-editors/nano/files/nano-4.9.3-disable-speller_build_fix.patch
deleted file mode 100644
index 978e24de805d..000000000000
--- a/app-editors/nano/files/nano-4.9.3-disable-speller_build_fix.patch
+++ /dev/null
@@ -1,342 +0,0 @@
-From 4b7f7a30c9ec593d68186b1dfef44d4e2bda735b Mon Sep 17 00:00:00 2001
-From: Benno Schulenberg
-Date: Mon, 22 Jun 2020 08:39:59 +0200
-Subject: [PATCH] build: fix compilation when configured with
- --disable-speller
-
-Move two functions that are used by the formatter too
-to between the proper #ifdef.
-
-Problem existed since commit 8089f5ad from a month ago.
-
-Backported to v4.9.3
-Signed-off-by: Lars Wendler
----
- src/text.c | 302 ++++++++++++++++++++++++++---------------------------
- 1 file changed, 151 insertions(+), 151 deletions(-)
-
-diff --git a/src/text.c b/src/text.c
-index 93ad3704..c7690fd0 100644
---- a/src/text.c
-+++ b/src/text.c
-@@ -2011,8 +2011,159 @@ void construct_argument_list(char ***arguments, char *command, char *filename)
- (*arguments)[count - 2] = filename;
- (*arguments)[count - 1] = NULL;
- }
-+
-+/* Open the specified file, and if that succeeds, remove the text of the marked
-+ * region or of the entire buffer and read the file contents into its place. */
-+bool replace_buffer(const char *filename, undo_type action, const char *operation)
-+{
-+ linestruct *was_cutbuffer = cutbuffer;
-+ int descriptor;
-+ FILE *stream;
-+
-+ descriptor = open_file(filename, FALSE, &stream);
-+
-+ if (descriptor < 0)
-+ return FALSE;
-+
-+ cutbuffer = NULL;
-+
-+#ifndef NANO_TINY
-+ add_undo(COUPLE_BEGIN, operation);
-+
-+ /* Cut either the marked region or the whole buffer. */
-+ add_undo(action, NULL);
-+#endif
-+ do_snip(FALSE, openfile->mark, openfile->mark == NULL, FALSE);
-+#ifndef NANO_TINY
-+ update_undo(action);
- #endif
-
-+ /* Discard what was cut. */
-+ free_lines(cutbuffer);
-+ cutbuffer = was_cutbuffer;
-+
-+ /* Insert the spell-checked file into the cleared area. */
-+ read_file(stream, descriptor, filename, TRUE);
-+
-+#ifndef NANO_TINY
-+ add_undo(COUPLE_END, operation);
-+#endif
-+ return TRUE;
-+}
-+
-+/* Execute the given program, with the given temp file as last argument. */
-+const char *treat(char *tempfile_name, char *theprogram, bool spelling)
-+{
-+ ssize_t lineno_save = openfile->current->lineno;
-+ size_t current_x_save = openfile->current_x;
-+ size_t pww_save = openfile->placewewant;
-+ bool was_at_eol = (openfile->current->data[openfile->current_x] == '\0');
-+ struct stat fileinfo;
-+ long timestamp_sec, timestamp_nsec;
-+ static char **arguments = NULL;
-+ pid_t thepid;
-+ int program_status;
-+ bool replaced = FALSE;
-+
-+ /* Get the timestamp and the size of the temporary file. */
-+ stat(tempfile_name, &fileinfo);
-+ timestamp_sec = (long)fileinfo.st_mtim.tv_sec;
-+ timestamp_nsec = (long)fileinfo.st_mtim.tv_nsec;
-+
-+ /* If the number of bytes to check is zero, get out. */
-+ if (fileinfo.st_size == 0)
-+ return NULL;
-+
-+ /* Exit from curses mode to give the program control of the terminal. */
-+ endwin();
-+
-+ construct_argument_list(&arguments, theprogram, tempfile_name);
-+
-+ /* Fork a child process and run the given program in it. */
-+ if ((thepid = fork()) == 0) {
-+ execvp(arguments[0], arguments);
-+
-+ /* Terminate the child if the program is not found. */
-+ exit(9);
-+ } else if (thepid < 0)
-+ return _("Could not fork");
-+
-+ /* Block SIGWINCHes while waiting for the program to end,
-+ * so nano doesn't get pushed past the wait(). */
-+ block_sigwinch(TRUE);
-+ wait(&program_status);
-+ block_sigwinch(FALSE);
-+
-+ /* Restore the terminal state and reenter curses mode. */
-+ terminal_init();
-+ doupdate();
-+
-+ if (!WIFEXITED(program_status) || WEXITSTATUS(program_status) > 2) {
-+ statusline(ALERT, _("Error invoking '%s'"), arguments[0]);
-+ return NULL;
-+ } else if (WEXITSTATUS(program_status) != 0)
-+ statusline(ALERT, _("Program '%s' complained"), arguments[0]);
-+
-+ /* Stat the temporary file again. */
-+ stat(tempfile_name, &fileinfo);
-+
-+ /* When the temporary file wasn't touched, say so and leave. */
-+ if ((long)fileinfo.st_mtim.tv_sec == timestamp_sec &&
-+ (long)fileinfo.st_mtim.tv_nsec == timestamp_nsec) {
-+ statusbar(_("Nothing changed"));
-+ return NULL;
-+ }
-+
-+#ifndef NANO_TINY
-+ /* Replace the marked text (or entire text) with the corrected text. */
-+ if (spelling && openfile->mark) {
-+ ssize_t was_mark_lineno = openfile->mark->lineno;
-+ bool upright = mark_is_before_cursor();
-+
-+ replaced = replace_buffer(tempfile_name, CUT, "spelling correction");
-+
-+ /* Adjust the end point of the marked region for any change in
-+ * length of the region's last line. */
-+ if (upright)
-+ current_x_save = openfile->current_x;
-+ else
-+ openfile->mark_x = openfile->current_x;
-+
-+ /* Restore the mark. */
-+ openfile->mark = line_from_number(was_mark_lineno);
-+ } else
-+#endif
-+ {
-+ openfile->current = openfile->filetop;
-+ openfile->current_x = 0;
-+
-+ replaced = replace_buffer(tempfile_name, CUT_TO_EOF,
-+ /* TRANSLATORS: The next two go with Undid/Redid messages. */
-+ (spelling ? N_("spelling correction") : N_("formatting")));
-+ }
-+
-+ /* Go back to the old position. */
-+ goto_line_posx(lineno_save, current_x_save);
-+ if (was_at_eol || openfile->current_x > strlen(openfile->current->data))
-+ openfile->current_x = strlen(openfile->current->data);
-+
-+#ifndef NANO_TINY
-+ if (replaced)
-+ update_undo(COUPLE_END);
-+#endif
-+
-+ openfile->placewewant = pww_save;
-+ adjust_viewport(STATIONARY);
-+
-+ if (spelling)
-+ statusbar(_("Finished checking spelling"));
-+ else
-+ statusbar(_("Buffer has been processed"));
-+
-+ return NULL;
-+}
-+#endif /* ENABLE_SPELLER || ENABLE_COLOR */
-+
- #ifdef ENABLE_SPELLER
- /* Let the user edit the misspelled word. Return FALSE if the user cancels. */
- bool fix_spello(const char *word)
-@@ -2307,157 +2458,6 @@ const char *do_int_speller(const char *tempfile_name)
- return NULL;
- }
-
--/* Open the specified file, and if that succeeds, remove the text of the marked
-- * region or of the entire buffer and read the file contents into its place. */
--bool replace_buffer(const char *filename, undo_type action, const char *operation)
--{
-- linestruct *was_cutbuffer = cutbuffer;
-- int descriptor;
-- FILE *stream;
--
-- descriptor = open_file(filename, FALSE, &stream);
--
-- if (descriptor < 0)
-- return FALSE;
--
-- cutbuffer = NULL;
--
--#ifndef NANO_TINY
-- add_undo(COUPLE_BEGIN, operation);
--
-- /* Cut either the marked region or the whole buffer. */
-- add_undo(action, NULL);
--#endif
-- do_snip(FALSE, openfile->mark, openfile->mark == NULL, FALSE);
--#ifndef NANO_TINY
-- update_undo(action);
--#endif
--
-- /* Discard what was cut. */
-- free_lines(cutbuffer);
-- cutbuffer = was_cutbuffer;
--
-- /* Insert the spell-checked file into the cleared area. */
-- read_file(stream, descriptor, filename, TRUE);
--
--#ifndef NANO_TINY
-- add_undo(COUPLE_END, operation);
--#endif
-- return TRUE;
--}
--
--/* Execute the given program, with the given temp file as last argument. */
--const char *treat(char *tempfile_name, char *theprogram, bool spelling)
--{
-- ssize_t lineno_save = openfile->current->lineno;
-- size_t current_x_save = openfile->current_x;
-- size_t pww_save = openfile->placewewant;
-- bool was_at_eol = (openfile->current->data[openfile->current_x] == '\0');
-- struct stat fileinfo;
-- long timestamp_sec, timestamp_nsec;
-- static char **arguments = NULL;
-- pid_t thepid;
-- int program_status;
-- bool replaced = FALSE;
--
-- /* Get the timestamp and the size of the temporary file. */
-- stat(tempfile_name, &fileinfo);
-- timestamp_sec = (long)fileinfo.st_mtim.tv_sec;
-- timestamp_nsec = (long)fileinfo.st_mtim.tv_nsec;
--
-- /* If the number of bytes to check is zero, get out. */
-- if (fileinfo.st_size == 0)
-- return NULL;
--
-- /* Exit from curses mode to give the program control of the terminal. */
-- endwin();
--
-- construct_argument_list(&arguments, theprogram, tempfile_name);
--
-- /* Fork a child process and run the given program in it. */
-- if ((thepid = fork()) == 0) {
-- execvp(arguments[0], arguments);
--
-- /* Terminate the child if the program is not found. */
-- exit(9);
-- } else if (thepid < 0)
-- return _("Could not fork");
--
-- /* Block SIGWINCHes while waiting for the program to end,
-- * so nano doesn't get pushed past the wait(). */
-- block_sigwinch(TRUE);
-- wait(&program_status);
-- block_sigwinch(FALSE);
--
-- /* Restore the terminal state and reenter curses mode. */
-- terminal_init();
-- doupdate();
--
-- if (!WIFEXITED(program_status) || WEXITSTATUS(program_status) > 2) {
-- statusline(ALERT, _("Error invoking '%s'"), arguments[0]);
-- return NULL;
-- } else if (WEXITSTATUS(program_status) != 0)
-- statusline(ALERT, _("Program '%s' complained"), arguments[0]);
--
-- /* Stat the temporary file again. */
-- stat(tempfile_name, &fileinfo);
--
-- /* When the temporary file wasn't touched, say so and leave. */
-- if ((long)fileinfo.st_mtim.tv_sec == timestamp_sec &&
-- (long)fileinfo.st_mtim.tv_nsec == timestamp_nsec) {
-- statusbar(_("Nothing changed"));
-- return NULL;
-- }
--
--#ifndef NANO_TINY
-- /* Replace the marked text (or entire text) with the corrected text. */
-- if (spelling && openfile->mark) {
-- ssize_t was_mark_lineno = openfile->mark->lineno;
-- bool upright = mark_is_before_cursor();
--
-- replaced = replace_buffer(tempfile_name, CUT, "spelling correction");
--
-- /* Adjust the end point of the marked region for any change in
-- * length of the region's last line. */
-- if (upright)
-- current_x_save = openfile->current_x;
-- else
-- openfile->mark_x = openfile->current_x;
--
-- /* Restore the mark. */
-- openfile->mark = line_from_number(was_mark_lineno);
-- } else
--#endif
-- {
-- openfile->current = openfile->filetop;
-- openfile->current_x = 0;
--
-- replaced = replace_buffer(tempfile_name, CUT_TO_EOF,
-- /* TRANSLATORS: The next two go with Undid/Redid messages. */
-- (spelling ? N_("spelling correction") : N_("formatting")));
-- }
--
-- /* Go back to the old position. */
-- goto_line_posx(lineno_save, current_x_save);
-- if (was_at_eol || openfile->current_x > strlen(openfile->current->data))
-- openfile->current_x = strlen(openfile->current->data);
--
--#ifndef NANO_TINY
-- if (replaced)
-- update_undo(COUPLE_END);
--#endif
--
-- openfile->placewewant = pww_save;
-- adjust_viewport(STATIONARY);
--
-- if (spelling)
-- statusbar(_("Finished checking spelling"));
-- else
-- statusbar(_("Buffer has been processed"));
--
-- return NULL;
--}
--
- /* Spell check the current file. If an alternate spell checker is
- * specified, use it. Otherwise, use the internal spell checker. */
- void do_spell(void)
---
-2.28.0
-
diff --git a/app-editors/nano/files/nano-4.9.3-minimal_build_fix.patch b/app-editors/nano/files/nano-4.9.3-minimal_build_fix.patch
deleted file mode 100644
index 52112bab7235..000000000000
--- a/app-editors/nano/files/nano-4.9.3-minimal_build_fix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From a98f48b4e82db7d30aa04925fb28344f5bce8c7c Mon Sep 17 00:00:00 2001
-From: Benno Schulenberg
-Date: Mon, 22 Jun 2020 14:00:23 +0200
-Subject: [PATCH] build: fix compilation for --enable-tiny --enable-color
- --enable-nanorc
-
-Backported to v4.9.3
-Signed-off-by: Lars Wendler
----
- src/nano.c | 2 +-
- src/text.c | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/nano.c b/src/nano.c
-index be80a073..3ac81ba4 100644
---- a/src/nano.c
-+++ b/src/nano.c
-@@ -1079,7 +1079,7 @@ RETSIGTYPE do_continue(int signal)
- ungetch(KEY_FLUSH);
- }
-
--#if !defined(NANO_TINY) || defined(ENABLE_SPELLER)
-+#if !defined(NANO_TINY) || defined(ENABLE_SPELLER) || defined(ENABLE_COLOR)
- /* Block or unblock the SIGWINCH signal, depending on the blockit parameter. */
- void block_sigwinch(bool blockit)
- {
-diff --git a/src/text.c b/src/text.c
-index c7690fd0..32727946 100644
---- a/src/text.c
-+++ b/src/text.c
-@@ -2032,10 +2032,10 @@ bool replace_buffer(const char *filename, undo_type action, const char *operatio
-
- /* Cut either the marked region or the whole buffer. */
- add_undo(action, NULL);
--#endif
- do_snip(FALSE, openfile->mark, openfile->mark == NULL, FALSE);
--#ifndef NANO_TINY
- update_undo(action);
-+#else
-+ do_snip(FALSE, TRUE, FALSE, FALSE);
- #endif
-
- /* Discard what was cut. */
---
-2.28.0
-
diff --git a/app-editors/nano/nano-4.9.3.ebuild b/app-editors/nano/nano-4.9.3.ebuild
deleted file mode 100644
index 869ecf6995d1..000000000000
--- a/app-editors/nano/nano-4.9.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://git.sv.gnu.org/nano.git"
- inherit git-r3 autotools
-else
- MY_P="${PN}-${PV/_}"
- SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify +magic minimal ncurses nls slang +spell +split-usr static unicode"
-
-LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
- sys-libs/ncurses:0=[static-libs(+)]
- magic? ( sys-apps/file[static-libs(+)] )
- nls? ( virtual/libintl )
- !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-BDEPEND="
- nls? ( sys-devel/gettext )
- virtual/pkgconfig
-"
-
-REQUIRED_USE="!ncurses? ( slang? ( minimal ) )"
-
-PATCHES=(
- "${FILESDIR}/${P}-disable-speller_build_fix.patch"
- "${FILESDIR}/${P}-minimal_build_fix.patch" #734856
-)
-
-src_prepare() {
- default
- if [[ ${PV} == "9999" ]] ; then
- eautoreconf
- fi
-}
-
-src_configure() {
- use static && append-ldflags -static
- local myconf=(
- --bindir="${EPREFIX}"/bin
- --htmldir=/trash
- $(use_enable !minimal color)
- $(use_enable !minimal multibuffer)
- $(use_enable !minimal nanorc)
- $(use_enable magic libmagic)
- $(use_enable spell speller)
- $(use_enable justify)
- $(use_enable debug)
- $(use_enable nls)
- $(use_enable unicode utf8)
- $(use_enable minimal tiny)
- $(usex ncurses --without-slang $(use_with slang))
- )
- econf "${myconf[@]}"
-}
-
-src_install() {
- default
- # don't use "${ED}" here or things break (#654534)
- rm -r "${D}"/trash || die
-
- dodoc doc/sample.nanorc
- docinto html
- dodoc doc/faq.html
- insinto /etc
- newins doc/sample.nanorc nanorc
- if ! use minimal ; then
- # Enable colorization by default.
- sed -i \
- -e '/^# include /s:# *::' \
- "${ED}"/etc/nanorc || die
- fi
-
- use split-usr && dosym ../../bin/nano /usr/bin/nano
-}
diff --git a/app-editors/nano/nano-5.4.ebuild b/app-editors/nano/nano-5.6.ebuild
similarity index 89%
rename from app-editors/nano/nano-5.4.ebuild
rename to app-editors/nano/nano-5.6.ebuild
index 92473ae856c8..64c74e70f9b1 100644
--- a/app-editors/nano/nano-5.4.ebuild
+++ b/app-editors/nano/nano-5.6.ebuild
@@ -18,13 +18,12 @@ HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_
LICENSE="GPL-3"
SLOT="0"
-IUSE="debug justify magic minimal ncurses nls slang +spell +split-usr static unicode"
+IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode"
LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?]
sys-libs/ncurses:0=[static-libs(+)]
magic? ( sys-apps/file[static-libs(+)] )
- nls? ( virtual/libintl )
- !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )"
+ nls? ( virtual/libintl )"
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )"
@@ -34,7 +33,6 @@ BDEPEND="
"
REQUIRED_USE="
- !ncurses? ( slang? ( minimal ) )
magic? ( !minimal )
"
@@ -60,7 +58,6 @@ src_configure() {
$(use_enable nls)
$(use_enable unicode utf8)
$(use_enable minimal tiny)
- $(usex ncurses --without-slang $(use_with slang))
)
econf "${myconf[@]}"
}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index bff74f729e5d..b674bbbd3c2d 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/uchardet/uchardet-0.0.7.ebuild b/app-i18n/uchardet/uchardet-0.0.7.ebuild
index 32125552eb6b..f2fa9d7cdbc2 100644
--- a/app-i18n/uchardet/uchardet-0.0.7.ebuild
+++ b/app-i18n/uchardet/uchardet-0.0.7.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="cpu_flags_x86_sse2 static-libs test"
RESTRICT="!test? ( test )"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index d2d429db0aa4..4b8cb6a25414 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/detox/detox-1.4.0.ebuild b/app-misc/detox/detox-1.4.0.ebuild
index ab367fc95870..7a6a540e4cee 100644
--- a/app-misc/detox/detox-1.4.0.ebuild
+++ b/app-misc/detox/detox-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/dharple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE=""
S="${WORKDIR}"/${MY_P}
diff --git a/app-misc/fdupes/fdupes-2.1.2.ebuild b/app-misc/fdupes/fdupes-2.1.2.ebuild
index 4c010453e090..d185f45be19d 100644
--- a/app-misc/fdupes/fdupes-2.1.2.ebuild
+++ b/app-misc/fdupes/fdupes-2.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/adrianlopezroche/${PN}/releases/download/v${PV}/${P}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="+ncurses"
RDEPEND="
diff --git a/app-misc/screen/files/screen-CVE-2021-26937.patch b/app-misc/screen/files/screen-CVE-2021-26937.patch
new file mode 100644
index 000000000000..9556278274e8
--- /dev/null
+++ b/app-misc/screen/files/screen-CVE-2021-26937.patch
@@ -0,0 +1,61 @@
+ encoding.c | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+diff --git i/encoding.c w/encoding.c
+index e5db3e7..79f5d14 100644
+--- i/encoding.c
++++ w/encoding.c
+@@ -43,7 +43,7 @@ static int encmatch __P((char *, char *));
+ # ifdef UTF8
+ static int recode_char __P((int, int, int));
+ static int recode_char_to_encoding __P((int, int));
+-static void comb_tofront __P((int, int));
++static void comb_tofront __P((int));
+ # ifdef DW_CHARS
+ static int recode_char_dw __P((int, int *, int, int));
+ static int recode_char_dw_to_encoding __P((int, int *, int));
+@@ -1263,6 +1263,8 @@ int c;
+ {0x30000, 0x3FFFD},
+ };
+
++ if (c >= 0xdf00 && c <= 0xdfff)
++ return 1; /* dw combining sequence */
+ return ((bisearch(c, wide, sizeof(wide) / sizeof(struct interval) - 1)) ||
+ (cjkwidth &&
+ bisearch(c, ambiguous,
+@@ -1330,11 +1332,12 @@ int c;
+ }
+
+ static void
+-comb_tofront(root, i)
+-int root, i;
++comb_tofront(i)
++int i;
+ {
+ for (;;)
+ {
++ int root = i >= 0x700 ? 0x801 : 0x800;
+ debug1("bring to front: %x\n", i);
+ combchars[combchars[i]->prev]->next = combchars[i]->next;
+ combchars[combchars[i]->next]->prev = combchars[i]->prev;
+@@ -1396,9 +1399,9 @@ struct mchar *mc;
+ {
+ /* full, recycle old entry */
+ if (c1 >= 0xd800 && c1 < 0xe000)
+- comb_tofront(root, c1 - 0xd800);
++ comb_tofront(c1 - 0xd800);
+ i = combchars[root]->prev;
+- if (c1 == i + 0xd800)
++ if (i == 0x800 || i == 0x801 || c1 == i + 0xd800)
+ {
+ /* completely full, can't recycle */
+ debug("utf8_handle_comp: completely full!\n");
+@@ -1422,7 +1425,7 @@ struct mchar *mc;
+ mc->font = (i >> 8) + 0xd8;
+ mc->fontx = 0;
+ debug3("combinig char %x %x -> %x\n", c1, c, i + 0xd800);
+- comb_tofront(root, i);
++ comb_tofront(i);
+ }
+
+ #else /* !UTF8 */
diff --git a/app-misc/screen/screen-4.8.0-r2.ebuild b/app-misc/screen/screen-4.8.0-r2.ebuild
new file mode 100644
index 000000000000..e5fef8fffeab
--- /dev/null
+++ b/app-misc/screen/screen-4.8.0-r2.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic pam tmpfiles toolchain-funcs
+
+DESCRIPTION="screen manager with VT100/ANSI terminal emulation"
+HOMEPAGE="https://www.gnu.org/software/screen/"
+
+if [[ "${PV}" != 9999 ]] ; then
+ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
+ EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
+ S="${WORKDIR}"/${P}/src
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug nethack pam selinux multiuser"
+
+CDEPEND="
+ >=sys-libs/ncurses-5.2:0=
+ pam? ( sys-libs/pam )"
+RDEPEND="${CDEPEND}
+ acct-group/utmp
+ selinux? ( sec-policy/selinux-screen )"
+DEPEND="${CDEPEND}
+ sys-apps/texinfo"
+
+PATCHES=(
+ # Don't use utempter even if it is found on the system.
+ "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
+ "${FILESDIR}"/${PN}-4.6.2-utmp-exit.patch
+ "${FILESDIR}"/${PN}-CVE-2021-26937.patch
+)
+
+src_prepare() {
+ default
+
+ # sched.h is a system header and causes problems with some C libraries
+ mv sched.h _sched.h || die
+ sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
+
+ # Fix manpage.
+ sed -i \
+ -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+ -e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
+ -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
+ -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
+ -e "s:/local/screens/S\\\-:${EPREFIX}/tmp/screen/S\\\-:g" \
+ doc/screen.1 || die
+
+ if [[ ${CHOST} == *-darwin* ]] || use elibc_musl ; then
+ sed -i -e '/^#define UTMPOK/s/define/undef/' acconfig.h || die
+ fi
+
+ # disable musl dummy headers for utmp[x]
+ use elibc_musl && append-cppflags "-D_UTMP_H -D_UTMPX_H"
+
+ # reconfigure
+ eautoreconf
+}
+
+src_configure() {
+ append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
+
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ # enable msg_header by upping the feature standard compatible
+ # with c99 mode
+ append-cppflags -D_XOPEN_SOURCE=600
+ fi
+
+ use nethack || append-cppflags "-DNONETHACK"
+ use debug && append-cppflags "-DDEBUG"
+
+ local myeconfargs=(
+ --with-socket-dir="${EPREFIX}/tmp/${PN}"
+ --with-sys-screenrc="${EPREFIX}/etc/screenrc"
+ --with-pty-mode=0620
+ --with-pty-group=5
+ --enable-rxvt_osc
+ --enable-telnet
+ --enable-colors256
+ $(use_enable pam)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ LC_ALL=POSIX emake comm.h term.h
+ emake osdef.h
+
+ emake -C doc screen.info
+ default
+}
+
+src_install() {
+ local DOCS=(
+ README ChangeLog INSTALL TODO NEWS* patchlevel.h
+ doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
+ )
+
+ emake DESTDIR="${D}" SCREEN="${P}" install
+
+ local tmpfiles_perms tmpfiles_group
+
+ if use multiuser || use prefix ; then
+ fperms 4755 /usr/bin/${P}
+ tmpfiles_perms="0755"
+ tmpfiles_group="root"
+ else
+ fowners root:utmp /usr/bin/${P}
+ fperms 2755 /usr/bin/${P}
+ tmpfiles_perms="0775"
+ tmpfiles_group="utmp"
+ fi
+
+ newtmpfiles - screen.conf <<<"d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}"
+
+ insinto /usr/share/${PN}
+ doins terminfo/{screencap,screeninfo.src}
+
+ insinto /etc
+ doins "${FILESDIR}"/screenrc
+
+ if use pam; then
+ pamd_mimic_system screen auth
+ fi
+
+ dodoc "${DOCS[@]}"
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]
+ then
+ elog "Some dangerous key bindings have been removed or changed to more safe values."
+ elog "We enable some xterm hacks in our default screenrc, which might break some"
+ elog "applications. Please check /etc/screenrc for information on these changes."
+ fi
+
+ # Add /tmp/screen in case it doesn't exist yet. This should solve
+ # problems like bug #508634 where tmpfiles.d isn't in effect.
+ local rundir="${EROOT}/tmp/${PN}"
+ if [[ ! -d ${rundir} ]] ; then
+ if use multiuser || use prefix ; then
+ tmpfiles_group="root"
+ else
+ tmpfiles_group="utmp"
+ fi
+ mkdir -m 0775 "${rundir}"
+ chgrp ${tmpfiles_group} "${rundir}"
+ fi
+
+ ewarn "This revision changes the screen socket location to ${rundir}"
+}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index d73232163901..1a9c83071120 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/calligra/calligra-3.2.1-r1.ebuild b/app-office/calligra/calligra-3.2.1-r1.ebuild
index ac8c65551999..fb5388edbf8b 100644
--- a/app-office/calligra/calligra-3.2.1-r1.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ HOMEPAGE="https://calligra.org/"
if [[ ${KDE_BUILD_TYPE} == release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
- KEYWORDS="amd64 x86"
+ KEYWORDS="amd64 ~ppc64 x86"
fi
CAL_FTS=( karbon sheets stage words )
diff --git a/app-office/homebank/homebank-5.4.3.ebuild b/app-office/homebank/homebank-5.4.3.ebuild
index c6fa624fa773..74e82bbad586 100644
--- a/app-office/homebank/homebank-5.4.3.ebuild
+++ b/app-office/homebank/homebank-5.4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://homebank.free.fr/public/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
IUSE="+ofx"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ppc ~ppc64 ~x86"
RDEPEND=">=dev-libs/glib-2.39
>=net-libs/libsoup-2.26
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index 2c9697a65ce1..b50346ed3b93 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,12 +1,24 @@
DIST amd64-debug-libreoffice-6.4.7.2_p2.tar.xz 1110439052 BLAKE2B 54aa720a740c94d146fe2ae8c5ba11bd4e65efbbd18188bbf6b7aedc88a3d8907a18beb74cf901cc3fcf7b7053816f5c3b7c08c1513ff3e9d3e8130fdf995a28 SHA512 f3392bdfffb47abcca83ddc50b0fb3f3cb5fdbe6f1b70d4dd866cca4586a61def6c21439ea34ae8bf758bb3cfa77ddaffe0f4e9bfac5ee3ccd354bed24e14aef
+DIST amd64-debug-libreoffice-6.4.7.2_p3.tar.xz 1110393216 BLAKE2B 58ad318a09d4759b73c986900e4303c55f62c493dac6a54dde770e96ff4c30a2e2108a648c0d3182c84b096d58ffc10eb240d3b498c3ea5ae4305fa84de1e00d SHA512 7f76bba61fee7f8e5a3d30b7d7ec08a5c1ed25a7f4cb057689310d03b8c15006b742b01839f8d33c1ea8e51065f6fa2f4ec2641c338cedfd942dfc36423cf445
DIST amd64-debug-libreoffice-gnome-6.4.7.2_p2.xd3 1136937 BLAKE2B 49749de74736b6749ece897dac2f7f1a4ebbb2a3cdce82b27e3eae8ae045dbc9b4849238e8ff8631a0db9f1004cc51a2ee00f34f4df82a118982a45f3474e1c3 SHA512 372e9173f269555102f7e5fc7f2dc6c668ae6d4c18eab9d2e96e6b28db056a9ed12a1e7aca18094ddf54419a26ea1aa8b12b40527c29f4d146b3e4370f9f6606
+DIST amd64-debug-libreoffice-gnome-6.4.7.2_p3.xd3 1136174 BLAKE2B b4a90dbf3cb53d5c356e4bd7ff69eb75be18bf496e768277e95737da2ebeffc9b2d2cb465aba2c4dc3b4a376e45c857c64b4b240847b24e82e94529572df4ac2 SHA512 e8f58b3dc0b248e1bca704b84545665bd9a59f528f834074e4fbaf63c2e88759dbb0468892504dd056c887cf504ed349cb8032a001df63d5294f8434c73e1ee1
DIST amd64-debug-libreoffice-gnome-java-6.4.7.2_p2.xd3 505817824 BLAKE2B a911ebe4fb2f0ab5efc644b41c966cf18d9904bd13cce8fbc8c57e8cf2433a5a43c2b6fd7bbf3cd957c82153518932b5e124d11ca5711ff195a2089ddc8bfc10 SHA512 11138384e355e08fd5bb98fe5a0e4aacbd02cea53b0c416bb78e2406b604f6dbcc839bc5b6318183186a2e04e1597e56dbf2267e0202e9d2dbf54d4f3b523e21
+DIST amd64-debug-libreoffice-gnome-java-6.4.7.2_p3.xd3 505625604 BLAKE2B 62222cce0da41ae7379a44a1bdf2c11fa8972567b62d34a8152337e9dc2ab1c3a354e8f862ee0774cc26c892fea65c538e8c6ab492040145c0264b5ac2e7b82c SHA512 3a5512c2d8bd2553127c1b21cb0da69b53febe6874680927676e55c180cd76f1575eb3fa07d408090dfb831d44dc2739de7bd738f891d8a31b240f152d785494
DIST amd64-debug-libreoffice-java-6.4.7.2_p2.xd3 504686001 BLAKE2B 7bb5b84f06c91495a1765e00d54ef933aa73e237a3c28f4c87956c34577cdc6e5ca55a19a287a43c21f42b218c41d0c7a5fc0ab698fbfd6163a026ca00af9447 SHA512 008e79263223f430acbf2f3aa29050319de8ef20e5a2d50c424eb644bcf3e3103e0a2fdb2b566d25b4e266e7a70de693b596266c849510c641d6f1bfabed7f79
+DIST amd64-debug-libreoffice-java-6.4.7.2_p3.xd3 504497844 BLAKE2B b3b51a0dcc5ca3cc67401762ad696d751f03cf9ef33c9d939aab46cf2d26e7a60b60480a3ffe343f1928ef7b5e4b3b16af1cff132af55b59e6ae8ed6cc2a8dce SHA512 7153491a740c53f27430b62dbe5cead8a06c9520c535b913f76eb9fe09b043504c5a0d4d99dde728c13ee6be2656e7ed9298001bb7dcdebcc7871e0716400f57
DIST amd64-debug-libreoffice-kde-6.4.7.2_p2.xd3 294278544 BLAKE2B feb74b38abb5d8f11442d5437c50a1e33f31aaa077a29a908e083936afdbc9a8bd42fff035f587391df510c9af4a481b4625783e181a05f66d7f1661ebd2a634 SHA512 ebf44dc2af818b2190dfae1d418b1a3705def0dfdca59cd01957bf2b6687a1d64814d755afbb1215300d49c3efdb16fd37650fcfbf2ab164bbf981e7384f389c
+DIST amd64-debug-libreoffice-kde-6.4.7.2_p3.xd3 294352306 BLAKE2B e40cd9d1a2edffef0c9fc7de97eadb8f45eabd8bb3cefe323669945e564624ae508bba4a082ccc10284f09557e848f2eacc03c990b73eb17195f75881a5602e6 SHA512 e241964a062ebdf4ab869f72647496703b1083ced67d74eb6eb4f92d5812716c212c3f4bbdeb2f27542749c0e9340211719c1526a8d19d3820924574f477399b
DIST amd64-debug-libreoffice-kde-java-6.4.7.2_p2.xd3 512988426 BLAKE2B f2558a4d962e991ec18ddcedbb8d25c0720f6cddc02f542695c5623ae1ad8ea76896139749620c96d69bce76ecea1d1ff7985ee3c0907705f332e4a67b3701cf SHA512 84a1d7ebb4460a9615863e0136a3b6d2acac5dbf8d3812633142a1b3092fbc324570dd3e0faf9f3e55e25001d308b0b03bc0217a08f9c1aa90479b6705ec0251
+DIST amd64-debug-libreoffice-kde-java-6.4.7.2_p3.xd3 512913914 BLAKE2B e122e62051a328be51dc0b5e5e136b93eb01e1b1102a8ad440e7483d66984b5b69c8180b2867c2990c3560ab2739bbdafc58ee29a44ac2bff66b220dc165c461 SHA512 c643668a70f4d8c85869784de8ab77336e8b993a39bcc03ba43a8c5d06d1f1848af3b398b2d82e46af55f0a5073b3cb7df454c4e231c80ced1601cf32c3975f7
DIST x86-debug-libreoffice-6.4.7.2_p2.tar.xz 1108975220 BLAKE2B b5cba545c995462b3281146fc5a86c597157a89696b1cc76c1b249d583223f3e1c9355c8d3452eb59216cbdf2968f73f7e804fcaa675e67d7d310da590c8db1c SHA512 0613735ef4f11cb80cd8589f7d1713c4d6fa7ad8e1dd7a611598e744075afd016b00440a0cb75c107fe20995252a7f01062ddce2060f6825da719e1cb86279a3
+DIST x86-debug-libreoffice-6.4.7.2_p3.tar.xz 1108731764 BLAKE2B 5323edab63fa327a670f2c5427f0f1fa0e743288d55fb89999623e9a140221de757db192449138d3ad2f3ce370f0790fd96dc1497f0d5f0c09317d3cb56498cf SHA512 211203a1691a1efdf4b55c70c08f610bb0a0660ab0ce6decceae9a2c71dca44a4b4010116c0c07de0c2cd9a6543c45d5f8c68612596d65e83ba757886b3ff1ac
DIST x86-debug-libreoffice-gnome-6.4.7.2_p2.xd3 1134093 BLAKE2B 6d53b91a5c9c37b0bdee0b08f3600403e342ccdd470f508ec374284a0c4e548ad39af554b079619a67a079212ae690098ef4d2c6825733ff57b009db3ac127b5 SHA512 5c2fbc64f88e0e3f6129cf7a3210a16e7edc4483903aee24a73bdfa80896e0a743e217e8566c7352d727f79afe100490d2952cfb3d29345ed716ecaace90d1ee
+DIST x86-debug-libreoffice-gnome-6.4.7.2_p3.xd3 1133870 BLAKE2B ce9bfe5f23700d260f2cb872f3fa57155ccadbcbd96aacbe5e62dd721d6b180a7a3bc7a632fa8dba6405d530d892e4ac8c60b98c66a54bf50418f1687e2fd162 SHA512 598b15be8cc2af87ddd721615e49adbb32b6353ba9af712bf8fe29997420ed3a7b10352898ee2ce76f4b633fa8bfc44bdb1662ba097a28fafd6ab2e9d9e1bdca
DIST x86-debug-libreoffice-gnome-java-6.4.7.2_p2.xd3 505408886 BLAKE2B ca886fcd42c9f3c2b1e634974e0dcdb18b5001db8cc0015465f6146487d830c4ca5e56d0543cd550a3f19b81eece2cbb9d421716f9203191254335f7724b4df2 SHA512 74c5fa80c9e0716befda497e90405cf85a5aa5ed5d27c129dfd48e65cf123a4d28457e70fa4592a583a0ff2f111ddc6fc6d7481a130f8520d48039b3f267f02d
+DIST x86-debug-libreoffice-gnome-java-6.4.7.2_p3.xd3 505608813 BLAKE2B 912323f73cd169970c9e68ca336842c64b705e96199b05f5703851fcf8afe4e39cc9cb4f9aaf9d808fbb9d4bf0174724276d3f4d04f810adae8fda7c67d460b5 SHA512 f4f5507abd461304abb72c8aa83e8e88e1a442e93978e1c123169911227a5ba55589dc2f2c7de60def770bb9b5baaca2ac7c9de79acbf7568483c8e7a41344e8
DIST x86-debug-libreoffice-java-6.4.7.2_p2.xd3 504269108 BLAKE2B f89d79891225c5c3c87f006cceffef9f8228990f2dcb9777721dc3f8a1f7988b2c0753b10d03a77ff42090aa9471d4034b802309dfdf4958cbb03ab2b162c691 SHA512 55c1eb19f3f7a0fe365f946f1f46d2ec57437bfda514f3111e63eea284c8cd7e1ee33ad047fa776edf6231fc1f39a6369793d09012204a4aa1c1c687a91d87b4
+DIST x86-debug-libreoffice-java-6.4.7.2_p3.xd3 504464135 BLAKE2B ab5031fbf713a482e2c1672896fa4393830de9f7cfb9eae7d438245ec4ae5b98605d613af6fb396ffa500738604bb0ddce3e29edb92686058ea7cf9c33324fe9 SHA512 df1e7b9dcb7eeafda450512097bf0c0229183a68e7b179b4c5cee254639d0a7ddb2f1db99e2daa7966fe17a46f7d227df9aede251455236c4efcec7f9503aeb0
DIST x86-debug-libreoffice-kde-6.4.7.2_p2.xd3 285508996 BLAKE2B 5779310599eb281247a137f2565067b829b6711beb7823a54973cc35f31b20ef0c64da29e3615426eb548e6033416b0f2189a17a0f4f0f5435520dae5400ba45 SHA512 d2312309477a96e33c6101e33aa68c42389c191a4969cb4f6378138faeb231c1cde941818af81366da87ef544531a412fea6a402c1c7fdbd3d4bcbdcb99d54ac
+DIST x86-debug-libreoffice-kde-6.4.7.2_p3.xd3 285501269 BLAKE2B be187ba9a98126b9b2f742839eb5ae191eff31cc0918e2ddb0e13ff3a47b1feebe0b45e068ed6a303802146cfae34349ca129fe48fd940276a0735a6b3102ed1 SHA512 8c8c3849873b843ccdd4f813caf0474a1676a32a9328f13f69294159c18fb991914c3cba24d436361f9939de16f54ceab97d3153d7682ec06de215ce629e6a84
DIST x86-debug-libreoffice-kde-java-6.4.7.2_p2.xd3 504189621 BLAKE2B aca65755c930755d97c64f860160b8c090bb04cbfb48d5a413419a16828b8fb50bc8dd2d42941181f4996733b6c04e351cd6b2017cfb0b0776b0f44baeae3a55 SHA512 e6e5d91fb4e063a0dc432b0d546a0af9a744c33f223c03b583a223e5d118de0729fb717c8b580252ee142560522bdbb5ea970755a79d768da5048d528a25c8b3
+DIST x86-debug-libreoffice-kde-java-6.4.7.2_p3.xd3 504466811 BLAKE2B d18dfd7a45b101faf20792d3f91ec747d56076291de20b640719a28b8af8718c7d25a313e3108b2964949e639fa3917b6e3798caf614004bdb9f39b17d1dba22 SHA512 22b56e8872d2270a45f87dd4c6cd8edef3aade2b278fa0f546fab0cc9ac26453d5e5f1c8a6450283d282f0afa5e20dfa1c329c6f97ee61e3b441ece44794c5bb
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.4.7.2_p3.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.4.7.2_p3.ebuild
new file mode 100644
index 000000000000..48644c566566
--- /dev/null
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.4.7.2_p3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASE_PACKAGENAME="debug"
+BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
+
+DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI_AMD64="
+ ${BASE_AMD64_URI}libreoffice-${PV}.tar.xz
+ kde? (
+ !java? ( ${BASE_AMD64_URI}libreoffice-kde-${PV}.xd3 )
+ java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PV}.xd3 )
+ )
+ gnome? (
+ !java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PV}.xd3 )
+ java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PV}.xd3 )
+ )
+ !kde? ( !gnome? (
+ java? ( ${BASE_AMD64_URI}libreoffice-java-${PV}.xd3 )
+ ) )
+"
+SRC_URI_X86="
+ ${BASE_X86_URI}libreoffice-${PV}.tar.xz
+ kde? (
+ !java? ( ${BASE_X86_URI}libreoffice-kde-${PV}.xd3 )
+ java? ( ${BASE_X86_URI}libreoffice-kde-java-${PV}.xd3 )
+ )
+ gnome? (
+ !java? ( ${BASE_X86_URI}libreoffice-gnome-${PV}.xd3 )
+ java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PV}.xd3 )
+ )
+ !kde? ( !gnome? (
+ java? ( ${BASE_X86_URI}libreoffice-java-${PV}.xd3 )
+ ) )
+"
+
+SRC_URI="
+ amd64? ( ${SRC_URI_AMD64} )
+ x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="~app-office/${PN/-debug}-${PV}[gnome=,java=,kde=]"
+
+DEPEND="dev-util/xdelta:3"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/*"
+
+src_unpack() {
+ einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz"
+ xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+
+ local patchname
+ use kde && patchname="-kde"
+ use gnome && patchname="-gnome"
+ use java && patchname="${patchname}-java"
+
+ if [[ -n "${patchname}" ]]; then
+ einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3"
+ xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3" "${WORKDIR}/tmpdist.tar" || die
+ mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+ fi
+
+ einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+ unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+ dodir /usr
+ cp -aR "${S}"/usr/* "${ED}"/usr/ || die
+}
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index c696354f3f00..f0461f461f0c 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,12 +1,24 @@
DIST amd64-bin-libreoffice-6.4.7.2_p2.tar.xz 132899212 BLAKE2B daab7c709cef0298e445e8c2ebb1690a7df1b6bef2932bf3a1d965d80117bc3f5a1aedb293ec7a7c73b61a81cb6ba9d595fa4698636eba066453461dde83d28c SHA512 50715cefdbf6e949b010d449c831387ffe7f1444cdb6f8dfa890113e034401cf4d19774043604475c9ea6fd840f21ed7299234eec742177d82f2b9a3095dee42
+DIST amd64-bin-libreoffice-6.4.7.2_p3.tar.xz 132926632 BLAKE2B c5d249988e973049779a99df2e6cdc51325fa27307b1fdacf6fbad6f193ae4e1edb91ddd9b57f716431f872e46229deef4a71d45c0b341c2545c2e8912369e66 SHA512 5a1a96370d5a7e23700c32fed0be9863da0be39df7a247b4a21b2e2f9f9ed92ba3c97c3514c511587247834dfa6957535c88d41d6187afb0a87d30ebd03b2873
DIST amd64-bin-libreoffice-gnome-6.4.7.2_p2.xd3 1915838 BLAKE2B 4ac09d0e9cadd34b8bf374b91526763d8059f36faa0e701310df76f01dd471a781e7a4a57eca0458200b55cd73803e44d2fa902bc4cf9ffdc9b7819583f66e61 SHA512 bd6754ba2512f1679ab7a98af007723b5a2bcd64f1813c6a2c2b61c5aef65bee1cfd866016b67a456e4bb2295b3664cdbf73923dea9900aff5b88d5f42baa535
+DIST amd64-bin-libreoffice-gnome-6.4.7.2_p3.xd3 1929541 BLAKE2B 542f8b1b5cca9d64b46e5115266c2e23764d6c7c3617f0385b050fc58e8463172501d49d7294b1e9005a22587b245b754e69b008f66d4fd0b6dc518fcd93c930 SHA512 aa8c649c10122801594b57270c34f7caed7a2014a8dbf9bf9a25b499763c7780f186857382facbafb5b736a665350f2a2154ba4311c88d8ea7171b639edad1db
DIST amd64-bin-libreoffice-gnome-java-6.4.7.2_p2.xd3 29294532 BLAKE2B fc9d82a6dc3986dbb6d68f8d17deb5bb2477ca1cabaa3abcb214800e668440f3b80338767329aeeb1c0c0c9f2793e482d6749021798c8123f1a07c7f0bbf0ad8 SHA512 b6852c3e504a4a37f151d50df92c6f545434dd285e6635791516e279d93b51b7dd7bdd65d40157aaf5ea9d1cd8bdf06630fceecd4953626ebcfe42f1f015c835
+DIST amd64-bin-libreoffice-gnome-java-6.4.7.2_p3.xd3 29599053 BLAKE2B bb8adba8d02edaf7fc4dcb95a4c79e41ec7c5e4645fbd4d901ed48492214ff8c03fd1115e8667726c124ba29f546da92b6605c8944c034ed5ee676deeef468bd SHA512 90d9cfff0358ccd8d1bb3ee21a8597ce7e0897b5961c1f844d8bfbe2e2c220561701a2d631c3918f62b0eca7267c24997dd0ad063455c282d348517ca90de9a5
DIST amd64-bin-libreoffice-java-6.4.7.2_p2.xd3 29174648 BLAKE2B 1349e5db1bde42d695bd12dab39af30b8288f0ac318a662b1bfced9e3b18b67d02bb2d00201b1e8ae40f5f860d02be132e4e27ff686f703c229d1ec3c6de3e41 SHA512 ec281709877764827b9fb481be480b0f1177fbb3a281a6be7fc50a75733cca9d8212d9b2d420ec823605a9e2881a02da8716c482c82d85e7a7d9b43efa3fe469
+DIST amd64-bin-libreoffice-java-6.4.7.2_p3.xd3 29417968 BLAKE2B 4b5ee3ef8d796485cc9db11de96f973ac958dffa4f91689dc0062db7bd0a0cc35fe5fe7eb19574af2b8251b1aef65da21d0858d213c2fcdfdbf16795b11e2734 SHA512 77ce6945d5b748a2485abd70ebc01c9d3dd42b85d9f5a88660db1c3bdaab95f76aab89cbc6881c3095eadfc8d08fde2b000365e434be6193553a64955e0c87d3
DIST amd64-bin-libreoffice-kde-6.4.7.2_p2.xd3 19690260 BLAKE2B 902b28eaf17c8ba8eb2496674c1c03fa7317eb7eb5455c0650752f9f0313a1b18910775844ab26933aa95d00be57e4c01b3c93f8a0d7dac15198e56138ec404d SHA512 356014519693e5ca73761f13720abac5e8ff715cd9939bfc50581892946d073664753c373ef501cf6bd407cbce7d85fc232eeac1af3fe5279f65f10585e07635
+DIST amd64-bin-libreoffice-kde-6.4.7.2_p3.xd3 19726501 BLAKE2B 52f1335998b47b9e586e408699d8dbfc7371e27967860c11d4141e8ef68ed13db32977999c739a3223f9b52a8491a3b3e532e232674ee499fb9f2fae4226ed93 SHA512 cfb1d9c1046eac6239322a3abce394e02ff1619710c87e2ccf6b8e2e5be3f1c943e165344a9134cad9876423a37e9148ab3b15217a41c7f0680867b7f0ad55d3
DIST amd64-bin-libreoffice-kde-java-6.4.7.2_p2.xd3 29809537 BLAKE2B f975c8bb30067a97eb6fd8b7a13b95e6788c5593c7da7eef870dc52ac1d7c3d7c8d3dfbdb92998f88cd69f4578044ed783477e072f1aa4f91cedcca362c467c4 SHA512 802326419d9bcf88add3dd0712d1feb2c8663a9663c762dc1d08e28cb577e4aa0ac4800ef27b39dd523729df8edc069098a69c25f57b461ba908a4cd2064bba3
+DIST amd64-bin-libreoffice-kde-java-6.4.7.2_p3.xd3 30202629 BLAKE2B 95ec8df939a656537b86d7d3054cc28213f11b276c5b74b20b6b63773c6ce0be59aee9d3370ce4c66219d55f48521ac1ca11622a1ec8082b59069645e94cfd80 SHA512 929885d21ea8d1e61e3353e2b26554711f61111667d20fc34067fc5e7e11a2137539ce0853e9ffceda9498d556ef1e2c04e7518b6083b86d824f6980e0ce4701
DIST x86-bin-libreoffice-6.4.7.2_p2.tar.xz 134593448 BLAKE2B 26b57979c917dd379c590891fb630485d1ba51eddc18407fd2287de03fd76403137c61a8e8b4a49a2a34c71638b15918912187eb0e7a682ca4b338467d376a77 SHA512 62364be3d5513247d95c839a90643bff630ddc075b6e1c1cc9fe46f8c98338f93fce55c939913417423c0f559c697f1156e2d4a0448f08501b23f65a354d82df
+DIST x86-bin-libreoffice-6.4.7.2_p3.tar.xz 134564388 BLAKE2B 8de9bcb052136d1280795831a0a273f3f91f644f721263f4fd6b1378ebb407d8a5098e11220809f31626a0c8b87c00471053eb2b592cb2fb466753ad9bf50c3a SHA512 b80eea595111f80e8c3742d5c2f299514fe5ac7a32ccc0e51f22d78fcc6652bc26bb2cd65e52e377cb15ebcc9ca63f881a5835cf3445d6a73e691f833606e7b1
DIST x86-bin-libreoffice-gnome-6.4.7.2_p2.xd3 1892727 BLAKE2B d1cf2b679a91dd5c1947ec60be83fde839159f5b1e514925b90f47cfc28bf0a902d22c4d57834e9548f8fe6867a1452d4d42d098ac08a8632d341110fa550691 SHA512 d9ef6b5fe1b60fd4085feadb0b7f00ea239d4ce86828db7a3f2d07a89dc1bd879d4d6e2e5277a6b98518dd2c52cc692b1b84b74964ee287a1d9e749e6a47ab8c
+DIST x86-bin-libreoffice-gnome-6.4.7.2_p3.xd3 1909501 BLAKE2B fc56ea80fc2136049f37e9e5d23707d3c67fb0c5b5f07da4081deeec601714d06d3d28e6daa5f7dfe4e67d3142327f25bf1f4f54211a37846c7c8ca94acc81e0 SHA512 3e8a4fd3ac127c1ae6b9a78ed78a4dd767d08ef0fba4bdb1ceb183a101d9b9a46dd5c2dcd931033bcd732163053bfd1a0cf26742d3ef3f8f22d5af45922c1524
DIST x86-bin-libreoffice-gnome-java-6.4.7.2_p2.xd3 27275582 BLAKE2B 4b91ba882e76747227f780b505ca691d7d5dc2bc2a1d3a8305b43248df595e4c429769bc998724dbbd8d0949951b2fb3d19b00f0c76339ee15182bf5193e95ab SHA512 e62fd9d5e7864ef9d7dd745364768e390e3313cee9ea55f021d5f0a12d935132e526c2134c1733c9564622730645c0e1200da9194521f96f5884a678e09391c0
+DIST x86-bin-libreoffice-gnome-java-6.4.7.2_p3.xd3 27103451 BLAKE2B bfebef1f82d7ab7d1859523735afa84f15c5cdd07d4b1c3206279d31c61d3d1fe1d34051fc9f74fbfefeb5b60b170f52c0fd011d9f63a292c054808fa4d81780 SHA512 05647fd328441341697a720be1871cf2b5848791349c8bcef006f8895abdd82a468c6a84a91b8a76803e0641ca8817a1f5c26de104295b15fcbd423b3be125b8
DIST x86-bin-libreoffice-java-6.4.7.2_p2.xd3 27169643 BLAKE2B b84c5e9851ff563e5ecc9cb0368aba008f3f43cda15f81d832c3a5fec97953665fcba6b3d1231a7bb14effd5358cc0a363567d5cdf1d00265a093c18ec9035f2 SHA512 39f4465c340fd6b70717fad48905e38519dfb274fdd97f9b018572814bcd2e903690f5a627e40eb20eff004a55cd3a8157e2943d90685ae872f8c51ddbcb6b05
+DIST x86-bin-libreoffice-java-6.4.7.2_p3.xd3 26982704 BLAKE2B 0f0a69f86c9751af74205c54f74ab32f7c552426f47be9d7f94067a01a4db7d5c9ab8d226cc563c897ef5694ad823708f713050d01cd34c7c1bb0b9b112ebe75 SHA512 6650495d959e0de6ff9e7f13e1e09b11d2d449c0f78bd8580edc1465d76b0d037d5033f9b74358f20272c224c15568affc4fb190974e2f7046d0fbf9c3d0c044
DIST x86-bin-libreoffice-kde-6.4.7.2_p2.xd3 17409833 BLAKE2B 032f5b6ca8262443e2d891dbaa8bbbfd8b7a6a2257a40eafbdd06273fc947cd3a9b96cc10334e3a11086fce7ba3cfc5596e767640d1e5d9258f6bf78ad4266af SHA512 d107cfa5310ee9d139e73cf84bb128d91485caf1b51c62168e29697416649e428e0e55cc55d0347ae8e20f4893907e522515e0f5d4fa350417fe9d181de75a9b
+DIST x86-bin-libreoffice-kde-6.4.7.2_p3.xd3 17740958 BLAKE2B b8dc1ba6da19d96b4e0dc6b9c4889a3e50f81575638f952abd2773b44995a68bdcbbe8274c0886ce249ee11a4de73225be8b4e93d014decb8dae396bfe40be07 SHA512 9154c2918e7d725fba7fc43f03d0c4ed157181ebf09f7e08e1b63797a192f75d24ef854483dc5a1a5c110f90688b4edc7bb532f60af4fdf3f5e42b71c66531f3
DIST x86-bin-libreoffice-kde-java-6.4.7.2_p2.xd3 27721907 BLAKE2B 9ef839325facb31ce7b90f9aae404098d49bf135d9507b1941eb3af2c3f7919783f4bee289549c49041a843d87336bbc8a91cc10a0c72a1d9a48d5dd06ef99e7 SHA512 1965b8b044dbef3f3b02b5fde8fbc2b4fb7890ffb01e337d5471b1886361096fd7a5d06d2955bf6df2a448bd143df4f5263aa203a13d5d92f61e2f3cf4961879
+DIST x86-bin-libreoffice-kde-java-6.4.7.2_p3.xd3 26966369 BLAKE2B 08102ca92e948c920977c0f909657eccbc148906f527da4dcbc5af93d7577862e652e9725fbdba4463adf26a5530328d959dc8a729e94ca1d0a43197e48937dd SHA512 32f5927e621ac23c015449ac485ac452ff5cd07f18e3c76d61b3200580a123111b5a57d3a2d7db32719f91d5d5da6249ec27328d3347df98a4548e60b957180f
diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.4.7.2_p3.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.4.7.2_p3.ebuild
new file mode 100644
index 000000000000..d8b4dd4cb4b4
--- /dev/null
+++ b/app-office/libreoffice-bin/libreoffice-bin-6.4.7.2_p3.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASE_PACKAGENAME="bin"
+BASE_AMD64_URI="https://tamiko.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="https://tamiko.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
+
+PYTHON_COMPAT=( python3_8 )
+PYTHON_REQ_USE="xml"
+
+inherit java-pkg-opt-2 python-single-r1 prefix toolchain-funcs xdg-utils
+
+DESCRIPTION="A full office productivity suite. Binary package"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI_AMD64="
+ ${BASE_AMD64_URI}libreoffice-${PV}.tar.xz
+ kde? (
+ !java? ( ${BASE_AMD64_URI}libreoffice-kde-${PV}.xd3 )
+ java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PV}.xd3 )
+ )
+ gnome? (
+ !java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PV}.xd3 )
+ java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PV}.xd3 )
+ )
+ !kde? ( !gnome? (
+ java? ( ${BASE_AMD64_URI}libreoffice-java-${PV}.xd3 )
+ ) )
+"
+SRC_URI_X86="
+ ${BASE_X86_URI}libreoffice-${PV}.tar.xz
+ kde? (
+ !java? ( ${BASE_X86_URI}libreoffice-kde-${PV}.xd3 )
+ java? ( ${BASE_X86_URI}libreoffice-kde-java-${PV}.xd3 )
+ )
+ gnome? (
+ !java? ( ${BASE_X86_URI}libreoffice-gnome-${PV}.xd3 )
+ java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PV}.xd3 )
+ )
+ !kde? ( !gnome? (
+ java? ( ${BASE_X86_URI}libreoffice-java-${PV}.xd3 )
+ ) )
+"
+
+SRC_URI="
+ amd64? ( ${SRC_URI_AMD64} )
+ x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+BIN_COMMON_DEPEND="
+ app-text/hunspell:0/1.7
+ =app-text/libexttextcat-3.4*
+ =app-text/libmwaw-0.3*
+ dev-libs/boost:0/1.75.0
+ dev-libs/icu:0/68.2
+ dev-libs/liborcus:0/0.15
+ >=media-gfx/graphite2-1.3.10
+ media-libs/harfbuzz:0/0.9.18[icu]
+ media-libs/libpng:0/16
+ >=sys-devel/gcc-9.3.0
+ >=sys-libs/glibc-2.32
+ virtual/jpeg-compat:62
+"
+
+# PLEASE place any restrictions that are specific to the binary builds
+# into the BIN_COMMON_DEPEND block above.
+# All dependencies below this point should remain identical to those in
+# the source ebuilds.
+
+COMMON_DEPEND="
+ ${BIN_COMMON_DEPEND}
+ ${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ >=dev-cpp/libcmis-0.5.2
+ dev-db/unixODBC
+ dev-lang/perl
+ >=dev-libs/boost-1.72.0:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ dev-libs/liborcus:0/0.15
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.28[nss]
+ media-gfx/fontforge
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ net-print/cups
+ sys-apps/dbus[X]
+ gnome? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ !kde? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+ dev-db/mariadb-connector-c
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.8 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+
+PDEPEND="
+ =app-office/libreoffice-l10n-$(ver_cut 1-4)*
+"
+
+DEPEND="dev-util/xdelta:3"
+
+# only one flavor at a time
+REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+PYTHON_UPDATER_IGNORE="1"
+
+QA_PREBUILT="/usr/*"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_unpack() {
+ einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz"
+ xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+
+ local patchname
+ use kde && patchname="-kde"
+ use gnome && patchname="-gnome"
+ use java && patchname="${patchname}-java"
+
+ if [[ -n "${patchname}" ]]; then
+ einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3"
+ xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PV}.xd3" "${WORKDIR}/tmpdist.tar" || die
+ mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar" || die
+ fi
+
+ einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+ unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PV}.tar"
+}
+
+src_prepare() {
+ cp "${FILESDIR}"/50-${PN} "${T}"
+ eprefixify "${T}"/50-${PN}
+ default
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+ dodir /usr
+ cp -aR "${S}"/usr/* "${ED}"/usr/
+
+ # prevent revdep-rebuild from attempting to rebuild all the time
+ insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+
+ ewarn 'If you plan to use the Base application you should use a source build and enable java and firebird.'
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 3cb812b7a034..2770e55997ea 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/elogviewer/Manifest b/app-portage/elogviewer/Manifest
index df98e588981b..711cefee880c 100644
--- a/app-portage/elogviewer/Manifest
+++ b/app-portage/elogviewer/Manifest
@@ -1 +1,2 @@
DIST elogviewer-3.0.tar.gz 28349 BLAKE2B 44f3ca5b28d075bb8349450cc817fd8ccdd1d1dc7eb948a9d65ab3b423191eca04cc479b2d6bec0bf6bc7f1120eccd257fdf61bb736919129ee756c2f4bd4366 SHA512 7eb59849a06632053ee0f7d1d76d9848220dbb8ad48d04c80fea5e64304f86c1a99987f525c6df682c832bd8453e07781a5c95ad2dee0539e954400730f47e36
+DIST elogviewer-3.1.tar.gz 28650 BLAKE2B b15d94095def5fb7fdcf77ad1e7bf1fc35af6bbd999d89b7f90bed8ef9739182c8e4af0033aee92453d6b0731ac5d8c168e3900abe0a4466d584bfd9bc64917a SHA512 b99bc165ab08755273ead73fdd3602c9266a9bb243c46d99805c1f8b07f7e8ea9b0583aedb9b7ab717461f2ed3bd27dcf0a5677f2d908d3fcc03769794a64d5b
diff --git a/app-portage/elogviewer/elogviewer-3.1.ebuild b/app-portage/elogviewer/elogviewer-3.1.ebuild
new file mode 100644
index 000000000000..7e2097ac19e0
--- /dev/null
+++ b/app-portage/elogviewer/elogviewer-3.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+DISABLE_AUTOFORMATTING=true
+
+inherit desktop python-single-r1 readme.gentoo-r1
+
+DESCRIPTION="Elog viewer for Gentoo"
+HOMEPAGE="https://github.com/Synss/elogviewer"
+SRC_URI="https://github.com/Synss/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/PyQt5[gui,widgets,${PYTHON_MULTI_USEDEP}]
+ >=sys-apps/portage-2.1[${PYTHON_MULTI_USEDEP}]
+ ')
+"
+DEPEND="${RDEPEND}
+ $(python_gen_cond_dep '
+ dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+ ')
+"
+
+DOC_CONTENTS="In order to use this software, you need to activate
+Portage's elog features. Required is
+ PORTAGE_ELOG_SYSTEM=\"save\"
+and at least one of
+ PORTAGE_ELOG_CLASSES=\"warn error info log qa\"
+More information on the elog system can be found in
+/usr/share/portage/config/make.conf.example
+
+To operate properly this software needs the directory
+${PORT_LOGDIR:-/var/log/portage}/elog created, belonging to group portage.
+To start the software as a user, add yourself to the portage group."
+
+PATCHES=( "${FILESDIR}/elogviewer-3.0-segfault.patch"
+)
+
+src_compile() {
+ rm -f Makefile
+}
+
+src_install() {
+ python_newscript elogviewer.py elogviewer
+
+ make_desktop_entry ${PN} ${PN} ${PN} System
+
+ doman elogviewer.1
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+
+ ewarn "The elogviewer's configuration file is now saved in:"
+ ewarn "~/.config/elogviewer/ (was ~/.config/Mathias\ Laurin/)."
+ ewarn "Please migrate any user specific settings to the new config file."
+}
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 8ca3a26ec03f..b28ccef515af 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,4 +1,4 @@
DIST portage-utils-0.87.tar.xz 1772956 BLAKE2B b1487d89303b524ffa9e6030feba181fcad73a6f38febf29f63b1f7bcd7a5080ddb1f907ca217040d064427f2060bb3885a61c30663594428be475a5bf7253f0 SHA512 a29f2d1fc85aea1c2b4c8b16fca0e9b559a980951f79cb10d7fd836d99ec65a904f2cbc54a949150ce490ba5d705b0aa5aa39f56365968b3dd591cb3d7c5eb21
-DIST portage-utils-0.89.tar.xz 1775088 BLAKE2B 6218cd3a5a435622366550857753529b38a8c2c9dbc2c9d72d3ce8517679fb782caded843807cebd606294a5ecb6dd110311e8da95d54626126b091ee902ab1d SHA512 c285901f1200f0ee81a4cd12840f5b4938fa525ce3611458287d6f5439c78b9ecf5ec0dc40d759fe5e6a848d4fd13b6d9ac38222ebf2c4453a60f9fdb842a55c
DIST portage-utils-0.90.1.tar.xz 1779252 BLAKE2B 27c94694cab84970c0c92e835b9039d9420fbfa20f9f2e03f4f53d118df4dc243cddce33994095a3e41bd1027a42c9c29cda65cb7cf4f45279a028b21555f4f8 SHA512 67290a69ad6ac40da3ce0f41d2630096690e69bb97a1428af921ccc582dcfbf903bbf98259f68afdbe9e96aef81672ea3352a9266a649e75f99acec7fa00cd8a
DIST portage-utils-0.90.tar.xz 1776636 BLAKE2B bbacc05aa97c77705ae4fbdb5efde5f1d49a99ac8ed259e026c9a997f43a86551b3a10a397e0c5f1da161d2c0d88afe88e22870705ca39d911c4a98ad13f4928 SHA512 2077061dd7dfd444d4ad38faf5a87aa44392d7747f71d7283b5e2775ce3d714773cd642ea085aea3dd34a715f2c446d42fd64ba42fa99e716e8d843aae3d9682
+DIST portage-utils-0.91.tar.xz 1783048 BLAKE2B cb93f29b8f7402b745ca0d191c8c02c75ab6a4a9fbe54b8d1ea60d1a2917a8ba2f6ff88e2c211b957ace1916307c38308ff355c7cd9a8db8876aed8f235a841f SHA512 f10c1653af44e9907bea5245b65127f047f8cd48c30a5d0252f514c759b6fdb83fbf036ba7297c926b6ddd3ca34c231717e78378dfd709fab699012ab5a67450
diff --git a/app-portage/portage-utils/portage-utils-0.89.ebuild b/app-portage/portage-utils/portage-utils-0.91.ebuild
similarity index 100%
rename from app-portage/portage-utils/portage-utils-0.89.ebuild
rename to app-portage/portage-utils/portage-utils-0.91.ebuild
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 025b1557deee..8bd05425e88b 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/ansifilter/ansifilter-2.17.ebuild b/app-text/ansifilter/ansifilter-2.17.ebuild
index 3233e9d2bbd7..f016eddcddc3 100644
--- a/app-text/ansifilter/ansifilter-2.17.ebuild
+++ b/app-text/ansifilter/ansifilter-2.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~s390 ~sparc x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
IUSE="qt5"
RDEPEND="
diff --git a/app-text/csvfix/Manifest b/app-text/csvfix/Manifest
deleted file mode 100644
index 76e235609d27..000000000000
--- a/app-text/csvfix/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST csvfix-1.6.tar.bz2 322530 BLAKE2B 8bda635a5182b31efe2c5c6613baaea13fe2f5c32f97c2bcbdaf05447103507c46190557f0a07e46aa0f442a6ed6b63b0d46d9759e5ddb2b19f00a31a38ddcce SHA512 abd525cff11e6dc4e59f5b26d57b2327564327e27009bbf777a6d83a6f8e474415b4448408aa162c6fb20b9a5bbaf970bdca23d8a9d7e31c3b8aaa19cd878035
-DIST csvfix_man_html_160.zip 403468 BLAKE2B 8007ca95891a99926f6c2968a73ddc30211ff07017261583664dc44ac84a508d097cb4acb81529891caa2f98ca4f094565f46cfa9d79e0d99df92ffd5acc908e SHA512 868047ca4eef7bbbf3735f25489c72820465c414af2ffa11fd3e61fd45ca80661d73082a90b94c4503876bb2355a6b3751f8ede862744f0d7223e77ae770ccd5
diff --git a/app-text/csvfix/csvfix-1.6.ebuild b/app-text/csvfix/csvfix-1.6.ebuild
deleted file mode 100644
index 8f35d4536767..000000000000
--- a/app-text/csvfix/csvfix-1.6.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs versionator vcs-snapshot eutils
-
-MY_PV="$(delete_all_version_separators)"
-DESCRIPTION="A stream editor for manipulating CSV files"
-HOMEPAGE="https://neilb.bitbucket.org/csvfix/ https://bitbucket.org/neilb/csvfix/"
-SRC_URI="https://bitbucket.org/neilb/csvfix/get/version-${PV}.tar.bz2 -> ${P}.tar.bz2
- doc? ( https://bitbucket.org/neilb/csvfix/downloads/csvfix_man_html_${MY_PV}0.zip )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-libs/expat"
-DEPEND="${RDEPEND}
- doc? ( app-arch/unzip )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-makefile.patch
- "${FILESDIR}"/${PN}-1.10a-tests.patch
- "${FILESDIR}"/${P}-shuffle-test.patch
-)
-
-src_prepare() {
- default
- edos2unix $(find csvfix/tests -type f)
-}
-
-src_compile() {
- emake CC="$(tc-getCXX)" AR="$(tc-getAR)" lin
-}
-
-src_test() {
- cd ${PN}/tests
- chmod +x run1 runtests
- ./runtests || die "tests failed"
-}
-
-src_install() {
- dobin csvfix/bin/csvfix
- if use doc; then
- docinto html
- dodoc -r "${WORKDIR}"/${PN}${MY_PV}/*
- fi
-}
diff --git a/app-text/csvfix/files/csvfix-1.10a-tests.patch b/app-text/csvfix/files/csvfix-1.10a-tests.patch
deleted file mode 100644
index 8e4461d85a31..000000000000
--- a/app-text/csvfix/files/csvfix-1.10a-tests.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- csvfix-build.orig/csvfix/tests/run1
-+++ csvfix-build/csvfix/tests/run1
-@@ -1,4 +1,4 @@
--#!bash
-+#!/bin/bash
- # run1
- # run single test
- # copyright (C) 2008 Neil Butterworth
-@@ -49,7 +49,7 @@
- fi
-
- # exe to be tested - used in tests
--CSVED=../bin/csvfix.exe
-+CSVED=../bin/csvfix
- export CSVED
-
- if [ ! -f "$CSVED" ]
-@@ -64,7 +64,7 @@
- fi
-
- # where to find diff & where to put output
--DIFF=/bin/diff
-+DIFF=/usr/bin/diff
- DIFFOUT=tmp/_diffout
- WINDIFF="C:/Program Files/Microsoft Visual Studio/Common/Tools/WINDIFF.EXE"
- TEST=`basename $TEST`
-@@ -133,5 +133,7 @@
- fi
- else
- echo "Execution problem with $TEST - please correct"
-+ color_red "FAILED $TEST"
-+ exit 1
- fi
-
---- csvfix-build.orig/csvfix/tests/runtests
-+++ csvfix-build/csvfix/tests/runtests
-@@ -1,4 +1,4 @@
--#!bash
-+#!/bin/bash
- # runall.bash
- # run all tests and report
-
-@@ -22,3 +22,8 @@
- echo $FAILS failed, $PASSES passed
- echo ""
-
-+if [[ $FAILS -gt 0 ]]; then
-+ exit 1
-+else
-+ exit 0
-+fi
diff --git a/app-text/csvfix/files/csvfix-1.6-makefile.patch b/app-text/csvfix/files/csvfix-1.6-makefile.patch
deleted file mode 100644
index aaee2aa003f7..000000000000
--- a/app-text/csvfix/files/csvfix-1.6-makefile.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- neilb-csvfix-e804a794d175/alib/Makefile
-+++ neilb-csvfix-e804a794d175/alib/Makefile
-@@ -2,12 +2,12 @@
- # Copyright (C) 2009 Neil Butterworth
-
- OUT = lib/alib.a
-+AR = ar
- CCTYPE = gcc
- IDIR = inc
- ODIR = obj
--XDIR = expat
- SDIR = src
--INC = -Iinc -Iexpat
-+INC = -Iinc
-
- cc.gcc = g++
- cc.clang = clang++ -std=c++11 -stdlib=libc++
-@@ -26,9 +26,6 @@
- _WINOBJS = a_db.o a_dir.o a_opsys.o a_winerr.o
- WINOBJS = $(patsubst %,$(ODIR)/%,$(_WINOBJS))
-
--_EXPAT = xmlparse.o xmlrole.o xmltok.o xmltok_impl.o xmltok_ns.o
--EXPAT = $(patsubst %,$(ODIR)/%,$(_EXPAT))
--
- $(ODIR)/%.o: $(SDIR)/%.cpp $(IDIR)/%.h
- $(CC) -c $(INC) $(CFLAGS) -o $@ $<
-
-@@ -36,10 +33,10 @@
- $(CC) -c $(INC) $(CFLAGS) -o $@ $<
-
- win: $(OBJS) $(EXPAT) $(WINOBJS)
-- ar rvs $(OUT) $^
-+ $(AR) rvs $(OUT) $^
-
- lin: $(OBJS) $(EXPAT)
-- ar rvs $(OUT) $^
-+ $(AR) rvs $(OUT) $^
-
- .PHONY: clean
- clean:
---- neilb-csvfix-e804a794d175/csvfix/Makefile
-+++ neilb-csvfix-e804a794d175/csvfix/Makefile
-@@ -22,7 +22,7 @@
-
- ALIB = ../alib/lib/alib.a
- WINLIBS = ../alib/lib/alib.a -lodbc32
--LINLIBS = ../alib/lib/alib.a
-+LINLIBS = ../alib/lib/alib.a -lexpat
-
- _OBJS = csved_atable.o \
- csved_block.o \
-@@ -99,8 +99,7 @@
- strip $(WINOUT)
-
- $(LINOUT): $(OBJS) $(ALIB)
-- $(CC) -o $@ $^ $(LINLIBS)
-- strip $(LINOUT)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LINLIBS)
-
- .PHONY: win
- win:
---- neilb-csvfix-e804a794d175/Makefile
-+++ neilb-csvfix-e804a794d175/Makefile
-@@ -1,3 +1,5 @@
-+CFLAGS += -std=c++11
-+
- ifndef COMSPEC
- CLEAN = (cd alib; $(MAKE) clean) && (cd csvfix; $(MAKE) clean)
- else
diff --git a/app-text/csvfix/files/csvfix-1.6-shuffle-test.patch b/app-text/csvfix/files/csvfix-1.6-shuffle-test.patch
deleted file mode 100644
index 3916e92e0592..000000000000
--- a/app-text/csvfix/files/csvfix-1.6-shuffle-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Fix the expected data output for the shuffle test.
-
---- a/csvfix/tests/correct/shuffle.test
-+++ b/csvfix/tests/correct/shuffle.test
-@@ -5,10 +5,10 @@
- "Oscar","Wilde","M"
- "Charles","Dickens","M"
- "George","Elliot","F"
--"Charles","Dickens","M"
--"Austen","F","Jane"
-+"Charles","M","Dickens"
-+"Jane","F","Austen"
- "Herman","M","Melville"
- "M","Flann","O'Brien"
--"Elliot","George","F"
--"Virginia","Woolf","F"
--"M","Wilde","Oscar"
-+"George","F","Elliot"
-+"Woolf","F","Virginia"
-+"Wilde","M","Oscar"
diff --git a/app-text/csvfix/metadata.xml b/app-text/csvfix/metadata.xml
deleted file mode 100644
index bf239db74a96..000000000000
--- a/app-text/csvfix/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
- neilb/csvfix
-
-
diff --git a/app-text/dblatex/dblatex-0.3.11-r1.ebuild b/app-text/dblatex/dblatex-0.3.11-r1.ebuild
index 0c962c5b3d9d..14c834cb4886 100644
--- a/app-text/dblatex/dblatex-0.3.11-r1.ebuild
+++ b/app-text/dblatex/dblatex-0.3.11-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.sourceforge.net/project/dblatex/dblatex/${P}/${P}py3.
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86"
IUSE="inkscape"
RDEPEND="
diff --git a/app-text/mupdf/files/mupdf-1.18.0-CVE-2021-3407.patch b/app-text/mupdf/files/mupdf-1.18.0-CVE-2021-3407.patch
new file mode 100644
index 000000000000..566ee562389c
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.18.0-CVE-2021-3407.patch
@@ -0,0 +1,51 @@
+https://bugs.gentoo.org/772311
+
+From cee7cefc610d42fd383b3c80c12cbc675443176a Mon Sep 17 00:00:00 2001
+From: Robin Watts
+Date: Fri, 22 Jan 2021 17:05:15 +0000
+Subject: [PATCH 1/1] Bug 703366: Fix double free of object during
+ linearization.
+
+This appears to happen because we parse an illegal object from
+a broken file and assign it to object 0, which is defined to
+be free.
+
+Here, we fix the parsing code so this can't happen.
+---
+ source/pdf/pdf-parse.c | 6 ++++++
+ source/pdf/pdf-xref.c | 2 ++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/source/pdf/pdf-parse.c b/source/pdf/pdf-parse.c
+index 7abc8c3d4..5761c3351 100644
+--- a/source/pdf/pdf-parse.c
++++ b/source/pdf/pdf-parse.c
+@@ -749,6 +749,12 @@ pdf_parse_ind_obj(fz_context *ctx, pdf_document *doc,
+ fz_throw(ctx, FZ_ERROR_SYNTAX, "expected generation number (%d ? obj)", num);
+ }
+ gen = buf->i;
++ if (gen < 0 || gen >= 65536)
++ {
++ if (try_repair)
++ *try_repair = 1;
++ fz_throw(ctx, FZ_ERROR_SYNTAX, "invalid generation number (%d)", gen);
++ }
+
+ tok = pdf_lex(ctx, file, buf);
+ if (tok != PDF_TOK_OBJ)
+diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c
+index 1b2bdcd59..30197b4b8 100644
+--- a/source/pdf/pdf-xref.c
++++ b/source/pdf/pdf-xref.c
+@@ -1190,6 +1190,8 @@ pdf_read_new_xref(fz_context *ctx, pdf_document *doc, pdf_lexbuf *buf)
+ {
+ ofs = fz_tell(ctx, doc->file);
+ trailer = pdf_parse_ind_obj(ctx, doc, doc->file, buf, &num, &gen, &stm_ofs, NULL);
++ if (num == 0)
++ fz_throw(ctx, FZ_ERROR_GENERIC, "Trailer object number cannot be 0\n");
+ }
+ fz_catch(ctx)
+ {
+--
+2.17.1
+
diff --git a/app-text/mupdf/mupdf-1.18.0-r3.ebuild b/app-text/mupdf/mupdf-1.18.0-r3.ebuild
new file mode 100644
index 000000000000..839b9706a052
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.18.0-r3.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git"
+SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
+S="${WORKDIR}/${P}-source"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~x86"
+IUSE="X +javascript libressl opengl ssl"
+REQUIRED_USE="opengl? ( javascript )"
+
+# Although we use the bundled, patched version of freeglut in mupdf (because of
+# bug #653298), the best way to ensure that its dependencies are present is to
+# install system's freeglut.
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+ dev-libs/gumbo
+ media-libs/freetype:2=
+ media-libs/harfbuzz:=[truetype]
+ media-libs/jbig2dec:=
+ media-libs/libpng:0=
+ >=media-libs/openjpeg-2.1:2=
+ virtual/jpeg
+ javascript? ( >=dev-lang/mujs-1.0.7:= )
+ opengl? ( >=media-libs/freeglut-3.0.0 )
+ ssl? (
+ libressl? ( >=dev-libs/libressl-3.1.4:0= )
+ !libressl? ( >=dev-libs/openssl-1.1:0= )
+ )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXext
+ )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.15-CFLAGS.patch
+ "${FILESDIR}"/${PN}-1.18-Makefile.patch
+ "${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+ # See bugs #662352
+ "${FILESDIR}"/${PN}-1.15-openssl-x11.patch
+ # General cross fixes from Debian (refreshed)
+ "${FILESDIR}"/${PN}-1.18.0-cross-fixes.patch
+ # Additional security patches post-1.18.0
+ "${FILESDIR}"/${P}-fix-oob-in-pdf-layer.c
+ "${FILESDIR}"/${P}-fix-oob-in-pixmap.c
+ "${FILESDIR}"/${P}-CVE-2021-3407.patch
+)
+
+src_prepare() {
+ xdg_src_prepare
+
+ use hppa && append-cflags -ffunction-sections
+
+ append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)"
+
+ sed -e "1iOS = Linux" \
+ -e "1iCC = $(tc-getCC)" \
+ -e "1iCXX = $(tc-getCXX)" \
+ -e "1iLD = $(tc-getLD)" \
+ -e "1iAR = $(tc-getAR)" \
+ -e "1iverbose = yes" \
+ -e "1ibuild = debug" \
+ -e "1iprefix = ${ED}/usr" \
+ -e "1ilibdir = ${ED}/usr/$(get_libdir)" \
+ -e "1idocdir = ${ED}/usr/share/doc/${PF}" \
+ -i Makerules || die
+}
+
+_emake() {
+ # When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
+ # Bundled libs
+ # * General
+ # Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's
+ # recommendations. It does not mean "always use system libs".
+ # See [0] below for what it means in a specific version.
+ #
+ # * freeglut
+ # We don't use system's freeglut because upstream has a special modified
+ # version of it that gives mupdf clipboard support. See bug #653298
+ #
+ # * mujs
+ # As of v1.15.0, mupdf started using symbols in mujs that were not part
+ # of any release. We then went back to using the bundled version of it.
+ # But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk
+ # when bumping and check!
+ # See bug #685244
+ #
+ # * lmms2
+ # mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1].
+ # It is therefore not appropriate for us to unbundle it at this time.
+ #
+ # [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9
+ # [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt
+ emake \
+ GENTOO_PV=${PV} \
+ HAVE_GLUT=$(usex opengl) \
+ HAVE_LIBCRYPTO=$(usex ssl) \
+ HAVE_X11=$(usex X) \
+ USE_SYSTEM_LIBS=yes \
+ USE_SYSTEM_MUJS=$(usex javascript) \
+ USE_SYSTEM_GLUT=no \
+ HAVE_OBJCOPY=no \
+ "$@"
+}
+
+src_compile() {
+ _emake XCFLAGS="-fpic"
+}
+
+src_install() {
+ if use X || use opengl ; then
+ domenu platform/debian/${PN}.desktop
+ doicon platform/debian/${PN}.xpm
+ else
+ rm docs/man/${PN}.1 || die
+ fi
+
+ _emake install
+
+ dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+
+ if use opengl ; then
+ einfo "mupdf symlink points to mupdf-gl (bug 616654)"
+ dosym ${PN}-gl /usr/bin/${PN}
+ elif use X ; then
+ einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
+ dosym ${PN}-x11 /usr/bin/${PN}
+ fi
+
+ # Respect libdir (bug #734898)
+ sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die
+
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins platform/debian/${PN}.pc
+
+ dodoc README CHANGES CONTRIBUTORS
+}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 18dd2c7dccf1..6eea8b3e58dd 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,3 +1,2 @@
DIST poppler-20.11.0.tar.xz 1648432 BLAKE2B 373464ba60ed84863b40eca2e4f99ebc1625ea06f68a1621165675cf46e70713b649f90630049d15c5c2bc59bd0befb437a4039b47e17509d4fcc4fed8586d53 SHA512 c8237e931ef20d939656e2600453fffb12a2beeafb273782b2069aec6e5915d8cc85136982b7eaf5956af30ce00da2faf84d86ffab47f725447dfbb9d6ffe335
-DIST poppler-21.01.0.tar.xz 1680536 BLAKE2B 5f8d283cd26f4713c09b0c102dd3295bc7ae1c2ad2ba0f51d12fdaed5f89a864d98d10be7176e17c5613aa4579da3bea1aca56aff3cec4e5c53e977a1e84659f SHA512 aec130446df73a2fc66851a563a14cb40299212a2de4a0d03668b0fecb28312fffa70d0a82431c774d0c0e3f7293788bd2bdf28c8136aa09ad80edbca4cf0ddd
DIST poppler-21.02.0.tar.xz 1684496 BLAKE2B f62399a70baa0af36abd9bf7f5bc69003fcdc9b668a64475a6373dbdd9885092a8beb42f887eafdafac5ee17e9aac5b610bad1c9a64af8112e72c82f47e6a304 SHA512 3964990749f38f4468b244c579ff1f2dab7357dfddecb3035d14d3aaeac6ee4be42e76b4a1cc1a8cf53715518def9e92cc59d08c1e22592ced00a9c948989035
diff --git a/app-text/poppler/poppler-21.01.0.ebuild b/app-text/poppler/poppler-21.01.0.ebuild
deleted file mode 100644
index 0c0be114df56..000000000000
--- a/app-text/poppler/poppler-21.01.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 2005-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake toolchain-funcs xdg-utils
-
-if [[ ${PV} == *9999* ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
- SLOT="0/9999"
-else
- SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
- SLOT="0/106" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-BDEPEND="
- dev-util/glib-utils
- virtual/pkgconfig
-"
-DEPEND="
- media-libs/fontconfig
- media-libs/freetype
- sys-libs/zlib
- cairo? (
- dev-libs/glib:2
- x11-libs/cairo
- introspection? ( dev-libs/gobject-introspection:= )
- )
- curl? ( net-misc/curl )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
- lcms? ( media-libs/lcms:2 )
- nss? ( >=dev-libs/nss-3.19:0 )
- png? ( media-libs/libpng:0= )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtxml:5
- )
- tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
- cjk? ( app-text/poppler-data )
-"
-
-DOCS=( AUTHORS NEWS README.md README-XPDF )
-
-PATCHES=(
- "${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
- "${FILESDIR}/${PN}-20.12.0-respect-cflags.patch"
- "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
-
- # Clang doesn't grok this flag, the configure nicely tests that, but
- # cmake just uses it, so remove it if we use clang
- if [[ ${CC} == clang ]] ; then
- sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
- fi
-
- if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
- sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
- -i CMakeLists.txt || die
- else
- einfo "policy(SET CMP0002 OLD) - workaround can be removed"
- fi
-}
-
-src_configure() {
- xdg_environment_reset
- local mycmakeargs=(
- -DBUILD_GTK_TESTS=OFF
- -DBUILD_QT5_TESTS=OFF
- -DBUILD_CPP_TESTS=OFF
- -DRUN_GPERF_IF_PRESENT=OFF
- -DENABLE_SPLASH=ON
- -DENABLE_ZLIB=ON
- -DENABLE_ZLIB_UNCOMPRESS=OFF
- -DENABLE_UNSTABLE_API_ABI_HEADERS=ON
- -DUSE_FLOAT=OFF
- -DWITH_Cairo=$(usex cairo)
- -DENABLE_LIBCURL=$(usex curl)
- -DENABLE_CPP=$(usex cxx)
- -DWITH_JPEG=$(usex jpeg)
- -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
- -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
- -DENABLE_CMS=$(usex lcms lcms2 none)
- -DWITH_NSS3=$(usex nss)
- -DWITH_PNG=$(usex png)
- $(cmake_use_find_package qt5 Qt5Core)
- -DWITH_TIFF=$(usex tiff)
- -DENABLE_UTILS=$(usex utils)
- -DENABLE_QT6=OFF
- )
- use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- # live version doesn't provide html documentation
- if use cairo && use doc && [[ ${PV} != *9999* ]]; then
- # For now install gtk-doc there
- insinto /usr/share/gtk-doc/html/poppler
- doins -r "${S}"/glib/reference/html/*
- fi
-}
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 1cf9e94f082f..1b0fea927805 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,2 +1,3 @@
DIST qpdf-10.0.4.tar.gz 18465085 BLAKE2B 3b9edc38069d58d43d26b131da755b7921b7add905ed652e3abb48d9b2e140d0c3b38f0250dbd3dca1c4b3dadf76c636606c6fa802b1ebe2dda77444badd828e SHA512 0a8c243928a3273d78b4a898e17a619f1565ec5e9b6f637800a2937749fb8006d0438fee2e623d2f8dc715bfb478ee818e86e9da7c7e0fcf14af496464b79a07
DIST qpdf-10.1.0.tar.gz 18528427 BLAKE2B e62b1c8ca8d301b082cde292cb8430d6ae26433c77a30a6a21379f00cbfb3df09117d042f532f77d372d091a89a3f6581ef7d7734c67a4a1b29c1708129078f3 SHA512 f9b22d89fc62e430e6232c840ad74d220ac9eb09d7f2dfe2c42c1c943d35b5fd25e2abec9970ac19ad7ad25dc3d95c74e68e50bad395abf815cf71c432233106
+DIST qpdf-10.2.0.tar.gz 18816798 BLAKE2B 2983dd4ab8d234d6acb838abb57cd8e75edc540804608c3c3d387ee4c2f8ca8060b77e1b6f1a0950640835065fc681d9ad1dec5d8cf2a706727e237b71eabf8d SHA512 07a37aafccb670034aedfc031a4c2c1d3b6aa001e5c1bde5a3f57520a0523eebd890011a8225bb26b5beb83be15d4be3d2f1f40ad91f8370032db984cf788c0a
diff --git a/app-text/qpdf/metadata.xml b/app-text/qpdf/metadata.xml
index f203b11e95cd..bc587dc37636 100644
--- a/app-text/qpdf/metadata.xml
+++ b/app-text/qpdf/metadata.xml
@@ -7,6 +7,7 @@
cpe:/a:qpdf_project:qpdf
+ qpdf/qpdf
qpdf
diff --git a/app-text/qpdf/qpdf-10.2.0.ebuild b/app-text/qpdf/qpdf-10.2.0.ebuild
new file mode 100644
index 000000000000..fa194fe13674
--- /dev/null
+++ b/app-text/qpdf/qpdf-10.2.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="http://qpdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 Artistic-2 )"
+# subslot = libqpdf soname version
+SLOT="0/28"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+IUSE="doc examples libressl ssl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ net-libs/gnutls:0=
+ sys-libs/zlib
+ virtual/jpeg:0=
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+"
+DEPEND="${RDEPEND}
+ test? (
+ app-text/ghostscript-gpl[tiff(+)]
+ media-libs/tiff
+ sys-apps/diffutils
+ )
+"
+
+DOCS=( ChangeLog README.md TODO )
+
+src_configure() {
+ local myeconfargs=(
+ --disable-implicit-crypto
+ --enable-crypto-gnutls
+ --enable-crypto-native
+ --with-default-crypto=gnutls
+ --disable-static
+ $(use_enable ssl crypto-openssl)
+ $(use_enable test test-compare-images)
+ )
+ CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ if use examples ; then
+ dobin examples/build/.libs/*
+ fi
+
+ find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/app-text/teckit/Manifest b/app-text/teckit/Manifest
index 219b05849e03..fac64127da87 100644
--- a/app-text/teckit/Manifest
+++ b/app-text/teckit/Manifest
@@ -1,2 +1 @@
DIST teckit-2.5.10.tar.gz 2112617 BLAKE2B fe38bbecfeec61f2c926fc033230a753ce1435fdf77bebe3c6d6c427a46bd5019d23605ee3d73f733d6345301a26ad3b1fd207daa46fdf66a7728be4569758aa SHA512 c2d3bcf1245723bb3bbe9c147fc3024e667ab4d1280aa0f8b5394b2dd9bb75e3f2bf42f057744fa86ed551ebf3e0f13300072a0325888cb8f9501d874c356f34
-DIST teckit-2.5.6.tar.gz 2500800 BLAKE2B a41c51e80b558d9735be782ed655fe36ec673180e559a3063c3b78ece14e470e194740f2039863a6e7a12e006c2314c3b73eff5de4d289c8eca1b6c9744f1e0d SHA512 d3462dbf22658de85fd718c43229259c460730d907226435195742f1ab65accc4ec83f7b6cb32a0e99fa12ddb7f2b7b5f2598c8853636aa5b31c8592ed9b4745
diff --git a/app-text/teckit/files/teckit-2.5.1-mixcflagscxxflags.patch b/app-text/teckit/files/teckit-2.5.1-mixcflagscxxflags.patch
deleted file mode 100644
index 5a290f45133b..000000000000
--- a/app-text/teckit/files/teckit-2.5.1-mixcflagscxxflags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-No need to pass CFLAGS twice, esp. if they are used to feed g++
-Bug #338110
-
-Index: TECkit_2_5_1/configure.ac
-===================================================================
---- TECkit_2_5_1.orig/configure.ac
-+++ TECkit_2_5_1/configure.ac
-@@ -76,7 +76,7 @@ noexpat_CFLAGS="$CFLAGS"
- noexpat_LIBS="$LIBS"
- AC_CHECK_LIB(expat, XML_ExpatVersion)
- AM_CONDITIONAL(SYSTEM_EXPAT, test x$ac_cv_lib_expat_XML_ExpatVersion = xyes)
--expat_CFLAGS="$CFLAGS"
-+expat_CFLAGS=""
- expat_LIBS="$LIBS"
- CFLAGS="$noexpat_CFLAGS"
- LIBS="$noexpat_LIBS"
diff --git a/app-text/teckit/teckit-2.5.6.ebuild b/app-text/teckit/teckit-2.5.6.ebuild
deleted file mode 100644
index 465bce230049..000000000000
--- a/app-text/teckit/teckit-2.5.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="Text Encoding Conversion toolkit"
-HOMEPAGE="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&cat_id=TECkit"
-SRC_URI="https://github.com/silnrsi/teckit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( CPL-0.5 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="sys-libs/zlib
- dev-libs/expat"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-2.5.1-mixcflagscxxflags.patch"
- rm -f configure
- sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
- eautoreconf
-}
-
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS README NEWS
- find "${ED}" -name '*.la' -delete || die
-}
-
-src_test() {
- cd "${S}/test"
- chmod +x dotests.pl
- ./dotests.pl || die "tests failed"
-}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index cd38872cb174..78d400e97bbd 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/string-theory/string-theory-3.4.ebuild b/dev-cpp/string-theory/string-theory-3.4.ebuild
index f894600367c2..f6c5c3db6f6a 100644
--- a/dev-cpp/string-theory/string-theory-3.4.ebuild
+++ b/dev-cpp/string-theory/string-theory-3.4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/string_theory-${PV}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 2e0e28416b51..1c5eed77996e 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
index 3b6bbb7078ba..741d65dda0ff 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1 +1,2 @@
DIST mariadb-connector-c-3.1.11-src.tar.gz 752342 BLAKE2B 5bee575bffdceb1eff60b7ba3fa334882cf2b2a12446cd6c52663cc5ce2e179bcd19c8452e9bdae3877ac7e9e08f4f6a974d136170c399439c42e1759d226c84 SHA512 2da3a5e438037dde2b9fafb07c084c742983ff4ce18f06cf7a34836aace5317cdb2ddb1bca63143367f5ae827c988d99ee20e8f598fabdb06190d9e2191eb3f4
+DIST mariadb-connector-c-3.1.12-src.tar.gz 966702 BLAKE2B 8187199f43ccb6f92ea9df61a1f62e48dbef4744cda9a5e865f71038e47a65dea3ed094dd76d81d0d8d357a8d611a9770590a3504c297ea30f59f285ab511d17 SHA512 a46e8ec976c28e227a72f09c15c92126d178b422a92a4c90fd52c8053604c3309aeb3bd098dc63fbd0d87059d5360c8b63d76e61a1152e7a3e7145e13681453d
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild
new file mode 100644
index 000000000000..f5b20304f800
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VCS_INHERIT=""
+if [[ "${PV}" == 9999 ]] ; then
+ VCS_INHERIT="git-r3"
+ EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
+else
+ MY_PN=${PN#mariadb-}
+ MY_PV=${PV/_b/-b}
+ SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
+ S="${WORKDIR%/}/${PN}-${MY_PV}-src"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
+
+MULTILIB_WRAPPED_HEADERS+=(
+ /usr/include/mariadb/mariadb_version.h
+)
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="https://mariadb.org/"
+LICENSE="LGPL-2.1"
+
+SLOT="0/3"
+IUSE="+curl gnutls kerberos libressl +ssl static-libs test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+ virtual/libiconv:=[${MULTILIB_USEDEP}]
+ curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
+ kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
+ app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
+ ssl? (
+ gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
+ !gnutls? (
+ libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+ !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+ )
+ )
+ "
+RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}"/gentoo-layout-3.0.patch
+ "${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
+)
+
+src_configure() {
+ # bug 508724 mariadb cannot use ld.gold
+ tc-ld-disable-gold
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DWITH_EXTERNAL_ZLIB=ON
+ -DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
+ -DWITH_CURL=$(usex curl ON OFF)
+ -DWITH_ICONV=ON
+ -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
+ -DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ -DINSTALL_LIBDIR="$(get_libdir)"
+ -DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
+ -DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
+ -DINSTALL_BINDIR=bin
+ -DWITH_UNIT_TESTS=$(usex test ON OFF)
+ )
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile
+}
+
+multilib_src_install() {
+ cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+ if ! use static-libs ; then
+ find "${D}" -name "*.a" -delete || die
+ fi
+}
diff --git a/dev-db/mysqltuner/Manifest b/dev-db/mysqltuner/Manifest
index dbfa8381d38e..0a63f1edfd23 100644
--- a/dev-db/mysqltuner/Manifest
+++ b/dev-db/mysqltuner/Manifest
@@ -2,3 +2,4 @@ DIST mysqltuner-1.6.18.tar.gz 169074 BLAKE2B e138e29db2f0b1abf88b2d8268732fd9f05
DIST mysqltuner-1.7.13.tar.gz 26721104 BLAKE2B 76a51c5e3ff897feed6bb6348fb5b09ab3fce0eae403880a3be96203522c9006980dbf6966e8c7e7784168c71e149cc57941ffbadba049b68b30993ed4d519d1 SHA512 88842bef1968f3150be49a5e82cdd0349bf0975f6ff0d8188117240ed2161ae1e44722077ff661ce31b55d0d4fc90fa4bb1972d96405113d82255718cebe0d53
DIST mysqltuner-1.7.15.tar.gz 212839 BLAKE2B cd90091063e6ae7737cb79f6936d14577352c5b6c016e0efcf82cfcabcbc1acf9f646258bebc835ede368d5ea5594e269d165cb01ab8c980e5fdc68f3c605747 SHA512 b1ea9c91df3fb68d7ae9e54014b4d9095122f10750f7807e0c72d9bbbb859db9a60bc8698d337f4dda6e1bd89ce4ff97fa4299f5dbf650f6fa03012c309e761f
DIST mysqltuner-1.7.17.tar.gz 213429 BLAKE2B 166ed3d657a529ce7c8e92648bcbf6da91f23a45222a8df0c6b79a7a23ffa7a1d066f2d3e2f651eb0aecc4032b75b7976cc8ea5e789ee2e7c990549b422fe30d SHA512 ded34cc9532eb407ba72b5669caab874c948031606b99e414b397bbd2a150801203f7af66a01b3d39a35cec570abbac09af9e2a5f594d1c36d9b3141b7bb12d5
+DIST mysqltuner-1.7.21.tar.gz 223961 BLAKE2B 1307afc2a73b40330817fe0c0b834a537b14caed1125acbdc5a03e98787321ffbbfb84ba0a2077adb0fa49c0e2df947dc0062d2218866c689fbfd903776f7fbd SHA512 2b5d8a7cc3f0ebe3a481cd77e395ead37ec037f0a9b9649bbf450215bc83f4049a297d86b171c7e2e7d51b3fbe381069310f13d3b8152f5a90e05a9efbabd4dc
diff --git a/dev-db/mysqltuner/mysqltuner-1.7.21.ebuild b/dev-db/mysqltuner/mysqltuner-1.7.21.ebuild
new file mode 100644
index 000000000000..511d0291d647
--- /dev/null
+++ b/dev-db/mysqltuner/mysqltuner-1.7.21.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=MySQLTuner-perl
+
+DESCRIPTION="MySQLTuner is a high-performance MySQL tuning script"
+HOMEPAGE="https://github.com/major/MySQLTuner-perl"
+SRC_URI="https://github.com/major/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="
+ dev-lang/perl
+ virtual/mysql
+ virtual/perl-Getopt-Long"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+DOCS=( USAGE.md CONTRIBUTING.md INTERNALS.md basic_passwords.txt vulnerabilities.csv )
+
+src_install() {
+ einstalldocs
+
+ newbin "${PN}.pl" "${PN}"
+
+ # Passwords and vulnerabilities are meant to be fed
+ # to the script uncompressed.
+ docompress -x "/usr/share/doc/${PF}/basic_passwords.txt" "/usr/share/doc/${PF}/vulnerabilities.csv"
+}
diff --git a/dev-db/postgresql/postgresql-10.16.ebuild b/dev-db/postgresql/postgresql-10.16.ebuild
index 735bf97aba30..e82b2d2d08b4 100644
--- a/dev-db/postgresql/postgresql-10.16.ebuild
+++ b/dev-db/postgresql/postgresql-10.16.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8,9} )
inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/postgresql/postgresql-11.11.ebuild b/dev-db/postgresql/postgresql-11.11.ebuild
index 13e06ee83fbe..cf5cd351c515 100644
--- a/dev-db/postgresql/postgresql-11.11.ebuild
+++ b/dev-db/postgresql/postgresql-11.11.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8,9} )
inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/postgresql/postgresql-12.6.ebuild b/dev-db/postgresql/postgresql-12.6.ebuild
index f6fc1da4eb6b..512e4dfc2d3a 100644
--- a/dev-db/postgresql/postgresql-12.6.ebuild
+++ b/dev-db/postgresql/postgresql-12.6.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8,9} )
inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/postgresql/postgresql-13.2.ebuild b/dev-db/postgresql/postgresql-13.2.ebuild
index 43e5eb93683a..7661f3aed842 100644
--- a/dev-db/postgresql/postgresql-13.2.ebuild
+++ b/dev-db/postgresql/postgresql-13.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8,9} )
inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1)
diff --git a/dev-db/postgresql/postgresql-9.5.25.ebuild b/dev-db/postgresql/postgresql-9.5.25.ebuild
index 256b16657d92..21b9e356bb31 100644
--- a/dev-db/postgresql/postgresql-9.5.25.ebuild
+++ b/dev-db/postgresql/postgresql-9.5.25.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8,9} )
inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/postgresql/postgresql-9.6.21.ebuild b/dev-db/postgresql/postgresql-9.6.21.ebuild
index 6eb45e33ad54..974a58975c23 100644
--- a/dev-db/postgresql/postgresql-9.6.21.ebuild
+++ b/dev-db/postgresql/postgresql-9.6.21.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8,9} )
inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(ver_cut 1-2)
diff --git a/dev-db/rqlite/Manifest b/dev-db/rqlite/Manifest
index b062a343cace..49ad7ce8a8e8 100644
--- a/dev-db/rqlite/Manifest
+++ b/dev-db/rqlite/Manifest
@@ -1,79 +1,345 @@
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
+DIST cloud.google.com%2Fgo%2F@v%2Fv0.37.4.mod 1006 BLAKE2B ed912b9fe91ee4e16f58b599232ea85bc1f994a290e8f514f6d053bad6312422c18e868b9d419079c63cd547781dcf82994b53af6ef10bb23fea05b66f55747f SHA512 8e12292cb0c83d0ea8d4227c27fdabaed182de6f42bc6a29bd53848c41c87754994dd50df282ff30ab78411d54a6667a371d84b620d1b02f3f953429e3c2e97b
DIST github.com%2F!bowery%2Fprompt%2F@v%2Fv0.0.0-20190916142128-fa8279994f75.mod 32 BLAKE2B 1993101cf60d3e6cb8eb318b265bdb167109bd5b0c5a446c155e19c7e36730268091bcd90e9b72a560fe421e8911ce38ea3045f2f903666a6714609ad254e4fa SHA512 c8e0182aa59575ecad31b0c9be0517ae55fc3daa8daa700252e4dc866def7ac16344bcfe9f081b941a3a2a837be262cee672855fe744efcfa447a43a6cd1bc61
DIST github.com%2F!bowery%2Fprompt%2F@v%2Fv0.0.0-20190916142128-fa8279994f75.zip 19490 BLAKE2B 99ac55ccfb212ef98eb5ea2235dbedaccd46643b34e2fa963e31940b1553871abfd3e2223d807a557a92b97652877855870b390346b0e3441bf8bf521b49cfc1 SHA512 e7bda215393a6d5b4025566167f4b567dfe1da07baaa75b734afca117e24c9614f244c7452650d71e9a80b1f11299e64a0157cf8d8179c578148a9ae1dd6834d
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
DIST github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod 37 BLAKE2B 74a94066231395cbd85f1dbbb68408161ef74781c0c686746f97365dceb3ca69e3b924a86e6639b5e4cbcf64928fa21245e6828339105a779a86bc4f132a5bf5 SHA512 da3a3499834784b7ace8158659956206fdb113000fdc84d54b6525805727e37029bdcf263afcbabe724d8b10f6601f1f38a985e6ac10fd0466907ae56da3edd7
+DIST github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv3.2.0+incompatible.mod 37 BLAKE2B 74a94066231395cbd85f1dbbb68408161ef74781c0c686746f97365dceb3ca69e3b924a86e6639b5e4cbcf64928fa21245e6828339105a779a86bc4f132a5bf5 SHA512 da3a3499834784b7ace8158659956206fdb113000fdc84d54b6525805727e37029bdcf263afcbabe724d8b10f6601f1f38a985e6ac10fd0466907ae56da3edd7
+DIST github.com%2F!shopify%2Fsarama%2F@v%2Fv1.19.0.mod 33 BLAKE2B 7013f44d03c22c21595c5369c52e1538a526891c9fc4cccac37373504f13c66d7c504552251f46632917739dfa1d6c3a15e15aec4dc03b9c69902b0bcfc8785c SHA512 db3271d8abd514934ce5d06fd20f7490db8368e57822a2379bbfd4ccb94e67354400d487d388a57467a5a16cec339cbae9488cecf82e41d85918639bedaa0a87
+DIST github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod 36 BLAKE2B af7b84d9f1cd163555b32bcf960b28b64a5689a1c9694f430af310f5041cd967fcf0d6c1a6c4020478544d347e4ba5b2fd16a6ef54258d33314ee0ad9239752c SHA512 917ada7ac198a013d2b090dfc59a45bd2619dcb7227df1521ca38a0d822fab12ea8c158c526257fef4ef506af29d9fa678e8dc2a73fc13c8dfeb57b398801744
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
+DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Fapache%2Fthrift%2F@v%2Fv0.12.0.mod 32 BLAKE2B f5b7273a6c32fd9eb6e4a8956477bac6cdc2a5415eb1dd5dfa5dbafb28f5f8d1cc477196a4c3347025d9c184bb68ab269f4622ae03a01516f5e9c67124a10776 SHA512 190c3c9b3fe9e247246976b3c916c2ff41da6cfc04091de1d050eb78badedb067d9e960c2295a17b167ceeaf27fa62d149b33a8794ff2bddacf93e9731660564
DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod 582 BLAKE2B 92aab40d86d733eb8f751fb23e40621b5b3bbfbd8b1d194bc6e689b6df763b4030aa83ab78654dc8e536274af6de247b8fc7e4e35e6cbf2f6fb5532291deec6b SHA512 aa43d2e262a603661ac3dc7aef111aea6e348e11c5384840d2be06224a6c2c580fcc0e3c6645a0d48b48826b0aff92562f0c6504eae980ff5610d2ffd2255d88
DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.zip 41353 BLAKE2B 850ec7d356246c8b47c8594aaba8db95d979ca7fb50b383ec02c6802faf089bb170ea7e86f7e1fe8f95fbed4208c6f39c307871d74b8052de5ccd9d6ae29d49e SHA512 b533a51ecc7709cb74da88cd3dea70b3605e75a88b93d16aca5aafa100352002f5b1c1c6d9c33d6c93ce74663d27b7cf82c8fa8db7aadca4d42e8a7f6354f78e
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.mod 607 BLAKE2B 5c2f3345ddf95f94ef8ff19ebdaac810591c771cae226a2f7029f2f59249eab50b30fb27bce2b41b6ec51e961ed3ed46b55218c8cd405b8cc90bd760f1c0d7ce SHA512 7a835e1c62454a3577e71bb91a1a2ba8e135b94140e1394505678a5d628bf452de2fe8c7a9ad30c17ee462fd0d2f04967d0cc7b96010cfcd3d0fcf7dcaf4748f
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.4.zip 44812 BLAKE2B ba556ac48b565838fd1686825e0bf8417d0473cdd1d0c9f28ce88cbda83b9e61bdfc9cc8b86351d0ad1d57b2aeb978800200bb023d9cd1bdbd013237e1813d92 SHA512 6a71cedd6356d9e17ffa7af4e005a7d17f1c004b6b68f487ac75b13668d22f18c06ea0c0e4c9b62d5d60b27054a3afa0e73d4adbab6ad46ede4b4387500c27d4
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.5.mod 607 BLAKE2B 5c2f3345ddf95f94ef8ff19ebdaac810591c771cae226a2f7029f2f59249eab50b30fb27bce2b41b6ec51e961ed3ed46b55218c8cd405b8cc90bd760f1c0d7ce SHA512 7a835e1c62454a3577e71bb91a1a2ba8e135b94140e1394505678a5d628bf452de2fe8c7a9ad30c17ee462fd0d2f04967d0cc7b96010cfcd3d0fcf7dcaf4748f
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.5.zip 46960 BLAKE2B 4e0c2b3648de9ed0080ecbfab00dca5ca102e2a6cb5c8f5dbf9c54abc77b34a7756b189a544311a2c6d1de9574c1a00e98ca0fad141306e23558be5c09043545 SHA512 a8aaed4d0174fc670511c8744b06884ec79744d5c779286f93a45fd8347e5112cb8d378ac17334eb2479eb45c83b66b3a6ca7a3f932b9d0311db48c7662f3d21
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.6.mod 607 BLAKE2B 5c2f3345ddf95f94ef8ff19ebdaac810591c771cae226a2f7029f2f59249eab50b30fb27bce2b41b6ec51e961ed3ed46b55218c8cd405b8cc90bd760f1c0d7ce SHA512 7a835e1c62454a3577e71bb91a1a2ba8e135b94140e1394505678a5d628bf452de2fe8c7a9ad30c17ee462fd0d2f04967d0cc7b96010cfcd3d0fcf7dcaf4748f
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.3.6.zip 47374 BLAKE2B 021e1956ed377ee200d28aa4a6b9559fd81654ee039fde644059ec4c10a43554fa091689788e8fc773c438f60a7c3036f47b7416c8d967152cbfe29ac89ab465 SHA512 08520d539031a646219d6e84139ad9f8398ebb443182a95cf4d48cc2ec6be24abc63ba8d18ae129851e5ffa5ee5988be1a8ae67658c9327cbd2c0e65a7d25c13
DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod 40 BLAKE2B 6cc86f2bceda8617678a251604b6c049cfdc80f9afcae0cead6b2cd04f90fe1b5d5d56d0c29f98fddd7f4ff6fb4a0f97c052193b153dbfc772cf6597d664c09d SHA512 d0c78b8f08d177e05148ce845f8d720fe79a193a420c12ce15504af8fa3dffc4d2fcebea8030f5cca90aff5775013e2252e0c289d4ed5094e07657ea97a79570
DIST github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod 30 BLAKE2B bf7d457fdd333781e403b93aac891f5a0a8e202c62983ec6e34ab559ea5624c3e6cc525416fe400c7a0af20a3f647b49eac5717aa749d9ff79b02fe994c36d42 SHA512 7a1ef7d0fc6d5a3a8530b44dd5aa23d4248d952fd573b9f0f6f630b1bc38fa5c9c65ecc4894734c7115a8a0c7c71e8d0e2da0773ed4c5779c23f7f294e1e7d5f
DIST github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip 99852 BLAKE2B 9151e6475685ff3b550d1ae1291778a01793f691a3ddb007d64fa49f02ee85927c834ad709dee5fcba0f071630cd62504a65fd4344d4ea5b9fb713787bf6b725 SHA512 837cbbdb0a91efd765e697e01bc64f0206897d6363b303c96ba53062d674623b19d8c86d96a867529f1dfd6689240e18ae7c25dee268542d46e2877dcbf83848
+DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
+DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod 45 BLAKE2B 350e937e3f7b254b5c590445a9a7f7cc908daa2a5f208e293ac414d50b46bd29671bb483e55daeedca41d70a42fdcc62ce17fffd9992a932e29153ab6ca1168e SHA512 c1b9f572957bc4ed1ad0c61d22b7b5d6a4c863df2aaeb4cf914e304af21d949c9cfc53dc8eb67aacdf3dd56f339ee6f4a1f5fa464121d9db79b7b3febfb3251b
DIST github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod 51 BLAKE2B 3d0af1f8d7979de88067539579b73ce3d5d81a477ff042831692c738e9b4c99de13a3beb20fde003df06145e26d472621a2ff2857fd584aa1527df3730fc5efd SHA512 d1c83d2dbd4e242bfa9d8b9b58cddbd4a1ad112d1f5d1ca757fc31c6a31bf460d08cc3c9bf14c977fa74d2099ec83d5e45c05fd6121f800e26da6a837d862ccd
DIST github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod 47 BLAKE2B ef512f7530c4c3fc3319129afa2fdb655d40af9aca697d22e4470528cc41ef9dd5ffea2258792d0efc7e1e5de2de2fe760651df84c3d39989c4d96b58e85371c SHA512 027b177fb04d5bcfaa0e524e6682b639bd91f7aad9ba14e22cc1b4f352e2c3bcd4d93348ed013cd839eccdb01449db40170243e7895c2cfa3f6980279faf39e3
+DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
+DIST github.com%2Fcockroachdb%2Fapd%2F@v%2Fv1.1.0.mod 34 BLAKE2B 21714162b9a8fd9c535eb49321b31d8c574339b2f548a64d4c224323f87e795b5412d502499e83917a1395dabcc9e2455f5e786ae2c3f204688d5c6ca402cdfc SHA512 58f3cc974ff4897b4f160dc47440241bc7084dd62f20c16c019b0c3090d3c8a8adb46ee8cab1afa675c9d3830cfb2eee97e1eb1315a683307d87ea3d2b403efa
+DIST github.com%2Fcomail%2Fcolog%2F@v%2Fv0.0.0-20160416085026-fba8e7b1f46c.mod 31 BLAKE2B 5cc90c5ba1dbce59af7e6f56a1d0342015353f55c69cc032491131e5662950ae1cb0b470db299e20c89c906a7ca7736336802d19aab1d46dff788184bbde1440 SHA512 4a438245ec8326b306568aaf966fc79dc9d8292730093171a40b787760a0f35736b56816bf90bd496d903062d3b28c264bf7944ada7b32f1994c348fa146b188
DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
+DIST github.com%2Fdenisenkom%2Fgo-mssqldb%2F@v%2Fv0.0.0-20190707035753-2be1aa521ff4.mod 250 BLAKE2B 9471836a5e2d1c25d6cc99df4ed2c674f9fff051f66bdb45c8731a17a76846844efc28d90bfbbdcdc995f51b2ac50d29c935aec164d0eda50d626086edc34397 SHA512 43f9b5d4c71ae8b2cc1fe69f91d1caac0271a0b8095ea41b1e2dad811cad277d71de4c31da9bed0f5190f6831ae9493d4da40fdd6d47b4bcdce0ab180156c5c3
+DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod 40 BLAKE2B 9300f3006801602e05416487e6021123ff345e36835b5f4841158bc87556afa086470218c3f2178d125baae065c1af3cb27e210a50173a5bc9a469c592758eb6 SHA512 fb616884898669f21d53576f0fb70c8babc38bb98da066a2cb77fa85ceab6bcc8775feea3d3bcec19ea3b25544c776b8d55ad82f8876da5d0ed5176768da735f
+DIST github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod 43 BLAKE2B 500b3a85f43db1d61f037f437b3290888204aef8b80aabf42d70c37607fdac86e8b1f7f4e41ad3709ad7015a78b934ed7d6d254522eb3e2baba4ae24619ea4d2 SHA512 da87f8eea5497796badaa6bdd1c67ae04e75deb7595f10739f30f20364f22e588a449aacf603f2c8d738b365ac14211c7cfe8e1bfb91f220f5c9d547007ad453
+DIST github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod 32 BLAKE2B 51c322074fb7a69418dcdfd2e54b187fbfe541c21a979c8bf8b155a6264cc670eeaa95c2949f2b760b187fa582e86688a045f3f022cb45f053a58e00ec2c0c60 SHA512 bc43f85d5a21cbdf4b3821e707c845d08f8a6d8f2c6ef0f6ec76f7711c53bb4407f2a356c79bbbda438fe138a3cf74a4b279e8757cec7aa134a93f2173b931a0
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
+DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.10.0.mod 126 BLAKE2B 3ad1240496ce1f7c94c224a1eca571a3671851bdfebb40b243cb4aec90e329c820788c6080083e138240b9aa0a6e980701e12349058a1fd7e9c972faf7085fd6 SHA512 d7e895c4a2e515a0d20f8839b4f6d52f3aa3d000b97cecc99fbeeb5080e53c260ebc3aba0ca6ea180a2f5c88d5ae303fb94a257cb55aa9430773f6f5b4048d87
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.10.0.zip 12593 BLAKE2B 359ee7d5efadf7957871e7fbe9671683380966044426e0318f582a5050fdc11a1168493aa7dc4690bd44eb75543536dd8390d37e14a9ac408d64374c20102e76 SHA512 205d595d76ba552b654c7c991d4df0cebddf1323915404749f28634f2bd881798f291e9dc1666a10fa00fe1fd95bb2afb091e7936a02d18082dbb4d21ee5cdac
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip 11987 BLAKE2B bb585868c568466b366c1c50762376d9e2b6f3d3ac287af94c45f7d348516d2e80ee96c6980a4b5fede40f1302f0e3e900e24aae16fec29801a795cb7e514dec SHA512 70f78081c04bdbb52e8f5d24b8926b39a28c4f069beaee0d7bf24be946f2b0ee3bc08d8ecc1305412623670e1767433a37d458df3fc849d244c63b6222f1f599
+DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
+DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
+DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod 38 BLAKE2B 198f3a6fb7348bf50286e1dbb067e72ff854b1daedf1d181b643872aab377b930029feeb95d5d6ca21109facde089527a06922b9ea52cdd59ef553d69b984e06 SHA512 21ac6d6f8fd92ccbe09cb30d0dd6a37142907048cc5f9d0574824765918dfd8ccef96b7ceab9dd259f9a95f5c5be566ac00ff4eb3e37ba7c7c98f25b3185baef
+DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0
+DIST github.com%2Fgo-xorm%2Fsqlfiddle%2F@v%2Fv0.0.0-20180821085327-62ce714f951a.mod 36 BLAKE2B 50c44f0b42c1c0ce6ee90f95e210df11ace1f393d0e9e407dd63d51dd32baf9eba49fa1d3de7122a29061e2cdd2a3ca7b6a006f9fe0360fee15c257e07c537ae SHA512 574e3bca84f11f497db1fd7c3e0b14e742550c9cacab9bd7300f1e762625ce9d35ca31e7932c55431871c73216513fe65263bfd59d0f502cd82739c9dadd1e00
+DIST github.com%2Fgo-xorm%2Fxorm%2F@v%2Fv0.7.9.mod 703 BLAKE2B f608ae26c8bfcceced4f39b8474893391e644246494d3a57254b06171b440b92ec0be0e0ae1b13f396624b971693dd351e68880507ab6fa9b4c241f9909acbe8 SHA512 b3707ea5114994dcf199ac778909958d804551f20964b2b1b0f9eea2f6a874df97b40d92a60a4486b482030ae8b1b7dcfc547511997e1cdf279ad538b8d6d217
+DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod 29 BLAKE2B 5311a22dbbbedd78a98e34293e79fb5443c57774fa9049665943e377fd07984a9316f3ec5c8fb70da9b133c6390d32ab28b97e939f938bfeeef78883cca6fba2 SHA512 8a1ab67bf3555ca17b7efb1042fb6a7d58b225b4186302b0cf289e7b60f9aeaf23e36ff6d4e8da2ed728dcd676cb2f30f0625c430c0b6943dd25ee02d2c27247
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
+DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
+DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.2.0.mod 30 BLAKE2B 5c355e64d858c99536e459f9fc4428dc00435bea944b67bf3dda5b61edb5f0c193c5857eb10bed926987cef865836c3f7ae3d8f081a58551ccd0772e4eb565b1 SHA512 ae6a1a6f8d31592ea6141f2ea39c9b60cd28e73ffae74bcf370fa739865b95a7ed56f687975f017b42c59e3b0f1c02884fbd5c93140bce268771380c8c7a7a96
DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip 465217 BLAKE2B 4caaf832a22faf1c45e04bebf35d29b38bfab18a490ad1fd7b2c6cd85ae678fd3991505f68e526f9f2205cf919374b07d57f8abe95d8f74dc8263cd37a9db3dd SHA512 7fe69c066b2407e6000ae21888f6cc696e51df2342a71e196aba1a9a9ecce630bd9a4d41c58b3105002508a4d0efb9c5ae2b8a87f848b8e2c6293558b8c4b4ad
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod 151 BLAKE2B 9c1bc32114f742984396777149c3fad997bb47288dfe265614a1d17412ae3946581c2e60ff9ab87e784d71cfbe423b7ed1ea5864b6cd3f81f35e9103c8c08a00 SHA512 431b8d4756fe79e43cdc2f8478f3171ac9c90912222e50503301fc83d34c90001fb6ee0fee3bc05f66e47d657977395769e54efa0fb74ba35f34429cc0dac5c3
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod 151 BLAKE2B 260f1bb3e48b0bf9870ea3b725b13f84d2f18a12c6ca1275afcc2897bef547fcc1e893bd6b1efd46330bc1de66a00e3ef133a4418a50a075302aa3141abed8e5 SHA512 b6d7911148c590b3ce2a14a158cfbb94dd56dd402b3a4a2399adcd0421604f85d904244ddf5f8dba65326f04a7817d5652b30a306c65f44fd248ed269485a21c
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod 151 BLAKE2B efe8a8f8394f082a813ed4983158ada7bcd20f92f9f8b9b0d0e61e8dbb968b3c825432ae05d69c9b61a04ad57533c1e60438d9a1964312d4c9168f86864ba2d3 SHA512 2df7aaf6cb36a18165dc458a7b3f4158e2bce3bf10165418de401dd43e06d44378511dd4fea6530cb668a8ebb17b4c3f294ba35f5018e6aeb1b7b9082aac8a84
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod 154 BLAKE2B 8645404d124dde54c3e9c284b1243b1faf2124f2b7d6c5e6566ca600d3c965f7787f09f6825840f5e3ea6d36c016ef2c7fef10e8e12dce354593f7a8a3210a33 SHA512 4c9416c4777123a39b23b49ecf6265295fc3432de083a04dbefc87264b8c69f0d9e342ebb7e8e488f30c3efdc02951fd7dec23dfd1fef0802c8f0250f96612a8
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod 124 BLAKE2B 4c032e7f2e1c8765cdd720690c1067c7c0ba1005bbfae01cd928bc60d96bd82321052fdb18a4ae12119144e34865cf910e306c5116e4f4f56cc5f70f5d52004e SHA512 acbd5afd399b3798d4b24529479b18523ae4009e21acde15a3893d2af75f9a6e65fcbd5a237423849003eb8903718eaa0b1aed9177c390972ab9490f3acc0d1f
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod 124 BLAKE2B 9e60030e0014cbc67c0bc7064eef3b127dec57dfe25bbf7f0d0e2b9c8c77e28477066daf073a6793428116419900e7c9f6dea6e8841a5f61812cf11ff77e7009 SHA512 14a0f1fed404939fad835398d5889ad57621edeb0e183785b3094957183bb29a2026e2af939b94c7155f8496e966116c4a6a2497fab113a175a9aef3f7ec3f32
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip 206951 BLAKE2B da403116137f70222d2028df84c6f872d324e6aef808ceb2f58dae257e9b7cd2fb37b477c2b61bda55888f5aa72fe6f46afc79ed4fb440f1212c5105f8b6dcc2 SHA512 8df603b906846c265342236e7bff8ad4f37fbac2ab425b6002201ec727602bc2454708985d44de11bd91212e15e338ce1942f33a3e38c328f2ab9e3b990a2ab5
+DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
+DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
+DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
+DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
+DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
+DIST github.com%2Fgorilla%2Fcontext%2F@v%2Fv1.1.1.mod 34 BLAKE2B 378e68460634c64da8779bea61bcf813ce4c5797c3ea541362d1409bff606626917c1bc4cbd030d98077819c5a8abf2ded047c047c2fc6b58977093e67e7b6ab SHA512 1db09f5968fde5c7877937c2ba476afb8a07832943f66c24cda7669ccde744ecc5ebd6e9efee9427b24e10fafba5f7acba7416f9c4e438c2ae2ab22c4483127b
+DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.15.0.mod 297 BLAKE2B 2b94bfb4df06f08d28c84dacdc35385535dd33f4de23b9c4b2207d7da84982a0e48f2d4d49357c7e0d7f30b01a8772270c4ca42334612cb1c33bb6527cf426a4 SHA512 4e25954cd212cf102dcffc751cd2489db9bcd6f1f0fe975de3f5ba2588ecae5d0622c35a86fb61970872b4e27d3349fb7f76bc3dd9b7b6db76152da07cda1427
+DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.15.0.zip 31391 BLAKE2B fd332ce0bacbe2d8d8733db2c1c7635365b8d398df74663b775785538803fca8e9a79488bff55de7a9e1f0e0c7afda21a5828fa6c8466f4b09e37769f391ec25 SHA512 ed82ed922a0056eecbe702c5886f0d1f60b390d17d5e9fc9361012229c699ad15a9757421860e487fb6036705d1e8ee0d1e17f93edfec84efaca732005701dca
DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod 183 BLAKE2B dceb26b60f2c77dd17451ba54fbf981f8033b7a1a840f938fd56454cb0af56273e260b1fadf2f708072dcda4cb26a1bc3b10497790ae128efaaefcd326c84520 SHA512 84dafac5d0770fdf20eae443ab6262dd3a32737c62908830a941b2593f683f35b0c33c009cfd2b24d3cf86a3701b9c3ffba84b77e66840201348591277ea6f8c
DIST github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.zip 34982 BLAKE2B 182c247773cc6c2ad4ae42f255fb4e1c7f2e9664b07141e36bd763e498afa315e34e24007b6a8e857422dae46a99c199666effa09d1935888d2c96fd2fcc5bd9 SHA512 98eb544687e67eecfca40a285133e306402cade215b9776f5276c16113c0da1484795195894b0b0eb6a965909c1658ce0acafd3d98864cf2d2fa246fe5b18d94
DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip 23003 BLAKE2B fa553bc49f3f28624830aa0323b0c668db17d7628ca24b280eb718711c240e67fa6ec86b61c7fb5799b63085b570238d07c925a8cbc13e95b9d73d00e4a2ff65 SHA512 91c7b40e4125c3350ac4700bab85547840a8cc848f01bab06bde2eb51693a6dfd584fff718bd2425c67b15757e6e3f8a779cdbb051afff2094444f4bcb080ba8
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.3.0.zip 31729 BLAKE2B cc35c143559499bb19e8802039ee32f1ba2db84cd4b6e7209feb9b4a9a36f2a7b21e817c40c82d75abd94dc02f4e3e89b38692c93fbca987a1ac16f2a43676e4 SHA512 b7a8bde64b16c032ab4ed47c7ec11da6661293d231d7e100b4fdf9db88a1ed2fb9f48b95f7a6c44fd14e033a5a02244c894496cac57fcefe8bcddc73f4755508
DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip 63182 BLAKE2B 6f6ca7aef3a60232a715cecb6f2a4f642fc32388229890699371d7a901498726bace0e37c800db4096769c65cebef01dc4abff9a111daa3cae8fd8352ff18174 SHA512 a50702f312dc7b0a9dc95c3415980e51d082e0c36820917b7ff5bc0965e06d5ead6d7749cf8c87c7671456e9c07e9625e342b644aa6f49a10b4483a198f845b4
+DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv1.1.5.mod 111 BLAKE2B 4f800290bd148916692a372216504629ebdf62ae0c672be6506045d0fd0ebc3f170e11d0d97a5d209ad97306ace0209c2c89d199a004f800ca0b483eda61cde8 SHA512 d4922b778ab17f7ef41fe2f59bf40a7cfb3bdd466b595d4e06bdef60c3054db560797297721be61f39a0a20224ec410608f6de0043649e914e750036117bf36e
+DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv1.1.5.zip 408057 BLAKE2B e90f9126620d741149d908875364dc9b94a4eeb2392af6cd44c3fe2a63d13bfe904b399cb60d4c339e6149c68a409cadac5e0586282062cf1f606ae72b695c2e SHA512 6692bbec3d50611a212b3bf1cbbec779e721fabd740928c53817c0278ef16aacd10608370d97f4fa2bdfcd06c27bcfab7ee8b315e7ab641994772e767d385d32
DIST github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod 95 BLAKE2B 66af3c20daaa7307f453ab70f7f8db429de6202fef7ad27c4c54f6a37d5c06c253df6ea24ed2315fa8208107187615b7e5d7a5aeae2cd1fcfd3be407e8f67fe7 SHA512 472addc2b61db4d72d356e2033b0963352d5baed7e2c28a567ec4f4f8a4cdf199d50de2022d136f9ef85ee5e0329c2e4b9a6797e4ef07e348fe7976aec56088b
DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.zip 19501 BLAKE2B 6c60c3832f5bd1d3c50b058611c9896a3db90dd727401506bdcb656966368cc9af7d8384a714e370dd69714856b63351db4485716dff566c3518434919cc4035 SHA512 02cde99c414bb38d5586ce722128e6c9a940583c9c4a99f1ec30787988235de6a3a1c516c150aa2bc94dab7723a9988c7efa2d8b151d05c9c36c04af6d145168
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.mod 48 BLAKE2B d49fb83b0e128d1d891c78fd7efc4d1f6c92ff9ba30943fcda9b89d752d468836df7c37d6f30d1b4e8eaa5cd966c4b2ec90efc087887f037cce94654761ac107 SHA512 a55d0882366adebd894e5ebf9de5f70ac8b5f8f945e52b7dac8e56b4efc03f40930d132ac03bacb51ca220bad114940b9e27bc0ecbb92dc739691674a8aa5e15
+DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip 20160 BLAKE2B 19b98d09d695d9d1d999e30896d7bc6b5f7266adebcf182ea18cf8bb379ded400d2200e22ec4151831d4e124c4cbfa0c6332678b20311134d5666eae24302f07 SHA512 f18b267cf4ebb61f56c726f2e6b7ebe33bf97d445d44648d41a5ba9734fd7ef7dcb034ef8881f476ff2ce843118703ecaa01f9925c2fec08bc642cdadab742b7
DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.0.mod 233 BLAKE2B 5a1324854b1f65cb37077cee6097e04e24f099eb48355d84f8df7b82f5bc8b0ecf01021c63591cb83363c1b8156455ce86a0a2599f9ba6ec2a94fafd107df1ad SHA512 a687048d5ba12f826081a5c4c39501e0dfe949b98e7c8b4b4bfa2b9be27fb650d6fe8ec31ca379ab0c13b79909a1edbe1f410500651f7226206bd4e0d21eb296
DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod 410 BLAKE2B 192e571d096d665a55c29da1dc35ba17c52d6f5b0c3f522c80b355bf881ffe269b27a62fe44761143966aaa5bede99800918999a313869c1a81dba98b710a1ad SHA512 e44c233e6bf407eac6a4eb6f7a72dc0118575b6dfe48a9d0afb95d99a847ad30f75b11e6d008238b7761965182df56e52ec183bb0905e054a638c76898368e6d
DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.zip 151101 BLAKE2B 41c638b0934f697256c87b5d034010ee49bf42740a5152005effcba78d29911ee2e981e6e6643df6f804bf38675b2dcb961161f2a8c912d514d007dd349512f4 SHA512 d4aaa571f5f30c87a37f70ce4b190665386e943bf107931cb0650eb54b2480b9acf31e8b83a66b1a8bef11d088a80c522ee70a4b85ee25ab1b28d7cc44d0e131
+DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.mod 410 BLAKE2B 192e571d096d665a55c29da1dc35ba17c52d6f5b0c3f522c80b355bf881ffe269b27a62fe44761143966aaa5bede99800918999a313869c1a81dba98b710a1ad SHA512 e44c233e6bf407eac6a4eb6f7a72dc0118575b6dfe48a9d0afb95d99a847ad30f75b11e6d008238b7761965182df56e52ec183bb0905e054a638c76898368e6d
+DIST github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.2.0.zip 157790 BLAKE2B 29623bc436d2a1f1057532b98858f3e3309a0ae1cb209ca9e242d56eba97b84ac2b2f3533a542df9cbc8dd5521c5a09747adee1e38d3f3ec2b6a5517a0713684 SHA512 c689267a27346d83ac054c5202746c69bf79e5accc69a07c833ab00fe4f2a780ccbf41ed62d50e411322e62ba6603031134662c9e0dca18cd1ec3a52179a062b
DIST github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod 40 BLAKE2B 77f35128903a84139dfc23055bf87c4fd8b4843953c764f0ec004a8a2b10599de19bd767a569080422179bd8ad66218d3639025cf1d83eb5cab22599b5da2c3a SHA512 76ce93f04caa8045ed49fccbbbfe76fc278bb7d94c973e408d0695e8c9c5e569b3dc9d4af8722f13c4718753aa72fea76a238dc8243aff34bbfd10d4b684e38a
DIST github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20191021154308-4207f1bf0617.mod 232 BLAKE2B 8404f0438360f34a406d86a852fc15ac2941ef34a859041d198d56878bef4e8e4896c960ffbe02690bf5debad6c0dc23d8a75bb2e943a624784643111c290ea9 SHA512 b0171397f8a45df46dfa4962e4d2520b8c2fcfaeb90f990dc26ddfb825525201a8139fbc56f8f1108d82788b1ab1a10fbf99c72fcac1b34c6feed48ebb1d3ba6
DIST github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20191021154308-4207f1bf0617.zip 15107 BLAKE2B 8cd0e37800a81dc40d2d4ad380483df6cbb96862c1900ef2c24f22c28bffacdedf4dda733698e3afb70462aa302aaf0b20ae1efcd4fef1433f39eb438b622090 SHA512 a780cc5d38b200bd8bcd3bc9b4178ebe2d6486b229fc42142a0739cf5f5075053b359624282e9b2154790841445c11fc43757f36a2e9f806108284c743ca936e
+DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a4484c61586949dbf7e13622067675cdd09dace3ce2e5b3a37b6fc5275b3bd6dbb0ec6ca0335bb7c9a036cc043b2d8ff1f38bc90ce13041aec SHA512 54a5bbc02b82693a977a4f690314b16d94cf071decddee3a4af2a90398e626ff188bc34ab3517278e7aac4e657f3f3070a020c85274be3750371dfdeee139b23
+DIST github.com%2Fjackc%2Ffake%2F@v%2Fv0.0.0-20150926172116-812a484cc733.mod 29 BLAKE2B 3d5b46c50c2c48a41de97e3fc038e4ea6b6cc84c3c518bd867ce8c8c1518c7b28886533e6e8a9e5e64b949348b0b15c193ef29bc236e7e81bbf46e6f79163ee9 SHA512 002762fc54b7db0152d59a6388108b028f089c21f024353ba85795e00db73b93c73377ecb728b1ab801e915c20d3d3482e32b467187cc05c37c8d163d53c5e5c
+DIST github.com%2Fjackc%2Fpgx%2F@v%2Fv3.6.0+incompatible.mod 28 BLAKE2B c6ec1d0b807ad4dd8c0a9ce726d1c1d93d964c07100d8c9684f59fe5f348a5a6b158feb2181d43ddfb0586a0d0a124605aa6baf4559b380b4e359e9c8dfbfe78 SHA512 76a383265779809a87851fce9a713884b6d9e2c69966153f3ab67c566eeddc149c6a21266e91d91fee790edf6654d1b80c197513aa4a8617e044f08e91c91f5c
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
+DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
+DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
+DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
+DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 BLAKE2B fddd4b3cdef60f53bc3f8da5a3154d10b49dd180c12837d3740c22b442947cba2025649f3ac7321bcf0c73a272527659b0ccd9be141ddca13caa7594bf6ad3fe SHA512 3c623d077e39697506174a50c0380cb7787a05a52819b1a73c2f64ba8dd819fd500777de83c83d8d9e80f19c828128a569b4cd783667b4d6b9a375b0e3d527a7
+DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
+DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
+DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
DIST github.com%2Flabstack%2Fgommon%2F@v%2Fv0.3.0.mod 205 BLAKE2B eef043d3215773a25c3caa1b744edf92fed91eb6574ee5e41affb1575779404de9247fe0197a9653055ee53d7133c91daae259adf62f0863bd2804e2cab36fc2 SHA512 55556ccd01e407be90eaf0818419d88be225e0296c4cd7610cc48e753f990bee5dc0f77f40ac824def0574f6f396f1401a3ab5130e1d4edc606a8d0cc09632e8
DIST github.com%2Flabstack%2Fgommon%2F@v%2Fv0.3.0.zip 16495 BLAKE2B 0685bc1a8735d96d8d6b6c4131561f42cd4a181ecd41468b5045d3d92755253fdce9152a18b554c70b63eeca982e93ccb21691231eec20709fe17c39b814951b SHA512 68a6bbc146314b0ff55fbaddf18ae453081e5f9379f3cff037ae6baaf747d390767d056eee66c7a38f31b3926df2ea400508c2ce6be73c36ce80dfcad75bdc27
+DIST github.com%2Flib%2Fpq%2F@v%2Fv1.0.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.2.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip 12838 BLAKE2B 668586a4df02fa2d5db174a4ada1245a463946d4bccdef2599b791414af4f10eb07f56c61484977eeb21499db7f9b46f8fea03feebbaae5511504c13e3f7a64d SHA512 c3104e921a94b1a424cbf6936e8e5cdf5823947132f41190c211e050c9c8b7135c7b319eee0667a2b958c9f4fda27b9cbad4436d37b512e269716249dbfbef65
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip 13690 BLAKE2B cc3568a99c03ce4ef19e52a8429b485e774eabddc3ab24315a58b149e8168c448bb1fdbaabb8e3eaea918de96cb7411caa000be4585f851edcb26cb0be9f0a7a SHA512 c39ebb2cc99a555054d55ffcefd5680292c66eed23b1ba8a3595259dc24cd42d432b558014066554308f14fc452b7a830f8b10e635d317b5f14ac0e0b24b1528
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod 104 BLAKE2B ee5067e0e89fe2d374ea852dac828c094db84c3a3d2d8a991abeaf40385431015577eeb6b11a66033e8da599e808f9385a84843fd8f87dea487bd3bc9ba233da SHA512 f144089cc85271c7d91b9a6faf169018bb12177dd770db0092dfd0b4c71846e5cc6dea385c0158a974cfe86971e5642858a6d633c64d3b598f1ab254fd47db28
DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8952e12f0518d455969d7a496b8318052ca37ffabc663d9602b9df70385274818af8bf1b50e70a44ade59b0436133e08818ceb385d34a3b44c03 SHA512 218110264da1c7396295627414259fcc65cc9823216d6c03f2a6d7499e17205e540821add3216ba673efda92f1e5bfbb817416874fc745ed1d926c43fdd9bc99
DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip 8885 BLAKE2B a9d15d5bb4264391abb906ef4b8ec929ecf61d0bbc781ad37aa36e236cf92f5a97f2035c0c08bb49c85142df10ba129c4c1755ede5bc8ec71743300f60af3d47 SHA512 4430b33d70f0fe35d07aefd6320ca0d8e49b71689d93b49e021e1893f8f9f043f8a6d16705e5517a600a538b3f35fed8f14a69a985b2955e8b6f34c19605c83f
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.mod 95 BLAKE2B 21f86775ef310fa5f1cbd773890d231e9dc64fbf2dfabaa3b7dab027f5cb1ee9880adaadf6b8a9a2b181db838e5fe26d7349442b591d925ca24ec7788d887ef5 SHA512 64b61a0f9ba20ae004a305963046d91b7b66e3659b67fc15350a0afa625ecf4892854e1829dabd589482d844a248aa73a56dc970784f2a03f6492a0010c5c665
+DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.10.0.mod 35 BLAKE2B dfade1d4d17af2380cb103ad9a0c91ce0eb7e570f9ab98d32c8d74a9056b1ba89c44c6fbceb4a2d5e5d45bb552a18e5845b1c40d8d1efbe5a9aa87e4af0ae2cd SHA512 c929334b82e3174b98a22bcc58dffd1291e3bcea6c5f789ab36296353cafe0b09640ba7015ff559acdaef58a9212b0367bada54aa89f563c6dd4773f3220c04e
+DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.5.mod 44 BLAKE2B 1589d473d7d8dd651610eeb2771cbaf667c65d2bc445cb9a114b972c21855c31cd323f39f96115cb622d57111685d9cb3deb7d8817d6383da3e26a8df36e2277 SHA512 e5f95d50299fe85ce00ad24e01580bcf8c82473fb49b5d1c0f40f027e36264d226c7de9d88568eb954908e55f643a37a5a93ca538827631637c71a0a032add95
+DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.5.zip 2420081 BLAKE2B 2a9e5620f88d56c462a1271dcbbc7bb6c88392a5323a840bcf8a5453d74bbaac152329a3330f5de8fb49e828af2020d624a8b473ffd513672001de3cd591aaf8 SHA512 10c3676708532efff8a8d910a364fa5bbb7f7455cc7ee191ac0bfda97a3d8a7689fc11a5337978dfbbc26735c34bf1e46fbe8e1fa5bc2560f9e437424be25422
+DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.6.mod 44 BLAKE2B 3a67fafe0b1e32665bd4e897602283e68e7b2afe2d89cb772a19f02feb8543731b4a3a902ac975b0cc4f5315baa332256bac3e10919d6e82bffa01e17225d987 SHA512 e7572c4b152f83a58c81e374c109eb5b80514c63d9f02f7adc2bc23e8bc81dfaefe6f1ed079b65ecbebbe118a3423c2124f0b619378b8b237ff0a6cc687e1952
+DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.14.6.zip 2433858 BLAKE2B 861a706537f56b1430aadf15e270e23f2e5b447ded8604e445c8b890bfa00b07b75525de85c96f1947e3ae7d173d2844694d177ae1c2b2482397f084b824dfcd SHA512 7c91aea5551993f6bae7aa41c4c222cafdffedd0f277c7c16904b825c45ade29531124a5dfe21b6045630e8e58aa5523b1380ddb49b1f199d551fe8d6c107f4a
DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv2.0.2+incompatible.mod 35 BLAKE2B dfade1d4d17af2380cb103ad9a0c91ce0eb7e570f9ab98d32c8d74a9056b1ba89c44c6fbceb4a2d5e5d45bb552a18e5845b1c40d8d1efbe5a9aa87e4af0ae2cd SHA512 c929334b82e3174b98a22bcc58dffd1291e3bcea6c5f789ab36296353cafe0b09640ba7015ff559acdaef58a9212b0367bada54aa89f563c6dd4773f3220c04e
DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv2.0.2+incompatible.zip 2361860 BLAKE2B 6420b95ece069525858fe5e3aa75b0df800fd2dd550cd13b2038273a49d9c2b7564cdbbc43ac95c7fc54d3de595ce7100027983f0aaf12040aa6364479ab2842 SHA512 65f289de2498d947152eacf0de984f6a1366665dd0aaf957af34327b606d9d96a4ad22adc60ac625226a46982e35c9ab2f0949641f74679876bee6c37a75f042
+DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv2.0.3+incompatible.mod 35 BLAKE2B dfade1d4d17af2380cb103ad9a0c91ce0eb7e570f9ab98d32c8d74a9056b1ba89c44c6fbceb4a2d5e5d45bb552a18e5845b1c40d8d1efbe5a9aa87e4af0ae2cd SHA512 c929334b82e3174b98a22bcc58dffd1291e3bcea6c5f789ab36296353cafe0b09640ba7015ff559acdaef58a9212b0367bada54aa89f563c6dd4773f3220c04e
+DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv2.0.3+incompatible.zip 2399906 BLAKE2B 55498f26a8d0ff8f33a3bb2ed542fbd54d723261084428e3a77f9b9f9dc2ba0884d681adbef53ca8cb609d05938231defdd40066c791746e1c0784f07a48976e SHA512 8550c70a5cb050de022699b2ee50dc56cf92c09da4421dd5b76ab8b27e2a9816e7d2f6e20b27164ef86f788fa7abe660ed6a2425d5288c07034eef38bdb4188e
DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
DIST github.com%2Fmkideal%2Fcli%2F@v%2Fv0.0.3.mod 30 BLAKE2B 15a777a1125c102b5d3e25b1c478cfd9612a39b5240bc84864acd2b421cc5825f11d72312bd6fe9b61f0538ca49be08a7533755b6d48a6b5466b9a6c14e12489 SHA512 d539c09d037675b742f5993040f4c6474f4a927f5b2f84b9bd20e76f5b1cc8a3f85dbb23f88feff7d98faafae0d6e8db21886f88429ce9d8137d6e8d2fb86b3c
DIST github.com%2Fmkideal%2Fcli%2F@v%2Fv0.0.3.zip 80501 BLAKE2B 43ddf3dae35f3d4140f14dbb9888e0bce93b96d149ebe480d49b393407304c189e747f13e57c3c03236c209b5668e5d58ef3caf6acbd585fc84b0ee9468db2c5 SHA512 4d722e560fb0b94280c748567569f6dbb467c0492414dada3ed249d69fed2908bd6389b454527a0ae261252816a368d5566f9dba58337588a55c2b21816dfd10
+DIST github.com%2Fmkideal%2Fcli%2F@v%2Fv0.2.3.mod 288 BLAKE2B 40037cd290d9af9d255aec5fc22e0fe1afaf846b40a1c36f564e345c642afe064bcd48801cdd8c058843b7ada0b0a7b964a0410fac5dc0acdd87adcdbd76f53e SHA512 41840648e6111107bd7d720bb5b4f83f72d888d22477bc3ef4de10910c60777de720a846ada3ca846ca9b485230dd004dbfd9e8803f98882ff76aae11d10f40c
+DIST github.com%2Fmkideal%2Fcli%2F@v%2Fv0.2.3.zip 88127 BLAKE2B cf5eb17e0ad740c538f40b8ebb62c21b24e468a34db435392974922a58a0824091dfe0963ec470c0090b407d3fd5828f02a463bd297bfd160728d0f0576fd5e0 SHA512 068689a092350e96dc84c4b7145736f1e1fa4e04c0621f97b82341a01aa2e2fd212925d3cf8ac4fed4aa29bc0d4c7df017db9182aece139416364b2fb7f0f182
+DIST github.com%2Fmkideal%2Flog%2F@v%2Fv1.0.0.mod 30 BLAKE2B 80b4dfcd46c104d14d23938779ceec3aca4940f6ccf1f3b85a42bd15ec7f0ef3c9d132bdef3a09065822e0e645591fd3223863d4dda13db5aaf67da55f2edca7 SHA512 fa93439c9b6b0a308923224da66f53ab1608014a60309df704aa8cce2feb5b6440817a5365fb1a28e27e86ee4b5894e34eab701c190c11da56a5bf5fded761ec
DIST github.com%2Fmkideal%2Fpkg%2F@v%2Fv0.0.0-20170503154153-3e188c9e7ecc.mod 30 BLAKE2B be0d67c172ff76b8c4576e2e76e3c56418280ab4e8981e832f11f0105e22440e1a881c7b928752edd9596eccc62d478d87e210e9b1207ff65227d8ca16e7a69b SHA512 a4c91adb03651c89f0954d03648876fc0738a879fe0d13aab60e8b645897a1f1d6f6954aa42761e95a079946a9f072b0c8d4d0b8b34b9978dab9cebb72e12ea8
DIST github.com%2Fmkideal%2Fpkg%2F@v%2Fv0.0.0-20170503154153-3e188c9e7ecc.zip 112591 BLAKE2B a67b96f3d477b6522a6df1d39223e7c9f53baebf657c6e321771ee4409cca356c7e6a0ca7eb36a0370cb1bb9fc27cfb4e60401ee967968e56b28adc999a451d0 SHA512 b4986d45c9390796b1cc4bb173e2c2e441751439004663e04b4f3fb05064620fdfa998fb85a6797b9f5cd06bebe9b85cded46eca38860bd09d588c456b0cae15
+DIST github.com%2Fmkideal%2Fpkg%2F@v%2Fv0.1.2.mod 395 BLAKE2B 3bdd175990891c8cf145dcbc05118c356d388d1ebdb2f048a2dd5c23030adec5f15a6d00a1419418051e204a3c3771360c0f1fe023f07d036946638fb3505d2f SHA512 2d631f413724ccf4e621b783cc9f06ab3b8f5b740ddd6d1cf68e83285517a95d4f760ed5b0eab46ae9f2566af16386398c3798305fefbe121f98459d499f770f
+DIST github.com%2Fmkideal%2Fpkg%2F@v%2Fv0.1.2.zip 112864 BLAKE2B a11a908ab1736e95b2a19d7424a71ab8fe95b25fb4c05562ea92d54890593bda0d4b4eccc1c3a35a836872c7657712e38aca2a2b3f3396c342cdc34885f96ecc SHA512 4996e0eb65a55c0c3a7561da0a2037e8a3f4ebecf4cec5019ecaf6d886f7a5360f5ec10dde1647e2b09643bb6d44662c2a58fb59da9a5ede0a651ec0505f6d80
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
+DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
+DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
+DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
+DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.6.mod 1010 BLAKE2B 6bef0142218537a9452ead65865ba25d9bd2c9773cd87e199a72ec57c7de0143088044bb79e23c2d7a29d4275713efaeab457d8fe2b519006883b0c15f11e24d SHA512 10181677125b9bccfca933fa3ccc84c81381548b0bcbbf1c7423822f13902eca3907e06d9cff462126b4795b8ecba9fd0525e4dd9f90962697829b99dbc20bc7
DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod 540 BLAKE2B 4d43a0901fa46da74e62fa22f61dfebdf6468f2766bd43dfd487d7a5434f961d181ecf26015ff9134e8d3f9c2dc03da6abbcd0030348facda3a499af9a04665d SHA512 9add81238044589ae2cf38042b963953d507e40945118fd62ac1cbf41bde1b001a69423c50b7045b721488b3d53489b4ce3c544b68f6c4e31e340d2581f7c8a6
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.3-0.20190127221311-3c4408c8b829.mod 443 BLAKE2B 2bc1a0ca986dd17787cbf528312efc6e721d3d9a46126b90537b7cae6681192e74afc83f3b64f8835314a0608a3f146e3fb74afc3339bb7b009d16ba04208cbe SHA512 e45c711b58e0453c63b899faabfb662fe743085dbc82782ef730ef6797fd8d372208d4fa887168ac920d6b1d15f7f65fc9a3fbff25a4474915d858411a7adee8
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod 535 BLAKE2B a8d3fb22b519e88dcb6b6f305a80c94e8b40fba8bdc96941230b354cc6bd8ec4bfd121b8e5ee57e9883e0b01b6224ff22a55fa8434bee1623133cf59489e64d0 SHA512 1d3646f93821b2ff1a4d80074f773eca22ff3675caca9d267762a31c1ec719ab464ba7ade7c8e2aa79b16a4f35f5a64f779fd909060a0c3056f09af77cebd655
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.0.mod 612 BLAKE2B e77946b5137a632121f113e6d7b390d25891d1fdf214b7c07ee0307aa4e78f5d19e96d1f4bf01aa1d62a2b0918727db1e128fdca6b6f1daeb08632b940a3084e SHA512 46eb82a74b845f5eda8cd01e8ae182e5dec7867306b31a40cb5c6bb9df2045c3259070b57388cc7826f54ee7b9fddaf980436f74ed500ab88748a13f12b30ff8
DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod 829 BLAKE2B 14a7c9b3754cce16715135e33ee294058d999f343d74281b9fd111a9c0a5632b90b6594d1ed220165b58614a695b2b2aae27b2ed9aa35ba1acc768ad12e46ea3 SHA512 4cb3dba50a3b47b9db735de9df4bd7b35d02464065919502bb1e17236c2f6b1bf1e74f312a8d0127d2d570344c30d58063d62031d3439f52a6dd8f47b29b9996
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190117184657-bf6a532e95b1.mod 36 BLAKE2B 3c6acbd1022261065a321c6f3cfa2946b58011f45fae9b98761397eb7e5e0984dae4ea34c4f837f798ab29ca8e26ed3f07771be10e500a99ce7e5e9f4c401b5c SHA512 05f032eba0c264b186936c2b9831624a01999972d4f1bba6aa15c452407eb10d402f1ac674eb41e2d24fa66e85ae2e56efd2326fc4ecc741169b9908d7935335
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod 145 BLAKE2B 8c6ed8a28b2f2fa7e97cfcb545ff7604eeb5802bf301ecfd574c1bd5bbd59172479a55c9f42f42a13a85daeb77e730dcf5cdb78aa9b7c499f3ded0584163d75b SHA512 0d285b677b209f7973ddf036b2f2463aacd060e58db9a0721e85d40d513f8befe3605677dca1040fe9dce006e3d5d3246d876224f05c45757505696122a3153c
+DIST github.com%2Frcrowley%2Fgo-metrics%2F@v%2Fv0.0.0-20181016184325-3113b8401b8a.mod 38 BLAKE2B 091e64943724001796bfb662a26443a681d4db705219a1d7601c350b94105caa1584c62a4befd1aa0c634268867c84bacc79e235d5a8b416f6a8aa8e12192261 SHA512 f22213d29e8a0914fc947e08d8c85dbcab835cd7587e45cf5458a1cff074359fcb187ab47bdfd933c8937e393975a29e872b744ad61295fb1dee3783877e81df
+DIST github.com%2Frqlite%2Fgo-sqlite3%2F@v%2Fv1.15.0.mod 45 BLAKE2B 1eee601849740d90744f1819d6048998a21504a4400c9913fdbb01afad7ea6d5a9c07c70d0aa1d74a604e0d889c40e5358732f1f00f001fef2f58b16a1ce5293 SHA512 6308492c9daef5d00332441cbe7443a9da9226d24b41c216b8d2425c4c0c9d6d6e44a44669cb75d815c9641bc5c424f9d5cc97b4d9da7a1879c76580f4d5830d
+DIST github.com%2Frqlite%2Fgo-sqlite3%2F@v%2Fv1.15.0.zip 2434355 BLAKE2B fe1362bfb6203e162fd10e2f1ae5a4b23dc9d19ba990aee7150a353bbed56a02ccf359a6fffe8947680a59975375103ffe7bf7fe3037a9266cf37606e3b7f272 SHA512 0e43a50b69ab2002056178f7bf657c4c013747e38246f44bb7a06b4c284f1dbec5f90d7712159bbdae8777e418ff77472525ee4b6cb4995f55b49ed7cd9a130d
+DIST github.com%2Frqlite%2Fgo-sqlite3%2F@v%2Fv1.18.0.mod 45 BLAKE2B 1eee601849740d90744f1819d6048998a21504a4400c9913fdbb01afad7ea6d5a9c07c70d0aa1d74a604e0d889c40e5358732f1f00f001fef2f58b16a1ce5293 SHA512 6308492c9daef5d00332441cbe7443a9da9226d24b41c216b8d2425c4c0c9d6d6e44a44669cb75d815c9641bc5c424f9d5cc97b4d9da7a1879c76580f4d5830d
+DIST github.com%2Frqlite%2Fgo-sqlite3%2F@v%2Fv1.18.0.zip 2425214 BLAKE2B 9911a174624fe85bd7b9e348a421d5dc395ba9e10a89cf65967aa9726d06ddbc336ef559c4cdf999c0ee3d02073866bdae75504d1396af05fd8db0f9546cb1dc SHA512 73dcf0e7625d45dbdb1da7cadabfa949dd7b974aeb503f598c9bc41dc7347deb53a2285a36d9f6ac3962ced05cd657f72df1424997db305e27b3909fa3e45c33
+DIST github.com%2Frqlite%2Fgo-sqlite3%2F@v%2Fv1.19.0.mod 45 BLAKE2B 1eee601849740d90744f1819d6048998a21504a4400c9913fdbb01afad7ea6d5a9c07c70d0aa1d74a604e0d889c40e5358732f1f00f001fef2f58b16a1ce5293 SHA512 6308492c9daef5d00332441cbe7443a9da9226d24b41c216b8d2425c4c0c9d6d6e44a44669cb75d815c9641bc5c424f9d5cc97b4d9da7a1879c76580f4d5830d
+DIST github.com%2Frqlite%2Fgo-sqlite3%2F@v%2Fv1.19.0.zip 2425305 BLAKE2B 8668e0c433b6a1c4217055dc357dca95d82eebcfdf18b785aa697fb28f012ddfcbbbbce741a9e9bad285ac17058e684e270844fbd21327c027fa1101911152df SHA512 13368fce4ebe2257d11b63b34291b6cd9e47ab78999927ede538bd11db9aaa7a6f29cc62db5044888636872d2a6c580f48affcfbc7fede9769fa2242161b8a99
+DIST github.com%2Frqlite%2Fgo-sqlite3%2F@v%2Fv1.20.0.mod 45 BLAKE2B 1eee601849740d90744f1819d6048998a21504a4400c9913fdbb01afad7ea6d5a9c07c70d0aa1d74a604e0d889c40e5358732f1f00f001fef2f58b16a1ce5293 SHA512 6308492c9daef5d00332441cbe7443a9da9226d24b41c216b8d2425c4c0c9d6d6e44a44669cb75d815c9641bc5c424f9d5cc97b4d9da7a1879c76580f4d5830d
+DIST github.com%2Frqlite%2Fgo-sqlite3%2F@v%2Fv1.20.0.zip 2425279 BLAKE2B 67149b675fb720bc4484c441c3735f2d038b16a7fe486a5cdfd39f00238ad810765ef03b919c4b20dd054dafccbfd5127a660bc2f3da857009a31b34ddbfbc51 SHA512 c4edf75df81daf7bcc3ceb341261b4e604a2892150faad85083bf43ec20027c7b908112d2944c5a2223dfdbeabffa8f3154dd3ba964033a22fc50506e3ab9b9f
+DIST github.com%2Frqlite%2Fgo-sqlite3%2F@v%2Fv1.20.1.mod 45 BLAKE2B 1eee601849740d90744f1819d6048998a21504a4400c9913fdbb01afad7ea6d5a9c07c70d0aa1d74a604e0d889c40e5358732f1f00f001fef2f58b16a1ce5293 SHA512 6308492c9daef5d00332441cbe7443a9da9226d24b41c216b8d2425c4c0c9d6d6e44a44669cb75d815c9641bc5c424f9d5cc97b4d9da7a1879c76580f4d5830d
+DIST github.com%2Frqlite%2Fgo-sqlite3%2F@v%2Fv1.20.1.zip 2425288 BLAKE2B 29c4acb691e654c6ab2a55bdea8aa47ce64706c410266561ff670a796ffbc2b3e55366bac65bb922d895ff95a8c9345064c8b37249c2f3482cfb28cbd71f743b SHA512 a907701185079c2adee790a233e6f5dad3201400dd11eaffbc49647694b99ce621c0afa85c51ca05bdbed14aaa0c7ce8cc0f65f7809a8a962a3bb59883f1c581
+DIST github.com%2Fshopspring%2Fdecimal%2F@v%2Fv0.0.0-20180709203117-cd690d0c9e24.mod 37 BLAKE2B 9945435440e0d3be57cdb12cab697382fe91c56329289bbde332bbd1fd15928a5101d7fcadd89064ecbd103130514a1cad383db097d02d596138fad0348c15d0 SHA512 7f46d39bc8f24a5c5c1ff513c0f0018d5341a008526a49bf0b3694008c272b3080b0386a44ba6c27f2894bef19dfbec5095c9189ed222ed5a55797788668315e
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod 393 BLAKE2B b9d712acd24d7a0605c74920733902a8eb1f9151fe0b0c575f01e2f821705ca7323f854c5b88d5bc534ccc9155571c083d4f53c6f6892879c829146bd95729f3 SHA512 c1621afd4618d1027b2d89a8e9653d18dabe098a7004b376ca2be63955ab783879540a890ab1324c2560dae9e6f3198dacc32d5fb0afd4b5a779d29a8c28f035
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod 337 BLAKE2B 94ce7d2e23281061ee0ac0b1be2f8c3439c86e62c56ecf556a81123d57d819b1e0e95ec3b7c6425f13abaaa1683942b7a3d0bb8ad489577284b2a6063c777b37 SHA512 38a79599dbd09661614d54fc92149fe581575b7833e89dd73a3f754fafa4bc549c6c9078753ab8e2a85ce2be3ab81e528e29b6d19e7c329e0cb0f74896d2e418
DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
+DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
DIST github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod 32 BLAKE2B c5bd918ed79f8ad33509bee3028b85da9941f721e12735da810f7cf4238ddf83d3c5b7634c01944ebbe9d0c77fea36d5480d945d2dad9d9126cdb5ceb1cc1d11 SHA512 4168487b908d7fbec0813e5ac4d1cc854216d2355fd2843c2856ce81ee7bc399d9fc2b0811b5fbf1f0f1f26e92d327aab3d54b30809ffed621aff37a706e3417
DIST github.com%2Fvalyala%2Fbytebufferpool%2F@v%2Fv1.0.0.mod 41 BLAKE2B b7c7dfaa36f45deedb2b403a7a0f09577321cdcd86d714724f9d8dd8044c05aae91dbee433deec1dc094d8af6ceb8d01924bf4a9812b7521ce52ffe5678e4a22 SHA512 887a7529d78ca53e5e8822ac041705ae20c34c337b1bb94d3f6b671e4afd2dbdcce3a52aac4a42defe3da92fde14eef180bc01293040f6150c362f23408e3fa3
DIST github.com%2Fvalyala%2Ffasttemplate%2F@v%2Fv1.0.1.mod 89 BLAKE2B 6dd7632179015369088b8e1271127271daac6a3af65032e723691e1d19ae50428b705a8f417950dd1b86c6aae63a0518636029f589eb4ef722e1c21ef0d0aa9a SHA512 02820d9107d43b1d41e74fb2281edb421bd95f852ae1062536d3f2ad9d6e97e2154b90a831f4618a0f83f9c4a828c176759132c0565a7a4d99dfe3b76e5f6d10
+DIST github.com%2Fziutek%2Fmymysql%2F@v%2Fv1.5.4.mod 33 BLAKE2B 06075bbd3eb02ab2dd096de6cce4658000082d9afe5616c75d74b0dadf777263a3c914517bf0df87908d043370cd066c4a5c45b6843cf02bb3fd67928a8d5197 SHA512 cd6a60a15f71d86acc64da0657180522cc0cb7a6e43428e131241bcf791a9c73d6dd8813fb8dd5b3d8e9bf99ac9264b0519c796053a7d519bf66143e1b0643ac
+DIST go.opencensus.io%2F@v%2Fv0.20.1.mod 408 BLAKE2B 01a022e76e1605416e74ffa8aafc0868304c7810d9e9de804bd611a2eb7417adf113cf10ecf607d89d1ef18f1e17fdbd1efc35f889854210114fb8a4e8db1d6f SHA512 2bfbe633ffde1f91834ca77f19d0b32cc4c9480b8a59e101199cf3e8ab0285c16fb45a00326353f02a7dbe06c1562c4695ce7d98767c4149ed2321acd527bebd
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190325154230-a5d413f7728c.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191219195013-becbf705a915.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191219195013-becbf705a915.zip 1861363 BLAKE2B ee9b24e4db030aca81dde9b7c3e8e9cf8834be2ccff243da43198fc414d088f7a2d36dc3a6ad7269f07f3186fe183d04a6643474f1d0973272657920e190d13a SHA512 75cbea0d611fc561e0ec8632afb5078892a54aaf39390c6cd79ec71e099622c437a644844597f4d1305eb66fcd0a2182caeb864c4613d0f47d7d9cbf5e87c96f
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200820211705-5c72a883971a.zip 1876176 BLAKE2B 84ea067e58783d36780037272d669162fce90fac23d5bb6090898e14ed6753ebd4bafc001b3e3ec792a29a2a802d57763a365a3f89f1acfc37f18e320aee42e6 SHA512 1a94d4b9e787a0f322cf9ee223c3b01d8dbd34b59381330808d2682ae05de0cdad62c31e085c554033e852bc5fe49d789993a668a2d75bd7eb8b2389ac774e65
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201116153603-4be66e5b6582.mod 209 BLAKE2B 3c7f74d8c14c4bf61492915500dd2ff7e3622dea9584686df4169fc8f9bd43019a9fbc75fe9949cb7b27e21f0e5ac25009c4c25476c538294a70d5dd608681eb SHA512 0a9254b2d0f816892ac9d8231d2cd65cbabd604785bb4b11c696bc321b3a2d14f19ce4337fea3df4a9a2bc17092ac6438a7d00d412392db8c594b0006c238fcb
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201116153603-4be66e5b6582.zip 1861830 BLAKE2B 3ee7018880e8596549f2885209fa624a41f050646d94d93b6d1906f796c080e50ca2ad0fbb983831753e293f5e0fbb733fa795d6b6b8629788ce34cc3f552289 SHA512 d1fb9786bf476f190f50a2cffc231faee6aef3e78c6d09d0476a06e069e538101359a7fecc47cfde0433d6038b7ce28e0c82df869299db9780b5f9a868b3e1b6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.zip 1864231 BLAKE2B a7261951977aa8143153915d72e608ef263a760de7b4977a11d0d2ead32f88ad370b993ada6344556616343a700a93edce3294df354f93d51214cfe888b97836 SHA512 1b7237562a92560aedb2527d8242b46c5a421488f638c0049812ceed87144828ca682bc4eeb87869db947479ac9e1350e5abbd31e1ff3e53734d4ea25bf5c27d
+DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod 88 BLAKE2B ce393846b227c374753f46fc076385826a6288b0c85095e097c041b844f46b87120774c68924492c4f33c33729103a2d916d2335e24953022630314b63f606d0 SHA512 0097db2957ab98a21a73960d2a37c526e5cabcd5ba4825e44f0ec4851ef83743ae171c8dc4b6c09ea4d931c15879c247e362ca53ef8dc762b484f1ddcc483d04
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190301231843-5614ed5bae6f.mod 25 BLAKE2B 8942ceba0f85f2e950663feb634e602815315834dea89d18f7319100c19a27f15746a11b50157d682756fc922138660512cd6c8e75a2458b0cd512aba19760da SHA512 3ba23f3472e0ae7904b4250e2e3a1b04c719c4bb66c59ccfaf96fae2fb25ae0abf19f542f03c7179a312a008521acaf4ff389517b11dba8b6f581a9dded44883
+DIST golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.mod 88 BLAKE2B 04ec98f76d6779784920b4f746fccafdba5ee6f365edc58985219675791d417746575165985de6d866ee891b6c768d317360a4229e61f19a1f05e4f0bafdb111 SHA512 5e787e9d2c16c87238995214eab353f87d009acf8ef78889295d11dfabef73cea4e8cabfc2999f9ef0c936efb84c22963e0aa2bce4b3678680a389cbe23df961
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.zip 1503811 BLAKE2B c8cfe6b14a455a6ad71c42ce03235c650b7efe842131874cf99570716907e02c9fbe42df586e69332189518cbdcf6e2e417caebec84ce928e7ba959b66ab869c SHA512 bc3772a7ae7cd2b50f61ec8d07e7f7e1af9f24e0b737131da375a525be44dc993ee740ce0a11e0baaf0cbd81e819e3ecad889c0c7ece95086cb428e52b10a785
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
+DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20190226205417-e64efc72b421.mod 233 BLAKE2B 5a1feba7e2d9703a864889f35f70eb18d30f9c0179a1425b0f4cddf17b03d2d187ba36346243a97820ae45e03a136ac26aedfefa09c0c7bf6cbd246eddf36c50 SHA512 9e91ec99aeb8b639d63fde3cc38f750d0a29d4a05864595beec0de0667ef9193007d89cb899b1d5ba44f0675121b2cff1e09b86bad4331378a66e15ef2f4e26b
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181122145206-62eef0e2fa9b.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190602015325-4c4f7f33c9ed.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190602015325-4c4f7f33c9ed.zip 1784999 BLAKE2B 53d1fff8c1f3427dd91a5c6052e671dc97c646c267448a18beaad4b5c3108aa08a94c6cf2adbae4be847238e2bc02189a2c59f29500fe1be904f66c2daaa0ada SHA512 f63a04e8a940a998a028bd9489af913d2e47948bb927f669046d03a90765806da33ba45c53550d7b9a553c6b58257320486b5b0211854a8cb894e4cde4e59a3a
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.zip 1867927 BLAKE2B bd890b16f2adb601f5655ca3f4815bbb335fe48c961b06f316ec579ff6efa2fc8f360d7c0bf272dc2d35e9a0470235c36cee331399ed01d8c455172f39921194 SHA512 59a4db96e438a1f03af9b00070f4d3772f1eeeff72334e6bc8ad1774bf202d39f7129572cd75fb9e1ecdfc7a532c5cd91bfdbfab3ebd10228bc6733e9556f70c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201116194326-cc9327a14d48.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201116194326-cc9327a14d48.zip 1528232 BLAKE2B 9cddfa965bfb142308706b0f3ce20c8738800ae047d80162608d2a3d0e88413fa7514e4dfdf0fe965680fe12d09ac6d400b47b556eca3be6c92f1825294ab742 SHA512 83c43c31549794d37661228afeb954703b20470ca8170e82e451d565a7cbb6a1af72d60ed6edb7bb52d202f760aaeab087cd7a829992ad25d5536eb4d850a3a3
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201223074533-0d417f636930.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201223074533-0d417f636930.zip 1533200 BLAKE2B 3eeebc8d4cb2982446d4de432fa87efec38d572f0c655ce06368db86974481590afba70a16db3bea9538695f150194853a4ae688b5f9e3f3bd8e9856e11d1267 SHA512 ad71626ffdebd4147754bfbec2b2382cf987536a62b3e477634f1b1f42ec999a8baf9b96b89a388b12005a04e9a44ff5fa7772736247e8e623bdc2594bfbaaab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210124154548-22da62e12c0c.zip 1549338 BLAKE2B 94514181eb8c63293bcc8586586ed12574ed1aeb1f64247ec4953c4a591d8cfff3f32f8cb919eea69b67ee0b6edf406d65b7676dc27db2fea86549148f372127 SHA512 8ac070589db0adff74a784cf233ff80bfafbca77d840fc13f8f5c03e66bd62c960248e13aeee5d6b401282c913adc5d42ab3e4eef64ed199700c953500309ad4
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201113234701-d7a72108b828.mod 95 BLAKE2B d86fb6e63016a8645cdec646a8ea85e1ab94e8be82123ebbe037124f353f21474e3396a64dc5f18299dc97c395759914a737699097f371c16806cc8b1e0eee64 SHA512 3295d1778ba3160c8360d99fbc648bbb4356fadd7947466f8b2f493a3c4c406515033268cf3525bdf50430b0cc31169838b5d3223842c7b1cd881e155744506e
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201113234701-d7a72108b828.zip 24204 BLAKE2B 1842cd2a55c2e2f634a4c349a27d3861e2597a8033f023661e97629e6a5837f7ec3ac3e266b8474fbfecfef19442fba7bf205ab983d1491fee91affc4a680027 SHA512 1fe3e275927653b69c4cf054aac217b195f322b19edbb8bfb48f44b4a0864cee40788c1b534408c5e79e826aaa53b48fcd8660d47d4f6c91061d7e3a85926638
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod 95 BLAKE2B d86fb6e63016a8645cdec646a8ea85e1ab94e8be82123ebbe037124f353f21474e3396a64dc5f18299dc97c395759914a737699097f371c16806cc8b1e0eee64 SHA512 3295d1778ba3160c8360d99fbc648bbb4356fadd7947466f8b2f493a3c4c406515033268cf3525bdf50430b0cc31169838b5d3223842c7b1cd881e155744506e
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.zip 23282 BLAKE2B 9bfaf8ea78b49038403d7a49abdfa9ab6cfc4fc2d71e693a15368da8cbdcd99437898f72f8a240ec7484a7f2a11405258e4cd17bab00aaaed291e2a1d1566e3f SHA512 fa88149897dd4470a7e36683de33db945e219819ce74f39f384cad03db8fd6829d47e2711dec895fafa7aa24d576dffc7cb8594a499cb1e66abeada196d502be
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201210144234-2321bbc49cbf.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
+DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201210144234-2321bbc49cbf.zip 23324 BLAKE2B 2374b37a902f15136181d5a52759aa5f2755ef5aab7f8ad2ff58ac31a1f249d1349b32d945075c3158b7c4a89f7e22887a2cd6f565ea3ab79b9d86955fba3ff6 SHA512 2774ed5c167d2f4d26d7b0fe2ff5beeb0bd2b7a45b9cfc4bd9a57c9fd5491c960de8d9fbd5f02c090d74ba45a8842fd94beb016c53ded33f9f3d50e65d601d09
DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.zip 6872962 BLAKE2B 60b7225842e40bb0fa279caaf787b3095eb04b0d245b5c098a7612048c61db7ccb64930a380872bc2eac5d49314a51dc482af03d728c864abea2f0a0a87027f4 SHA512 84dc45aa00cda5d6da40b3c063001f7bf62d96b6c21a8a83f2e507c979afc30cb12fda860082500c467815912c15f84639c5f9480521e3d88187b36cded5d46f
+DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180828015842-6cd1fcedba52.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod 194 BLAKE2B 94f62204dd4fd9b865aca70366a7a7754e2e92ed27591beaf789b268ad272dfb34ca0906d888c608393b4c71bc5c9f975fc86c164528ed7d0390e41b66206ec4 SHA512 8b68acbca48744320e64a70a983a471e9e2fc2249562064b10256269033473fd50264b6544646227fb666f075c4f266df1835ca3f88ee679bb97d34bf62bd195
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190424220101-1e8e1cfdf96b.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
+DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
+DIST google.golang.org%2Fapi%2F@v%2Fv0.3.1.mod 506 BLAKE2B 106ba1eae2f79ddc10b69e21988215a1be000c5b32a4bd8315d473748780be8785e89ce269f1560dc23a8afcb199c8a0428aefdf8035991051021443c17fd206 SHA512 37d49dd9c576465cc9dec58fab5cd9c0fa84ab472d46c961e64f34fcda27f88c45925da72368268f857db22bc9cd1378c6595933ee33ed5a6253f62c221ca6ef
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.1.0.mod 35 BLAKE2B 24fb6ba95138448c45da7f1ecc4c87391485006b54b8e7ff96ec582c2659f9ea77574b4d5fef2442eff9e5564f3c3263ed8e6963c5d21cde8772a7143d82f3ed SHA512 6644c398d639794470e49cad4402d17765422934915b5a13e13e1f84d8890cc8fad9e6ea8c580d114aefea70d894242e05ce3a432ee596f772b98b6b73069fe2
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fappengine%2F@v%2Fv1.6.0.mod 162 BLAKE2B 21c4d160665b6a87101d2aec39d2f7faef9a66f6be50f7293706686022f808b131c9ce7ddfcba6c2b6d27d15f9414101650436a2403f156a0368de2bce72e482 SHA512 60fb2454326103e4905f79f23a25320cb2c0035b7a0e3c228af845ed7dae23014efb81685f29805303edf277e8b1a2d9a7530b8f3a1a8e57caa1a85edeb52475
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod 34 BLAKE2B cd6cb61b9f55a3c1e8b33588e98e62c9c27613ac20fb039cd70c9ecbe41c34d11d80246290ab73a9faf3ec809a15fc00267654b0eb00dbf23fe5c9758c705d9c SHA512 1c29af2b4f8b54234f09dfbfad120b4b11d4fe67e9578b0553412f1587cac2fa2bfe5537fbf15e6d52dcb04332413231c250c3c460b04e64326d2eaed3102464
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod 353 BLAKE2B 7e159067adb934153bc2a45c1a091ea85083c9e52927db8aba3e7ef9e13f984dd738aaf3890e85f7daf86afdab8e5717775250715285c0edc05625a544664cd2 SHA512 17266a643d974e2fae18e7055986002b9705bd2a7fb1e3cd3664fe6dbefbc7a04aef6900146c1e1c3ed84bea8b4d1bda4d6c355af2cda013c01f19eed57568d5
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod 832 BLAKE2B 9de27394e05cf42e762a8b7ed42b6715244ea1086acd7c44f71b04bc0dc23c31ab236e6474fea423953eb3001dcaa357938daad1d54debfb5d52bdecc1de6bda SHA512 ac90f3fc374cc1ac7706146efaa8488a59634a209c30bf87453fa150bf8849870db2ec04e854438d59911ea35930a5dd8f40f5d5954786d0e0565907fc42f711
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod 83 BLAKE2B 4cef0579e4d6b156c1af532343070021171ead815734fe1210a0be6a8ba9bc5f3d11b97ee14cde810f2556bca76c206520f56363ee82af7409772d33301e413d SHA512 3cb3393e78f44d9de80074244756d5e309d19adca15e8313a392b925a687edad46e93c612da1539dc09d0c0072a063eede6f04fbd9e5671059e9857da0f7b1e6
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod 128 BLAKE2B 79cca062b7c73fedaa5357b7b43af16adc1ef83a86be48787887ec450e022d31e0700b7ca4cf5dca03bf2ad9db79727da0fbb89c73bdb006db6b68d75c3e1751 SHA512 bf45db2ba4ae10b447c471118551d337125d5432142f5aa4ba964054d09393730c23373e42eb34574ca93f9b1a12364669be13ba7faa7d9908cacb982984d414
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod 158 BLAKE2B 8cafd0a40647244f2dd1d3d3da7ef8e376c6eb3823fca68d7aeb041d480e1147b70b70c49c65e47ff1e9b92eba026a109c67c7900da88cf8569ebd037912a35c SHA512 7d00ab108b35ba41ed8c6ad54533bbbd967e0cdf39e62cb8914c0c6e4a531c779a28ea3fb2a4a7f6f4af7f3c922246a8d8ec8eabb779758245cedbebfdd97378
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod 128 BLAKE2B e36e105129abbd7729a6d509724246766c16df526ce22637e92ca8f29bf854b66622a0afc5afe8e4ad29c9efc498c488a87020fad5969e044757d49ed4bd6399 SHA512 802c0df5ed11f0bb2e221c01152c6339d3634068f89aac760654411884e6b936b031cbfabad57c5add340f9d504edfcd683c77cb0ba7d753e06bc604095257ce
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod 158 BLAKE2B 46e19153fe487751cddafb86818a962b621b10c109e513ef22e7f5c93b44dd94c6a1636e6c03d0db6e5099536901821549859bcf84f06c00483637d5d4284c43 SHA512 4797f4305d5b0159aba0825c0432cc5678cb74e55cd95eb5c42e9879a62db5aefa76c6286a436aee9a31b096193e8a3bc2e67175f0296c9d5eca3d03e98ab2d9
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip 1491602 BLAKE2B 7fcfd0d05fe509a3e30885304b7ec76a538fdc9cde84d44fb90a32aebbd14bdffd5f3f7e36f9ba24ef87decec89fa824963780b152faf43f3799c8e64e822f34 SHA512 91a070430e3a44edc4f66d6b2ecfcfeb4c633a07c252d1494ecbc9a37141483cb7bc9bfc641022a59e740ccfe9c4ed52e263d59eb85b5bc37a66088bafb6ca8a
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod 186 BLAKE2B 7df4a9ba66d7fcfc40d73332ba6fcece38a38ffef4e9686fe7887272cdc81904438cfdd0e733224058289d24ee23efe087ed9a2b4f2dc31e7213bc3038ed9512 SHA512 1b0e5543fcdbca876b51ed261aa7b8abf09e985e4622111d46378893b7a2bbad882135fc1eb26ebbf97078800f6ad9f2983dd11c62a8aaa2ab1a4f0774585e65
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.zip 1543881 BLAKE2B 2f556bdf8ed16bde9e6ecc8fc7339578c719ed0ec73ee426caa75b672ff5fcc442ea7dfed7f737900c98d5a5afc014b9e44b1b7f0f8147edb4627f3b390814c2 SHA512 29073698d91f0bd9d37cba38102b19e6223ea362f6eb331bb186670a0549391eaf856855d2978f70861e775af0a1f678a7669754862c9247edb0a682992debc7
+DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod 28 BLAKE2B ee2514c386f6cb3ff4a9b829d903e57372ce765aeab91fb2f29e95358e3472e0612a00f2982f53790159738e416819e368afa03e44bf8f6b43511347bc6d6995 SHA512 7cf7d1933039974dd4fa16febc52cc118bcd0e35c329d4c563c7f411b8000d9e17be5bca9a60d94f5309cbef97b3d176110704ebfbc3c114572cbadf63a55a34
+DIST gopkg.in%2Fredis.v5%2F@v%2Fv5.2.9.mod 25 BLAKE2B bbe629e67d59873850727cdcbfce1caf861de887cf5d27f8cc2e62839ac46a9f44ec4096d6462a66cda6ee4c754f7b556a4d1cf4ee9e93a5a19a86ecf9709e6a SHA512 b6e0ffefd02ffd73eeb9e13218c19bf6a3fd525b94ff388b4bda6c1fc6ff5162c921872663ff85cd59aa587aa34e1d5b6e3c0fbd9533e56eadf40c7886b7f8d8
+DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod 24 BLAKE2B 24a0c476e6590543f1b46175c4f0e036498afd9af616f6e204cac280e61cc10454e0c2a54fe10b9a7a306715ab966a5822ad78626c6cf20c2c78aac02598c922 SHA512 b147b03cabc4666519b94f4d9c7d9fefdea45810e3e35a9b3d303dba491d486fe03c0d5969a6186adbb9c75665e4f3e9811c7bf4ce72c46280b053611c198c41
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190106161140-3f1c8253044a.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
+DIST rqlite-5.10.2.tar.gz 363210 BLAKE2B b3200b7e945cef01dfba20aa29cd36789fcf325565e37cfc8a765becbacfa77857abb8760f3aeb20a1e5823fac41ab1056d17234644122e83ab3e4b06a02ea32 SHA512 f633a4114c1adb905e30d28e8eef363cf6f2e8a773ad6c5ba5f45e6e0c95ad0b3287d31b1aa9a324aec19c60e3ef6837b4a38cec9d18cf3fe287c001b1c56fd3
DIST rqlite-5.2.0.tar.gz 304914 BLAKE2B eb455a1f30c5f431c657fa04a09fdadbd471c34788b3a86e0440c1fb0301c51318e0d9e96e9d948d3093665e1aff612f8429acbf9c572f7497f691d3ee49665f SHA512 80f0af92c9f3af158094d728a032c87e2cd3fc7631207e5aa300ef1866a8bfd5915ad652de09874b75bf9ef155a8795d736aba275414a9d6ae912b01082a0aa2
+DIST xorm.io%2Fbuilder%2F@v%2Fv0.3.6.mod 146 BLAKE2B 2db3e352ea5e2e318fe56cfa165d5345f4d85f0523ef6cc495c7f4596bedfb4dc3730c1842a62b75e532cb50505db10162dce1dee8ce5860a3e7b17c83a37910 SHA512 05161f20c13095943f26bbddf4e8ecf60a79121edef21567e51366fe13f5ac24ed8a5ff836484a23d27ccc5b5345a780973097218e2fbf43847cdc94d45ab7ec
+DIST xorm.io%2Fcore%2F@v%2Fv0.7.2-0.20190928055935-90aeac8d08eb.mod 193 BLAKE2B ee37149b40933dc6446d105468e577643ff324821320be45bb82bcedc13882e5e1236dd89eaec2d883db33ccc60584dd9a4c5309b60822b778a393897478bb22 SHA512 5af3eed4c6cfb8f258f0fd2e8fc924aa15e16431298e1d79ffc9701fb37b8393dfa4dcf922d8ce704df7dbf6b36684540eb0972da3f13ddc4c5f3bdb07dc7090
diff --git a/dev-db/rqlite/rqlite-5.10.2.ebuild b/dev-db/rqlite/rqlite-5.10.2.ebuild
new file mode 100644
index 000000000000..79b24a2a8eff
--- /dev/null
+++ b/dev-db/rqlite/rqlite-5.10.2.ebuild
@@ -0,0 +1,383 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+EGIT_COMMIT=0ff0bab8f576e9e746b249b74e1078a6a70725e4
+
+DESCRIPTION="Replicated SQLite using the Raft consensus protocol"
+HOMEPAGE="https://github.com/rqlite/rqlite https://www.philipotoole.com/tag/rqlite/"
+
+EGO_SUM=(
+"cloud.google.com/go v0.26.0/go.mod"
+"cloud.google.com/go v0.34.0/go.mod"
+"cloud.google.com/go v0.37.4/go.mod"
+"github.com/Bowery/prompt v0.0.0-20190916142128-fa8279994f75"
+"github.com/Bowery/prompt v0.0.0-20190916142128-fa8279994f75/go.mod"
+"github.com/BurntSushi/toml v0.3.1/go.mod"
+"github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod"
+"github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod"
+"github.com/Shopify/sarama v1.19.0/go.mod"
+"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
+"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
+"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
+"github.com/apache/thrift v0.12.0/go.mod"
+"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878"
+"github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod"
+"github.com/armon/go-metrics v0.3.4"
+"github.com/armon/go-metrics v0.3.4/go.mod"
+"github.com/armon/go-metrics v0.3.5"
+"github.com/armon/go-metrics v0.3.5/go.mod"
+"github.com/armon/go-metrics v0.3.6"
+"github.com/armon/go-metrics v0.3.6/go.mod"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"github.com/beorn7/perks v1.0.0/go.mod"
+"github.com/beorn7/perks v1.0.1/go.mod"
+"github.com/boltdb/bolt v1.3.1"
+"github.com/boltdb/bolt v1.3.1/go.mod"
+"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
+"github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod"
+"github.com/circonus-labs/circonusllhist v0.1.3/go.mod"
+"github.com/client9/misspell v0.3.4/go.mod"
+"github.com/cockroachdb/apd v1.1.0/go.mod"
+"github.com/comail/colog v0.0.0-20160416085026-fba8e7b1f46c/go.mod"
+"github.com/davecgh/go-spew v1.1.0/go.mod"
+"github.com/davecgh/go-spew v1.1.1/go.mod"
+"github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4/go.mod"
+"github.com/eapache/go-resiliency v1.1.0/go.mod"
+"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
+"github.com/eapache/queue v1.1.0/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+"github.com/fatih/color v1.7.0"
+"github.com/fatih/color v1.7.0/go.mod"
+"github.com/fatih/color v1.10.0"
+"github.com/fatih/color v1.10.0/go.mod"
+"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+"github.com/go-kit/kit v0.8.0/go.mod"
+"github.com/go-kit/kit v0.9.0/go.mod"
+"github.com/go-logfmt/logfmt v0.3.0/go.mod"
+"github.com/go-logfmt/logfmt v0.4.0/go.mod"
+"github.com/go-sql-driver/mysql v1.4.1/go.mod"
+"github.com/go-stack/stack v1.8.0/go.mod"
+"github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod"
+"github.com/go-xorm/xorm v0.7.9/go.mod"
+"github.com/gofrs/uuid v3.2.0+incompatible/go.mod"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/gogo/protobuf v1.2.0/go.mod"
+"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+"github.com/golang/mock v1.1.1/go.mod"
+"github.com/golang/mock v1.2.0/go.mod"
+"github.com/golang/protobuf v1.2.0/go.mod"
+"github.com/golang/protobuf v1.3.1/go.mod"
+"github.com/golang/protobuf v1.3.2"
+"github.com/golang/protobuf v1.3.2/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+"github.com/golang/protobuf v1.4.0/go.mod"
+"github.com/golang/protobuf v1.4.1/go.mod"
+"github.com/golang/protobuf v1.4.3"
+"github.com/golang/protobuf v1.4.3/go.mod"
+"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
+"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+"github.com/google/go-cmp v0.2.0/go.mod"
+"github.com/google/go-cmp v0.3.0/go.mod"
+"github.com/google/go-cmp v0.3.1/go.mod"
+"github.com/google/go-cmp v0.4.0/go.mod"
+"github.com/google/go-cmp v0.5.0/go.mod"
+"github.com/google/gofuzz v1.0.0/go.mod"
+"github.com/google/martian v2.1.0+incompatible/go.mod"
+"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+"github.com/gorilla/context v1.1.1/go.mod"
+"github.com/gorilla/mux v1.6.2/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
+"github.com/hashicorp/go-hclog v0.9.1"
+"github.com/hashicorp/go-hclog v0.9.1/go.mod"
+"github.com/hashicorp/go-hclog v0.15.0"
+"github.com/hashicorp/go-hclog v0.15.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.0.0"
+"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.3.0"
+"github.com/hashicorp/go-immutable-radix v1.3.0/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.5"
+"github.com/hashicorp/go-msgpack v0.5.5/go.mod"
+"github.com/hashicorp/go-msgpack v1.1.5"
+"github.com/hashicorp/go-msgpack v1.1.5/go.mod"
+"github.com/hashicorp/go-retryablehttp v0.5.3/go.mod"
+"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.0"
+"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.4"
+"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+"github.com/hashicorp/raft v1.1.0/go.mod"
+"github.com/hashicorp/raft v1.1.1"
+"github.com/hashicorp/raft v1.1.1/go.mod"
+"github.com/hashicorp/raft v1.2.0"
+"github.com/hashicorp/raft v1.2.0/go.mod"
+"github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea/go.mod"
+"github.com/hashicorp/raft-boltdb v0.0.0-20191021154308-4207f1bf0617"
+"github.com/hashicorp/raft-boltdb v0.0.0-20191021154308-4207f1bf0617/go.mod"
+"github.com/hpcloud/tail v1.0.0/go.mod"
+"github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod"
+"github.com/jackc/pgx v3.6.0+incompatible/go.mod"
+"github.com/json-iterator/go v1.1.6/go.mod"
+"github.com/json-iterator/go v1.1.9/go.mod"
+"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+"github.com/kisielk/gotool v1.0.0/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+"github.com/kr/pretty v0.1.0/go.mod"
+"github.com/kr/pty v1.1.1/go.mod"
+"github.com/kr/text v0.1.0/go.mod"
+"github.com/labstack/gommon v0.3.0"
+"github.com/labstack/gommon v0.3.0/go.mod"
+"github.com/lib/pq v1.0.0/go.mod"
+"github.com/mattn/go-colorable v0.1.2/go.mod"
+"github.com/mattn/go-colorable v0.1.4"
+"github.com/mattn/go-colorable v0.1.4/go.mod"
+"github.com/mattn/go-colorable v0.1.7/go.mod"
+"github.com/mattn/go-colorable v0.1.8"
+"github.com/mattn/go-colorable v0.1.8/go.mod"
+"github.com/mattn/go-isatty v0.0.8/go.mod"
+"github.com/mattn/go-isatty v0.0.9/go.mod"
+"github.com/mattn/go-isatty v0.0.10/go.mod"
+"github.com/mattn/go-isatty v0.0.11"
+"github.com/mattn/go-isatty v0.0.11/go.mod"
+"github.com/mattn/go-isatty v0.0.12"
+"github.com/mattn/go-isatty v0.0.12/go.mod"
+"github.com/mattn/go-sqlite3 v1.10.0/go.mod"
+"github.com/mattn/go-sqlite3 v1.14.5"
+"github.com/mattn/go-sqlite3 v1.14.5/go.mod"
+"github.com/mattn/go-sqlite3 v1.14.6"
+"github.com/mattn/go-sqlite3 v1.14.6/go.mod"
+"github.com/mattn/go-sqlite3 v2.0.2+incompatible"
+"github.com/mattn/go-sqlite3 v2.0.2+incompatible/go.mod"
+"github.com/mattn/go-sqlite3 v2.0.3+incompatible"
+"github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod"
+"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+"github.com/mkideal/cli v0.0.3"
+"github.com/mkideal/cli v0.0.3/go.mod"
+"github.com/mkideal/cli v0.2.3"
+"github.com/mkideal/cli v0.2.3/go.mod"
+"github.com/mkideal/log v1.0.0/go.mod"
+"github.com/mkideal/pkg v0.0.0-20170503154153-3e188c9e7ecc"
+"github.com/mkideal/pkg v0.0.0-20170503154153-3e188c9e7ecc/go.mod"
+"github.com/mkideal/pkg v0.1.2"
+"github.com/mkideal/pkg v0.1.2/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
+"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
+"github.com/modern-go/reflect2 v1.0.1/go.mod"
+"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+"github.com/onsi/ginkgo v1.6.0/go.mod"
+"github.com/onsi/ginkgo v1.7.0/go.mod"
+"github.com/onsi/gomega v1.4.3/go.mod"
+"github.com/openzipkin/zipkin-go v0.1.6/go.mod"
+"github.com/pascaldekloe/goe v0.1.0/go.mod"
+"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
+"github.com/pkg/errors v0.8.0/go.mod"
+"github.com/pkg/errors v0.8.1/go.mod"
+"github.com/pmezard/go-difflib v1.0.0/go.mod"
+"github.com/prometheus/client_golang v0.9.1/go.mod"
+"github.com/prometheus/client_golang v0.9.2/go.mod"
+"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
+"github.com/prometheus/client_golang v1.0.0/go.mod"
+"github.com/prometheus/client_golang v1.4.0/go.mod"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+"github.com/prometheus/client_model v0.2.0/go.mod"
+"github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod"
+"github.com/prometheus/common v0.2.0/go.mod"
+"github.com/prometheus/common v0.4.1/go.mod"
+"github.com/prometheus/common v0.9.1/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
+"github.com/prometheus/procfs v0.0.2/go.mod"
+"github.com/prometheus/procfs v0.0.8/go.mod"
+"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod"
+"github.com/rqlite/go-sqlite3 v1.15.0"
+"github.com/rqlite/go-sqlite3 v1.15.0/go.mod"
+"github.com/rqlite/go-sqlite3 v1.18.0"
+"github.com/rqlite/go-sqlite3 v1.18.0/go.mod"
+"github.com/rqlite/go-sqlite3 v1.19.0"
+"github.com/rqlite/go-sqlite3 v1.19.0/go.mod"
+"github.com/rqlite/go-sqlite3 v1.20.0"
+"github.com/rqlite/go-sqlite3 v1.20.0/go.mod"
+"github.com/rqlite/go-sqlite3 v1.20.1"
+"github.com/rqlite/go-sqlite3 v1.20.1/go.mod"
+"github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod"
+"github.com/sirupsen/logrus v1.2.0/go.mod"
+"github.com/sirupsen/logrus v1.4.2/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/objx v0.1.1/go.mod"
+"github.com/stretchr/testify v1.2.2/go.mod"
+"github.com/stretchr/testify v1.3.0/go.mod"
+"github.com/stretchr/testify v1.4.0/go.mod"
+"github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod"
+"github.com/valyala/bytebufferpool v1.0.0/go.mod"
+"github.com/valyala/fasttemplate v1.0.1/go.mod"
+"github.com/ziutek/mymysql v1.5.4/go.mod"
+"go.opencensus.io v0.20.1/go.mod"
+"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod"
+"golang.org/x/crypto v0.0.0-20191219195013-becbf705a915"
+"golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod"
+"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a"
+"golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod"
+"golang.org/x/crypto v0.0.0-20201116153603-4be66e5b6582"
+"golang.org/x/crypto v0.0.0-20201116153603-4be66e5b6582/go.mod"
+"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad"
+"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod"
+"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
+"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod"
+"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
+"golang.org/x/net v0.0.0-20200707034311-ab3426394381"
+"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
+"golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod"
+"golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed"
+"golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod"
+"golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod"
+"golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod"
+"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037"
+"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+"golang.org/x/sys v0.0.0-20201116194326-cc9327a14d48"
+"golang.org/x/sys v0.0.0-20201116194326-cc9327a14d48/go.mod"
+"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+"golang.org/x/sys v0.0.0-20201223074533-0d417f636930"
+"golang.org/x/sys v0.0.0-20201223074533-0d417f636930/go.mod"
+"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c"
+"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
+"golang.org/x/term v0.0.0-20201113234701-d7a72108b828"
+"golang.org/x/term v0.0.0-20201113234701-d7a72108b828/go.mod"
+"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221"
+"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+"golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf"
+"golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod"
+"golang.org/x/text v0.3.0/go.mod"
+"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2"
+"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod"
+"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+"golang.org/x/tools v0.0.0-20190424220101-1e8e1cfdf96b/go.mod"
+"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+"google.golang.org/api v0.3.1/go.mod"
+"google.golang.org/appengine v1.1.0/go.mod"
+"google.golang.org/appengine v1.4.0/go.mod"
+"google.golang.org/appengine v1.6.0/go.mod"
+"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+"google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod"
+"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+"google.golang.org/grpc v1.17.0/go.mod"
+"google.golang.org/grpc v1.19.0/go.mod"
+"google.golang.org/grpc v1.23.0/go.mod"
+"google.golang.org/grpc v1.27.0/go.mod"
+"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+"google.golang.org/protobuf v1.21.0/go.mod"
+"google.golang.org/protobuf v1.22.0/go.mod"
+"google.golang.org/protobuf v1.23.0"
+"google.golang.org/protobuf v1.23.0/go.mod"
+"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+"google.golang.org/protobuf v1.25.0"
+"google.golang.org/protobuf v1.25.0/go.mod"
+"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+"gopkg.in/redis.v5 v5.2.9/go.mod"
+"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
+"gopkg.in/yaml.v2 v2.2.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"gopkg.in/yaml.v2 v2.2.4/go.mod"
+"gopkg.in/yaml.v2 v2.2.5/go.mod"
+"honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod"
+"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+"xorm.io/builder v0.3.6/go.mod"
+"xorm.io/core v0.7.2-0.20190928055935-90aeac8d08eb/go.mod"
+)
+go-module_set_globals
+SRC_URI="https://github.com/rqlite/rqlite/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ ${EGO_SUM_SRC_URI}"
+
+LICENSE="MIT BSD MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+src_compile() {
+ GOBIN="${S}/bin" \
+ go install \
+ -ldflags="-X main.version=v${PV}
+ -X main.branch=master
+ -X main.commit=${EGIT_COMMIT}
+ -X main.buildtime=$(date +%Y-%m-%dT%T%z)" \
+ ./cmd/... || die
+}
+
+src_test() {
+ GOBIN="${S}/bin" \
+ go test ./... || die
+}
+
+src_install() {
+ dobin bin/*
+ dodoc -r *.md DOC
+}
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 874b0a25f4a9..d6aa9f2cc84e 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/libftdi/libftdi-1.5-r2.ebuild b/dev-embedded/libftdi/libftdi-1.5-r2.ebuild
index ad0007487f72..43edbc08b4f8 100644
--- a/dev-embedded/libftdi/libftdi-1.5-r2.ebuild
+++ b/dev-embedded/libftdi/libftdi-1.5-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
else
SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
- KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~amd64 arm ~arm64 ~mips ppc ppc64 ~sparc ~x86"
fi
DESCRIPTION="Userspace access to FTDI USB interface chips"
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 07a93dd74279..2a8dba32e52d 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/libsmacker/libsmacker-1.1.1_p35.ebuild b/dev-games/libsmacker/libsmacker-1.1.1_p35.ebuild
index 6082deae84fc..1d9ad17218d9 100644
--- a/dev-games/libsmacker/libsmacker-1.1.1_p35.ebuild
+++ b/dev-games/libsmacker/libsmacker-1.1.1_p35.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
src_prepare() {
default
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 18cc2b2851ec..ee5653c0048c 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 1279d88ed3c0..bb30f38906e4 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -3,4 +3,5 @@ DIST ocaml-4.09.0.tar.gz 4838748 BLAKE2B 80f29d535c64bf2371b480217723ed20b2b21cf
DIST ocaml-4.10.0.tar.gz 4927867 BLAKE2B 71b8448a10bf3049e3b005dfbb2030d479e69e4c2ef00055f1dacd38eff838b0a5c18b4883d899b5eb4cbd05bb7ca35867010794ed25682ad51b2fe19ef2114d SHA512 f39269d572b3f7755f7881b7a9fdfe5253e49d847835ae2a8695f67e3309fc1e925523d66ecbe1fb8bc0cc3b5602e077ce7feac4926aab571383766442265179
DIST ocaml-4.10.2.tar.gz 4933135 BLAKE2B ec5e92adb23c28a254247182c79ab555fd82603e02f24799049b8057abf869d18234302408c8ae89b9997a2b210ed6965e45c2c03e4f0cab34262ad3f6ebb528 SHA512 1dd827da07f01e815fd74dd7ee84db0900f24782f8f7fd426e2d71b9fb03c7b8045f22e018120a0446c362315751365d1bd8c1724edef2b182394e76eb0a07b2
DIST ocaml-4.11.1.tar.gz 5069552 BLAKE2B a731d4b60d7965c860dda5c9dfb26b968320760501ff3cac908b8cd96e34391c417e16077cdf753b27b85a79857451e6ff0b566a9158178026a0e6bd5240aac4 SHA512 93fa8b2ff71d5f645e3ed72913205e7d35aa523cfa87d1939d77e796495b94c2fdb4a429ea65330cdeecfb0a36f7ab053b15090d9baa151b58e5331148dc8150
+DIST ocaml-4.11.2.tar.gz 5075323 BLAKE2B bdc503d9a8d0e39dd11060febcd0287657b460e50ed81e55578a3e778af990ca5d4ef9011753eee4e1a144da33eb76c95b1672dc99b76e65a2e107eee472fe06 SHA512 03d8a9f6e130142c121ff2eb3d54f584f1e7c8475f066a5803bb0edd2fa172ca06a56a3ec548b225f5c8b12112d7a68511b1e16f3ade075b5f02610d4247bbb3
DIST ocaml-patches-9.tar.bz2 1700 BLAKE2B 4e46b8fb490db28f815414e285f54e251394ea53e1d25c529bbea9f03e426fd19132b1e2c7c2be7d14983fceb4cad073d191b001f6da522fee4226371d4a2eca SHA512 cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
diff --git a/dev-lang/ocaml/ocaml-4.11.2.ebuild b/dev-lang/ocaml/ocaml-4.11.2.ebuild
new file mode 100644
index 000000000000..280d813184b1
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-4.11.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+HOMEPAGE="https://ocaml.org/"
+SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Programming language supporting functional, imperative & object-oriented styles"
+
+LICENSE="QPL-1.0 LGPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
+
+RDEPEND="sys-libs/binutils-libs:=
+ spacetime? ( sys-libs/libunwind:= )"
+BDEPEND="${RDEPEND}
+ virtual/pkgconfig"
+PDEPEND="emacs? ( app-emacs/ocaml-mode )
+ xemacs? ( app-xemacs/ocaml )"
+
+src_prepare() {
+ default
+ # Upstream build ignores LDFLAGS in several places.
+ sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \
+ -e 's/\(^OC_CFLAGS=.*\)/\1 $(LDFLAGS)/' \
+ -e 's/\(^OC_LDFLAGS=.*\)/\1 $(LDFLAGS)/' \
+ Makefile.config.in || die "LDFLAGS fix failed"
+}
+
+src_configure() {
+ local opt=(
+ --bindir="${EPREFIX}/usr/bin"
+ --libdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+ --mandir="${EPREFIX}/usr/share/man"
+ --prefix="${EPREFIX}/usr"
+ $(use_enable flambda)
+ $(use_enable spacetime)
+ )
+ econf ${opt[@]}
+}
+
+src_compile() {
+ if use ocamlopt ; then
+ env -u P emake world.opt
+ else
+ env -u P emake world
+ fi
+}
+
+src_test() {
+ if use ocamlopt ; then
+ # OCaml tests only work when run sequentially
+ emake -j1 tests
+ else
+ ewarn "${PN} was built without 'ocamlopt' USE flag; skipping tests."
+ fi
+}
+
+src_install() {
+ default
+ dodir /usr/include
+ # Create symlink for header files
+ dosym "../$(get_libdir)/ocaml/caml" /usr/include/caml
+ dodoc Changes README.adoc
+ # Create envd entry for latex input files
+ if use latex ; then
+ echo "TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}/99ocamldoc"
+ doenvd "${T}/99ocamldoc"
+ fi
+ # Install ocaml-rebuild portage set
+ insinto /usr/share/portage/config/sets
+ doins "${FILESDIR}/ocaml.conf"
+}
diff --git a/dev-lang/rust-bin/rust-bin-1.47.0-r1.ebuild b/dev-lang/rust-bin/rust-bin-1.47.0-r1.ebuild
index df69c8f7404c..f8a6a6b2ddbf 100644
--- a/dev-lang/rust-bin/rust-bin-1.47.0-r1.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.47.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="$(rust_all_arch_uris ${MY_P})"
LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
SLOT="stable"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
IUSE="clippy cpu_flags_x86_sse2 doc rls rustfmt"
DEPEND=""
diff --git a/dev-lang/rust/rust-1.47.0-r2.ebuild b/dev-lang/rust/rust-1.47.0-r2.ebuild
index dbd12671e43f..c5a1c92a3412 100644
--- a/dev-lang/rust/rust-1.47.0-r2.ebuild
+++ b/dev-lang/rust/rust-1.47.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,7 +18,7 @@ else
SLOT="stable/${ABI_VER}"
MY_P="rustc-${PV}"
SRC="${MY_P}-src.tar.xz"
- KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+ KEYWORDS="amd64 arm arm64 ppc64 x86"
fi
RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index c3e7e762e063..bbc8afd367c8 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/botan/botan-2.17.3.ebuild b/dev-libs/botan/botan-2.17.3.ebuild
index de43def34d08..fb15d09e9e4b 100644
--- a/dev-libs/botan/botan-2.17.3.ebuild
+++ b/dev-libs/botan/botan-2.17.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="BSD-2"
SLOT="2/$(ver_cut 1-2)" # soname version
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/dbus-c++/dbus-c++-0.9.0-r3.ebuild b/dev-libs/dbus-c++/dbus-c++-0.9.0-r3.ebuild
deleted file mode 100644
index afa3caaaab8a..000000000000
--- a/dev-libs/dbus-c++/dbus-c++-0.9.0-r3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules"
-
-inherit autotools-multilib eutils
-
-DESCRIPTION="Provides a C++ API for D-BUS"
-HOMEPAGE="https://sourceforge.net/projects/dbus-cplusplus/ https://sourceforge.net/apps/mediawiki/dbus-cplusplus/index.php?title=Main_Page"
-SRC_URI="mirror://sourceforge/dbus-cplusplus/lib${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="doc ecore glib static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-apps/dbus[${MULTILIB_USEDEP}]
- ecore? ( dev-libs/efl )
- glib? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- dev-util/cppunit[${MULTILIB_USEDEP}]
- virtual/pkgconfig"
-
-S=${WORKDIR}/lib${P}
-
-PATCHES=(
- "${FILESDIR}"/${P}-gcc-4.7.patch #424707
- "${FILESDIR}"/${PN}-gcc7.patch #622790
-)
-
-multilib_src_configure() {
- # not just using autotools-multilib_src_configure because of multilib_native... logic
-
- # TODO : add ecore multilib support if/when it is multilibified
- ECONF_SOURCE="${S}" econf \
- --disable-examples \
- $(multilib_native_use_enable doc doxygen-docs) \
- $(multilib_native_use_enable ecore) \
- $(use_enable glib) \
- $(use_enable static-libs static) \
- $(use_enable test tests) \
- PTHREAD_LIBS=-lpthread
- # ACX_PTHREAD sets PTHREAD_CFLAGS but not PTHREAD_LIBS for some reason...
-
- if multilib_is_native_abi; then
- # docs don't like out-of-source builds
- local d
- for d in img html; do
- ln -s "${S}"/doc/${d} "${BUILD_DIR}"/doc/${d} || die
- done
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- if use doc; then
- dohtml -r "${S}"/doc/html/*
- fi
-}
diff --git a/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719.ebuild b/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719.ebuild
deleted file mode 100644
index f10a930314c9..000000000000
--- a/dev-libs/hidapi/hidapi-0.8.0_rc1_p20140719.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit eutils versionator autotools-multilib #git-2
-
-# If github is desired, the following may be used.
-#EGIT_REPO_URI="https://github.com/signal11/hidapi.git"
-#EGIT_BRANCH="master"
-EGIT_COMMIT="d17db57b9d4354752e0af42f5f33007a42ef2906"
-
-# S is only needed for the debian_package
-S=${WORKDIR}/${PN}-${DEBIAN_PV}
-
-DESCRIPTION="A multi-platform library for USB and Bluetooth HID-Class devices"
-HOMEPAGE="http://www.signal11.us/oss/hidapi/"
-SRC_URI="https://github.com/signal11/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tgz"
-# When 0.8.0 is officially available the following link should be used.
-#SRC_URI="https://github.com/downloads/signal11/${PN}/${P}.zip"
-
-LICENSE="|| ( BSD GPL-3 HIDAPI )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="doc fox static-libs"
-
-RDEPEND="virtual/libusb:1[${MULTILIB_USEDEP}]
- virtual/libudev:0[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- virtual/pkgconfig
- fox? ( x11-libs/fox )"
-
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-PATCHES=("${FILESDIR}"/${P}-autoconf-2.70.patch)
-
-src_prepare() {
- if ! use fox; then
- sed -i -e 's:PKG_CHECK_MODULES(\[fox\], .*):AC_SUBST(fox_CFLAGS,[ ])AC_SUBST(fox_LIBS,[ ]):' configure.ac || die
- fi
-
- # Fix bashisms in the configure.ac file.
- sed -i -e 's:\([A-Z_]\+\)+="\(.*\)":\1="${\1}\2":g' \
- -e 's:\([A-Z_]\+\)+=`\(.*\)`:\1="${\1}\2":g' configure.ac || die
-
- # Portage handles license texts itself, no need to install them
- sed -i -e 's/LICENSE.*/ # blank/' Makefile.am || die
-
- autotools-multilib_src_prepare
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- $(multilib_native_use_enable fox testgui)
- )
-
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-multilib_src_compile
-
- if use doc; then
- doxygen doxygen/Doxyfile || die
- fi
-}
-
-src_install() {
- autotools-multilib_src_install
-
- if use doc; then
- dohtml -r html/.
- fi
-}
diff --git a/dev-libs/libbase58/libbase58-0.1.4-r1.ebuild b/dev-libs/libbase58/libbase58-0.1.4-r1.ebuild
index 433dcc192f88..80dc047c83be 100644
--- a/dev-libs/libbase58/libbase58-0.1.4-r1.ebuild
+++ b/dev-libs/libbase58/libbase58-0.1.4-r1.ebuild
@@ -11,7 +11,7 @@ LICENSE="MIT"
SRC_URI="https://github.com/luke-jr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0/0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 x86"
IUSE="test tools"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libbpf/libbpf-0.3.ebuild b/dev-libs/libbpf/libbpf-0.3.ebuild
index b74596abd7bf..a6fc9e4cc47a 100644
--- a/dev-libs/libbpf/libbpf-0.3.ebuild
+++ b/dev-libs/libbpf/libbpf-0.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} =~ [9]{4,} ]]; then
EGIT_REPO_URI="https://github.com/libbpf/libbpf.git"
else
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~s390 ~x86"
fi
S="${WORKDIR}/${P}/src"
diff --git a/dev-libs/libebml/Manifest b/dev-libs/libebml/Manifest
index d22637fac8d6..00ebb08a4f4d 100644
--- a/dev-libs/libebml/Manifest
+++ b/dev-libs/libebml/Manifest
@@ -2,3 +2,4 @@ DIST libebml-1.3.10.tar.xz 69488 BLAKE2B 0133ec041cd2f2aad9e8870d56c4ec8f3f3cbf7
DIST libebml-1.3.9.tar.xz 69836 BLAKE2B d37bf9d74cb21a0c4cea3550bbd25f081e48085ba8d97d2f133e3f5da292527f0f31fc5aa3978c21f82262698877a76670b4b120e915573d339751234c4450c7 SHA512 a388fa8ff7acf9a0fb33faf9c00fc07f53794d86a4f894e04e2a690a24e781a7f380a0896e607e801a6f1f0b215407ee09a801e96d4b3e15f39ca71ec3a6d64e
DIST libebml-1.4.0.tar.xz 69944 BLAKE2B 240c18d53ec73cc42b4cbed507e95ecc5ada0bd65e826b3f2e930bf6d4055097606b920c433ee5786112894ea6ad0eac229e784501ba14563274b7605dab01f5 SHA512 db78ee560a44b90b4df12ba23a00f8ccb0d3626f44296af6b79a492a00126690582764c6be6c9e9851302a0d0d70edfbe000cc217c5532abe862a821624af230
DIST libebml-1.4.1.tar.xz 70096 BLAKE2B 9b4ae80bcc2184f018c25f1a644acdf9e79c5ebc6576a5b91ccd93286c0cab2d99a80e3d2aefcbc6210724d9e05229c9ea19e0def85ba28f7e1aa059ba52925d SHA512 ddde4975546ba4214cd22db37992c2b5130a731da1b34e171cca8d7f39d981b9643a193d06be1a1e156b316e51419d1eb4c1cfe40511a52b245152e69a507e4b
+DIST libebml-1.4.2.tar.xz 70484 BLAKE2B e27da59218c6c5655e2b57295b8f0ea8770f92eea4fe65331147a963f45fa8a06cc685af553b8234ca0162acea05b99b7463753044cc49bc815c752223e3b3fa SHA512 b9535b60ba2716053819d48e345f161ad797a74678fdf60797d652da9dfa7cab905669dac744f30a81083341462bac6f2a0e69fa7d80ee59cf7414bffbd667d5
diff --git a/dev-libs/libebml/libebml-1.4.2.ebuild b/dev-libs/libebml/libebml-1.4.2.ebuild
new file mode 100644
index 000000000000..4d3afc58ea39
--- /dev/null
+++ b/dev-libs/libebml/libebml-1.4.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Extensible binary format library (kinda like XML)"
+HOMEPAGE="https://www.matroska.org/ https://github.com/Matroska-Org/libebml/"
+SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/5" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=YES
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-libs/libgusb/libgusb-0.3.5.ebuild b/dev-libs/libgusb/libgusb-0.3.5.ebuild
index 3d42d69fb362..2288ee798781 100644
--- a/dev-libs/libgusb/libgusb-0.3.5.ebuild
+++ b/dev-libs/libgusb/libgusb-0.3.5.ebuild
@@ -4,7 +4,7 @@
EAPI=7
VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
PYTHON_REQ_USE="xml(+)"
inherit meson multilib-minimal python-any-r1 vala
diff --git a/dev-libs/libofx/libofx-0.10.1.ebuild b/dev-libs/libofx/libofx-0.10.1.ebuild
index 1b4d6cf7be8e..be0553ad879b 100644
--- a/dev-libs/libofx/libofx-0.10.1.ebuild
+++ b/dev-libs/libofx/libofx-0.10.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/10"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ppc ~ppc64 ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/liboil/liboil-0.3.17-r3.ebuild b/dev-libs/liboil/liboil-0.3.17-r3.ebuild
index 7347610d5fe3..35619ad3a606 100644
--- a/dev-libs/liboil/liboil-0.3.17-r3.ebuild
+++ b/dev-libs/liboil/liboil-0.3.17-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://liboil.freedesktop.org/download/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0.3"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/libretls/libretls-3.3.1-r1.ebuild b/dev-libs/libretls/libretls-3.3.1-r1.ebuild
index 8844158c3849..252b66a3db8f 100644
--- a/dev-libs/libretls/libretls-3.3.1-r1.ebuild
+++ b/dev-libs/libretls/libretls-3.3.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://causal.agency/libretls/${P}.tar.gz"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86"
DEPEND="dev-libs/openssl:="
RDEPEND="${DEPEND}
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
index 6f29ef84ebee..133b8ddb93a2 100644
--- a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
LICENSE="BSD"
SLOT="0/4.51"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="abyss +cgi +curl +cxx +libxml2 threads test"
diff --git a/dev-perl/Const-Fast/Const-Fast-0.14.0-r2.ebuild b/dev-perl/Const-Fast/Const-Fast-0.14.0-r2.ebuild
index 27a9d59ba25f..2a1a25893828 100644
--- a/dev-perl/Const-Fast/Const-Fast-0.14.0-r2.ebuild
+++ b/dev-perl/Const-Fast/Const-Fast-0.14.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Facility for creating read-only scalars, arrays, and hashes"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/File-Map/File-Map-0.670.0.ebuild b/dev-perl/File-Map/File-Map-0.670.0.ebuild
index e99adaf70939..7c650f6fa9d2 100644
--- a/dev-perl/File-Map/File-Map-0.670.0.ebuild
+++ b/dev-perl/File-Map/File-Map-0.670.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Memory mapping made simple and safe"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index a66ab977b9e7..f519bbed5b6e 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/PerlIO-Layers/PerlIO-Layers-0.11.0-r1.ebuild b/dev-perl/PerlIO-Layers/PerlIO-Layers-0.11.0-r1.ebuild
index 43c240075533..8d564f925947 100644
--- a/dev-perl/PerlIO-Layers/PerlIO-Layers-0.11.0-r1.ebuild
+++ b/dev-perl/PerlIO-Layers/PerlIO-Layers-0.11.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Querying your filehandle's capabilities"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 88bbdfb6129e..f1651c093840 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/smarty/Manifest b/dev-php/smarty/Manifest
index 811d25356f8a..59f8dd20ec00 100644
--- a/dev-php/smarty/Manifest
+++ b/dev-php/smarty/Manifest
@@ -1,3 +1,2 @@
DIST manual-en.3.1.14.zip 408414 BLAKE2B 03d4e7a386eb3bd5b19e5c555ec34b86812838a5b5fac8ec0ab9701fba89a5867714da57d950f68224a89bbe2267c18d638ee850681860de309c74bbfb3d0a0b SHA512 d384e3856b45ed3f992f3732a5465120abe9fb947cdf13ff67a9c4264f72987d24885ee61cd7309b728e64cdfe4f34c3e7f757096d35de56d962f3b78def9e58
-DIST smarty-3.1.33.tar.gz 249999 BLAKE2B 1e174b190238c8b20d5dae9c0c9fdf264c4716ba850599a2a028fe6c307eb3d9d2611e3b928efb9471e051496e4e31502458cd7a71a9318e012d5af7eca2c50e SHA512 443473cf12c7e053744daef7a70d4172979d760278aa1593216d0b70f0c12ca2b48eb79486a1c10a1cf2264da671804b94ee9d538b9013ff0bdc42e28639ca5d
DIST smarty-3.1.39.tar.gz 264604 BLAKE2B ab5e8e052fd83e38a99725f03dcc4a206848c153b0584c12de1c605d9a9a5b47d23c29bd8a5179e53cf73921c89632ee2c4e9921002f41a4de97c6dc2e7d91a1 SHA512 84566bdefd83784c5b22ea4c21405261010a03e07839b15f6e1837aeb93ae12ae724a31648627b5f8794659e2fcd6cbbcd633be8d290dd1744e45e87fbe60fd2
diff --git a/dev-php/smarty/smarty-3.1.33.ebuild b/dev-php/smarty/smarty-3.1.33.ebuild
deleted file mode 100644
index 838dc8fab1c7..000000000000
--- a/dev-php/smarty/smarty-3.1.33.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DOC_PV="3.1.14"
-
-DESCRIPTION="A template engine for PHP"
-HOMEPAGE="https://www.smarty.net/"
-SRC_URI="https://github.com/smarty-php/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- doc? ( https://www.smarty.net/files/docs/manual-en.${DOC_PV}.zip )"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="doc"
-
-BDEPEND="doc? ( app-arch/unzip )"
-
-# PHP unicode support is detected at runtime, and the cached templates
-# that smarty generates depend on it. If, later on, PHP is reinstalled
-# without unicode support, all of the previously-generated cached
-# templates will begin to throw 500 errrors for missing mb_foo
-# functions. See bug #532618.
-RDEPEND="dev-lang/php:*[unicode]"
-
-src_install() {
- insinto "/usr/share/php/${PN}"
- doins -r libs/*
-
- local DOCS=( *.txt README README.md )
- local HTML_DOCS
- use doc && HTML_DOCS="${WORKDIR}/manual-en/"*
- einstalldocs
-}
-
-pkg_postinst() {
- elog "${PN} has been installed in /usr/share/php/${PN}/."
- elog
- elog 'To use it in your scripts, include the Smarty.class.php file'
- elog "from the \"${PN}\" directory; for example,"
- elog
- elog " require('${PN}/Smarty.class.php');"
- elog
- elog 'After that, the Smarty class will be available to you.'
-}
diff --git a/dev-php/smarty/smarty-3.1.39.ebuild b/dev-php/smarty/smarty-3.1.39.ebuild
index e887b41e4ed6..e78d49468259 100644
--- a/dev-php/smarty/smarty-3.1.39.ebuild
+++ b/dev-php/smarty/smarty-3.1.39.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/smarty-php/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
IUSE="doc"
BDEPEND="doc? ( app-arch/unzip )"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 3ee27c0c128f..ec496a315527 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/aiorpcX/aiorpcX-0.18.5.ebuild b/dev-python/aiorpcX/aiorpcX-0.18.5.ebuild
index 5daef298f5af..d5a8e748ca69 100644
--- a/dev-python/aiorpcX/aiorpcX-0.18.5.ebuild
+++ b/dev-python/aiorpcX/aiorpcX-0.18.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -26,3 +26,13 @@ BDEPEND="
)"
distutils_enable_tests pytest
+
+python_test() {
+ local deselect=(
+ # require Internet
+ tests/test_socks.py::TestSOCKSProxy::test_create_connection_resolve_good
+ )
+
+ pytest -vv ${deselect[@]/#/--deselect } ||
+ die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/aiorpcX/aiorpcX-0.19.1.ebuild b/dev-python/aiorpcX/aiorpcX-0.19.1.ebuild
index 1dceb3bd58c3..89eb9710f38e 100644
--- a/dev-python/aiorpcX/aiorpcX-0.19.1.ebuild
+++ b/dev-python/aiorpcX/aiorpcX-0.19.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python3_{8..9} )
inherit distutils-r1
@@ -26,3 +26,13 @@ BDEPEND="
)"
distutils_enable_tests pytest
+
+python_test() {
+ local deselect=(
+ # require Internet
+ tests/test_socks.py::TestSOCKSProxy::test_create_connection_resolve_good
+ )
+
+ pytest -vv ${deselect[@]/#/--deselect } ||
+ die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 3980f76c3f77..0697d50e36ad 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -12,6 +12,7 @@ DIST boto3-1.17.11.tar.gz 346877 BLAKE2B 4f6051da99527c01bc69677164024ac2f5c5e9e
DIST boto3-1.17.12.tar.gz 346906 BLAKE2B 47ada52081fca432f23e6c373949bbea74c04396f9fbc15a9ec45654b2e077067c03bf633449e43079000e8be275322048a9f48ae0dd895b30cca2b16a61860a SHA512 76f8462604bded88b959f8a0ebcb4a4bc4bbb31de70c2d527e2d0420fbbd0f4bd014cb255f354648fb57a43600190573b41c6eba8a87c3186c5c93224fe59216
DIST boto3-1.17.13.tar.gz 347484 BLAKE2B 6e07f563ccb6c54b40af962d7b8941c7afa7976550956f7ac86b8720403d8c1a9a535a15ee25985e978c5274cb5268d56d142cf25832636635136cc71657f92f SHA512 427ac5f8d1418f8603f3807a71c1fa3e4105a8cf2fba51b2f29befad5a703a3d9400c96722ea0149187d93546caec2677e37f377605ad15e4c1e9453b0b29e8c
DIST boto3-1.17.14.tar.gz 347559 BLAKE2B 66a4a1a062f74d8cbb425c945716ad912e28daf7ce4d85568ae2d30083bebaab5e314c0447c3faf5375400b939685a3bf083a122d5827666d8f6b50cd9ccf30f SHA512 b2c6510554b33d839026cb27354967c1fd25c80fbdc6ceaf92ba1fa2dd2bf47040e98db053f73d37aff759a52ff0a44c361b301bbb52e03a4fb2b3f0a389ea79
+DIST boto3-1.17.15.tar.gz 347639 BLAKE2B 91769c2aa49bd7bfa873cafa4350ca7fc1ebc53a4f94086a31b1e2e18e2bf721b351f7e2784e09b7dba7798fe558d2082b83f2b48c5e36c67efc8a57d8999614 SHA512 7601194ea9b0ce2ae657369da9ac19eec6e071dfa33780216748d2e971830478fb7712275b9330a1ed0b6a88fbbf66e681aa54cccffee6200c589f8d9a728128
DIST boto3-1.17.2.tar.gz 346203 BLAKE2B 77da42c2a7f2c2ad08feba51e11e1821a44d5c433ca8fd8339bbdfe41a0caa907c2c566bfb747acf591270e539036988a8cb2488e0b2266b7970fa3fb2d0e9fa SHA512 d215417f68d958bcd4593f19a12d94a00bc7ead5cd6133f7390886fed2a545212f8da75220ddab298737326ec14a347fbba233ca52a4e3214f7911f9a9622fa6
DIST boto3-1.17.3.tar.gz 346250 BLAKE2B 7edf59a88ec32a08056112c088de9aae903daba909a4dfeb502830d8e9a7767cd34c1c77e06525ffb6b64be3c694e38011815e39b23959caaf11043f50d53948 SHA512 fa31cccb065c0e7cceb8733045a9232b1ee455ec408eaf62f2b2a7b2b29252b5eaa765dcd8b294ae10fef9707940f75194b450ac7f49f9db3b57060ecb74ab2a
DIST boto3-1.17.4.tar.gz 346342 BLAKE2B 3fba8f8b68edb268f20919bb65c5f8715d6c89c54884395f8080384c2d07ada15894d605a943e2c167ddf7fd3550657367e4b195caf28fd73609763cf23da687 SHA512 45ecf4fe0eb61d09aea5cc5e741544c6b23d6b98de24ab9f646f28d463104ec11116d0afd4b5fbd09f55e1a7ad65a653770efb67d4b023590c218bef4f326af1
diff --git a/dev-python/boto3/boto3-1.17.15.ebuild b/dev-python/boto3/boto3-1.17.15.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.15.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/boto/boto3"
+ inherit git-r3
+ BOTOCORE_PV=${PV}
+else
+ SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+ # botocore is x.(y+3).z
+ BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+ >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+ >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_sphinx docs/source \
+ 'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+ # don't lock versions to narrow ranges
+ sed -e '/botocore/ d' \
+ -e '/jmespath/ d' \
+ -e '/s3transfer/ d' \
+ -i setup.py || die
+
+ # prevent an infinite loop
+ rm tests/functional/docs/test_smoke.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 7732408adb79..6cd9346cdb10 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -12,6 +12,7 @@ DIST botocore-1.20.11.tar.gz 7465706 BLAKE2B 25fc668ee93f04a538be736678e4186dadf
DIST botocore-1.20.12.tar.gz 7466322 BLAKE2B 07eb28f5b0fef5ffb284a5eac0c78e3430c3539cc18178c8b6bcf10cc397e91c263d89fb08a5f9c6edcaf903602f08ba445836a771b19591ad2acf58cfc4e771 SHA512 c1dee323290e1e1fa31253e23d24671fcf4806872098a8b2e5e851348dcd078ad222f858e3e284a7daa151a3b8caaf6249440d468a3c86d786dc829627bfc4b3
DIST botocore-1.20.13.tar.gz 7467277 BLAKE2B 9662965ecb4acf1c8ff90e2ee35100c5f14459acc9aefeba4a47fde00acfa1cd20140bea82273f6d7bf74065154be928c97585728cc7650153d2c747c6b87a13 SHA512 e61c2736cd40d15f01550b2c0d1ec289ad6cefbc485ace7f1d11c39c6e29daf37d2fdd34aebb0dd613c7af75312bf672b3bddbfb588d8782e73e949101586155
DIST botocore-1.20.14.tar.gz 7470342 BLAKE2B 894b7471a1d1a483edd1f59bed604e9a389d88cb5035ccbf8149303fef7f135aadc6d7df7446e3969e0d17476f9fae2f30f8c9c3b4d995152d36da3bdd4b06f5 SHA512 d2cf24743aa72171ea6c1d804f189e8428fc24f315bc3f118f802932e081b2c75a53ff5c1803c66e3b23e0adb525d8e842f003a7156dd6311aeacd95c2599693
+DIST botocore-1.20.15.tar.gz 7473239 BLAKE2B 7661c6c667b50bfff436752e723b4892c8f2967b4f95f6f7a869671451d2ecae6519fb43e813ba86a912e8003d3ca701c7285bd5f19739b8e1f40654bc419e29 SHA512 bb1f5fd9c7dc995826c6945d5bddbe623c6c40bb44dd0b20fd7806a94669994b836d527566825bd3730eb8a57460072d7da68d1630e287ce949f678700a93d84
DIST botocore-1.20.2.tar.gz 7446650 BLAKE2B 777dbcbfcd824a7d009ffc3a1aec8afbd14a097c61a49116db37c6957e6046b8cd0011cdcb3cc344944e568e9f24d15d625a51d0d2d87761279b449783ce9f68 SHA512 3e225dfa55febb9d7bf77dfcbf4b75c8505ed4a90a5a86cc6eea750b4ab7d8a2ceb16891d4473b1bd7ce1cfd43642ee32e20eea65a25d9d6da1a5f02067fa050
DIST botocore-1.20.3.tar.gz 7446281 BLAKE2B 536cbe8f6b6c150f3c66468f3e0c51ae0e602f277ff64ee67a2f149c0481fe603b10439e2fa37831b106d7ca4b23d1e7037cfc55c8e7caf06b8f9cf5561d9544 SHA512 ad0982fb9095e4d8e36a5805f5041fa1241526409d6a1fad3628c52d9870e54fd4a828816eb77f39b60f49ade7805e97cd286f7ac4070ebafbb696e513691e0f
DIST botocore-1.20.4.tar.gz 7447611 BLAKE2B 05cb501cf40748ac1053c4687bd6de7a17d9ac31fe688de8d6aaf8047260f230ea14cc947c4c208a11d26477508b38428fdca116b9fa8212c5ee6ac020a6367f SHA512 b3ec1597b1cf4e9d18e21216f9ba703e4ae0a924653d21cfd93eeffbb13041ad96c3cd099ff1c8631bdcd5c7d6a70e6d36848fdbc44de9f7cebf7ee223918743
diff --git a/dev-python/botocore/botocore-1.20.15.ebuild b/dev-python/botocore/botocore-1.20.15.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.15.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/boto/botocore"
+ inherit git-r3
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/jmespath[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ >=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/jsonschema[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+ 'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+ # unpin deps
+ sed -i -e "s:>=.*':':" setup.py || die
+ # very unstable
+ sed -i -e 's:test_stress_test_token_bucket:_&:' \
+ tests/functional/retries/test_bucket.py || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ # note: suites need to be run separately as one of the unit tests
+ # seems to be leaking mocks and breaking a few functional tests
+ nosetests -v tests/unit ||
+ die "unit tests failed under ${EPYTHON}"
+ nosetests -v tests/functional ||
+ die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/clang-python/clang-python-11.0.1.ebuild b/dev-python/clang-python/clang-python-11.0.1.ebuild
index 9b562d893ad1..33f1dfa8da5f 100644
--- a/dev-python/clang-python/clang-python-11.0.1.ebuild
+++ b/dev-python/clang-python/clang-python-11.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
IUSE="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RESTRICT="!test? ( test )"
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 4ccb59c95506..1e996e8e2c31 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,3 +1,2 @@
-DIST cliff-3.5.0.tar.gz 82997 BLAKE2B f169770a0a956e6091e56eccda8d10906bee09bdb03b474f3b17837b3eda858f3afd21beae1d6945bcdabfa89fc1555d13d70ddd0454a10fe05bfb63c8de75e7 SHA512 215f22e5dd2c4c17bd0f19866189b6b247377a7d5bddeb4a07b7536af7545bd0440b5fb0a98474fc018e3b12f6695f60028c012f3e7eeb6498b20f2923939d08
DIST cliff-3.6.0.tar.gz 80464 BLAKE2B 2b7efb07123fd9939c5717d6bdc1685d2e6474f3852e920c8d93f8a3e7ba20e433dbead97040ab035c4081058b621740ff64045c282a0568393fe8453da245d9 SHA512 ed4077e8b9e848dbd8aebb076b9f55086ea861cbf22322f7c9fb03a66b88bd60f5c09c6914481fe5f02bad25c0183e245405d9ac54d37b6bf0f14c9c97bd7684
DIST cliff-3.7.0.tar.gz 81853 BLAKE2B aab3ad056c13232978e93b380d9d0d48748778f403b4200c09f92bcedc6c2806213d81612aa453277e2c99acc5959ad666ac888d4a0726f50a5c0f04be0e9fdd SHA512 d3cf3ecc6778bbc676e47ebfcbc6be4ee120dd864684da58e476f52d021b5932bf9361ce2aa6a8ee4d68845ba79ec7a9174cfa7f21fa3fa16a945b96c968cc26
diff --git a/dev-python/cliff/cliff-3.5.0.ebuild b/dev-python/cliff/cliff-3.5.0.ebuild
deleted file mode 100644
index 184932a74483..000000000000
--- a/dev-python/cliff/cliff-3.5.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-# TODO: revert to rdepend once this is merged
-# https://github.com/openstack/cliff/pull/3
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Command Line Interface Formulation Framework"
-HOMEPAGE="https://github.com/openstack/cliff"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
- >=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
- =dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
- >=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
- !~dev-python/pbr-2.1.0
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
- >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/cliff/cliff-3.6.0.ebuild b/dev-python/cliff/cliff-3.6.0.ebuild
index 1cc8d0117cc8..cad6510ed236 100644
--- a/dev-python/cliff/cliff-3.6.0.ebuild
+++ b/dev-python/cliff/cliff-3.6.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
RDEPEND="
>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
diff --git a/dev-python/django/django-2.2.19.ebuild b/dev-python/django/django-2.2.19.ebuild
index 96e50fa2ad6d..9f6fa7fa5169 100644
--- a/dev-python/django/django-2.2.19.ebuild
+++ b/dev-python/django/django-2.2.19.ebuild
@@ -23,7 +23,7 @@ LICENSE+=" Apache-2.0"
# admin icons, jquery, xregexp.js
LICENSE+=" MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="doc sqlite test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/django/django-3.0.13.ebuild b/dev-python/django/django-3.0.13.ebuild
index c5e25f2be57a..779e41fa3f23 100644
--- a/dev-python/django/django-3.0.13.ebuild
+++ b/dev-python/django/django-3.0.13.ebuild
@@ -23,7 +23,7 @@ LICENSE+=" Apache-2.0"
# admin icons, jquery, xregexp.js
LICENSE+=" MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc ~ppc64 x86"
IUSE="doc sqlite test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/django/django-3.1.7.ebuild b/dev-python/django/django-3.1.7.ebuild
index e6482b2c0bde..79920fd3e7fe 100644
--- a/dev-python/django/django-3.1.7.ebuild
+++ b/dev-python/django/django-3.1.7.ebuild
@@ -23,7 +23,7 @@ LICENSE+=" Apache-2.0"
# admin icons, jquery, xregexp.js
LICENSE+=" MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
IUSE="doc sqlite test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index dced1e7a1f2c..3b8dce51b2cb 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,5 +1,2 @@
-DIST elementpath-2.0.5.tar.gz 194557 BLAKE2B 0c2571eff6fd850f42d2e3cd30598a5764d2f3a81f9cad756eda82e1212337e344314d60203d06b19200537aa8027e4c902de4df746b4e838fe42a1db39f25bb SHA512 c4fd4b360c88870ccb4102e7bca29cd979262b706b795b2a9314853543cd0a40c0ea4bebbac9cff9aaa0fcfefe107f574b41822be7e3c7328bb163c2bdc53283
-DIST elementpath-2.1.1.tar.gz 199609 BLAKE2B d28364e355c760b0e3b0f0695b1b4af1e05439546ab6413b29cecac934de1d4e6fa091c7e3d4d4f5da43e147b6d930fde4a3e2e9fcfeda1e646a91d27fd83dd5 SHA512 77414f37aecbe44d44cb51fdfcdad630d35fe00d6ff14dcc819851b5d844ba7f266026f6763aa70265c11cca922fb78f565d0fb33f41749594a9f256fa44ac1a
DIST elementpath-2.1.2.tar.gz 204979 BLAKE2B d247e2dc3ed685e2ba9715ed44665f1162bb8c6983e9b4010d7bf32193129b43983fc31dc9db8f76e618dfeef81061c3d5515a6e369f5159636012afac272abe SHA512 3ba7802d4a4f81c73743963b8ee8cc293973430b521f67615f344d78bf259fd371630ce09d0acff223584ac5aa11cccdfe47fe34b0dfd5ff64faacd181e10d28
-DIST elementpath-2.1.3.tar.gz 206716 BLAKE2B 51060618ae8e67b8f033b493f6ddac38e457ee57ffb49f3740fcdf001975965a8d3add42a64cdc90c00b2a464018e503c58d48744dfcaf9383eb79d66feb104d SHA512 9713ecc7a6d5fe9a1cc7aba088cda8938c2b0c258c85b3a8b2b53eec3545ec0c50b62b7825435396423e32b9df47533701e95856621e26c2236497d17ef3b5a7
DIST elementpath-2.1.4.tar.gz 208691 BLAKE2B 8317c8fa90d7feaff76357c19ed8373644d60985b1d53a1e0a702e26bf80887523a0f1dcf601800ac1618e8f681b3898b5d56fb4edbbffaacbb4a0efe58f67b1 SHA512 d965bd58254e601000da5be309ab18d3f5964cbc1224092e5e38b4523eb3ac2f7ae6e71fa6c3698b40b13484ed1d07bf93c80d45a9b3ad04f69f63bd18a42975
diff --git a/dev-python/elementpath/elementpath-2.0.5.ebuild b/dev-python/elementpath/elementpath-2.0.5.ebuild
deleted file mode 100644
index 029b5e534b88..000000000000
--- a/dev-python/elementpath/elementpath-2.0.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
-HOMEPAGE="https://github.com/sissaschool/elementpath
- https://pypi.org/project/elementpath/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- test? (
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/xmlschema[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests unittest
diff --git a/dev-python/elementpath/elementpath-2.1.1.ebuild b/dev-python/elementpath/elementpath-2.1.1.ebuild
deleted file mode 100644
index af7780cd7e42..000000000000
--- a/dev-python/elementpath/elementpath-2.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
-HOMEPAGE="https://github.com/sissaschool/elementpath
- https://pypi.org/project/elementpath/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- test? (
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/xmlschema[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests unittest
diff --git a/dev-python/elementpath/elementpath-2.1.2.ebuild b/dev-python/elementpath/elementpath-2.1.2.ebuild
index 73b63d2a6ee3..4d73295e2eef 100644
--- a/dev-python/elementpath/elementpath-2.1.2.ebuild
+++ b/dev-python/elementpath/elementpath-2.1.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/elementpath/elementpath-2.1.3.ebuild b/dev-python/elementpath/elementpath-2.1.3.ebuild
deleted file mode 100644
index 73b63d2a6ee3..000000000000
--- a/dev-python/elementpath/elementpath-2.1.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
-HOMEPAGE="https://github.com/sissaschool/elementpath
- https://pypi.org/project/elementpath/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- test? (
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/xmlschema[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests unittest
diff --git a/dev-python/flask-cors/flask-cors-3.0.10.ebuild b/dev-python/flask-cors/flask-cors-3.0.10.ebuild
index 7f2e5d1d534b..fb63fbbbae0a 100644
--- a/dev-python/flask-cors/flask-cors-3.0.10.ebuild
+++ b/dev-python/flask-cors/flask-cors-3.0.10.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]]; then
inherit git-r3
else
SRC_URI="https://github.com/corydolphin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 x86"
+ KEYWORDS="amd64 ~arm x86"
fi
DESCRIPTION="A Flask extension for Cross Origin Resource Sharing (CORS)"
diff --git a/dev-python/gevent/gevent-21.1.2.ebuild b/dev-python/gevent/gevent-21.1.2.ebuild
index b590d89c024b..0d511fe988b5 100644
--- a/dev-python/gevent/gevent-21.1.2.ebuild
+++ b/dev-python/gevent/gevent-21.1.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="doc examples test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 08939442506b..fccdfe53b2dc 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -2,3 +2,4 @@ DIST importlib_metadata-3.3.0.tar.gz 33549 BLAKE2B 6646cf7f8dbbeeadd7b4e9e572a59
DIST importlib_metadata-3.4.0.tar.gz 33841 BLAKE2B e2ac38c0f6fc5ecf78d3a4018715282b176f448e0a9f2cb16320812c1f9ca18f797b2ddfa85a96d83f6ff9540b486abcd8b5a38fa7f9261abbde4a88962e765d SHA512 d17aae60ca79ddb3c2e60218144e7a3e055b2807e8ca4e55f0d0c1ae428323ab7d832e4178dd05a60f1de2f157497a6261afa7baa8f91bec85d042303869fb67
DIST importlib_metadata-3.5.0.tar.gz 34528 BLAKE2B 589cd89639626a2fa70dc5e8e68c04b36e87cee59517c31b6cc68b5c7d0248a030a6bfb8641f199b3b59cc452ac2b9e3c05b993577f2b5fbed1f98e9b43abbf8 SHA512 711603d2dce7d9fae275348aa4b53671e0253e5321d97caa891094daeb7330cf40cf70a21586eeb5cc9da2f06171b3f811e5c583164f105e32250484c5e5f4b7
DIST importlib_metadata-3.6.0.tar.gz 36235 BLAKE2B 8a0a3d3bdb3656e695f86e5def2271e1d246bb92e8967d51185654cc8883dd5258da4f85325e1ba39e931bd8c42878d9589db18482ec510b9b18dc7035e819d3 SHA512 75a69e52207a5a6b26491eabe89a049a520d7c92566e74b942227a899b94872fbad6e1940c38a1d1fdf2cc951cd45605fcb85438cbfa48c548273391c9f39da0
+DIST importlib_metadata-3.7.0.tar.gz 36517 BLAKE2B b96ac99bbc9ed7c961635a598d46bf409f11b008453123f3236feaf3650f7c6fe262c803dbf6b65bbe42ca4ea9990b559d3f03dde2287b19f0f7ff21668a3a3a SHA512 c11c503412cb5f18a235dbff13eb0d5b24a2a7510f32cb8fc4abec3259987de9e5a01692aef729c5d7c7fe597156b1317abc357d49726ef1026172995b080631
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.7.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.7.0.ebuild
new file mode 100644
index 000000000000..753f44d0b774
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-3.7.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Included in Python >= 3.8
+PYTHON_COMPAT=( pypy3 python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="https://github.com/python/importlib_metadata"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+ $(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7})
+ dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/importlib_resources-1.3.0[${PYTHON_USEDEP}]
+ dev-python/packaging[${PYTHON_USEDEP}]
+ dev-python/pyfakefs[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
+distutils_enable_tests unittest
+
+python_prepare_all() {
+ # Skip a test that requires pep517 which is not in the tree
+ sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
+
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index 9114c54584ee..5070e043bf01 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -1,3 +1,2 @@
-DIST jaraco.classes-3.1.0.tar.gz 11616 BLAKE2B 5b438f7582a9a93ca4fc97a71725c1fe3275e4bfb48f5e06b549f7ac8fb6900262165b1ad0638114d3a8d11c10f449b7930d4c2d66fa928665aaff820af88937 SHA512 697d892a01c4e8ad83f57e69dcd744f976cea67fa3efcd55b10eda02f6bf1916162c0fa952d0d711e62f62fdff62740ee55a93be9fc46ebd4ab22416092f0ff6
DIST jaraco.classes-3.2.0.tar.gz 12277 BLAKE2B 4512d2ef96a6dba8c5f226da5947e69beb21a7bef20402fc1ef3cd8a0495bedadaf261b1d47757af10838897923ce0561ac063cb2d6d53c2ebf2be909c335dc1 SHA512 89cc24826c647ebb4a08ceb76159e6d123b7067c7f725989195b073895f1482a04db82e3e52059faf825a6dec7c9b9201859267de06880d4a80d397a7ab209b6
DIST jaraco.classes-3.2.1.tar.gz 12286 BLAKE2B c96162ecda1ca3e546b58ab147ea5b080f03e3570d6d59fe7372aeff290c683b68abad6560d7ebf57662009e4d9d8d9a6c1d768ba86e4bd24568794fdedf0534 SHA512 4c85cfdd1da88de01596867365147be6cadd7e1d230798683236fdfde579747e3309aac95ae4f3ef86c91bb4493f3096c4ecc14e3db764ef308aab41ead88e23
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.1.0-r1.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.1.0-r1.ebuild
deleted file mode 100644
index f3145026f6ea..000000000000
--- a/dev-python/jaraco-classes/jaraco-classes-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Tests fail with pypy
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Classes used by other projects by developer jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.classes"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- >=dev-python/pytest-2.8[${PYTHON_USEDEP}]
- )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-distutils_enable_sphinx docs \
- ">=dev-python/jaraco-packaging-3.2" \
- ">=dev-python/rst-linker-1.9"
-
-python_prepare_all() {
- # avoid a setuptools_scm dependency
- sed -i "s:use_scm_version=True:version='${PV}':" setup.py || die
- sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+)[[:space:]]*::" \
- setup.cfg || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- # Avoid ImportMismatchError, override pytest options to skip flake8
- pytest -vv "${BUILD_DIR}"/lib --override-ini="addopts=--doctest-modules" \
- || die "tests failed with ${EPYTHON}"
-}
-
-# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
-python_install() {
- rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
- # note: eclass may default to --skip-build in the future
- distutils-r1_python_install --skip-build
-}
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.2.0.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.2.0.ebuild
index 20b9ab27a6cb..4e4708f23252 100644
--- a/dev-python/jaraco-classes/jaraco-classes-3.2.0.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-3.2.0.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
BDEPEND="
dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index c4817debb38b..07829e0a2f75 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,4 +1,2 @@
-DIST keyring-21.7.0.tar.gz 46998 BLAKE2B 469d2de254ed88604a40a4e05c001f50986f55296d35b54969cfa8612473cbd5184f36bd6babdfb6631ab908e03f81858434b7e52471a2d366f97293c2c0ed93 SHA512 8fc5e8f0f0cf2a336c6ce900d59fcd31b4ec270d62559a1c2b4c36803428532b463bad0b2ace9af33b6fb0d50de94229449c4ef4042287ecaa8f1fac37c5faf8
-DIST keyring-21.8.0.tar.gz 47639 BLAKE2B 3b8b11cd7ea121f9d8544a5775d9f62de23613da0265f0d815687ad311f4a7b6ed431142682df3059fbe43a342c6151871782a850c416a5b50c1df14a64d609a SHA512 4acadf421946644466b5c43481eddd111170185ba3993f4fec38cad0129259bd17aebad4dc2e2d2e88e84aa814e62d37b39efe7385ccd569e40a5291d5f4ae40
DIST keyring-22.0.0.tar.gz 47693 BLAKE2B 88a151327778e5e039c43caa68e53705d985d6ef2b7b668df1d941160b843f47a0e2f6f79c9afc39bc66a36373c0374333296a3cb98f1c65c620a8fad3f43fec SHA512 5e9e27cf9b09f042747909b442864a1ea0669b36f69592538b487978a582e16e58056d6bd68b35566143000ed3f5c7733e3ef471c66935a811e09fc4b7f56f6f
DIST keyring-22.0.1.tar.gz 47782 BLAKE2B ec9f5c0418b2c279f111cbcb8ccc1fc05f64e859e2e675041289a639c7e2d4681e562c9c023e46f1eacb99f88114af97545ad36f71037db0b77e83d927785ce0 SHA512 2e264570d2e905ce4862d71fe4b02fcf0631218a693292c13159fdbad0032e91d81910f84d787e948057e2f428fcf8677ebdd83af4da54c3359347f642db0441
diff --git a/dev-python/keyring/keyring-21.7.0.ebuild b/dev-python/keyring/keyring-21.7.0.ebuild
deleted file mode 100644
index 8d3f371fb8f3..000000000000
--- a/dev-python/keyring/keyring-21.7.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-IUSE="doc"
-
-RDEPEND="
- dev-python/secretstorage[${PYTHON_USEDEP}]
- dev-python/entrypoints[${PYTHON_USEDEP}]
- dev-python/jeepney[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/importlib_metadata[${PYTHON_USEDEP}]
- ' pypy3 python3_{5,6,7})
-"
-BDEPEND="
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- dev-python/toml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
- dev-python/jaraco-packaging \
- dev-python/rst-linker
-
-python_prepare_all() {
- sed -i -e 's:--flake8 --black --cov --mypy::' pytest.ini || die
- rm tests/backends/test_kwallet.py || die
-
- distutils-r1_python_prepare_all
-
- export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
diff --git a/dev-python/keyring/keyring-21.8.0.ebuild b/dev-python/keyring/keyring-21.8.0.ebuild
deleted file mode 100644
index 6953c7f243bd..000000000000
--- a/dev-python/keyring/keyring-21.8.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
-IUSE="doc"
-
-RDEPEND="
- dev-python/secretstorage[${PYTHON_USEDEP}]
- dev-python/entrypoints[${PYTHON_USEDEP}]
- dev-python/jeepney[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/importlib_metadata[${PYTHON_USEDEP}]
- ' pypy3 python3_{5,6,7})
-"
-BDEPEND="
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- dev-python/toml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
- dev-python/jaraco-packaging \
- dev-python/rst-linker
-
-python_prepare_all() {
- sed -i -e 's:--flake8 --black --cov --mypy::' pytest.ini || die
- rm tests/backends/test_kwallet.py || die
-
- distutils-r1_python_prepare_all
-
- export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
diff --git a/dev-python/keyring/keyring-22.0.0.ebuild b/dev-python/keyring/keyring-22.0.0.ebuild
index d62127ef81b5..d5c69ea2f5fd 100644
--- a/dev-python/keyring/keyring-22.0.0.ebuild
+++ b/dev-python/keyring/keyring-22.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0"
LICENSE="PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
RDEPEND="
dev-python/secretstorage[${PYTHON_USEDEP}]
diff --git a/dev-python/lit/lit-11.0.1.ebuild b/dev-python/lit/lit-11.0.1.ebuild
index f956b11885ac..27bd409a071b 100644
--- a/dev-python/lit/lit-11.0.1.ebuild
+++ b/dev-python/lit/lit-11.0.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://llvm.org/"
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index 84af96a722f0..63fb7a4fd48a 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,2 +1,3 @@
DIST Markdown-2.6.11.tar.gz 274132 BLAKE2B 0d14d308c97d925db83d71f3b9be5622e77ee4a159fced15c811390b39950e81bff9ffc567f32e878cbc44014640ab0a2f596258cfd0dce6b66029105cec7370 SHA512 4e7dd3e04f181fa2751a359aede301fb29a23b9af74867ff9d1d0fdd051dcd16d04a5891e37aff0b309649c5fd13363802ec7e10fc33896e9453991efcab4a66
DIST Markdown-3.3.3.tar.gz 319531 BLAKE2B b7a527a7d202ee955106ecddb75541285589cb006a0cb3e587f06bb06aa3be8bdf8e976a35cc2ca63b2f085a8b462f8e8d5fad84710561dc105e533939c04204 SHA512 b8e42c1471d155be6cc9aa0b6ce649454b09d36df1de51ef7e45043ae3c1c87b9b09e1fae4c680a771bee52e7fa8ea82548b78b2ffb1d38e85785f0b0de25b36
+DIST Markdown-3.3.4.tar.gz 322192 BLAKE2B 37122305112440b85d7f0e5e1bf90bafe15a8bcb84e8d8bdd9b4183dcb4be1010d287450062bab7dc9017d8e618f84a8245e6fd35f8204e5e2ece14d302fb13b SHA512 37422619dd8f542bfcf7975c92e76a39e4eeeb42386727d52037869cee1617f8efcb74a382a9c7cb903907ebf3643a27ba0de583bc0dbd327a36e72bbf8520af
diff --git a/dev-python/markdown/markdown-3.3.4.ebuild b/dev-python/markdown/markdown-3.3.4.ebuild
new file mode 100644
index 000000000000..2f439b137c6e
--- /dev/null
+++ b/dev-python/markdown/markdown-3.3.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the markdown markup language"
+HOMEPAGE="
+ https://python-markdown.github.io/
+ https://pypi.org/project/Markdown/
+ https://github.com/Python-Markdown/markdown"
+SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="doc"
+
+# importlib_metadata is only necessary for nbformat
jupyter/nbformat
diff --git a/dev-python/pdfrw/metadata.xml b/dev-python/pdfrw/metadata.xml
index fe2a825dbce0..d9e05d70094d 100644
--- a/dev-python/pdfrw/metadata.xml
+++ b/dev-python/pdfrw/metadata.xml
@@ -1,9 +1,9 @@
-
- python@gentoo.org
- Python
+
+ nerdboy@gentoo.org
+ Steve Arnold
diff --git a/dev-python/pdfrw/pdfrw-0.4_p1.ebuild b/dev-python/pdfrw/pdfrw-0.4_p1.ebuild
index 97423711ace0..43e32b1d00f4 100644
--- a/dev-python/pdfrw/pdfrw-0.4_p1.ebuild
+++ b/dev-python/pdfrw/pdfrw-0.4_p1.ebuild
@@ -21,7 +21,7 @@ else
SRC_URI="https://github.com/sarnold/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz
test? ( https://github.com/pmaupin/static_pdfs/archive/${PDFS_COMMIT}.tar.gz
-> pdfrw-static_pdfs-${PDFS_COMMIT}.tar.gz )"
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
S="${WORKDIR}/${MY_P}"
fi
diff --git a/dev-python/pip/pip-21.0.ebuild b/dev-python/pip/pip-21.0.ebuild
index ca2635d6f3eb..b9e8cec37390 100644
--- a/dev-python/pip/pip-21.0.ebuild
+++ b/dev-python/pip/pip-21.0.ebuild
@@ -29,7 +29,7 @@ SRC_URI="
# PyPI archive does not have tests, so we need to download from GitHub.
LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
SLOT="0"
IUSE="test -vanilla"
RESTRICT="!test? ( test )"
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index 1deb83a7fa27..0e66240e5472 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,9 +1,3 @@
-DIST prompt_toolkit-2.0.10.tar.gz 347981 BLAKE2B b95cf000d5249da3710f9b51f72d41c3d552f1d3a35dea5493f565f0f62998d890bf2b81b3376140a4d16a19f2c5fd60eb0cb5f2f58180c176ef1543c6fc4ec2 SHA512 b91292cf43607b3a7018ca29827f0aa9bc90efc064c68faffe02ad28e4bb60f45fc2d25bbfd9a40a383a815cb08596975f08237a498f94a5c088d56d3a0a9803
DIST prompt_toolkit-3.0.10.tar.gz 3020391 BLAKE2B 397ab28e5a362c84df7286be27be11acd4c6666bf77d63a1042cd76e6a4ee0b8002bad6166d858dfa6f07f8da41c6513c13fe2500b55da1dbc6562038ed974ef SHA512 71cdbe28064f28a2d88f369ee4550cc02b2609841b51d8fa7e8028304e77f34c6feed5d4549d62a3cbce27f95a4ebca1066a6fd869fbffa1799a3dedef2df6f4
-DIST prompt_toolkit-3.0.11.tar.gz 3024453 BLAKE2B 3e4b278797b1d55c35566d35ea08b3421df16942023952acfc1126bcdc2c4b2105d7e061951fc0fb995045437ea1168a0f3855f4b1450675da87d53a1e6e68af SHA512 d8f17aace8b54df0bcac101d062e207ed05ad305b1876bf1c0b926dd09ecec07f557dcab16f22f24fd9bc82902f4f85dc86ad797b542efa95b377b5d8f473423
-DIST prompt_toolkit-3.0.13.tar.gz 3024804 BLAKE2B 9e2db8742bd2bf64a662dbf2bf859b475a2b55213bb90dbee334deecde19a26d325713b9515b53b6e4e946020a7bd8263a391bcad738a3742d02e38bda4f2188 SHA512 d71671d3608e9d7600c5c846d215da829919dfec5fe2bb69615b2e6aaab2226c5c7fbb444eb31019d208b1f590f7ac29b5705d422b164eed0cb61802b90beb12
DIST prompt_toolkit-3.0.14.tar.gz 385647 BLAKE2B 08e4483846ba0e6cc69828840a0791e1b85a7db91718042e9a357741164183c0ccd241130c83b980b88884ba32bcb60714c7f920731aa6ca91186ed6f256bafe SHA512 7767861d9f6e5cf88b398420187e4b0a075aaa4645cd8c346db104101f89bbe7c0da2a6518c82066da5efa7376db5144451416ec7b12e92360972f8d4e25d018
-DIST prompt_toolkit-3.0.15.tar.gz 3027170 BLAKE2B c00c44310784ccb652f8130fb236605bb2fa7cec4c396ff842038e6e07667fb185cfb0b2b6df676c1a4472f35a14542252080429662c959712c2ec566bbfefa2 SHA512 a8e2078f01a5e4b5f50fbdd16a4aa98e34322460da64be416a127234736074ae851d2be62a19bc98064376f49afc24aef40e4d568c43e92a16d55e31e7551c71
DIST prompt_toolkit-3.0.16.tar.gz 3033157 BLAKE2B 6f21544701f956a1e9ec29d049750dc47a6e3861e33a0ccc1e407185ece967c692d3f868e670779dadef3cdf5ec72bd6477e1b3ebfeddd84c267db94efa33f22 SHA512 fd8ebf4ceb61fb823a13bf81ebd6864e817541d08d0744eec8968afe9a9d44bfa95031fe7c53accc81a1612253041e742957aee3718dd18c437d8c3e1b616f35
-DIST prompt_toolkit-3.0.7.tar.gz 3018359 BLAKE2B c1d1f897a422df599d2bfbbfc53851489bf9f41a7ddb57fb1a03cae8411a7468bd047423922a5e95dcdcfb2730dee38029bdaa15eb7dc92ff47066b4b6edc6cb SHA512 3ee4cf65f175343273eb2c1b76250b35430ac3f3ee7cc61bfbcca86a717fdaaf74c723dba400d872b47b06883bed959b166df33b8960173beb466edf9266ff43
-DIST prompt_toolkit-3.0.9.tar.gz 3019859 BLAKE2B ebde3bd1ecf0f24b98e4f3e173c0a885c47af4a30bc19ce50bdc01636cd095cb7b09f9aacf37fd5f33f92ad2e5adec7f94cc85d5a48264c186a3a7460ef04b7d SHA512 8e9777215b73e1076f82e9733963151bbc4248581298b0f996cc1700db2aa28eaef3fb1a07470706e7569021f5e47ad9bc3a9a93c976fa36b6979552afc522b7
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-2.0.10-r1.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-2.0.10-r1.ebuild
deleted file mode 100644
index f36f66f96974..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-2.0.10-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
-inherit distutils-r1
-
-DESCRIPTION="Building powerful interactive command lines in Python"
-HOMEPAGE="https://pypi.org/project/prompt_toolkit/ https://github.com/prompt-toolkit/python-prompt-toolkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.11.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.11.ebuild
deleted file mode 100644
index fe628251486f..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.11.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Building powerful interactive command lines in Python"
-HOMEPAGE="
- https://pypi.org/project/prompt-toolkit/
- https://github.com/prompt-toolkit/python-prompt-toolkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.13.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.13.ebuild
deleted file mode 100644
index fe628251486f..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.13.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Building powerful interactive command lines in Python"
-HOMEPAGE="
- https://pypi.org/project/prompt-toolkit/
- https://github.com/prompt-toolkit/python-prompt-toolkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.14.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.14.ebuild
index fe628251486f..8f045fd79e7b 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.14.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
IUSE=""
RDEPEND="
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.15.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.15.ebuild
deleted file mode 100644
index fe628251486f..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.15.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Building powerful interactive command lines in Python"
-HOMEPAGE="
- https://pypi.org/project/prompt-toolkit/
- https://github.com/prompt-toolkit/python-prompt-toolkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.7.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.7.ebuild
deleted file mode 100644
index 9c7616cb8e91..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Building powerful interactive command lines in Python"
-HOMEPAGE="https://pypi.org/project/prompt_toolkit/ https://github.com/prompt-toolkit/python-prompt-toolkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.9.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.9.ebuild
deleted file mode 100644
index fe628251486f..000000000000
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Building powerful interactive command lines in Python"
-HOMEPAGE="
- https://pypi.org/project/prompt-toolkit/
- https://github.com/prompt-toolkit/python-prompt-toolkit"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
- dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 6fe1839e516c..e6debd61e9af 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -1 +1,2 @@
DIST pyfakefs-4.3.3.tar.gz 194498 BLAKE2B 4ad300889e8c8462f4a237c2a12a9d93cbaaff6e9e6347e667bc366abf9705023eb1838c4291488c10a51d5209810c773edcb08c58e3759ccd9f851b17ea82e1 SHA512 e4cc3603496705216c1ea1448f835a19efa5a1429f3ecd67911ab2dc76d6754af7bb25312a6b15046355af26b8b72528acf68db50960d2eaba8bb3ef80fccaa0
+DIST pyfakefs-4.4.0.tar.gz 196236 BLAKE2B d19fb44320d9c7eab1e97ee4123da548f1e3b2f8f6b0e3be762b6228677fa165ed1b60364481c53f54e79e50a2f98d298e7ff6e65f40aa9c4e372a0f72e19d52 SHA512 774e5e213ee8ce17759cdeaa4ce1d70c43df25f0885c73c7e8aa923973a43f48d9fb19d45105a6a5c5d1c6a0c54c22fe4d80ec3ec92ac7cd97c50fb532af90bc
diff --git a/dev-python/pyfakefs/pyfakefs-4.4.0.ebuild b/dev-python/pyfakefs/pyfakefs-4.4.0.ebuild
new file mode 100644
index 000000000000..1d0bb7aebad8
--- /dev/null
+++ b/dev-python/pyfakefs/pyfakefs-4.4.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+DISTUTILS_IN_SOURCE_BUILD=1
+
+inherit distutils-r1
+
+DESCRIPTION="a fake file system that mocks the Python file system modules"
+HOMEPAGE="https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/"
+SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests pytest
+
+python_test() {
+ "${EPYTHON}" -m pyfakefs.tests.all_tests -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index e12fb77fb050..368a96d8db11 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -1,2 +1 @@
-DIST pytest-cov-2.11.0.tar.gz 59018 BLAKE2B f2ecaff439e701c3b7d029e4c51cb019d5222a083815ae5771341b0fa0f1b658f921a6eab75c0b568b630cc7ca75887f25ae7fb6fcaa9c2e8dc419397c4c799a SHA512 001f4975d7ad1a573354074366f983887ec9035bcc29afe9bd1ae2654fab520b8f479c5037936e6131749e5205077e937304e73d366cb43460db1f24a58b02be
DIST pytest-cov-2.11.1.tar.gz 59143 BLAKE2B 21aeffbc9ccbe6a7c69a08fe3f0013204eb039c6dc9ddbb364a74ad10764e16ce7be0154e27beaab2c8f9b2a972131c4c2421c4aa4557efc18318556056a421b SHA512 19c465f5972ee0ee3b9a2f1a656fdf5457622cb449f73a6f707d377a617807dadda997a6875f0c081bc4c4f7039559c6e7ce820b818db42dfd053c016e1c3b4e
diff --git a/dev-python/pytest-cov/pytest-cov-2.11.0.ebuild b/dev-python/pytest-cov/pytest-cov-2.11.0.ebuild
deleted file mode 100644
index 60cf89a6e397..000000000000
--- a/dev-python/pytest-cov/pytest-cov-2.11.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin for coverage reporting"
-HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-python/py-1.4.22[${PYTHON_USEDEP}]
- >=dev-python/pytest-3.6[${PYTHON_USEDEP}]
- >=dev-python/coverage-4.4[${PYTHON_USEDEP}]
-"
-# TODO: figure out how to make tests work without pytest-cov installed
-# first
-BDEPEND="
- test? (
- ~dev-python/pytest-cov-${PV}[${PYTHON_USEDEP}]
- dev-python/virtualenv[${PYTHON_USEDEP}]
- dev-python/fields[${PYTHON_USEDEP}]
- >=dev-python/process-tests-2.0.2[${PYTHON_USEDEP}]
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_sphinx docs \
- dev-python/sphinx-py3doc-enhanced-theme
-
-python_test() {
- local deselect=(
- # attempts to install packages via pip (network)
- tests/test_pytest_cov.py::test_dist_missing_data
- )
-
- pytest -vv ${deselect[@]/#/--deselect } || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/pytest-cov/pytest-cov-2.11.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.11.1.ebuild
index ae807ac41f7d..60cf89a6e397 100644
--- a/dev-python/pytest-cov/pytest-cov-2.11.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index e9e02d072008..32a370363cd8 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,5 +1,4 @@
DIST pytest-4.6.11.tar.gz 952305 BLAKE2B af07adf5e8fc614b1fdb7b5673fb9c557ff0dd3f22e2f3bf853c643c5c8bd38f307018579299b700d90034a826db73a3e569857d6d6f7ac6646ace894b35a39b SHA512 6fddf4944bd9fab83024aa2d338d54aaf3d164bd5c7f634357376f3b0d2dab6a43d784e7fb567236c2d2f029151c5d9e2cb36c22e9b551c2c8823c52a2246e9c
DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a6d3ebb71a6d9ed4fb4a4a21531e1b151ed0e4c5e56e5dd3243a1a272441f17c4c2c4e3b0b19c24654b74e8e52 SHA512 0a07d4f4f791969c6f21961a0ba0f8c6670e5870c6cc1cebf93766587bb9cb3e10db8e57f0bd33dd22b275f3aad7aa674949f124ac80e0ccca64e35be4beee4e
DIST pytest-6.1.2.tar.gz 1084943 BLAKE2B cbdf29c54118b5daf699f11fb674d37d5972a163a7a53f42f6ddf9224e2d8d9e84b9a88106d5a77e70f470ccbffb15c2cf9a939be69bc0a2cab1fc4c76054562 SHA512 6335e994c5273881c8d1c334fe6bfa9cd0a3e5c251f3d6a9332f7f7c1427e6560ff48d8f235b307ea5eb53491072daf30c41f566bb67b304354fd88d286c61b1
-DIST pytest-6.2.1.tar.gz 1102958 BLAKE2B 336757fe911e2bfa1041d7d9c1f83ce66418c55bbe0a1accdac45a36ed5ace972f124bc5f68d2847e3d310bcb2e68a8ced04c74e818ff6f1d43c3ba8b915332d SHA512 abd130212411e0a26265aec922958053e41d05d09d14942b75c1ba81d0ad7c5115d851110a257b32f0b05a2d515961ad068a1fd65f7e275cfe65d16150d008a6
DIST pytest-6.2.2.tar.gz 1116980 BLAKE2B 7e74050f01fdc4b1ba8a6d703915b0d707305e6e8299917fff8e0cedb873f998c9a904728b77e7234718016ccdac15d491d10411c582d1bfa60d2450a8a2fa7b SHA512 a81def83759c550c169b3db8ed43b4df40433a88acb663e2e9422ef562149ed52041724b7f3cc5d0d6b532f2243a8d9a9614ffbcd87ed571f7fdde7f036c2297
diff --git a/dev-python/pytest/pytest-6.2.1.ebuild b/dev-python/pytest/pytest-6.2.1.ebuild
deleted file mode 100644
index 6435b7e7e8df..000000000000
--- a/dev-python/pytest/pytest-6.2.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Simple powerful testing with Python"
-HOMEPAGE="https://pytest.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/importlib_metadata[${PYTHON_USEDEP}]
- ' python3_{6,7} pypy3)
- dev-python/iniconfig[${PYTHON_USEDEP}]
- >=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
- dev-python/packaging[${PYTHON_USEDEP}]
- >=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
- =dev-python/py-1.8.2[${PYTHON_USEDEP}]
- dev-python/toml[${PYTHON_USEDEP}]
-"
-# flake cause a number of tests to fail
-DEPEND="
- >=dev-python/setuptools_scm-3.4[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- dev-python/argcomplete[${PYTHON_USEDEP}]
- >=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/xmlschema[${PYTHON_USEDEP}]
- !!dev-python/flaky
- )"
-
-python_prepare_all() {
- # fragile to warnings from other packages (setuptools)
- # little value for us to run it
- sed -i -e 's:test_no_warnings:_&:' \
- testing/test_meta.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- distutils_install_for_testing --via-root
-
- "${EPYTHON}" -m pytest -vv --lsof -rfsxX ||
- die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pytest/pytest-6.2.2.ebuild b/dev-python/pytest/pytest-6.2.2.ebuild
index 173f3694ca7a..68c99e5b183b 100644
--- a/dev-python/pytest/pytest-6.2.2.ebuild
+++ b/dev-python/pytest/pytest-6.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/python-libevdev/python-libevdev-0.9.ebuild b/dev-python/python-libevdev/python-libevdev-0.9.ebuild
index 1b49c5bbfdac..acd5b88324f3 100644
--- a/dev-python/python-libevdev/python-libevdev-0.9.ebuild
+++ b/dev-python/python-libevdev/python-libevdev-0.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/libevdev/${PN}/-/archive/${PV}/${P}.tar.
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/python-sshpubkeys/metadata.xml b/dev-python/python-sshpubkeys/metadata.xml
index c773e85856d7..f19fc76eae25 100644
--- a/dev-python/python-sshpubkeys/metadata.xml
+++ b/dev-python/python-sshpubkeys/metadata.xml
@@ -9,6 +9,7 @@
python@gentoo.org
Python
+
sshpubkeys
ojarva/python-sshpubkeys
diff --git a/dev-python/reportlab/reportlab-3.5.60.ebuild b/dev-python/reportlab/reportlab-3.5.60.ebuild
index 715b36b555d2..c3ce5b6e6141 100644
--- a/dev-python/reportlab/reportlab-3.5.60.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.60.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/rsa/Manifest b/dev-python/rsa/Manifest
index cd9c4a74b8df..62fa1a28a7ca 100644
--- a/dev-python/rsa/Manifest
+++ b/dev-python/rsa/Manifest
@@ -1,2 +1,3 @@
DIST python-rsa-version-4.7.1.gh.tar.gz 65085 BLAKE2B e63200a7861f13177d042ae92dbb9f8eb4ba3c30174e21b12cb4d84d9a39d3cbb59d6dacec5d4e3d2375ca100bf48c12dabff3f90011f3a3c795ece9e863893f SHA512 f06eee5d6e72c11cdf68ee756ffef7fd9d002ee93939158593ee6d0b5cf1abbfad31c50f6cfd4676d9f64247faee6019d8b214d22324706c82d07068f55ebd94
+DIST python-rsa-version-4.7.2.gh.tar.gz 65177 BLAKE2B 513d6f346813d6bc67de23ee419d70f310155303df40174d47343786f735e00446d8874f51fdea0d7dc890bc8986bb2861746328d7200e8704197adde99d68ad SHA512 4ab64868be00b74b64931453f684bc7f68cfea92cee651e957411e4dc5084e5f8e300fda01cf5187df2f3b455ea40d233488a2e777c9d669d457f67325b420f0
DIST python-rsa-version-4.7.gh.tar.gz 64870 BLAKE2B 1e8c8c1a2c4261fdfacf5c83a76b0828dd2fabd26c0a76c0d39e7043a3005058e74a50c1d8f6ed705f5a47ab5d7c077587061ff097cad87424a2e82a8b478b3f SHA512 a88c8f04860e8babe762eb70e6096c55fbb4bbde43525564ecc719f5e6c56fdb65fa7b82a907c6de529a8effea26b1f6f8ffa3440dab99bff97664f7ce5fe31a
diff --git a/dev-python/rsa/rsa-4.7.2.ebuild b/dev-python/rsa/rsa-4.7.2.ebuild
new file mode 100644
index 000000000000..32aff8b85fb7
--- /dev/null
+++ b/dev-python/rsa/rsa-4.7.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_P=python-rsa-version-${PV}
+DESCRIPTION="Pure-Python RSA implementation"
+HOMEPAGE="
+ https://stuvel.eu/rsa/
+ https://pypi.org/project/rsa/"
+SRC_URI="
+ https://github.com/sybrenstuvel/python-rsa/archive/version-${PV}.tar.gz
+ -> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+ >=dev-python/pyasn1-0.1.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+ rm tests/test_mypy.py || die
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/setproctitle/setproctitle-1.2.2.ebuild b/dev-python/setproctitle/setproctitle-1.2.2.ebuild
index 81bb11e0f58d..663d55dc4eee 100644
--- a/dev-python/setproctitle/setproctitle-1.2.2.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.2.2.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
distutils_enable_tests pytest
diff --git a/dev-python/snowballstemmer/Manifest b/dev-python/snowballstemmer/Manifest
index dc789cacfa23..30729daa62f8 100644
--- a/dev-python/snowballstemmer/Manifest
+++ b/dev-python/snowballstemmer/Manifest
@@ -1,2 +1 @@
-DIST snowballstemmer-2.0.0.tar.gz 79284 BLAKE2B 2d9b5de8493ca8833b3b52b143e1f56b40a87cbde3f182793edc3ecfa8b3577c9ab506c19aa93870b3e03b5d86a62fb515b2df0bc616d4d88b4b9894ecde174e SHA512 d673205cacc7f6e81eaee23e6c50064af77c3c4464dbdf5dc1c3f5682dec2688fe6e7069b7ed2e59259312ba926d3be84bd846a132b6138e30b4ff2b9a9353e8
DIST snowballstemmer-2.1.0.tar.gz 85674 BLAKE2B 3301e3f799fa61a679b88efc87b3d019231ae7172172f136eb7e1bdfb40d054489aaa29ca1b8b2a04d8260a82ef7f4a8da75a9784f69942aac57ccfcc4983e5b SHA512 e0550d3389074d7686d26397ff2289519cd8b26cf7090fe781d6407d1c2b95f912347d70cd25e02d6016c454ad6c5cf6d648e54ef87161328ac57bc1ceaf7826
diff --git a/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild b/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
deleted file mode 100644
index c04bc14ab321..000000000000
--- a/dev-python/snowballstemmer/snowballstemmer-2.0.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Stemmer algorithms generated from Snowball algorithms"
-HOMEPAGE="https://snowballstem.org/
- https://github.com/snowballstem/snowball
- https://pypi.org/project/snowballstemmer/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-python/snowballstemmer/snowballstemmer-2.1.0.ebuild b/dev-python/snowballstemmer/snowballstemmer-2.1.0.ebuild
index 75c0271af099..2da4295832ff 100644
--- a/dev-python/snowballstemmer/snowballstemmer-2.1.0.ebuild
+++ b/dev-python/snowballstemmer/snowballstemmer-2.1.0.ebuild
@@ -14,4 +14,4 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos ~x64-solaris"
diff --git a/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0.ebuild b/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0.ebuild
index 29a90a74b6ba..78ade22f2821 100644
--- a/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0.ebuild
+++ b/dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="https://gitlab.com/lv2/${PN}/-/archive/v${PV}/{PN}-v${PV}.tar.gz"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
S="${WORKDIR}/${PN}-v${PV}-${COMMIT}"
diff --git a/dev-python/tree-sitter/Manifest b/dev-python/tree-sitter/Manifest
index d0fae368df6d..c16f2368fff3 100644
--- a/dev-python/tree-sitter/Manifest
+++ b/dev-python/tree-sitter/Manifest
@@ -1,2 +1,3 @@
DIST tree_sitter-0.2.0.tar.gz 110387 BLAKE2B 62bd0cac84626738c051a16a6e1d8bf18985850e9c0174794d060e09f289edcf5e6183da28ab3805713b7d55d63c2210cc0e53d022689b46a3770243acf08937 SHA512 1b5c1dd8855de00357b5e8fc9dc3cb826c1cd10bec499b2db26f50fe2249a9848e1641765ee9717c8eae88b8d091f0de79cdfabafdecbe8e666a05f63fefe4ba
DIST tree_sitter-0.2.1.tar.gz 110417 BLAKE2B 263f47b9c8beab4b99fbfeb40521467f7f507ead77b20eb1bea7d6f076398d4f0db02299290a552aaa35959dff4a87866d010d628269e64cebeb06d86856fdc6 SHA512 72fd602689a78f51184820fb15891863873f8b290811152ea568cfa6fbd2d3f182ae8627f028c8d485d0e9bbe7b81a9d6ed57e7a8b551ba38f8dd738fb7c858a
+DIST tree_sitter-0.2.2.tar.gz 110585 BLAKE2B 2798469b65bdc2447697797f937242dcfd2fe0dbb0afa7a41fe05463ec6c93afa63b26ee4e3e65585b57a2592ac444c2522469472cb0562f313f1261c358e5b3 SHA512 b32d7e3be408eedf52b53a5ae7613b3c423eb84d175d0fb31d63c052c2c4d3a7539b53d45276629a2a02c460289e877efa519c2055cdee477e23fe50cc452892
diff --git a/dev-python/tree-sitter/tree-sitter-0.2.1.ebuild b/dev-python/tree-sitter/tree-sitter-0.2.1.ebuild
index e9a8bfb79818..9f91d8ee2512 100644
--- a/dev-python/tree-sitter/tree-sitter-0.2.1.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.2.1.ebuild
@@ -15,6 +15,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/tree-sitter/tree-sitter-0.2.2.ebuild b/dev-python/tree-sitter/tree-sitter-0.2.2.ebuild
new file mode 100644
index 000000000000..9f91d8ee2512
--- /dev/null
+++ b/dev-python/tree-sitter/tree-sitter-0.2.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python bindings to the Tree-sitter parsing library"
+HOMEPAGE="https://github.com/tree-sitter/py-tree-sitter"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 0342bd00440e..3ad94bb924a1 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/cmake/cmake-3.18.5.ebuild b/dev-util/cmake/cmake-3.18.5.ebuild
index 2f725e7349b3..49e1a051d670 100644
--- a/dev-util/cmake/cmake-3.18.5.ebuild
+++ b/dev-util/cmake/cmake-3.18.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
LICENSE="CMake"
SLOT="0"
[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs ncurses qt5 test"
RESTRICT="!test? ( test )"
diff --git a/dev-util/colm/colm-0.14.7.ebuild b/dev-util/colm/colm-0.14.7.ebuild
index 860e6fa71be2..00f792d0d8cd 100644
--- a/dev-util/colm/colm-0.14.7.ebuild
+++ b/dev-util/colm/colm-0.14.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="doc"
BDEPEND="
diff --git a/dev-util/cppunit/cppunit-1.15.1-r2.ebuild b/dev-util/cppunit/cppunit-1.15.1-r2.ebuild
index 09eb8d15a46b..f6e7eeb07c61 100644
--- a/dev-util/cppunit/cppunit-1.15.1-r2.ebuild
+++ b/dev-util/cppunit/cppunit-1.15.1-r2.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/cppunit.git"
else
SRC_URI="https://dev-www.libreoffice.org/src/${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
fi
LICENSE="LGPL-2.1"
SLOT="0/1.15"
diff --git a/dev-util/github-cli/Manifest b/dev-util/github-cli/Manifest
index a8b008b07716..dda6442b841d 100644
--- a/dev-util/github-cli/Manifest
+++ b/dev-util/github-cli/Manifest
@@ -13,6 +13,7 @@ DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.0.0.mod 374 BLAKE2B 4fef9f7da9f23
DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
DIST github-cli-1.4.0.tar.gz 386950 BLAKE2B 68126e45886e1bc38ac6c3a541e52f69299a6e12f1b6c5baafa6d5c3fbf5be8c30854b5c85294de6b50dd6bfe9e12262758a4751aad1aa4f310206ac10d4cf2f SHA512 cac1675bef1bcf749c87cb1d196fe687e32b304d73e16d4fc21dc4f429d18d4c04aa00be713a6b76e1261df565ecb589b8cf2ad322e4f7d49ea102369c5bf644
DIST github-cli-1.5.0.tar.gz 396453 BLAKE2B 728939040d263bea4a623571d03589628f69bf3887b0bd79da14d36da8fa515c1d646c00b2aff154685369d0e1a4ea5b16ed788f4989addff28af233568f3208 SHA512 a75bf4ea913310f097dc158a1b8ce73453402af0647d918007afe7fa05cb5dbf1bdff1f4dfc4b4b0a301d68ed447428088e956fbcbc755ea9396ffb6cb77152c
+DIST github-cli-1.6.2.tar.gz 419795 BLAKE2B cd34782f2afccc976487082532a15e9c9ca6ff0d12b89469e4234290a62e98d1207f111e51a8d7cef2a4ae926046b1705e59cf7e95364fd0981357f79f6004c9 SHA512 5aed724fe508d118c35d5efd089b1d0b7a220ed4713567fff528c692c402a8ee5245aef62fd8f219bead5e2d55dc92f9f2ca60e2c048e43c04dd48f125cf56d7
DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.3.mod 719 BLAKE2B d95afef5c101e842eb6754ce837753f0d953c76546b5cfa0a25b672e42db57b78e7fcf9fbc48dab261301c448a811818f53aabb251edf6cb209adf196a5cc0a8 SHA512 11355981fa0cc2c28a274175a123c7a3ac5dab596ea08faa429da137611bcfacfa15b38110943b520a99565776039f2c48c5474eade25aa64b8eb5a3fdb3f098
DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.3.zip 154742 BLAKE2B 1eb9644a4458d70e3d0ca66969cd4c50ee3ac3ec89a3840a0168d703fb4d716cdbdc703e07b9c60775220dfda3d48791d7410484314b7263f231155d51ec0d1b SHA512 765d4137f91984faf60380e9a67726cc679c26dcf421445b932aa18db9f2b29ef9c58d69c3cdbb97c3f1703fb880152d53c6eeafb639392a35218afc6491d8aa
DIST github.com%2F!alec!aivazis%2Fsurvey%2Fv2%2F@v%2Fv2.2.7.mod 707 BLAKE2B 3f7da997d7cb7e3ed2426497741ee7b4517adb66588f268b095f9abe4ab12842a5e14df940a1b89d1e5514c0c377a0a71e5460ab22073a1639c6dbed892fe8fc SHA512 6f0c6aa88ce38abfa9bce0992b75b8ef5a2f58c743bc96ef49b8a97d7e04ad7071c0f63f65c3ff82e5014df91d383f5ab84a2c0ac8e54739048de9aede5443c5
@@ -336,6 +337,7 @@ DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod 25 BLAK
DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
+DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip 25620 BLAKE2B 770b7dc9bdd8999123fb58cfd951dcbd5592172fd394f1a70abc918e3d7adee5273da1c757f95be15a0ede27f4fd00804564828251ab308d6fc4b116415ac144 SHA512 5a9db9d294b5f2121f3de994da38161f013a0512ad64aaf51f1c7a94b7cdb1ec4102f7c457d29f9bde209e8c254f6ad034c294af3649dbd10d5349c05874f74c
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
diff --git a/dev-util/github-cli/github-cli-1.6.2.ebuild b/dev-util/github-cli/github-cli-1.6.2.ebuild
new file mode 100644
index 000000000000..ae5398409433
--- /dev/null
+++ b/dev-util/github-cli/github-cli-1.6.2.ebuild
@@ -0,0 +1,494 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="GitHub CLI"
+HOMEPAGE="https://github.com/cli/cli"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/cli/cli.git"
+else
+EGO_SUM=(
+ "cloud.google.com/go v0.26.0/go.mod"
+ "cloud.google.com/go v0.34.0/go.mod"
+ "cloud.google.com/go v0.38.0/go.mod"
+ "cloud.google.com/go v0.44.1/go.mod"
+ "cloud.google.com/go v0.44.2/go.mod"
+ "cloud.google.com/go v0.45.1/go.mod"
+ "cloud.google.com/go v0.46.3/go.mod"
+ "cloud.google.com/go/bigquery v1.0.1/go.mod"
+ "cloud.google.com/go/datastore v1.0.0/go.mod"
+ "cloud.google.com/go/firestore v1.1.0/go.mod"
+ "cloud.google.com/go/pubsub v1.0.1/go.mod"
+ "cloud.google.com/go/storage v1.0.0/go.mod"
+ "dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+ "github.com/AlecAivazis/survey/v2 v2.2.7"
+ "github.com/AlecAivazis/survey/v2 v2.2.7/go.mod"
+ "github.com/BurntSushi/toml v0.3.1"
+ "github.com/BurntSushi/toml v0.3.1/go.mod"
+ "github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+ "github.com/MakeNowJust/heredoc v1.0.0"
+ "github.com/MakeNowJust/heredoc v1.0.0/go.mod"
+ "github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8"
+ "github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod"
+ "github.com/OneOfOne/xxhash v1.2.2/go.mod"
+ "github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38"
+ "github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod"
+ "github.com/alecthomas/chroma v0.7.3"
+ "github.com/alecthomas/chroma v0.7.3/go.mod"
+ "github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721"
+ "github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod"
+ "github.com/alecthomas/kong v0.2.4/go.mod"
+ "github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897"
+ "github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/go.mod"
+ "github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
+ "github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
+ "github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+ "github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+ "github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+ "github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+ "github.com/beorn7/perks v1.0.0/go.mod"
+ "github.com/bgentry/speakeasy v0.1.0/go.mod"
+ "github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod"
+ "github.com/briandowns/spinner v1.11.1"
+ "github.com/briandowns/spinner v1.11.1/go.mod"
+ "github.com/cespare/xxhash v1.1.0/go.mod"
+ "github.com/charmbracelet/glamour v0.2.1-0.20200724174618-1246d13c1684"
+ "github.com/charmbracelet/glamour v0.2.1-0.20200724174618-1246d13c1684/go.mod"
+ "github.com/cli/browser v1.0.0"
+ "github.com/cli/browser v1.0.0/go.mod"
+ "github.com/cli/oauth v0.8.0"
+ "github.com/cli/oauth v0.8.0/go.mod"
+ "github.com/cli/safeexec v1.0.0"
+ "github.com/cli/safeexec v1.0.0/go.mod"
+ "github.com/cli/shurcooL-graphql v0.0.0-20200707151639-0f7232a2bf7e"
+ "github.com/cli/shurcooL-graphql v0.0.0-20200707151639-0f7232a2bf7e/go.mod"
+ "github.com/client9/misspell v0.3.4/go.mod"
+ "github.com/coreos/bbolt v1.3.2/go.mod"
+ "github.com/coreos/etcd v3.3.13+incompatible/go.mod"
+ "github.com/coreos/go-semver v0.3.0/go.mod"
+ "github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+ "github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+ "github.com/cpuguy83/go-md2man/v2 v2.0.0"
+ "github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+ "github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964"
+ "github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/go.mod"
+ "github.com/davecgh/go-spew v1.1.0/go.mod"
+ "github.com/davecgh/go-spew v1.1.1"
+ "github.com/davecgh/go-spew v1.1.1/go.mod"
+ "github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+ "github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+ "github.com/dlclark/regexp2 v1.2.0"
+ "github.com/dlclark/regexp2 v1.2.0/go.mod"
+ "github.com/enescakir/emoji v1.0.0"
+ "github.com/enescakir/emoji v1.0.0/go.mod"
+ "github.com/fatih/color v1.7.0"
+ "github.com/fatih/color v1.7.0/go.mod"
+ "github.com/fsnotify/fsnotify v1.4.7/go.mod"
+ "github.com/ghodss/yaml v1.0.0/go.mod"
+ "github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+ "github.com/go-kit/kit v0.8.0/go.mod"
+ "github.com/go-logfmt/logfmt v0.3.0/go.mod"
+ "github.com/go-logfmt/logfmt v0.4.0/go.mod"
+ "github.com/go-stack/stack v1.8.0/go.mod"
+ "github.com/gogo/protobuf v1.1.1/go.mod"
+ "github.com/gogo/protobuf v1.2.1/go.mod"
+ "github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+ "github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+ "github.com/golang/mock v1.1.1/go.mod"
+ "github.com/golang/mock v1.2.0/go.mod"
+ "github.com/golang/mock v1.3.1/go.mod"
+ "github.com/golang/protobuf v1.2.0/go.mod"
+ "github.com/golang/protobuf v1.3.1"
+ "github.com/golang/protobuf v1.3.1/go.mod"
+ "github.com/golang/protobuf v1.3.2"
+ "github.com/golang/protobuf v1.3.2/go.mod"
+ "github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+ "github.com/google/btree v1.0.0/go.mod"
+ "github.com/google/go-cmp v0.2.0"
+ "github.com/google/go-cmp v0.2.0/go.mod"
+ "github.com/google/go-cmp v0.3.0/go.mod"
+ "github.com/google/go-cmp v0.5.2"
+ "github.com/google/go-cmp v0.5.2/go.mod"
+ "github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f"
+ "github.com/google/goterm v0.0.0-20190703233501-fc88cf888a3f/go.mod"
+ "github.com/google/martian v2.1.0+incompatible/go.mod"
+ "github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+ "github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+ "github.com/google/renameio v0.1.0/go.mod"
+ "github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510"
+ "github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod"
+ "github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+ "github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+ "github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+ "github.com/gorilla/websocket v1.4.2/go.mod"
+ "github.com/graph-gophers/graphql-go v0.0.0-20200622220639-c1d9693c95a6/go.mod"
+ "github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+ "github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
+ "github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod"
+ "github.com/hashicorp/consul/api v1.1.0/go.mod"
+ "github.com/hashicorp/consul/sdk v0.1.1/go.mod"
+ "github.com/hashicorp/errwrap v1.0.0/go.mod"
+ "github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+ "github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+ "github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+ "github.com/hashicorp/go-multierror v1.0.0/go.mod"
+ "github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+ "github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+ "github.com/hashicorp/go-syslog v1.0.0/go.mod"
+ "github.com/hashicorp/go-uuid v1.0.0/go.mod"
+ "github.com/hashicorp/go-uuid v1.0.1/go.mod"
+ "github.com/hashicorp/go-version v1.2.1"
+ "github.com/hashicorp/go-version v1.2.1/go.mod"
+ "github.com/hashicorp/go.net v0.0.1/go.mod"
+ "github.com/hashicorp/golang-lru v0.5.0/go.mod"
+ "github.com/hashicorp/golang-lru v0.5.1/go.mod"
+ "github.com/hashicorp/hcl v1.0.0/go.mod"
+ "github.com/hashicorp/logutils v1.0.0/go.mod"
+ "github.com/hashicorp/mdns v1.0.0/go.mod"
+ "github.com/hashicorp/memberlist v0.1.3/go.mod"
+ "github.com/hashicorp/serf v0.8.2/go.mod"
+ "github.com/henvic/httpretty v0.0.6"
+ "github.com/henvic/httpretty v0.0.6/go.mod"
+ "github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174"
+ "github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod"
+ "github.com/inconshreveable/mousetrap v1.0.0"
+ "github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+ "github.com/jonboulle/clockwork v0.1.0/go.mod"
+ "github.com/json-iterator/go v1.1.6/go.mod"
+ "github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+ "github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+ "github.com/julienschmidt/httprouter v1.2.0/go.mod"
+ "github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51"
+ "github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod"
+ "github.com/kisielk/errcheck v1.1.0/go.mod"
+ "github.com/kisielk/gotool v1.0.0/go.mod"
+ "github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+ "github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+ "github.com/kr/pretty v0.1.0"
+ "github.com/kr/pretty v0.1.0/go.mod"
+ "github.com/kr/pty v1.1.1/go.mod"
+ "github.com/kr/pty v1.1.4"
+ "github.com/kr/pty v1.1.4/go.mod"
+ "github.com/kr/text v0.1.0"
+ "github.com/kr/text v0.1.0/go.mod"
+ "github.com/lucasb-eyer/go-colorful v1.0.3"
+ "github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
+ "github.com/magiconair/properties v1.8.1/go.mod"
+ "github.com/mattn/go-colorable v0.0.9/go.mod"
+ "github.com/mattn/go-colorable v0.1.2"
+ "github.com/mattn/go-colorable v0.1.2/go.mod"
+ "github.com/mattn/go-colorable v0.1.6"
+ "github.com/mattn/go-colorable v0.1.6/go.mod"
+ "github.com/mattn/go-colorable v0.1.8"
+ "github.com/mattn/go-colorable v0.1.8/go.mod"
+ "github.com/mattn/go-isatty v0.0.3/go.mod"
+ "github.com/mattn/go-isatty v0.0.8/go.mod"
+ "github.com/mattn/go-isatty v0.0.12"
+ "github.com/mattn/go-isatty v0.0.12/go.mod"
+ "github.com/mattn/go-runewidth v0.0.7"
+ "github.com/mattn/go-runewidth v0.0.7/go.mod"
+ "github.com/mattn/go-runewidth v0.0.9"
+ "github.com/mattn/go-runewidth v0.0.9/go.mod"
+ "github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
+ "github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b"
+ "github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod"
+ "github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d"
+ "github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod"
+ "github.com/microcosm-cc/bluemonday v1.0.2"
+ "github.com/microcosm-cc/bluemonday v1.0.2/go.mod"
+ "github.com/miekg/dns v1.0.14/go.mod"
+ "github.com/mitchellh/cli v1.0.0/go.mod"
+ "github.com/mitchellh/go-homedir v1.0.0/go.mod"
+ "github.com/mitchellh/go-homedir v1.1.0"
+ "github.com/mitchellh/go-homedir v1.1.0/go.mod"
+ "github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
+ "github.com/mitchellh/gox v0.4.0/go.mod"
+ "github.com/mitchellh/iochan v1.0.0/go.mod"
+ "github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+ "github.com/mitchellh/mapstructure v1.1.2/go.mod"
+ "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
+ "github.com/modern-go/reflect2 v1.0.1/go.mod"
+ "github.com/muesli/reflow v0.1.0"
+ "github.com/muesli/reflow v0.1.0/go.mod"
+ "github.com/muesli/termenv v0.6.0"
+ "github.com/muesli/termenv v0.6.0/go.mod"
+ "github.com/muesli/termenv v0.7.4"
+ "github.com/muesli/termenv v0.7.4/go.mod"
+ "github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+ "github.com/oklog/ulid v1.3.1/go.mod"
+ "github.com/olekukonko/tablewriter v0.0.4"
+ "github.com/olekukonko/tablewriter v0.0.4/go.mod"
+ "github.com/opentracing/opentracing-go v1.1.0/go.mod"
+ "github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+ "github.com/pelletier/go-toml v1.2.0/go.mod"
+ "github.com/pkg/errors v0.8.0/go.mod"
+ "github.com/pkg/errors v0.8.1"
+ "github.com/pkg/errors v0.8.1/go.mod"
+ "github.com/pkg/errors v0.9.1/go.mod"
+ "github.com/pmezard/go-difflib v1.0.0"
+ "github.com/pmezard/go-difflib v1.0.0/go.mod"
+ "github.com/posener/complete v1.1.1/go.mod"
+ "github.com/prometheus/client_golang v0.9.1/go.mod"
+ "github.com/prometheus/client_golang v0.9.3/go.mod"
+ "github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+ "github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+ "github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+ "github.com/prometheus/common v0.4.0/go.mod"
+ "github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+ "github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod"
+ "github.com/prometheus/tsdb v0.7.1/go.mod"
+ "github.com/rivo/uniseg v0.1.0"
+ "github.com/rivo/uniseg v0.1.0/go.mod"
+ "github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+ "github.com/rogpeppe/go-internal v1.3.0/go.mod"
+ "github.com/russross/blackfriday/v2 v2.0.1"
+ "github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+ "github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
+ "github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
+ "github.com/sergi/go-diff v1.0.0"
+ "github.com/sergi/go-diff v1.0.0/go.mod"
+ "github.com/shurcooL/githubv4 v0.0.0-20200928013246-d292edc3691b"
+ "github.com/shurcooL/githubv4 v0.0.0-20200928013246-d292edc3691b/go.mod"
+ "github.com/shurcooL/sanitized_anchor_name v1.0.0"
+ "github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+ "github.com/sirupsen/logrus v1.2.0/go.mod"
+ "github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+ "github.com/smartystreets/goconvey v1.6.4/go.mod"
+ "github.com/soheilhy/cmux v0.1.4/go.mod"
+ "github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+ "github.com/spf13/afero v1.1.2/go.mod"
+ "github.com/spf13/cast v1.3.0/go.mod"
+ "github.com/spf13/cobra v1.1.1"
+ "github.com/spf13/cobra v1.1.1/go.mod"
+ "github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+ "github.com/spf13/pflag v1.0.3"
+ "github.com/spf13/pflag v1.0.3/go.mod"
+ "github.com/spf13/pflag v1.0.5"
+ "github.com/spf13/pflag v1.0.5/go.mod"
+ "github.com/spf13/viper v1.7.0/go.mod"
+ "github.com/stretchr/objx v0.1.0/go.mod"
+ "github.com/stretchr/objx v0.1.1"
+ "github.com/stretchr/objx v0.1.1/go.mod"
+ "github.com/stretchr/testify v1.2.1/go.mod"
+ "github.com/stretchr/testify v1.2.2/go.mod"
+ "github.com/stretchr/testify v1.3.0"
+ "github.com/stretchr/testify v1.3.0/go.mod"
+ "github.com/stretchr/testify v1.6.1"
+ "github.com/stretchr/testify v1.6.1/go.mod"
+ "github.com/subosito/gotenv v1.2.0/go.mod"
+ "github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+ "github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+ "github.com/yuin/goldmark v1.2.0"
+ "github.com/yuin/goldmark v1.2.0/go.mod"
+ "go.etcd.io/bbolt v1.3.2/go.mod"
+ "go.opencensus.io v0.21.0/go.mod"
+ "go.opencensus.io v0.22.0/go.mod"
+ "go.uber.org/atomic v1.4.0/go.mod"
+ "go.uber.org/multierr v1.1.0/go.mod"
+ "go.uber.org/zap v1.10.0/go.mod"
+ "golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+ "golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+ "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+ "golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+ "golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5"
+ "golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod"
+ "golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+ "golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
+ "golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+ "golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897"
+ "golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod"
+ "golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+ "golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+ "golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+ "golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+ "golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+ "golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+ "golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+ "golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+ "golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+ "golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+ "golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+ "golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+ "golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+ "golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+ "golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+ "golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+ "golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+ "golang.org/x/mod v0.1.0/go.mod"
+ "golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+ "golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+ "golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
+ "golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+ "golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+ "golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+ "golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+ "golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+ "golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+ "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3"
+ "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+ "golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+ "golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+ "golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+ "golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+ "golang.org/x/net v0.0.0-20200707034311-ab3426394381"
+ "golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be"
+ "golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+ "golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45"
+ "golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+ "golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+ "golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+ "golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+ "golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+ "golang.org/x/sync v0.0.0-20190423024810-112230192c58"
+ "golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+ "golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
+ "golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+ "golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+ "golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+ "golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+ "golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+ "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+ "golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+ "golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+ "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+ "golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+ "golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+ "golang.org/x/sys v0.0.0-20190530182044-ad28b68e88f1/go.mod"
+ "golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+ "golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+ "golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+ "golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae"
+ "golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+ "golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
+ "golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+ "golang.org/x/sys v0.0.0-20200413165638-669c56c373c4"
+ "golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod"
+ "golang.org/x/text v0.3.0"
+ "golang.org/x/text v0.3.0/go.mod"
+ "golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+ "golang.org/x/text v0.3.2/go.mod"
+ "golang.org/x/text v0.3.4"
+ "golang.org/x/text v0.3.4/go.mod"
+ "golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+ "golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+ "golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+ "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+ "golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+ "golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+ "golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+ "golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+ "golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+ "golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+ "golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+ "golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+ "golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+ "golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+ "golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+ "golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+ "golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+ "golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+ "golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod"
+ "golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+ "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
+ "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+ "google.golang.org/api v0.4.0/go.mod"
+ "google.golang.org/api v0.7.0/go.mod"
+ "google.golang.org/api v0.8.0/go.mod"
+ "google.golang.org/api v0.9.0/go.mod"
+ "google.golang.org/api v0.13.0/go.mod"
+ "google.golang.org/appengine v1.1.0"
+ "google.golang.org/appengine v1.1.0/go.mod"
+ "google.golang.org/appengine v1.4.0/go.mod"
+ "google.golang.org/appengine v1.5.0/go.mod"
+ "google.golang.org/appengine v1.6.1"
+ "google.golang.org/appengine v1.6.1/go.mod"
+ "google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+ "google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+ "google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+ "google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+ "google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+ "google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+ "google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+ "google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+ "google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+ "google.golang.org/grpc v1.19.0/go.mod"
+ "google.golang.org/grpc v1.20.1/go.mod"
+ "google.golang.org/grpc v1.21.1/go.mod"
+ "gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
+ "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405"
+ "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+ "gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
+ "gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+ "gopkg.in/errgo.v2 v2.1.0/go.mod"
+ "gopkg.in/ini.v1 v1.51.0/go.mod"
+ "gopkg.in/resty.v1 v1.12.0/go.mod"
+ "gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+ "gopkg.in/yaml.v2 v2.2.1/go.mod"
+ "gopkg.in/yaml.v2 v2.2.4/go.mod"
+ "gopkg.in/yaml.v2 v2.2.8"
+ "gopkg.in/yaml.v2 v2.2.8/go.mod"
+ "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+ "gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776"
+ "gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod"
+ "honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+ "honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+ "honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+ "honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+ "rsc.io/binaryregexp v0.2.0/go.mod"
+ )
+go-module_set_globals
+ SRC_URI="https://github.com/cli/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ ${EGO_SUM_SRC_URI}"
+ KEYWORDS="~amd64"
+ S="${WORKDIR}/cli-${PV}"
+fi
+
+LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0"
+SLOT="0"
+
+RDEPEND=">=dev-vcs/git-1.7.3"
+
+RESTRICT+=" test "
+
+src_unpack() {
+ if [[ ${PV} == *9999 ]]; then
+ git-r3_src_unpack
+ go-module_live_vendor
+ else
+ go-module_src_unpack
+ fi
+}
+
+src_compile() {
+ [[ ${PV} == *9999 ]] || export GH_VERSION="v${PV}"
+ # Go LDFLAGS are not the same as GCC/Binutils LDFLAGS
+ unset LDFLAGS
+ # Once we set up cross compiling, this line will need to be adjusted
+ # to compile for the target.
+ # Everything else in this function happens on the host.
+ emake
+
+ einfo "Building man pages"
+ emake manpages
+
+ einfo "Building completions"
+ go run ./cmd/gh completion -s bash > gh.bash-completion || die
+ go run ./cmd/gh completion -s zsh > gh.zsh-completion || die
+}
+
+src_install() {
+ dobin bin/gh
+ dodoc README.md
+
+ doman share/man/man?/gh*.?
+
+ newbashcomp gh.bash-completion gh
+ insinto /usr/share/zsh/site-functions
+ newins gh.zsh-completion _gh
+}
diff --git a/dev-util/lldb/lldb-11.0.1.ebuild b/dev-util/lldb/lldb-11.0.1.ebuild
index 4b257fa26775..f54a9b588a20 100644
--- a/dev-util/lldb/lldb-11.0.1.ebuild
+++ b/dev-util/lldb/lldb-11.0.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="libedit lzma ncurses +python test"
REQUIRED_USE=${PYTHON_REQUIRED_USE}
RESTRICT="test"
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.0.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.0.ebuild
index 1b9d02cb2a44..b119c84b2823 100644
--- a/dev-util/pkgcheck/pkgcheck-0.9.0.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.9.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
inherit git-r3
else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
fi
diff --git a/dev-util/ragel/ragel-7.0.4.ebuild b/dev-util/ragel/ragel-7.0.4.ebuild
index 834ee76ec2ae..5e0d58f2860f 100644
--- a/dev-util/ragel/ragel-7.0.4.ebuild
+++ b/dev-util/ragel/ragel-7.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="doc"
# Notes from bug #766090
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 5fe327c2655f..063fce9c99b6 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/git-cola/git-cola-3.8.ebuild b/dev-vcs/git-cola/git-cola-3.8.ebuild
index bf6122a84dc8..09638531c42e 100644
--- a/dev-vcs/git-cola/git-cola-3.8.ebuild
+++ b/dev-vcs/git-cola/git-cola-3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 48e53875c799..9d8b9d8a245a 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/desktop.eclass b/eclass/desktop.eclass
index 7d5c0f0f9a26..82e764e2a1a4 100644
--- a/eclass/desktop.eclass
+++ b/eclass/desktop.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: desktop.eclass
@@ -162,8 +162,15 @@ make_desktop_entry() {
else
local desktop_name="${PN}-${slot}"
fi
- local desktop="${exec%%[[:space:]]*}"
- desktop="${T}/${desktop##*/}-${desktop_name}.desktop"
+ local desktop_exec="${exec%%[[:space:]]*}"
+ desktop_exec="${desktop_exec##*/}"
+
+ # Prevent collisions if a file with the same name already exists #771708
+ local desktop="${desktop_exec}-${desktop_name}" count=0
+ while [[ -e ${ED}/usr/share/applications/${desktop}.desktop ]]; do
+ desktop="${desktop_exec}-$((++count))-${desktop_name}"
+ done
+ desktop="${T}/${desktop}.desktop"
# Don't append another ";" when a valid category value is provided.
type=${type%;}${type:+;}
diff --git a/eclass/dune.eclass b/eclass/dune.eclass
index da1813def533..03857d25a2d4 100644
--- a/eclass/dune.eclass
+++ b/eclass/dune.eclass
@@ -1,10 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: dune.eclass
# @MAINTAINER:
# rkitover@gmail.com
# Mark Wright
+# ML
# @AUTHOR:
# Rafael Kitover
# @SUPPORTED_EAPIS: 5 6 7
diff --git a/eclass/findlib.eclass b/eclass/findlib.eclass
index 8090d6ce5c29..0e37e2ecfa0f 100644
--- a/eclass/findlib.eclass
+++ b/eclass/findlib.eclass
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: findlib.eclass
# @MAINTAINER:
-# maintainer-needed@gentoo.org
+# ML
# @AUTHOR:
# Original author: Matthieu Sozeau (retired)
# @BLURB: ocamlfind (a.k.a. findlib) eclass
diff --git a/eclass/oasis.eclass b/eclass/oasis.eclass
index bcc46b4af326..53cfbb87122e 100644
--- a/eclass/oasis.eclass
+++ b/eclass/oasis.eclass
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: oasis.eclass
# @MAINTAINER:
-# maintainer-needed@gentoo.org
+# ML
# @AUTHOR:
# Original Author: Alexis Ballier
# @SUPPORTED_EAPIS: 3 4 5
diff --git a/eclass/opam.eclass b/eclass/opam.eclass
index 05ebea510548..338ba842cd9c 100644
--- a/eclass/opam.eclass
+++ b/eclass/opam.eclass
@@ -1,9 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: opam.eclass
# @MAINTAINER:
# Mark Wright
+# ML
# @AUTHOR:
# Alexis Ballier
# @SUPPORTED_EAPIS: 5 6 7
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 62ae7dfe721c..87f032a4e8eb 100644
Binary files a/games-action/Manifest.gz and b/games-action/Manifest.gz differ
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index 05d0a191d37e..3dd06573d258 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -1 +1 @@
-DIST minetest-5.3.0.tar.gz 10828893 BLAKE2B 0847c040d2874962be79af6fce89b19354f6763cb37dd61d7e5e91bcacb9a76a115e295976056ae761db257612277ceef0d7e8bfc55790b1bc59a9c4961af41b SHA512 7bb34a80107861539a9ac2417812625ef11d145bf9401afdb8e0a1b9f619adcce24e2becf5bf361b805f4610097cf9d44c76d497ab08d489a43655852ce44777
+DIST minetest-5.4.0.tar.gz 11205196 BLAKE2B 4fd03cf75c6ace4a8e3b1fc81826a43df4a6ea68c7dbdc33cda948e5c81fb49440341f148943c7300036d4063fafb0104fc42a8a29a0495df65d4c66f0d4eb46 SHA512 4cb43678c56ee2ccf9d5dd9c1fc0007119d598a4a56df43fc2a1b827efe08feba0008a30bdb1a1fcd4efe0ada88484b7be0c9e46f108d5424451adb0999b0bcb
diff --git a/games-action/minetest/minetest-5.3.0.ebuild b/games-action/minetest/minetest-5.3.0.ebuild
deleted file mode 100644
index b954c7f0fa33..000000000000
--- a/games-action/minetest/minetest-5.3.0.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="A free open-source voxel game engine with easy modding and game creation"
-HOMEPAGE="https://www.minetest.net"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+client +curl doc +leveldb ncurses nls postgres prometheus redis +server +sound spatial test +truetype"
-REQUIRED_USE="|| ( client server )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-db/sqlite:3
- dev-lang/luajit:2
- dev-libs/gmp:0=
- dev-libs/jsoncpp:=
- sys-libs/zlib
- client? (
- app-arch/bzip2
- dev-games/irrlicht
- media-libs/libpng:0=
- virtual/jpeg:0
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXxf86vm
- sound? (
- media-libs/libogg
- media-libs/libvorbis
- media-libs/openal
- )
- truetype? ( media-libs/freetype:2 )
- )
- curl? ( net-misc/curl )
- leveldb? ( dev-libs/leveldb:= )
- ncurses? ( sys-libs/ncurses:0= )
- nls? ( virtual/libintl )
- postgres? ( >=dev-db/postgresql-9.5:= )
- prometheus? ( dev-cpp/prometheus-cpp )
- redis? ( dev-libs/hiredis:= )
- server? (
- acct-group/minetest
- acct-user/minetest
- dev-games/irrlicht-headers
- )
- spatial? ( sci-libs/libspatialindex:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- doc? (
- app-doc/doxygen
- media-gfx/graphviz
- )
- nls? ( sys-devel/gettext )"
-
-src_prepare() {
- cmake_src_prepare
- # set paths
- sed \
- -e "s#@BINDIR@#${EPREFIX}/usr/bin#g" \
- -e "s#@GROUP@#${PN}#g" \
- "${FILESDIR}"/minetestserver.confd > "${T}"/minetestserver.confd || die
-
- # remove bundled libraries
- rm -rf lib || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_CLIENT=$(usex client)
- -DBUILD_SERVER=$(usex server)
- -DBUILD_UNITTESTS=$(usex test)
- -DCUSTOM_BINDIR="${EPREFIX}/usr/bin"
- -DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
- -DCUSTOM_EXAMPLE_CONF_DIR="${EPREFIX}/usr/share/doc/${PF}"
- -DCUSTOM_LOCALEDIR="${EPREFIX}/usr/share/${PN}/locale"
- -DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}"
- -DENABLE_CURL=$(usex curl)
- -DENABLE_CURSES=$(usex ncurses)
- -DENABLE_FREETYPE=$(usex truetype)
- -DENABLE_GETTEXT=$(usex nls)
- -DENABLE_GLES=0
- -DENABLE_LEVELDB=$(usex leveldb)
- -DENABLE_LUAJIT=1
- -DENABLE_POSTGRESQL=$(usex postgres)
- -DENABLE_PROMETHEUS=$(usex prometheus)
- -DENABLE_REDIS=$(usex redis)
- -DENABLE_SPATIAL=$(usex spatial)
- -DENABLE_SOUND=$(usex sound)
- -DENABLE_SYSTEM_GMP=1
- -DENABLE_SYSTEM_JSONCPP=1
- -DRUN_IN_PLACE=0
- )
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
-
- if use doc ; then
- cmake_src_compile doc
- HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
- fi
-}
-
-src_install() {
- cmake_src_install
-
- if use server ; then
- keepdir /var/log/minetest
- fowners minetest:minetest /var/log/minetest
-
- newconfd "${T}"/minetestserver.confd minetest-server
- newinitd "${FILESDIR}"/minetestserver.initd minetest-server
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/minetestserver.logrotate minetest-server
- fi
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- if use server ; then
- elog
- elog "Configure your server via /etc/conf.d/minetest-server"
- elog
- fi
-
- elog
- elog "The version 5.x series is not compatible to the version 0.4 series."
- elog "This applies to clients and servers, other content such as mods,"
- elog "texture packs and worlds is unaffected and backwards-compatible"
- elog "as usual."
- elog
-}
diff --git a/games-action/minetest/minetest-5.3.0-r100.ebuild b/games-action/minetest/minetest-5.4.0.ebuild
similarity index 98%
rename from games-action/minetest/minetest-5.3.0-r100.ebuild
rename to games-action/minetest/minetest-5.4.0.ebuild
index de4641d9e6a5..6cd3d801b35b 100644
--- a/games-action/minetest/minetest-5.3.0-r100.ebuild
+++ b/games-action/minetest/minetest-5.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 689f4cfd1d7c..c2a8d4155c0d 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/dosbox/Manifest b/games-emulation/dosbox/Manifest
index b3d80b76edec..43fd6fb2644a 100644
--- a/games-emulation/dosbox/Manifest
+++ b/games-emulation/dosbox/Manifest
@@ -1,3 +1,4 @@
DIST dosbox-0.74-3.tar.gz 1326339 BLAKE2B bc25e6aba29747d4060269809d729904d8d187527c59953125c8591c0a91cf4583223c1bcf1224a041d44bfe5efcfe9034d6572954cf26870a290ff1b27e7d9d SHA512 3770f1578e71730168fba01809585f2a05cf8c4d420524687ba28791d242faad294401bb9cd268bba725798e1db853551f274dc00a4024331f5dcef9f87f8f5f
DIST dosbox-code-0-r4302-dosbox-trunk.zip 1443140 BLAKE2B 91e7c5ceb90baa09fd30cf0d8799d900d6bcd94f2b1eead8493ee276b1ee038e093fde56874c58d379218b60e1b510f1d493d72fc275f206912304312ce58d0b SHA512 57758950fd3f0440f4e4d59191a059387a0c7c4559376a2ba826537423ac63d266defe2da37be81450bfece3e0d1caa79b7097ea7fcd3cf96cd04d8899123c69
+DIST dosbox_glide-6a01f554fad979cf34d3ff07c9579192c88086c3.diff 97353 BLAKE2B bb95f9916d4dc8813d1fb4b61c63e50aba5d1862e5554c4af0fc2e75c105b477a6e6ef8b8941e9570860a2fe41570eca94ef36e1d594a2fb9a922b132b210e76 SHA512 b4cf2e5a335b948de94567806950c9512d81adc7687a184b6da5aae082c437af51c61950b1abd0d0c00d83ce37b5ee365ee6bb9e981854fce8bfbb0b1e93be68
DIST dosbox_glide-841e1071597b64ead14dd08c25a03206b2d1d1b6.diff 96801 BLAKE2B d24d1f4262129899d807c275b1ae2d6c09056a126441665f37359302428f30576f399c4778b55f4eaec674e714d85243f576bfa3064887c5801daddc9e507aad SHA512 4cbe0ede9c4242aa346ca6c609b7a4d8e4e1d204d79d93ff741d58d3ca14e43a2e49cd696bd4bd54c13e62d1080320ee233963bac26f25bb0b4fada86e813ca2
diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild
index e9aadb1e2ef7..205ff225911c 100644
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ b/games-emulation/dosbox/dosbox-9999.ebuild
@@ -24,7 +24,7 @@ case "${PV}" in
;;
esac
-GLIDE_PATCH=841e1071597b64ead14dd08c25a03206b2d1d1b6
+GLIDE_PATCH=6a01f554fad979cf34d3ff07c9579192c88086c3
SRC_URI+=" glide? ( https://raw.githubusercontent.com/voyageur/openglide/${GLIDE_PATCH}/platform/dosbox/dosbox_glide.diff -> dosbox_glide-${GLIDE_PATCH}.diff )"
DESCRIPTION="DOS emulator"
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 460e85772316..19d81f905792 100644
Binary files a/games-fps/Manifest.gz and b/games-fps/Manifest.gz differ
diff --git a/games-fps/prboom-plus/Manifest b/games-fps/prboom-plus/Manifest
index 9acad2caf4b3..e2d5bed539ea 100644
--- a/games-fps/prboom-plus/Manifest
+++ b/games-fps/prboom-plus/Manifest
@@ -1 +1 @@
-DIST prboom-plus-2.5.1.7.82.tar.gz 1541604 BLAKE2B 7c10754aa5f85879b63a3778d87e8e2fcd21fcd5092f96a31dc087e878ca080b9ce48d2e7d8f5cac9aa05c8a69cf5f6e9661a5b581de7afe21d59a18af2e57e9 SHA512 55f0ec4edcbac80174aadc63f1f77f3b868a6d1e8efc309ed6f71898d486a3c31d18e08130c9b4a6afd63185003bfd11e6b5940b550071f60168b3c716845f0f
+DIST prboom-plus-2.6.tar.gz 1526732 BLAKE2B 00c0eeb0dfb5a99a427c986e557b6616e69be3b98373582c3aa54585136e3a16b67c0176faec59ebc011112bc8764da78b34215ae4c00b490f12820b26704e45 SHA512 c2f8c6895683ee22d729ad2c9dc10bd821e5bdb55d75b88b4c6db25b8f3604370d18285677660c82761912a159b0c1068a6fcf1c8333e20d849fa1087a74800f
diff --git a/games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-CMake-install-targets.patch b/games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-CMake-install-targets.patch
deleted file mode 100644
index b506fdd6aacc..000000000000
--- a/games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-CMake-install-targets.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From b123022530997df901abbfc7f8dab2846e7d1d7a Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray
-Date: Sat, 6 Jun 2020 13:39:46 -0400
-Subject: [PATCH] Add CMake install targets
-
-Fixes: https://github.com/coelckers/prboom-plus/issues/70
----
- prboom2/CMakeLists.txt | 2 +-
- prboom2/data/CMakeLists.txt | 2 ++
- prboom2/src/CMakeLists.txt | 3 +++
- 3 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/prboom2/CMakeLists.txt b/prboom2/CMakeLists.txt
-index 4aba6b94..932182b6 100644
---- a/prboom2/CMakeLists.txt
-+++ b/prboom2/CMakeLists.txt
-@@ -150,7 +150,7 @@ check_symbol_exists(SDL_JoystickGetAxis "SDL.h" HAVE_SDL_JOYSTICKGETAXIS)
- set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_PREV})
- set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_PREV})
-
--set(DOOMWADDIR "${CMAKE_INSTALL_PREFIX}/share/games/doom" CACHE PATH "Path to install prboom.wad and look for other WAD files")
-+set(DOOMWADDIR "${CMAKE_INSTALL_PREFIX}/share/games/doom" CACHE PATH "Path to look for WAD files")
-
- option(SIMPLECHECKS "Enable checks which only impose significant overhead if a posible error is detected" ON)
- option(ZONEIDCHECK "Enable id checks on zone blocks, to detect corrupted and illegally freed blocks" ON)
-diff --git a/prboom2/data/CMakeLists.txt b/prboom2/data/CMakeLists.txt
-index b855e9e5..33e1d873 100644
---- a/prboom2/data/CMakeLists.txt
-+++ b/prboom2/data/CMakeLists.txt
-@@ -362,3 +362,5 @@ add_custom_command(
- DEPENDS rdatawad ${WAD_SRC}
- )
- add_custom_target(prboomwad DEPENDS ${WAD_DATA_PATH})
-+set(WAD_INSTALL_PATH ${DOOMWADDIR} CACHE PATH "Path to install prboom.wad")
-+install(FILES ${WAD_DATA_PATH} DESTINATION ${WAD_INSTALL_PATH} COMPONENT "PrBoom-Plus internal WAD")
-diff --git a/prboom2/src/CMakeLists.txt b/prboom2/src/CMakeLists.txt
-index b5a0f6bd..89505603 100644
---- a/prboom2/src/CMakeLists.txt
-+++ b/prboom2/src/CMakeLists.txt
-@@ -340,6 +340,8 @@ function(AddGameExecutable TARGET SOURCES)
- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${WAD_DATA_PATH} $
- )
- endif()
-+
-+ install(TARGETS ${TARGET} COMPONENT "Game executable")
- endfunction()
-
- AddGameExecutable(prboom-plus "${PRBOOM_PLUS_SOURCES}")
-@@ -426,6 +428,7 @@ if(BUILD_SERVER AND SDL2_NET_FOUND)
- RUNTIME_OUTPUT_DIRECTORY ${PRBOOM_OUTPUT_PATH}
- )
- ApplySDL2NetOptions(prboom-plus-game-server)
-+ install(TARGETS prboom-plus-game-server COMPONENT "Game server executable")
- endif()
-
-
---
-2.26.2
-
diff --git a/games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-install-rules-for-prboom-plus-documentation.patch b/games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-install-rules-for-prboom-plus-documentation.patch
deleted file mode 100644
index dee4306a4378..000000000000
--- a/games-fps/prboom-plus/files/prboom-plus-2.5.1.7.82-Add-install-rules-for-prboom-plus-documentation.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 3be21f1964d1446962adc15acf1e5d993708780f Mon Sep 17 00:00:00 2001
-From: William Breathitt Gray
-Date: Tue, 11 Aug 2020 20:25:46 -0400
-Subject: [PATCH] Add install rules for prboom-plus documentation
-
----
- prboom2/CMakeLists.txt | 3 +++
- prboom2/doc/CMakeLists.txt | 24 ++++++++++++++++++++++++
- 2 files changed, 27 insertions(+)
- create mode 100644 prboom2/doc/CMakeLists.txt
-
-diff --git a/prboom2/CMakeLists.txt b/prboom2/CMakeLists.txt
-index ec1885a5..52d91e19 100644
---- a/prboom2/CMakeLists.txt
-+++ b/prboom2/CMakeLists.txt
-@@ -9,6 +9,8 @@ include(TargetArch)
- include(TestBigEndian)
- TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
-
-+include(GNUInstallDirs)
-+
- # Automated dependencies discovery, mostly needed for MSVC
- target_architecture(TARGET_ARCH)
- if(${TARGET_ARCH} MATCHES "i386")
-@@ -184,4 +186,5 @@ set(WAD_DATA prboom-plus.wad)
- set(WAD_DATA_PATH "${PRBOOM_OUTPUT_PATH}/${WAD_DATA}")
-
- add_subdirectory(data)
-+add_subdirectory(doc)
- add_subdirectory(src)
-diff --git a/prboom2/doc/CMakeLists.txt b/prboom2/doc/CMakeLists.txt
-new file mode 100644
-index 00000000..9f9b96c8
---- /dev/null
-+++ b/prboom2/doc/CMakeLists.txt
-@@ -0,0 +1,24 @@
-+set(DOC_FILES
-+ boom.txt
-+ DeePBSPV4specs.txt
-+ MBFFAQ.txt
-+ MBF.txt
-+ prboom-plus-history.html
-+ prboom-plus-history.txt
-+ prboom-plus-usage.txt
-+ README.command-line
-+ README.compat
-+ README.demos
-+ umapinfo.txt
-+)
-+set(MAN5_FILES
-+ prboom-plus.cfg.5
-+)
-+set(MAN6_FILES
-+ prboom-plus.6
-+ prboom-plus-game-server.6
-+)
-+
-+install(FILES ${DOC_FILES} TYPE DOC COMPONENT "Documentation")
-+install(FILES ${MAN5_FILES} DESTINATION "${CMAKE_INSTALL_MANDIR}/man5" COMPONENT "Manpages")
-+install(FILES ${MAN6_FILES} DESTINATION "${CMAKE_INSTALL_MANDIR}/man6" COMPONENT "Manpages")
---
-2.28.0
-
diff --git a/games-fps/prboom-plus/files/prboom-plus-2.6-Set-CMAKE_INSTALL_DOCDIR-as-a-cache-entry.patch b/games-fps/prboom-plus/files/prboom-plus-2.6-Set-CMAKE_INSTALL_DOCDIR-as-a-cache-entry.patch
new file mode 100644
index 000000000000..8f07606acd3c
--- /dev/null
+++ b/games-fps/prboom-plus/files/prboom-plus-2.6-Set-CMAKE_INSTALL_DOCDIR-as-a-cache-entry.patch
@@ -0,0 +1,29 @@
+From 9f56505b7c41337cab3a6ce3f882cf8df6bf29a9 Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray
+Date: Mon, 22 Feb 2021 18:27:24 +0900
+Subject: [PATCH] Set CMAKE_INSTALL_DOCDIR as a cache entry
+
+CMAKE_INSTALL_DOCDIR is being unconditionally set which prevents users
+from supplying their own docdir preference. This changes the behavior to
+set CMAKE_INSTALL_DOCDIR as a cache entry so that users can override the
+default install location if they so wish.
+---
+ prboom2/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/prboom2/CMakeLists.txt b/prboom2/CMakeLists.txt
+index 9c2c1fde..3110d7f3 100644
+--- a/prboom2/CMakeLists.txt
++++ b/prboom2/CMakeLists.txt
+@@ -38,7 +38,7 @@ set(PACKAGE_TARNAME "prboom-plus")
+ set(PACKAGE_VERSION "${PROJECT_VERSION}um")
+ set(PACKAGE_HOMEPAGE "${PROJECT_HOMEPAGE_URL}")
+ set(PACKAGE_STRING "${PROJECT_NAME} ${PROJECT_VERSION}")
+-set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PACKAGE_TARNAME}")
++set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PACKAGE_TARNAME}" CACHE PATH "")
+
+ include(CheckSymbolExists)
+
+--
+2.30.1
+
diff --git a/games-fps/prboom-plus/prboom-plus-2.5.1.7.82.ebuild b/games-fps/prboom-plus/prboom-plus-2.6.ebuild
similarity index 81%
rename from games-fps/prboom-plus/prboom-plus-2.5.1.7.82.ebuild
rename to games-fps/prboom-plus/prboom-plus-2.6.ebuild
index 5736a368a569..dcd77904bd3f 100644
--- a/games-fps/prboom-plus/prboom-plus-2.5.1.7.82.ebuild
+++ b/games-fps/prboom-plus/prboom-plus-2.6.ebuild
@@ -1,14 +1,13 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit cmake desktop xdg
-MY_PV=$(ver_rs 4 "um+git")
DESCRIPTION="An enhanced clone of the classic first-person shooter Doom"
HOMEPAGE="https://github.com/coelckers/prboom-plus/"
-SRC_URI="http://deb.debian.org/debian/pool/main/p/prboom-plus/${PN}_${MY_PV}.orig.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://deb.debian.org/debian/pool/main/p/prboom-plus/${PN}_${PV}um.orig.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+ GPL-3+ BSD BSD-2 BSD-with-disclosure CC-BY-3.0 CC0-1.0 LGPL-2.1+ MIT public-domain"
SLOT="0"
@@ -30,11 +29,10 @@ DEPEND="
zlib? ( sys-libs/zlib )"
RDEPEND="${DEPEND}"
-S="${WORKDIR}/${PN}-master/prboom2"
+S="${WORKDIR}/${P}um/prboom2"
src_prepare() {
- eapply -p2 "${FILESDIR}"/prboom-plus-2.5.1.7.82-Add-CMake-install-targets.patch
- eapply -p2 "${FILESDIR}"/prboom-plus-2.5.1.7.82-Add-install-rules-for-prboom-plus-documentation.patch
+ eapply -p2 "${FILESDIR}/${P}-Set-CMAKE_INSTALL_DOCDIR-as-a-cache-entry.patch"
cmake_src_prepare
}
@@ -52,7 +50,7 @@ src_configure() {
-DWITH_VORBISFILE="$(usex vorbis)"
-DWITH_PORTMIDI="$(usex portmidi)"
-DDOOMWADDIR="${EPREFIX}/usr/share/doom"
- -DWAD_INSTALL_PATH="${EPREFIX}/usr/share/doom"
+ -DWAD_DATA_PATH="${EPREFIX}/usr/share/doom"
-DBUILD_SERVER="$(usex server)"
)
cmake_src_configure
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 3f7ecb2a3f1c..29e040d7499d 100644
Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ
diff --git a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.17.0.ebuild b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.17.0.ebuild
index 6dcb1aa202bb..78580ea5af65 100644
--- a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.17.0.ebuild
+++ b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.17.0.ebuild
@@ -102,7 +102,7 @@ SRC_URI+=" $(cargo_crate_uris ${CRATES})"
LICENSE="public-domain SFI-SCLA"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="cdinstall editor ru-gold test"
# Run with ja2 --unittest
# Needs data files?
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index d5baf0db47b5..cd7c7abb6d4d 100644
Binary files a/games-util/Manifest.gz and b/games-util/Manifest.gz differ
diff --git a/games-util/slade/Manifest b/games-util/slade/Manifest
index be9e5aaa542c..2ca180f19853 100644
--- a/games-util/slade/Manifest
+++ b/games-util/slade/Manifest
@@ -1 +1 @@
-DIST slade-3.1.12a.tar.gz 5883702 BLAKE2B 400cf032bf0b60555b45b450c524d85f145d593d74601461f33fa571360a0c66a1d5933a7d48e8cfad98981bcf446df213240f53da237be6d9a1ce09517c4566 SHA512 ecedec880b8ebed921e152d016a451164efd4de90ae69963be077d1ef39326670254ca8eb03e1045ca7ae5b02f7512dbbe712f83c845cbbd4ed787a90899ad13
+DIST slade-3.2.0_beta2.tar.gz 5999580 BLAKE2B 29cd515e4553fa1d74a43dc982b376b10d95ebbe2da4a25bc39329c15967466142c73ec134ada371b9aa65d8fc8d9f4a1820cece7fe8dca59fec039aaad32331 SHA512 e46d9664348233c7ee7fa8ed748d7e23914bb1bb6dd65d40aff7603b386e032e988e0990d4a435f597ba8a6416c7ec377c8334a66efacd55ebdd994d3fd11073
diff --git a/games-util/slade/files/slade-3.1.12a-bundled-libs.patch b/games-util/slade/files/slade-3.1.12a-bundled-libs.patch
deleted file mode 100644
index 6e8285d81056..000000000000
--- a/games-util/slade/files/slade-3.1.12a-bundled-libs.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -Naur a/src/Application/App.cpp b/src/Application/App.cpp
---- a/src/Application/App.cpp 2020-05-26 00:34:50.000000000 +0100
-+++ b/src/Application/App.cpp 2020-05-31 17:11:08.365000293 +0100
-@@ -34,7 +34,7 @@
- #include "App.h"
- #include "Archive/ArchiveManager.h"
- #include "Dialogs/SetupWizard/SetupWizardDialog.h"
--#include "External/dumb/dumb.h"
-+#include
- #include "Game/Configuration.h"
- #include "General/ColourConfiguration.h"
- #include "General/Console/Console.h"
-diff -Naur a/src/Audio/ModMusic.cpp b/src/Audio/ModMusic.cpp
---- a/src/Audio/ModMusic.cpp 2020-05-26 00:34:50.000000000 +0100
-+++ b/src/Audio/ModMusic.cpp 2020-05-31 17:11:08.365000293 +0100
-@@ -30,7 +30,7 @@
- *******************************************************************/
- #include "Main.h"
- #include "ModMusic.h"
--#include "External/dumb/dumb.h"
-+#include
-
-
- /*******************************************************************
-diff -Naur a/src/CMakeLists.txt b/src/CMakeLists.txt
---- a/src/CMakeLists.txt 2020-05-26 00:34:50.000000000 +0100
-+++ b/src/CMakeLists.txt 2020-05-31 17:11:08.365000293 +0100
-@@ -105,6 +105,8 @@
- find_package(GLEW REQUIRED)
- find_package(Freetype REQUIRED)
- find_package(CURL REQUIRED)
-+find_package(Lua REQUIRED)
-+pkg_check_modules(DUMB REQUIRED dumb>=1.0)
- include_directories(
- ${FREEIMAGE_INCLUDE_DIR}
- ${SFML_INCLUDE_DIR}
-@@ -112,8 +114,9 @@
- ${FREETYPE_INCLUDE_DIRS}
- ${GLEW_INCLUDE_PATH}
- ${CURL_INCLUDE_DIR}
-+ ${LUA_INCLUDE_DIR}
-+ ${DUMB_INCLUDE_DIRS}
- .
-- ./External/dumb
- ./Application
- )
-
-@@ -182,6 +185,8 @@
- ${FREETYPE_LIBRARIES}
- ${GLEW_LIBRARY}
- ${CURL_LIBRARIES}
-+ ${LUA_LIBRARIES}
-+ ${DUMB_LIBRARIES}
- )
-
- if (WX_GTK3)
-diff -Naur a/src/External/CMakeLists.txt b/src/External/CMakeLists.txt
---- a/src/External/CMakeLists.txt 2020-05-26 00:34:50.000000000 +0100
-+++ b/src/External/CMakeLists.txt 2020-05-31 17:12:09.614333605 +0100
-@@ -24,8 +24,6 @@
- file(GLOB_RECURSE EXTERNAL_SOURCES
- *.cpp
- *.cxx
-- dumb/*.c
-- lua/*.c
- lzma/C/LzmaDec.c
- ${SLADE_HEADERS}
- )
-diff -Naur a/src/External/sol/sol.hpp b/src/External/sol/sol.hpp
---- a/src/External/sol/sol.hpp 2020-05-26 00:34:50.000000000 +0100
-+++ b/src/External/sol/sol.hpp 2020-05-31 17:11:08.367000336 +0100
-@@ -798,7 +798,7 @@
- #include
- #include
- #else
--#include "External/lua/lua.hpp"
-+#include
- #endif // C++ Mangling for Lua
-
- #if defined(_WIN32) || defined(_MSC_VER)
diff --git a/games-util/slade/files/slade-3.1.12a-cmake-lua-version.patch b/games-util/slade/files/slade-3.1.12a-cmake-lua-version.patch
deleted file mode 100644
index ba7fba329c9b..000000000000
--- a/games-util/slade/files/slade-3.1.12a-cmake-lua-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -104,7 +104,7 @@
- find_package(OpenGL REQUIRED)
- find_package(GLEW REQUIRED)
- find_package(CURL REQUIRED)
--find_package(Lua REQUIRED)
-+find_package(Lua ${LUA_VERSION} EXACT REQUIRED)
- pkg_check_modules(DUMB REQUIRED dumb>=1.0)
- include_directories(
- ${FREEIMAGE_INCLUDE_DIR}
diff --git a/games-util/slade/files/slade-3.1.12a-fluidsynth-driver.patch b/games-util/slade/files/slade-3.1.12a-fluidsynth-driver.patch
deleted file mode 100644
index c0ef70d6dfc8..000000000000
--- a/games-util/slade/files/slade-3.1.12a-fluidsynth-driver.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://github.com/sirjuddington/SLADE/issues/1147
-
-diff -Naur a/src/Audio/MIDIPlayer.cpp b/src/Audio/MIDIPlayer.cpp
---- a/src/Audio/MIDIPlayer.cpp 2020-05-28 00:08:34.000000000 +0100
-+++ b/src/Audio/MIDIPlayer.cpp 2020-05-31 21:40:03.480211253 +0100
-@@ -74,8 +74,6 @@
- #ifndef NO_FLUIDSYNTH
- // Set fluidsynth driver to alsa in linux (no idea why it defaults to jack)
- #if !defined __WXMSW__ && !defined __WXOSX__
-- if (fs_driver == "")
-- fs_driver = "alsa";
- #endif // !defined __WXMSW__ && !defined __WXOSX__
-
- // Init soundfont path
diff --git a/games-util/slade/files/slade-3.1.12a-freetype-deps.patch b/games-util/slade/files/slade-3.1.12a-freetype-deps.patch
deleted file mode 100644
index 33fdbfe8521c..000000000000
--- a/games-util/slade/files/slade-3.1.12a-freetype-deps.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 115ae712d576deafaa95dc5227a7f83dce92a9cb Mon Sep 17 00:00:00 2001
-From: James Le Cuirot
-Date: Sun, 31 May 2020 21:59:06 +0100
-Subject: [PATCH 1/2] Drop unused FreeType dependency
-
-It may be used by FTGL but it's not directly used by this
-project. pkg-config should handle this for static builds.
----
- src/CMakeLists.txt | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index f54b126f..8dab39fc 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -103,7 +103,6 @@ find_package(SFML COMPONENTS ${SFML_FIND_COMPONENTS} REQUIRED)
- find_package(FTGL REQUIRED)
- find_package(OpenGL REQUIRED)
- find_package(GLEW REQUIRED)
--find_package(Freetype REQUIRED)
- find_package(CURL REQUIRED)
- find_package(Lua REQUIRED)
- find_package(fmt CONFIG REQUIRED)
-@@ -111,7 +110,6 @@ include_directories(
- ${FREEIMAGE_INCLUDE_DIR}
- ${SFML_INCLUDE_DIR}
- ${FTGL_INCLUDE_DIR}
-- ${FREETYPE_INCLUDE_DIRS}
- ${GLEW_INCLUDE_PATH}
- ${CURL_INCLUDE_DIR}
- ${LUA_INCLUDE_DIR}
-@@ -184,7 +182,6 @@ target_link_libraries(slade
- ${SFML_LIBRARY}
- ${FTGL_LIBRARIES}
- ${OPENGL_LIBRARIES}
-- ${FREETYPE_LIBRARIES}
- ${GLEW_LIBRARY}
- ${CURL_LIBRARIES}
- ${LUA_LIBRARIES}
---
-2.26.2
-
-From 9116972a75b58ef32e229842f80cdc96fab04f1e Mon Sep 17 00:00:00 2001
-From: James Le Cuirot
-Date: Sun, 31 May 2020 22:00:53 +0100
-Subject: [PATCH 2/2] Only require FTGL when USE_SFML_RENDERWINDOW is disabled
-
----
- src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 8dab39fc..b0d4776d 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -72,6 +72,7 @@ set(SFML_FIND_COMPONENTS system audio window graphics network)
- ADD_DEFINITIONS(-DUSE_SFML_RENDERWINDOW)
- else (USE_SFML_RENDERWINDOW)
- set(SFML_FIND_COMPONENTS system audio window network)
-+find_package(FTGL REQUIRED)
- endif(USE_SFML_RENDERWINDOW)
-
- # Fluidsynth
-@@ -100,7 +101,6 @@ endif()
-
- find_package(FreeImage REQUIRED)
- find_package(SFML COMPONENTS ${SFML_FIND_COMPONENTS} REQUIRED)
--find_package(FTGL REQUIRED)
- find_package(OpenGL REQUIRED)
- find_package(GLEW REQUIRED)
- find_package(CURL REQUIRED)
---
-2.26.2
-
diff --git a/games-util/slade/files/slade-3.1.12a-sfml-gtk3.patch b/games-util/slade/files/slade-3.1.12a-sfml-gtk3.patch
deleted file mode 100644
index 745a41d64b80..000000000000
--- a/games-util/slade/files/slade-3.1.12a-sfml-gtk3.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 7e2aa2666701cc0db32d8b3185c3cd07ae733ab0 Mon Sep 17 00:00:00 2001
-From: Simon Judd
-Date: Fri, 6 Dec 2019 16:36:52 +1030
-Subject: [PATCH] Fix SFML RenderWindow embedding on GTK3
-
-It actually seems to work ok now so might be able to make it the default there
-
-It'd be nice if it worked on macos as well, then I'd be able to remove the wxGLCanvas/FTGL stuff completely...
----
-
-diff --git a/src/UI/Canvas/OGLCanvas.cpp b/src/UI/Canvas/OGLCanvas.cpp
-index 92f86b29..4bba9f98 100644
---- a/src/UI/Canvas/OGLCanvas.cpp
-+++ b/src/UI/Canvas/OGLCanvas.cpp
-@@ -44,6 +44,8 @@
- #endif
- #endif
-
-+EXTERN_CVAR(Int, gl_depth_buffer_size)
-+
-
- /*******************************************************************
- * OGLCANVAS CLASS FUNCTIONS
-@@ -130,29 +132,29 @@ bool OGLCanvas::setContext()
- #endif
- }
-
--void OGLCanvas::createSFML()
-+bool OGLCanvas::createSFML()
- {
- #ifdef USE_SFML_RENDERWINDOW
- // Code taken from SFML wxWidgets integration example
- sf::WindowHandle handle;
- #ifdef __WXGTK__
-- // GTK implementation requires to go deeper to find the
-- // low-level X11 identifier of the widget
-- gtk_widget_realize(m_wxwindow);
-- gtk_widget_set_double_buffered(m_wxwindow, false);
-- GdkWindow* Win = gtk_widget_get_window(m_wxwindow);
-- XFlush(GDK_WINDOW_XDISPLAY(Win));
-- //sf::RenderWindow::Create(GDK_WINDOW_XWINDOW(Win));
-- handle = GDK_WINDOW_XWINDOW(Win);
-+ auto widget = GetHandle();
-+ if (!widget)
-+ return false;
-+ auto window = gtk_widget_get_window(widget);
-+ if (!window)
-+ return false;
-+ handle = gdk_x11_window_get_xid(window);
- #else
- handle = GetHandle();
- #endif
- // Context settings
- sf::ContextSettings settings;
-- settings.depthBits = 24;
-- settings.stencilBits = 8;
-+ settings.depthBits = gl_depth_buffer_size;
-+ settings.stencilBits = sf::ContextSettings::Default;
- sf::RenderWindow::create(handle, settings);
- #endif
-+ return true;
- }
-
- /* OGLCanvas::init
-@@ -308,7 +310,9 @@ void OGLCanvas::onPaint(wxPaintEvent& e)
-
- if (recreate)
- {
-- createSFML();
-+ if (!createSFML())
-+ return;
-+
- recreate = false;
- }
-
-diff --git a/src/UI/Canvas/OGLCanvas.h b/src/UI/Canvas/OGLCanvas.h
-index a1defbee..9b9b07db 100644
---- a/src/UI/Canvas/OGLCanvas.h
-+++ b/src/UI/Canvas/OGLCanvas.h
-@@ -28,7 +28,7 @@ public:
- Palette* getPalette() { return &palette; }
- void setPalette(Palette* pal) { palette.copyPalette(pal); }
- bool setContext();
-- void createSFML();
-+ bool createSFML();
- void init();
- virtual void draw() = 0;
- virtual void update(long frametime) {}
diff --git a/games-util/slade/files/slade-3.1.12a-wxGLCanvas.patch b/games-util/slade/files/slade-3.1.12a-wxGLCanvas.patch
deleted file mode 100644
index 64698cc4591d..000000000000
--- a/games-util/slade/files/slade-3.1.12a-wxGLCanvas.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From a934d04b8c49c250e9be27581129c75bc058814a Mon Sep 17 00:00:00 2001
-From: Simon Judd
-Date: Mon, 9 Dec 2019 12:26:17 +1030
-Subject: [PATCH] Always use wxGLCanvas as a base for OGLCanvas
-
-Even if using SFML - this fixes the depth buffer not being created on linux
----
-
-diff --git a/src/OpenGL/OpenGL.cpp b/src/OpenGL/OpenGL.cpp
-index 7e506550..0a8d4236 100644
---- a/src/OpenGL/OpenGL.cpp
-+++ b/src/OpenGL/OpenGL.cpp
-@@ -38,14 +38,14 @@ CVAR(Bool, gl_tex_enable_np2, true, CVAR_SAVE)
- CVAR(Bool, gl_point_sprite, true, CVAR_SAVE)
- CVAR(Bool, gl_tweak_accuracy, true, CVAR_SAVE)
- CVAR(Bool, gl_vbo, true, CVAR_SAVE)
--CVAR(Int, gl_depth_buffer_size, 16, CVAR_SAVE)
-+CVAR(Int, gl_depth_buffer_size, 24, CVAR_SAVE)
-
- namespace OpenGL
- {
- #ifndef USE_SFML_RENDERWINDOW
- wxGLContext* context = NULL;
-- int wx_gl_attrib[] = { WX_GL_RGBA, WX_GL_DOUBLEBUFFER, WX_GL_DEPTH_SIZE, 16, WX_GL_STENCIL_SIZE, 8, 0 };
- #endif
-+ int wx_gl_attrib[] = { WX_GL_RGBA, WX_GL_DOUBLEBUFFER, WX_GL_DEPTH_SIZE, 16, WX_GL_STENCIL_SIZE, 8, 0 };
- bool initialised = false;
- double version = 0;
- unsigned max_tex_size = 128;
-@@ -224,7 +224,6 @@ bool OpenGL::accuracyTweak()
- return gl_tweak_accuracy;
- }
-
--#ifndef USE_SFML_RENDERWINDOW
- /* OpenGL::getWxGLAttribs
- * Returns the GL attributes array for use with wxGLCanvas
- *******************************************************************/
-@@ -235,7 +234,6 @@ int* OpenGL::getWxGLAttribs()
-
- return wx_gl_attrib;
- }
--#endif
-
- /* OpenGL::setColour
- * Sets the colour to [col], and changes the colour blend mode if
-diff --git a/src/OpenGL/OpenGL.h b/src/OpenGL/OpenGL.h
-index 1d5c9b9a..9082687c 100644
---- a/src/OpenGL/OpenGL.h
-+++ b/src/OpenGL/OpenGL.h
-@@ -20,10 +20,8 @@
- #include
- #endif
-
--#ifndef USE_SFML_RENDERWINDOW
- #include
- #undef None // Why does #define this? Idiotic
--#endif
-
- #define BLEND_NORMAL 0
- #define BLEND_ADDITIVE 1
-@@ -56,9 +54,7 @@ namespace OpenGL
- unsigned maxTextureSize();
- bool isInitialised();
- bool accuracyTweak();
--#ifndef USE_SFML_RENDERWINDOW
- int* getWxGLAttribs();
--#endif
- void setColour(rgba_t col, bool set_blend = true);
- void setColour(uint8_t r, uint8_t g, uint8_t b, uint8_t a = 255, int8_t blend = BLEND_IGNORE);
- void setBlend(int blend);
-diff --git a/src/UI/Canvas/OGLCanvas.cpp b/src/UI/Canvas/OGLCanvas.cpp
-index 4bba9f98..a48d9ac6 100644
---- a/src/UI/Canvas/OGLCanvas.cpp
-+++ b/src/UI/Canvas/OGLCanvas.cpp
-@@ -55,8 +55,9 @@ EXTERN_CVAR(Int, gl_depth_buffer_size)
- /* OGLCanvas::OGLCanvas
- * OGLCanvas class constructor, SFML implementation
- *******************************************************************/
--OGLCanvas::OGLCanvas(wxWindow* parent, int id, bool handle_timer, int timer_interval)
-- : wxControl(parent, id, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE|wxWANTS_CHARS), timer(this)
-+OGLCanvas::OGLCanvas(wxWindow* parent, int id, bool handle_timer, int timer_interval) :
-+ wxGLCanvas(parent, id, OpenGL::getWxGLAttribs(), wxDefaultPosition, wxDefaultSize, wxBORDER_NONE | wxWANTS_CHARS),
-+ timer(this)
- {
- init_done = false;
- recreate = false;
-diff --git a/src/UI/Canvas/OGLCanvas.h b/src/UI/Canvas/OGLCanvas.h
-index 9b9b07db..128cb633 100644
---- a/src/UI/Canvas/OGLCanvas.h
-+++ b/src/UI/Canvas/OGLCanvas.h
-@@ -8,7 +8,7 @@
-
- class wxWindow;
- #ifdef USE_SFML_RENDERWINDOW
--class OGLCanvas : public wxControl, public sf::RenderWindow
-+class OGLCanvas : public wxGLCanvas, public sf::RenderWindow
- {
- #else
- class OGLCanvas : public wxGLCanvas
-@@ -38,7 +38,11 @@ public:
- void setup2D();
-
- #ifdef USE_SFML_RENDERWINDOW
-- void SwapBuffers() { display(); }
-+ bool SwapBuffers() override
-+ {
-+ display();
-+ return true;
-+ }
- #endif
-
- void onPaint(wxPaintEvent& e);
diff --git a/games-util/slade/files/slade-3.2.0_beta2-bundled-libs.patch b/games-util/slade/files/slade-3.2.0_beta2-bundled-libs.patch
new file mode 100644
index 000000000000..4474ab783d47
--- /dev/null
+++ b/games-util/slade/files/slade-3.2.0_beta2-bundled-libs.patch
@@ -0,0 +1,85 @@
+From a22553a612ade8a5e3f90c84166e9fdda16635c9 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot
+Date: Sat, 20 Feb 2021 12:22:24 +0000
+Subject: [PATCH] Unbundle the DUMB library
+
+---
+ src/Application/App.cpp | 2 +-
+ src/Audio/ModMusic.cpp | 2 +-
+ src/CMakeLists.txt | 4 +++-
+ thirdparty/CMakeLists.txt | 2 --
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/Application/App.cpp b/src/Application/App.cpp
+index 3d4dcc1d..d2c3e583 100644
+--- a/src/Application/App.cpp
++++ b/src/Application/App.cpp
+@@ -60,7 +60,7 @@
+ #include "UI/WxUtils.h"
+ #include "Utility/StringUtils.h"
+ #include "Utility/Tokenizer.h"
+-#include "thirdparty/dumb/dumb.h"
++#include
+ #include
+
+ using namespace slade;
+diff --git a/src/Audio/ModMusic.cpp b/src/Audio/ModMusic.cpp
+index cb8eef8c..2d368fdb 100644
+--- a/src/Audio/ModMusic.cpp
++++ b/src/Audio/ModMusic.cpp
+@@ -32,7 +32,7 @@
+ // -----------------------------------------------------------------------------
+ #include "Main.h"
+ #include "ModMusic.h"
+-#include "thirdparty/dumb/dumb.h"
++#include
+
+ using namespace slade;
+ using namespace audio;
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 802598f6..222e6040 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -110,6 +110,7 @@ endif()
+ pkg_check_modules(fmt REQUIRED fmt>=6)
+ include_directories(${fmt_INCLUDE_DIRS})
+ find_package(MPG123 REQUIRED)
++pkg_check_modules(DUMB REQUIRED dumb>=1.0)
+ include_directories(
+ ${FREEIMAGE_INCLUDE_DIR}
+ ${SFML_INCLUDE_DIR}
+@@ -118,9 +119,9 @@ include_directories(
+ ${CURL_INCLUDE_DIR}
+ ${LUA_INCLUDE_DIR}
+ ${MPG123_INCLUDE_DIR}
++ ${DUMB_INCLUDE_DIRS}
+ .
+ ..
+- ../thirdparty/dumb
+ ./Application
+ )
+
+@@ -200,6 +201,7 @@ target_link_libraries(slade
+ ${CURL_LIBRARIES}
+ ${LUA_LIBRARIES}
+ ${MPG123_LIBRARIES}
++ ${DUMB_LIBRARIES}
+ ${fmt_LIBRARIES}
+ -lstdc++fs
+ )
+diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
+index 6b0eb504..a3757c91 100644
+--- a/thirdparty/CMakeLists.txt
++++ b/thirdparty/CMakeLists.txt
+@@ -12,8 +12,6 @@ set(EXTERNAL_SOURCES
+ file(GLOB_RECURSE EXTERNAL_SOURCES
+ *.cpp
+ *.cxx
+- dumb/*.c
+- lua/*.c
+ lzma/C/LzmaDec.c
+ fmt/*.cc
+ ${SLADE_HEADERS}
+--
+2.30.0
+
diff --git a/games-util/slade/files/slade-3.2.0_beta2-fluidsynth-driver.patch b/games-util/slade/files/slade-3.2.0_beta2-fluidsynth-driver.patch
new file mode 100644
index 000000000000..bd828d81b390
--- /dev/null
+++ b/games-util/slade/files/slade-3.2.0_beta2-fluidsynth-driver.patch
@@ -0,0 +1,27 @@
+From dc0057d1200f9bb6b67f1b1a2094b7e402d1d370 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot
+Date: Sat, 20 Feb 2021 12:28:48 +0000
+Subject: [PATCH] Don't force FluidSynth to use ALSA on Linux
+
+---
+ src/Audio/MIDIPlayer.cpp | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/Audio/MIDIPlayer.cpp b/src/Audio/MIDIPlayer.cpp
+index bb001339..f33ffe67 100644
+--- a/src/Audio/MIDIPlayer.cpp
++++ b/src/Audio/MIDIPlayer.cpp
+@@ -344,10 +344,6 @@ public:
+ fs_initialised_ = false;
+ file_ = "";
+
+- // Set fluidsynth driver to alsa in linux (no idea why it defaults to jack)
+- if (app::platform() == app::Platform::Linux && fs_driver.value.empty())
+- fs_driver = "alsa";
+-
+ // Init soundfont path
+ if (fs_soundfont_path.value.empty())
+ {
+--
+2.30.0
+
diff --git a/games-util/slade/slade-3.1.12a.ebuild b/games-util/slade/slade-3.1.12a.ebuild
deleted file mode 100644
index 3ddd53ebe756..000000000000
--- a/games-util/slade/slade-3.1.12a.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-inherit cmake wxwidgets
-
-DESCRIPTION="Modern editor for Doom-engine based games and source ports"
-HOMEPAGE="https://slade.mancubus.net/"
-SRC_URI="https://github.com/sirjuddington/${PN^^}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="fluidsynth timidity webkit"
-
-DEPEND="
- app-arch/bzip2:=
- dev-lang/lua:0
- >=media-libs/dumb-2:=
- media-libs/freeimage[jpeg,png,tiff]
- media-libs/glew:0=
- media-libs/libsfml:=
- net-misc/curl
- sys-libs/zlib
- x11-libs/wxGTK:${WX_GTK_VER}[gstreamer,opengl,webkit?,X]
- fluidsynth? ( media-sound/fluidsynth:= )
-"
-
-RDEPEND="
- ${DEPEND}
- timidity? ( media-sound/timidity++ )
-"
-
-BDEPEND="
- app-arch/p7zip
- virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN^^}-${PV}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-bundled-libs.patch
- "${FILESDIR}"/${P}-sfml-gtk3.patch
- "${FILESDIR}"/${P}-wxGLCanvas.patch
- "${FILESDIR}"/${P}-freetype-deps.patch
- "${FILESDIR}"/${P}-fluidsynth-driver.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- # Delete bundled libraries just in case.
- rm -r src/External/{dumb,glew,lua}/ || die
-
-}
-
-src_configure() {
- local mycmakeargs=(
- -DNO_FLUIDSYNTH=$(usex fluidsynth OFF ON)
- -DNO_WEBVIEW=$(usex webkit OFF ON)
- -DUSE_SFML_RENDERWINDOW=ON
- -DWX_GTK3=ON
- )
- setup-wxwidgets
- cmake_src_configure
-}
diff --git a/games-util/slade/slade-3.1.12a-r100.ebuild b/games-util/slade/slade-3.2.0_beta2.ebuild
similarity index 67%
rename from games-util/slade/slade-3.1.12a-r100.ebuild
rename to games-util/slade/slade-3.2.0_beta2.ebuild
index da73f5e0060b..c11364215f02 100644
--- a/games-util/slade/slade-3.1.12a-r100.ebuild
+++ b/games-util/slade/slade-3.2.0_beta2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,25 +8,28 @@ WX_GTK_VER="3.0-gtk3"
inherit cmake lua-single wxwidgets
+MY_PV="${PV/beta/b}"
DESCRIPTION="Modern editor for Doom-engine based games and source ports"
HOMEPAGE="https://slade.mancubus.net/"
-SRC_URI="https://github.com/sirjuddington/${PN^^}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/sirjuddington/${PN^^}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2 MIT"
SLOT="0"
KEYWORDS="~amd64"
IUSE="fluidsynth timidity webkit"
-
REQUIRED_USE="${LUA_REQUIRED_USE}"
-DEPEND="${LUA_DEPS}
+DEPEND="
+ ${LUA_DEPS}
app-arch/bzip2:=
+ dev-libs/libfmt:=
>=media-libs/dumb-2:=
media-libs/freeimage[jpeg,png,tiff]
media-libs/glew:0=
media-libs/libsfml:=
+ media-sound/mpg123
net-misc/curl
sys-libs/zlib
- x11-libs/wxGTK:${WX_GTK_VER}[gstreamer,opengl,webkit?,X]
+ x11-libs/wxGTK:${WX_GTK_VER}[opengl,webkit?,X]
fluidsynth? ( media-sound/fluidsynth:= )
"
@@ -40,33 +43,35 @@ BDEPEND="
virtual/pkgconfig
"
-S="${WORKDIR}/${PN^^}-${PV}"
+S="${WORKDIR}/${PN^^}-${MY_PV}"
PATCHES=(
"${FILESDIR}"/${P}-bundled-libs.patch
- "${FILESDIR}"/${P}-sfml-gtk3.patch
- "${FILESDIR}"/${P}-wxGLCanvas.patch
- "${FILESDIR}"/${P}-freetype-deps.patch
"${FILESDIR}"/${P}-fluidsynth-driver.patch
- "${FILESDIR}"/${PN}-3.1.12a-cmake-lua-version.patch
)
src_prepare() {
cmake_src_prepare
# Delete bundled libraries just in case.
- rm -r src/External/{dumb,glew,lua}/ || die
+ rm -r thirdparty/dumb/ || die
}
src_configure() {
+ local luav=$(lua_get_version)
+
local mycmakeargs=(
- -DLUA_VERSION=$(lua_get_version)
+ -DLua_FIND_VERSION_MAJOR=$(ver_cut 1 "${luav}")
+ -DLua_FIND_VERSION_MINOR=$(ver_cut 2 "${luav}")
+ -DLua_FIND_VERSION_COUNT=2
+ -DLua_FIND_VERSION_EXACT=ON
-DNO_FLUIDSYNTH=$(usex fluidsynth OFF ON)
-DNO_WEBVIEW=$(usex webkit OFF ON)
-DUSE_SFML_RENDERWINDOW=ON
-DWX_GTK3=ON
)
+
setup-wxwidgets
cmake_src_configure
}
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 7f8681f54fd7..842a01ef7815 100644
Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ
diff --git a/kde-apps/akonadi-calendar/Manifest b/kde-apps/akonadi-calendar/Manifest
index 2d0914d51f1e..358f3a3aca4e 100644
--- a/kde-apps/akonadi-calendar/Manifest
+++ b/kde-apps/akonadi-calendar/Manifest
@@ -1,2 +1 @@
-DIST akonadi-calendar-20.08.3.tar.xz 344600 BLAKE2B 0f478e41b7b43119c6c1fc4abcc7bab2d7c7e48ccdf83d97471cb34f6364beb606dcf09e61e838c8601b7d0834bd4115c2273db11a3cf319b03dcf7aebf9581e SHA512 f9b48dd1f8820ddb4a3c1259b20eeb814ffd0f0209407cc0412c21491b42f4744b7fd09e9a0e56249f5e8cd9c8d29a0265ccf46607a6617a1b605b2e20f15c02
DIST akonadi-calendar-20.12.2.tar.xz 342764 BLAKE2B 0c71a7a2f5949eff8ccd0c93d31f4c332d04015b507477f6d03d06ac930622ac9704794a18ae7fc263eeaee3c6e3550f7d4bedc62be90e275c11b412adef9263 SHA512 80d7d9e77d176c157e885d1229fee07def248728679d5fea90124518aefd6f998cde4a2a22a0b5087c49547ba4fda3811b1a6980a920c47d13bc9039a17e02ae
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-20.08.3.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-20.08.3.ebuild
deleted file mode 100644
index 2b6af811dee1..000000000000
--- a/kde-apps/akonadi-calendar/akonadi-calendar-20.08.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi calendar integration"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/akonadi-mime-${PVCUT}:5
- >=kde-apps/kcalutils-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/kmailtransport-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-frameworks/kcalendarcore-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/akonadi-calendar/akonadi-calendar-20.12.2.ebuild b/kde-apps/akonadi-calendar/akonadi-calendar-20.12.2.ebuild
index c0cb12f6b932..909df4b925d1 100644
--- a/kde-apps/akonadi-calendar/akonadi-calendar-20.12.2.ebuild
+++ b/kde-apps/akonadi-calendar/akonadi-calendar-20.12.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Library for akonadi calendar integration"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/akonadi-contacts/Manifest b/kde-apps/akonadi-contacts/Manifest
index e3c368922dc3..c26f6dc7fea3 100644
--- a/kde-apps/akonadi-contacts/Manifest
+++ b/kde-apps/akonadi-contacts/Manifest
@@ -1,2 +1 @@
-DIST akonadi-contacts-20.08.3.tar.xz 409772 BLAKE2B c974d8b48c12bce036f833089f8a59eb523b65d3cd8e9649bb573eaaa7fb5cfd8fa56a7842dafd67bc816ab298c942721c4cc1ef0c5c4ed12d8a2fc40ba62f94 SHA512 1b6d10a4cce9b84092673f5779cbd1db71beef86887ef6c809174445fbc13d7a0b6d8417eb54e3cbd10504ed12155d53e148a7667569b9458e900eebd16ce943
DIST akonadi-contacts-20.12.2.tar.xz 414208 BLAKE2B d0cdd880e6a05422afed82d7ec0d69424928c9bc9a2d7ff1565fb89163d5f4842388cfc8a6805bd052a0aa06f2fd895f34103809f9e4c7072bc0c569594a14fe SHA512 9e6bb8162619a484fffe822d448ab3aae5199c5deacb2ce10ccfdafb025b19e1f1a3aa0241f013c261205f6e7c9b7501c755589d69b082d3bc00d5d6fb58ccb9
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-20.08.3.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-20.08.3.ebuild
deleted file mode 100644
index cbb86208bfea..000000000000
--- a/kde-apps/akonadi-contacts/akonadi-contacts-20.08.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi contact integration"
-
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-LICENSE="GPL-2+"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcontacts-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/prison-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-20.12.2.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-20.12.2.ebuild
index b546743d414b..f42c78dd86cf 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-20.12.2.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-20.12.2.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
DESCRIPTION="Library for akonadi contact integration"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
LICENSE="GPL-2+"
IUSE=""
diff --git a/kde-apps/akonadi-import-wizard/Manifest b/kde-apps/akonadi-import-wizard/Manifest
index dcc4d39336d0..29dc02625bed 100644
--- a/kde-apps/akonadi-import-wizard/Manifest
+++ b/kde-apps/akonadi-import-wizard/Manifest
@@ -1,2 +1 @@
-DIST akonadi-import-wizard-20.08.3.tar.xz 506104 BLAKE2B d11db50eaae05cbf1fd7e6322d3e56ef9c8b6738107134e6db6417f1d155e4d36d623af50569126a7fe43cced56e8001e2bc8b7fce2a743d52ee30567ea59be5 SHA512 d0319d42b9ed4eef654c1bd2728c17919f3b04c806b12ed01c872ade5094309f0fb2dfd01462e1ec860515f8a989470549da8aae2e933251e69951f067b12da5
DIST akonadi-import-wizard-20.12.2.tar.xz 506672 BLAKE2B fcb9c46b509787d68296e96ad55e960c994ce4bcc87e7d541a8ead254378433efde46339565e01894949ddeb69378078e469e21833a49b8406fc9a64fabd0d2f SHA512 459014c383e62566b85535468ea0ac2970315248b98cf2aa7b5581e01a799ad35aa0fb5488e66e71ca3e6a1d94eb3dc1421e9ff638d2b87e8ec7dc3b6461906b
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.08.3.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.08.3.ebuild
deleted file mode 100644
index a045325c928c..000000000000
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.08.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Assistant to import PIM data from other applications into Akonadi"
-HOMEPAGE+=" https://userbase.kde.org/KMail/Import_Options"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/kmailtransport-${PVCUT}:5
- >=kde-apps/mailcommon-${PVCUT}:5
- >=kde-apps/mailimporter-${PVCUT}:5
- >=kde-apps/messagelib-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcontacts-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.12.2.ebuild b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.12.2.ebuild
index 9b0d68e29440..2a87744f374d 100644
--- a/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.12.2.ebuild
+++ b/kde-apps/akonadi-import-wizard/akonadi-import-wizard-20.12.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE+=" https://userbase.kde.org/KMail/Import_Options"
LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/akonadi-mime/Manifest b/kde-apps/akonadi-mime/Manifest
index c73f950568e2..308b574130db 100644
--- a/kde-apps/akonadi-mime/Manifest
+++ b/kde-apps/akonadi-mime/Manifest
@@ -1,2 +1 @@
-DIST akonadi-mime-20.08.3.tar.xz 137936 BLAKE2B ceb9e46da5ba1cf62f3d47c54bf60ed0ab25d20a4006dc6b9f667f1b7f449cd216508de4a76a04784f686383f70447467144e990a564e10c3af214ac9a348ad0 SHA512 d5f996f5e8e1e1c148d7b78e48d88d622e190881cc522fbd3cb0bb683888ba037ac9f84d5ba964eec356ff1c201b88e5339351d489a8647d8cab5fef22a882a1
DIST akonadi-mime-20.12.2.tar.xz 135892 BLAKE2B 29ee94c335728ffd815ddf75a4b9839707654a4894647e097398b7c148cb211e2a19ca951bfd4c249798e248c5b97bb256bd02615c10a7a6c266f551929783e5 SHA512 7d4aadacdeb2c9627bea5494ca3d986365af1aea3cb87482e7d671edb4aa3055a6069709bb57bdf8cd3a4e291160af548044ec42f2e3c3aa2dcacfc0ae018aaf
diff --git a/kde-apps/akonadi-mime/akonadi-mime-20.08.3.ebuild b/kde-apps/akonadi-mime/akonadi-mime-20.08.3.ebuild
deleted file mode 100644
index 2a6c242d5996..000000000000
--- a/kde-apps/akonadi-mime/akonadi-mime-20.08.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi mime types"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-DEPEND="
- dev-libs/libxslt
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-mime/akonadi-mime-20.12.2.ebuild b/kde-apps/akonadi-mime/akonadi-mime-20.12.2.ebuild
index 610e0e0a9e08..ad9c82303281 100644
--- a/kde-apps/akonadi-mime/akonadi-mime-20.12.2.ebuild
+++ b/kde-apps/akonadi-mime/akonadi-mime-20.12.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Library for akonadi mime types"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE=""
# some akonadi tests time out, that probably needs more work as it's ~700 tests
diff --git a/kde-apps/akonadi-notes/Manifest b/kde-apps/akonadi-notes/Manifest
index 169131cfbb9b..84c71ac62c93 100644
--- a/kde-apps/akonadi-notes/Manifest
+++ b/kde-apps/akonadi-notes/Manifest
@@ -1,2 +1 @@
-DIST akonadi-notes-20.08.3.tar.xz 22784 BLAKE2B eb88c528218d2853f8182f37fbb0f93bd34b78a76a5cbb03f35983fb79eb1361c1bb8836c8bb65fc106530d49b5e7e48cc3e7633b1b881b741561d0c8f49f618 SHA512 7b38bfa0854da839b40c455a87bba59574af5ebb69019ce4f58aeb2811df5b652e34aaebd942d8a9f5519e8d93faaa713a2dc8298abffcf4b7af41cca1416cf6
DIST akonadi-notes-20.12.2.tar.xz 22916 BLAKE2B 54928a4adf67d4e6afb6692067e177f634142bae2fa0041663c6154bef5bcd2ed051bcf0a1a597d27d9d4685ca18627f001401e7f7b70eec802e64468fd896ef SHA512 30e4fc0753abee49f69c5c0727b123ff8bf2e8e8c127043895e6f3a221f0cf1e6bf5ca89ed87687d83184e082c8cf7fad7f490f1bc5678317cac8c18d2e83b49
diff --git a/kde-apps/akonadi-notes/akonadi-notes-20.08.3.ebuild b/kde-apps/akonadi-notes/akonadi-notes-20.08.3.ebuild
deleted file mode 100644
index 16e6cb72422c..000000000000
--- a/kde-apps/akonadi-notes/akonadi-notes-20.08.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Library for akonadi notes integration"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadi-notes/akonadi-notes-20.12.2.ebuild b/kde-apps/akonadi-notes/akonadi-notes-20.12.2.ebuild
index 0b141def05b6..bc1ec9fcad70 100644
--- a/kde-apps/akonadi-notes/akonadi-notes-20.12.2.ebuild
+++ b/kde-apps/akonadi-notes/akonadi-notes-20.12.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Library for akonadi notes integration"
LICENSE="GPL-2+"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/akonadi-search/Manifest b/kde-apps/akonadi-search/Manifest
index c305eac7ac46..b7ddbbc11ec2 100644
--- a/kde-apps/akonadi-search/Manifest
+++ b/kde-apps/akonadi-search/Manifest
@@ -1,2 +1 @@
-DIST akonadi-search-20.08.3.tar.xz 94772 BLAKE2B a1ab156b0306dc543eff92711a7c3e3d94fde423a16fead67559b4b01b937178e549421d41dd486e3f68e4743c13a3667d7f432b656d990f02cac6edb0968a1c SHA512 db6246e428bfbe77239089e1bc4036b99dd8c070a70a995c698785ab202e5f975e30a7e0f36ac3fa41c859b928821f626f545c2be21479ffe5809e83068dbee8
DIST akonadi-search-20.12.2.tar.xz 93988 BLAKE2B 42b62605b4dbe27dae073761ccb78e6063b65fc9ad934aa77065baa380e4dba38b38062f30ac800ec9546697d1b10b275f1bc0ca21426ebe16f5d8e399560720 SHA512 cbb9bb579b0545198ebc145d41ca3ffdc84a5cdab00941ef133c5d2fba2e720eefdb4ea52edfa065bcd2baffe5a612c15058fd5d7a2106c8728ad4ff6e531de0
diff --git a/kde-apps/akonadi-search/akonadi-search-20.08.3.ebuild b/kde-apps/akonadi-search/akonadi-search-20.08.3.ebuild
deleted file mode 100644
index 10513b4e2695..000000000000
--- a/kde-apps/akonadi-search/akonadi-search-20.08.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Libraries and daemons to implement searching in Akonadi"
-HOMEPAGE="https://invent.kde.org/pim/akonadi-search"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RESTRICT+=" test" # perpetually broken, bug 662378
-
-BDEPEND="
- test? ( >=kde-apps/akonadi-${PVCUT}:5[tools] )
-"
-RDEPEND="
- >=dev-libs/xapian-1.3:=[chert(+)]
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-mime-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-frameworks/kcalendarcore-${KFMIN}:5
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcontacts-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/krunner-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
- dev-libs/boost
- test? ( =kde-apps/akonadi-${PVCUT}*:5[mysql,postgres,sqlite] )
-"
diff --git a/kde-apps/akonadi-search/akonadi-search-20.12.2-r1.ebuild b/kde-apps/akonadi-search/akonadi-search-20.12.2-r1.ebuild
index e8429904b4bf..55be7024c781 100644
--- a/kde-apps/akonadi-search/akonadi-search-20.12.2-r1.ebuild
+++ b/kde-apps/akonadi-search/akonadi-search-20.12.2-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/pim/akonadi-search"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE=""
RESTRICT+=" test" # perpetually broken, bug 662378
diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index 4649cb718990..78ad98c9c798 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1,2 +1 @@
-DIST akonadi-20.08.3.tar.xz 1591360 BLAKE2B e237fc3307ae3cd785e29da9c2177832f1cff523ab3dc46279813c9ae152ac3a030649e6b73e8d566332f478992d6441457301355c2f6abd180c4db8c8d48011 SHA512 2d278a6189732e7c68a89321356915413771f1b4b1e3fb5a491b02f0000095163cce61278cc4f7f8b17759c1d71b3e3c08dbed0c89f3fe26be21da14adbbf720
DIST akonadi-20.12.2.tar.xz 1593452 BLAKE2B e3d058a43685a8b8bf92ffbb169f1c17b8e831712567a4ef8eba6ef1eee6321ae45f82a72a4c44a71835b65c18075497d26c8802b7a2f0a10c9baa21efefa65e SHA512 2c21db5d6ab6b8d9cedabad2f726fd518ba8219db3cb6f8f72820edc71ed72efa31efcb2c4cd8ff36e52e4c0a38a97dd890789bf6816ab524f0568892254523c
diff --git a/kde-apps/akonadi/akonadi-20.08.3.ebuild b/kde-apps/akonadi/akonadi-20.08.3.ebuild
deleted file mode 100644
index cd1506e09ba6..000000000000
--- a/kde-apps/akonadi/akonadi-20.08.3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
-HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="+kaccounts +mysql postgres sqlite tools xml"
-
-REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
-
-COMMON_DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5[mysql?,postgres?]
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- kaccounts? (
- >=kde-apps/kaccounts-integration-${PVCUT}:5
- net-libs/accounts-qt
- )
- sqlite? (
- dev-db/sqlite:3
- >=dev-qt/qtsql-${QTMIN}:5=[sqlite]
- )
- xml? ( dev-libs/libxml2 )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
- dev-libs/libxslt
- test? ( sys-apps/dbus )
-"
-RDEPEND="${COMMON_DEPEND}
- mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql )
-"
-
-# some akonadi tests time out, that probably needs more work as it's ~700 tests
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" )
-
-pkg_setup() {
- # Set default storage backend in order: MySQL, PostgreSQL, SQLite
- # reverse driver check to keep the order
- use sqlite && DRIVER="QSQLITE3"
- use postgres && DRIVER="QPSQL"
- use mysql && DRIVER="QMYSQL"
-
- if use mysql && has_version ">=dev-db/mariadb-10.4"; then
- ewarn "If an existing Akonadi QMYSQL database is being upgraded using"
- ewarn ">=dev-db/mariadb-10.4 and KMail stops fetching and sending mail,"
- ewarn "check ~/.local/share/akonadi/akonadiserver.error for errors like:"
- ewarn " \"Cannot add or update a child row: a foreign key constraint fails\""
- ewarn
- ewarn "Manual steps are required to fix it, see also:"
- ewarn " https://bugs.gentoo.org/688746 (see Whiteboard)"
- ewarn " https://bugs.kde.org/show_bug.cgi?id=409224"
- ewarn
- fi
-
- if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
- ewarn "We strongly recommend you change your Akonadi database backend to either MySQL"
- ewarn "or PostgreSQL in your user configuration."
- ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend."
- fi
-
- ecm_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package kaccounts AccountsQt5)
- $(cmake_use_find_package kaccounts KAccounts)
- -DAKONADI_BUILD_QSQLITE=$(usex sqlite)
- -DBUILD_TOOLS=$(usex tools)
- $(cmake_use_find_package xml LibXml2)
- )
-
- ecm_src_configure
-}
-
-src_install() {
- # Who knows, maybe it accidentally fixes our permission issues
- cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
- insinto /usr/share/config/akonadi
- doins "${T}"/akonadiserverrc
-
- ecm_src_install
-}
-
-pkg_postinst() {
- ecm_pkg_postinst
- elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc."
- elog "Available drivers are:"
- use mysql && elog " QMYSQL"
- use postgres && elog " QPSQL"
- use sqlite && elog " QSQLITE3"
- elog "${DRIVER} has been set as your default akonadi storage backend."
-}
diff --git a/kde-apps/akonadi/akonadi-20.12.2-r1.ebuild b/kde-apps/akonadi/akonadi-20.12.2-r1.ebuild
index 3c234d906ee2..c0e9eb4ea8cc 100644
--- a/kde-apps/akonadi/akonadi-20.12.2-r1.ebuild
+++ b/kde-apps/akonadi/akonadi-20.12.2-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
LICENSE="LGPL-2.1+"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE="+kaccounts +mysql postgres sqlite tools xml"
REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
diff --git a/kde-apps/akonadiconsole/Manifest b/kde-apps/akonadiconsole/Manifest
index 39a244cf74d0..ef4f4788efa1 100644
--- a/kde-apps/akonadiconsole/Manifest
+++ b/kde-apps/akonadiconsole/Manifest
@@ -1,2 +1 @@
-DIST akonadiconsole-20.08.3.tar.xz 195032 BLAKE2B 589266d05e295ab80c891937faa204fad3ab56d4f6cbffcb2a435b93fed407be03c95cbf8c8a9ef2e74f2fecae16b41b74555cf878aa051515ddbbacf2497932 SHA512 2770bd9a89f3e64d82d689301392285ccbd580edadceebb83ba5c456fd9fc1a8149cadea3b6eb14ba9a8d7e68c1c4308957df21111d721304dc6268fece3dfd9
DIST akonadiconsole-20.12.2.tar.xz 198012 BLAKE2B 1cbbb43d7d20d45a5afe112345b1a4a17b1492fd128e885c61925d9ef7a34a3347f3440ab577b6d81309c378ad6ddef9e56d8b2beb51a68ad4c412bed99a8fff SHA512 f4b33bd2b8add0e09beb5443d6360d2bfd226249950233d8dd44e1e408e199e3d3e625e2b6a1e0d4b6c756371c2b1ee5e486394ca4b2bc47e48e476e0711a6e4
diff --git a/kde-apps/akonadiconsole/akonadiconsole-20.08.3.ebuild b/kde-apps/akonadiconsole/akonadiconsole-20.08.3.ebuild
deleted file mode 100644
index cb5a1ac88cad..000000000000
--- a/kde-apps/akonadiconsole/akonadiconsole-20.08.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Application for debugging Akonadi Resources"
-HOMEPAGE="https://techbase.kde.org/KDE_PIM/Akonadi/Development_Tools"
-
-LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
- dev-libs/xapian:=
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/akonadi-search-${PVCUT}:5
- >=kde-apps/calendarsupport-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/messagelib-${PVCUT}:5
- >=kde-frameworks/kcalendarcore-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcontacts-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/akonadiconsole/akonadiconsole-20.12.2.ebuild b/kde-apps/akonadiconsole/akonadiconsole-20.12.2.ebuild
index b06d71b02a82..402f00b62a0d 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-20.12.2.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-20.12.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://techbase.kde.org/KDE_PIM/Akonadi/Development_Tools"
LICENSE="GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index a8125c61b8fe..a60e08cdd47f 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,2 +1 @@
-DIST akregator-20.08.3.tar.xz 2204024 BLAKE2B efe9b4acf8140eb018ce0b414f3829da2e4622348a54d43dc6707dd2a140eeec5bddcea1f33a04b8e3a96b312363d041b49d653597ff0985e9a8e2a1a8c89a02 SHA512 6df49879061e7163ab7c433929cfcb1ebbf2f8a974b7df9247c5576dd0e7aae4b8288daad2e65b0f302e0d208ef01de4dff838264b812f5f6d584051e3ca5c11
DIST akregator-20.12.2.tar.xz 2205104 BLAKE2B 56a05146aca50a419a659c93bbd9b8c5903e2465f80cd5125a01be14f53a67d1d9da6e7e7b2a97550ec86d28e85431f8f56392475d7c3f371b9c86754246ed17 SHA512 b8fef0b5f4a825d8854373810f173dc0c3d9e95007f6e96647d8b537801910f572d7b8593801137b078cbd754447e70af08c1ff3c2863e733be10dcfbc4c0913
diff --git a/kde-apps/akregator/akregator-20.08.3.ebuild b/kde-apps/akregator/akregator-20.08.3.ebuild
deleted file mode 100644
index 43aa546717ac..000000000000
--- a/kde-apps/akregator/akregator-20.08.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="News feed aggregator"
-HOMEPAGE="https://apps.kde.org/en/akregator"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="telemetry"
-
-RDEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-apps/grantleetheme-${PVCUT}:5
- >=kde-apps/kontactinterface-${PVCUT}:5
- >=kde-apps/kpimtextedit-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/messagelib-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/syndication-${KFMIN}:5
- telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${RDEPEND}
- dev-libs/grantlee:5
-"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package telemetry KUserFeedback)
- )
-
- ecm_src_configure
-}
diff --git a/kde-apps/akregator/akregator-20.12.2.ebuild b/kde-apps/akregator/akregator-20.12.2.ebuild
index 3fce873a34ae..2f6b14d2bdc9 100644
--- a/kde-apps/akregator/akregator-20.12.2.ebuild
+++ b/kde-apps/akregator/akregator-20.12.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/akregator"
LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE="telemetry"
RDEPEND="
diff --git a/kde-apps/calendarjanitor/Manifest b/kde-apps/calendarjanitor/Manifest
index 3e429bca6f88..36783e8c4152 100644
--- a/kde-apps/calendarjanitor/Manifest
+++ b/kde-apps/calendarjanitor/Manifest
@@ -1,2 +1 @@
-DIST akonadi-calendar-tools-20.08.3.tar.xz 228576 BLAKE2B 53d3beb42c766f0ac47ea54b5294b61680a6e712ed624489b7df2c182f014ec07fbcb81bd47ab6a2b045515a7d85f7efd1616b9aa672338e84b80258d98298b0 SHA512 d8dc7fbd74cce1081f2398d1d5478e08cd0b7e9c4aed5dc89b3a54b43e0427526c9a47f7304667b796bec2cb53d0f17d4541345f647165f50edfff44c7ee91a3
DIST akonadi-calendar-tools-20.12.2.tar.xz 224864 BLAKE2B 137a0d975242b2e419007ebc9be0eaac55e5f024b708c78fb773158695a0bb0b673657b8634423826eeba03cfdab75ff7e85bcc6ce09e33372a0927490d0b9b8 SHA512 12ed3517ec1a308bbb80691bb1fccf29a2a44c9715436288f51aa5eeffee25c3842d6664c1bfbe7c2ac669806d5ae0f0123bc1dece279953abd95feaafafff81
diff --git a/kde-apps/calendarjanitor/calendarjanitor-20.08.3.ebuild b/kde-apps/calendarjanitor/calendarjanitor-20.08.3.ebuild
deleted file mode 100644
index a9da3e17b958..000000000000
--- a/kde-apps/calendarjanitor/calendarjanitor-20.08.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
-ECM_TEST="false"
-KDE_ORG_NAME="akonadi-calendar-tools"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Tool to scan calendar data for buggy instances"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-calendar-${PVCUT}:5
- >=kde-apps/calendarsupport-${PVCUT}:5
- >=kde-frameworks/kcalendarcore-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- ecm_src_prepare
-
- cmake_comment_add_subdirectory doc konsolekalendar
- sed -i -e "/console\.categories/ s/^/#DONT/" CMakeLists.txt || die
-
- # delete colliding konsolekalendar translations
- if [[ ${KDE_BUILD_TYPE} = release ]]; then
- rm -f po/*/konsolekalendar.po || die
- rm -rf po/*/docs/konsolekalendar || die
- fi
-}
diff --git a/kde-apps/calendarjanitor/calendarjanitor-20.12.2.ebuild b/kde-apps/calendarjanitor/calendarjanitor-20.12.2.ebuild
index 0ee234b1a929..6e6c5bf7979d 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-20.12.2.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-20.12.2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Tool to scan calendar data for buggy instances"
LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/calendarsupport/Manifest b/kde-apps/calendarsupport/Manifest
index 795b904cfb14..2bbf96696f09 100644
--- a/kde-apps/calendarsupport/Manifest
+++ b/kde-apps/calendarsupport/Manifest
@@ -1,2 +1 @@
-DIST calendarsupport-20.08.3.tar.xz 661708 BLAKE2B cf7ef77afe14db2e5eddd48617f47f3d32c93b6d2697ed35f8dfacb73ca50d39e04ab459f8fb5ba18f48068034828c5d6fdd1af2604ae97586bfa4bac33b3029 SHA512 dc1f1eb8b633f19edf841e9b4d50b78afea9297918a4b3d8bab47352b53caec2737566504c9487fe1e36a01873e6e4bda8e257f997742d244d276992ddcc77f5
DIST calendarsupport-20.12.2.tar.xz 665200 BLAKE2B dbaf358e0295c27f663b87f91598a4aae6449f37bd470648f8416c69e654b8db39a37c9429c32ba204232118e7dc67cf3a1ef7927fdc2b84a04812620e0499f8 SHA512 63878598f52634e6dcd4aca527dd3f6278b9d2569b169d2a81a78d31b2cce632b45713da8fd4b97d241aa041fd9805a909b59aa2c090f6b55e685fe60e2f8cde
diff --git a/kde-apps/calendarsupport/calendarsupport-20.08.3.ebuild b/kde-apps/calendarsupport/calendarsupport-20.08.3.ebuild
deleted file mode 100644
index 58478c498820..000000000000
--- a/kde-apps/calendarsupport/calendarsupport-20.08.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="false"
-KFMIN=5.74.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Calendar support library"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
- dev-libs/libical
- >=dev-qt/designer-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-calendar-${PVCUT}:5
- >=kde-apps/akonadi-mime-${PVCUT}:5
- >=kde-apps/akonadi-notes-${PVCUT}:5
- >=kde-apps/kcalutils-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=kde-frameworks/kcalendarcore-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/kholidays-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.2.patch" )
diff --git a/kde-apps/calendarsupport/calendarsupport-20.12.2.ebuild b/kde-apps/calendarsupport/calendarsupport-20.12.2.ebuild
index be894e0fd1b4..85d97b997ff4 100644
--- a/kde-apps/calendarsupport/calendarsupport-20.12.2.ebuild
+++ b/kde-apps/calendarsupport/calendarsupport-20.12.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Calendar support library"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/calendarsupport/files/calendarsupport-20.08.3-qt-5.15.2.patch b/kde-apps/calendarsupport/files/calendarsupport-20.08.3-qt-5.15.2.patch
deleted file mode 100644
index af94c2e7a0de..000000000000
--- a/kde-apps/calendarsupport/files/calendarsupport-20.08.3-qt-5.15.2.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-From b4193facb223bd5b73a65318dec8ced51b66adf7 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella
-Date: Wed, 9 Sep 2020 17:26:46 +0200
-Subject: [PATCH] Port away from deprecated QPrinter functions
-
-This implies changing from QPrinter::Orientation to QPageLayout::Orientation. The actual values are the same tough.
----
- src/printing/calprintdefaultplugins.cpp | 14 +++++++-------
- src/printing/calprintdefaultplugins.h | 10 +++++-----
- src/printing/calprinter.cpp | 6 +++---
- src/printing/calprintpluginbase.cpp | 8 ++++----
- src/printing/calprintpluginbase.h | 2 +-
- src/printing/printplugin.h | 4 ++--
- src/printing/yearprint.cpp | 6 +++---
- src/printing/yearprint.h | 2 +-
- 8 files changed, 26 insertions(+), 26 deletions(-)
-
-diff --git a/src/printing/calprintdefaultplugins.cpp b/src/printing/calprintdefaultplugins.cpp
-index 862b74d..e3d802d 100644
---- a/src/printing/calprintdefaultplugins.cpp
-+++ b/src/printing/calprintdefaultplugins.cpp
-@@ -805,7 +805,7 @@ void CalPrintDay::print(QPainter &p, int width, int height)
- QString line1 = local.toString(mFromDate, QLocale::ShortFormat);
- QString line2 = local.toString(mToDate, QLocale::ShortFormat);
- QString title;
-- if (orientation() == QPrinter::Landscape) {
-+ if (orientation() == QPageLayout::Landscape) {
- title = i18nc("date from-to", "%1 - %2", line1, line2);
- } else {
- title = i18nc("date from-\nto", "%1 -\n%2", line1, line2);
-@@ -1050,14 +1050,14 @@ void CalPrintWeek::saveConfig()
- }
- }
-
--QPrinter::Orientation CalPrintWeek::defaultOrientation() const
-+QPageLayout::Orientation CalPrintWeek::defaultOrientation() const
- {
- if (mWeekPrintType == Filofax) {
-- return QPrinter::Portrait;
-+ return QPageLayout::Portrait;
- } else if (mWeekPrintType == SplitWeek) {
-- return QPrinter::Portrait;
-+ return QPageLayout::Portrait;
- } else {
-- return QPrinter::Landscape;
-+ return QPageLayout::Landscape;
- }
- }
-
-@@ -1099,7 +1099,7 @@ void CalPrintWeek::print(QPainter &p, int width, int height)
- do {
- line1 = local.toString(curWeek.addDays(-6), QLocale::ShortFormat);
- line2 = local.toString(curWeek, QLocale::ShortFormat);
-- if (orientation() == QPrinter::Landscape) {
-+ if (orientation() == QPageLayout::Landscape) {
- title = i18nc("date from-to", "%1 - %2", line1, line2);
- } else {
- title = i18nc("date from-\nto", "%1 -\n%2", line1, line2);
-@@ -1126,7 +1126,7 @@ void CalPrintWeek::print(QPainter &p, int width, int height)
- do {
- line1 = local.toString(curWeek.addDays(-6), QLocale::ShortFormat);
- line2 = local.toString(curWeek, QLocale::ShortFormat);
-- if (orientation() == QPrinter::Landscape) {
-+ if (orientation() == QPageLayout::Landscape) {
- title = i18nc("date from - to (week number)", "%1 - %2 (Week %3)",
- line1, line2, curWeek.weekNumber());
- } else {
-diff --git a/src/printing/calprintdefaultplugins.h b/src/printing/calprintdefaultplugins.h
-index 4df72f6..3f62d0b 100644
---- a/src/printing/calprintdefaultplugins.h
-+++ b/src/printing/calprintdefaultplugins.h
-@@ -53,9 +53,9 @@ public:
- }
-
- QWidget *createConfigWidget(QWidget *) override;
-- Q_REQUIRED_RESULT QPrinter::Orientation defaultOrientation() const override
-+ Q_REQUIRED_RESULT QPageLayout::Orientation defaultOrientation() const override
- {
-- return QPrinter::Portrait;
-+ return QPageLayout::Portrait;
- }
-
- public:
-@@ -166,7 +166,7 @@ public:
- /**
- Returns the default orientation for the eWeekPrintType.
- */
-- QPrinter::Orientation defaultOrientation() const override;
-+ QPageLayout::Orientation defaultOrientation() const override;
-
- public:
- void print(QPainter &p, int width, int height) override;
-@@ -222,9 +222,9 @@ public:
- }
-
- QWidget *createConfigWidget(QWidget *) override;
-- QPrinter::Orientation defaultOrientation() const override
-+ QPageLayout::Orientation defaultOrientation() const override
- {
-- return QPrinter::Landscape;
-+ return QPageLayout::Landscape;
- }
-
- public:
-diff --git a/src/printing/calprinter.cpp b/src/printing/calprinter.cpp
-index 182e0e3..10e9db6 100644
---- a/src/printing/calprinter.cpp
-+++ b/src/printing/calprinter.cpp
-@@ -126,13 +126,13 @@ void CalPrinter::doPrint(PrintPlugin *selectedStyle, CalPrinter::ePrintOrientati
- QPrinter printer;
- switch (dlgorientation) {
- case eOrientPlugin:
-- printer.setOrientation(selectedStyle->defaultOrientation());
-+ printer.setPageOrientation(selectedStyle->defaultOrientation());
- break;
- case eOrientPortrait:
-- printer.setOrientation(QPrinter::Portrait);
-+ printer.setPageOrientation(QPageLayout::Portrait);
- break;
- case eOrientLandscape:
-- printer.setOrientation(QPrinter::Landscape);
-+ printer.setPageOrientation(QPageLayout::Landscape);
- break;
- case eOrientPrinter:
- break;
-diff --git a/src/printing/calprintpluginbase.cpp b/src/printing/calprintpluginbase.cpp
-index e96f3b2..9db198e 100644
---- a/src/printing/calprintpluginbase.cpp
-+++ b/src/printing/calprintpluginbase.cpp
-@@ -232,9 +232,9 @@ void CalPrintPluginBase::setPrintFooter(bool printFooter)
- mPrintFooter = printFooter;
- }
-
--QPrinter::Orientation CalPrintPluginBase::orientation() const
-+QPageLayout::Orientation CalPrintPluginBase::orientation() const
- {
-- return mPrinter ? mPrinter->orientation() : QPrinter::Portrait;
-+ return mPrinter ? mPrinter->pageLayout().orientation() : QPageLayout::Portrait;
- }
-
- QColor CalPrintPluginBase::getTextColor(const QColor &c) const
-@@ -326,7 +326,7 @@ int CalPrintPluginBase::headerHeight() const
- {
- if (mHeaderHeight >= 0) {
- return mHeaderHeight;
-- } else if (orientation() == QPrinter::Portrait) {
-+ } else if (orientation() == QPageLayout::Portrait) {
- return PORTRAIT_HEADER_HEIGHT;
- } else {
- return LANDSCAPE_HEADER_HEIGHT;
-@@ -356,7 +356,7 @@ int CalPrintPluginBase::footerHeight() const
-
- if (mFooterHeight >= 0) {
- return mFooterHeight;
-- } else if (orientation() == QPrinter::Portrait) {
-+ } else if (orientation() == QPageLayout::Portrait) {
- return PORTRAIT_FOOTER_HEIGHT;
- } else {
- return LANDSCAPE_FOOTER_HEIGHT;
-diff --git a/src/printing/calprintpluginbase.h b/src/printing/calprintpluginbase.h
-index ff1113c..b3d41ac 100644
---- a/src/printing/calprintpluginbase.h
-+++ b/src/printing/calprintpluginbase.h
-@@ -108,7 +108,7 @@ public:
- */
- static int weekdayColumn(int weekday);
-
-- QPrinter::Orientation orientation() const;
-+ QPageLayout::Orientation orientation() const;
-
- /** Returns the height of the page header. If the height was explicitly
- set using setHeaderHeight, that value is returned, otherwise a
-diff --git a/src/printing/printplugin.h b/src/printing/printplugin.h
-index 57afdfe..73bf467 100644
---- a/src/printing/printplugin.h
-+++ b/src/printing/printplugin.h
-@@ -140,9 +140,9 @@ public:
- config settings), implement this function in your subclass and
- return the desired orientation.
- */
-- virtual QPrinter::Orientation defaultOrientation() const
-+ virtual QPageLayout::Orientation defaultOrientation() const
- {
-- return QPrinter::Portrait;
-+ return QPageLayout::Portrait;
- }
-
- /**
-diff --git a/src/printing/yearprint.cpp b/src/printing/yearprint.cpp
-index 3287ca6..e57a1c4 100644
---- a/src/printing/yearprint.cpp
-+++ b/src/printing/yearprint.cpp
-@@ -82,9 +82,9 @@ void CalPrintYear::saveConfig()
- }
- }
-
--QPrinter::Orientation CalPrintYear::defaultOrientation() const
-+QPageLayout::Orientation CalPrintYear::defaultOrientation() const
- {
-- return (mPages == 1) ? QPrinter::Landscape : QPrinter::Portrait;
-+ return (mPages == 1) ? QPageLayout::Landscape : QPageLayout::Portrait;
- }
-
- void CalPrintYear::setDateRange(const QDate &from, const QDate &to)
-@@ -131,7 +131,7 @@ void CalPrintYear::print(QPainter &p, int width, int height)
- QString stdate = locale.toString(start, QLocale::ShortFormat);
- QString endate = locale.toString(end, QLocale::ShortFormat);
- QString title;
-- if (orientation() == QPrinter::Landscape) {
-+ if (orientation() == QPageLayout::Landscape) {
- title = i18nc("date from - to", "%1 - %2", stdate, endate);
- } else {
- title = i18nc("date from -\nto", "%1 -\n%2", stdate, endate);
-diff --git a/src/printing/yearprint.h b/src/printing/yearprint.h
-index e59bf87..cd46a50 100644
---- a/src/printing/yearprint.h
-+++ b/src/printing/yearprint.h
-@@ -48,7 +48,7 @@ public:
- }
-
- QWidget *createConfigWidget(QWidget *) override;
-- Q_REQUIRED_RESULT QPrinter::Orientation defaultOrientation() const override;
-+ Q_REQUIRED_RESULT QPageLayout::Orientation defaultOrientation() const override;
-
- public:
- void print(QPainter &p, int width, int height) override;
---
-GitLab
-
diff --git a/kde-apps/eventviews/Manifest b/kde-apps/eventviews/Manifest
index 7300ff06af2a..30cb71e2319e 100644
--- a/kde-apps/eventviews/Manifest
+++ b/kde-apps/eventviews/Manifest
@@ -1,2 +1 @@
-DIST eventviews-20.08.3.tar.xz 445292 BLAKE2B 41fae6233d333a99fcecfc7f4a75acd1edd92b4398f6c149d708554b1a93377ed708745c98d9309293e6b1015b60be1d1daa5873749b333f322476f58057066a SHA512 a7fb4750ce5ac6f490a6cfead314e72334500c45b886fd3f24843bbe1eeca94aec340411217db9f223ed1546ceb09fdac8866249ba1e1c25fc0b67f9bf9a6e91
DIST eventviews-20.12.2.tar.xz 444096 BLAKE2B 937d4a1d390536140af60fe11a0cb8725b1ba7aefb89bba2984890f6fe4433e5e6a708c2e4b0d4461a003fbd276691a14ade7deeb86de4e48fec4f0f6bd35d56 SHA512 c76427eff7f14db5b58529e6c62ab1606e68fd90ce397f2d1b44013ea2d6c19761bf8b3900acee16a4aec29e6c5082a03ed349409063e0dbfa933bf68000732a
diff --git a/kde-apps/eventviews/eventviews-20.08.3.ebuild b/kde-apps/eventviews/eventviews-20.08.3.ebuild
deleted file mode 100644
index 95975bd39c9b..000000000000
--- a/kde-apps/eventviews/eventviews-20.08.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Calendar viewer for KDE PIM"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
- dev-libs/kdiagram:5
- dev-libs/libical
- >=dev-qt/qtcore-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-calendar-${PVCUT}:5
- >=kde-apps/calendarsupport-${PVCUT}:5
- >=kde-apps/kcalutils-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-frameworks/kcalendarcore-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcontacts-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/eventviews/eventviews-20.12.2.ebuild b/kde-apps/eventviews/eventviews-20.12.2.ebuild
index d83fb4df63f7..38e701200e41 100644
--- a/kde-apps/eventviews/eventviews-20.12.2.ebuild
+++ b/kde-apps/eventviews/eventviews-20.12.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Calendar viewer for KDE PIM"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/grantlee-editor/Manifest b/kde-apps/grantlee-editor/Manifest
index 9c45e34176cf..2a367f347e44 100644
--- a/kde-apps/grantlee-editor/Manifest
+++ b/kde-apps/grantlee-editor/Manifest
@@ -1,2 +1 @@
-DIST grantlee-editor-20.08.3.tar.xz 111832 BLAKE2B 49a0f3f0e8d5c281a9ccbd6e19fea17f77080dea7ff1b555ab52ca898042179ee9b852e5ca5a8b6509e45813f823b885d6adf3cfdee5dd3ab7235de423dad29e SHA512 908b0e1071731b458e8ee74ffecfbc482805086549b4db09893475f011b3659727b5381fab781a2a7edc5d17083ec1ac9a1cd56960e5cca6e20d2671b69bf0b2
DIST grantlee-editor-20.12.2.tar.xz 107480 BLAKE2B 6363c03ca0b020dd411f689a539002af822c09f0a1c2d63d131acf634e649db603c69b9ec13c3472052910846041ff62f263092332a30538d93d0fb3d1cca336 SHA512 b430d535b3c0e15c32dea5ac7aea73cd3d2353f84972fb3cdeb6c5f5d946fcc9b3058d175e998cf1b8d3dc9db5b16251d0c8cdf5d15cb710f0f7fec6ba3d4132
diff --git a/kde-apps/grantlee-editor/grantlee-editor-20.08.3.ebuild b/kde-apps/grantlee-editor/grantlee-editor-20.08.3.ebuild
deleted file mode 100644
index bbc82fe0c2d0..000000000000
--- a/kde-apps/grantlee-editor/grantlee-editor-20.08.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/kpimtextedit-${PVCUT}:5
- >=kde-apps/messagelib-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcontacts-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/ktexteditor-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/grantlee-editor/grantlee-editor-20.12.2.ebuild b/kde-apps/grantlee-editor/grantlee-editor-20.12.2.ebuild
index 14c95bd7e7d7..2c70baa0c538 100644
--- a/kde-apps/grantlee-editor/grantlee-editor-20.12.2.ebuild
+++ b/kde-apps/grantlee-editor/grantlee-editor-20.12.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Utilities and tools to manage themes in KDE PIM applications"
LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/grantleetheme/Manifest b/kde-apps/grantleetheme/Manifest
index 3f3f3ffd7cff..04c352f34c2a 100644
--- a/kde-apps/grantleetheme/Manifest
+++ b/kde-apps/grantleetheme/Manifest
@@ -1,2 +1 @@
-DIST grantleetheme-20.08.3.tar.xz 56280 BLAKE2B 8bdb1257d1315201ec9b2a4a4911d0de0de4e5902ed21477a9fbf1ba1bec40b3a3401b3a7e02932dac113cb590a9e374c987b8a39b1736795ea341fe9c683427 SHA512 2ef1cf5986a2e5956d888090c40760b5caebea4357e55ec6cd19679ec6e7fa3c683d7e57ca9bb21f60728b3c1cce73e95367e0584b7d587d4b48ec350cc3d048
DIST grantleetheme-20.12.2.tar.xz 56536 BLAKE2B 58a15b4beed8b2712bb6df6c7645cd41532b873422145c13e1b932faebecf30eda57bffa5fa214c58b3f994727341c2808b9e0a681cddcb5f2857c45c7347f80 SHA512 6f587ea30e4c5954fd09bfdacb5ebadb406c333ce04758e99ff31d7b219eb65c3be68d426f8677ad6816c38e409717f1a77fec4d4d97797fa3ee525d72380979
diff --git a/kde-apps/grantleetheme/grantleetheme-20.08.3.ebuild b/kde-apps/grantleetheme/grantleetheme-20.08.3.ebuild
deleted file mode 100644
index c799d1fd5382..000000000000
--- a/kde-apps/grantleetheme/grantleetheme-20.08.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Library for Grantlee plugins"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
- dev-libs/grantlee:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
- >=dev-qt/qtnetwork-${QTMIN}:5
-"
-
-# fails if package not already installed
-RESTRICT+=" test"
diff --git a/kde-apps/grantleetheme/grantleetheme-20.12.2.ebuild b/kde-apps/grantleetheme/grantleetheme-20.12.2.ebuild
index 55ab02ade230..662f50179731 100644
--- a/kde-apps/grantleetheme/grantleetheme-20.12.2.ebuild
+++ b/kde-apps/grantleetheme/grantleetheme-20.12.2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Library for Grantlee plugins"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE=""
RDEPEND="
diff --git a/kde-apps/incidenceeditor/Manifest b/kde-apps/incidenceeditor/Manifest
index e5d24703df4a..16836cd37406 100644
--- a/kde-apps/incidenceeditor/Manifest
+++ b/kde-apps/incidenceeditor/Manifest
@@ -1,2 +1 @@
-DIST incidenceeditor-20.08.3.tar.xz 543076 BLAKE2B 7990a6aa13098f92d0ab8b767c87592011f55e2847c7b21aac8a324a70c2e4cec8d9d5763760feb785b5eb8e3801cb862ed9f1e1aff2c30811f301c606f7a8a8 SHA512 d471a646ecb5a3ba9f0e932baa0fbccf2e159d7b69fd797003dd60f526bdfcc63dd7145bc335c3d850ec5934ccaaac52e682205f55a668bf93f713e575d5b5d0
DIST incidenceeditor-20.12.2.tar.xz 546144 BLAKE2B 2a7ee26b398347595a26b4a74c2dbfbd3c99e3cf576b484497b418b7522c9fe3ed0c218434da79b2fe72063224ab11add669e02dd033529f24a02cbf001f429b SHA512 4c28ccdbc7e389a26f93072309626966570392bb05af2457c8a8c73581f7ca9e04d030eb7d4bc45c16a5545218e928d66575cd9f5fb2333131be136f3b52c0ad
diff --git a/kde-apps/incidenceeditor/incidenceeditor-20.08.3.ebuild b/kde-apps/incidenceeditor/incidenceeditor-20.08.3.ebuild
deleted file mode 100644
index 6000ab94f038..000000000000
--- a/kde-apps/incidenceeditor/incidenceeditor-20.08.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Incidence editor for korganizer"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
- dev-libs/kdiagram:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-calendar-${PVCUT}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/akonadi-mime-${PVCUT}:5
- >=kde-apps/calendarsupport-${PVCUT}:5
- >=kde-apps/eventviews-${PVCUT}:5
- >=kde-apps/kcalutils-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/kldap-${PVCUT}:5
- >=kde-apps/kmailtransport-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=kde-frameworks/kcalendarcore-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcontacts-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/incidenceeditor/incidenceeditor-20.12.2.ebuild b/kde-apps/incidenceeditor/incidenceeditor-20.12.2.ebuild
index 70a6db0af84d..72a8cbb949a6 100644
--- a/kde-apps/incidenceeditor/incidenceeditor-20.12.2.ebuild
+++ b/kde-apps/incidenceeditor/incidenceeditor-20.12.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Incidence editor for korganizer"
LICENSE="GPL-2+"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE=""
RDEPEND="
diff --git a/kde-apps/kaddressbook/Manifest b/kde-apps/kaddressbook/Manifest
index b69982d41d6c..a6309f68a00e 100644
--- a/kde-apps/kaddressbook/Manifest
+++ b/kde-apps/kaddressbook/Manifest
@@ -1,2 +1 @@
-DIST kaddressbook-20.08.3.tar.xz 3168192 BLAKE2B d7776c19b4cbe6eb0a1034b25c1ba4efe26d965091b749dd3691557d8202bf8ea13afcf9125454aeea986394b8e23ace4af4be7a38512a4a860639c65c90ab12 SHA512 ff63a0a0b5f8d45bfde0a41f15157bbc338aceebc9455b70626a3baab5b294b24951f72c9c110f356f04dd0f5f1ed191454e1b11a13ffe10df95d99efbf6f052
DIST kaddressbook-20.12.2.tar.xz 3257200 BLAKE2B 8c5c8a31400533d145999b9d574c44d9466854da3480746d435d4d556db603ea4baf52a5563a96972281db9453d7d0212183b018a5b4d7f4fd75def79df0374b SHA512 fd7e8213db1061807b3ad509d92627282d0782af9c528d940a493fecc50c1680b97170d38d00d4b044722a598d4c5717a2561ec25171369f672518d24c99911b
diff --git a/kde-apps/kaddressbook/files/kaddressbook-20.08.3-qt-5.15.2.patch b/kde-apps/kaddressbook/files/kaddressbook-20.08.3-qt-5.15.2.patch
deleted file mode 100644
index 888febed0fa3..000000000000
--- a/kde-apps/kaddressbook/files/kaddressbook-20.08.3-qt-5.15.2.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 8aee8d40ae2a1c920d3520163d550d3b49720226 Mon Sep 17 00:00:00 2001
-From: Volker Krause
-Date: Sun, 25 Oct 2020 18:22:58 +0100
-Subject: [PATCH] Compile with recent Qt 5.15
-
-More QPrinter methods got deprecated there. DevicePixel no longer exists
-as a unit, visually Point looks pretty much the same though.
----
- src/printing/compact/compactstyle.cpp | 2 +-
- src/printing/grantlee/grantleeprintstyle.cpp | 2 +-
- src/printing/mike/mikesstyle.cpp | 2 +-
- src/printing/ringbinder/ringbinderstyle.cpp | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/printing/compact/compactstyle.cpp b/src/printing/compact/compactstyle.cpp
-index d950a963..71e74c0f 100644
---- a/src/printing/compact/compactstyle.cpp
-+++ b/src/printing/compact/compactstyle.cpp
-@@ -168,7 +168,7 @@ void CompactStyle::print(const KContacts::Addressee::List &contacts, PrintProgre
-
- // print
- QPrinter *printer = wizard()->printer();
-- printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
-+ printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
-
- progress->addMessage(i18n("Setting up document"));
-
-diff --git a/src/printing/grantlee/grantleeprintstyle.cpp b/src/printing/grantlee/grantleeprintstyle.cpp
-index d7afe8ef..49b5e494 100644
---- a/src/printing/grantlee/grantleeprintstyle.cpp
-+++ b/src/printing/grantlee/grantleeprintstyle.cpp
-@@ -38,7 +38,7 @@ GrantleePrintStyle::~GrantleePrintStyle()
- void GrantleePrintStyle::print(const KContacts::Addressee::List &contacts, PrintProgress *progress)
- {
- QPrinter *printer = wizard()->printer();
-- printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
-+ printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
-
- progress->addMessage(i18n("Setting up document"));
-
-diff --git a/src/printing/mike/mikesstyle.cpp b/src/printing/mike/mikesstyle.cpp
-index 9f698c53..81a4bd6f 100644
---- a/src/printing/mike/mikesstyle.cpp
-+++ b/src/printing/mike/mikesstyle.cpp
-@@ -107,7 +107,7 @@ MikesStyle::~MikesStyle()
- void MikesStyle::print(const KContacts::Addressee::List &contacts, PrintProgress *progress)
- {
- QPrinter *printer = wizard()->printer();
-- printer->setPageMargins(20, 20, 20, 20, QPrinter::DevicePixel);
-+ printer->setPageMargins(QMarginsF(20, 20, 20, 20), QPageLayout::Point);
-
- progress->addMessage(i18n("Setting up document"));
-
-diff --git a/src/printing/ringbinder/ringbinderstyle.cpp b/src/printing/ringbinder/ringbinderstyle.cpp
-index 60a39c86..5f600d6a 100644
---- a/src/printing/ringbinder/ringbinderstyle.cpp
-+++ b/src/printing/ringbinder/ringbinderstyle.cpp
-@@ -159,7 +159,7 @@ void RingBinderPrintStyle::print(const KContacts::Addressee::List &contacts, Pri
- config.sync();
-
- QPrinter *printer = wizard()->printer();
-- printer->setPageMargins(50, 20, 0, 50, QPrinter::DevicePixel);
-+ printer->setPageMargins(QMarginsF(50, 20, 0, 50), QPageLayout::Point);
-
- progress->addMessage(i18n("Setting up document"));
-
---
-GitLab
-
diff --git a/kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild b/kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild
deleted file mode 100644
index 4a9f7e41299e..000000000000
--- a/kde-apps/kaddressbook/kaddressbook-20.08.3.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Address book application based on KDE Frameworks"
-HOMEPAGE="https://apps.kde.org/en/kaddressbook"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="telemetry"
-
-DEPEND="
- >=app-crypt/gpgme-1.11.1[cxx,qt5]
- dev-libs/grantlee:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/akonadi-search-${PVCUT}:5
- >=kde-apps/grantleetheme-${PVCUT}:5
- >=kde-apps/kdepim-apps-libs-${PVCUT}:5
- >=kde-apps/kontactinterface-${PVCUT}:5
- >=kde-apps/libgravatar-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/libkleo-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcontacts-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/prison-${KFMIN}:5
- telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}
- >=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.2.patch" )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package telemetry KUserFeedback)
- )
-
- ecm_src_configure
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- elog "Optional dependencies:"
- optfeature "Postal addresses" kde-apps/kdepim-addons:${SLOT}
- fi
- ecm_pkg_postinst
-}
diff --git a/kde-apps/kaddressbook/kaddressbook-20.12.2.ebuild b/kde-apps/kaddressbook/kaddressbook-20.12.2.ebuild
index 2bf21097d8c8..c0eb71bdae66 100644
--- a/kde-apps/kaddressbook/kaddressbook-20.12.2.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-20.12.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/en/kaddressbook"
LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE="telemetry"
DEPEND="
diff --git a/kde-apps/kalarm/Manifest b/kde-apps/kalarm/Manifest
index 669915131b9c..27df6e14ece4 100644
--- a/kde-apps/kalarm/Manifest
+++ b/kde-apps/kalarm/Manifest
@@ -1,2 +1 @@
-DIST kalarm-20.08.3.tar.xz 1985344 BLAKE2B 6a6f44d9479370834c89dad00aca7fcbbf9c0f655450b29e0cc9bad0a5376946f24d36554088afcc2ec279d530ca6c43e31efb079f09808965ff74242053f137 SHA512 d564922bf41f176034535fd795d25eeabfbcd8e7eea115c29e5c0f1a2313de5b33406f87e1f7e705d7f814b9a2b826ac4cf7ac50723bf90beea5ecc92c750496
DIST kalarm-20.12.2.tar.xz 2080628 BLAKE2B dbb9109f6ed67b08cd57a575cd008bff7eafded5a64a49b13e507f54b0f982a202d9673e958c8a80cebab9df3c19ad6513ee6f8aab9f93791e8d8c7ce7cac614 SHA512 ff3b86679a98aa3da30691989b90bccaa1b400b5d11e6e8c2c730f999d64146c0913c4b321da7fd20a6e409c5200dad2a997036bffcb380957e6ec1b69d7f898
diff --git a/kde-apps/kalarm/kalarm-20.08.3.ebuild b/kde-apps/kalarm/kalarm-20.08.3.ebuild
deleted file mode 100644
index 65e000e16906..000000000000
--- a/kde-apps/kalarm/kalarm-20.08.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Application to manage alarms and other timer based alerts for the desktop"
-HOMEPAGE="https://apps.kde.org/en/kalarm https://userbase.kde.org/KAlarm"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="X"
-
-BDEPEND="
- dev-libs/libxslt
-"
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/akonadi-mime-${PVCUT}:5
- >=kde-apps/kalarmcal-${PVCUT}:5
- >=kde-apps/kcalutils-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/kmailtransport-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/kontactinterface-${PVCUT}:5
- >=kde-apps/kpimtextedit-${PVCUT}:5
- >=kde-apps/mailcommon-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=kde-frameworks/kauth-${KFMIN}:5
- >=kde-frameworks/kcalendarcore-${KFMIN}:5
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcontacts-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kglobalaccel-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/kholidays-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=media-libs/phonon-4.11.0
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- )
-"
-RDEPEND="${DEPEND}
- >=kde-apps/kdepim-runtime-${PVCUT}:5
-"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package X Qt5X11Extras)
- $(cmake_use_find_package X X11)
- )
-
- ecm_src_configure
-}
diff --git a/kde-apps/kalarm/kalarm-20.12.2.ebuild b/kde-apps/kalarm/kalarm-20.12.2.ebuild
index 2e220c77ac31..b5da90eae87f 100644
--- a/kde-apps/kalarm/kalarm-20.12.2.ebuild
+++ b/kde-apps/kalarm/kalarm-20.12.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/en/kalarm https://userbase.kde.org/KAlarm"
LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE="X"
BDEPEND="
diff --git a/kde-apps/kalarmcal/Manifest b/kde-apps/kalarmcal/Manifest
index 0ec91aeb5cd8..87b9046f6721 100644
--- a/kde-apps/kalarmcal/Manifest
+++ b/kde-apps/kalarmcal/Manifest
@@ -1,2 +1 @@
-DIST kalarmcal-20.08.3.tar.xz 575188 BLAKE2B c565d1fbd134fc7a6c06691730e23a75bea2a5e0e24d7e0924d492821f931d96e5ba6ad18eb58779a27fea3f9715a9166f3f275fae0452f5b9ad369e47f974f7 SHA512 a0bcd1aa8ff46dbd6b58386538a78741eed1252b423c6f22e15a43c3131655918b1f97512fcd9d9fef06d7c7f192210db9ef7f442eaf3c2aa46b0ed649108e22
DIST kalarmcal-20.12.2.tar.xz 576636 BLAKE2B 0b0eae2df5bb31d285c0c484133e233f1b1b42b34c99bd45fea5886e550f1f1669799f0f0661b133a183990fb7477ab017f0baba4946ddf3b63850ceaca80600 SHA512 af5522ff68bda3f6443aa3049f2826d85567fec77adf72721c79f4a1767272ae8181e663e1b904b7c49953630185df37f4b50999a961f964caa65911653038ba
diff --git a/kde-apps/kalarmcal/kalarmcal-20.08.3.ebuild b/kde-apps/kalarmcal/kalarmcal-20.08.3.ebuild
deleted file mode 100644
index ea2571f0e7f1..000000000000
--- a/kde-apps/kalarmcal/kalarmcal-20.08.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Client library to access and handling of KAlarm calendar data"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/kcalutils-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-frameworks/kcalendarcore-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kholidays-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
- test? ( >=dev-qt/qtdbus-${QTMIN}:5 )
-"
-
-src_test() {
- LC_TIME="C" ecm_src_test #bug 665626
-}
diff --git a/kde-apps/kalarmcal/kalarmcal-20.12.2.ebuild b/kde-apps/kalarmcal/kalarmcal-20.12.2.ebuild
index 1ad9db797272..01b92b99042d 100644
--- a/kde-apps/kalarmcal/kalarmcal-20.12.2.ebuild
+++ b/kde-apps/kalarmcal/kalarmcal-20.12.2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Client library to access and handling of KAlarm calendar data"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE=""
RDEPEND="
diff --git a/kde-apps/kcalutils/Manifest b/kde-apps/kcalutils/Manifest
index 47e0066c6951..449e25e6dcbc 100644
--- a/kde-apps/kcalutils/Manifest
+++ b/kde-apps/kcalutils/Manifest
@@ -1,2 +1 @@
-DIST kcalutils-20.08.3.tar.xz 324796 BLAKE2B f7d140d9fc4a28ffd71e5ddb7ee480d1b4a02af2b423cbee1dc3212984d3ef8c119325d231cd28da838bd721ecb18ece8f627839d01f1f09cd9d5e0bfd97d282 SHA512 6dbfde1ee9b245514ed09fc4e64d590c405bc7690087099600e8eedf6e9160eaa2b4e74e640b5bf51bca7ea354652446dfd9685277ace194d4ea65572eeb224a
DIST kcalutils-20.12.2.tar.xz 324624 BLAKE2B 180837b6f461b41a9915f96ee202d84681340091e2f2093a4f6d46757f67a04d8f2adf9252fe7cf10652d8b61d6ebdac0119f153015f3b201f17cad3727843d1 SHA512 ed4a2dbd9dc866809c5c2ee7befe9070d1b94b02d5066e1bd0e460ec2f633bb7040328bf0f6a0df128788b203eac0866f129a34f27ad391d279ed99ce9c7e8b9
diff --git a/kde-apps/kcalutils/kcalutils-20.08.3.ebuild b/kde-apps/kcalutils/kcalutils-20.08.3.ebuild
deleted file mode 100644
index 96ef8ecedd06..000000000000
--- a/kde-apps/kcalutils/kcalutils-20.08.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library providing utility functions for the handling of calendar data"
-HOMEPAGE="https://api.kde.org/kdepim/kcalutils/html/index.html"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
- >=dev-libs/grantlee-5.2.0:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-frameworks/kcalendarcore-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test" # bugs 653616, 711666
diff --git a/kde-apps/kcalutils/kcalutils-20.12.2.ebuild b/kde-apps/kcalutils/kcalutils-20.12.2.ebuild
index bb4bb6a682db..607945f11100 100644
--- a/kde-apps/kcalutils/kcalutils-20.12.2.ebuild
+++ b/kde-apps/kcalutils/kcalutils-20.12.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://api.kde.org/kdepim/kcalutils/html/index.html"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kdepim-addons/Manifest b/kde-apps/kdepim-addons/Manifest
index 76852713b828..7c39c3e3c777 100644
--- a/kde-apps/kdepim-addons/Manifest
+++ b/kde-apps/kdepim-addons/Manifest
@@ -1,2 +1 @@
-DIST kdepim-addons-20.08.3.tar.xz 2071996 BLAKE2B f66800962d6f42d7205ee718b639b22f2865f6e0f1b36a7c5caac7074affbf83bb5540e9ac6e3cb5587b6b129eb69e8d156f5b6f2f8bf90e11c00f08bb9adf01 SHA512 c788f3aa204486491747ca976268347b8b916c84670e58087a009d0cd153be9a199c09434f2e884d26d39f92728210e97ac4e9c74f20ba6fcf37c6e83276980d
DIST kdepim-addons-20.12.2.tar.xz 2145492 BLAKE2B 6c143977f8e645c9fde13fb5453c292cc8b4068721cb82beac942dfa571906648b03e49e0aa69e37c8042d4a3c0cea4b5befe48716adc736b7bdbf03b0c6b4c9 SHA512 33ed5c0e6444c292f78767c32778ac11a4d1e567c7fde2c85ab10016ddaa7adef7d29e2c75635b1538abf0e6f59eaeae0810b3b122c9aeadc0de407e476c7797
diff --git a/kde-apps/kdepim-addons/kdepim-addons-20.08.3.ebuild b/kde-apps/kdepim-addons/kdepim-addons-20.08.3.ebuild
deleted file mode 100644
index bc9c082334d4..000000000000
--- a/kde-apps/kdepim-addons/kdepim-addons-20.08.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Plugins for KDE Personal Information Management Suite"
-HOMEPAGE="https://apps.kde.org/en/kontact"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="importwizard markdown"
-
-RDEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/akonadi-notes-${PVCUT}:5
- >=kde-apps/calendarsupport-${PVCUT}:5
- >=kde-apps/eventviews-${PVCUT}:5
- >=kde-apps/grantleetheme-${PVCUT}:5
- >=kde-apps/incidenceeditor-${PVCUT}:5
- >=kde-apps/kdepim-apps-libs-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/kimap-${PVCUT}:5
- >=kde-apps/kitinerary-${PVCUT}:5
- >=kde-apps/kmailtransport-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/kontactinterface-${PVCUT}:5
- >=kde-apps/kpkpass-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/libkleo-${PVCUT}:5
- >=kde-apps/libksieve-${PVCUT}:5
- >=kde-apps/libktnef-${PVCUT}:5
- >=kde-apps/mailcommon-${PVCUT}:5
- >=kde-apps/messagelib-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcontacts-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/prison-${KFMIN}:5
- >=kde-frameworks/syntax-highlighting-${KFMIN}:5
- importwizard? ( >=kde-apps/akonadi-import-wizard-${PVCUT}:5 )
- markdown? ( app-text/discount )
-"
-DEPEND="${RDEPEND}
- >=app-crypt/gpgme-1.11.1[cxx,qt5]
-"
-
-RESTRICT+=" test"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package importwizard KPimImportWizard)
- $(cmake_use_find_package markdown Discount)
- )
-
- ecm_src_configure
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- elog "Optional dependencies:"
- optfeature "regex support for Sieve editor plugin" kde-misc/kregexpeditor
- fi
- ecm_pkg_postinst
-}
diff --git a/kde-apps/kdepim-addons/kdepim-addons-20.12.2.ebuild b/kde-apps/kdepim-addons/kdepim-addons-20.12.2.ebuild
index 16a173a9f36e..9acc125594ec 100644
--- a/kde-apps/kdepim-addons/kdepim-addons-20.12.2.ebuild
+++ b/kde-apps/kdepim-addons/kdepim-addons-20.12.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/en/kontact"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE="importwizard markdown"
RDEPEND="
diff --git a/kde-apps/kdepim-meta/kdepim-meta-20.08.3.ebuild b/kde-apps/kdepim-meta/kdepim-meta-20.08.3.ebuild
deleted file mode 100644
index 73ae704c0919..000000000000
--- a/kde-apps/kdepim-meta/kdepim-meta-20.08.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="KDE PIM - merge this to pull in all kdepim-derived packages"
-HOMEPAGE="https://apps.kde.org/en/kontact"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="bogofilter clamav spamassassin"
-
-RDEPEND="
- >=kde-apps/akonadi-${PV}:${SLOT}
- >=kde-apps/akonadiconsole-${PV}:${SLOT}
- >=kde-apps/akonadi-calendar-${PV}:${SLOT}
- >=kde-apps/akonadi-contacts-${PV}:${SLOT}
- >=kde-apps/akonadi-import-wizard-${PV}:${SLOT}
- >=kde-apps/akonadi-mime-${PV}:${SLOT}
- >=kde-apps/akonadi-notes-${PV}:${SLOT}
- >=kde-apps/akonadi-search-${PV}:${SLOT}
- >=kde-apps/akregator-${PV}:${SLOT}
- >=kde-apps/calendarjanitor-${PV}:${SLOT}
- >=kde-apps/calendarsupport-${PV}:${SLOT}
- >=kde-apps/eventviews-${PV}:${SLOT}
- >=kde-apps/grantlee-editor-${PV}:${SLOT}
- >=kde-apps/grantleetheme-${PV}:${SLOT}
- >=kde-apps/incidenceeditor-${PV}:${SLOT}
- >=kde-apps/kaddressbook-${PV}:${SLOT}
- >=kde-apps/kalarm-${PV}:${SLOT}
- >=kde-apps/kalarmcal-${PV}:${SLOT}
- >=kde-apps/kcalutils-${PV}:${SLOT}
- >=kde-apps/kdepim-addons-${PV}:${SLOT}
- >=kde-apps/kdepim-apps-libs-${PV}:${SLOT}
- >=kde-apps/kdepim-runtime-${PV}:${SLOT}
- >=kde-apps/kidentitymanagement-${PV}:${SLOT}
- >=kde-apps/kimap-${PV}:${SLOT}
- >=kde-apps/kitinerary-${PV}:${SLOT}
- >=kde-apps/kldap-${PV}:${SLOT}
- >=kde-apps/kleopatra-${PV}:${SLOT}
- >=kde-apps/kmail-${PV}:${SLOT}
- >=kde-apps/kmail-account-wizard-${PV}:${SLOT}
- >=kde-apps/kmailtransport-${PV}:${SLOT}
- >=kde-apps/kmbox-${PV}:${SLOT}
- >=kde-apps/kmime-${PV}:${SLOT}
- >=kde-apps/knotes-${PV}:${SLOT}
- >=kde-apps/konsolekalendar-${PV}:${SLOT}
- >=kde-apps/kontact-${PV}:${SLOT}
- >=kde-apps/kontactinterface-${PV}:${SLOT}
- >=kde-apps/korganizer-${PV}:${SLOT}
- >=kde-apps/kpimtextedit-${PV}:${SLOT}
- >=kde-apps/kpkpass-${PV}:${SLOT}
- >=kde-apps/ksmtp-${PV}:${SLOT}
- >=kde-apps/libgravatar-${PV}:${SLOT}
- >=kde-apps/libkdepim-${PV}:${SLOT}
- >=kde-apps/libkgapi-${PV}:${SLOT}
- >=kde-apps/libkleo-${PV}:${SLOT}
- >=kde-apps/libksieve-${PV}:${SLOT}
- >=kde-apps/libktnef-${PV}:${SLOT}
- >=kde-apps/mailcommon-${PV}:${SLOT}
- >=kde-apps/mailimporter-${PV}:${SLOT}
- >=kde-apps/mbox-importer-${PV}:${SLOT}
- >=kde-apps/messagelib-${PV}:${SLOT}
- >=kde-apps/pim-data-exporter-${PV}:${SLOT}
- >=kde-apps/pim-sieve-editor-${PV}:${SLOT}
- >=kde-apps/pimcommon-${PV}:${SLOT}
-"
-# Optional runtime dependencies: kde-apps/kmail
-RDEPEND="${RDEPEND}
- bogofilter? ( mail-filter/bogofilter )
- clamav? ( app-antivirus/clamav )
- spamassassin? ( mail-filter/spamassassin )
-"
diff --git a/kde-apps/kdepim-meta/kdepim-meta-20.12.2.ebuild b/kde-apps/kdepim-meta/kdepim-meta-20.12.2.ebuild
index 96540f8bfea5..6f04a2b45178 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-20.12.2.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-20.12.2.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://apps.kde.org/en/kontact"
LICENSE="metapackage"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE="bogofilter clamav spamassassin"
RDEPEND="
diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index f3cc67de9a4e..2349370f7f15 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,2 +1 @@
-DIST kdepim-runtime-20.08.3.tar.xz 1754672 BLAKE2B 6cfba7756489bbf86025637fa0943342359f081771843b73394c822f62ed7b5aef70546acef200544ac5037d603836c718ca7e81e8ef25808767fb4462cfc386 SHA512 98a3623b3973e7b7c194ef1ef986012e0dfddb4c74c3fddba23cac928a73e6f6b634883407ec56ec6f613f8830112389f3c9eb19c89a2164178f2063be72d623
DIST kdepim-runtime-20.12.2.tar.xz 1801616 BLAKE2B d1db1893a3f87392ecd345976735545a90188aa6b0156b3728c16e08dd3ffd35648345509cb8bce65f7a939708b45be6b8849a8df2ec48f0ae6275efd8982b07 SHA512 234751643730d2ef2f7e4988ca1cf364c30c23997f5e611ef24b09745ee497742210af21096fe2301bca1bdadfda2e7cf47f7ace1627b79ee8d9f8cdd2ebac4e
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-20.08.3.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-20.08.3.ebuild
deleted file mode 100644
index 3512281b89c8..000000000000
--- a/kde-apps/kdepim-runtime/kdepim-runtime-20.08.3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM"
-HOMEPAGE="https://apps.kde.org/en/kontact"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-# TODO kolab
-BDEPEND="
- dev-libs/libxslt
-"
-RDEPEND="
- >=app-crypt/qca-2.3.0:2
- dev-libs/cyrus-sasl:2
- dev-libs/libical:=
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtnetworkauth-${QTMIN}:5
- >=dev-qt/qtspeech-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-calendar-${PVCUT}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/akonadi-mime-${PVCUT}:5
- >=kde-apps/akonadi-notes-${PVCUT}:5
- >=kde-apps/kalarmcal-${PVCUT}:5
- >=kde-apps/kcalutils-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/kimap-${PVCUT}:5
- >=kde-apps/kldap-${PVCUT}:5
- >=kde-apps/kmailtransport-${PVCUT}:5
- >=kde-apps/kmbox-${PVCUT}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/libkdepim-${PVCUT}:5
- >=kde-apps/libkgapi-${PVCUT}:5
- >=kde-apps/pimcommon-${PVCUT}:5
- >=kde-frameworks/kcalendarcore-${KFMIN}:5
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcontacts-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdav-${KFMIN}:5
- >=kde-frameworks/kholidays-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
- >=dev-qt/qtxmlpatterns-${QTMIN}:5
- test? ( >=kde-apps/kimap-${PVCUT}:5[test] )
-"
-
-RESTRICT+=" test"
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON
- )
- ecm_src_configure
-}
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-20.12.2.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-20.12.2.ebuild
index 51e789f92ae4..78109648bc76 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-20.12.2.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-20.12.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/en/kontact"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE=""
# TODO kolab
diff --git a/kde-apps/kidentitymanagement/Manifest b/kde-apps/kidentitymanagement/Manifest
index f327fa8ecd87..64baf318a5a1 100644
--- a/kde-apps/kidentitymanagement/Manifest
+++ b/kde-apps/kidentitymanagement/Manifest
@@ -1,2 +1 @@
-DIST kidentitymanagement-20.08.3.tar.xz 151216 BLAKE2B f82931f29e9e18e8e6d5da112a27bac31ef8e846483381f56ef21dd61f0e2e371161b4ac3d3d6319f1ce7ac407948023e37d182aaa7872b739dfa5a02aa9c36e SHA512 ad7ffbf8d948f052ba24dc887ab7f6d259be277e13452451b09c2fb79358650bf91cee714358c4bcae00d5c6787d5ac95028e114823c6b4557b0b8d984322b93
DIST kidentitymanagement-20.12.2.tar.xz 152092 BLAKE2B c23b6d9eb32f7c85d742a323166acad5b544cb5920130536a1df0ae44a87df9f78fc7c7348557cfa1ae6d60d771417fd4d47ebbb75fef06c66f0b0ca4eca9d5c SHA512 8a7544376b475b533d618c40fa3acad42a817f147492dc31dfb1622a727db9912dbedd8222c46c05bd11cfe4dc09b53dbb47f6252cd3965f2e52cee62a532ac2
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-20.08.3.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-20.08.3.ebuild
deleted file mode 100644
index 9a91376f4ee1..000000000000
--- a/kde-apps/kidentitymanagement/kidentitymanagement-20.08.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Library for managing identitites"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-apps/kpimtextedit-${PVCUT}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
diff --git a/kde-apps/kidentitymanagement/kidentitymanagement-20.12.2.ebuild b/kde-apps/kidentitymanagement/kidentitymanagement-20.12.2.ebuild
index 055f58f6caf0..ddfde1583b45 100644
--- a/kde-apps/kidentitymanagement/kidentitymanagement-20.12.2.ebuild
+++ b/kde-apps/kidentitymanagement/kidentitymanagement-20.12.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library for managing identitites"
LICENSE="GPL-2+ LGPL-2.1+"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/kimap/Manifest b/kde-apps/kimap/Manifest
index 0f527cc091f7..8e0ba2dc26a9 100644
--- a/kde-apps/kimap/Manifest
+++ b/kde-apps/kimap/Manifest
@@ -1,2 +1 @@
-DIST kimap-20.08.3.tar.xz 120264 BLAKE2B f26910d0a599fad9509debac0a11c2cdf4b8733a3b50f89bdfe9ce2dae8004fa916a428fe73a911ca6e157e4571522901183913614f32dd4124bd4a2897e711c SHA512 c4213042b2b6ceb11986a7af962fe8e7c6de488e06456118527bfcab2b63f68ebc1e66583c8bdb0614156122fcba21d0ec24bd6e9965b689f0451d2f1016b9c8
DIST kimap-20.12.2.tar.xz 124672 BLAKE2B f03ac4355a6c34af2a249e83d726c0120c12d1a7344e9232aef78adbd3f0f9aa11ffa4610d063fb17c724d7ba335bfec3ead08227994a5796c4ed17a108c5066 SHA512 8017720c029aad508b0f32aee0a338785e72566e20eba03a07ec0644c77b929c90049247988e684e52d34f00025c88b41e36e1acbd83c625a1769fa651fa5317
diff --git a/kde-apps/kimap/kimap-20.08.3.ebuild b/kde-apps/kimap/kimap-20.08.3.ebuild
deleted file mode 100644
index a30252b125c6..000000000000
--- a/kde-apps/kimap/kimap-20.08.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Library for interacting with IMAP servers"
-HOMEPAGE="https://api.kde.org/kdepim/kimap/html/index.html"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="
- dev-libs/cyrus-sasl
- >=dev-qt/qtgui-${QTMIN}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-frameworks/kcodecs-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
-"
-# TODO: Convince upstream not to install stuff with tests
-DEPEND="${RDEPEND}
- test? ( >=dev-qt/qtnetwork-${QTMIN}:5 )
-"
-
-src_test() {
- # tests cannot be run in parallel #605586
- local myctestargs=(
- -j1
- )
- ecm_src_test
-}
diff --git a/kde-apps/kimap/kimap-20.12.2.ebuild b/kde-apps/kimap/kimap-20.12.2.ebuild
index 6553e8cae07f..fe7782838823 100644
--- a/kde-apps/kimap/kimap-20.12.2.ebuild
+++ b/kde-apps/kimap/kimap-20.12.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://api.kde.org/kdepim/kimap/html/index.html"
LICENSE="GPL-2+"
SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
IUSE=""
RDEPEND="
diff --git a/kde-apps/kitinerary/Manifest b/kde-apps/kitinerary/Manifest
index e28a82693d29..dae43ab6cf54 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,2 +1 @@
-DIST kitinerary-20.08.3.tar.xz 1756240 BLAKE2B 2c25e6befd0f3924fb80c7ec5de6526b1f45e663104fc8e3637456354f25984a2bc3d4d00c94f163781aa9e55f365887774d586f01ef1c5e9d27bc3cdbfd2e8a SHA512 d48dbb2153662352f7abb0a615f4a88b5f55c783e9aaab92b38c65b15dd22c4f7ab328e3d372ba8a23620711676785f7aaf69b50aa3c73d46adf15045f53f4ea
DIST kitinerary-20.12.2.tar.xz 1814612 BLAKE2B 68401199d3415b02a087f24e20e2c6772a8c66ebef0122788c189de8c4084337e31af42b8e842605d5062b59cd2303921d20680636ae4f4a407ff03e6426949a SHA512 58b0d3832cb04c024d6e9f41b60d0f7679aaa5aca96c21a6dfca6309d1e1e24f7d5156ee04938b0ac5d5dda463483f96e272abfcb3b6566a9f64238759c1d228
diff --git a/kde-apps/kitinerary/kitinerary-20.08.3.ebuild b/kde-apps/kitinerary/kitinerary-20.08.3.ebuild
deleted file mode 100644
index 4cea276fca34..000000000000
--- a/kde-apps/kitinerary/kitinerary-20.08.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
-HOMEPAGE="https://apps.kde.org/en/kontact"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="+barcode pdf"
-
-REQUIRED_USE="test? ( pdf )"
-
-DEPEND="
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=kde-apps/kmime-${PVCUT}:5
- >=kde-apps/kpkpass-${PVCUT}:5
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kcalendarcore-${KFMIN}:5
- >=kde-frameworks/kcontacts-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- sys-libs/zlib
- barcode? ( >=media-libs/zxing-cpp-1.1.0 )
- pdf? ( app-text/poppler:=[qt5] )
-"
-RDEPEND="${DEPEND}
- !