Sync with portage [Wed Mar 24 06:58:07 MSK 2021].

3 years ago · 34bb5a00de
parent 6a72bf4f14
commit 34bb5a00de
251 changed files with 2341 additions and 1536 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29293 BLAKE2B fd3e8d3cb8bcf7ed13e275cc4d05e70ef36610b59138eeb0e9238e06991dae3fa381d528567ff102f50f5d8be302dffae5e4a96a6125ce5173b10bbd15a4a95a SHA512 36a8ed61b825a08f73b3063de6aa5a67afb0690c2e2bd4b1b2d028f6e663120139b2db50c6197c172c19a5d292ea17dbe0b70fa3f42f0b8507d6b2dad86e647d
-TIMESTAMP 2021-03-23T07:38:30Z
+MANIFEST Manifest.files.gz 29275 BLAKE2B 8ed662a5203cf9eadb77fe318b527242037a628a401a85b6c370f43de3679d3f0064f62d4e54220ccb3b8e8409817dc7dc7f28c345a7a4589e434e570100bfd1 SHA512 01fbeb66dee7b881cadfa76d7d4aae807f44bd05ea22621d22b21fa78f9d9add59084f95a4d1d7c91bbc991c137f1b229d8a76c478179f645e6eb59c17808d7b
+TIMESTAMP 2021-03-24T03:08:30Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmBZmvZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmBarS5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDAGBAAo8CfC1jln3dLTZA9wbn7YLO1CTIB8eu5h9zyU3vhy7HFTtjPpz9wKSdr
-fNsIaY9/d8uqC6SIFXaNJU2OxXnrR4RCXaVa8KJJmKlR3uBWQ80Y0cbhX7UFux4W
-MBIeTZUpwOTkDo8MiBl5+X1TnXKz9vdG6DuxXbvPc9gv5sr1XCVXAdoxBNn/b99m
-K4LajIGZJOcz2wcCubLnTEAPw0CI+q0vZcLqc4U+BfMQN61UNOsAE6bI/0xQzKDP
-nEcsILiXKoYAQuJ3wCUqH2BxxPAcl2byGzLQ2z6X6grAHlJEGC2aC3pgUQp+U3n3
-p+IJ2w4wA/1jAPVCpQSxa/lGWEXLdttOHXOee6mr3HGoWO0NbMlQ+Vl28V/JVEWF
-kwZbRI/ddqV+z6xge9e3PZzj9XYYx0JBqTWSpDBxCn9vXcOG9ufhpMIqq7ZckPlV
-ip1qmC6RrTJeCWVoWPx7cY0ddNqBbiBQq3ERLGfw1KiCTsDHkHNTkYUJM6jMJsiE
-bZ5CUpxyR6mh3QD9QjfaUsIEo0CfeLkNU+gn3/EMv8w0Tmp929iGxDEq02zNP70V
-4TDidBCM6947V9XT8BPGILEZEhzc8t/trhhta/fxUUgKIXeZyEU2CwVd5QtARqge
-PvyCDYYhYLrbLNT8qZ3ID4tMC1bOCmIbwMGjsAUpsOvkwXHBJJU=
-=mdSK
+klDUbxAAsnzHJ8E+M67bRyvX2FvvCYgYkv2go2YI4tGKA8Gmvz5b6f3Md+rMStcQ
+vzi2snq78guPeGKj+f5QTHEBSqLKxwrLwUi0SDfBqn1SbU1uI/xJ77q5V1Zw7t74
+z1Tc/7HSdW+k4DAk6DKYTRrSiQkkC/peGfO39Yr9bB5a/VAnG383u1ZHuQCWArUp
+v55lmI9Vx2lkpWc+Hi8apYcAs2hKpoQG2988We8uUadQ85JHDuvf6g5UNe4ICGuX
+5uawQTQ2IndT3CXDRsl6uS+fdXi+4llt+gyHauqI6mRo3voUThsN2xa7X//WaUid
+TpFhyu0MPuyyto5Kmpl7V6k6Vogdcln3Eyh5eYneGlw0/KFgt4vtQUjja9FzJKvJ
+reXIyPJ+aqb0yVf/w9Z4RIYKrGwmyP0VTM/cfDUommPZjZ9/k8UWdV6+gTKKKB+F
+5ktcsDVYIyQjPZY7TMTX9lB1MpidgA6BePbWmN162oh6AjPXPW2TuOz9arXgWNH8
+mtPvNaFEFI4Mb4dapGlf5JKzlbdrAmYE5HO9rS6DwoNJqN8v1wmQIa4hPBudDMmJ
+Wmnb+y83wCTtG2RYoOAKVBhsyjcaUnChsu+62nWymrYj/oTDswCmVFdVdVMyQlHJ
+4A3ZVg5kJJ5a9i2Pu9aTxsLpDB0+mAmHrN/ja6dcs9J25nfDuWc=
+=KHMC
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@ -3,6 +3,6 @@ AUX cpio-2.12-name-overflow.patch 404 BLAKE2B f15aaffd716a6dca8b00f0831cd3bfa897
 AUX cpio-2.12-non-gnu-compilers.patch 223 BLAKE2B e5ba3da0c1dc23199e52c3782d3a11504b075b1216d20cd8643591abdc3a69afe1db254800327ece8f07f83438756d88c5c10c606b4e14c76a309941dc4ed1f9 SHA512 369efc3393affdb91191ab7a55a6dd3a1157ddfa294bd9a4763cc63e6df72af3a7ab614234d69e327edf14a97e4fb800aee32a379ade73c0f80b0dd8ecf33f03
 DIST cpio-2.12.tar.bz2 1258605 BLAKE2B 4b6d42a1d8aaeaa980cab5894b2e264451e96a108f2c3aa89d3e6fde0bff338e026ee233ebd7c8cf41f3c926d42d38b866778244db774055736ca8792889e160 SHA512 0cd4da5f2fbca179ab4e666a5f878414c086a5f98bce4c76273f21d9b2a6fe422d901b5d453826c5f81bbe363aa015047a1e99779ad1a451c8feca6205c63120
 DIST cpio-2.13.tar.bz2 1354559 BLAKE2B 45d77723acb55f15c8574ab5a2fdff6fb1767629d177dd3416b0268e9f82ee6bdd11b4fa591ef020efccbdc3f4918cf77263169da1a0f6422dfe1a9712295778 SHA512 459398e69f7f48201c04d1080218c50f75edcf114ffcbb236644ff6fcade5fcc566929bdab2ebe9be5314828d6902e43b348a8adf28351df978c8989590e93a3
-EBUILD cpio-2.12-r1.ebuild 864 BLAKE2B 37ccc2b3193de87220107008a20fac0e0973e9e2efd5486831d2968c60bcbf9e20ad4117fb6ffeae83529081faa308c00bec5b1fccce9c590a78fbff71992a4c SHA512 795a65bdd66af849720eb286524ddb2afbc52859badc8dddcd8f0f905bad7f5e1447379d6acd0881687e2e88a97db820120d8993a41ae0ebc8230a81f54a223b
+EBUILD cpio-2.12-r1.ebuild 819 BLAKE2B 08d6696adb989e2dfafca2317758955812fac942bbff67e4b43940a4607a765ee1181e273f265bf179d5edd82701a471d2f787ed0ebab46d8fe498d32f0b1eac SHA512 ae83b97c08efc5c28d9d312e8c7884534ee6b37a9c4550cc2445e50a12b561c15b2cbb0cb1358d00233b59b234a8442464ee710f038bb4bd02178a141ac2f8be
 EBUILD cpio-2.13.ebuild 804 BLAKE2B e83fdf9524b6e956473f1fd974991d8ca50096d014335afc29d89739a6c1d541b18b1e1ef72e47de769e28920e9a137a65761bf0acfafeff161d7a42bce6f459 SHA512 1ed9849be48ed8effaac3046638090e4e7f4a3ab00a649bc69aa3b021d9663c55f1feb7ba1bf28ef4bd02fe97b4666bdbf1fccc8931ba9d63cd002f036fe83e9
 MISC metadata.xml 327 BLAKE2B 5f895635aeb7efdcc8e9999d6892fb8dd6668d204fbedf5492cf086a3ada6d9b1c71ffb2344de642b279de34d7ef459371d0eff173ed70cc404f6ef50d81987e SHA512 9aed569e7f3412d9891326d8d0bdbd48fd46dcbcb3d045ddbe7971e2d9e315e2d71ee9c5adebaa12425cfadf03de00ba5c70a16a4227634b9cf40e534d96fb05
--- a/app-arch/cpio/cpio-2.12-r1.ebuild
+++ b/app-arch/cpio/cpio-2.12-r1.ebuild
@ -1,9 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI="5"
-
-inherit eutils
+EAPI=7

 DESCRIPTION="A file archival tool which can also read and write tar files"
 HOMEPAGE="https://www.gnu.org/software/cpio/cpio.html"
@ -14,11 +12,11 @@ SLOT="0"
 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"
 IUSE="nls"

-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch #275295
-	epatch "${FILESDIR}"/${PN}-2.12-name-overflow.patch #572428
-	epatch "${FILESDIR}"/${PN}-2.12-gcc-10.patch #705900
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch #275295
+	"${FILESDIR}"/${PN}-2.12-name-overflow.patch #572428
+	"${FILESDIR}"/${PN}-2.12-gcc-10.patch #705900
+)

 src_configure() {
 	econf \
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@ -2,6 +2,6 @@ AUX gzip-1.3.8-install-symlinks.patch 284 BLAKE2B f461a822371d56505aa3e436c4d611
 AUX gzip-1.9-gnulib-glibc-2.28.patch 5422 BLAKE2B 1c514d2ba6b3ff1596930b7efc32591bd7175bf5cbf07ef323f2566e0723fe8b125f746492ab25ef4cd892f75c832f79dba74d81da0814944898c83d03f54fa7 SHA512 5111b961d50906a5e27432628f5becbb63b993077861f4441cf445cbed3f4ec4e5c69aee22f209f05ccaa5514cace53b5805ef9f96886276d8f1b46620d614e3
 DIST gzip-1.10.tar.xz 775144 BLAKE2B 431dc0fd11061eabd9db86594777b86510b124b124fd74799eacd67334631af60f638be2638413bee0153a9da35528d0aecc5b5083152c395223705400c9103b SHA512 e6ba9e3906cdb6a6235b213515093d02afa1722686f73eddacbacae628542b586b449829783b6a1701e9b9e0c4d4dfa6845904d3b6b010f5cf21aec4997c9299
 DIST gzip-1.9.tar.xz 762516 BLAKE2B 4001fc7a770634916d52b026dab1b621fc96275bfb61ec2df2d0e7d7ec1c81414270d3c866034e6ef758870f38e9d4396a25832abe558915a7ded1f1511eb4b0 SHA512 c0852e7f7662141e79d14bc36e50f1940dba3e804feff3b0b8fa084ffec720ac245352282d2f1db117fadc95758424dd418d192b94621dac4367834ccf101fad
-EBUILD gzip-1.10.ebuild 1086 BLAKE2B f0c05758c344467c6e70a45ac67406c6ba89e3744e938e518d0cf7e5d4b723788899331109b2f89804e4a3b49a59241d17e4d396c63ba9f8e2dd06d33073408e SHA512 0fea04bed2f2a9898e6fa52ea2fb8ccc351f60175f5cc7c1d27ccf0dd0e0da37678d6886145032182014e30db6fab30de9be444d6a25d17f212b91e6717cafe4
+EBUILD gzip-1.10.ebuild 1080 BLAKE2B b8a0d64a37ca54fb45fcf8392b948e5f62fcaaf18969bce500a28d25988bf3049ef0a0c9a124fe7d6401e5997583e15c35fd8f978bca85812fda9189b75a4461 SHA512 d1bfeb944eb54c9383aabc1416063ed259afb86a47c1875dcab872954e5b627530cab5251c2527de3026c62c5e47049455c36139dc42700ccabdd228f3d02799
 EBUILD gzip-1.9.ebuild 1128 BLAKE2B fcc7de9606ccf57da14239d909ae785a872115ea13bd0d5caab544b8bec7f843774dc12c4f8de1900ccdc2aff13683ab59d76fe7f15905a51ed2aa1806e970ff SHA512 d1f7d608cc4d92f1b804b7c4a035ef01576c1b3f8982f26946cefb7814d5ed0fcc7c7c678461f21789dbbf8748c4e03434d18c57ce6be2c7035e1a4735bc19e0
 MISC metadata.xml 421 BLAKE2B cd73d8b6c846ebae069903fefc36cd0c2835cee6c137e1cc642cae9628be6fd3678c9002defeb2a63ca592f96f9f8032e99535f398a60989df9fb66270d6ec4f SHA512 fef953770d98077b95afc5f2d7fc208dc74453c403dd4220c8b35b837a485dbe8d98e1f669b5661633f599246752f1ee4136ee886ca6c15c2dcc0da73d976e96
--- a/app-arch/gzip/gzip-1.10.ebuild
+++ b/app-arch/gzip/gzip-1.10.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

 inherit flag-o-matic

@ -34,6 +34,6 @@ src_install() {

 	# 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
+	mv "${ED}"/usr/bin/{gunzip,gzip,uncompress,zcat} "${ED}"/bin/ || die
+	sed -e "s:${EPREFIX}/usr:${EPREFIX}:" -i "${ED}"/bin/gunzip || die
 }
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@ -1,5 +1,5 @@
-DIST mg-20200215.tar.gz 152254 BLAKE2B 89e47aaa94fd95b9409a53b09c9017e26d3f1cc73ce616e1c29ed22fbaed42cb78e7c9fbcd2424d98f86725fb00cee5160be4fe40abc97a927201557b684f800 SHA512 c6cda5544210bc3d3fa3cbb8494e60949e10ed3716d96b76d0c9e7f5671c7a85f6e7e7a860cfd05466f1bf52112053c722441ff338210c0ada89f10515ac170a
 DIST mg-20200723.tar.gz 152271 BLAKE2B 5fcbe2699da60c68a0c464bb337741d7797e9da3e2ab148a821aed46f661e5f5efbe7ceb14b153dcdd51185d22d0a2b2c7ad3525fc531192ecc0c0697e483b77 SHA512 8e481cf4981b93dba95b3b318f44dda15e580962216d452ce2fddcd19b86e4686673ba84d092bfaa540533b227428bd3bc9e6becda69be881d930937b0ea7add
-EBUILD mg-20200215.ebuild 1039 BLAKE2B 1b1c3ad8fd0373d8dd16ddf0a12747f06abb028bc205a6064f50f711ad8fef8a135df1e4b87cb4835656d9ac9834cd2194b83ffe56fbba74e8a6d616dbba3fae SHA512 2acc555ba564b5c9a11bab563847762bb1f726f750a25387b24f282af906c22cf49db2b6912b116dba81f3715e7baa736a57375413d2ac62f2a446e332f124ff
+DIST mg-20210314.tar.gz 152749 BLAKE2B eec9740db1a543025450746913c1b07f0646f370906665122c7f5dd1ecc46b5cab102bd29aa51afb13972f4f17118ea20c33bb619e8dc4bc8982f8423ed189d6 SHA512 816b1bf8aec97dd790b0d5bf8836d46cb87f60d0bda94c2aecce4f8a6b8599ab2e90805fa6b129c9e40b54b340e33a47fec97c60e1b59b7706aa357d58b0e3f6
 EBUILD mg-20200723.ebuild 1039 BLAKE2B eef7dd1ed4645c2cd557e702673fb57076beb717e4230147431d98d719d684415f83f90bce40b1a9c433c3084b4278740753c704dad7ce8a98ac768cb9e09157 SHA512 2ef7301ccbb7ef1d067759ff9932584864ca36a62ba1ce66ffbf35c2d6118040d77f42d6947a55c86d62251191dbe29d272a6d54e6c36a9632a37f197e246bad
+EBUILD mg-20210314.ebuild 1044 BLAKE2B bcdd18dfbdef4e09f9ced625ce21a8a391428942f74ab42c3a2f126449fb87da1e53c51643f06610ddc0250182d698c6b8ff4ea90763fa109475dd7c4240666d SHA512 e9ea391a0f88264c7d688c503f0972d00e4d489960b2c14b470d362dec6137f71ca7ac8fcca07f1610182524c28978fa1b4589c7d4bd8e46a3b9f4690495e180
 MISC metadata.xml 618 BLAKE2B d6aa73580d4aebe2a43f227c56df586058260eb53bc7b09e3cd9355526bcb32bad3c92c2ba20aaa8da9e96634d43b1385921e2f9ef77168e3089eed64b9e7d45 SHA512 a61abb9ef37a2e1d8e04d3476b2ba85e66f1e6287bb81c3d2ba71c7b1022c8e025fbe4f1b46dcef27d38b5f28a75e569608e7b9d5e9b504c8d405680cd764a4d
--- a/app-editors/mg/mg-20210314.ebuild
+++ b/app-editors/mg/mg-20210314.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="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="livecd"

 RDEPEND="sys-libs/ncurses:0
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/docker-compose/Manifest
+++ b/app-emulation/docker-compose/Manifest
@ -1,10 +1,13 @@
 AUX docker-compose-1.27.0_rc3-setup-py.patch 1840 BLAKE2B 15269cc09ad609008afbf2d61beabc5242d63f2e3c6cfb8c65c1768de3aea559dd99e6ab7ff6acd1b93420402d0a176fdb1390c5477c7820e3173b0ff2d39853 SHA512 12a1b996a8d37289991ea979ddf1a303241217f43b26df5b7d2a1241006c7de38234c11ed0b9e99ca92348159d0681c3316e3413a4d639c13fa29acb0ae8cf23
 AUX docker-compose-1.28.4-setup-py.patch 1844 BLAKE2B 5e9d683c5e90d30662555c050a07a3d13dd646028b62b9abfa19c84b9e3d0395fe2cedccbc8c352d6c2b89aca0244c750942ba7fb5e25fd2721c18bb47b6d008 SHA512 c60a3d56def25bdf9e884f0af8dcbba8e30d6aa05a8fc3efbef170807f007e67c2177340d6992688d531a937fbd2671656ddf74273dd4c8b4b5511dd73795cd1
 AUX docker-compose-1.28.5-setup-py.patch 1844 BLAKE2B 5fee25a003a6c0b2afcb17a38959a8f0c2284ec3f6a8ff2e09afee946dd68a4ef36d66b629922867baf7e16db26ec9b89aa943b7f1f4ee134d0881fa76024290 SHA512 fdc35b95a3a43c250aec3f71b5322badaac45a03ab17dce789ae114b0a9a5f2a493d07d3b177e295cd0ad94f0bda191eaae139517a50e229de1de599216e888e
+AUX docker-compose-1.28.6-setup-py.patch 1899 BLAKE2B 391331a3b425cde6657151f35883fcba40641a04063624ab49b6dfe3a4a376211d01547731d810d404c69befca083eb1116265ffdaf0fc4577255233f8391539 SHA512 94000982e32db3a874868565d326b5738ddb642e09759545f7652e2abc55fcd654ad7438ebaad3e19417c9b25fbc3cd93bf005c22ac9dab22f1bc25e01f0be3a
 DIST docker-compose-1.27.4.tar.gz 309308 BLAKE2B 098af5e0308de4fe72f8f7d5c9cbdb285ec1cb6fbd492baef8a4223f93591321c585ebabd4c7e4a40d7a1bce3ab2d7ccf4cee1d0a15e7f59bb80eb4df5b6c8d6 SHA512 b41b7cf88b1380021a30f9becb7567d1e154ef875c42b37483673b5107f1a26dae6868b92c6a61f695001eb63759b25f3729e6783272eb784047717cafea3b80
 DIST docker-compose-1.28.4.tar.gz 318110 BLAKE2B 97a39c52a2e9819fa4632a16080b9b3a029c5b81caa1bcb5143e78b9c6f3981aa462ef23c6c08fcafe80f8b786ce4962959dc84fd4fe2003ceee3dddcb85f438 SHA512 ba0b8a8a87e154c36b499b0fbb422847bcec421bdcbb6a7fc4a4d8169ae410f6bb71867fbff42b670b3d5ae61101527eeb71e68d57458906796e2d64adc0e367
 DIST docker-compose-1.28.5.tar.gz 318236 BLAKE2B 32aca16fdebd00c5b211404e82b44b9486340bfa379d4739d164d5aa75d4f35b95d914065c05fef585ea7e412035e582d8058f2b942a4ce17a9b2bc25ff0cd31 SHA512 1f2cc87b82d18c023e8c2d9eb2e991393c96f7a3ab17fa6871d0969a28162b6832f98b42c76cadc641416629f74eb00763c89e044ae8cf02a062bd74b58371c9
+DIST docker-compose-1.28.6.tar.gz 319216 BLAKE2B 6f35f13fd35e08223fd17406b219fcd8c97fe9a2e96a3210607d23d54923496a9a51271f359b1537b73bc5e407d175822075835f44406fcfe028cc23d8eaf9f9 SHA512 0aef0066e58ee3e9ac6ddfef71cd29ae46ba52ed641b6da7ffc74b9e9a60b3974593173e84ac863475bb5d2a3896a0d453fda4decb69101c91abc04f33e50d45
 EBUILD docker-compose-1.27.4.ebuild 2108 BLAKE2B 9d7a0dfad313a4311a188076d2cb06975f15a36d98d030c9f5bda18f0d5d7d35d70d65e0ddfa817eef560e575004e7c05f9b06e3a2a0582096f3d8476d480916 SHA512 e378202a4f2ae68eda0750a391d74c7fc9a2bc7614d4db4fffd32b6ca683989ef71e73c72a1d00e5e687296500c06a072c82c3b959b1c794f8942fdd94c33096
 EBUILD docker-compose-1.28.4.ebuild 2106 BLAKE2B aca5e45b0979591607a9468e4dfd1d74cdc46a6ca37f1bee0efd7ff74a043fe5d70f7a1d6b0e88f494f3be8791054a8c58afcf99a4ff45665599f2a59a92cef1 SHA512 29ac7efdddf077305e3aafed0786cfaa0af39c839e7fe129d20f540b17ad7b1d1ef276d574201be3e619aa2506b31d3909fbc709d097b59bfd59e4abe700c615
 EBUILD docker-compose-1.28.5.ebuild 2106 BLAKE2B 1ba83fc6311c7f57b5f73a19236d0be6f720ed4399735428abc46aba3e02b9ea11f3a34796f6fd89bce60e4ad614ec232293aa57c884412c5fa314bd3e9d1b65 SHA512 9310c2ac24b9d0d31505f78b1bfeaa0c87017c91bac5008de531f283fc4fd0a98343c8c80037616f427e9ed5d59e18dc6dfa96de297d19a580597727cfeff1a9
+EBUILD docker-compose-1.28.6.ebuild 2106 BLAKE2B 4c0b6b20bb8c738885b904338b555fc3d48de10cb850113da2c3c8b79deb14f3c951242100ab12b6edf8b006b346c10d4a0b70c2026acdcb708473ec328bcc56 SHA512 c41c7543b214c369bc11b23bfcbbf84f7a3d5f263b16d02036148f191e8ea8a36fd05c243c84ec4478ac985edc8e2e0381dcb8d154c94f6cdc37928f947593cd
 MISC metadata.xml 380 BLAKE2B 00c5a74fedd97fdd6dd3274523d134991e50dfb8dcf798027c00049d52cb431c8d06237dd06e48b4793cd14c879eb7a22a95dff01d9ad285cfa4d75e45a19e99 SHA512 04599c73f5b724749979b44f2eb3bcfdc071dc56d06a37c22eedfe7e9b85fee511bc5a0ad5553b96b0e86c054579dab538f2a519bcc21e96b8dbe79b27b95d0e
--- a/app-emulation/docker-compose/docker-compose-1.28.6.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.28.6.ebuild
@ -0,0 +1,73 @@
+# Copyright 2018-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit bash-completion-r1 distutils-r1
+
+MY_PV=${PV/_/-}
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-4.4.4[${PYTHON_USEDEP}]
+	>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+	test? (
+		>=dev-python/pytest-5[${PYTHON_USEDEP}]
+		>=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+PATCHES=(
+	# Bug #679968 -- https://bugs.gentoo.org/679968
+	# Bug #681002 -- https://bugs.gentoo.org/681002
+	"${FILESDIR}"/${PN}-1.28.6-setup-py.patch
+)
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+	# Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
+	sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
+
+	default
+}
+
+python_test() {
+	distutils_install_for_testing
+	${PYTHON} -m pytest tests/unit/ || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/*
+
+	distutils-r1_python_install_all
+}
--- a/app-emulation/docker-compose/files/docker-compose-1.28.6-setup-py.patch
+++ b/app-emulation/docker-compose/files/docker-compose-1.28.6-setup-py.patch
@ -0,0 +1,67 @@
+From 0efc455303f08b6a41df021972dfa337c527b9cb Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Tue, 23 Mar 2021 17:25:23 +0100
+Subject: [PATCH] setup.py: Drop generic upper version boundaries
+
+---
+ setup.py | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 7669979..59df626 100644
+--- a/setup.py
+++ b/setup.py
+@@ -25,33 +25,33 @@ def find_version(*file_paths):
+ 
+ 
+ install_requires = [
+-    'docopt >= 0.6.1, < 1',
+-    'PyYAML >= 3.10, < 6',
+-    'requests >= 2.20.0, < 3',
+-    'texttable >= 0.9.0, < 2',
+-    'websocket-client >= 0.32.0, < 1',
+-    'distro >= 1.5.0, < 2',
+-    'docker[ssh] >= 4.4.4, < 5',
+-    'dockerpty >= 0.4.1, < 1',
+-    'jsonschema >= 2.5.1, < 4',
+-    'python-dotenv >= 0.13.0, < 1',
+    'docopt >= 0.6.1',
+    'PyYAML >= 3.10',
+    'requests >= 2.20.0',
+    'texttable >= 0.9.0',
+    'websocket-client >= 0.32.0',
+    'distro >= 1.5.0',
+    'docker[ssh] >= 4.4.4',
+    'dockerpty >= 0.4.1',
+    'jsonschema >= 2.5.1',
+    'python-dotenv >= 0.13.0',
+ ]
+ 
+ 
+ tests_require = [
+-    'ddt >= 1.2.2, < 2',
+-    'pytest < 6',
+    'ddt >= 1.2.2',
+    'pytest',
+ ]
+ 
+ 
+ if sys.version_info[:2] < (3, 4):
+-    tests_require.append('mock >= 1.0.1, < 4')
+    tests_require.append('mock >= 1.0.1')
+ 
+ extras_require = {
+-    ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'],
+-    ':python_version < "3.8"': ['cached-property >= 1.2.0, < 2'],
+-    ':sys_platform == "win32"': ['colorama >= 0.4, < 1'],
+-    'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
+    ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
+    ':python_version < "3.8"': ['cached-property >= 1.2.0'],
+    ':sys_platform == "win32"': ['colorama >= 0.4'],
+    'socks': ['PySocks >= 1.5.6, != 1.5.7'],
+     'tests': tests_require,
+ }
+ 
+-- 
+2.30.2
+
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@ -11,6 +11,6 @@ DIST wine-staging-6.4.tar.gz 9778866 BLAKE2B 9fe69f359dd70433118695881c5254223f4
 EBUILD wine-staging-6.1.ebuild 22026 BLAKE2B 3ceadbcd50c6da5d2080c4a90561dbba6714c6977843adaf8a7a82fdf5d9d3c0d10a7160df77ef6db7020295e6de7586aaa513029b90d9d7a2b8b3a81f942cbc SHA512 737e1a65fdb3431f296cf5960fe764ce4e84392c4b986d640e0e16c697359f211bfeed49874b293609922a6cc20e5c4fb35642c34d91547046a4e6ba349fe8bb
 EBUILD wine-staging-6.2.ebuild 22026 BLAKE2B 2075bf50fda8783844b39bebff31a150c5cf6884a9f271f5e85143c5d26174d72c8ff238c919b09f9bd241f2e9beb93d0daf5625b98a832c9d5e8ce017863225 SHA512 17bc30704da90555b7c322f30e36603dbc4b3f865d07c5250250f2c035f1514c5c35f133c04ccd1143eb7a822bf0c45f52eda4973a02ee38e66a197b2d750560
 EBUILD wine-staging-6.3-r1.ebuild 22091 BLAKE2B 484991abcc53c6f006b2c21001c74fb42e1549ec4989d8dffee44598728296efa5e5abd0e2863f48bbce2701ee286fefa384f7c5dd1face7c2c52255b8dafe44 SHA512 b9290680fe60c73bdbc7b95a10ff9621516170b0ffd4c91805018e596a1adedac270a1477406c6c79a68115c935b982a692bdc914022cc1dc7cbf330d14c8a46
-EBUILD wine-staging-6.4.ebuild 22040 BLAKE2B fdc028150b9949d82c64910ff6ede3f16b23477f5a0769359fe274373d6ca97be354293a2171dcf329b29f4aa04a5f4c5680867714fb3750f45e86f72affd94f SHA512 9de89cd3f7ddbb2a036a5c4ddcdb9f81baebc40a88a23f5aba3e2f24b10899c24f7eeb9aa30a32cb5a92272549142e2caeddf587f5653ad9620e8fd6e6d42f25
-EBUILD wine-staging-9999.ebuild 22026 BLAKE2B 2075bf50fda8783844b39bebff31a150c5cf6884a9f271f5e85143c5d26174d72c8ff238c919b09f9bd241f2e9beb93d0daf5625b98a832c9d5e8ce017863225 SHA512 17bc30704da90555b7c322f30e36603dbc4b3f865d07c5250250f2c035f1514c5c35f133c04ccd1143eb7a822bf0c45f52eda4973a02ee38e66a197b2d750560
+EBUILD wine-staging-6.4.ebuild 21995 BLAKE2B 9c63116c5493432ddea73fb22e8360a96f043970f1a47ccb5cc1c9dcd9cbe7943adecd11588c0a393131ea8be64edf231a2f1250d724204fc36687748919d645 SHA512 3ff687d025b43a7edca2d22f7d8b5357d92bb9613cddf484073726e114899824b0aa29bc1cfcacb237f2e7a7ed2f3be1dcf34bb5e05082a36386866cedc2dd56
+EBUILD wine-staging-9999.ebuild 21995 BLAKE2B 9c63116c5493432ddea73fb22e8360a96f043970f1a47ccb5cc1c9dcd9cbe7943adecd11588c0a393131ea8be64edf231a2f1250d724204fc36687748919d645 SHA512 3ff687d025b43a7edca2d22f7d8b5357d92bb9613cddf484073726e114899824b0aa29bc1cfcacb237f2e7a7ed2f3be1dcf34bb5e05082a36386866cedc2dd56
 MISC metadata.xml 3966 BLAKE2B ee3d47cb51499adfa3a98d09c9a718f1c51f0dc4b24a57b8d3c1f18e45584bc12ccdb54250162a146f0b7c95b835b84684a16f0164a21832df80bbaa4cefece4 SHA512 7db52c79172194fb0e151431273fbb02694144c3a7d39746e78fcb195471ce0d702d0643cfe24414eda070943b58d21d06db341e3607924de89c34ad5e7b5033
--- a/app-emulation/wine-staging/wine-staging-6.4.ebuild
+++ b/app-emulation/wine-staging/wine-staging-6.4.ebuild
@ -181,8 +181,6 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then
 fi

 wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
 	# GCC-specific bugs
 	if tc-is-gcc; then
 		# bug #549768
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@ -16,6 +16,7 @@ if [[ ${MY_PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
+	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
 	MINOR_V=$(ver_cut 2)
@ -180,8 +181,6 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${MY_PV} == 9999 ]]; then
 fi

 wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
 	# GCC-specific bugs
 	if tc-is-gcc; then
 		# bug #549768
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@ -9,6 +9,6 @@ EBUILD wine-vanilla-6.0.ebuild 18908 BLAKE2B 3940b795b6b9ccf31f286a8efb99fa2a754
 EBUILD wine-vanilla-6.1.ebuild 18910 BLAKE2B 7f8a28cfdf2b0ffbc5196ae3aa7c6b9ead6f9a9cc05e1786723149e0c6d943fcd8080362c8c3c32e9f6a06af114e749a5b460515c82d875140e4b54c24355d03 SHA512 20837bb56938d1cb5fb828b540971621f21044e495e4e2461015cdcaa5c1b14efac011741a4403f3a6e3cb99ee6402c7003ea137acfad070b18911c6a8390285
 EBUILD wine-vanilla-6.2.ebuild 18910 BLAKE2B 46e6c295e091969cd9b00580c9944f991d7556db445aa97a677014724f055b881ef09240e65e62b04dc06ffcf6625f90b1d37d6feaa39ba9d1b8d2177526c7b5 SHA512 1bf603fc84638c3f01941c27a5b78bbe07175bcfd3a58d9036b29f18b8e70919618581ccf947976f610cd9575c11eaf8bd21f52f98d2ba8716835e3e7ab6f38d
 EBUILD wine-vanilla-6.3-r1.ebuild 18975 BLAKE2B 0d00607ee6c7faaf3396aab0fbfade31f681195faf593d453702b11da214ba78b7596472d54cbd625f0e6a3c1425b4069107f1939f7e66db02af472da1a715c9 SHA512 d2e7e68d564f1d27fba83225e039f231718ea3db574b86a37364cb4f0be2faa5d91dc2dbe7fdd893ee44cf05769bc9de45f65d6b4e9244390a48db5b6600290c
-EBUILD wine-vanilla-6.4.ebuild 18924 BLAKE2B 9ea7ac06e415635987999388a87f16ab3805a6d4f1ab1e7b05009db8f328f3d19a19b57e859ab751220ee60dfc9f2625a495e37fac0e7aab04b7e43015a830c4 SHA512 2fb10b28c4b126f7101c4e993021a6485162292912e0058bb4815a558b950a7f1609eb5c7bea2aa8bc98ea597b9d08df625e89220c92d6ab7890fb9e836b6f53
-EBUILD wine-vanilla-9999.ebuild 18910 BLAKE2B 46e6c295e091969cd9b00580c9944f991d7556db445aa97a677014724f055b881ef09240e65e62b04dc06ffcf6625f90b1d37d6feaa39ba9d1b8d2177526c7b5 SHA512 1bf603fc84638c3f01941c27a5b78bbe07175bcfd3a58d9036b29f18b8e70919618581ccf947976f610cd9575c11eaf8bd21f52f98d2ba8716835e3e7ab6f38d
+EBUILD wine-vanilla-6.4.ebuild 18879 BLAKE2B 3cc03505916d3202ca418375b739d5164b3858a20d3916f5dd1a055ac182ce918e680fb57d076805e3e6cd9386fba3ff752804b1ee5298682a7a1cfaa58f517c SHA512 20f385a55ec43f9bdaaf77cd45abb9597983279f968299e5f565280a36e45ba69ef86fd2f641ed19c7b380a2c30774024923359da768af5f34f0fb0bf1c6fae9
+EBUILD wine-vanilla-9999.ebuild 18879 BLAKE2B 3cc03505916d3202ca418375b739d5164b3858a20d3916f5dd1a055ac182ce918e680fb57d076805e3e6cd9386fba3ff752804b1ee5298682a7a1cfaa58f517c SHA512 20f385a55ec43f9bdaaf77cd45abb9597983279f968299e5f565280a36e45ba69ef86fd2f641ed19c7b380a2c30774024923359da768af5f34f0fb0bf1c6fae9
 MISC metadata.xml 3493 BLAKE2B 5574a661321f07674198bed06bdd632ccd5e46a4b4a15b49aef8882f5f6afa1a087a9fdb308bfecd80a9ea32d6b1135ff1bc2733ac3748d83d8754e4228ac1da SHA512 1e7d4867143412d7261b8f977f82df67ea9777dc1168e0ac3e428f68ac93314528df75b45a573dd96910d02a2357b75509c90b2de531b8188ce2e474a30d52e8
--- a/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild
@ -153,8 +153,6 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
 fi

 wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
 	# GCC-specific bugs
 	if tc-is-gcc; then
 		# bug #549768
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@ -16,6 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 	inherit git-r3
 	SRC_URI=""
+	#KEYWORDS=""
 else
 	MAJOR_V=$(ver_cut 1)
 	SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}.x/${MY_P}.tar.xz"
@ -152,8 +153,6 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then
 fi

 wine_compiler_check() {
-	[[ ${MERGE_TYPE} = "binary" ]] && return 0
-
 	# GCC-specific bugs
 	if tc-is-gcc; then
 		# bug #549768
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/binwalk/Manifest
+++ b/app-misc/binwalk/Manifest
@ -1,5 +1,7 @@
 AUX binwalk-2.2.0-disable-test-coverage.patch 378 BLAKE2B e1da360562eaa99fba1e5d3971fb9c7b2024b46319ec196a1408e8fc2d893e880749619595a884efab293842779b3745d071d5de9a30c0c411278595cefc56cd SHA512 0cac9b0714365196769a4e42e5cfcead7dad318b9bd60a737b6f25e3476d4127070d5ecab1ace155af4f3ba3f6c9a41be811c05c5ddf46390e7d49ca6bada94d
 DIST binwalk-2.2.0.tar.gz 39594514 BLAKE2B 899a919647258759f16c2e59766b0db68d1a78edf0f5c3755c2a987695199a1851deed2820e6323d82d8af85d294a6f1fcafb655e5d2257d49b673ddae49da67 SHA512 5f3ed31c0b5f9ca3057f86e82787a73b06f9f73747b51dd72130a78e4d69cf43a0207bffc495d177e97811de5bf835b3d0507f314b7a0c960eddf6d1efe0f0f9
+DIST binwalk-2.3.0.tar.gz 39603727 BLAKE2B abdb9909cf92a6cb35035c98467162dab2b009f5eab4bf255bba14ce82c2748cbd648977a54f276f2c141897b4e7a592d0adbde77a3c0f4164b04b7c328bc7e5 SHA512 74c25858eccaeff1bbf238cdff92df4cbec37dfff77204739bd82c35e4fd2329a8d0b13850b8b05900f756a99b898ebbbfb8ac44a26f37ca3ffb16c72402f9d6
 EBUILD binwalk-2.2.0.ebuild 1102 BLAKE2B c24cbc2f774b5c56bbe5b6cec8f4b0e31a2befd87824586436c9668fa21fb891597aadb84e7c8fb404b72f5ecece719966d7ed3f3f1bf18acb037460e7ff3c3d SHA512 28108b09384d868909f2bd842554f39a34b68af4274dcae3c1dc7dac934ca47231e19dfa765d4180a1c08cbefc66e406045bc6843758a53cac9a3cbaf427887f
-EBUILD binwalk-9999.ebuild 1089 BLAKE2B 9749014009bb0d2089dedb95f67fa594c299db27a79f917c8c974842f2a3d7dc7137aaaba48493423d250a5ddc75277836436f64d980e933283c51ab25cf0cb8 SHA512 25017f7e1bb1c6f0609312fa06953e16ab9b936b0a5cebb4029f57b1a884faf502a5e985384e7d71742fc2df60c37a4c270bb63bf8ced47bdebd1125bab6d34a
+EBUILD binwalk-2.3.0.ebuild 1021 BLAKE2B 2e14fc2b5f02e1ce8c541581d979fa7e6d4adfc34a3bdd0933449b85efcef138be6313cc8a018f05953ab0dc2b36b5e59f76cb411657ce5eb48a31115ef185a8 SHA512 729971c090b72c3308f65c382bd7b6e21069168ae1d1ae8948cfa8294432a9dd65f5dbd063c6474ae828a1acf8952a76520aa1621674b535de453152021189b5
+EBUILD binwalk-9999.ebuild 1021 BLAKE2B 2e14fc2b5f02e1ce8c541581d979fa7e6d4adfc34a3bdd0933449b85efcef138be6313cc8a018f05953ab0dc2b36b5e59f76cb411657ce5eb48a31115ef185a8 SHA512 729971c090b72c3308f65c382bd7b6e21069168ae1d1ae8948cfa8294432a9dd65f5dbd063c6474ae828a1acf8952a76520aa1621674b535de453152021189b5
 MISC metadata.xml 910 BLAKE2B 2be4408e8546fec32d55527a3cda95fe5d2dba9a08db3700155b317a6a3c634d20ab9862e0459efc0a0bc4563a026b600d50d6a058bbb404c8edee83b73e3e84 SHA512 b080a492253731e1048dc6e263b257b601a6e20851e1399ae6e95b8794433ae7b8fd304f00d276582b2b1fd6ff605b45d3c370130293bc3488d57d557f2aad9a
--- a/app-misc/binwalk/binwalk-2.3.0.ebuild
+++ b/app-misc/binwalk/binwalk-2.3.0.ebuild
@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ReFirmLabs/binwalk.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ReFirmLabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="A tool for identifying files embedded inside firmware images"
+HOMEPAGE="https://github.com/ReFirmLabs/binwalk"
+
+LICENSE="MIT"
+SLOT="0"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.2.0-disable-test-coverage.patch )
+
+distutils_enable_tests --install nose
+
+python_install_all() {
+	local DOCS=( API.md INSTALL.md README.md )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "binwalk has many optional dependencies to automatically"
+		elog "extract/decompress data, see INSTALL.md for more details."
+	fi
+}
--- a/app-misc/binwalk/binwalk-9999.ebuild
+++ b/app-misc/binwalk/binwalk-9999.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

-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_USE_SETUPTOOLS=bdepend
 PYTHON_COMPAT=( python3_{7..9} pypy3 )

 inherit distutils-r1
@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ReFirmLabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
 fi

 DESCRIPTION="A tool for identifying files embedded inside firmware images"
@ -21,16 +21,10 @@ HOMEPAGE="https://github.com/ReFirmLabs/binwalk"

 LICENSE="MIT"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"

 PATCHES=( "${FILESDIR}"/${PN}-2.2.0-disable-test-coverage.patch )

-python_test() {
-	esetup.py test
-}
+distutils_enable_tests --install nose

 python_install_all() {
 	local DOCS=( API.md INSTALL.md README.md )
--- a/app-misc/cmatrix/Manifest
+++ b/app-misc/cmatrix/Manifest
@ -5,5 +5,5 @@ DIST cmatrix-1.2a.tar.gz 74376 BLAKE2B 03319cecc8b15c441f36aa6c3267c4c0793855835
 DIST cmatrix-2.0.tar.gz 205640 BLAKE2B 3d38903b93853afc077c00308b84106664ec2ea3a31601ba7ab858f6571158182858de87392b5940725456bdd8c82232228451a4d30813e2c0a8bec99f285814 SHA512 1aeecd8e8abb6f87fc54f88a8c25478f69d42d450af782e73c0fca7f051669a415c0505ca61c904f960b46bbddf98cfb3dd1f9b18917b0b39e95d8c899889530
 EBUILD cmatrix-1.2a-r3.ebuild 991 BLAKE2B 0af3a62dd77252d92cd992d0388ea3db2fcc7a6ba937dd41bb9e436f15d9cea813118c28a26772c2c49d6e913d19c9ff6dd9de401ad6b44cc42ca2a3f8c684d9 SHA512 bc2b9d9a3f3f48e9e33a3cf69d8074330d8799afabdd2fff792f198be1fcde5bdd62eb1163b2db9b8398fa672da5ef72a34468a45d1b38ad02cc68e93c152b72
 EBUILD cmatrix-1.2a-r4.ebuild 1065 BLAKE2B 4d5958b295a53f1d17a32338245d079298932262dde0ee4e0948bec0dd4e74f45532e7aa1cdb696811b93777248ce5cbad0a497d16d0544ba745b4571790617b SHA512 8c3228954bfa3c3a950c3da31695678712320d78eae77ffa55cda3609086e0a782b5016c1be64478343ff7657eb9ad9e48ebf695cdc82321a566c84c4e0a9b73
-EBUILD cmatrix-2.0-r2.ebuild 1034 BLAKE2B fae14e81d2d010a4e35ff92511a7dac28bd0a63767231cb95cae788e7813f1c55cebf42c70cd5286dbc37dfa3c254d151420f88875a690b51472a195e86402e6 SHA512 a2846ed4ee167404c4e3eaa78b05ab658a9402f6facb34862fcffeba3389a183ea0c5067f01e3bcc1b11334a2aeadb8f098149f70b47b71d6a55ecce203eff79
+EBUILD cmatrix-2.0-r2.ebuild 1033 BLAKE2B 01ee1f344f3bfe40608e93a98d0c8eb7d4aaf74cb6e5571ec9fe9c67ac907f935983a5dbd3071b964475cae1a22358d7fdde55178011d7a23b4ccd920be73b37 SHA512 035c026d6e206edaed421368c21eb0198c2e9bf1e71f95d59fc508c65a11ab657aa94327aa7e0bcfc522ee076ef1d26b88588626562c3fbfb3b389849d0b67b1
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
--- a/app-misc/cmatrix/cmatrix-2.0-r2.ebuild
+++ b/app-misc/cmatrix/cmatrix-2.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
@ -13,7 +13,7 @@ SRC_URI="https://github.com/abishekvashok/${PN}/archive/v${PV}.tar.gz -> ${P}.ta

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ppc64 ~sparc ~x86"
 IUSE="X +unicode"

 DEPEND="
--- a/app-mobilephone/Manifest.gz
+++ b/app-mobilephone/Manifest.gz
--- a/app-mobilephone/heimdall/Manifest
+++ b/app-mobilephone/heimdall/Manifest
@ -1,4 +1,6 @@
 DIST heimdall-1.4.2.tar.bz2 5506713 BLAKE2B 775abc8d47f9efac21f28e47d607ab4b07f8948fcca005c78ddb7ed093e51a76f60ac5c04150a3424c360813d180cd1df1ff8a87295918bff872f41123250a58 SHA512 b2b0a8a8db6a52236716fff9748a391388c1b2b1774a26fab9b451b8dab5ff35e8e1403555a65daec180fc961388c7581d170df6e3599a102fd304a133da8674
+DIST heimdall-1.4.2.tar.gz 5486693 BLAKE2B 213bfa5bb7ede8d418847916a5ec16c17e4dec7fcb07de296d96e16c929634167afb57e13cee0e8a6e42fbbddcd2f2e0f5069cfbc3e8c3b5721d2d303ef48407 SHA512 c554662f9ccb763a8e9867a0c563618879d2533af985d44db3c237d3ee51add44c1681d13b1a83b72b30ba6e5b32d7c2f9c02b31114c67c5fbe01cbb010acfe7
+EBUILD heimdall-1.4.2-r1.ebuild 1033 BLAKE2B 511a9c38a9a064c19d89d4335d6cb6f1bd67c269aa527c4c85e12f83bec4c827c2be2163de970aa29fb5e19464dba484bae0620cbe1752197c5f27923749828c SHA512 542d168a44cdc9c4c77c6a22ee07d5a0491bcb752bbc5654c0ab2067332d8d7df4f0d886942bb1c8f1d1589632abf5de3f9ee67411fe434e9f4d95686fce3799
 EBUILD heimdall-1.4.2.ebuild 1055 BLAKE2B 6579d47c8e74492fbe3da7489fd6ebfb062cc5fd167fa8d7678447c0c2c62bdab0fc215362162b7aa09dac9b490eebbb963155f61a49afc8f2c09f210df55f1e SHA512 df06bdf6e550cdfbb4dfc025037002286cf8e0b677c7bfec4a68a2ec7257640e033be6c1c2a1f62f7122df487ff86ddb93058ac310535cca302dc99e13f667f2
-EBUILD heimdall-9999.ebuild 1056 BLAKE2B d03ca39689d7807d9478e14761d4fd4e18c71720038706d81c162a12ad95deb48b3647564f66052f5fad5d5f1a54d45571c58c85fca106b780014dfea374feab SHA512 0a824daa2b387832764b2243652c6efadc40724fbeb2893290eb87575bd73cfe4e9a96c5abb70980e62eb2ab0a53b0e968c6275fed251ec2ac8040f79aed52df
-MISC metadata.xml 255 BLAKE2B 78e757fc09b4330ab3b0b18ca84e305285598818ae326f66a1cc80cfd1de83af4abfb4174fc6b8ad0ff385f730b1cb6208b99a0ecef91aad5837196937ad31ca SHA512 7ad2bd23ece0c6c258d52c460d6f33570eece2ebda7f3526556e2428afc85936284bb1fdbd82b38cea5654b12f5530e026bc5f0cd5b8a3a83a3c9750eb6ea91a
+EBUILD heimdall-9999.ebuild 1033 BLAKE2B 511a9c38a9a064c19d89d4335d6cb6f1bd67c269aa527c4c85e12f83bec4c827c2be2163de970aa29fb5e19464dba484bae0620cbe1752197c5f27923749828c SHA512 542d168a44cdc9c4c77c6a22ee07d5a0491bcb752bbc5654c0ab2067332d8d7df4f0d886942bb1c8f1d1589632abf5de3f9ee67411fe434e9f4d95686fce3799
+MISC metadata.xml 484 BLAKE2B 735cec9feaeda05021f60068a46ab3156e6fe08c8e6c6abbb986170817db5d2c09b704f34c25b5c3da3549999ac28af0150a267b60a24555bf3beb0c34966865 SHA512 7425925defbe15e76ec54212daa8d1e6d45035102962fe4dcc9bd976f0610e2b535c52974b498cdbf55298f20095ee41c2f3545407534841c01fa40a6f89de2c
--- a/app-mobilephone/heimdall/heimdall-1.4.2-r1.ebuild
+++ b/app-mobilephone/heimdall/heimdall-1.4.2-r1.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake udev
+
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="https://github.com/Benjamin-Dobell/Heimdall/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/Heimdall-${PV}"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Benjamin-Dobell/Heimdall.git"
+fi
+
+DESCRIPTION="Tool suite used to flash firmware onto Samsung devices"
+HOMEPAGE="https://glassechidna.com.au/heimdall/ https://github.com/Benjamin-Dobell/Heimdall"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="gui"
+
+RDEPEND="
+	sys-libs/zlib
+	virtual/libusb:1=
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_FRONTEND=$(usex !gui)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	dobin "${BUILD_DIR}"/bin/heimdall
+	use gui && dobin "${BUILD_DIR}"/bin/heimdall-frontend
+	udev_dorules heimdall/60-heimdall.rules
+	dodoc README.md Linux/README
+}
--- a/app-mobilephone/heimdall/heimdall-9999.ebuild
+++ b/app-mobilephone/heimdall/heimdall-9999.ebuild
@ -6,30 +6,30 @@ EAPI=7
 inherit cmake udev

 if [[ ${PV} != 9999 ]]; then
-	SRC_URI="https://gitlab.com/BenjaminDobell/Heimdall/-/archive/v${PV}/Heimdall-v${PV}.tar.bz2 -> ${P}.tar.bz2"
+	SRC_URI="https://github.com/Benjamin-Dobell/Heimdall/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/Heimdall-v${PV}"
+	S="${WORKDIR}/Heimdall-${PV}"
 else
 	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/BenjaminDobell/Heimdall.git"
+	EGIT_REPO_URI="https://github.com/Benjamin-Dobell/Heimdall.git"
 fi

-DESCRIPTION="Tool suite used to flash firmware onto Samsung Galaxy S devices"
-HOMEPAGE="https://glassechidna.com.au/heimdall/"
+DESCRIPTION="Tool suite used to flash firmware onto Samsung devices"
+HOMEPAGE="https://glassechidna.com.au/heimdall/ https://github.com/Benjamin-Dobell/Heimdall"

 LICENSE="MIT"
 SLOT="0"
 IUSE="gui"

 RDEPEND="
-	>=dev-libs/libusb-1.0.18:1=
 	sys-libs/zlib
+	virtual/libusb:1=
 	gui? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtwidgets:5
-	)
-"
+	)"
+
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"

@ -43,9 +43,6 @@ src_configure() {
 src_install() {
 	dobin "${BUILD_DIR}"/bin/heimdall
 	use gui && dobin "${BUILD_DIR}"/bin/heimdall-frontend
-
-	insinto "$(get_udevdir)/rules.d"
-	doins heimdall/60-heimdall.rules
-
+	udev_dorules heimdall/60-heimdall.rules
 	dodoc README.md Linux/README
 }
--- a/app-mobilephone/heimdall/metadata.xml
+++ b/app-mobilephone/heimdall/metadata.xml
@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>marco@scardovi.com</email>
+		<name>Marco Scardovi</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="gitlab">BenjaminDobell/Heimdall</remote-id>
+		<remote-id type="github">Benjamin-Dobell/Heimdall</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
--- a/dev-cpp/pangomm/Manifest
+++ b/dev-cpp/pangomm/Manifest
@ -3,5 +3,5 @@ DIST pangomm-2.42.2.tar.xz 656760 BLAKE2B 8fae779aa78b2337b83759adc7aadec1f61c08
 DIST pangomm-2.48.0.tar.xz 674516 BLAKE2B 58c3e93c6127a14b5bc866b43bff4ab25a1ac1a06813c73e4f2a4d02adad3f51b7ec922f7c6e3d4af518a1f8f31c19de4df0c11b91a10ee61c2e16df8aa025ea SHA512 0c1be5726740669c366214caf8b8b0bca1c7b223aafb2e6ce64f7a5a90d07c62ee509821ac787f3997ae78aa3a3ffd5cff7d33c73bc7ebd7fe642c56689d98a3
 EBUILD pangomm-2.42.1-r1.ebuild 927 BLAKE2B 59f19896cf60e1c4296e31d58584ae819ba31044db859b4ba5f4f21c8637091116dcb6eac2ea3fc4372f49e3a0e40211512b0b1c689665bc5c025a2720cd25be SHA512 1c0d1f39152b9c27e67a94544dbf777afbff64bd4d2751d525e60c636b36c9feb8f516ed6c9f7ba7f3187082db2a4f21421f0bcc5c810dd1e6368e63bc26af5e
 EBUILD pangomm-2.42.2.ebuild 991 BLAKE2B daff32bc87f4d3a0978c22a358e59737c64bed09df58e00b4a87dff6671bb7e94674c11dfd04568ca00bb204b4d3363f19dca569534d627762352749e171b408 SHA512 9171d58dbcc3d0348bb38f8e5938a28cd3265754a56f738257ff26f685569d8c41ec07a02f89ea570e02268194b2536206ef966d03b098499668110dc9c77f33
-EBUILD pangomm-2.48.0.ebuild 965 BLAKE2B af5810a6597176766105eab875273f74b52d9dca34f12e95957577b734b7c5aa01018c399d07be5b911204f036d1f8a2dd9b1e613448c4122ddbc371319d1314 SHA512 91c5414ca5df1fb65854272f6e68c6f1fb786a7de81f192a0afacf63bdab187ce47934dab2b7f0e0ef362db25cec85b157248bd623798c5f592f3ec6b0902894
+EBUILD pangomm-2.48.0.ebuild 1005 BLAKE2B a5e2ed5eeba3809426505d9c017654c7affc840256d2874e8d5e14033a6783fbeed2badcad55cf232d79e1728bbf62edaec153e63ddb2a25b88da0cddc5fa689 SHA512 77df10f6dc25ccd967316aa4879ff57c45c9ab1afe22ea98cd0ed26a8f5857703360874349792612934e34b11c823274274d7697f356f6fce64ab3f38cb8b8c3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
--- a/dev-cpp/pangomm/pangomm-2.48.0.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.48.0.ebuild
@ -8,29 +8,29 @@ DESCRIPTION="C++ interface for pango"
 HOMEPAGE="https://www.gtkmm.org"

 LICENSE="LGPL-2.1+"
-SLOT="1.4"
+SLOT="2.48"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 IUSE="doc"

 DEPEND="
+	>=dev-cpp/cairomm-1.16.0:1.16[doc?,${MULTILIB_USEDEP}]
+	>=dev-cpp/glibmm-2.68.0:2.68[doc?,${MULTILIB_USEDEP}]
+	>=dev-libs/libsigc++-3:3[doc?,${MULTILIB_USEDEP}]
 	>=x11-libs/pango-1.48.0[${MULTILIB_USEDEP}]
-	>=dev-cpp/glibmm-2.68.0:2.68[${MULTILIB_USEDEP}]
-	>=dev-cpp/cairomm-1.16.0:1.16[${MULTILIB_USEDEP}]
-	>=dev-libs/libsigc++-3:3[${MULTILIB_USEDEP}]
 "
 RDEPEND="${DEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 	doc? (
-		media-gfx/graphviz
+		app-doc/doxygen[dot]
+		dev-lang/perl
 		dev-libs/libxslt
-		app-doc/doxygen
 	)
 "

 multilib_src_configure() {
 	local emesonargs=(
-		$(meson_use doc build-documentation)
+		-Dbuild-documentation=$(multilib_native_usex doc true false)
 	)
 	meson_src_configure
 }
--- a/dev-cpp/prometheus-cpp/Manifest
+++ b/dev-cpp/prometheus-cpp/Manifest
@ -1,4 +1,3 @@
-AUX prometheus-cpp-0.9.0-core-Skip-serialization-test-if-locale-is-not-availa.patch 2180 BLAKE2B cd864a68def30f4bf64eb56afc2666ebe7e56a645da1df7e143d7874ae36ea8ecc82a2d5f8aeba5939866b67baeb6a457937355d275375c3bd93b1340bf00ac7 SHA512 3f1dbd41a953e897a1e18a97ef239b73ee1a00475d210406ada3b17686ebd52698c125670a217bb2fd75bf43437640426d48d1c5216ed313c2aceee6bc9fed68
 DIST prometheus-cpp-0.12.2.tar.gz 55191 BLAKE2B f1430cf6b8ca8272c447e8c2a25af5fb0d515389cb1078f8836a9a1f1ba0e26cc43236e9c147219384df40d601b843219acb95ebc46bb1c2fce6d83a86724182 SHA512 9907658939b7956219c3623bd5997f341f4374fbce2ee606bd1d8df820779ed8dc70658a30aafbb47b9af645205c048270b23e701203e13286bc365094a441d3
 EBUILD prometheus-cpp-0.12.2.ebuild 821 BLAKE2B b4a5e9817f4cb65919ad504a6d2bcc53cf41b0cc81bfdda34eaf4b335d6bc9054d7648ebf4a344afc1087239b020f073142994b8ceebc0bf77c9daa1798632e5 SHA512 4377daa3ed659ee16bb0dca9bdce029b5e68650cccce4d4a6eb6b518e8f5bfbf4e08f11779e1a45e0b0c782218b8026b1200302e27459d1b7993f931564760f1
 MISC metadata.xml 987 BLAKE2B a3ee76e524e97e6577b2e71d00cd2eb29821f74230d8b8224497565ddf2e80a7358f37a95948caf1dc3a4213f7e96683a54b10836e83a71e6e5caf78d59a8268 SHA512 cfea74c7e5325514dacc13fc86213bc2c6fe758681168099fa1edb5b49503ffa40b83dc10ba6fdcbbbbe502aa064a6445caa7c07c8f1c82fe177dc574dbd75da
--- a/dev-cpp/prometheus-cpp/files/prometheus-cpp-0.9.0-core-Skip-serialization-test-if-locale-is-not-availa.patch
+++ b/dev-cpp/prometheus-cpp/files/prometheus-cpp-0.9.0-core-Skip-serialization-test-if-locale-is-not-availa.patch
@ -1,80 +0,0 @@
-From bf6e2ce56abe2a710181f0365a21ca2dafd2a8f5 Mon Sep 17 00:00:00 2001
-From: Gregor Jasny <gjasny@googlemail.com>
-Date: Fri, 13 Mar 2020 13:16:56 +0100
-Subject: [PATCH] core: Skip serialization test if locale is not available
-
-Closes: #345
---
- core/tests/raii_locale.h      | 15 +++++++++++++++
- core/tests/serializer_test.cc | 21 ++++++++++++++-------
- 2 files changed, 29 insertions(+), 7 deletions(-)
- create mode 100644 core/tests/raii_locale.h
-
-diff --git a/core/tests/raii_locale.h b/core/tests/raii_locale.h
-new file mode 100644
-index 0000000..592d74f
--- /dev/null
-+++ b/core/tests/raii_locale.h
-@@ -0,0 +1,15 @@
-+#pragma once
-+
-+#include <locale>
-+
-+class RAIILocale {
-+ public:
-+  RAIILocale(const char* name) : savedLocale_(std::locale::classic()) {
-+    std::locale::global(std::locale(name));
-+  }
-+
-+  ~RAIILocale() { std::locale::global(savedLocale_); }
-+
-+ private:
-+  const std::locale savedLocale_;
-+};
-diff --git a/core/tests/serializer_test.cc b/core/tests/serializer_test.cc
-index f935a3b..6cb8f0e 100644
--- a/core/tests/serializer_test.cc
-+++ b/core/tests/serializer_test.cc
-@@ -1,9 +1,13 @@
- #include "prometheus/counter.h"
-+#include "prometheus/detail/future_std.h"
- #include "prometheus/family.h"
- #include "prometheus/text_serializer.h"
- 
-+#include "raii_locale.h"
-+
- #include <gmock/gmock.h>
-#include <locale>
-+
-+#include <memory>
- #include <sstream>
- 
- namespace prometheus {
-@@ -25,15 +29,18 @@ class SerializerTest : public testing::Test {
- 
- #ifndef _WIN32
- TEST_F(SerializerTest, shouldSerializeLocaleIndependent) {
-  // save and change locale
-  const std::locale oldLocale = std::locale::classic();
-  std::locale::global(std::locale("de_DE.UTF-8"));
-+  std::unique_ptr<RAIILocale> localeWithCommaDecimalSeparator;
-+
-+  // ignore missing locale and skip test if setup fails
-+  try {
-+    localeWithCommaDecimalSeparator =
-+        detail::make_unique<RAIILocale>("de_DE.UTF-8");
-+  } catch (std::runtime_error&) {
-+    GTEST_SKIP();
-+  }
- 
-   const auto serialized = textSerializer.Serialize(collected);
-   EXPECT_THAT(serialized, testing::HasSubstr("1.0"));
-
-  // restore locale
-  std::locale::global(oldLocale);
- }
- #endif
- 
-- 
-2.28.0
-
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@ -3,5 +3,5 @@ AUX mysql-workbench-8.0.19-mysql-connector-8.patch 624 BLAKE2B 0cb899a8b01276644
 AUX mysql-workbench-8.0.23-findlibssh.patch 633 BLAKE2B 12deef5c346773931fb0f6d37a24cc67d4d0d6079b05cacbcaefc7a8c453f2811a4ea018a5e71390739500d2801cc12889ac2b61346830eff9d348925fdbb88d SHA512 d1d2d7091fad56fb62f29a323df00ae29a7ce5e921a49eb9199363e1113da207872f8f636cba479bc15697b574e54b4cf312aa354f6c050bd1934a523175b79d
 DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed SHA512 de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1
 DIST mysql-workbench-community-8.0.23-src.tar.gz 20719770 BLAKE2B 4e1e44428a9e8a00c23f8f9f6e1519f8d13c205fac110168da67fb462d2a13204d41f1d0e109a3dde8ad2dbd3de31fee09ae4ccea97f9de04d0bc4fb2fad180e SHA512 f50d71bd196d5e5446cd14a228e52c4e74506cc2dd95d1601cc5e99b00db0d82dbcb28fd2ed404ee77ca63c6854d47c46773938e09ab601c10009c0ca99e4d54
-EBUILD mysql-workbench-8.0.23.ebuild 2784 BLAKE2B 6469603c3deda475b362530141abc3012e440c5b80a557d8f969f86737e6406822c9d8d310ec10f95b1aeccf46c1d0c45a94a4e3dbf408f300cfc07618367cef SHA512 6468bcccdbd8073474225cc3a53ca81457da7ad3930290106f792f9ce2ce83a5431b09f04e89004f2f11e79d1772ad9bd8e254c508523995a756ab203e476aaa
+EBUILD mysql-workbench-8.0.23.ebuild 2788 BLAKE2B 6fac86e054a667e0d0e4b34defeaa5e21f9cfe0cc7fa4c1605e9c546be4172e82c802c5e430d31df1f3ebadc9382b82f4d1634e9398d57dd429e4a427c5ec4b1 SHA512 86692d89061acac4416fd9b749494ff0fbde86cb1b55a86aed5b4693cf5a786e0d7bd8123fa555125ea5537bd816b6d88498e856c93dc69c73a101b2b049d56e
 MISC metadata.xml 310 BLAKE2B b0d985e39bb17865a05907e5449723c2bf862d9f3ae7f8570173c9cff443171feef6694db26a51880f8c1a4b1e3834ca7ab9bc7c2057fd6f8930b9d1c1c02cdd SHA512 f284063d72f2218f8ed60a74b43f252d608865682b8c0447f52016a02a7cbf6d45a226787d893328dd31946ade1cca78ff7556896183b4422c4142a8935a2193
--- a/dev-db/mysql-workbench/mysql-workbench-8.0.23.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-8.0.23.ebuild
@ -30,7 +30,7 @@ CDEPEND="${PYTHON_DEPS}
 		dev-libs/glib:2
 		dev-cpp/antlr-cpp:4
 		dev-cpp/atkmm:*
-		dev-cpp/pangomm
+		dev-cpp/pangomm:1.4
 		>=dev-cpp/glibmm-2.14:2
 		dev-cpp/gtkmm:3.0
 		dev-libs/atk
--- a/dev-db/percona-xtrabackup/Manifest
+++ b/dev-db/percona-xtrabackup/Manifest
@ -10,11 +10,15 @@ DIST boost_1_73_0.tar.bz2 109247910 BLAKE2B 5995ff6ca21f45988b187b94bf743795cca9
 DIST percona-xtrabackup-2.4.15.tar.gz 57357749 BLAKE2B fcc64736230636a3a5584a300229e0507f00bcd64a3d0b8e00f834b15ec757347a55a85521dd0aea939761c3a26b1ef99466ff7e633133b8088cd290bd835444 SHA512 789b6870d3ad06861126f67190717ffb31224628d1b9631ec5f39d0a41b3c66aaf2127e3ec4b38d3e8f7858a1438a74f0e89b07b9f4248b637b2ed39143ab599
 DIST percona-xtrabackup-2.4.20.tar.gz 59782001 BLAKE2B 25deaa3044d89d6f884734bbaee20004d792f4b0bf86bd0d456177cd2b149c29af13900b32e29f92c04cf810b34584ec2d9a74b443be27b8c7dca54b330ced99 SHA512 bac5d276bb78209eacc34ea9950dc128a636c549795b6b071597ac3c8a43fefe9db085a42827b8176647affc2fcfc6caa51462dbc0ae7a1a716ba6fdc9092478
 DIST percona-xtrabackup-2.4.21.tar.gz 61901220 BLAKE2B 77245818015d4e9c22d05cfeb254ff570ab490c43f9d2fd0e1c499e1e3fefb143b4659fb929740a563e2344b3cd7dfb408931c6d24b277f6df06886dfa83126e SHA512 8b14ef4620fdf836a090d07e5aeb78141eacf081a2cf1069d91af1ba5206e36e3e195f8acb06609f334661d6ad27937b31e997b0f1aabb9cef612d35fabd0284
+DIST percona-xtrabackup-2.4.22.tar.gz 61911038 BLAKE2B 4e0eb211b253ac3bbe82af7b4303ae13ca557926fdad100e9101522f0b1af2fab5258f4a2c98dd9e71cbf3f28586bd527f552a40f1a7a9cb93f5649260a8325b SHA512 2ad0533e5f4750dbb2713b8538d62c23613ac94066fcaee154ab90b1a9ac19ed3c5c7a024e2dbbdf298192665ad6f3c0d42a1435400b003425a8d7630503eb2d
 DIST percona-xtrabackup-8.0.13.tar.gz 272887474 BLAKE2B d0ac4c602c7c3197ca0a7c361f9658bd2da00bdac5c6dc0a4d56b92e04e4e6c86f22b70e7cf2b375f121983ea7f134edae93116c91945b2c3314a51565033ae5 SHA512 b1fdb0dea1c8b6e39b5451153f01c8ce0dcf411fd88fe8f9f686e562e0950ff9270a39574230ada928b734cc8bb4517da0f01310e75d5c9beba0e35cfeaa11ff
 DIST percona-xtrabackup-8.0.22-15.tar.gz 294237178 BLAKE2B 819d7594bc41e0adc1e6f2632e6ad50de7a2416c7577f48ea83948bed1b14c0c552c4c44597c84c86fa292bcbbaace185978956acdc39070f81ede6701f4af52 SHA512 f5295e2f1e3ee71931295f89dbd708eed936c4912ab3b6c122eb63795ee2e5154011ddf95cfad005a89c7f086f087f7fb19068d098b49202c697a95b58ee7672
+DIST percona-xtrabackup-8.0.23-16.tar.gz 288261551 BLAKE2B ca82bfcac881cd1d9d3a1d0ea4647d809030b617cc8605f26f1378fba74f106b522447fc67be3968fe72bd8c6bd9fa64ba1943d8379c11f241178aa232680f06 SHA512 11927649ab2a25dbfc5268ab2196dbdd2b102229728a41dc61995aec92a133718c0bf79d3fe15ea91e0917cd4201bba806647d259a6aa0fc7b59ff8bd533e810
 EBUILD percona-xtrabackup-2.4.15.ebuild 1778 BLAKE2B 74e30f27b5dc192c2fe8050cb881b1c5450a0f0d39c630580bf93b8bb95312602b30fa827a06df1794410b2d655f8adc2be9fef596ea26bdf00d071800f99f72 SHA512 fa47544c2b83c281d04a3b9f2e435a36a47d94bce872b3b0fce45071cdffc196c0bd03ca41837a2d2132a09880c1a443216f9b7d98ffe856a3323f8de9067bed
 EBUILD percona-xtrabackup-2.4.20.ebuild 1535 BLAKE2B 41170fcaab472910dde609fb7b12aa6918a708018a7fde9cc182276b8383fd041c322141aea8dcf599752a88e2ed5872f4087ac11cc27387495f7574af1be594 SHA512 592dacff26ec640eec56853e8a9bbe63ba8ecae859463e55aac9478c393d05409e3b0bd9a7aefbd4795f37ef213e183c9e24f9929ea05f470c33a6034e5a1fd3
 EBUILD percona-xtrabackup-2.4.21.ebuild 1499 BLAKE2B 00e2dcb73eee4fcc85847e8524c67195d50e53675dfd9e65d2c4e2ad286cdf18416809f185be81256c59fb5908cf5b44893d365c3f0fb535c8025334350c573c SHA512 b436b90f4aa3bd37471c30f3cf23d35327f6d06d67ba4def513e49528fcc6569c22afee356392c877b951c49d60f2235e408ac18e11d61606105bb5ff00aa7a7
+EBUILD percona-xtrabackup-2.4.22.ebuild 1499 BLAKE2B 00e2dcb73eee4fcc85847e8524c67195d50e53675dfd9e65d2c4e2ad286cdf18416809f185be81256c59fb5908cf5b44893d365c3f0fb535c8025334350c573c SHA512 b436b90f4aa3bd37471c30f3cf23d35327f6d06d67ba4def513e49528fcc6569c22afee356392c877b951c49d60f2235e408ac18e11d61606105bb5ff00aa7a7
 EBUILD percona-xtrabackup-8.0.13.ebuild 1545 BLAKE2B 42ea67173b4c4f462e0acbe4a5ebdf2cae8ea7764df7d5353c73f65dd5d9023a2833e8e8c7baf9b4f8316d5179ea5aa3a7ca1b55eebd88d43fb89cbea333928d SHA512 5967bb6a3e95187d13c4b6995cfd8b151aa1d1fa9c4dadfa1bf0791ff8748a73705a750214115c62c92c41c483d48872e38c7915e82fbc4ef90d79f594a135c2
 EBUILD percona-xtrabackup-8.0.22.15.ebuild 1867 BLAKE2B 626bc0a244a6335f0b8f65ea586e1d26bd2215b239338160f6dcf5a0cb832a810d1a128de7c0599c74fa6c61a8389b002ab9a800d4fd9dfd7ef924d3f32ff0c5 SHA512 d5387d3a5ddf1232786b4d477b404f856484f4d2c9ef4a1b3edc7b4d9f0fb001e18137f0ac597da9ea7c6feed96fe74503126e17d0ff2f890bf12f33ff9c06d9
+EBUILD percona-xtrabackup-8.0.23.16.ebuild 2163 BLAKE2B 0ab36f111f6df3855f9641c35bb5440d532ee54ddf3b257ef7dff03cb1f8c9880753ce20b39d1fecb43f113e1433381432d8ad832b251ef0e9c6034dd16136b4 SHA512 4e95c7c94d2d8743560638a665225e846da34331e6a8e999810c066528aa202d22ccf78cd1f41cdd1547657a002e1a5d48036d6448d34281c4a45471caafd53a
 MISC metadata.xml 334 BLAKE2B dcc722d923e0f35bd57d67664edf99e7bc159816aa88b4ea210b72a643326c64ed26082088e0468c2b51670b1bd913e66e5f8a99adcb847b42e7f61e7a354223 SHA512 035813d50369063ec1da627ed05ad625045a52e252441bbd4ada2035913525fb18dbf443a57af587aa0f1f18a4e87168e4b683cd33b701e1f115d7e852a81add
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.22.ebuild
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.22.ebuild
@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Hot backup utility for MySQL based servers"
+HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup"
+SRC_URI="https://www.percona.com/downloads/Percona-XtraBackup-2.4/Percona-XtraBackup-${PV}/source/tarball/${P}.tar.gz
+	mirror://sourceforge/boost/boost_1_59_0.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	app-arch/lz4:0=
+	app-editors/vim-core
+	dev-libs/libaio
+	dev-libs/libedit
+	dev-libs/libev
+	dev-libs/libevent:0=
+	dev-libs/libgcrypt:0=
+	dev-libs/libgpg-error
+	dev-python/sphinx
+	net-misc/curl
+	sys-libs/zlib:="
+
+RDEPEND="
+	${DEPEND}
+	!dev-db/percona-xtrabackup-bin
+	dev-perl/DBD-mysql"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.6-remove-boost-version-check.patch
+	"${FILESDIR}"/${PN}-2.4.20-fix-gcc10.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CONFIG=xtrabackup_release
+		-DBUILD_SHARED_LIBS=OFF
+		-DWITH_BOOST="${WORKDIR}/boost_1_59_0"
+		-DWITH_EDITLINE=system
+		-DWITH_LIBEVENT=system
+		-DWITH_LZ4=system
+		-DWITH_SSL=system
+		-DWITH_ZLIB=system
+		-DWITH_PIC=ON
+	)
+
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
+
+src_install() {
+	local p="${BUILD_DIR}/storage/innobase/xtrabackup"
+
+	dobin "${p}"/src/{xbcloud/xbcloud,xbcrypt,xbstream,xtrabackup}
+	dosym xtrabackup /usr/bin/innobackupex
+
+	einstalldocs
+	doman "${p}"/doc/source/build/man/*
+}
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.23.16.ebuild
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.23.16.ebuild
@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
+inherit cmake flag-o-matic
+
+MY_BOOST_VERSION="1.73.0"
+MY_PV=$(ver_rs 3 '-')
+MY_PV="${MY_PV//_pre*}"
+MY_PN="Percona-XtraBackup"
+MY_P="${PN}-${MY_PV}"
+MY_MAJOR_PV=$(ver_cut 1-2)
+
+DESCRIPTION="Hot backup utility for MySQL based servers"
+HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup"
+SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz
+	https://dl.bintray.com/boostorg/release/${MY_BOOST_VERSION}/source/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION}).tar.bz2
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	app-arch/lz4:0=
+	app-editors/vim-core
+	dev-libs/icu:=
+	dev-libs/libaio
+	dev-libs/libedit
+	dev-libs/libev
+	dev-libs/libevent:0=
+	dev-libs/libgcrypt:0=
+	dev-libs/libgpg-error
+	dev-libs/openssl:0=
+	dev-libs/protobuf:=
+	dev-libs/rapidjson
+	dev-libs/re2:=
+	dev-python/sphinx
+	net-misc/curl
+	sys-libs/zlib:="
+
+RDEPEND="
+	${DEPEND}
+	!dev-db/percona-xtrabackup-bin
+	dev-perl/DBD-mysql"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.22-remove-rpm.patch
+	"${FILESDIR}"/${PN}-8.0.22-fix-building-against-ICU-68.patch
+)
+
+S="${WORKDIR}/percona-xtrabackup-${MY_PV}"
+
+src_configure() {
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG
+		-DBUILD_SHARED_LIBS=OFF
+		-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
+		-DINSTALL_PLUGINDIR=$(get_libdir)/${PN}/plugin
+		-DWITH_BOOST="${WORKDIR}/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION})"
+		-DWITH_MAN_PAGES=ON
+		-DWITH_SYSTEM_LIBS=ON
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	local p="${BUILD_DIR}/storage/innobase/xtrabackup"
+
+	dobin "${p}"/xbcloud_osenv
+	dobin "${BUILD_DIR}"/runtime_output_directory/{xbcloud,xbcrypt,xbstream,xtrabackup}
+
+	# cannot use dolib.so because helper would append libdir to target dir
+	insinto /usr/$(get_libdir)/${PN}/plugin
+	insopts -m 0755
+	doins "${BUILD_DIR}"/plugin_output_directory/{keyring_file.so,keyring_vault.so}
+
+	doman "${p}"/doc/source/build/man/*
+}
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@ -24,5 +24,5 @@ EBUILD postgresql-12.6.ebuild 13623 BLAKE2B fd4a8afad1a5dbf1cdceb5b59185220fb5a2
 EBUILD postgresql-13.2.ebuild 13869 BLAKE2B 1644abb185392b63183e1e949fe9735fa86733e4191716073d12de2fa96538fdf46fc648fdacb6bf06a7b0b4542586ffdcd6b93d7d26fe6a9d22d6377def8d2b SHA512 57dec06a04df5b2cd8847e2dcff6f4a6e643494dd93041a3b75661cf675b15081b2fa9a81bfc3aa89b1769dc474ce0c622a6cb3b4dc4b957242e4419999d327b
 EBUILD postgresql-9.5.25.ebuild 14352 BLAKE2B 384d20f025a4c6a5109e6c56b13fc5f3fe1017f4a3e1574ee4902e5a4fba5ca03b06f32407c6a536810a4faec1327ac857004d581102abe88ed54d14d728fe89 SHA512 fe008861fb16e8c4ba9754c89b7beca9d1173e46dec634cf6bd18f0ea95ab36aa600930fef3168d0e6de38a420c8e1af95a1d99b5eda6d9a9eac74f53099470a
 EBUILD postgresql-9.6.21.ebuild 14574 BLAKE2B ec064e090ccee5ed827f05469a665014937039fe8c9f12c39ab843037bd772de0fdf25fd931ab5aeb3015fbdcde96bccc6c0cd3afc6b8d969712b76052f1f392 SHA512 991a15e030dd85642f16b05cb724c07fd663630b982e7a982d53b35034d56aa067abf2c6f8b1cf5766549a59adfdbf5bbf074b83a983392c170f1e2d39ccb496
-EBUILD postgresql-9999.ebuild 14050 BLAKE2B 2ab90ab4e72ae00105b995f99b7bfbc249e604ad68f0b1301c1d0bf4a07b192360ac595f66f049e19caade63449ee3b501d842fdf3e58ef7a93bd477a6ccf309 SHA512 1a3fd6fdbe2b5e3a841a4341fccfd4e480c85336668b68994087be439b010f939a412f3b08764546f0ec4e647bf9b7d2ac202ab0075e385c9f98498194a83e41
+EBUILD postgresql-9999.ebuild 14092 BLAKE2B 125143665bda11dd9f9b090fed94d9ad6fc10e96bd7713b6cddaa8ef9a63395a68b7801e108e2b358752fe2a10ca4b6748981b2a2db8d4eb9786d025bf9d1f61 SHA512 3a5bd27396252f6a5d812530ead9a2f0792ecb6db3cb8e96b389ceed16c085321be52275e0104b935da6f29d6808a1119ddd3d676a61c55e71b9c50bef405bf4
 MISC metadata.xml 715 BLAKE2B 71b868113676bdbb1996ecc8e3727b0cc16a559c5906e6459a41c330bcb5a5f4b3f4b5c4473a81905713c2f0735f185cd14612c69108b6bb602a7d8a92d6f3ce SHA512 4148c9c11ffaea5d30cd18befb06af914147d41eec4a8f905127f0abc5317ca370a745e0fd51b03c4583efde927fe9c1b3333853e80c2aa3e7677de65cd5d1ba
--- a/dev-db/postgresql/postgresql-9999.ebuild
+++ b/dev-db/postgresql/postgresql-9999.ebuild
@ -18,9 +18,9 @@ LICENSE="POSTGRESQL GPL-2"
 DESCRIPTION="PostgreSQL RDBMS"
 HOMEPAGE="https://www.postgresql.org/"

-IUSE="debug icu kerberos kernel_linux ldap libressl llvm nls pam perl
-	  python +readline selinux server systemd ssl static-libs tcl
-	  threads uuid xml zlib"
+IUSE="debug icu kerberos kernel_linux ldap libressl llvm lz4
+	nls pam perl python +readline selinux server systemd
+	ssl static-libs tcl threads uuid xml zlib"

 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

@ -37,6 +37,7 @@ llvm? (
 	sys-devel/llvm:=
 	sys-devel/clang:=
 )
+lz4? ( app-arch/lz4 )
 pam? ( sys-libs/pam )
 perl? ( >=dev-lang/perl-5.8:= )
 python? ( ${PYTHON_DEPS} )
@ -78,8 +79,8 @@ uuid? (
 DEPEND="${CDEPEND}
 >=dev-lang/perl-5.8
 app-text/docbook-dsssl-stylesheets
-app-text/docbook-sgml-dtd:4.2
-app-text/docbook-xml-dtd:4.2
+app-text/docbook-sgml-dtd:4.5
+app-text/docbook-xml-dtd:4.5
 app-text/docbook-xsl-stylesheets
 app-text/openjade
 dev-libs/libxml2
@ -168,6 +169,7 @@ src_configure() {
 		$(use_with kerberos gssapi) \
 		$(use_with ldap) \
 		$(use_with llvm) \
+		$(use_with lz4) \
 		$(use_with pam) \
 		$(use_with perl) \
 		$(use_with python) \
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/hamcrest-core/Manifest
+++ b/dev-java/hamcrest-core/Manifest
@ -1,11 +1,11 @@
 AUX hamcrest-1.3-empty_generator.patch 1227 BLAKE2B 4e0bc6d085f6d26de9f2da8e09eb061c451a58d99385a2c41be28a137b209783affd76e1e0bd901a5497d40b290ac219d61046fc65931ea056c725ae0f835ee1 SHA512 766f57a449d4535432ab192c40a37ff9a09fe760b06ce5beb6a68b2b804c77ce232e8003fb3f3ef7b71df1cd2ceae7ff13fd3de28d20ec0ced1274c912d414b5
-AUX hamcrest-core-1.1-java-11.patch 1516 BLAKE2B 0a6c7fdc74015377075f174149a1fe2f55a3a4e782490c5bc7cac4abc3b0f8996e39dd98c094637f9899b58b15f9339b800154e4ab380395c06167c28d603076 SHA512 43b084fafa7d1c69f3cd6924e3446c32f20481da1148a77d2dc9021a439257eaa518e3b57a8049f3212cba75f62e1cd3db2c6feea36e28a6c93584fbb48ee968
+AUX hamcrest-core-1.1-java-11.patch 1198 BLAKE2B 0c9610b9225a6eff96669dbc0c4e052a33ad0ef46d8982d39220e851584afcf67b7696a5770ffe2a61090020a7dc6925367e5eb13c4f0e3c6a621361825e1ac7 SHA512 21f5305ef9bb2b0c4c8f9eb5524dd31a621b6acad1447644f75afac5c87de6187617c3beb592cb934f6befe316735f1cfb72b34371fd4b7c09e893a99461a87a
 AUX hamcrest-core-1.3-fix_javadoc.patch 3036 BLAKE2B ee65eb88f113a5f6fd93b49dafb76d8c1c39266f6fb2f220849eeabec7ce5b084d2411c51102fa5b47853aed66acd6d237497c0c8bb2c688c93b7eb0785e27a3 SHA512 f50fe8f2ba32e17118c42e438ef96973f7c04b70321353ed2c19c7ec8f61ba0c801b49920295d0d30add50fb18dbab5cd079b1879f71f4d569b8253ca40b4ce3
-AUX hamcrest-core-1.3-java-11.patch 1204 BLAKE2B 25f17238124829786bd3c8dbc468536f8a6bb684531e7859c003789249c88307d063aaf5b3e47abca5a93884bb3378d9197ce112d3237eaf1d021ad75e678e61 SHA512 6269c90835fea7387e5f830160c536eb91ab3037ed2e9bd5142f8cd2029fbea9e9baf374aa0fba98e0d59f0a0e83cd41f1d81265d94099013b81841253a85f20
+AUX hamcrest-core-1.3-java-11.patch 886 BLAKE2B eb6e3a1f3cd47d067987a436d947ab89732dfec0f73096b9b9a0be3213cb0bd7ee800f29ff2766e997c202f9309b766aeede966d399c080e1529c9f0d83c7e1d SHA512 82ead3c1344ac7a153992923e06bdb40dad2729202aa695e690c755937f570ad927c5aa832de13553050dfcce48bd84c6e73164c26c39890c134259c9ab67254
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
 DIST hamcrest-core-1.1.tar.gz 1247348 BLAKE2B 07b874ca2e61808cd1a30246cbfe7baa220a9c83df7be94dbb50c4df0279bcf906a32cc1b69aed0ebd81d51392af28050d070b7fabb50f8063964b0782b5e105 SHA512 d86080f1ef5982faee728e29675676a89b42a02c4b00783c67be948076e502e70a2b435568502d8ed3c5b1bcc5441b3cdd8817dab841cac537087edeee47632f
 EBUILD hamcrest-core-1.1-r3.ebuild 716 BLAKE2B a0442ff57be2628e59b831794fb9e48cb54d1ae88abd9ab69bdfe39195e55c16da9234241af00378345e21dd4b98421b625a3e42ffe254f57b2b4fd0a4b8cb55 SHA512 8138d54074543ccbf142647639eb45efd304b0bceffcd0fbe942e3dfcfe565d15c184178661495717aee507196284543a7d4f596e0ea828f1b1871d6ba29f260
 EBUILD hamcrest-core-1.1-r4.ebuild 819 BLAKE2B 3f493eba6cefdb44388ce7ff68358973124e501d4d64baa3db1ed090fc14879ea84cdc703a5735101980a7b65b9c3cca6fd0128e3faa70e70af42a1f54a7d80e SHA512 67e6a9862994324c14eae28d426ff1b9265bec1fb1ccb82ada71f2b376b13ec57d010c10678fc570ef60b6cf6a05a15558901ecaf0aee8f4e092db8a571f542c
 EBUILD hamcrest-core-1.3-r1.ebuild 1508 BLAKE2B 9d6f9a554c9194ae529da1323cb299012e0c9e24eb824abc81c97832d6bb3388278b1d2b70c2ab63a881d90e7e37051ab8a77775ebe58b6718f60a19a02a39cc SHA512 0c4e858cabb30eb516ee565bc12a34b3a10c160b8604a6c2ea7c64fdf1ef7f18f307bfd1f6dde9689606fc1396b67c54ed129c49bf92affa91917033ffddd510
-EBUILD hamcrest-core-1.3-r2.ebuild 1589 BLAKE2B 836857be5cc28379c345ded0738cb3d48dc43096d804b80bdb9e2345961a53b6b084e3e0fe39ef18fdb81cbf226005d1f6e82e7ae219db8467588043287a3e56 SHA512 9be6623ef6703d1a6dd930d4000d939de5d11f65221f9bcb4e537e6e9804a5cb3a9fa50d9661bd7af57950366d4f5bd825ecdd7e90a814f08bce4fab6fbdc5f3
-MISC metadata.xml 363 BLAKE2B 949dd901636266a4874e05a9902cabbfa703b665d96402ffa219ca9dfc6d6bb340518ecab596dac5cf38292b3303ebc63ae0831285cf3e6a3b5379c0ed9b7366 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8
+EBUILD hamcrest-core-1.3-r2.ebuild 1432 BLAKE2B 08bd6833be78fcdd0f52e3108909f81096a22f463d84db839ff80fd60784500b29b37097d3241f60865a51bdbc469fa5cbc8d64851ca3dbe621f243e653d4200 SHA512 179678dc160b1c56eea96848baece20f946684e3db60570afd0b626d42d5e5de8179b49caec5739749f7b3f4ddbbf8504e07f995799660b741ff2573026b41e1
+MISC metadata.xml 310 BLAKE2B 18f629f94221f2689e8e27ebd26be9a7fcb14a4a5ba2632b59e370dae8a13e25a7cff75b36b4eee5abee203f9c9d8ad012226928ce7300207b2fe7af151934d6 SHA512 04a1836dd5ab9e764bdde86a1944830b3e272ecba3a6ae7ee84e8128edeff96b5936bf3a7dcd133171b97ab1feac4a2ff639951168d0937e7b76a6958e566cef
--- a/dev-java/hamcrest-core/files/hamcrest-core-1.1-java-11.patch
+++ b/dev-java/hamcrest-core/files/hamcrest-core-1.1-java-11.patch
@ -1,5 +1,3 @@
-diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
-index d435303..962c945 100644
 --- a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
 +++ b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
@@ -1,6 +1,7 @@
@ -19,8 +17,6 @@ index d435303..962c945 100644
     }
 
     /**
-diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
-index e003a7f..4ed9030 100644
 --- a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
 +++ b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
@@ -1,6 +1,7 @@
--- a/dev-java/hamcrest-core/files/hamcrest-core-1.3-java-11.patch
+++ b/dev-java/hamcrest-core/files/hamcrest-core-1.3-java-11.patch
@ -1,5 +1,3 @@
-diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
-index a206b80..d55cf6b 100644
 --- a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
 +++ b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
@@ -57,7 +57,7 @@ public class AllOf<T> extends DiagnosingMatcher<T> {
@ -11,8 +9,6 @@ index a206b80..d55cf6b 100644
     }
 
     /**
-diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
-index 55d08dd..2a46631 100644
 --- a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
 +++ b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
@@ -47,7 +47,7 @@ public class AnyOf<T> extends ShortcutCombination<T> {
--- a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
+++ b/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild
@ -5,7 +5,7 @@ EAPI=7

 JAVA_PKG_IUSE="doc source"

-inherit java-pkg-2 java-ant-2
+inherit java-pkg-2 java-pkg-simple

 MY_PN="hamcrest"
 MY_P="${MY_PN}-${PV}"
@ -19,16 +19,15 @@ LICENSE="BSD-2"
 SLOT="${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos"

-DEPEND="~dev-java/hamcrest-generator-${PV}:1.3
-	>=virtual/jdk-1.8:*
+DEPEND=">=virtual/jdk-1.8:*
 	userland_GNU? ( sys-apps/findutils )"

 RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND=">=dev-java/hamcrest-generator-${PV}:1.3"

-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} java java-to-jar"
+JAVA_SRC_DIR="${PN}/src"

-EANT_BUILD_TARGET="core"
+DOCS=( {CHANGES,LICENSE,README}.txt )

 PATCHES=(
 	# https://bugs.gentoo.org/751379
@ -37,24 +36,26 @@ PATCHES=(

 src_prepare() {
 	default
-	# Empty out the contents of the generator target; it has already been built.
-	eapply "${FILESDIR}/hamcrest-1.3-empty_generator.patch"
+	java-pkg_clean
+}

-	# Fix problems with Javadoc target.
-	eapply "${FILESDIR}/hamcrest-core-1.3-fix_javadoc.patch"
+src_compile() {
+	java-pkg-simple_src_compile

-	find -iname "*.jar" -exec rm -v {} + || die "Unable to clean bundled JAR files"
+	# Need to add this in order to generate "CoreMatchers.java" as with java-ant-2 was triggered by "build.xml"
+	"$(java-config -J)" \
+		-cp $(java-config --with-dependencies --classpath hamcrest-generator:1.3):${PN}.jar \
+		org.hamcrest.generator.config.XmlConfigurator \
+		core-matchers.xml \
+		hamcrest-core/src/main/java \
+		org.hamcrest.CoreMatchers \
+		hamcrest-core/src/main/java

-	local cp="build/${P}.jar"
-	cp="${cp}:$(java-pkg_getjars --build-only --with-dependencies hamcrest-generator-${SLOT})"
-	EANT_EXTRA_ARGS="-Dversion=${PV} -Dgentoo.classpath=${cp}"
+	# Compile again, this time including the freshly generated "CoreMatchers.java"
+	java-pkg-simple_src_compile
 }

 src_install() {
-	java-pkg_newjar build/${P}.jar ${PN}.jar
-
-	dodoc README.txt CHANGES.txt
-
-	use doc && java-pkg_dojavadoc build/temp/hamcrest-all-${PV}-javadoc.jar.contents
-	use source && java-pkg_dosrc ${PN}/src/main/java/org
+	default
+	java-pkg-simple_src_install
 }
--- a/dev-java/hamcrest-core/metadata.xml
+++ b/dev-java/hamcrest-core/metadata.xml
@ -6,7 +6,6 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="google-code">hamcrest</remote-id>
 		<remote-id type="github">hamcrest/</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-java/hamcrest-library/Manifest
+++ b/dev-java/hamcrest-library/Manifest
@ -1,4 +1,6 @@
 AUX 1.3-remove-targets.patch 2263 BLAKE2B 17fb19da0f70f8d265a4e68f28ca530748af3372bcace0e7e04e04c46097abe2cf61265dd2b84f56467a83e0dc9c72bda2d94da25fa5abbb88f6f31f04d1321d SHA512 e403068cba91964dc7895c111a292a135ad27790da480c8779961075de559163052fa8ca5a997d3cfc278455ab3b8051bd3d4eb069f850dad2780a7ca974e551
+AUX hamcrest-library-1.3-java-11.patch 2323 BLAKE2B 6a16d58c3aadfbb7b6447b68f5d89ec17f82639b530f331e29276d1ebe947daa0c572e874efa328c03397058884ad6cc523c1ded08086fcfa42d1902624c948e SHA512 827966cf7ca175287df5005e35527575427986367013745ef49a7b1719fc3c6a0c7dd5697158726ff7d04122bc6e558bc402b71b6f2e9b932b87b61b5f71cecf
 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2
 EBUILD hamcrest-library-1.3-r1.ebuild 1349 BLAKE2B 7f4fe6555c6ca63e30104c0c705f8e6d3f92336c5edaee489171123e783bf0083eaaecb234a5ca59915af7278fa11a5c066c8eb759f0c53ce389bfbbb16da672 SHA512 a2b724168ede126135ede9a9054a476c783fb2c4afd491ff198083f31f4b47315a9d0c163a4fef4313f74a4cf83717abf6fe8bc68c5f572ea05ec8ae85a4a01a
-MISC metadata.xml 363 BLAKE2B 949dd901636266a4874e05a9902cabbfa703b665d96402ffa219ca9dfc6d6bb340518ecab596dac5cf38292b3303ebc63ae0831285cf3e6a3b5379c0ed9b7366 SHA512 7c71d7b035ce5a0a53a33932a8e7c90d2c4749deecb2a6e2b1dbaf7183b2526ad18d2233717f8c405039bf7d87939a544092d8f058f006418b8584caaff8fbf8
+EBUILD hamcrest-library-1.3-r2.ebuild 1494 BLAKE2B 8572675f1ba06799e294d195a02954fe9e6b366c5dd47183dd999d7b82d1a6d3c97fc665ac97a5433934c8c37fedd2cf641be25b11e29570934775810b82ea58 SHA512 0208ac3a1d509f93455faca12626be48815d1bd992b7947d7a1766a835dc8d27107a13658a8e53cd681a40b9a90735530a01d950dcd786922dc69d0f8732727c
+MISC metadata.xml 310 BLAKE2B 18f629f94221f2689e8e27ebd26be9a7fcb14a4a5ba2632b59e370dae8a13e25a7cff75b36b4eee5abee203f9c9d8ad012226928ce7300207b2fe7af151934d6 SHA512 04a1836dd5ab9e764bdde86a1944830b3e272ecba3a6ae7ee84e8128edeff96b5936bf3a7dcd133171b97ab1feac4a2ff639951168d0937e7b76a6958e566cef
--- a/dev-java/hamcrest-library/files/hamcrest-library-1.3-java-11.patch
+++ b/dev-java/hamcrest-library/files/hamcrest-library-1.3-java-11.patch
@ -0,0 +1,44 @@
+--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java
+@@ -122,7 +122,7 @@ public class IsIterableContainingInAnyOrder<T> extends TypeSafeDiagnosingMatcher
+      */
+     @Factory
+     public static <T> Matcher<Iterable<? extends T>> containsInAnyOrder(Matcher<? super T>... itemMatchers) {
+-        return containsInAnyOrder(Arrays.asList(itemMatchers));
+        return containsInAnyOrder((List<Matcher<? super T>>) Arrays.asList(itemMatchers));
+     }
+ 
+     /**
+--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java
+@@ -138,7 +138,7 @@ public class IsIterableContainingInOrder<E> extends TypeSafeDiagnosingMatcher<It
+      */
+     @Factory
+     public static <E> Matcher<Iterable<? extends E>> contains(Matcher<? super E>... itemMatchers) {
+-        return contains(asList(itemMatchers));
+        return contains((List<Matcher<? super E>>) asList(itemMatchers));
+     }
+ 
+     /**
+--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java
+@@ -55,7 +55,7 @@ public class IsArrayContainingInAnyOrder<E> extends TypeSafeMatcher<E[]> {
+      */
+     @Factory
+     public static <E> Matcher<E[]> arrayContainingInAnyOrder(Matcher<? super E>... itemMatchers) {
+-        return arrayContainingInAnyOrder(Arrays.asList(itemMatchers));
+        return arrayContainingInAnyOrder((List<Matcher<? super E>>) Arrays.asList(itemMatchers));
+     }
+ 
+     /**
+--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
+++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java
+@@ -69,7 +69,7 @@ public class IsArrayContainingInOrder<E> extends TypeSafeMatcher<E[]> {
+      */
+     @Factory
+     public static <E> Matcher<E[]> arrayContaining(Matcher<? super E>... itemMatchers) {
+-        return arrayContaining(asList(itemMatchers));
+        return arrayContaining((List<Matcher<? super E>>) asList(itemMatchers));
+     }
+ 
+     /**
--- a/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
+++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r2.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN=${PN/-library}
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Core library of matchers for building test expressions"
+HOMEPAGE="https://github.com/hamcrest"
+SRC_URI="mirror://gentoo/${MY_P}.tgz"
+
+LICENSE="BSD-2"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="dev-java/hamcrest-core:${SLOT}
+	>=virtual/jdk-1.8:*
+	userland_GNU? ( sys-apps/findutils )"
+RDEPEND="dev-java/hamcrest-core:${SLOT}
+	>=virtual/jre-1.8:*"
+BDEPEND=">=dev-java/hamcrest-generator-${PV}:1.3"
+
+JAVA_SRC_DIR="${PN}/src"
+JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3"
+
+DOCS=( {CHANGES,LICENSE,README}.txt )
+
+PATCHES=(
+	"${FILESDIR}"/hamcrest-library-1.3-java-11.patch
+)
+
+src_prepare() {
+	default
+	java-pkg_clean
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	# Generate "Matchers.java" (java-pkg-simple does not use the "build.xml" file)
+	"$(java-config -J)" \
+		-cp $(java-config --with-dependencies --classpath hamcrest-core:1.3,hamcrest-generator:1.3):${PN}.jar \
+		org.hamcrest.generator.config.XmlConfigurator \
+		matchers.xml \
+		hamcrest-core/src/main/java,hamcrest-library/src/main/java \
+		org.hamcrest.Matchers \
+		hamcrest-library/src/main/java
+
+	# Compile again, this time including the freshly generated "Matchers.java"
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	default
+	java-pkg-simple_src_install
+}
--- a/dev-java/hamcrest-library/metadata.xml
+++ b/dev-java/hamcrest-library/metadata.xml
@ -6,7 +6,6 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="google-code">hamcrest</remote-id>
 		<remote-id type="github">hamcrest/</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/pycurl-requests/Manifest
+++ b/dev-python/pycurl-requests/Manifest
@ -0,0 +1,4 @@
+AUX pycurl-requests-0.2.0-test.patch 1001 BLAKE2B dcb7f921ab27fcd2e0b20087a9b65415f3b57ddf9bf98e47aa0b9d712799ec9ff22ac7abbb7ee856d0c24457893b44448fe476843d92712982858fa6883d13a6 SHA512 80b438f25a2b3bd4b8ca34998fb7d56477bf3667e90de648ef74fc653848414553157c190839534b06b9f668cd350ae45ab7ceece0ba8cc31e686ff1da8a0c6e
+DIST pycurl-requests-0.2.0.tar.gz 22962 BLAKE2B 9e28422e910ab88f2f6ace1684cd35a89eccde9eed9d63f48cb2d6f0caa30811016365fbbffc2bdd2dd8b05a3b248142a5822c092c9d40ebaabeed4ef068c659 SHA512 3bf091ff47e376a23f9046dbcc5631199da9434911d4140f5d09e5091b81f05c8cd8094528b7ac7d74f7a4b085a6dfd40bec81c66fde020a0680e2237b7af5b2
+EBUILD pycurl-requests-0.2.0.ebuild 587 BLAKE2B e0d9c4b363b762f82c904b5b9b55bbabd7b3f2d5cdcdbdac6fc7ce58aba047e777c9c8193d49c5b46b3b9b3b25a01f140d379702ad3dfcfa164bcd6f063bce91 SHA512 21ebc22102170cc8f047ba4441a01f05339901ab5aef7d1201ab77678a9323c68ca8f92641d206e7e95ff81be6671fefe6a557ef999d837e99d0101ae866ee57
+MISC metadata.xml 273 BLAKE2B e63a5ac24d72d1f4d149064a48900b9e8fb5613ee7ac52dc1ece604ededdee3083f6e7eaa88501c4f07aa954ad515cbbf22e0b2b187266f613b7276a9e1874b8 SHA512 0140397ca54e88f4d4cfbf84b87fcfad82e3064358c65f164aae2eab3f0787b568b7ea968fef442c6c6cc0a854f60340bbd02ce6e25b702dea0ce9ba58040683
--- a/dev-python/pycurl-requests/files/pycurl-requests-0.2.0-test.patch
+++ b/dev-python/pycurl-requests/files/pycurl-requests-0.2.0-test.patch
@ -0,0 +1,20 @@
+diff --git a/pycurl_requests/tests/test_requests.py b/pycurl_requests/tests/test_requests.py
+index 7d2c627..850d530 100644
+--- a/pycurl_requests/tests/test_requests.py
+++ b/pycurl_requests/tests/test_requests.py
+@@ -160,6 +160,7 @@ def test_get_timeout_urllib3(http_server, timeout):
+         requests.get(http_server.base_url + '/slow', timeout=timeout)
+ 
+ 
+@pytest.mark.skip("not compatible with network-sandbox")
+ @pytest.mark.parametrize('timeout', [0.1, (0.1, None)])
+ def test_get_connect_timeout(http_server, timeout):
+     with pytest.raises(requests.Timeout):
+@@ -168,6 +169,7 @@ def test_get_connect_timeout(http_server, timeout):
+         requests.get(http_server.base_url + '/slow', timeout=timeout)
+ 
+ 
+@pytest.mark.skip("not compatible with network-sandbox")
+ @pytest.mark.skipif('urllib3' not in sys.modules, reason='urllib3 not available')
+ @pytest.mark.parametrize('timeout', [Timeout(connect=0.1), Timeout(total=0.1)])
+ def test_get_connect_timeout_urllib3(http_server, timeout):
--- a/dev-python/pycurl-requests/metadata.xml
+++ b/dev-python/pycurl-requests/metadata.xml
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
--- a/dev-python/pycurl-requests/pycurl-requests-0.2.0.ebuild
+++ b/dev-python/pycurl-requests/pycurl-requests-0.2.0.ebuild
@ -0,0 +1,26 @@
+# Copyright 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="Requests-compatible interface for PycURL"
+HOMEPAGE="https://github.com/dcoles/pycurl-requests"
+SRC_URI="https://github.com/dcoles/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/pycurl[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/pycurl-requests-0.2.0-test.patch"
+)
+
+distutils_enable_tests pytest
--- a/dev-python/rfc3339-validator/Manifest
+++ b/dev-python/rfc3339-validator/Manifest
@ -1,4 +1,6 @@
 AUX rfc3339-validator-0.1.2-remove-pytest-runner.patch 551 BLAKE2B 4ad2e2d740b38c0628d321bf77f0884a0c72448b65296daea25217725e526de27ffd5927a9ac52cde0bd9cab4ee46b6cdd0608657a4edff4d5de5b04fe0a5813 SHA512 2ebb2eaca9311944283eb09feca1796540298b16d99480931deffea6a441093f33c48437a2d4a6e44aa3293b2e984db1a00028e9b96805d284223090e5321f89
 DIST rfc3339-validator-0.1.2.tar.gz 7429 BLAKE2B 9c08ae6ebe12af043ebad82a716e359f323f318d44e1f23a41759773e1927f90d6dde95566ca3c9463db6ffc9f2c3a31925ee4668f7fbe1defc78e09949ac391 SHA512 42164f8258025b056a6c5584c1c5e76f4c4fddead1a18199cd5b115a5a576d8863676d741e5e9a12bd4b41cbf55e722632a57dc3f76688ff0ad886615286c567
+DIST rfc3339-validator-0.1.3.tar.gz 7439 BLAKE2B 8991906720f3c7fe08edbc2994693b354338e70bb361e2ceebe168e8f8195a061c2cd716e365a7713c1a21658517e4f2028f9b619513408252a46ef589868c02 SHA512 d89679fb9fabcfa75cf3955744facb235201c0c3ccc4bcfd53b553c5403967226282b68e628d0dd74bb4abe553da6c3734912c63f3a5e16875e57a872c78231d
 EBUILD rfc3339-validator-0.1.2.ebuild 738 BLAKE2B c37e8630e894ff3e3ac1b113ee2ca2830b9cfd8557368bbf517a3324d2860cf63b8b021b268627e0a325b216cb869698a7387a37990f676bb1f9f37769ed5775 SHA512 6c32c7efa29e8f395e6fedba67553910f669c8cbf32482cb461e08fcf9469f0504e7ee039b35218941c6dd781245b5758ac44349620673435a34254e444f56bf
+EBUILD rfc3339-validator-0.1.3.ebuild 660 BLAKE2B be1cd8f389c1e3697846fb8d64d6eaa7be3fa0d0df5312de564f4ef7ee8ef94c83f04e4e022831db5da83df0d88dd2bf74d728726171427cd9f0074efca46f91 SHA512 3c32f37e44aaf6235dc342b01fdfa7396a2b672d712670b572db74f6c56a088eda864bd9a75315487b5c8411361072cbd311d49dff3f7d25f29206275268fc62
 MISC metadata.xml 374 BLAKE2B 4b440428addb3f4f1ee8556ca6fcf8ba55eb64571381eef4bac2b7744d13d8538942d0fefeb1513d558124e9e6806de73f81e39a84afa30d3de3634319b2b518 SHA512 579adade6871bd44f7cf9759c2c46ebaffdad553c78eca373bcce4b143fab229f7ccebe11c25884e6721736a506f03bdf2e67057f58cf8b18dc8af6d4de008c5
--- a/dev-python/rfc3339-validator/rfc3339-validator-0.1.3.ebuild
+++ b/dev-python/rfc3339-validator/rfc3339-validator-0.1.3.ebuild
@ -0,0 +1,25 @@
+# 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="A pure python RFC3339 validator"
+HOMEPAGE="https://github.com/naimetti/rfc3339-validator"
+SRC_URI="
+	https://github.com/naimetti/rfc3339-validator/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	dev-python/strict-rfc3339[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
--- a/dev-python/sphinx-prompt/Manifest
+++ b/dev-python/sphinx-prompt/Manifest
@ -1,3 +1,5 @@
 DIST sphinx-prompt-1.3.0.tar.gz 7511 BLAKE2B 3e327b93fdfba48684983b0524fddc2c70f5ca997364e58cddb4e1d1078f51fc73e0102b969c49fa6cb27154624cd0220ea244eb13a0f64444a4e252bfe3f9ca SHA512 21dad50833ee1e00493c208b844caa41420fc2874c48fcb9ce20168a4872f8dc0a654eeea6ca6159d5ff6bbac3de15c2633c2f5abd826ac352c3f0ced37f6146
+DIST sphinx-prompt-1.4.0.tar.gz 9072 BLAKE2B c3ee936bb05eb39fcabd85260ef65b66c9a3fbf64d1b1e188ba889a3777d32fd90c6857d88191f5d9521b25ae46bc6ffc1777c18ace7e0aa0d96f266548ae7be SHA512 e79deb7164fe76f5f4a82855030d5eadd1966d87c0785d2a7a743205301ae0809398823e2a3558c3759774b3ee38c974638daf0b58ce565ef5b298f593ffd18d
 EBUILD sphinx-prompt-1.3.0.ebuild 546 BLAKE2B 5aa1462b89470b8d13db9efeb53d55689f035934c54ed25074d04c163bc4ea3f829a56a12502455ab13eb622a24142ea42976dc1494cb90f4024711f50eb7fda SHA512 993c70b9da6ddd023706f8719c66bcff469c9ca811bf2711db9501d9784f8d580b72c0e8255c8d8b730439a13a0e890d7423dabcb83e279b11303dfaf89de4ac
+EBUILD sphinx-prompt-1.4.0.ebuild 553 BLAKE2B 531c5e84d769baaecad3f90c6db72b5ccee61db722962bd2b13b10a6831e9448c595d57242639826b138119516e64a07cbf48bfe9ea99c5160ad2c8b452d33ed SHA512 217d630d4d9b5628edca147fe02cdcd4dc470c42d7aee357e5bfe822d312be43034c38c2e40164749cd0397ade83edd406a5d93de45b135c565e5f7a937b7942
 MISC metadata.xml 415 BLAKE2B 00d16da1c9b70e7dcb3da0bd1e6056944c9c011d99dde0f1e1a5a804ee79b8c9fc5e186f7f9d684401a7c360ec4ef2d367216717c18ea0464da944c0edf54fd9 SHA512 9002d60f91e3621e24a472a8c5bd512ab0b8364a82556b2be8b50d2c332aff3b8ea6f633aacf7d7d09101f2b354621291ffc35ef28103106c08df9558a74dceb
--- a/dev-python/sphinx-prompt/sphinx-prompt-1.4.0.ebuild
+++ b/dev-python/sphinx-prompt/sphinx-prompt-1.4.0.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx directive to add unselectable prompt"
+HOMEPAGE="https://github.com/sbrunner/sphinx-prompt/"
+SRC_URI="https://github.com/sbrunner/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+"
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@ -1,12 +1,14 @@
 AUX qtwebengine-5.15.0-disable-fatal-warnings.patch 414 BLAKE2B 531523ee8c85d6ac51637b3bfd4fbcd56476e1231103c0db62b7c27ace4d5e070becb97beb74526806101c138669adc81a00eefe319ff96582df4743ecabcef8 SHA512 4e3ae727f2738bcc011c9fdd27593d9689206573ff7f17a51fd78d3aa25d427b899af78c098c278f6e7ab4ce88bf415e7382a8a635dd880448a75e6756abc680
+AUX qtwebengine-5.15.2-enable-ppc64.patch 1249 BLAKE2B b8b9957bbf848ee8b19e4a7d43f1bfb8c2e63e691f2f0c4b10ef5367bc71b12fb6d161767f7669825e423c08af83e70ff744dd08facf92281c431de90a36847e SHA512 8e29e4e3c2085e5bba9c5a6ce7b366814767bb421132474cae413bba81217a70aec941b09a63d1f914c1e6b9e417b108df236d0b9d39e0df4b4d74111ddcda47
 AUX qtwebengine-5.15.2-icu-68-v8-runtime-fix.patch 6264 BLAKE2B 18a5bc35ddf7fc120dde8adcb0bd3f450f2422695dec698ad65f133e51018bc0e84bbcf8e3c85c6003dca114a11083903e05ea7348316b4aa90d415f1fd539c1 SHA512 e505c98cb777fb353529810e59acb0976403924a18ad8336d0ff4cf76df024e54f354efbac35322f0cf135d38a7340bc26e9a709435bf0f96d21344d8fecaa99
 AUX qtwebengine-5.15.2-icu-68.patch 15373 BLAKE2B 3b7ef4b096f8a593e711c74c64a0a770c0a2bd0fc3af0a2bc4b28fd9999358b06affce062ececf0b0c6f5092a4f6cb243ecc3decd00eb3f69292ad6393bf1bca SHA512 159c1553702b505a1e59ff18b3ac0340c7e0534a98b45ef2a70ab645d10bbb569c47bccb9d5a58d0f413b86abf29f9706af0ff5800029617a0575d6a759edbc3
 AUX qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch 7361 BLAKE2B 0a5ab9077982df3afea7d156e0dbaf11384d7b9ab6ea70ef4dc0b82f1690e455144318734cb50b7bf2349a95b99325e67bbfcbdf5c88f55f3ecc65c7e593c468 SHA512 585dab11bf6cf811b657831292d5b6b90dd01d9e4c1fa4b6a446d0eb66f436c46a6fcd4851e9c6b6b0bda8a41cbea57fe74ca5ecca4e40cb35f85d7c2f5265e7
 AUX qtwebengine-5.15.2_p20210224-disable-git.patch 501 BLAKE2B a295e5061830da6bfaf0c0ae6db832c86f797fa2426ec29e244133e862c0998a03373c11a2a31944bc09e0a20bf30c0a0a91eb06b1f8a9fdcdd9762f5ba7c542 SHA512 b795328058be945e7a323ea50f01cd5c11b130bc1204c8274fec920e04cce1643d8f9313e975f451dbb7dfecd6214f9ff9ea0aec87ad29237b6e9bb1b4114c5f
 AUX qtwebengine-5.15.2_p20210224-fix-crash-w-app-locales.patch 5278 BLAKE2B 3dce18cb5af9f0b0209e1a37c8ad149882feee324d5c061ab2523f8cc6d17f6adbbdac9a54210764fd3bc244b06d2061deb62edd5048b6f3ef927326c8018b8e SHA512 d0350befaa76ca83742fec69c0f6efd6b601a5775963b39f1d69602515bd2a4aeb4447239d0ee2658d281cf9e9098f8e52cf582ce51e95c7a300fbc418f46466
+DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654
 DIST qtwebengine-5.15.2-ppc64.tar.xz 43868 BLAKE2B 97a2db64c688cc3ce178a6f00c29d3408221302c992bf0df31edd5c11f7cd978b92d9222201644991fca4fc0824b19d994a71c472732dbbdda3729bdd04a67f3 SHA512 835e7da4670cd823a1674052d64971bfd98d54edb6c5df8e9d09aa8103d496a4c16f0eb9d47c46db466e1c640e3326d4e43b284161129d648bfe693a902ec9cc
 DIST qtwebengine-5.15.2_p20210224.tar.xz 320052028 BLAKE2B a1ebaae7cf114041576f4920de1e484bea70c715a470e83e7c47bd8ff95480fc4e408bba173990480732bd464a9eb07d304f4afdb90d943c0a8cbe1e8299df84 SHA512 939292511703f3a6d758d38f1c860ffacd003be65761b19f23e8817bf1121cb9e6351216f737126d8defb1c97ca877e1c6f352e7cfee8e9289274d0793348b51
 DIST qtwebengine-everywhere-src-5.15.2.tar.xz 280142544 BLAKE2B cf84a07292e69b5746d6575d65295b5bf4e054d448361f26e63cbe20ddd0773f60893e656d74b3b8c191e2829e09398a65896c8d96d3a7ef210ac1f21cd90e63 SHA512 de64c30819f5e2f8620c853ff22b2f9717641477aef4432a552a72d1d67ed62ed61572afee6de3f2c9f32dee28f4f786ffd63fc465aa42c0ae1e87ea28341756
 EBUILD qtwebengine-5.15.2.ebuild 5272 BLAKE2B c5ffd7075103bb6daaeaee53e7abe77a4ff1d941c1705db68c1da2df4fbd659d0afa00f9a63376d9b29a2df180263470a90d73c05d39e472f6d327e1689808d7 SHA512 15d27511929ad0877a047c02491913a33de9d80ef4ee5e1cd92f33259b853c4e8cc360dacfca7ce980f64e3a3f1685371334331f6dbb62bd2d19b64399148b15
-EBUILD qtwebengine-5.15.2_p20210224.ebuild 5907 BLAKE2B 950687e17a007172a9248295e8468d728a7047cc89acf405e65da39b4be274b085239c86a89635baf497968ae93034acd2b8c6b0ab2ce0eab19fc22c2d51d351 SHA512 b96bbc6fd9c3c5529a6d9d99a97ab09d02794ee3a1e2dc8c21d5c08c3fe4d7c588ce527483d251ca878bb0c6a1230bdb00a5b12434b2ef09e528f3dc136d7d8f
+EBUILD qtwebengine-5.15.2_p20210224.ebuild 6069 BLAKE2B a718532bfafc9190988ea17046d78856ab9c2e272adb053f271347171444447d5735786b70ec217b1dde33135e50cd38a2689174ed2c4d9ce2cc2e1134f7cd6d SHA512 9c38e5017a75fd4654cb6fa02f3a28fc04bfe58c09fd0dc605bae2cc684518cba542485caac5ed2d7ef106125b6843408b017062a95d7f33c121c3d5bd825667
 MISC metadata.xml 1269 BLAKE2B f95392929bcecbce9334108e3446d631e2a91d1aceb0fa6347496d2d0eeaff8cff55e08b7c3bb39fb8b51667988a6cc2b8e500143f2ebe0d78e6985a6f7af3c1 SHA512 7949854cf55f26750ded6787ce295762af7fd16600f8b251b25e1c9dd4d643338ed4c3b2a8a3405a2c427ed8b5a9ad13a8566a640161768d4dbf6db7e54811a3
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch
@ -0,0 +1,37 @@
+From 463f1234c57a36e78ff666bd55094a9d4e68f296 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Sat, 18 Jan 2020 23:52:55 +0100
+Subject: [PATCH 1/3] Enable ppc64 builds
+
+---
+ configure.pri                  | 1 +
+ mkspecs/features/functions.prf | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/configure.pri b/configure.pri
+index 3a144e3f8..cabe8b24a 100644
+--- a/configure.pri	2021-02-24 10:45:58.000000000 +0100
+++ -	2021-03-07 21:18:43.124754796 +0100
+@@ -144,6 +144,7 @@
+     contains(QT_ARCH, "arm")|contains(QT_ARCH, "arm64"): return(true)
+     contains(QT_ARCH, "mips"): return(true)
+     contains(QT_ARCH, "mips64"): return(true)
+    contains(QT_ARCH, "power64"): return(true)
+     qtLog("Architecture not supported.")
+     return(false)
+ }
+diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
+index 512e2523b..e31123654 100644
+--- a/mkspecs/features/functions.prf	2021-02-24 10:45:58.000000000 +0100
+++ -	2021-03-07 21:19:21.345036293 +0100
+@@ -107,6 +107,7 @@
+     contains(qtArch, "mips"): return(mipsel)
+     contains(qtArch, "mips64"): return(mips64el)
+     contains(qtArch, "mips64el"): return(mips64el)
+    contains(qtArch, "power64"): return(ppc64)
+     return(unknown)
+ }
+ 
+-- 
+2.26.0
+
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild
@ -10,7 +10,7 @@ inherit multiprocessing python-any-r1 qt5-build
 DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"

 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 ~arm arm64 x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 	if [[ ${PV} == ${QTVER}_p* ]]; then
 		SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
 		S="${WORKDIR}/${P}"
@ -19,7 +19,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 fi

 # patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-ppc64.tar.xz )"
+SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-chromium87-ppc64le.tar.xz )"

 IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
 REQUIRED_USE="designer? ( widgets )"
@ -144,7 +144,10 @@ src_prepare() {
 	# we need to generate ppc64 stuff because upstream does not ship it yet
 	if use ppc64; then
 		einfo "Patching for ppc64le and generating build files"
-		eapply "${WORKDIR}/${PN}-ppc64"
+		eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch"
+		pushd src/3rdparty/chromium > /dev/null || die
+		eapply -p0 "${WORKDIR}/${PN}-ppc64le"
+		popd > /dev/null || die
 		pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die
 		mkdir -vp source/config/linux/ppc64 || die
 		mkdir -p source/libvpx/test || die
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@ -1,3 +1,3 @@
-DIST CLion-2020.3.2.tar.gz 624043209 BLAKE2B 9a7d1ea2e83c06c27b595f042ba1a9768445ca0d79f6e2e227ed01252b49a72abf0f8c57d9418af31fc9f292bbe4d16306a1359dbf4622170f46d0e22f0b0999 SHA512 a70e9c8393ca8f96e51c2a575dbb67efee61d840198ed5d2dfff19a4d6e63f0612cbdc05752589b29702bb0c90ab1fa07859793f9bbd61d4a5afdd6a33dbae04
-EBUILD clion-2020.3.2.ebuild 2745 BLAKE2B 3d643fefb54fed93ab82bc6764b049990d5dc4fd33922ffb0dd248f1a06896cfeda36ecc9c95260687437cf4bc78b97eab76286ff328cb9e60363f9112eb9d0a SHA512 fb868e55e348552c2797c33c843e9a01fa304e4b0bdb9e7bf7ae4aac129e1c8a226a6eef2f4e8efb492f112ed9a6e49a863e90b8159332803bbcf6ca29f7faa3
+DIST CLion-2020.3.3.tar.gz 624552270 BLAKE2B 46290e8419e9cdfb9321a5364316447863301e69446994737972af18547a0306a82af3f407d07a043591faafe528fd09d9e18b7f76f610597f7781dcba9478ea SHA512 e0ea848a4a8b07ceb6bd60b6c57163cd3dabbca336a72e3618e15adcf011c5df7b34e43126d668a9c1b3ce15dfecfa905da3c1fd77bcdd209d9eccc87360cf1d
+EBUILD clion-2020.3.3.ebuild 2745 BLAKE2B 3d643fefb54fed93ab82bc6764b049990d5dc4fd33922ffb0dd248f1a06896cfeda36ecc9c95260687437cf4bc78b97eab76286ff328cb9e60363f9112eb9d0a SHA512 fb868e55e348552c2797c33c843e9a01fa304e4b0bdb9e7bf7ae4aac129e1c8a226a6eef2f4e8efb492f112ed9a6e49a863e90b8159332803bbcf6ca29f7faa3
 MISC metadata.xml 401 BLAKE2B 8e7319368a46c0f6bacf401c7004b1ae2c96267eab37b3a0a2fd878b5b9c2da2efae52a81a586c3f7aa49a33bb20c34d186350f55478beae674bba9c6e4c90e2 SHA512 388b826fc271151a9a0223ba619f5893e2a33170d505ae032a455e6b46d2dcecf3753244b810b01e0d5f985ef916fb3b9ae2e4476bc6f47ede977077565a8288
--- a/dev-util/clion/clion-2020.3.3.ebuild
+++ b/dev-util/clion/clion-2020.3.3.ebuild
--- a/dev-util/dejagnu/Manifest
+++ b/dev-util/dejagnu/Manifest
@ -1,5 +1,3 @@
 DIST dejagnu-1.6.2.tar.gz 525879 BLAKE2B 1a4cf8bea350d7fca8983fe9f5f77756746e9ef81a06e2bc733a9fa32f54e3c791f28d80ab563306df4082f2d5f9f30b87f1380b57b15213bf401783e5384dde SHA512 ae527ce245871d49b84773d0d14b1ea6b2316c88097eeb84091a3aa885ff007eeaa1cd9c5b002d94a956d218451079b5e170561ffa43a291d9d82283aa834042
-DIST dejagnu-1.6.tar.gz 523969 BLAKE2B 1cc9498aacd681570cd8d8834cd2fe0594bb49e6664cfe934b824dba0bd4a6766f977de6a1dc4596095a11d68844873f5687000423f4928f0432981023d26451 SHA512 a494dd5cde8d275b397116049c93e183f5f1731d63660ee8d2f4263b099fc5be7fbddde927fab3ccd5f000c43d50242f94bbb4d95497b915ea53be418bc145bc
 EBUILD dejagnu-1.6.2.ebuild 489 BLAKE2B 53ffd0147d4046ef35bb82e53233865830034002207a1de51f07f37526540a4a5c722c819847da168103a521d75e44b0f36161bae5b1ed253d071519a2fca617 SHA512 a193712d8ec65aef4f669502e4dba0eee9f1bbed424559567b6d34f346375daf226b31a45a749c34eb9164b0477b0142d7afa1b2e132558d0d4ccfa02506f37b
-EBUILD dejagnu-1.6.ebuild 705 BLAKE2B 50d6abbe6d3f5a8e636d284f335d38a39508e13c4304e828d751b3daeec46b3552a6902a8c1121f5df473e691def071d1cb31346a75a86929f3ae5cba78462df SHA512 549d9355c000f3dce727950b3d181760783ab69d6c3aa92f0fc5e9d8e481250c99f902796f206374971a9173271d3295941e42b1f466a2b12c12e2bb0321a4fd
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
--- a/dev-util/dejagnu/dejagnu-1.6.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.6.ebuild
@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Framework for testing other programs"
-HOMEPAGE="https://www.gnu.org/software/dejagnu/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-lang/tcl
-	dev-tcltk/expect"
-
-src_test() {
-	# if you dont have dejagnu emerged yet, you cant
-	# run the tests ... crazy aint it :)
-	type -p runtest || return 0
-	emake check
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@ -1,5 +1,3 @@
-DIST diffoscope-168.tar.gz 1569627 BLAKE2B ad0dcfeb40b4747877a5b0366706a57fea87229d23b4c7faa43e5dd12d8d950df52f42e74df862c52875e4722f046481ceb7204e74df11ed20188522e9874d9d SHA512 55025ff1a4e7664631d15c980aef46e6db4b22501989b1d58812a18eacb0e8c87028e6bed1599842b1ac072e0797d49a9d0796419a9678956c2f779b8909b6f4
 DIST diffoscope-169.tar.gz 1569438 BLAKE2B de2da2a4629c88e71aaeb694595ce04e7bcb6f24b9e84e47b197272c61bd8300922aed4b5d012a8b27abd4b8c4d62d45bc7361195ecf43498baec72753e15d2a SHA512 0207b97784218a324f4b51ad30b95a4c5f3cb072ff757b0617b87f1e8fcf6cbd0edd2f93e104206ce9c2870177ac56f3af171fff35bcaa40477e7c09b0921460
-EBUILD diffoscope-168.ebuild 2194 BLAKE2B 9dd510ff0851561703b950d555d87c92ac9c7f6cd4a29b623397352fd2a6caeecf100d81818145658a781517a4f5bf548779d78b820169f6ab5edf889c9163b9 SHA512 33432f35354fa308b9764c425e13eba5a5242f1f4c08fe544edcfc67f7c90abcadef6afe71e50e32e25fe2bfaea6bd7a34809ec777191884bd2dd4b7c8d59e17
 EBUILD diffoscope-169.ebuild 2196 BLAKE2B 34de6fd45de22af7b90709f728078fa57fd92f58e6fe2f8223ff2a6e57ea91e9fefd016ca3013328f1fc9e54d1f3d76ab3eba668aa7ede530ebf7bc43a6f0579 SHA512 80fffa1ea26a25bf7d1e55b558d40eda4c8289743d5681a0c95ff5bee867e34d83a0f6efb78ad92dfa322a3f35abcd774ad4e09ff277f01700698fa6c57dd2b9
 MISC metadata.xml 2137 BLAKE2B 70393ec4166e001aaeeb4c10958693ff090b04e7e5bf7eb760746dc4920e0554724f61e1a073f008660789438bec33378796ebc117c1cedcac5116b0b1d32142 SHA512 a1f5648c7593f16db4df87b750360034647704b1809ed52d585d49b5769ee8e190ff853941d2739da7c5f514ef02442b3b3ebf55fb21541e7bc551c720a305d0
--- a/dev-util/diffoscope/diffoscope-168.ebuild
+++ b/dev-util/diffoscope/diffoscope-168.ebuild
@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="ncurses"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar tcpdump xz zip zstd"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	gzip? ( app-arch/gzip )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( app-cdr/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/PyPDF2[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	xz? ( app-arch/xz-utils )
-	zip? ( app-arch/unzip )
-	zstd? ( app-arch/zstd )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@ -7,5 +7,5 @@ EBUILD gtk-update-icon-cache-3.24.20.ebuild 884 BLAKE2B 63830fae35e08408a5f65874
 EBUILD gtk-update-icon-cache-3.24.21.ebuild 891 BLAKE2B 3f0624e0b7e5f9c6de546d656deb5493ce4f4e549810e3cf76bd935cd57ecc987da693bcc298e308196726976093d04ef2b86fe9c40c68bb116b2d28929763e2 SHA512 18b0292291330e263af174acd179c36ab2e283eb36a29163e78774ae7461ae3057b49dfc183d57e04f12517dfad8e5f4b5acc06f709b44575f5ce1dbb0171f34
 EBUILD gtk-update-icon-cache-3.24.24.ebuild 892 BLAKE2B 53b4ce1015ceb2c8f561f89861254111ba547ac364757e8940564894442342504b542efdc6bf0b79d574f12dcbae67406bf68c610fa8c111793474f88e359b98 SHA512 0b7df96eca435a6653d5b26ba95d95ba91f8e4164b7f16e325c89eef7f65d886c3f7adeed393b56412ecf6113010b28eb55e8383b3a444410276681d79404a7b
 EBUILD gtk-update-icon-cache-3.24.25.ebuild 899 BLAKE2B 3c6deea073dc6034fc8d9a8c58295066445af479b4f7116a7203a4c7bdbd1729dfe7695259f53945bd3b813f315daed32276277fae3f6290ac35016d5091653c SHA512 3216d5f465b0740229c0d97ebe7f8104129b3537bcd3cffff0145dc2ad2f18c58cc18caa0694ddd06bbc25ce040a4182ff625972aa09685ff8662455a15cfff8
-EBUILD gtk-update-icon-cache-3.24.26.ebuild 899 BLAKE2B 3c6deea073dc6034fc8d9a8c58295066445af479b4f7116a7203a4c7bdbd1729dfe7695259f53945bd3b813f315daed32276277fae3f6290ac35016d5091653c SHA512 3216d5f465b0740229c0d97ebe7f8104129b3537bcd3cffff0145dc2ad2f18c58cc18caa0694ddd06bbc25ce040a4182ff625972aa09685ff8662455a15cfff8
+EBUILD gtk-update-icon-cache-3.24.26.ebuild 902 BLAKE2B 7715e8adacc6ceac7cda1f631c9aaf8813ad9d0ed7ecca6576f223dca9ae6bc4d269405492491f8f03167c74927f6d773df852690fef7c98d090a9c95854d350 SHA512 90b8b67859a82d65d9d57becebd7bdd1004c20c1556d0c8e66cbc16463e7df99fa21e9843fa78ee675783c2ffed9dc2eb2adf0d9c975f62ea6d8799ecccaf3d7
 MISC metadata.xml 647 BLAKE2B 2846e4ac0b5816fe7699b197958118535cac7092930d7b6ba63c23b126242102edd832d60b13baeed23bf8781babe1058f06fece732c4ecd58c9b01b621042ae SHA512 7301a9425528d65112ec9dd1eca7291473905493b1b550119c6984141b3b216c4f3825d3b2a395a8375aa8b481b29d841153bd279d593586d5ea7d77ce46d7d3
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.26.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.26.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

 inherit meson

@ -11,7 +11,6 @@ SRC_URI="https://gitlab.gnome.org/Community/gentoo/${PN}/-/archive/${PV}/${P}.ta

 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE=""

 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

@ -22,7 +21,8 @@ RDEPEND="
 	!<x11-libs/gtk+-2.24.28-r1:2
 	!<x11-libs/gtk+-3.22.2:3
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/docbook-xml-dtd:4.3
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@ -1,7 +1,8 @@
 AUX ffmpeg4.patch 1401 BLAKE2B 116679802c4acb9e843dbb8d656177ae133aefc49a270392eededdae662d7ead518fa4301e1c7d231acfd4a7fd3053d807611737add6a1746ec119e400a1f199 SHA512 c29db5f40e7a206fcdb05958c0dc3a479f3e9d0ebd02703c26049162b8cc7d88875f508f29eee387270c96cb381ea93366498faa79d62bf21686e24a1142f608
+AUX moc-2.6_alpha3-stdint_uint_types.patch 1179 BLAKE2B 73dcba135553cd9630cf44e42a4651785d6b9d1cacb554be166a7772c56fbfdc1b4165c6951c810e962a6b4dc24fe714eb739244490b9a975e79b1d67e82dec6 SHA512 642be986fb147aa81251ce9c3f86761ff9f24c61e84fd447e243da34b1e9058a94f27ef632144f01e3c989bc321346bdc543130fd090520fb3064668a8017110
 DIST moc-2.5.2.tar.bz2 602728 BLAKE2B 10b568404632f29ed5fd1d04ec424aa364a6e74c1a31d47cb9a3b377ccd04e2be53e57274e76daed29177368c944740fd26cc862fc498f950070f0b83b0acc7a SHA512 992d06809fb52e58dcee63704bde05795b99edbac46edd8381f314c564490013b18e1853926f419c2c3c7f1bb68ff35e97048de03ace3232b800cf4b3b7dbe0f
 DIST moc-2.6-alpha3.tar.xz 496676 BLAKE2B 3b4f31676c869a0cacd44cce1e4509304e3b00a15e578eb394510fbe0ddaf53f5c5628f2dccd60f4b3925f3e597d9fbc04bc2a8e090e2e05227b822f1aa05ef0 SHA512 e38e277e5e945827308f47a8f3614eb1e52c16271da372f50e7b6427a7dfc994e1c66761a9e46326bf483b91e9127efe7796a329c62e95524609edfb3a7603bf
 EBUILD moc-2.5.2-r1.ebuild 2109 BLAKE2B a24ab48ca76fe6a1d062bd2d7e875daad0b833e73687a6c328d21c89f4857fc270f0fb57f79e6554253b6d2ce2ce8ada2d8970f3a325840a5681f89276be9dd4 SHA512 d7b1a37f2a5b162c8637af93a5da4a39e7080904054eb7d6cc3433521a43447b2d670137af09b74d19fa98b8cd647f83045a21bdad5692f81adb898523d0a667
-EBUILD moc-2.6_alpha3-r2.ebuild 2248 BLAKE2B e74e11a9a71a95399bb7e4c802d14b3992a63a8a1c9a5386fe857fa2cc48b61c1851d41aae5c438cf7c65d8a54e2213c243953849220a61607b304580db50eba SHA512 bf4131162002fc37857ea0022f7304ef7d6f7bda45cd8ed96a1fd3d204ddbe0b1f4b3cb6a544a9661fe915d6144c07586812e9cc8926747c85148b97505b48b9
-EBUILD moc-2.6_alpha3-r3.ebuild 2309 BLAKE2B d64957278960b177987a702701a5519b30439da37c2b254f97b0fcbaa402159a5eb669d9bab35d4d2aa71dc636eba405905a4a40e9202e2a1e0d19058aa4dd43 SHA512 3299e36a66c407ea53df6d4e6a8cce0ee1493b4e07e585b9c6e0bdcdbfe49e4c2dd953b6d81e6faf0489346cb0a808e1ada04a3eeb07fcc325d8367da3812a74
+EBUILD moc-2.6_alpha3-r2.ebuild 2382 BLAKE2B 5f7d189eac7cc88ef6748280a92f5513ab54eb64b9a879eeab1d7090a7ae9fcf610cd642353c21bb9aa2579ef427c222de2c9e63b39d08fbb7b0d3b0730976e3 SHA512 d00283ef4d38560755eca2ea20d18fa4d0b903e8cf21f487f80023ac6849b51bc1a3a196db0cd0ce5bb7b2b60e97b446d8d3f4541455a5d78ac0427889ef34d9
+EBUILD moc-2.6_alpha3-r3.ebuild 2443 BLAKE2B a3f2e51c9d64a9d6f5e51413f6179142283a4b53b01affc1e64ae5d009bb68b7f5ed5da6ca5a508a5e19e7d4383bbfa4f88eeaaf37a05c315b28e3feca836d79 SHA512 34b9ee89705a0541b9bc5b894571091a4cce38b8df3bd6f9bbe92b8c8c873cb12123d083868451595009e7d794d2186858fd13043ab0cda9c6c90ec91564baec
 MISC metadata.xml 620 BLAKE2B f4b43ba546218153ab2e3c980ca4b09e4b82a35dc17755be3904beb7131f22f71b756edc913f0dce4285e779a1b4a75c474577c81095d341c50d45b03f407497 SHA512 fd676e1ee0aba80032597c106ae94a451e9e2762fffe0b7a33119d2701eea37ac400d25849bd668654bcf7ed8d12af91c0bcab4e6006d5cd3bf0f35af098baa2
--- a/media-sound/moc/files/moc-2.6_alpha3-stdint_uint_types.patch
+++ b/media-sound/moc/files/moc-2.6_alpha3-stdint_uint_types.patch
@ -0,0 +1,39 @@
+diff -ru a/configure.in b/configure.in
+--- a/configure.in	2016-11-16 02:29:53.000000000 +0200
+++ b/configure.in	2020-11-21 06:07:06.778092416 +0200
+@@ -152,9 +152,9 @@
+ 	CFLAGS="$save_CFLAGS"
+ 	LDFLAGS="$LDFLAGS $BDB_LDFLAGS"
+ 	EXTRA_LIBS="$EXTRA_LIBS $BDB_LIBS"
+-	AC_CHECK_TYPES([u_int], , , [[#include "${srcdir}/compiler.h"]
+	AC_CHECK_TYPES([u_int,u_int32_t], , , [[#include "${srcdir}/compiler.h"]
+ 	                             [#include <sys/types.h>]
+-	                             [#include <db.h>]])
+	                             [#include <stdint.h>]])
+ fi
+ 
+ AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss],
+diff -ru a/tags_cache.c b/tags_cache.c
+--- a/tags_cache.c	2016-11-16 02:29:53.000000000 +0200
+++ b/tags_cache.c	2020-11-21 06:02:55.043214842 +0200
+@@ -24,6 +24,7 @@
+ #include <time.h>
+ #include <unistd.h>
+ #include <dirent.h>
+#include <stdint.h>
+ 
+ #ifdef HAVE_DB_H
+ # ifndef HAVE_U_INT
+@@ -32,6 +33,12 @@
+ typedef unsigned int u_int;
+ typedef unsigned long int u_long;
+ # endif
+# ifndef HAVE_U_INT32_T
+typedef uint8_t u_int8_t;
+typedef uint16_t u_int16_t;
+typedef uint32_t u_int32_t;
+typedef uint64_t u_int64_t;
+# endif
+ #include <db.h>
+ #endif
+ 
--- a/media-sound/moc/moc-2.6_alpha3-r2.ebuild
+++ b/media-sound/moc/moc-2.6_alpha3-r2.ebuild
@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

+inherit autotools
+
 MY_P=${PN}-${PV/_/-}
 DESCRIPTION="Music On Console - ncurses interface for playing audio files"
 HOMEPAGE="https://moc.daper.net"
@ -57,7 +59,16 @@ DEPEND="${RDEPEND}
 "

 S=${WORKDIR}/${MY_P}
-PATCHES=( "${FILESDIR}/ffmpeg4.patch" )
+PATCHES=(
+	"${FILESDIR}/ffmpeg4.patch"
+	"${FILESDIR}/${P}-stdint_uint_types.patch"
+)
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}

 src_configure() {
 	local myconf=(
--- a/media-sound/moc/moc-2.6_alpha3-r3.ebuild
+++ b/media-sound/moc/moc-2.6_alpha3-r3.ebuild
@ -3,6 +3,8 @@

 EAPI=7

+inherit autotools
+
 MY_P=${PN}-${PV/_/-}
 DESCRIPTION="Music On Console - ncurses interface for playing audio files"
 HOMEPAGE="https://moc.daper.net"
@ -58,7 +60,16 @@ DEPEND="${RDEPEND}
 "

 S=${WORKDIR}/${MY_P}
-PATCHES=( "${FILESDIR}/ffmpeg4.patch" )
+PATCHES=(
+	"${FILESDIR}/ffmpeg4.patch"
+	"${FILESDIR}/${P}-stdint_uint_types.patch"
+)
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}

 src_configure() {
 	local myconf=(
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Tue, 23 Mar 2021 07:38:25 +0000
+Wed, 24 Mar 2021 03:08:26 +0000
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@ -2,22 +2,22 @@
 Hash: SHA512

 MANIFEST Manifest.files.gz 500540 BLAKE2B 7a48959b9c07be5fc6e9e98ffbda2d71400bbd137c089df45f7701ae5dd1ba444366d51af5a4656f0a37ca0bbed5e1b74627c57cf425e57c4516bb7194b7dc59 SHA512 e923ed887d7140a57ff660001f6646dac898bdcaefc8ab2effe01101b80e6b709f7e4d00bf72e6d181aa41f6d99fe7b4285de0597a1b60734104a3eee41ee946
-TIMESTAMP 2021-03-23T07:38:29Z
+TIMESTAMP 2021-03-24T03:08:29Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmBZmvVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmBarS1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBGZQ/8ClFalJ6kGKQiWYjom1gj4hWp2fYVFIfKLCF0kTjKCOSEauWvtAgGWXwR
-wFs60jJKwTwOwiCOpJGU8ifLzVtRQauCtIuBU/aDR4fkWhQZ8nGqnXUUjAiq6ek5
-d321tZAbrD/C3epTwHIR/sH6v4xJ9WHzefDfM4rsO9C9u3FBDgMZPDx3ft/Z9bRr
-sp5mlCvbtrC10ZkjD/TYEDiYgB6YxttQiwofU7KWIiugfFq9a+yNYYJqdK6WTeFd
-njYQFI/S77HdXVfh2qCTwiMbmYHmRIO5QW1InmSYFnXgDpKikD9AUyZ9C+Q+cSzm
-Y3/t1gcVH437+osmioP4NB99/0pShIgy/u4EqIoidyZVvHHrwXmd/LPOb1IIszkj
-chfnNP4/lDwUsaHK7m/6gGvNrhOlR53rUWLX00prdtA0mpPy7u1a5dgL7HbvLMrW
-1cOIEsB3o7nvUFAwz63o2B0uJA/yStmxETZvoi0ljTx2q2cDhIut4BQ0au1aDEhd
-WQJwP4U7NKlpwBleemY4e8tbjGuBBW/VRlGUdhc1/oA7Y9Jj22OGyUNg6HccNV4F
-pK03bWTCmI2BdDlv5nYes5fD8alHd8gneshFh9WF21FPnlgCDOveH0ktAHShT+YU
-h7wThIujVUQmnkmLBl+bG+MgIzs5MBDQPZOhEtRpoBQ0CCvKHzc=
-=zppQ
+klBwuhAAlOagMFPdIpxSOrMx4863p0oj4W0l+b94ELGsID55PdlmXBCvjMmx6bSO
+Jr1xJFX1AhXaXpsKwz5vG/A+xyqX/AExjEN/9zSdDeGiWdA/4x12Pg+8J+Wc8W5q
+J5wY354UIJB2toEq4JgXb1YFG4jn68bw7tT0WkEb1ilVuVX/RR4/jhFegUTRbdtt
+GBQyPn2aM/5IgUi5sHD8kOmJqaxdIqfKj42daS+8AbcUuLJflm53BMeWpjEvSx6i
+HwhDTPBO2RCAjWVrxt/DCyITBFA8pLsobxY/4vnJ2hsuvC8F+CODltZbMJWIMkF6
+3Gkpot5ofL56WWEXq9EPUAb3qRPCZgzKbxO+iN7eW6WytaUmjWPuBgdiZuVNZBWf
+kd9myHQFqaeaBiGzSyqMmqoXOvBvHAOlJE7Vlt0I4TqiAKgEVB1zfQjcCLkzTBxp
+ZO6c5T+yx81fPQ7KqEufvWdTdf3iLe0KhskTmnMHfEs8D7MQYVQYthT3cKkphMDM
+Tj/Q+M7jtNIEq+8DFuwmV6BmraPk7NgEcfbybZ3TL6PUAIYyuwUnVtfjMH3a8Zl2
+xRICpDHjvMsjdqhopi6ZeBkR2LPG08OpV3YcuIshwatsutYfInSuySS4B13ZZrqF
+NETQMG4x5Et4c8t6snpxe70cG4bWE8qABCze2TEm6pVxJTWScdQ=
+=C/W3
 -----END PGP SIGNATURE-----
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Tue, 23 Mar 2021 07:38:25 +0000
+Wed, 24 Mar 2021 03:08:26 +0000
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
--- a/metadata/md5-cache/app-arch/cpio-2.12-r1
+++ b/metadata/md5-cache/app-arch/cpio-2.12-r1
@ -1,11 +1,10 @@
-DEFINED_PHASES=configure prepare
+DEFINED_PHASES=configure
 DESCRIPTION=A file archival tool which can also read and write tar files
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.gnu.org/software/cpio/cpio.html
 IUSE=nls
 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
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/cpio/cpio-2.12.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6e09211e997333f23cb68c26c882bb3f
+_md5_=2421ab9d1e51c84c58e6ff75ea156343
--- a/metadata/md5-cache/app-arch/gzip-1.10
+++ b/metadata/md5-cache/app-arch/gzip-1.10
@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install
 DESCRIPTION=Standard GNU compressor
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gzip/
 IUSE=pic static
 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
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://gnu/gzip/gzip-1.10.tar.xz https://alpha.gnu.org/gnu/gzip/gzip-1.10.tar.xz mirror://gentoo/gzip-1.10.tar.xz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c7da563baaee20e583817223c70be5b8
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=0f6c755e4fde9515ca3903aa7ec4861e
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
--- a/metadata/md5-cache/app-editors/mg-20210314
+++ b/metadata/md5-cache/app-editors/mg-20210314
@ -4,10 +4,10 @@ DESCRIPTION=MicroGnuEmacs, a port from the BSDs
 EAPI=7
 HOMEPAGE=https://homepage.boetes.org/software/mg/
 IUSE=livecd
-KEYWORDS=~alpha amd64 arm ~hppa ppc ~ppc64 sparc x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=public-domain
 RDEPEND=sys-libs/ncurses:0 !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )
 SLOT=0
-SRC_URI=https://github.com/hboetes/mg/archive/20200215.tar.gz -> mg-20200215.tar.gz
+SRC_URI=https://github.com/hboetes/mg/archive/20210314.tar.gz -> mg-20210314.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=c49c507798c83757bc7f583aa98f4d74
+_md5_=85f695f18615013315515647d71ec97d
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
--- a/metadata/md5-cache/app-emulation/docker-compose-1.28.6
+++ b/metadata/md5-cache/app-emulation/docker-compose-1.28.6
@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cached-property-1.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/distro-1.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/docker-py-4.4.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/dockerpty-0.4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/docopt-0.6.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-dotenv-0.13.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-2.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/paramiko[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PySocks-1.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyyaml-3.10[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.20.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/texttable-0.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/websocket-client-0.32.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/pytest-5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/ddt-1.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DESCRIPTION=Multi-container orchestration for Docker
+EAPI=7
+HOMEPAGE=https://github.com/docker/compose
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cached-property-1.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/distro-1.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/docker-py-4.4.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/dockerpty-0.4.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/docopt-0.6.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-dotenv-0.13.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsonschema-2.5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/paramiko[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/PySocks-1.6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyyaml-3.10[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.20.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/texttable-0.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/websocket-client-0.32.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/docker/compose/archive/1.28.6.tar.gz -> docker-compose-1.28.6.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=e133be6244b0f7223ef6605cef25cc15
--- a/metadata/md5-cache/app-emulation/wine-staging-6.4
+++ b/metadata/md5-cache/app-emulation/wine-staging-6.4
@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=6.4
 SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.4.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v6.4.tar.gz -> wine-staging-6.4.tar.gz )
 _eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=da0f76eacd40a84b09e70c54bdb92992
+_md5_=f66947389c3b99a1560abbb19f6edd6c
--- a/metadata/md5-cache/app-emulation/wine-staging-9999
+++ b/metadata/md5-cache/app-emulation/wine-staging-9999
@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
 _eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8ac201799ce2322faf69aa00efd397fd
+_md5_=f66947389c3b99a1560abbb19f6edd6c
--- a/metadata/md5-cache/app-emulation/wine-vanilla-6.4
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-6.4
@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=6.4
 SRC_URI=https://dl.winehq.org/wine/source/6.x/wine-6.4.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
 _eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=75cf20f69a0ace4c399c5579f8852d51
+_md5_=b96780771ce943fc1c3863a10d51bd07
--- a/metadata/md5-cache/app-emulation/wine-vanilla-9999
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-9999
@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=9999
 SRC_URI=https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20200523.tar.xz
 _eclasses_=autotools	4ba6c345bf49883c84d5fa5c9bf40c0b	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eec9b9ca70076ec507d7449037d001d0
+_md5_=b96780771ce943fc1c3863a10d51bd07
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
--- a/metadata/md5-cache/app-misc/binwalk-2.3.0
+++ b/metadata/md5-cache/app-misc/binwalk-2.3.0
@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A tool for identifying files embedded inside firmware images
+EAPI=7
+HOMEPAGE=https://github.com/ReFirmLabs/binwalk
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ReFirmLabs/binwalk/archive/v2.3.0.tar.gz -> binwalk-2.3.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a5d12e9960da7be74c41418a6d18e511
--- a/metadata/md5-cache/app-misc/binwalk-9999
+++ b/metadata/md5-cache/app-misc/binwalk-9999
@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/nose[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=test? ( >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
 DESCRIPTION=A tool for identifying files embedded inside firmware images
 EAPI=7
@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	git-r3	3e7ec3d6619213460c85e2aa48398441	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d63f6afe98b49ed682577bc29e2ac8ec
+_md5_=a5d12e9960da7be74c41418a6d18e511
--- a/Show More
+++ b/Show More