Sync with portage [Mon May 24 08:51:14 MSK 2021].

3 years ago · 15e50efcfe
parent 75060232ac
commit 15e50efcfe
928 changed files with 5201 additions and 12313 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/lib_users/lib_users-0.14-r2.ebuild
+++ b/app-admin/lib_users/lib_users-0.14-r2.ebuild
@ -0,0 +1,44 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 PYTHON_COMPAT=( python3_{7..10} )
 inherit python-r1
 DESCRIPTION="Check for mapped libs and open files that are marked as deleted"
 HOMEPAGE="https://github.com/klausman/lib_users"
 SRC_URI="https://github.com/klausman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="${PYTHON_DEPS}
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
 	)"
 RDEPEND="${PYTHON_DEPS}"
 src_test() {
 	python_foreach_impl nosetests --verbosity=2
 }
 my_install() {
 	python_newscript lib_users.py lib_users
 	python_newscript fd_users.py fd_users
 	# lib_users_util/ contains a test script we don't want, so do things by hand
 	python_moduleinto lib_users_util
 	python_domodule lib_users_util/common.py
 	python_domodule lib_users_util/__init__.py
 }
 src_install() {
 	python_foreach_impl my_install
 	dodoc README.md TODO
 }
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@ -1,2 +1 @@
 DIST gzip-1.10.tar.xz 775144 BLAKE2B 431dc0fd11061eabd9db86594777b86510b124b124fd74799eacd67334631af60f638be2638413bee0153a9da35528d0aecc5b5083152c395223705400c9103b SHA512 e6ba9e3906cdb6a6235b213515093d02afa1722686f73eddacbacae628542b586b449829783b6a1701e9b9e0c4d4dfa6845904d3b6b010f5cf21aec4997c9299
 DIST gzip-1.9.tar.xz 762516 BLAKE2B 4001fc7a770634916d52b026dab1b621fc96275bfb61ec2df2d0e7d7ec1c81414270d3c866034e6ef758870f38e9d4396a25832abe558915a7ded1f1511eb4b0 SHA512 c0852e7f7662141e79d14bc36e50f1940dba3e804feff3b0b8fa084ffec720ac245352282d2f1db117fadc95758424dd418d192b94621dac4367834ccf101fad
--- a/app-arch/gzip/files/gzip-1.9-gnulib-glibc-2.28.patch
+++ b/app-arch/gzip/files/gzip-1.9-gnulib-glibc-2.28.patch
@ -1,134 +0,0 @@
 fix build failure against glibc-2.28
 https://bugs.gentoo.org/663928
 Adopted gnulib's upstream patch:
 From 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e Mon Sep 17 00:00:00 2001
 From: Paul Eggert <eggert@cs.ucla.edu>
 Date: Mon, 5 Mar 2018 10:56:29 -0800
 Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 Problem reported by Daniel P. Berrangé in:
 https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
 * lib/fflush.c (clear_ungetc_buffer_preserving_position)
 (disable_seek_optimization, rpl_fflush):
 * lib/fpurge.c (fpurge):
 * lib/freadahead.c (freadahead):
 * lib/freading.c (freading):
 * lib/fseeko.c (fseeko):
 * lib/fseterr.c (fseterr):
 Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
 * lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
 Define if not already defined.
 ---
 lib/fflush.c     |  6 +++---
 lib/fpurge.c     |  2 +-
 lib/freading.c   |  2 +-
 lib/fseeko.c     |  4 ++--
 lib/fseterr.c    |  2 +-
 lib/stdio-impl.h |  6 ++++++
 --- a/lib/fflush.c
 +++ b/lib/fflush.c
@@ -33,7 +33,7 @@
 #undef fflush
 -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
 +#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
 /* Clear the stream's ungetc buffer, preserving the value of ftello (fp).  */
 static void
@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp)
 #endif
 -#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
 +#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
 # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
 /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream)
   if (stream == NULL || ! freading (stream))
     return fflush (stream);
 -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
 +#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
   clear_ungetc_buffer_preserving_position (stream);
 --- a/lib/fpurge.c
 +++ b/lib/fpurge.c
@@ -62,7 +62,7 @@ fpurge (FILE *fp)
   /* Most systems provide FILE as a struct and the necessary bitmask in
      <stdio.h>, because they need it for implementing getc() and putc() as
      fast macros.  */
 -# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
 +# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
   fp->_IO_read_end = fp->_IO_read_ptr;
   fp->_IO_write_ptr = fp->_IO_write_base;
   /* Avoid memory leak when there is an active ungetc buffer.  */
 --- a/lib/freading.c
 +++ b/lib/freading.c
@@ -31,7 +31,7 @@ freading (FILE *fp)
   /* Most systems provide FILE as a struct and the necessary bitmask in
      <stdio.h>, because they need it for implementing getc() and putc() as
      fast macros.  */
 -# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
 +# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
   return ((fp->_flags & _IO_NO_WRITES) != 0
           || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
               && fp->_IO_read_base != NULL));
 --- a/lib/fseeko.c
 +++ b/lib/fseeko.c
@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence)
 #endif
   /* These tests are based on fpurge.c.  */
 -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
 +#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
   if (fp->_IO_read_end == fp->_IO_read_ptr
       && fp->_IO_write_ptr == fp->_IO_write_base
       && fp->_IO_save_base == NULL)
@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence)
           return -1;
         }
 -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
 +#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
       fp->_flags &= ~_IO_EOF_SEEN;
       fp->_offset = pos;
 #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
 --- a/lib/fseterr.c
 +++ b/lib/fseterr.c
@@ -29,7 +29,7 @@ fseterr (FILE *fp)
   /* Most systems provide FILE as a struct and the necessary bitmask in
      <stdio.h>, because they need it for implementing getc() and putc() as
      fast macros.  */
 -#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
 +#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
   fp->_flags |= _IO_ERR_SEEN;
 #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
 --- a/lib/stdio-impl.h
 +++ b/lib/stdio-impl.h
@@ -18,6 +18,12 @@
    the same implementation of stdio extension API, except that some fields
    have different naming conventions, or their access requires some casts.  */
 +/* Glibc 2.28 made _IO_IN_BACKUP private.  For now, work around this
 +   problem by defining it ourselves.  FIXME: Do not rely on glibc
 +   internals.  */
 +#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
 +# define _IO_IN_BACKUP 0x100
 +#endif
 /* BSD stdio derived implementations.  */
 -- 
 2.19.1
--- a/app-arch/gzip/gzip-1.9.ebuild
+++ b/app-arch/gzip/gzip-1.9.ebuild
@ -1,40 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit flag-o-matic
 DESCRIPTION="Standard GNU compressor"
 HOMEPAGE="https://www.gnu.org/software/gzip/"
 SRC_URI="mirror://gnu/gzip/${P}.tar.xz
 	https://alpha.gnu.org/gnu/gzip/${P}.tar.xz
 	mirror://gentoo/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pic static"
 PATCHES=(
 	"${FILESDIR}/${PN}-1.3.8-install-symlinks.patch"
 	"${FILESDIR}/${PN}-1.9-gnulib-glibc-2.28.patch"
 )
 src_configure() {
 	use static && append-flags -static
 	# avoid text relocation in gzip
 	use pic && export DEFS="NO_ASM"
 	econf --disable-gcc-warnings #663928
 }
 src_install() {
 	default
 	docinto txt
 	dodoc algorithm.doc gzip.doc
 	# keep most things in /usr, just the fun stuff in /
 	dodir /bin
 	mv "${ED%/}"/usr/bin/{gunzip,gzip,uncompress,zcat} "${ED%/}"/bin/ || die
 	sed -e "s:${EPREFIX}/usr:${EPREFIX}:" -i "${ED%/}"/bin/gunzip || die
 }
--- a/app-arch/unrpa/unrpa-2.3.0.ebuild
+++ b/app-arch/unrpa/unrpa-2.3.0.ebuild
@ -1,14 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 SRC_URI="https://github.com/Lattyware/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
 DESCRIPTION="Ren'Py's RPA data file extractor"
 HOMEPAGE="https://github.com/Lattyware/unrpa"
-LICENSE="GPL-3"
+SRC_URI="https://github.com/Lattyware/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~x86"
--- a/app-arch/upx/files/upx-3.96_CVE-2020-24119.patch
+++ b/app-arch/upx/files/upx-3.96_CVE-2020-24119.patch
@ -0,0 +1,34 @@
 From 87b73e5cfdc12da94c251b2cd83bb01c7d9f616c Mon Sep 17 00:00:00 2001
 From: John Reiser <jreiser@BitWagon.com>
 Date: Wed, 22 Jul 2020 19:34:27 -0700
 Subject: [PATCH] Unpack: Phdrs must be within expansion of first compressed
 block
 https://github.com/upx/upx/issues/388
 	modified:   p_lx_elf.cpp
 ---
 src/p_lx_elf.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp
 index cd9e4ec97..453d5c457 100644
 --- a/src/p_lx_elf.cpp
 +++ b/src/p_lx_elf.cpp
@@ -4550,7 +4550,7 @@ void PackLinuxElf64::unpack(OutputFile *fo)
     unsigned c_adler = upx_adler32(NULL, 0);
     unsigned u_adler = upx_adler32(NULL, 0);
 #define MAX_ELF_HDR 1024
 -    if ((MAX_ELF_HDR - sizeof(Elf64_Ehdr))/sizeof(Elf64_Phdr) < u_phnum) {
 +    if ((umin64(MAX_ELF_HDR, ph.u_len) - sizeof(Elf64_Ehdr))/sizeof(Elf64_Phdr) < u_phnum) {
         throwCantUnpack("bad compressed e_phnum");
     }
 #undef MAX_ELF_HDR
@@ -5617,7 +5617,7 @@ void PackLinuxElf32::unpack(OutputFile *fo)
     unsigned c_adler = upx_adler32(NULL, 0);
     unsigned u_adler = upx_adler32(NULL, 0);
 #define MAX_ELF_HDR 512
 -    if ((MAX_ELF_HDR - sizeof(Elf32_Ehdr))/sizeof(Elf32_Phdr) < u_phnum) {
 +    if ((umin(MAX_ELF_HDR, ph.u_len) - sizeof(Elf32_Ehdr))/sizeof(Elf32_Phdr) < u_phnum) {
         throwCantUnpack("bad compressed e_phnum");
     }
 #undef MAX_ELF_HDR
--- a/app-arch/upx/upx-3.96-r2.ebuild
+++ b/app-arch/upx/upx-3.96-r2.ebuild
@ -14,15 +14,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
-RDEPEND=">=dev-libs/ucl-1.03
+DEPEND=">=dev-libs/ucl-1.03
-	sys-libs/zlib
+	sys-libs/zlib"
 RDEPEND="${RDEPEND}
 	!app-arch/upx-bin"
-DEPEND="${RDEPEND}
+BDEPEND="dev-lang/perl"
 	dev-lang/perl"
 S="${WORKDIR}/${P}-src"
 PATCHES=(
 	"${FILESDIR}/${P}_CVE-2020-24119.patch"
 	"${FILESDIR}/${P}_CVE-2021-20285.patch"
 )
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/dar/Manifest
+++ b/app-backup/dar/Manifest
@ -1,3 +1,3 @@
 DIST dar-2.6.13.tar.gz 2148732 BLAKE2B 51de01793dead832209671569f8054b1de3b5fa810c786ae675207b6dc3e639a5c036896e1688e017b222fbaa6c011494a9d43b3bb2b16570a38e291f893b73f SHA512 f0f853db6e15f5abfabf87be06a1c374662c7fa7e1140eaaeef3e8c8c4d0049a00a8e74409d6805ea3ae5b2f3171f2eba27459e8acb4438c467c4f0bd0825c0c
 DIST dar-2.6.14.tar.gz 2148023 BLAKE2B 36653d798d1da9cd87e84d2301b9f1fd657e92d1eee91ec1efadb54e94638860103c5e509479a2da846d432328e0a93ae92e1a4d23b6956ca55341ef767fe9a8 SHA512 2b116929fcc192ffee0c266959902b45dc9982ba77e017b3217715e0c63d1574d64083ca55a63e0bb6390e8955c41ca8b09da63934826fe4f0471a63ea739550
-DIST dar-2.7.0.tar.gz 2285856 BLAKE2B 194e9fe2345bdccdb053996b109fe4efb886e23b69d440f7ac2b545c1ce2f241c7f24c56d7b68bde904b8e1a85df20716b63068a6c471c71a7569921eb06aa1f SHA512 0e207c244f6700860a84217069774162b7b56c95e5c0955813fbd96d37a3fe1fa126cab05bab0a21b3e9eab335c10961daf243024fdc35f6276468bd549d49cb
+DIST dar-2.7.1.tar.gz 2290659 BLAKE2B 89fa7ac208eb3009f5151f27022a7a449bb204cb035f320e33ff642588b5ab0389c2ed33b71b7a7c6240d205877073f26a04f0164ce05bb370db3bc3faf25fda SHA512 404e3281b2c420088623e4c6ba262d2a7a44848986e43d4c71aff77104395f1178445d560849a73e0dbacce6b8014df2bb20bc33471ae2d07d897bb6ad577bcc
--- a/app-backup/dar/dar-2.6.14.ebuild
+++ b/app-backup/dar/dar-2.6.14.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86 ~amd64-linux"
+KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux"
 IUSE="curl dar32 dar64 doc gcrypt gpg lzo nls rsync threads xattr"
 RESTRICT="test" # need to be run as root
--- a/app-backup/dar/dar-2.7.1.ebuild
+++ b/app-backup/dar/dar-2.7.1.ebuild
@ -14,6 +14,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux"
 IUSE="argon2 curl dar32 dar64 doc gcrypt gpg lzo nls rsync threads xattr"
 REQUIRED_USE="?? ( dar32 dar64 )
 		gpg? ( gcrypt )"
 RESTRICT="test" # need to be run as root
 RDEPEND="
@ -41,9 +44,6 @@ BDEPEND="
 	)
 "
 REQUIRED_USE="?? ( dar32 dar64 )
 		gpg? ( gcrypt )"
 DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
 src_configure() {
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
--- a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild
@ -10,7 +10,7 @@ SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz"
 LICENSE="GPL-2"
 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=""
 RDEPEND="app-cdr/cdrtools"
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/minisign/minisign-0.9.ebuild
+++ b/app-crypt/minisign/minisign-0.9.ebuild
@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/jedisct1/${PN}.git"
 else
 	SRC_URI="https://github.com/jedisct1/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 LICENSE="ISC"
--- a/app-crypt/openpgp-keys-crypto++/openpgp-keys-crypto++-20210416.ebuild
+++ b/app-crypt/openpgp-keys-crypto++/openpgp-keys-crypto++-20210416.ebuild
@ -9,7 +9,7 @@ S="${WORKDIR}"
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 src_install() {
 	# Note: Currently Jeffrey Walton (noloader) makes releases, but may need to add
--- a/app-crypt/openpgp-keys-mlichvar/openpgp-keys-mlichvar-20210513.ebuild
+++ b/app-crypt/openpgp-keys-mlichvar/openpgp-keys-mlichvar-20210513.ebuild
@ -10,7 +10,7 @@ S="${WORKDIR}"
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 src_install() {
 	local files=( ${A} )
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/okteta/okteta-0.26.6.ebuild
+++ b/app-editors/okteta/okteta-0.26.6.ebuild
@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/okteta/ https://utils.kde.org/projects/okteta/"
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 LICENSE="GPL-2 handbook? ( FDL-1.2 )"
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/pymacs/pymacs-0.26-r2.ebuild
+++ b/app-emacs/pymacs/pymacs-0.26-r2.ebuild
@ -3,9 +3,10 @@
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_IN_SOURCE_BUILD=1
 DISTUTILS_USE_SETUPTOOLS="no"
 inherit elisp distutils-r1
 DESCRIPTION="A tool that allows both-side communication beetween Python and Emacs Lisp"
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-6.0.0.ebuild
@ -3,7 +3,7 @@
 EAPI="7"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit systemd toolchain-funcs udev python-any-r1
--- a/app-emulation/sen/sen-0.6.1_p20200905.ebuild
+++ b/app-emulation/sen/sen-0.6.1_p20200905.ebuild
@ -1,11 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 COMMIT="02e5872ee2905861e1da06ab5174e1a3f41f0e0b"
@ -18,25 +16,24 @@ S="${WORKDIR}/${PN}-${COMMIT}"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 RDEPEND="dev-python/urwid[${PYTHON_USEDEP}]
 	dev-python/urwidtrees[${PYTHON_USEDEP}]
 	dev-python/docker-py[${PYTHON_USEDEP}]
 	"
-DEPEND="${RDEPEND}
+BDEPEND="
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/flexmock[${PYTHON_USEDEP}]
 	)
 	"
 distutils_enable_tests pytest
 python_install_all() {
 	distutils-r1_python_install_all
 	dodoc -r docs
 }
 python_test() {
-	pytest -vv tests || die "pytest failed"
+	epytest tests
 }
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@ -1,9 +1,9 @@
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
 DIST wine-6.5.tar.xz 24375196 BLAKE2B c30f606d268bf39f9424dd2e65f98f75b3538c82df6a931ea4955040a625ff07a2272f7d83f4343f8997ac2660a934528279ff31555ef062c81487e897c429f9 SHA512 11f9d2bb515c63429d397b97ecc1f13d0dbb717780d674229b851b819d707e0fd6fbf8bbae9a41dbf7b2ceb3729c4f5643d1ec5e414d6694d192072081f96fe4
 DIST wine-6.6.tar.xz 24400568 BLAKE2B 37ec581686a2145a84cd40a1c29c313cf253f96c86fd16fac0402afb02aa15687b86e2de850b86c9a132b8898ab93b639f431711f3c6220a566537768612f97a SHA512 a5caabc5ff91a830fbdcd25a85ee32b6df98315325a929a3124521cd10cc873e5a585359b03eb0293bb2474e39a179cbe179c0611acda6a228861e06068c091e
 DIST wine-6.7.tar.xz 24449368 BLAKE2B 002bd6e74205217d4517c8697ddb212d8bcb8ba66ac1594996e24e2d5e771119e73e65a0b42608133ebaab699a31cd6567a0ab954e8d4e1f94492ebb929d0ffb SHA512 42920921eaff5a483859fba2b9e866c6afad25427d030f971efe2136f9619b675d5eb1ddfffd54bba8caa172c3e91eb347d673cb16f45560f0ab40a184a34758
 DIST wine-6.8.tar.xz 24481304 BLAKE2B 37643eb75b29a646f23620df4084809aa15ac9d390e34e2e1ffb9e0c5211df9e7595dd0d877ede61f914f4a4373a450c50f4f2da5f7a0fa880881404cd918c88 SHA512 784863e3aa11f692cee2ab3b3d99cc896c1eb41cfab8cc6b52b5a31671d82fc7f6783bae72c65d8806a8c4096000401cbd0a1a7f1a88fd980685fae67fa9bd91
-DIST wine-staging-6.5.tar.gz 9743825 BLAKE2B 606377c33a789e092f044bb610746e54fba77a9af0e3da674d16c8ce0f51c59d82f78f0e63c5915fb6f1ab10d6ee91d7b95a7634f1177a6455de6e0c0517ef01 SHA512 bb5199419a22a4536ff95fb0e6257d7c870fe79f40346d56101579edae5c44086fac0db975e04452fcc1d7cda0d5392ff703e1c39504ec4ee63610e2e89fd1e1
+DIST wine-6.9.tar.xz 24526724 BLAKE2B 9e39bbc84380f7f40a9f41e1dbd1728ae8833eab4fe977eaf9386a92b9f089cf63147e35093b084d3a61e5c7209b405caea9cee2a4bebb294b77c65fc3551d66 SHA512 e9dc4da8cd6553db4227f09b5734513939d7e361449f52472a1f51ae569377a2931a0ab6f402aef751587ff1fa50f10f222b4479aba44f862db320931eeff363
 DIST wine-staging-6.6.tar.gz 9756871 BLAKE2B 45e49f7cd2820e027cf9788e7257a3fdaeb97d711d8ae4b466026316f331c2ad84aa0f8446cbeacb98c280e21bd1666d23054bcbc7702533e4974148e684be91 SHA512 65e90c4a0965f2db499edcff5171552b8e95716ff9b2a4ed272d022bc0b1f99547ca1d7b09ced2a267cdf3dfbaf552f9cbb2cc8bbd34636eb3882406ab5985d2
 DIST wine-staging-6.7.tar.gz 9722531 BLAKE2B 1df164ea23808f40baddbbe30ed92125563c3c952e13817ddea124cf780a397237e70aa48532d5b49c8b80919122a09e579f1928a13b6d17329d51f0ba03da74 SHA512 74805846e2e6e5d751c25f4b98ac671f8507d3a9b13d572e166b1885e397a6bb74bd3ea4b456d46298306d632499a4b88f97eb6d53ff049c2495cf055347611d
 DIST wine-staging-6.8.tar.gz 9709006 BLAKE2B 48a100f43cedc4217c083421d4391e5f052faf354483990552d271a5820b654b4dd4db0b3d2d1478cbdf8414da56c86e7bce05ebdb70c347d81ce0b6df811498 SHA512 a2dfe74b07b687af147b61f235ea2843ff38a563f37ed2ed68dce1cc0ff3d50dbd7c9596836c6e236e368e7a55cbe1ba881dac11bb0966e61a76a7376f92bdcc
 DIST wine-staging-6.9.tar.gz 9687986 BLAKE2B 72cf53616a619638fdc91d7501c8fcc2bb9c102a1a445a9c58dd23fbb5bccc27fcf2f9635ec65b23d93839514d8aa9ede29d84d6737e49776a1d99b716295ea4 SHA512 09732ce6fe5e5460ef5f30ab3dd5581c94b27e1d2c228bc395b1defd32fc5e908ab32eb2a56e489b154e1d0f638ad792c80a64d82d90a33c943102b379bef937
--- a/app-emulation/wine-staging/wine-staging-6.9.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.9.ebuild
@ -134,7 +134,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.0.0 )
+	mono? ( app-emulation/wine-mono:6.1.1 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@ -373,7 +373,7 @@ src_unpack() {
 src_prepare() {
-	eapply_bin() {
+	eapply_bin(){
 		local patch
 		for patch in ${PATCHES_BIN[@]}; do
 			patchbin --nogit < "${patch}" || die
@ -436,7 +436,7 @@ src_prepare() {
 \164\2/' loader/Makefile.in || die
 	fi
-	rm_man_file() {
+	rm_man_file(){
 		local file="${1}"
 		loc=${2}
 		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@ -1,6 +1,6 @@
 DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75
 DIST wine-6.0.tar.xz 24192280 BLAKE2B baf0eee582190ede8d210390b51d330c1879cb442100bc2e957052898fbd84bcc047a885065f9bf96ac4f072f92eee44f0e1c3baddc68937286e7cc6f976bd4e SHA512 c0732fbab1da8737d595a876b28ce87eef1440c317746e798642b59b44b34e890de562e0c0cc674e97096f39db82f8e9c3b1cc1ba9edc246b7266a0f7cb00057
 DIST wine-6.5.tar.xz 24375196 BLAKE2B c30f606d268bf39f9424dd2e65f98f75b3538c82df6a931ea4955040a625ff07a2272f7d83f4343f8997ac2660a934528279ff31555ef062c81487e897c429f9 SHA512 11f9d2bb515c63429d397b97ecc1f13d0dbb717780d674229b851b819d707e0fd6fbf8bbae9a41dbf7b2ceb3729c4f5643d1ec5e414d6694d192072081f96fe4
 DIST wine-6.6.tar.xz 24400568 BLAKE2B 37ec581686a2145a84cd40a1c29c313cf253f96c86fd16fac0402afb02aa15687b86e2de850b86c9a132b8898ab93b639f431711f3c6220a566537768612f97a SHA512 a5caabc5ff91a830fbdcd25a85ee32b6df98315325a929a3124521cd10cc873e5a585359b03eb0293bb2474e39a179cbe179c0611acda6a228861e06068c091e
 DIST wine-6.7.tar.xz 24449368 BLAKE2B 002bd6e74205217d4517c8697ddb212d8bcb8ba66ac1594996e24e2d5e771119e73e65a0b42608133ebaab699a31cd6567a0ab954e8d4e1f94492ebb929d0ffb SHA512 42920921eaff5a483859fba2b9e866c6afad25427d030f971efe2136f9619b675d5eb1ddfffd54bba8caa172c3e91eb347d673cb16f45560f0ab40a184a34758
 DIST wine-6.8.tar.xz 24481304 BLAKE2B 37643eb75b29a646f23620df4084809aa15ac9d390e34e2e1ffb9e0c5211df9e7595dd0d877ede61f914f4a4373a450c50f4f2da5f7a0fa880881404cd918c88 SHA512 784863e3aa11f692cee2ab3b3d99cc896c1eb41cfab8cc6b52b5a31671d82fc7f6783bae72c65d8806a8c4096000401cbd0a1a7f1a88fd980685fae67fa9bd91
 DIST wine-6.9.tar.xz 24526724 BLAKE2B 9e39bbc84380f7f40a9f41e1dbd1728ae8833eab4fe977eaf9386a92b9f089cf63147e35093b084d3a61e5c7209b405caea9cee2a4bebb294b77c65fc3551d66 SHA512 e9dc4da8cd6553db4227f09b5734513939d7e361449f52472a1f51ae569377a2931a0ab6f402aef751587ff1fa50f10f222b4479aba44f862db320931eeff363
--- a/app-emulation/wine-vanilla/wine-vanilla-6.9.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.9.ebuild
@ -110,7 +110,7 @@ RDEPEND="${COMMON_DEPEND}
 	!app-emulation/wine:0
 	dos? ( >=games-emulation/dosbox-0.74_p20160629 )
 	gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
-	mono? ( app-emulation/wine-mono:6.0.0 )
+	mono? ( app-emulation/wine-mono:6.1.1 )
 	perl? (
 		dev-lang/perl
 		dev-perl/XML-Simple
@ -318,7 +318,7 @@ src_unpack() {
 src_prepare() {
-	eapply_bin() {
+	eapply_bin(){
 		local patch
 		for patch in ${PATCHES_BIN[@]}; do
 			patchbin --nogit < "${patch}" || die
@ -364,7 +364,7 @@ src_prepare() {
 \164\2/' loader/Makefile.in || die
 	fi
-	rm_man_file() {
+	rm_man_file(){
 		local file="${1}"
 		loc=${2}
 		sed -i "/${loc}\.UTF-8\.man\.in/d" "${file}" || die
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/gnutu/Manifest
+++ b/app-misc/gnutu/Manifest
@ -1 +0,0 @@
 DIST gnutu-2.9.tar.gz 325519 BLAKE2B 4c98d9f7f6a4752821bff464d744a019736353f0011bb162624f3458e1e872dfbe6039572ed79f3c479cdcda4d93f61a4a12fd10c72cd3bbddff45be8d8b0775 SHA512 7ad470ff524422b2236f05bf79cf2a144d166cac7a26d94851b6aacda32e8fa4f8e0ef6abf12157aba19d1e92b7774c3b86f89a8e32514b1ebf7d6e460045411
--- a/app-misc/gnutu/gnutu-2.9.ebuild
+++ b/app-misc/gnutu/gnutu-2.9.ebuild
@ -1,26 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 DESCRIPTION="GNU Student's Timetable for polish users"
 HOMEPAGE="https://sourceforge.net/projects/gnutu/"
 SRC_URI="https://master.dl.sourceforge.net/project/gnutu/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 RDEPEND="
 	>=dev-lang/mono-1.2.5.1-r1
 	>=dev-dotnet/gtk-sharp-2.12.21
 "
 DEPEND="${RDEPEND}"
 BDEPEND="sys-devel/gettext"
 src_prepare() {
 	# Remove deprecated Application tag from .desktop file
 	sed -i 's/\;Application//g' gnutu.desktop.cs || die "Sed failed"
 	default
 }
--- a/app-misc/gnutu/metadata.xml
+++ b/app-misc/gnutu/metadata.xml
@ -1,23 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription lang="en">
 		GNUTU is a polish program. It is designed for students from primary and
 		secondary schools – using it, you can note various information (like marks,
 		tests dates and important school events). It also can create various statistics,
 		calculate your average; it can also serve as a journal and many, many more...
 	</longdescription>
 	<longdescription lang="ja">
 		GNUTUはポーランド語のプログラムです。GNUTUは学生のために作ったプログラムです。この
 		プログラムで、色々なこと(ノートやテストの年月日や必要なイベント)を取れる。統計を
 		作って、点数割り出すも出来る。
 	</longdescription>
 </pkgmetadata>
--- a/app-misc/media-player-info/media-player-info-24.ebuild
+++ b/app-misc/media-player-info/media-player-info-24.ebuild
@ -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
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit python-any-r1
 DESCRIPTION="Repository of data files describing media player capabilities"
--- a/app-misc/tmuxp/tmuxp-1.7.2-r1.ebuild
+++ b/app-misc/tmuxp/tmuxp-1.7.2-r1.ebuild
@ -3,8 +3,7 @@
 EAPI=7
-PYTHON_COMPAT=( python3_{7..8} pypy3 )
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 DESCRIPTION="tmux session manager. built on libtmux"
@ -14,7 +13,6 @@ SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="test"
 RDEPEND="
 	>=app-misc/tmux-3.0a
@ -24,9 +22,8 @@ RDEPEND="
 	>=dev-python/click-7.0[${PYTHON_USEDEP}]
 	>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]
 "
-BDEPEND="${RDEPEND}
+BDEPEND="
 	test? (
 		>=dev-python/pytest-4.1.1[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		>=dev-python/pytest-rerunfailures-4.2[${PYTHON_USEDEP}]
 		!dev-python/flaky
@ -39,8 +36,8 @@ PATCHES=(
 	"${FILESDIR}/tmuxp-1.7.2-relax-click-dep.patch"
 )
-distutils_enable_tests --install pytest
+distutils_enable_tests pytest
 python_test() {
-	SHELL="/bin/bash" pytest -vv || die "Tests fail with ${EPYTHON}"
+	SHELL="/bin/bash" epytest
 }
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/gnumeric/gnumeric-1.12.49.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.49.ebuild
@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnumeric.org/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+introspection libgda perl"
 REQUIRED_USE="introspection? ( ${PYTHON_REQUIRED_USE} )"
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/g-sorcery/g-sorcery-0.2.2.ebuild
+++ b/app-portage/g-sorcery/g-sorcery-0.2.2.ebuild
@ -3,7 +3,7 @@
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=no
 inherit distutils-r1 prefix
@ -19,10 +19,11 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="bson git test"
 RESTRICT="!test? ( test )"
-DEPEND="bson? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+BDEPEND="
 	bson? ( dev-python/pymongo[${PYTHON_USEDEP}] )
 	git? ( dev-vcs/git )
 	sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="${BDEPEND}"
 PDEPEND=">=app-portage/layman-2.2.0[g-sorcery(-),${PYTHON_USEDEP}]"
 src_prepare() {
@ -31,7 +32,7 @@ src_prepare() {
 }
 python_test() {
-	PYTHONPATH="." "${PYTHON}" scripts/run_tests.py
+	PYTHONPATH="." "${PYTHON}" scripts/run_tests.py || die
 }
 python_install_all() {
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@ -1 +1,2 @@
 DIST gpyutils-0.4.5.tar.gz 20037 BLAKE2B f628c11e0ae2c9bb02a024e1b7dcab7092e7b01c14078683c47a8ca00d71021b988c51d80ab8b322891f9ecd4bb11c7bfe7d300f3bcbe489a977b18244ead085 SHA512 f68c87b5a35aece182bf2f9f93fe89f061dd49b4b75fabb7637038aee1e5301797af1d889a75829048eeb05dda0233461a2f2600e185214600a282cea50d1d3c
 DIST gpyutils-0.5.1.tar.gz 23480 BLAKE2B 90e7a0f54526ede6a3c0342558cbbc379a8e8453aca1bc79751c12e292322d3cd3da8dad69f8a6aed7704bf043fe9e2324b567b3b6f7eff49c0e7a3e2bb2ea31 SHA512 5be4e4e03a5fef746eaf9bfed70f58801ed0dcec34cfdeef8d0936b92690b9519802fa3cdc3ca446ba688c4ff1604b5819d14b723c7ed2e6dd8f5b39ee76996f
--- a/app-portage/gpyutils/gpyutils-0.5.1.ebuild
+++ b/app-portage/gpyutils/gpyutils-0.5.1.ebuild
@ -0,0 +1,26 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{8..9} )
 inherit distutils-r1
 DESCRIPTION="Utitilies for maintaining Python packages"
 HOMEPAGE="https://github.com/mgorny/gpyutils/"
 SRC_URI="
 	https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND=">=app-portage/gentoopm-0.3.2[${PYTHON_USEDEP}]"
 python_test() {
 	esetup.py test
 }
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
--- a/app-shells/tcsh/tcsh-6.22.04.ebuild
+++ b/app-shells/tcsh/tcsh-6.22.04.ebuild
@ -77,6 +77,12 @@ src_configure() {
 	append-cppflags -D_PATH_USRBIN="'"'"${EPREFIX}/usr/bin"'"'"
 	append-cppflags -D_PATH_BIN="'"'"${EPREFIX}/bin"'"'"
 	# musl's utmp is non-functional
 	if use elibc_musl ; then
 		export ac_cv_header_utmp_h=no
 		export ac_cv_header_utmpx_h=no
 	fi
 	econf \
 		--prefix="${EPREFIX:-}" \
 		--datarootdir='${prefix}/usr/share' \
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild
+++ b/app-text/cherrytree/cherrytree-0.99.0_p20200523-r1.ebuild
@ -3,7 +3,7 @@
 EAPI=7
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit cmake python-any-r1 xdg-utils
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
--- a/dev-cpp/eigen/eigen-3.3.9.ebuild
+++ b/dev-cpp/eigen/eigen-3.3.9.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://gitlab.com/lib${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
 LICENSE="MPL-2.0"
 SLOT="3"
-KEYWORDS="~amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_ppc_vsx cuda debug doc openmp test" #zvector
 RESTRICT="!test? ( test )"
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/mycli/mycli-1.22.2_p20201026.ebuild
+++ b/dev-db/mycli/mycli-1.22.2_p20201026.ebuild
@ -1,48 +1,47 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_SINGLE_IMPL=yes
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 MY_PV=$(ver_cut 1-3)
 S="${WORKDIR}/${PN}-${MY_PV}"
 DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting"
 HOMEPAGE="https://www.mycli.net"
 SRC_URI="https://github.com/dbcli/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ssh test"
+IUSE="ssh"
-RESTRICT="!test? ( test )"
+
-RDEPEND="$(python_gen_cond_dep '
+RDEPEND="
-	>=dev-python/cli_helpers-2.0.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+		>=dev-python/cli_helpers-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+		>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+		<dev-python/prompt_toolkit-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
-	<dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
-	ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )')
+		<dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}]
 		ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )')
 "
-DEPEND="${RDEPEND}"
+BDEPEND="
-BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]') )"
+	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]') )"
 distutils_enable_tests pytest
 PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch" "${FILESDIR}/mycli-1.22.2_p20201026.patch" )
 python_test() {
-	pytest --capture=sys \
+	epytest --capture=sys \
 		--showlocals \
 		--doctest-modules \
 		--doctest-ignore-import-errors \
 		--ignore=setup.py \
--- a/dev-db/mycli/mycli-9999.ebuild
+++ b/dev-db/mycli/mycli-9999.ebuild
@ -1,46 +1,45 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_SINGLE_IMPL=yes
 DISTUTILS_USE_SETUPTOOLS=rdepend
 EGIT_REPO_URI="https://github.com/dbcli/mycli.git"
 inherit distutils-r1 git-r3
 DESCRIPTION="CLI for MySQL Database with auto-completion and syntax highlighting"
 HOMEPAGE="https://www.mycli.net"
 SRC_URI=""
 LICENSE="BSD MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="ssh test"
+IUSE="ssh"
-RESTRICT="!test? ( test )"
+
-RDEPEND="$(python_gen_cond_dep '
+RDEPEND="
-	>=dev-python/cli_helpers-2.0.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+		>=dev-python/cli_helpers-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+		>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/prompt_toolkit-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+		<dev-python/prompt_toolkit-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pymysql-0.9.2[${PYTHON_USEDEP}]
-	<dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlparse-0.3.0[${PYTHON_USEDEP}]
-	ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )')
+		<dev-python/sqlparse-0.5.0[${PYTHON_USEDEP}]
 		ssh? ( dev-python/paramiko[${PYTHON_USEDEP}] )')
 "
-DEPEND="${RDEPEND}"
+BDEPEND="
-BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]') )"
+	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]') )"
 distutils_enable_tests pytest
 PATCHES=( "${FILESDIR}/mycli-1.21.1-fix-test-install.patch" )
 python_test() {
-	pytest --capture=sys \
+	epytest --capture=sys \
 		--showlocals \
 		--doctest-modules \
 		--doctest-ignore-import-errors \
 		--ignore=setup.py \
--- a/dev-db/mydumper/mydumper-0.10.3.ebuild
+++ b/dev-db/mydumper/mydumper-0.10.3.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/maxbube/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc"
 RDEPEND="app-arch/zstd
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.25.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-8.0.25.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}-src.tar.gz"
 LICENSE="Artistic GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+legacy"
 RDEPEND="
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.25.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.25.ebuild
@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 	S="${WORKDIR}/mysql-${PV}"
 fi
--- a/dev-db/mysql/mysql-5.7.34.ebuild
+++ b/dev-db/mysql/mysql-5.7.34.ebuild
@ -27,7 +27,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="?? ( tcmalloc jemalloc )"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
--- a/dev-db/mysql/mysql-8.0.25.ebuild
+++ b/dev-db/mysql/mysql-8.0.25.ebuild
@ -36,7 +36,7 @@ REQUIRED_USE="?? ( tcmalloc jemalloc )
 	router? ( server )
 	tcmalloc? ( server )"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
--- a/dev-dotnet/Manifest.gz
+++ b/dev-dotnet/Manifest.gz
--- a/dev-dotnet/gkeyfile-sharp/Manifest
+++ b/dev-dotnet/gkeyfile-sharp/Manifest
@ -1 +0,0 @@
 DIST gkeyfile-sharp-0.1.tar.gz 19862 BLAKE2B 7251560e6127b9a604da01ac72e76e6c5c8bdd46e9a13dad399f3f5ead2ed7ddb548ca733f45a7deaa5515ebec51ba8c96f7cfd4fead4dbbbb648479dcc5eee5 SHA512 056bf88b8e1e4032be5d082f4f9fcb1eb00df0294cec6edea8117539b5f5c29fddf41b26a43ff7fadc370d10f0e53add968dfa4bd7763f130e140f45b7c21e9d
--- a/dev-dotnet/gkeyfile-sharp/gkeyfile-sharp-0.1-r1.ebuild
+++ b/dev-dotnet/gkeyfile-sharp/gkeyfile-sharp-0.1-r1.ebuild
@ -1,34 +0,0 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 inherit autotools mono-env
 DESCRIPTION="C# binding for gkeyfile"
 HOMEPAGE="https://launchpad.net/gkeyfile-sharp https://github.com/mono/gkeyfile-sharp"
 SRC_URI="https://github.com/mono/${PN}/tarball/GKEYFILE_SHARP_0_1 -> ${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 RDEPEND=">=dev-dotnet/gtk-sharp-2.12.21"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 src_unpack() {
 	unpack ${A}
 	mv *-${PN}-* "${S}"
 }
 src_prepare() {
 	mv configure.in configure.ac
 	sed -i -e 's/gmcs/mcs/' configure.ac || die
 	eautoreconf
 }
 src_install() {
 	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog NEWS
 }
--- a/dev-dotnet/gkeyfile-sharp/metadata.xml
+++ b/dev-dotnet/gkeyfile-sharp/metadata.xml
@ -1,9 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">mono/gkeyfile-sharp</remote-id>
 		<remote-id type="launchpad">gkeyfile-sharp</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-dotnet/gtk-sharp/Manifest
+++ b/dev-dotnet/gtk-sharp/Manifest
@ -1 +0,0 @@
 DIST gtk-sharp-2.12.21.tar.gz 2498480 BLAKE2B b5471f18e0ed49e12d56d1ed8f086e68003cfd0cd2ee2b51b5c343ad94af69601daee8b357a661b1012c0c7449e5b401ef074526ad7c772a17d15305dbbe46aa SHA512 f7f575ec42e1a6d3bdbd9493b06d083d10687b6f5b41eebe1f1e03087c0e3cce79948aa19e9dd88972b023837d48bd02afee719a28b7015a78dccb96f2fee307
--- a/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.21-mono-ambiguous-range.patch
+++ b/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.21-mono-ambiguous-range.patch
@ -1,15 +0,0 @@
 https://github.com/mono/gtk-sharp/commit/a00552ad68ae349e89e440dca21b86dbd6bccd30
 https://bugs.gentoo.org/697108
 --- a/sample/test/TestRange.cs	2012-09-25 14:19:02.000000000 -0700
 +++ b/sample/test/TestRange.cs	2020-07-05 09:07:25.112932811 -0700
@@ -10,6 +10,10 @@
 using Gtk;
 +// disambiguate, Gtk.Range vs System.Range
 +using Range=Gtk.Range;
 +
 +
 namespace WidgetViewer {
 	public class TestRange
--- a/dev-dotnet/gtk-sharp/gtk-sharp-2.12.21.ebuild
+++ b/dev-dotnet/gtk-sharp/gtk-sharp-2.12.21.ebuild
@ -1,62 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 WANT_AUTOMAKE="1.11"
 inherit autotools dotnet
 DESCRIPTION="GTK bindings for mono"
 HOMEPAGE="http://www.mono-project.com/GtkSharp"
 SRC_URI="http://download.mono-project.com/sources/gtk-sharp212/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="amd64 x86"
 IUSE="debug"
 RESTRICT="test"
 RDEPEND="
 	>=dev-lang/mono-3.0
 	x11-libs/pango
 	>=dev-libs/glib-2.31
 	dev-libs/atk
 	x11-libs/gtk+:2
 	gnome-base/libglade
 	dev-perl/XML-LibXML
 	!dev-dotnet/gtk-sharp-gapi
 	!dev-dotnet/gtk-sharp-docs
 	!dev-dotnet/gtk-dotnet-sharp
 	!dev-dotnet/gdk-sharp
 	!dev-dotnet/glib-sharp
 	!dev-dotnet/glade-sharp
 	!dev-dotnet/pango-sharp
 	!dev-dotnet/atk-sharp
 "
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 PATCHES=(
 	"${FILESDIR}/${PN}-2.12.21-mono-ambiguous-range.patch"
 )
 src_prepare() {
 	default
 	eautoreconf
 }
 src_configure() {
 	econf \
 		--disable-static \
 		--disable-maintainer-mode \
 		$(use_enable debug)
 }
 src_install() {
 	default
 	dotnet_multilib_comply
 	sed -i "s/\\r//g" "${D}"/usr/bin/* || die "sed failed"
 }
--- a/dev-dotnet/gtk-sharp/metadata.xml
+++ b/dev-dotnet/gtk-sharp/metadata.xml
@ -1,5 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 </pkgmetadata>
--- a/dev-dotnet/notify-sharp/Manifest
+++ b/dev-dotnet/notify-sharp/Manifest
@ -1 +0,0 @@
 DIST notify-sharp-20090305.tar.bz2 79020 BLAKE2B e3ce9779211baba2ecd71e054d849031ea669ab97d4b40e8db5d597d9d4d28cf300fca23f843527b28615709eb33a202f45f4489fd171cdc9e89c734ff7a0eea SHA512 2daf6d33b3a4f53445193a654c3a92cd8e3766772472a914aa12a1c8619e5d48ed954987c44c3d856faec2e0a03e3348f6b4809a615ea3cfb4ef17ef5000c686
--- a/dev-dotnet/notify-sharp/files/notify-sharp-0.4.0_pre20080912-control-docs.patch
+++ b/dev-dotnet/notify-sharp/files/notify-sharp-0.4.0_pre20080912-control-docs.patch
@ -1,28 +0,0 @@
 diff -NrU5 notify-sharp-20080912.orig/configure.ac notify-sharp-20080912/configure.ac
 --- notify-sharp-20080912.orig/configure.ac	2008-11-26 21:56:02.000000000 +0100
 +++ notify-sharp-20080912/configure.ac	2008-11-26 22:01:08.000000000 +0100
@@ -34,16 +34,21 @@
 if test "x$GACUTIL" = "xno"; then
 	AC_MSG_ERROR([You need to install gacutil])
 fi
 AC_SUBST(GACUTIL)
 -AC_ARG_ENABLE(docs, AC_HELP_STRING([--disable-docs], 
 -	[Do not build documentation]), with_docs=no, with_docs=yes)
 +AC_ARG_ENABLE(	[docs],
 +		[AC_HELP_STRING(	[--enable/disable-docs], 
 +					[Do (not) build documentation (default=yes)]
 +		)],
 +		[],
 +		[enable_docs=yes]
 +)
 MONODOC_REQ_VERSION=1.1.18
 -if test "x$with_docs" = "xyes"; then
 +if test "x$enable_docs" = "xyes"; then
 	PKG_CHECK_MODULES(MONODOC, monodoc >= $MONODOC_REQ_VERSION,,
 		[AC_MSG_ERROR([You need to install monodoc, or pass --disable-docs to configure to skip documentation installation])])
 	AC_PATH_PROG(MONODOCER, monodocer, no)
 	if test "x$MONODOCER" = "xno"; then
 		AC_MSG_ERROR([You need to install monodoc, or pass --disable-docs to configure to skip documentation installation])
--- a/dev-dotnet/notify-sharp/files/notify-sharp-0.4.0_pre20090305-dbus-sharp.patch
+++ b/dev-dotnet/notify-sharp/files/notify-sharp-0.4.0_pre20090305-dbus-sharp.patch
@ -1,60 +0,0 @@
 diff --git a/configure.ac b/configure.ac
 index d2ff635..7200f06 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -71,11 +71,11 @@ GTK_SHARP_REQ_VERSION=2.10.1
 PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTK_SHARP_REQ_VERSION)
 AC_SUBST(GTK_SHARP_LIBS)
 -NDESK_DBUS_REQ_VERSION=0.4
 -NDESK_DBUS_GLIB_REQ_VERSION=0.3
 -PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= $NDESK_DBUS_REQ_VERSION \
 -                              ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQ_VERSION)
 -AC_SUBST(NDESK_DBUS_LIBS)
 +DBUS_SHARP_REQ_VERSION=0.7
 +DBUS_SHARP_GLIB_REQ_VERSION=0.5
 +PKG_CHECK_MODULES(DBUS_SHARP, dbus-sharp-1.0 >= $DBUS_SHARP_REQ_VERSION \
 +                              dbus-sharp-glib-1.0 >= $DBUS_SHARP_GLIB_REQ_VERSION)
 +AC_SUBST(DBUS_SHARP_LIBS)
 required_assemblies="Mono.Posix"
 diff --git a/src/Global.cs b/src/Global.cs
 index eedefbf..a0f80ed 100644
 --- a/src/Global.cs
 +++ b/src/Global.cs
@@ -24,7 +24,7 @@ using System;
 using System.Reflection;
 using System.Collections.Generic;
 -using NDesk.DBus;
 +using DBus;
 using org.freedesktop;
 using org.freedesktop.DBus;
 diff --git a/src/Makefile.am b/src/Makefile.am
 index 3b39c23..50bbb39 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
@@ -7,7 +7,7 @@ CSFLAGS = \
 LIBFLAGS = \
 	-r:Mono.Posix \
 	$(GTK_SHARP_LIBS) \
 -	$(NDESK_DBUS_LIBS)
 +	$(DBUS_SHARP_LIBS)
 CSFILES = \
 	$(srcdir)/Global.cs \
 diff --git a/src/Notification.cs b/src/Notification.cs
 index 09ef83e..e2ab72f 100644
 --- a/src/Notification.cs
 +++ b/src/Notification.cs
@@ -28,7 +28,7 @@ using GLib;
 using Gdk;
 using Gtk;
 -using NDesk.DBus;
 +using DBus;
 using org.freedesktop;
 using org.freedesktop.DBus;
--- a/dev-dotnet/notify-sharp/metadata.xml
+++ b/dev-dotnet/notify-sharp/metadata.xml
@ -1,5 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 </pkgmetadata>
--- a/dev-dotnet/notify-sharp/notify-sharp-0.4.0_pre20090305-r1.ebuild
+++ b/dev-dotnet/notify-sharp/notify-sharp-0.4.0_pre20090305-r1.ebuild
@ -1,36 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 inherit autotools epatch mono-env
 MY_P=${PN}-${PV#*_pre}
 DESCRIPTION="a C# client implementation for Desktop Notifications"
 HOMEPAGE="http://www.ndesk.org/NotifySharp"
 SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc"
 RDEPEND=">=dev-lang/mono-1.1.13
 	>=dev-dotnet/gtk-sharp-2.10.1
 	>=dev-dotnet/dbus-sharp-0.6:1.0
 	>=dev-dotnet/dbus-sharp-glib-0.4:1.0
 	>=x11-libs/libnotify-0.4.5"
 DEPEND="${RDEPEND}"
 S=${WORKDIR}/${MY_P}
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-0.4.0_pre20080912-control-docs.patch" \
 		"${FILESDIR}/${P}-dbus-sharp.patch"
 	sed -i -e 's/gmcs/mcs/' configure.ac || die
 	eautoreconf
 }
 src_configure() {
 	econf $(use_enable doc docs)
 }
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
--- a/dev-games/aseprite/aseprite-1.1.9.ebuild
+++ b/dev-games/aseprite/aseprite-1.1.9.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
@ -74,7 +74,7 @@ src_configure() {
 		-DUSE_SHARED_FREETYPE=ON
 		-DUSE_SHARED_GIFLIB=ON
 		-DUSE_SHARED_JPEGLIB=ON
-		-DUSE_SHARED_LIBLOADPNG=ON
+		-DUSE_SHARED_LIBLOADPNG=$(usex !bundled-libs)
 		-DUSE_SHARED_LIBPNG=ON
 		-DUSE_SHARED_PIXMAN=ON
 		-DUSE_SHARED_TINYXML=ON
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
--- a/dev-haskell/hexpat/hexpat-0.20.13.ebuild
+++ b/dev-haskell/hexpat/hexpat-0.20.13.ebuild
@ -1,34 +1,33 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-# ebuild generated by hackport 0.5.3.9999
+# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: bundle:bundled-expat
+#hackport: flags: -bundle
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 DESCRIPTION="XML parser/formatter based on expat"
-HOMEPAGE="http://haskell.org/haskellwiki/Hexpat/"
+HOMEPAGE="https://haskell.org/haskellwiki/Hexpat/"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="bundled-expat"
 RDEPEND=">=dev-haskell/list-0.4.2:=[profile?] <dev-haskell/list-0.7:=[profile?]
 	>=dev-haskell/text-0.5.0.0:=[profile?] <dev-haskell/text-1.3.0.0:=[profile?]
 	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-lang/ghc-7.8.2:=
+	>=dev-lang/ghc-8.4.3:=
-	!bundled-expat? ( dev-libs/expat )
+	dev-libs/expat
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.18.1.3
+	>=dev-haskell/cabal-2.2.0.1
 "
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag bundled-expat bundle)
+		--flag=-bundle
 }
--- a/dev-haskell/hexpat/metadata.xml
+++ b/dev-haskell/hexpat/metadata.xml
@ -3,59 +3,6 @@
 <pkgmetadata>
 	<maintainer type="project">
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
 	<use>
 		<flag name="bundled-expat"> Use bundled expat instead of <pkg>dev-libs/expat</pkg></flag>
 	</use>
 	<longdescription>
 		This package provides a general purpose Haskell XML library using Expat to
 		do its parsing (&lt;http://expat.sourceforge.net/&gt; - a fast stream-oriented XML
 		parser written in C).  It is extensible to any string type, with @String@,
 		@ByteString@ and @Text@ provided out of the box.
 		Basic usage: Parsing a tree (/Tree/), formatting a tree (/Format/).
 		Other features: Helpers for processing XML trees (/Proc/), trees annotated with
 		XML source location (/Annotated/), extended XML trees with comments,
 		processing instructions, etc (/Extended/), XML cursors (/Cursor/),
 		SAX-style parse (/SAX/), and access to the low-level interface in case speed
 		is paramount (/Internal.IO/).
 		The design goals are speed, speed, speed, interface simplicity and modularity.
 		For introduction and examples, see the /Text.XML.Expat.Tree/ module. For benchmarks,
 		&lt;http://haskell.org/haskellwiki/Hexpat/&gt;
 		If you want to do interactive I\/O, an obvious option is to use lazy parsing
 		with one of the lazy I\/O functions such as hGetContents.  However, this can be
 		problematic in some applications because it doesn't handle I\/O errors properly
 		and can give no guarantee of timely resource cleanup.  In these cases, chunked
 		I\/O is a better approach: Take a look at the /hexpat-enumerator/ package.
 		/IO/ is filed under /Internal/ because it's low-level and most users won't want
 		it.  The other /Internal/ modules are re-exported by /Annotated/, /Tree/ and /Extended/,
 		so you won't need to import them directly.
 		Credits to Iavor Diatchki and the @xml@ (XML.Light) package for /Proc/ and /Cursor/.
 		Thanks to the many contributors.
 		BOUND VS. UNBOUND THREADS: GHC (at least versions 6.12.X) will spawn threads
 		if you call a safe FFI callback from an unbound thread.  This can get out of
 		control in a busy application.  To avoid this, from version 0.19.1 we now delegate
 		processing to a single worker thread if the calling thread is not bound.
 		This essentially means that hexpat currently won't exploit multicores very well.
 		It also means that hexpat may be more efficient on threads spawned with forkOS
 		(to give you a bound thread) rather than forkIO.
 		ChangeLog: 0.15 changes intended to fix a (rare) \"error: a C finalizer called back into Haskell.\"
 		that seemed only to happen only on ghc6.12.X; 0.15.1 Fix broken Annotated parse;
 		0.16 switch from mtl to transformers; 0.17 fix mapNodeContainer &amp; rename some things.;
 		0.18 rename defaultEncoding to overrideEncoding. 0.18.3 formatG and indent were demanding list
 		items more than once (inefficient in chunked processing); 0.19 add Extended.hs;
 		0.19.1 fix a memory leak introduced in 0.19, delegate parsing to bound thread
 		if unbound (see note above); 0.19.2 include expat source code so \'cabal install\' just works
 		on Linux, Mac and Windows (thanks Jacob Stanley); 0.19.3 fix misconfiguration of expat
 		which broke entity parsing; 0.19.4 bump version constraint for text; 0.19.5 bump text
 		to &lt; 0.12 and fix text-0.10.0.1 breakage; 0.19.6 dependency breakage with List;
 		0.19.7 ghc-7.2.1 compatibility; 0.19.8 fix space leak on lazy parse under ghc-7.2.1
 	</longdescription>
 </pkgmetadata>
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/cdegroot-db/Manifest
+++ b/dev-java/cdegroot-db/Manifest
@ -1 +0,0 @@
 DIST com.cdegroot.db-0.08.tar.gz 154705 BLAKE2B a267d402d1741f701e0fc1a99fa765c0f86a9b13ccca20f4a592661472a31e85a4da49d6fb8be07ef1800cbd0fbb123366def29e30667448484ba419a0938684 SHA512 c8a6a6a46add440499dce42f27876cadfb9d247f4e7f8852e94cc20ca9afacb400f91f884760bf3659bad46979ddd5a65f6dda4bd5416da14d89a93ff5b447d1
--- a/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild
+++ b/dev-java/cdegroot-db/cdegroot-db-0.08-r2.ebuild
@ -1,38 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-ant-2
 DESCRIPTION="OO database written in Java"
 HOMEPAGE="http://www.cdegroot.com/software/db/"
 SRC_URI="http://www.cdegroot.com/software/db/download/com.${P/-/.}.tar.gz"
 LICENSE="MIT"
 SLOT="1"
 KEYWORDS="amd64 ppc64 x86"
 IUSE="doc source"
 DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4"
 S="${WORKDIR}/com.${P/-/.}"
 PATCHES=( "${FILESDIR}/${P}-gentoo.patch" )
 src_prepare() {
 	default
 	rm -rv src/db/test lib/*.jar || die
 	cp -v "${FILESDIR}/build.xml" "${S}/build.xml" || die
 }
 EANT_DOC_TARGET="docs"
 src_install() {
 	java-pkg_dojar "dist/${PN}.jar"
 	dodoc TODO VERSION CHANGES BUGS README
 	use doc && java-pkg_dojavadoc docs
 	use source && java-pkg_dosrc src/*
 }
--- a/dev-java/cdegroot-db/files/build.xml
+++ b/dev-java/cdegroot-db/files/build.xml
@ -1,59 +0,0 @@
 <?xml version="1.0"?>
 <project name="cdegroot-db" default="jar">
 	<!-- some properties -->
 	<property name="src.dir" value="src/db" />
 	<property name="build.dir" value="build" />
 	<property name="docs.dir" value="docs" />
 	<property name="dist.dir" value="dist" />
 	<property name="lib.dir" value="lib" />
 	<property name="jarfile" value="${dist.dir}/${ant.project.name}.jar" />
 	<property name="target.jdk" value="1.3" />
 	<!-- init -->
 	<target name="init">
 		<mkdir dir="${dist.dir}" />
 		<mkdir dir="${build.dir}" />
 		<mkdir dir="${docs.dir}" />
 	</target>	
 	<!-- compile everything -->
 	<target name="compile" depends="init">
 		<mkdir dir="${build.dir}" />
 		<javac srcdir="${src.dir}" 
 			destdir="${build.dir}"
 			source="${target.jdk}"
 			target="${target.jdk}"/>
 	</target>
 	<!-- build the jar file -->
 	<target name="jar" depends="compile">
 		<jar jarfile="${jarfile}" basedir="${build.dir}" />
 	</target>
 	<!-- generate javadocs -->
 	<target name="docs" depends="init">
 		<javadoc sourcepath="${src.dir}"
 			packagenames="com.*"
           		destdir="${docs.dir}"
           		author="true"
           		version="true"
           		use="true"
           		windowtitle="${ant.project.name} API" />
 	</target>
 	<!-- clean up -->
 	<target name="clean">
 		<delete dir="${build.dir}" />
 		<delete dir="${docs.dir}" />
 		<delete dir="${dist.dir}" />
 	</target>
        <!-- zip the sources -->
        <target name="sourcezip">
 		<zip destfile="${dist.dir}/${ant.project.name}-src.zip">
                        <zipfileset dir="${src.dir}" />
                </zip>
        </target>
 </project>
--- a/dev-java/cdegroot-db/files/cdegroot-db-0.08-gentoo.patch
+++ b/dev-java/cdegroot-db/files/cdegroot-db-0.08-gentoo.patch
@ -1,205 +0,0 @@
 diff -urpN src.orig/db/com/cdegroot/db/hash/EntryPage.java src/db/com/cdegroot/db/hash/EntryPage.java
 --- a/src/db/com/cdegroot/db/hash/EntryPage.java	2005-02-06 00:40:17.191151504 +0100
 +++ b/src/db/com/cdegroot/db/hash/EntryPage.java	2005-02-06 00:54:14.045930240 +0100
@@ -25,7 +25,7 @@ final class EntryPage extends PageHeader
     /**
      *  Constructs a page view from the indicated block.
      */
 -    EntryPage(BlockIo block) {
 +    public EntryPage(BlockIo block) {
 	super(block);
     }
@@ -33,7 +33,7 @@ final class EntryPage extends PageHeader
      *  Factory method to create or return a data page for the
      *  indicated block.
      */
 -    static EntryPage getEntryPageView(BlockIo block) {
 +    public static EntryPage getEntryPageView(BlockIo block) {
 	BlockView view = block.getView();
 	if (view != null && view instanceof EntryPage)
 	    return (EntryPage) view;
 diff -urpN src.orig/db/com/cdegroot/db/recman/BlockIo.java src/db/com/cdegroot/db/recman/BlockIo.java
 --- a/src/db/com/cdegroot/db/recman/BlockIo.java	2005-02-06 00:40:17.192151352 +0100
 +++ b/src/db/com/cdegroot/db/recman/BlockIo.java	2005-02-06 00:58:02.990125432 +0100
@@ -31,7 +31,7 @@ package com.cdegroot.db.recman;
  *  @see java.io.DataInput
  *  @see java.io.DataOutput
  */
 -final class BlockIo implements java.io.Serializable {
 +final public class BlockIo implements java.io.Serializable {
     private long blockId;
     private final byte[] snapshot; // committed snapshot.
     private boolean snapshotValid = false;
@@ -44,7 +44,7 @@ final class BlockIo implements java.io.S
      *  Constructs a new BlockIo instance working on the indicated
      *  buffer.
      */
 -    BlockIo(long blockId, byte[] data) {
 +    public BlockIo(long blockId, byte[] data) {
 	// removeme for production version
 	if (blockId > 10000000000L)
 	    throw new Error("bogus block id " + blockId);
@@ -108,7 +108,7 @@ final class BlockIo implements java.io.S
     /**
      *  Returns the current view of the block.
      */
 -    BlockView getView() {
 +    public BlockView getView() {
 	return view;
     }
@@ -172,17 +172,25 @@ final class BlockIo implements java.io.S
     /**
      *  Reads a short from the indicated position
      */
 -    short readShort(int pos) {
 +    public short readShort(int pos) {
 	return (short)
 	    (((short) (data[pos+0] & 0xff) << 8) | 
 	     ((short) (data[pos+1] & 0xff) << 0));
     }
 +   
 +    public byte readByte(int pos) {
 +	return data[pos];
 +    }
 +
 +    public void writeByte(int pos, byte value)
 +    {	data[pos] = value;
 +    }
     /**
      *  Writes a short to the indicated position
      */
 -    void writeShort(int pos, short value) {
 +    public void writeShort(int pos, short value) {
 	data[pos+0] = (byte)(0xff & (value >> 8));
 	data[pos+1] = (byte)(0xff & (value >> 0));
 	setDirty();
@@ -191,7 +199,7 @@ final class BlockIo implements java.io.S
     /**
      *  Reads an int from the indicated position
      */
 -    int readInt(int pos) {
 +    public int readInt(int pos) {
 	return
 	    (((int)(data[pos+0] & 0xff) << 24) |
 	     ((int)(data[pos+1] & 0xff) << 16) |
@@ -202,7 +210,7 @@ final class BlockIo implements java.io.S
     /**
      *  Writes an int to the indicated position
      */
 -    void writeInt(int pos, int value) {
 +    public void writeInt(int pos, int value) {
 	data[pos+0] = (byte)(0xff & (value >> 24));
 	data[pos+1] = (byte)(0xff & (value >> 16));
 	data[pos+2] = (byte)(0xff & (value >>  8));
@@ -213,7 +221,7 @@ final class BlockIo implements java.io.S
     /**
      *  Reads a long from the indicated position
      */
 -    long readLong(int pos) {
 +    public long readLong(int pos) {
 	return
 	    (((long)(data[pos+0] & 0xff) << 56) |
 	     ((long)(data[pos+1] & 0xff) << 48) |
@@ -228,7 +236,7 @@ final class BlockIo implements java.io.S
     /**
      *  Writes a long to the indicated position
      */
 -    void writeLong(int pos, long value) {
 +    public void writeLong(int pos, long value) {
 	data[pos+0] = (byte)(0xff & (value >> 56));
 	data[pos+1] = (byte)(0xff & (value >> 48));
 	data[pos+2] = (byte)(0xff & (value >> 40));
 diff -urpN src.orig/db/com/cdegroot/db/recman/BlockView.java src/db/com/cdegroot/db/recman/BlockView.java
 --- a/src/db/com/cdegroot/db/recman/BlockView.java	2005-02-06 00:40:17.193151200 +0100
 +++ b/src/db/com/cdegroot/db/recman/BlockView.java	2005-02-06 00:47:57.632153832 +0100
@@ -28,5 +28,5 @@ package com.cdegroot.db.recman;
  *
  *  @see BlockIo.setView()
  */
 -interface BlockView {
 +public interface BlockView {
 }
 diff -urpN src.orig/db/com/cdegroot/db/recman/Magic.java src/db/com/cdegroot/db/recman/Magic.java
 --- a/src/db/com/cdegroot/db/recman/Magic.java	2005-02-06 00:40:17.193151200 +0100
 +++ b/src/db/com/cdegroot/db/recman/Magic.java	2005-02-06 00:44:22.164909832 +0100
@@ -25,7 +25,7 @@ package com.cdegroot.db.recman;
 /**
  *  This interface contains magic cookies.
  */
 -interface Magic {
 +public interface Magic {
     /** Magic cookie at start of file */
     short FILE_HEADER = 0x1350;
@@ -57,4 +57,6 @@ interface Magic {
     int SZ_INT = 4;
     /** Size of an externalized long */
     int SZ_LONG = 8;
 +    /** Size of byte */
 +    int SZ_BYTE = 1;
 }
 diff -urpN src.orig/db/com/cdegroot/db/recman/PageHeader.java src/db/com/cdegroot/db/recman/PageHeader.java
 --- a/src/db/com/cdegroot/db/recman/PageHeader.java	2005-02-06 00:40:17.193151200 +0100
 +++ b/src/db/com/cdegroot/db/recman/PageHeader.java	2005-02-06 00:50:10.236994832 +0100
@@ -28,15 +28,15 @@ import java.io.*;
  *  This class represents a page header. It is the common superclass for
  *  all different page views.
  */
 -class PageHeader implements BlockView {
 +public class PageHeader implements BlockView {
     // offsets
     private static final short O_MAGIC = 0; // short magic
     private static final short O_NEXT = Magic.SZ_SHORT;  // long next
     private static final short O_PREV = O_NEXT + Magic.SZ_LONG; // long prev
 -    static final int SIZE = O_PREV + Magic.SZ_LONG;
 +    public static final int SIZE = O_PREV + Magic.SZ_LONG;
     // my block
 -    BlockIo block;
 +    public BlockIo block;
     /**
      *  Constructs a PageHeader object from a block
@@ -45,7 +45,7 @@ class PageHeader implements BlockView {
      *  @throws IOException if the block is too short to keep the file
      *          header.
      */
 -    PageHeader(BlockIo block) {
 +    public PageHeader(BlockIo block) {
 	initialize(block);
 	if (!magicOk()) 
 	    throw new Error("CRITICAL: page header magic for block " 
@@ -66,7 +66,7 @@ class PageHeader implements BlockView {
      *  Factory method to create or return a page header for the
      *  indicated block.
      */
 -    static PageHeader getView(BlockIo block) {
 +    public static PageHeader getView(BlockIo block) {
 	BlockView view = block.getView();
 	if (view != null && view instanceof PageHeader)
 	    return (PageHeader) view;
 diff -urpN src.orig/db/com/cdegroot/db/recman/RecordFile.java src/db/com/cdegroot/db/recman/RecordFile.java
 --- a/src/db/com/cdegroot/db/recman/RecordFile.java	2005-02-06 00:40:17.193151200 +0100
 +++ b/src/db/com/cdegroot/db/recman/RecordFile.java	2005-02-06 00:45:38.616287456 +0100
@@ -33,7 +33,7 @@ import java.util.*;
  *  The set of dirty records on the in-use list constitutes a transaction. 
  *  Later on, we will send these records to some recovery thingy.
  */
 -final class RecordFile {
 +final public class RecordFile {
     private final TransactionManager txnMgr;
     // Todo: reorganize in hashes and fifos as necessary.
@@ -48,7 +48,7 @@ final class RecordFile {
     private boolean transactionsDisabled = false;
     /** The length of a single block. */
 -    final static int BLOCK_SIZE = 8192;//4096;
 +    final public static int BLOCK_SIZE = 8192;//4096;
     /** The extension of a record file */
     final static String extension = ".db";
--- a/dev-java/cdegroot-db/metadata.xml
+++ b/dev-java/cdegroot-db/metadata.xml
@ -1,8 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>java@gentoo.org</email>
 	<name>Java</name>
 </maintainer>
 </pkgmetadata>
--- a/dev-java/codemodel/Manifest
+++ b/dev-java/codemodel/Manifest
@ -1 +0,0 @@
 DIST codemodel-2.6-sources.jar 178745 BLAKE2B d04979e3d912af5f16b0d0f6842c87e741abd32c8294fa429276a7457b328d577ed42352d8ea1874e9092845f7e8932df569f09f053702c5de635d243513d404 SHA512 f314fcd242d61bf0236b0520e8316df12cc5c068029d3a3a889db5d67ad1f0da37f3a1c09cc73d4709b7735b70f0ce8737365cb01441b3dedc6614f733e932c7
--- a/dev-java/codemodel/codemodel-2.6.ebuild
+++ b/dev-java/codemodel/codemodel-2.6.ebuild
@ -1,20 +0,0 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Java library for code generators"
 HOMEPAGE="https://codemodel.java.net/"
 SRC_URI="http://repo.maven.apache.org/maven2/com/sun/${PN}/${PN}/${PV}/${P}-sources.jar"
 LICENSE="CDDL"
 SLOT="2"
 KEYWORDS="amd64 x86"
 DEPEND=">=virtual/jdk-1.5
 		app-arch/unzip"
 RDEPEND=">=virtual/jre-1.5"
--- a/dev-java/codemodel/metadata.xml
+++ b/dev-java/codemodel/metadata.xml
@ -1,8 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="project">
    <email>java@gentoo.org</email>
    <name>Java</name>
  </maintainer>
 </pkgmetadata>
--- a/dev-java/istack-commons-buildtools/Manifest
+++ b/dev-java/istack-commons-buildtools/Manifest
@ -1 +0,0 @@
 DIST istack-commons-buildtools-2.22-sources.jar 12689 BLAKE2B 09edcf7a2a968a960d6ea3556bc081883697149c264798680089ff4916e8dcb30193d32250ad3093b104333f8893c8159a607d9e518987c922511032d6a8ab09 SHA512 6cafd354c51fe1b42bb8a6cf52ddf9f6dd97cfdd16182ed5d1a2db6440d18ab84af4d9136df09aa4703694bad546967d25e828c0e1b21fb802c66630da3f4fe4
--- a/dev-java/istack-commons-buildtools/istack-commons-buildtools-2.22-r1.ebuild
+++ b/dev-java/istack-commons-buildtools/istack-commons-buildtools-2.22-r1.ebuild
@ -1,29 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 inherit java-pkg-2 java-pkg-simple
 JAVA_PKG_IUSE="doc source"
 MY_PN=${PN%%-*}
 DESCRIPTION="IStack Commons - Buildtools jar"
 HOMEPAGE="https://istack-commons.java.net"
 SRC_URI="https://maven.java.net/content/repositories/releases/com/sun/${MY_PN}/${PN}/${PV}/${P}-sources.jar"
 LICENSE="CDDL"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc source"
 CDEPEND="dev-java/ant-core:0
 	dev-java/codemodel:2"
 RDEPEND=">=virtual/jre-1.6
 	${CDEPEND}"
 DEPEND=">=virtual/jdk-1.6
 	app-arch/zip
 	${CDEPEND}"
 JAVA_GENTOO_CLASSPATH="ant-core,codemodel-2"
--- a/dev-java/istack-commons-buildtools/metadata.xml
+++ b/dev-java/istack-commons-buildtools/metadata.xml
@ -1,11 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
  <email>robbat2@gentoo.org</email>
 </maintainer>
 <maintainer type="project">
  <email>java@gentoo.org</email>
  <name>Java</name>
  </maintainer>
 </pkgmetadata>
--- a/dev-java/velocity-dvsl/Manifest
+++ b/dev-java/velocity-dvsl/Manifest
@ -1 +0,0 @@
 DIST velocity-dvsl-1.0.zip 91539 BLAKE2B 747c735804b24d6d775c658e505a5fbe22289e98ede55577354da7ec0a7908031312febeef8f698aba033d0c9b1553b4e46eb6a5cbf6683ba4f16f87b178fa32 SHA512 0f431347706143a76d93d58f44a534a566780e27ba3ec43e48e4268b88a5fc523850a693800b730bee3a26d1c03339b24603f7eacabf716d199a9974d95c1d01
--- a/dev-java/velocity-dvsl/metadata.xml
+++ b/dev-java/velocity-dvsl/metadata.xml
@ -1,8 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
 </pkgmetadata>
--- a/dev-java/velocity-dvsl/velocity-dvsl-1.0.ebuild
+++ b/dev-java/velocity-dvsl/velocity-dvsl-1.0.ebuild
@ -1,54 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 JAVA_PKG_IUSE="doc source examples"
 inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Declarative Velocity Style Language"
 HOMEPAGE="https://velocity.apache.org/dvsl/devel/"
 SRC_URI="mirror://apache/velocity/dvsl/${PV}/${P}-src.zip -> ${P}.zip"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 RESTRICT="test"
 CDEPEND="
 	dev-java/ant-core:0
 	dev-java/dom4j:1
 	dev-java/velocity:0"
 DEPEND="
 	${CDEPEND}
 	app-arch/unzip
 	>=virtual/jdk-1.6"
 RDEPEND="
 	${CDEPEND}
 	>=virtual/jre-1.6"
 S="${WORKDIR}/${P}-src"
 JAVA_SRC_DIR="src"
 JAVA_GENTOO_CLASSPATH="
 	dom4j-1
 	ant-core
 	velocity
 "
 java_prepare() {
 	java-pkg_clean
 	rm -rv src/test || die
 }
 src_install() {
 	java-pkg-simple_src_install
 	java-pkg_dolauncher "${PN}" --main org.apache.dvsl.DVSL
 	use examples && java-pkg_doexamples examples
 }
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/jerryscript/Manifest
+++ b/dev-lang/jerryscript/Manifest
@ -0,0 +1 @@
 DIST jerryscript-2.4.0.tar.gz 2802799 BLAKE2B 18a3f71e7d3e2fc43772cb94aa3b0d4d28d72c6cd174eb0195f09283c5da5140ef85e86c6ed7a82e672724563549294c26d870b55c8bd9d0a92251b1002c612a SHA512 e96e6c6a2207ff869474801a1f8bbd3ce453d4076e558736ebf6962ccab08540f57cf932ec43bcd40429e21f1c6453d77874dd0a467d91a15d8357257533c1ea
--- a/dev-lang/jerryscript/files/jerryscript-2.4.0-python3.patch
+++ b/dev-lang/jerryscript/files/jerryscript-2.4.0-python3.patch
@ -0,0 +1,122 @@
 From 3f725c9a6e62048dcc7e1d0dd0f9c3e8d2e092f6 Mon Sep 17 00:00:00 2001
 From: Zac Medico <zmedico@gmail.com>
 Date: Sun, 23 May 2021 13:46:30 -0700
 Subject: [PATCH] Python debugger support for Python 3 (in addition to Python 2)
 https://github.com/jerryscript-project/jerryscript/pull/4678
 - Added ord builtin compatibility to pass through int arguments
 - Fixed JerryDebugger _parse_source method to decode bytes as utf8 strings
 - Fixed WebSocket send_message method to use packed_data[0:1] bytes slice
 JerryScript-DCO-1.0-Signed-off-by: Zac Medico <zmedico@gmail.com>
 ---
 jerry-debugger/jerry_client_main.py      | 26 ++++++++++++++++--------
 jerry-debugger/jerry_client_websocket.py | 14 ++++++++++++-
 2 files changed, 31 insertions(+), 9 deletions(-)
 diff --git a/jerry-debugger/jerry_client_main.py b/jerry-debugger/jerry_client_main.py
 index e65d0e14..e3176c86 100644
 --- a/jerry-debugger/jerry_client_main.py
 +++ b/jerry-debugger/jerry_client_main.py
@@ -151,2 +151,12 @@ def arguments_parse():
 +if sys.version_info.major >= 3:
 +    _ord_orig = ord
 +    def _ord_compat(c):
 +        if isinstance(c, int):
 +            return c
 +        return _ord_orig(c)
 +    # pylint: disable=redefined-builtin
 +    ord = _ord_compat
 +
 +
 class JerryBreakpoint(object):
@@ -563,2 +573,3 @@ class JerryDebugger(object):
     def _send_string(self, args, message_type, index=0):
 +        args = args.encode("utf8")
@@ -810,3 +821,3 @@ class JerryDebugger(object):
             elif buffer_type in [JERRY_DEBUGGER_SCOPE_VARIABLES, JERRY_DEBUGGER_SCOPE_VARIABLES_END]:
 -                self.scope_vars += "".join(data[1:])
 +                self.scope_vars += "".join(data[1:].decode("utf8"))
@@ -866,5 +877,5 @@ class JerryDebugger(object):
     def _parse_source(self, data):
 -        source_code = ""
 -        source_code_name = ""
 -        function_name = ""
 +        source_code = b""
 +        source_code_name = b""
 +        function_name = b""
         stack = [{"line": 1,
@@ -905,7 +916,7 @@ class JerryDebugger(object):
 -                stack.append({"source": source_code,
 -                              "source_name": source_code_name,
 +                stack.append({"source": source_code.decode("utf8"),
 +                              "source_name": source_code_name.decode("utf8"),
                               "line": position[0],
                               "column": position[1],
 -                              "name": function_name,
 +                              "name": function_name.decode("utf8"),
                               "lines": [],
@@ -939,4 +950,4 @@ class JerryDebugger(object):
                 if not stack:
 -                    func_desc["source"] = source_code
 -                    func_desc["source_name"] = source_code_name
 +                    func_desc["source"] = source_code.decode("utf8")
 +                    func_desc["source_name"] = source_code_name.decode("utf8")
@@ -1153,3 +1164,3 @@ class JerryDebugger(object):
                 message = self.current_out + message
 -                lines = message.split("\n")
 +                lines = message.decode("utf8").split("\n")
                 self.current_out = lines.pop()
@@ -1162,3 +1173,3 @@ class JerryDebugger(object):
                 message = self.current_log + message
 -                lines = message.split("\n")
 +                lines = message.decode("utf8").split("\n")
                 self.current_log = lines.pop()
@@ -1171,7 +1182,7 @@ class JerryDebugger(object):
             if subtype == JERRY_DEBUGGER_OUTPUT_WARNING:
 -                return "%swarning: %s%s" % (self.yellow, self.nocolor, message)
 +                return "%swarning: %s%s" % (self.yellow, self.nocolor, message.decode("utf8"))
             elif subtype == JERRY_DEBUGGER_OUTPUT_ERROR:
 -                return "%serr: %s%s" % (self.red, self.nocolor, message)
 +                return "%serr: %s%s" % (self.red, self.nocolor, message.decode("utf8"))
             elif subtype == JERRY_DEBUGGER_OUTPUT_TRACE:
 -                return "%strace: %s%s" % (self.blue, self.nocolor, message)
 +                return "%strace: %s%s" % (self.blue, self.nocolor, message.decode("utf8"))
@@ -1180,2 +1191,3 @@ class JerryDebugger(object):
 +        message = message.decode("utf8")
         if not message.endswith("\n"):
 diff --git a/jerry-debugger/jerry_client_websocket.py b/jerry-debugger/jerry_client_websocket.py
 index fe2c761a..07c75e53 100644
 --- a/jerry-debugger/jerry_client_websocket.py
 +++ b/jerry-debugger/jerry_client_websocket.py
@@ -17,2 +17,3 @@
 import struct
 +import sys
@@ -22,2 +23,13 @@ WEBSOCKET_FIN_BIT = 0x80
 +
 +if sys.version_info.major >= 3:
 +    _ord_orig = ord
 +    def _ord_compat(c):
 +        if isinstance(c, int):
 +            return c
 +        return _ord_orig(c)
 +    # pylint: disable=redefined-builtin
 +    ord = _ord_compat
 +
 +
 class WebSocket(object):
@@ -94,3 +106,3 @@ class WebSocket(object):
                               WEBSOCKET_BINARY_FRAME | WEBSOCKET_FIN_BIT,
 -                              WEBSOCKET_FIN_BIT + struct.unpack(byte_order + "B", packed_data[0])[0],
 +                              WEBSOCKET_FIN_BIT + struct.unpack(byte_order + "B", packed_data[0:1])[0],
                               0) + packed_data[1:]
--- a/dev-lang/jerryscript/jerryscript-2.4.0-r2.ebuild
+++ b/dev-lang/jerryscript/jerryscript-2.4.0-r2.ebuild
@ -0,0 +1,70 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=(python3_{7,8,9})
 inherit cmake python-any-r1
 DESCRIPTION="Ultra-lightweight JavaScript engine for the Internet of Things"
 HOMEPAGE="https://github.com/jerryscript-project/jerryscript"
 SRC_URI="https://github.com/jerryscript-project/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="debugger"
 RDEPEND="debugger? ( ${PYTHON_DEPS} )"
 BDEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}/jerryscript-2.4.0-python3.patch"
 )
 src_prepare() {
 	find . -name CMakeLists.txt -print0 | xargs -0 sed -i \
 		-e "s:lib/pkgconfig:$(get_libdir)/pkgconfig:" \
 		-e "s:DESTINATION lib):DESTINATION $(get_libdir)):" \
 		|| die
 	find . -name '*.pc.in' -print0 | xargs -0 sed -i \
 		-e "s|/lib\$|/$(get_libdir)|" \
 		|| die
 	cmake_src_prepare
 }
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_STRIP=OFF
 		-DJERRY_DEBUGGER=ON
 		-DJERRY_ERROR_MESSAGES=ON
 		-DJERRY_EXTERNAL_CONTEXT=ON
 		-DJERRY_LINE_INFO=ON
 		-DJERRY_LOGGING=ON
 		-DJERRY_PARSER_DUMP_BYTE_CODE=ON
 		-DJERRY_PARSER=ON
 		-DJERRY_REGEXP_DUMP_BYTE_CODE=ON
 		-DJERRY_SNAPSHOT_EXEC=ON
 		-DJERRY_SNAPSHOT_SAVE=ON
 	)
 	cmake_src_configure
 }
 src_install() {
 	local jerry_debugger_dir
 	cmake_src_install
 	if use debugger; then
 		jerry_debugger_dir=/usr/$(get_libdir)/jerryscript/jerry-debugger
 		insinto "${jerry_debugger_dir}"
 		doins jerry-debugger/*.py
 		python_optimize "${ED}${jerry_debugger_dir}"
 		cat <<-EOF > "${T}/jerry-debugger"
 		#!/bin/sh
 		export PYTHONPATH=${EPREFIX}${jerry_debugger_dir}
 		exec python "${jerry_debugger_dir}/jerry_client.py" "\$@"
 		EOF
 		dobin "${T}"/jerry-debugger
 	fi
 }
--- a/dev-lang/jerryscript/metadata.xml
+++ b/dev-lang/jerryscript/metadata.xml
@ -0,0 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/jerryscript-project/jerryscript/issues</bugs-to>
 		<remote-id type="github">jerryscript-project/jerryscript</remote-id>
 	</upstream>
 	<use>
 		<flag name="debugger">Install jerry-debugger</flag>
 	</use>
 </pkgmetadata>
--- a/dev-lang/pcc/pcc-9999.ebuild
+++ b/dev-lang/pcc/pcc-9999.ebuild
@ -1,40 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 inherit autotools
 DESCRIPTION="pcc portable c compiler"
 HOMEPAGE="http://pcc.ludd.ltu.se"
 if [[ ${PV} == 9999 ]]; then
 	ECVS_SERVER="pcc.ludd.ltu.se:/cvsroot"
 	ECVS_MODULE="${PN}"
 	inherit cvs
 	S="${WORKDIR}/${PN}"
 else
 	SRC_URI="ftp://pcc.ludd.ltu.se/pub/pcc-releases/${P}.tgz"
 	KEYWORDS="~amd64 ~x86"
 fi
 LICENSE="BSD"
 SLOT="0"
 DEPEND=">=dev-libs/pcc-libs-${PV}"
 RDEPEND="${DEPEND}"
 src_prepare() {
 	sed -i -e 's/AC_CHECK_PROG(strip,strip,yes,no)//' configure.ac || die "Failed to fix configure.ac"
 	sed -i -e 's/AC_SUBST(strip)//' configure.ac || die "Failed to fix configure.ac more"
 	eautoreconf
 }
 src_configure() {
 	econf --disable-stripping
 }
 src_install() {
 	emake DESTDIR="${D}" install
 }
--- a/dev-lang/perl/perl-5.32.1.ebuild
+++ b/dev-lang/perl/perl-5.32.1.ebuild
@ -55,7 +55,7 @@ SLOT="0/${SUBSLOT}"
 if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
 # SOMEWHAT EXPERIMENTAL CODE, DO NOT USE WITHOUT AN ADULT PRESENT, CHECK CHANGELOG
 # FOR DETAILS
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="berkdb debug doc gdbm ithreads minimal"
--- a/dev-lang/rakudo/files/rakudo-2016.04-jna-lib.patch
+++ b/dev-lang/rakudo/files/rakudo-2016.04-jna-lib.patch
@ -1,21 +0,0 @@
 Upstream uses -Xbootclasspath, which prevents us from using
 LD_LIBRARY_PATH, thefore we need to set jna.boot.library.path.
 See http://bugs.java.com/bugdatabase/view_bug.do?bug_id=4285197.
 Chewi
 2016/05/15
 diff -Naur rakudo-2016.04.orig/tools/build/create-jvm-runner.pl rakudo-2016.04/tools/build/create-jvm-runner.pl
 --- rakudo-2016.04.orig/tools/build/create-jvm-runner.pl	2015-12-25 19:23:19.000000000 +0000
 +++ rakudo-2016.04/tools/build/create-jvm-runner.pl	2016-05-15 11:30:37.488085661 +0100
@@ -60,7 +60,10 @@
 }
 my $classpath = join($cpsep, ($jardir, $libdir, $nqplibdir));
 +my $jna_lib = `java-config --query LIBRARY_PATH --package jna-4`;
 +chomp $jna_lib;
 my $jopts = '-noverify -Xms100m -Xbootclasspath/a:' . $perl6jars 
 +          . ' -Djna.boot.library.path=' . $jna_lib
           . ' -cp ' . ($^O eq 'MSWin32' ? '"%CLASSPATH%";' : '$CLASSPATH:') . $classpath
           . ' -Dperl6.prefix=' . $prefix
           . ' -Djna.library.path=' . $sharedir
--- a/dev-lang/rakudo/rakudo-9999.ebuild
+++ b/dev-lang/rakudo/rakudo-9999.ebuild
@ -1,79 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 inherit java-pkg-opt-2
 DESCRIPTION="A compiler for the Perl 6 programming language"
 HOMEPAGE="https://rakudo.org"
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="https://rakudo.org/downloads/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 LICENSE="Artistic-2"
 SLOT="0"
 # TODO: add USE="javascript" once that's usable in nqp
 IUSE="clang java +moar test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( java moar )"
 CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]"
 RDEPEND="${CDEPEND}
 	java? ( >=virtual/jre-1.7 )"
 DEPEND="${CDEPEND}
 	clang? ( sys-devel/clang )
 	java? ( >=virtual/jdk-1.7 )
 	>=dev-lang/perl-5.10"
 PATCHES=( "${FILESDIR}/${PN}-2016.04-jna-lib.patch" )
 pkg_pretend() {
 	if has_version dev-lang/rakudo; then
 		ewarn "Rakudo is known to fail compilation/installation with Rakudo"
 		ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo,"
 		ewarn "then do a new installation."
 		ewarn "(see Bug #584394)"
 	fi
 }
 src_prepare() {
 	epatch "${PATCHES[@]}"
 	epatch_user
 }
 src_configure() {
 	local backends
 	use moar && backends+="moar,"
 	use java && backends+="jvm"
 	local myargs=(
 		"--prefix=/usr"
 		"--sysroot=/"
 		"--sdkroot=/"
 		"--backends=${backends}"
 	)
 	perl Configure.pl "${myargs[@]}" || die
 	if use java; then
 		NQP=$(java-pkg_getjars --with-dependencies nqp)
 	fi
 }
 src_compile() {
 	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
 }
 src_install() {
 	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install
 }
 src_test() {
 	RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default
 }
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/Show More
+++ b/Show More
`@ -1,2 +1 @@`
	`DIST gzip-1.10.tar.xz 775144 BLAKE2B 431dc0fd11061eabd9db86594777b86510b124b124fd74799eacd67334631af60f638be2638413bee0153a9da35528d0aecc5b5083152c395223705400c9103b SHA512 e6ba9e3906cdb6a6235b213515093d02afa1722686f73eddacbacae628542b586b449829783b6a1701e9b9e0c4d4dfa6845904d3b6b010f5cf21aec4997c9299`	`DIST gzip-1.10.tar.xz 775144 BLAKE2B 431dc0fd11061eabd9db86594777b86510b124b124fd74799eacd67334631af60f638be2638413bee0153a9da35528d0aecc5b5083152c395223705400c9103b SHA512 e6ba9e3906cdb6a6235b213515093d02afa1722686f73eddacbacae628542b586b449829783b6a1701e9b9e0c4d4dfa6845904d3b6b010f5cf21aec4997c9299`
	`DIST gzip-1.9.tar.xz 762516 BLAKE2B 4001fc7a770634916d52b026dab1b621fc96275bfb61ec2df2d0e7d7ec1c81414270d3c866034e6ef758870f38e9d4396a25832abe558915a7ded1f1511eb4b0 SHA512 c0852e7f7662141e79d14bc36e50f1940dba3e804feff3b0b8fa084ffec720ac245352282d2f1db117fadc95758424dd418d192b94621dac4367834ccf101fad`
		`@ -1 +0,0 @@`
			`DIST gnutu-2.9.tar.gz 325519 BLAKE2B 4c98d9f7f6a4752821bff464d744a019736353f0011bb162624f3458e1e872dfbe6039572ed79f3c479cdcda4d93f61a4a12fd10c72cd3bbddff45be8d8b0775 SHA512 7ad470ff524422b2236f05bf79cf2a144d166cac7a26d94851b6aacda32e8fa4f8e0ef6abf12157aba19d1e92b7774c3b86f89a8e32514b1ebf7d6e460045411`
`@ -1 +1,2 @@`
	`DIST gpyutils-0.4.5.tar.gz 20037 BLAKE2B f628c11e0ae2c9bb02a024e1b7dcab7092e7b01c14078683c47a8ca00d71021b988c51d80ab8b322891f9ecd4bb11c7bfe7d300f3bcbe489a977b18244ead085 SHA512 f68c87b5a35aece182bf2f9f93fe89f061dd49b4b75fabb7637038aee1e5301797af1d889a75829048eeb05dda0233461a2f2600e185214600a282cea50d1d3c`	`DIST gpyutils-0.4.5.tar.gz 20037 BLAKE2B f628c11e0ae2c9bb02a024e1b7dcab7092e7b01c14078683c47a8ca00d71021b988c51d80ab8b322891f9ecd4bb11c7bfe7d300f3bcbe489a977b18244ead085 SHA512 f68c87b5a35aece182bf2f9f93fe89f061dd49b4b75fabb7637038aee1e5301797af1d889a75829048eeb05dda0233461a2f2600e185214600a282cea50d1d3c`
		`DIST gpyutils-0.5.1.tar.gz 23480 BLAKE2B 90e7a0f54526ede6a3c0342558cbbc379a8e8453aca1bc79751c12e292322d3cd3da8dad69f8a6aed7704bf043fe9e2324b567b3b6f7eff49c0e7a3e2bb2ea31 SHA512 5be4e4e03a5fef746eaf9bfed70f58801ed0dcec34cfdeef8d0936b92690b9519802fa3cdc3ca446ba688c4ff1604b5819d14b723c7ed2e6dd8f5b39ee76996f`
		`@ -1 +0,0 @@`
			`DIST gkeyfile-sharp-0.1.tar.gz 19862 BLAKE2B 7251560e6127b9a604da01ac72e76e6c5c8bdd46e9a13dad399f3f5ead2ed7ddb548ca733f45a7deaa5515ebec51ba8c96f7cfd4fead4dbbbb648479dcc5eee5 SHA512 056bf88b8e1e4032be5d082f4f9fcb1eb00df0294cec6edea8117539b5f5c29fddf41b26a43ff7fadc370d10f0e53add968dfa4bd7763f130e140f45b7c21e9d`
		`@ -1 +0,0 @@`
			`DIST gtk-sharp-2.12.21.tar.gz 2498480 BLAKE2B b5471f18e0ed49e12d56d1ed8f086e68003cfd0cd2ee2b51b5c343ad94af69601daee8b357a661b1012c0c7449e5b401ef074526ad7c772a17d15305dbbe46aa SHA512 f7f575ec42e1a6d3bdbd9493b06d083d10687b6f5b41eebe1f1e03087c0e3cce79948aa19e9dd88972b023837d48bd02afee719a28b7015a78dccb96f2fee307`
		`@ -1 +0,0 @@`
			`DIST notify-sharp-20090305.tar.bz2 79020 BLAKE2B e3ce9779211baba2ecd71e054d849031ea669ab97d4b40e8db5d597d9d4d28cf300fca23f843527b28615709eb33a202f45f4489fd171cdc9e89c734ff7a0eea SHA512 2daf6d33b3a4f53445193a654c3a92cd8e3766772472a914aa12a1c8619e5d48ed954987c44c3d856faec2e0a03e3348f6b4809a615ea3cfb4ef17ef5000c686`
		`@ -1 +0,0 @@`
			`DIST com.cdegroot.db-0.08.tar.gz 154705 BLAKE2B a267d402d1741f701e0fc1a99fa765c0f86a9b13ccca20f4a592661472a31e85a4da49d6fb8be07ef1800cbd0fbb123366def29e30667448484ba419a0938684 SHA512 c8a6a6a46add440499dce42f27876cadfb9d247f4e7f8852e94cc20ca9afacb400f91f884760bf3659bad46979ddd5a65f6dda4bd5416da14d89a93ff5b447d1`
		`@ -1 +0,0 @@`
			`DIST codemodel-2.6-sources.jar 178745 BLAKE2B d04979e3d912af5f16b0d0f6842c87e741abd32c8294fa429276a7457b328d577ed42352d8ea1874e9092845f7e8932df569f09f053702c5de635d243513d404 SHA512 f314fcd242d61bf0236b0520e8316df12cc5c068029d3a3a889db5d67ad1f0da37f3a1c09cc73d4709b7735b70f0ce8737365cb01441b3dedc6614f733e932c7`
		`@ -1 +0,0 @@`
			`DIST istack-commons-buildtools-2.22-sources.jar 12689 BLAKE2B 09edcf7a2a968a960d6ea3556bc081883697149c264798680089ff4916e8dcb30193d32250ad3093b104333f8893c8159a607d9e518987c922511032d6a8ab09 SHA512 6cafd354c51fe1b42bb8a6cf52ddf9f6dd97cfdd16182ed5d1a2db6440d18ab84af4d9136df09aa4703694bad546967d25e828c0e1b21fb802c66630da3f4fe4`
		`@ -1 +0,0 @@`
			`DIST velocity-dvsl-1.0.zip 91539 BLAKE2B 747c735804b24d6d775c658e505a5fbe22289e98ede55577354da7ec0a7908031312febeef8f698aba033d0c9b1553b4e46eb6a5cbf6683ba4f16f87b178fa32 SHA512 0f431347706143a76d93d58f44a534a566780e27ba3ec43e48e4268b88a5fc523850a693800b730bee3a26d1c03339b24603f7eacabf716d199a9974d95c1d01`