Sync with portage [Thu May 7 11:24:18 MSK 2020].

Manifest

@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29437 BLAKE2B f9cda81a53d7740d661a4046b57f8c15e2ecbf0d17938fc7854ed519248ae14b1b64e2dd094139ccf2c2d387cf68ec887f34cda9ce9870e097489afff495cee8 SHA512 0e084c6fe714266b9ac83d5d912b05fb0dd2f760ed8f93cff4d4ba66e63000f97ec6fb98f15f8b1bc5b9d45f3b836b33c143f0927af24dca615cfe4016aa0ed0
+MANIFEST Manifest.files.gz 29444 BLAKE2B 3c75363e8a9e44c4c8602ed11b3c24b7041968a6035155f07dc9627675f9dc53714a1b87ed22d882914e5efb5ce5cb7b132412bd26aadb4eec947cc4830792e2 SHA512 b5a6e865c66cb059fee3e25c343e352bd0f701fd6d094af6ecfbde2f53aec4e04e2c5e53534a63bd7a4ff39b6235e8e0e60e686b434cba8d4eff71038e7be55b
-TIMESTAMP 2020-05-06T19:08:56Z
+TIMESTAMP 2020-05-07T07:38:57Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl6zC0hfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl6zuxFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAotw//VAVQw8Q8fgjY0sP35g/hAWzDWNZh3gGby1rggyBzKKtrDH1tY5FU9xen
+klAMlg//eCmAiqiqFJdpPd/y+pvl0Nga6s6x9lSeBT0lK70dsxjUKXY9pqVM2NXU
-fEaasn7AugTtMZqJS8Te89DhHx2ZKm1/5laV7nGR300YcZAb7qHfZL5hcIId+JJ1
+2oqFzEJc8mMmI1C/FvCXdLwxqhJs/3ptVaDRLWxwPH9ydVY4oCmgvZWp+GwHt3A4
-SH8KW2ytOEaqidKzDN8uPLttYro1zgXvtg/7Vs8P8TJ+ue4//g+XU6m8irSc4A9D
+3LAL6fDXg0I2fHk+fuB/HG2NI4rH5MhyvZfGHZ7xrelzadQDrPj/xVcK5r/XMhsV
-dkNLpb85hc21ERZGU4MuMf0WsnA+fd+CJ8NIaC/wC3I1JEXE1NRtJS+PQH5fit8h
+hjYR8SGySwNI3wmXswSpo3D8t/i6fzArI6cQ5Gj3/wt5aIDvFXDzeF15HQmGJaIJ
-rakdd6Fw0T4+PMNMLzWDVS9+Q/Ez3V8P/9TEMm5e4VVwBCijNR0tihA2of1mHPib
+TeaIitYRzeFtyzmJjQFs5+uykQQqTDex26KOuZ7SaF7KJevVbAdy7G3yS/n+tQ5s
-v2Dg4F+AD+7tMqiL7fNfHAEBbZptB1auF41p1SMb9SM5xjbYZWwTUoRKqkqLwW5D
+l0s4Uhs7XFkWJOtO2lVVmySP4ZEcfBPaPpDtYCbVzz2wB+f96kFSSDSGt79bNbPS
-rd7qhQGx2ylWNtytqJlL9q8NJaj1vhjwJgcbLjiskRAmvtTzu7HW8RugEdPyfmSa
+AGQAZXjTaRxrQh4W0p2bbIrYtSUmo6oh5vrK/I4lUoiwoGNa0WTUK98JKFUqh5GW
-AqfvM9IvXga9dD0jxAB4poNTmdE/SteB3f1S5R3YF5AJ58dvjq2H5AtFFTa51XJT
+9sqg4YFvgga2EsFAr/MUf4ORU7JzVc3/+MYlhiBy6YulTkgk2zEdE9jAjta9nnTF
-idOFMNUyE+EMZaOpDKY7WQw8icJD3JO69U2Z2hDuG/lN3yZEPBNg7TpRHVmkQqbH
+KbOva7dbyiXlNThwElpKrWoQLgdftrn1pB7l0V8RQa8Fz25u5wPIAi8eEFtDh4fM
-kSYxt3JrmN+uU47iwgGveDju2fcJ+gr0/HSFmEbKim+KhW4jwGLqVP0c27Hi+wAw
+AeSeX0KnyoWHk13J8zsu4VLNLCcxAt7Jzdc9di+agF92EFln2DIGN2wh97hGDAFl
-iiElZblrPOEUrIndz89PfmT5ZicSHF4zJB4Vy2JGxL9lGuyWMWA=
+fVFZN944z4a95DVgY0TwfCEGmesBroSpI3ynsTviqj4a6+ZFmXo=
-=pJl5
+=c2Uo
 -----END PGP SIGNATURE-----

acct-group/simplevirt/Manifest

@@ -0,0 +1,2 @@
+EBUILD simplevirt-0.ebuild 146 BLAKE2B e3ed3ba0e82a7ffa91dcf7888de167ac11d918b0c5880ebcb38d97b7af7d8ff49371829135f02533b9ce44eea39b76366c8b642df18c1b3d81e03c44ed845283 SHA512 0710eb59efb4a20520af0ad291bb466a0abbffeb28c14335c338c2619bd3002664ac1d40eb6ac18c69e6d657a9d1621e496319f88a96ee8873d498125d33b7ba
+MISC metadata.xml 257 BLAKE2B c4675d1acb1e5dd4987811e68c4e4b23d7476dc5d5a1c90aea425f43e9f92261fea544c0fe3bb2907b43a47db5a340abce8b8b0e9b777e79a9811a7d5d96dc9f SHA512 7c68096d12fdee234074ad1256cb5075513b3a00795138a18a70003d8498c9418664d4f62772647e090796ea6b9bda9aeeac1e74c271773efa42568aeefde301

acct-group/simplevirt/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rafaelmartins@gentoo.org</email>
+		<name>Rafael G. Martins</name>
+	</maintainer>
+</pkgmetadata>

acct-group/simplevirt/simplevirt-0.ebuild

@@ -0,0 +1,8 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=404

acct-group/tsm/Manifest

@@ -0,0 +1,2 @@
+EBUILD tsm-0.ebuild 151 BLAKE2B e6457ed32c91ddc0ea5ac8412c2885ccfd1e74b63558e0c511716a68dc007c18f6cfe2d2d8c77c697fb43294dc43af2524909fc09e973d875e42f4a0b9c018df SHA512 88e4eb80cbccee365f80a008311a9451983f0d1cb3fc2dab1072ee73b4a67f840025f3319cb51f7dac8a90db0fdfff638ac6b5ec62db02311b89476918f37090
+MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2

acct-group/tsm/metadata.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>dilfridge@gentoo.org</email>
+    <name>Andreas K. Huettel</name>
+  </maintainer>
+</pkgmetadata>

acct-group/tsm/tsm-0.ebuild

@@ -0,0 +1,8 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=465

app-backup/tsm/Manifest

@@ -6,6 +6,6 @@ AUX dsmcad.service 224 BLAKE2B cb84b8616daa3649b8b29c58aa91fffbb119dfd1e84810ed6
 AUX tsm.logrotate 60 BLAKE2B bb367d3da53f8061d71e3753ab8c46595d5cf91485da920f032473a99d3241d22fdbe576cc99088c99e97c63d3f2af920d4602878830fb815a58dc8321d37a2a SHA512 2f412c61a21dbb2c69b2c12130ae12844787d998098de269da2b8a284c2ed86f7244c2854d7050f2a521b3fbe7239f1ec4339f3b434c67b9cd57980fe5de5a92
 DIST 7.1.8.0-TIV-TSMBAC-LinuxX86.tar 221849600 BLAKE2B a57d15885c802925e92afca45bfd25c1aa56c33329f03d3de89f00dd139239da3b835ef514dd8d881e76e04e84656d3d630b8e8e44fe8ef331c3f2c5d6acf816 SHA512 68dce2463554b7bd6100d5bf6a617316a04898b747fcaec182c9c4870c34bceb16eea47d073c587c7184945a3cef0f6c98d9a59364589a4745fd1fdc195e3af9
 DIST 8.1.6.0-TIV-TSMBAC-LinuxX86.tar 215961600 BLAKE2B de7e3083a87e72763ffee5adbabc20f546edbc771a9ea0017af591b677cb55832c366ec42da6258ccbb81368f7934acfd116eee77236737d8015cc7588d95d3e SHA512 82897f8af6e1408b25eb95206500fa2e05f17983843de3a3456d71ee3cc25188e31a0a2b11c7ee5cf02c3a6aa46fbba03e2a31e697868905739e97c75bfd5984
-EBUILD tsm-7.1.8.0.ebuild 7414 BLAKE2B a4c7bb803de17e972bb470d6fcf1c53e22eeb895b5a9a9cf5e759f11fb19a2349e1b81b191276eebe852eff695c8e21dee5f1b9d8f22d6ea8cb606ffe066d3b0 SHA512 d7cc0f7fd95822302dd76daec518eb2d68842777fcfee6d62b5870e8a5597da5633b84a8cb9f6a4dd3850d955c95f986b30485e4c9a17f89e90a9369bb1953d9
+EBUILD tsm-7.1.8.0-r1.ebuild 7363 BLAKE2B 250828bb462c55293b3ec977b07d573bf92820231cdf7b52e6d4d3d090eeb943705597ee2865d96588a2740dfb25c6681ba7a311bcefa215089077106b718f83 SHA512 ebca5a44443ee1d1655364f53194dc9c745b0f9b99c2ac27b0f9ef6f2685d08c150a641cb0c3252f251b1abd3ad7c76c567d4ff9d5540c83dcef386ca75cf8ec
-EBUILD tsm-8.1.6.0.ebuild 7415 BLAKE2B beaed12de8c8a45d48bf900bdbd056001f874f3e1d549367f362fa37bf23a964d8b985c8f72af3046014de8e2b689df336c1a84175119a80ebf1674c5ccdc804 SHA512 3d07ea73af8d11d45dfc4191c474011ec618034ab6e578c65ec7fd78518b7afb12034252748d3621d5970f36c19eb2049584d92aab88bc68370ae6ef3f1dded4
+EBUILD tsm-8.1.6.0.ebuild 7428 BLAKE2B d9308e428ecee65a55bdbb473f37eefbf9f1e08e211f08e308534c951a83c5ba18cb75adb7026bcb7c8242bf46046569f7dc97753e9b0e55bc477e3376494753 SHA512 73500c52e5f8939c2821bbdce16e97ccddaef5ed6502e192be348d7203c98ae1eb2f92aed7a95a6f0b15538fcf28c903ca2d0d2bb209474ec39df0020024ee61
 MISC metadata.xml 398 BLAKE2B fb4d250c3bf724349ac31d66b1c43e766d4ba9b001e88b47949c6fe188a629eb1b87321ef3391d2886e9b74daf235cff0139079fd6f72b7342119542438e30e6 SHA512 bd6ec11787dd6f2ff1a59e7e1027a01b80b22256530d35d6a2fb5b3398ee641b9c778f6a8c2555b7098a199bbb1eda1a5204be53509e5eb47399dbad83798547

app-backup/tsm/tsm-7.1.8.0-r1.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit versionator multilib eutils readme.gentoo-r1 rpm systemd user pax-utils
+inherit versionator multilib eutils readme.gentoo-r1 rpm systemd pax-utils
 
 DESCRIPTION="IBM Spectrum Protect (former Tivoli Storage Manager) Backup/Archive Client, API"
 HOMEPAGE="https://www.ibm.com/us-en/marketplace/data-protection-and-recovery"
@@ -50,8 +50,11 @@ ${MY_LANG_PV}TIVsm-msg.${lang#*:}.x86_64.rpm )"
 done
 unset lang
 
-DEPEND=""
+DEPEND="
+	acct-group/tsm
+"
 RDEPEND="
+	acct-group/tsm
 	dev-libs/expat
 	dev-libs/libxml2
 	sys-fs/fuse:0
@@ -62,7 +65,6 @@ RDEPEND="
 S="${WORKDIR}/bacli"
 
 pkg_setup() {
-	enewgroup tsm
 	DOC_CONTENTS="
 		Note that you have to be root to be able to use the Tivoli Storage Manager
 		client. The dsmtca trusted agent binary does not exist anymore.
@@ -193,7 +195,6 @@ src_install() {
 	echo 'DSM_CONFIG="/etc/tivoli/dsm.opt"' >> ${ENV_FILE}
 	echo 'DSM_DIR="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
 	echo 'DSM_LOG="/var/log/tsm"' >> ${ENV_FILE}
-	echo 'ROOTPATH="/opt/tivoli/tsm/client/ba/bin"' >> ${ENV_FILE}
 
 	echo 'SEARCH_DIRS_MASK="/opt/tivoli/tsm/client/ba/bin"' > "${T}/80${PN}" || die
 	insinto "/etc/revdep-rebuild"

app-backup/tsm/tsm-8.1.6.0.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit versionator multilib eutils readme.gentoo-r1 rpm systemd user pax-utils
+inherit versionator multilib eutils readme.gentoo-r1 rpm systemd pax-utils
 
 DESCRIPTION="IBM Spectrum Protect (former Tivoli Storage Manager) Backup/Archive Client, API"
 HOMEPAGE="https://www.ibm.com/us-en/marketplace/data-protection-and-recovery"
@@ -50,8 +50,11 @@ ${MY_LANG_PV}TIVsm-msg.${lang#*:}.x86_64.rpm )"
 done
 unset lang
 
-DEPEND=""
+DEPEND="
+	acct-group/tsm
+"
 RDEPEND="
+	acct-group/tsm
 	dev-libs/expat
 	dev-libs/libxml2
 	sys-fs/fuse:0
@@ -62,7 +65,6 @@ RDEPEND="
 S="${WORKDIR}/bacli"
 
 pkg_setup() {
-	enewgroup tsm
 	DOC_CONTENTS="
 		Note that you have to be root to be able to use the Tivoli Storage Manager
 		client. The dsmtca trusted agent binary does not exist anymore.

app-crypt/acme/Manifest

@@ -1,4 +1,6 @@
 DIST certbot-1.3.0.tar.gz 1362945 BLAKE2B bb36a7737275332f018d7f2283286e07e041892cc366f79e68df9eee7e57ca2186d36895d1923b032068a365878d09e49e17c1399a7418dbd8607c9a7efc1c26 SHA512 4205cdd1f3ddf500b9b952744db234636c086a856df80acd2d776305f4501eed07995e453e5c9b2c711fb0d1f1987d2bb8baaa13fccce8e000a38f486cfdc5d3
+DIST certbot-1.4.0.tar.gz 1381435 BLAKE2B 57d70a12ee38e1ba96f4c8c594c1940403e33d4cdf5111472a9c0c7d41061b2201792c38d9bb4ec516358f5592d2f689eeab31e1e686a534418b20eba2df4b4b SHA512 8926f724c47c0249e2e420cd8944f0b106682efaa2d9b211491ea4524fe4e64bb3ff4f21fd756996049d781a68294ab8307bd077b6d96fa00e09cbbdf4e59261
 EBUILD acme-1.3.0-r1.ebuild 1770 BLAKE2B dd2b344dc9157631cadafaec85f9bf220444917e71be0166a513d2eb0ac9d863aa3369f2c61c11bf4b9fb9054a1a0e59b28fe6b92aa0c686133fb4b8cbcefc71 SHA512 caba8e15d9e396d9707cf868cc1ec76be17b462d5be08508df8f02ef16c093b55ae770e8f68e97a0d19cd030a8ac087c3e980829eccb8458f5e1bf770a86d947
-EBUILD acme-9999.ebuild 1772 BLAKE2B fd15cbcf90416ad182432bbee91d262fbcc5b3b3304fe226b61a6ff368c9ecdeea8d554a2b57ccf3d280da9cb0d8bcd4a32de5c8fe5b2b53a890db6084bc7544 SHA512 e905702e2cf1f89e453876a828d377c2c50cb5f157b7fe538501a24ade7306bcf9be160b8bd748156d6769a15c21d363a02be0c90517a0d89c7082c7fefc1e42
+EBUILD acme-1.4.0.ebuild 1737 BLAKE2B 06af2a535bda2baf9baa807647ede63d0189d66e0bedf02e5ec1fe4d33f4b804a4c620163bee5247ae9558d886f918bea761aeb361636a18138c4f91dee9cb54 SHA512 a8f6f502cc67c3bf355e064718293d31fbb993563a12cf87c2dafe41f724e60e6e93a4bdc3ac048a4fc7c2b5fe7be169510b0a779937e26347052ab83fee92eb
+EBUILD acme-9999.ebuild 1737 BLAKE2B 06af2a535bda2baf9baa807647ede63d0189d66e0bedf02e5ec1fe4d33f4b804a4c620163bee5247ae9558d886f918bea761aeb361636a18138c4f91dee9cb54 SHA512 a8f6f502cc67c3bf355e064718293d31fbb993563a12cf87c2dafe41f724e60e6e93a4bdc3ac048a4fc7c2b5fe7be169510b0a779937e26347052ab83fee92eb
 MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1

app-crypt/acme/acme-1.4.0.ebuild

@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13.1[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
+"
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+	distutils-r1_src_compile
+	if use doc ; then
+		cd docs || die
+		sphinx-build -b html -d _build/doctrees   . _build/html
+	fi
+}
+
+python_test() {
+	nosetests -w ${PN} || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}

app-crypt/acme/acme-9999.ebuild

@@ -28,7 +28,6 @@ RDEPEND="
 	>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
 	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-0.13.1[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]

app-crypt/certbot-apache/Manifest

@@ -1,4 +1,6 @@
 DIST certbot-1.3.0.tar.gz 1362945 BLAKE2B bb36a7737275332f018d7f2283286e07e041892cc366f79e68df9eee7e57ca2186d36895d1923b032068a365878d09e49e17c1399a7418dbd8607c9a7efc1c26 SHA512 4205cdd1f3ddf500b9b952744db234636c086a856df80acd2d776305f4501eed07995e453e5c9b2c711fb0d1f1987d2bb8baaa13fccce8e000a38f486cfdc5d3
+DIST certbot-1.4.0.tar.gz 1381435 BLAKE2B 57d70a12ee38e1ba96f4c8c594c1940403e33d4cdf5111472a9c0c7d41061b2201792c38d9bb4ec516358f5592d2f689eeab31e1e686a534418b20eba2df4b4b SHA512 8926f724c47c0249e2e420cd8944f0b106682efaa2d9b211491ea4524fe4e64bb3ff4f21fd756996049d781a68294ab8307bd077b6d96fa00e09cbbdf4e59261
 EBUILD certbot-apache-1.3.0-r1.ebuild 1103 BLAKE2B b5e48f218836b1d6ed67a7c752fba68f938cfda74e86472eaf7e518857948d091a80d8516e3459fd550252c5366082a2cf0246550145ca27cb680c303bc76815 SHA512 3a139f0e9430e2bf0fb6bb5efc4bdd055bb12a66a48f5ab19a2d540267922317cba30a84dd12d90d34b26ccecf79066fda61df0330266f7a7c1f8f1352407e2d
-EBUILD certbot-apache-9999.ebuild 1105 BLAKE2B 80bb99718096bc436534a7baefd6253e99b331e8313d59176a8c316b1c90fc9b7fa78128ca16f6dbff29830a25c13caafb4ae24f1da669821b6c9e549d1877bb SHA512 4ed9707a48eb0bf8350e00f73de4504a5e1d0dd9cfa29874f46a37d8f09d645fc0c6d9f0aaa8f7486fc748734ded2ecd04b44ad209681e55c57b8f48ed683bc8
+EBUILD certbot-apache-1.4.0.ebuild 1070 BLAKE2B d6b3ef4ff80e04cb94d44726c2a63aaf78171e9ab990f137f69ecb521ed70708c6a840071d32e62a590c43021bdcb48d1d2027c1a3bb64cc1030be5ef78f1224 SHA512 3c4cf9cf312c78e845b1bcb710f0bbb20a2ce135c140ff32cd707b995b95a1c655ea6d5b064319d65268f88061a614e849f09c8d2b544f3084da97d688702d49
+EBUILD certbot-apache-9999.ebuild 1070 BLAKE2B d6b3ef4ff80e04cb94d44726c2a63aaf78171e9ab990f137f69ecb521ed70708c6a840071d32e62a590c43021bdcb48d1d2027c1a3bb64cc1030be5ef78f1224 SHA512 3c4cf9cf312c78e845b1bcb710f0bbb20a2ce135c140ff32cd707b995b95a1c655ea6d5b064319d65268f88061a614e849f09c8d2b544f3084da97d688702d49
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f

app-crypt/certbot-apache/certbot-apache-1.4.0.ebuild

@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,3_7})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-1.1.0[${PYTHON_USEDEP}]
+	dev-python/python-augeas[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND}
+	dev-python/pytest[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test || die
+}

app-crypt/certbot-apache/certbot-apache-9999.ebuild

@@ -26,7 +26,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
 	>=app-crypt/certbot-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/python-augeas[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"

app-crypt/certbot-nginx/Manifest

@@ -1,4 +1,6 @@
 DIST certbot-1.3.0.tar.gz 1362945 BLAKE2B bb36a7737275332f018d7f2283286e07e041892cc366f79e68df9eee7e57ca2186d36895d1923b032068a365878d09e49e17c1399a7418dbd8607c9a7efc1c26 SHA512 4205cdd1f3ddf500b9b952744db234636c086a856df80acd2d776305f4501eed07995e453e5c9b2c711fb0d1f1987d2bb8baaa13fccce8e000a38f486cfdc5d3
+DIST certbot-1.4.0.tar.gz 1381435 BLAKE2B 57d70a12ee38e1ba96f4c8c594c1940403e33d4cdf5111472a9c0c7d41061b2201792c38d9bb4ec516358f5592d2f689eeab31e1e686a534418b20eba2df4b4b SHA512 8926f724c47c0249e2e420cd8944f0b106682efaa2d9b211491ea4524fe4e64bb3ff4f21fd756996049d781a68294ab8307bd077b6d96fa00e09cbbdf4e59261
 EBUILD certbot-nginx-1.3.0.ebuild 1002 BLAKE2B ce0f437e0c35c4384932b65f1f9bc68a7bb1f10b601941dddd87350d9c8745014cd1cfeb8253c8262fa07fede07a10cb42bb6584363c6a510e023b5cf40253ec SHA512 84cf0ce1e323a9f20a70f147d67465662fdc799df553dd9e74ddb35b8da4d8bf3b3d6179f23964d3145fc8d44804321352b779424b5f15c6e19626129f6a2f97
-EBUILD certbot-nginx-9999.ebuild 1004 BLAKE2B d9c6cdfb14346b94daab36f639191aeb826d1e550ac22c972d6f7203690a565274992111172c5672f2d695030920e762bca222f7fea1ccfc415a3b8e5c7951a2 SHA512 b728d99c7675bb42c1af6dcd3c88cbca72f7e3a3e4651e916437ec7aaac5fa43b675b47560a04b879c2f454c1e8f11bd2dd436eba1fe6761399c44c9068a0116
+EBUILD certbot-nginx-1.4.0.ebuild 969 BLAKE2B d6b7572af8756020330110055c1e3e4c28b54bb4f3adaedd71b565425b3d7d0950ca233f9a7c0040c7f6f8887c99227e661bebf2d97d054c687b28212e955703 SHA512 8ec6ed2c69c2f16ede2112f43d9b157b3b981e5c2177d21a4bf6a750f22cdec798e62eededf3ae0e0b6859f25e408531b3782ee2271a18188be48b49cdba8b6f
+EBUILD certbot-nginx-9999.ebuild 969 BLAKE2B d6b7572af8756020330110055c1e3e4c28b54bb4f3adaedd71b565425b3d7d0950ca233f9a7c0040c7f6f8887c99227e661bebf2d97d054c687b28212e955703 SHA512 8ec6ed2c69c2f16ede2112f43d9b157b3b981e5c2177d21a4bf6a750f22cdec798e62eededf3ae0e0b6859f25e408531b3782ee2271a18188be48b49cdba8b6f
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f

app-crypt/certbot-nginx/certbot-nginx-1.4.0.ebuild

@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,3_7})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-1.4.0[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"

app-crypt/certbot-nginx/certbot-nginx-9999.ebuild

@@ -25,9 +25,8 @@ IUSE=""
 
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
-	>=app-crypt/acme-1.0.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.1.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-1.4.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"

app-crypt/certbot/Manifest

@@ -1,4 +1,6 @@
 DIST certbot-1.3.0.tar.gz 1362945 BLAKE2B bb36a7737275332f018d7f2283286e07e041892cc366f79e68df9eee7e57ca2186d36895d1923b032068a365878d09e49e17c1399a7418dbd8607c9a7efc1c26 SHA512 4205cdd1f3ddf500b9b952744db234636c086a856df80acd2d776305f4501eed07995e453e5c9b2c711fb0d1f1987d2bb8baaa13fccce8e000a38f486cfdc5d3
+DIST certbot-1.4.0.tar.gz 1381435 BLAKE2B 57d70a12ee38e1ba96f4c8c594c1940403e33d4cdf5111472a9c0c7d41061b2201792c38d9bb4ec516358f5592d2f689eeab31e1e686a534418b20eba2df4b4b SHA512 8926f724c47c0249e2e420cd8944f0b106682efaa2d9b211491ea4524fe4e64bb3ff4f21fd756996049d781a68294ab8307bd077b6d96fa00e09cbbdf4e59261
 EBUILD certbot-1.3.0.ebuild 1482 BLAKE2B c937a391b768757ed01f31fa96596da3cad08ea7394af1b5f5a9a828ef97a4a948b9315a3fc499742eb95dd3370f2d303b52886dcc6df75d2d502801a18aa62d SHA512 e7081e69f95c7d2aec45938ca6cc7e3da6dc00d038cb3d9167e1e33102b84d06e6a7a3ff13c5734c933c0b062d1e07203d6002a3a3f1609c14874679d2b3d077
-EBUILD certbot-9999.ebuild 1484 BLAKE2B ec9e79981e59a16061161afacfbb68e889bbcc2f39874914af18f9442c762fa617c05132779b84ae8df5fc96680a3b96b7773cf7e82e6ced118d5a21c7c6eba6 SHA512 df7ebbc90d3f07e67507936ceff7f346dba3a8f91f6fa7a94bcf69fbff2c817f85df0da336c5bacc97643b32cdbde781fa0e66ac29df8ca14c4cf71856c23f24
+EBUILD certbot-1.4.0.ebuild 1449 BLAKE2B 33697537a8dfe539c1aee02b90745fd8da1150c94c9d842f17e3703c79f24fb5ba8b54a95a3f450d340abdc0240663e0b338c86a5a0b4e1506a591bc2a5e5a99 SHA512 a725b74a30ba0b7afd8ec12a02cdbbbb2f69054f588fc8f6da3ba47fdba481ba5b39b70f5609e1e874397d5e53319deb2a5589a2044079d009034fbdec0c3fe7
+EBUILD certbot-9999.ebuild 1449 BLAKE2B 33697537a8dfe539c1aee02b90745fd8da1150c94c9d842f17e3703c79f24fb5ba8b54a95a3f450d340abdc0240663e0b338c86a5a0b4e1506a591bc2a5e5a99 SHA512 a725b74a30ba0b7afd8ec12a02cdbbbb2f69054f588fc8f6da3ba47fdba481ba5b39b70f5609e1e874397d5e53319deb2a5589a2044079d009034fbdec0c3fe7
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70

app-crypt/certbot/certbot-1.4.0.ebuild

@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+S=${WORKDIR}/${P}/${PN}
+
+inherit distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	${CDEPEND}
+	>=app-crypt/acme-0.40.0[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# required as deps of deps can trigger this too...
+	echo '    ignore:.*collections\.abc:DeprecationWarning' >> ../pytest.ini
+	distutils-r1_python_prepare_all
+}

app-crypt/certbot/certbot-9999.ebuild

@@ -32,7 +32,6 @@ RDEPEND="
 	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
 	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
 	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
 	>=dev-python/parsedatetime-1.3[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]

app-emulation/simplevirt/Manifest

@@ -6,5 +6,5 @@ DIST github.com-inconshreveable-mousetrap-v1.0.0.tar.gz 2290 BLAKE2B bd46103e50d
 DIST github.com-spf13-cobra-v0.0.3.tar.gz 101526 BLAKE2B 8613eccdd5bbd31429b7aa8260ee9367e34a5cc78075b394b09db91a97445ed1dadfb53a86105b55cb6ea3b4c2f9d50553e9198d64dfb6033dd1db2805984a2c SHA512 c38db9432a168f913b41a1e1b11d84bedfade82ff70791be9d343a6cc86b8a05b18bae344d67ebd8bae4c98662db7ac664a9dc86fa9b9ad4aa5c96cbf0178efb
 DIST github.com-spf13-pflag-v1.0.2.tar.gz 44042 BLAKE2B 157fa6c2b1efa594abebd76ff03121050187974d62475b1aa66af325a2198ea64105655597703c37f25e22c4a07864d9fc31a6a29ba9233fdeefcceef400d5e5 SHA512 fd3cefd683329316eda4ec660193a970e38435515c16805190235e2c969c8d65a6f602fdc7c2f7cf3d9740c5a321ee5be5e8034bd6cd7c05c12722cf64d1e8ae
 DIST simplevirt-0.0_p20181012.tar.gz 14652 BLAKE2B a6a648ed159d0648f27174c6598c9ae85e41530b218ef0360962884d1f61cfd16d2534ef4d2a01eb87138d0390fc7fe25e070c602f296344b8285c9dd2804287 SHA512 64c0edfc22ed0347c7335b942b06b6b9fd8c3f2ea7d374bf14b96b98b23248d15b6f38d7d1d809c8cd60b605f1809dfca8ff5c249e2df183c8b1636c26440ca8
-EBUILD simplevirt-0.0_p20181012.ebuild 2132 BLAKE2B f6ae27c4dd6b7f60a3008b04e30fba04659478c4874768bf5b1116d52890141838a0bfccf424eeb7b9126f23736f5040c28f6af81c7d7a50a5cb586c1dfe8afb SHA512 e34ec31a73639d8f622b290dc58ac5beb44f1338f99b2a4809473f293138f3f341e7f1dd6e54db06b7907f261310d3e07654e3a56b380f580a91038fd2b6710e
+EBUILD simplevirt-0.0_p20181012-r1.ebuild 2088 BLAKE2B 7ee65bf2f0ae236e901d2abd66d6ff46963023dfb20017ca78f67c91843d298da83b0540136259f10db2d8a3b05f5238ebccbc2ef837f583fabab0ab0d53be72 SHA512 e10663b3b9c9574cb7d847d17c45d02d1111ff379f1fa812c934e40b64b48276abe631171b47b0881c4c3d936c24b7433d1e48c288663270f8d806f92e82897f
-MISC metadata.xml 576 BLAKE2B d62570b65053dc9cb9c264b5fdc90aec72d429b6a166e0c4298e4d27105b127094b1a5ad2f96fe8ba6d23118d82faa3aada90643a5165e3874f2f425dc7d37f1 SHA512 91031a71f21466b4782efe38f645169a585dcc29346c4a6e98b129549b8ccb197cb00f03ce3d9d51306284bc24494afcf117efb003c33855f262177daf077987
+MISC metadata.xml 473 BLAKE2B 742768d0f49f8d15b12a4c4d14d5cad41899adf34beedaff9c51ab785bc09b5278de0325a3ab0803de7ec17d9df4e1ed03f3135895d6def353ab2957aef5571c SHA512 5f02732aba8e98b5b94d91d54d96d15bcbdee31c531ea6d9d9fb9377edd8a8577a5691582562735d55fa562f09391f0625344d2377dadf9bf048c4e0a8aca14b

app-emulation/simplevirt/metadata.xml

@@ -5,9 +5,6 @@
 		<email>rafaelmartins@gentoo.org</email>
 		<name>Rafael G. Martins</name>
 	</maintainer>
-	<longdescription lang="en">
-		Simple virtual machine manager for Linux (QEMU/KVM)
-	</longdescription>
 	<upstream>
 		<maintainer status="active">
 			<email>rafael@rafaelmartins.eng.br</email>

app-emulation/simplevirt/simplevirt-0.0_p20181012-r1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ EGO_VENDOR=(
 	"gopkg.in/yaml.v2 v2.2.1 github.com/go-yaml/yaml"
 )
 
-inherit linux-info golang-vcs-snapshot user
+inherit linux-info golang-vcs-snapshot
 
 EGO_PN="github.com/rafaelmartins/simplevirt"
 GIT_COMMIT="78d29d8fa11ce72af5f897430af7bb7d2947a32f"
@@ -30,6 +30,7 @@ KEYWORDS=""
 IUSE=""
 
 RDEPEND="
+	acct-group/simplevirt
 	virtual/logger
 	app-emulation/qemu"
 
@@ -37,12 +38,6 @@ CONFIG_CHECK="~TUN ~BRIDGE"
 ERROR_TUN="CONFIG_TUN: Universal TUN/TAP driver required to setup bridge networking"
 ERROR_BRIDGE="CONFIG_BRIDGE: 802.1d Ethernet Bridging required to setup bridge networking"
 
-pkg_setup() {
-	enewgroup simplevirt
-
-	linux-info_pkg_setup
-}
-
 src_compile() {
 	pushd src/${EGO_PN} > /dev/null || die
 	GOPATH="${S}" go install -v -ldflags "-X ${EGO_PN}.Version=${GIT_VERSION}" ./cmd/... || die

app-portage/euses/Manifest

@@ -1,3 +1,5 @@
 DIST euses-2.5.9.tar.bz2 44281 BLAKE2B 2da1309f8eeb5b4999212ddb0b2fb59a8fbd17c49f2c8e7bbfa64bba5c7831f84289ef833d9787506ed735ea1be92dc1f0ab765501b30f123a7f2f168da42c60 SHA512 afbacdcb73bc10548b32050bc38f71e9ac8613277d2cd961f2f96e32e7fa1827c5a208e68a6994efdcaa9e4a64a581138daadab2296a5e60c5e29677dbbd9ef8
+DIST euses-2.6.0.tar.bz2 44315 BLAKE2B 90db468c60f439366c7a4bf1a111af48a67f6bc0a10a391563e79db926be34da423fcd5bf667359a9b6426882e95a240742555fe62de71fcca8fa92fa307df8d SHA512 b7f81b171380b2abd6d4b00f4294f7d6ef86e5b0ba8dc5b735bc389deed4b24c3d6cd45ec70f5a01e37182ca09e5798385a93afff413d4fd71841dc12ea3e86c
 EBUILD euses-2.5.9.ebuild 446 BLAKE2B b7bdf544a2276e443e781ca6df7854ca903eeb4f8107e074c3b8e48da1fd1bc2209ddbafad18fa88319fc513070fb1c45cff8f226df58c114e9f102964d95ada SHA512 e9e25eb55a81e9831d6849ad2b1e5fd999808cd22c1bc725096cc21d6ba351c7c6bbcd9a3622ad18c85618c5d985fa43cc587d58079080a584778599e284cc83
+EBUILD euses-2.6.0.ebuild 445 BLAKE2B 50c75a0c775ae9ddcde4b5a8ba218a331af128ebd699e56aecead14f8550509608cdf24cea682680bbe84c1106d54f0221f5e435f20fa8600757c5a682d0133d SHA512 f3a862b4a2fdb06aeb3b48a097e82a9e4a8fb710fb9e047878fa370fad4ee6f7fa166539efb486aaa7d860b436be996032690f53ff55882eee601fa6b2ca1407
 MISC metadata.xml 363 BLAKE2B d048d26125f3c965a6f3e467d8cd211fa8a3999692bd507c036b625b23d0a75dfcea9f32544aeb3e3219d7ba2a2ab03005b0cbecb51cd58f11cc48cebff9ef59 SHA512 568c3af8e7aa91c9732a29b74b31b89869ae031fcdf94d9c13c64f740bf1c86ee45a257cf10a298090239c7a92119e0010fc9316962a625a6494ff3174e80e5f

app-portage/euses/euses-2.6.0.ebuild

@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="look up USE flag descriptions fast"
+HOMEPAGE="https://www.xs4all.nl/~rooversj/gentoo"
+SRC_URI="https://www.xs4all.nl/~rooversj/gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+S=${WORKDIR}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc ChangeLog
+}

app-vim/vim-clang-format/Manifest

@@ -0,0 +1,3 @@
+DIST vim-clang-format-0_pre20200506.tar.gz 12836 BLAKE2B be6882788c4ea582f2fbabfe3fdbd4184ab407b09b8c68177539999620413919f074bef72a52ae0cfddd58d85d9f716c36bc8593b1b745d47887dbfbd599aa63 SHA512 5bf2f9082ef64953122e87659fbafae5af4cd7e2fda1ed5bcee52ed49a3727dae0dc3bc3ab172ac4200f93421898d6cbf26def019ac33d77ca4cc67c2da37846
+EBUILD vim-clang-format-0_pre20200506.ebuild 606 BLAKE2B 47060b5800a8c30722315d91b669abe0da81a8353c69fe8071b93e47b9b3de541e4d17eaa7176a044dd73c85f2d55c4a72bd756193a8d31e1b6fae3edde204bc SHA512 2d4be9fd15182b102df510c9c4c03c3a1d3f4a3201e26189591721da728e4a5c645a8e93d7beee4999778e59b392b24afc89cfe418576707d5faacb03ced3f1d
+MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0

app-vim/vim-clang-format/metadata.xml

@@ -0,0 +1,8 @@
+<?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>
+</pkgmetadata>

app-vim/vim-clang-format/vim-clang-format-0_pre20200506.ebuild

@@ -0,0 +1,25 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+#VIM_PLUGIN_VIM_VERSION="7.0"
+inherit vim-plugin
+
+COMMIT_HASH="95593b67723f23979cd7344ecfd049f2f917830f"
+DESCRIPTION="Vim plugin for clang-format"
+HOMEPAGE="https://github.com/rhysd/vim-clang-format"
+SRC_URI="https://github.com/rhysd/${PN}/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT_HASH}"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-devel/clang"
+
+src_prepare() {
+	default
+
+	# tests are written in ruby, prefer to avoid that
+	rm -r .travis.yml test || die
+}

dev-perl/CGI-Fast/CGI-Fast-2.150.0.ebuild

@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=LEEJO
+DIST_VERSION=2.15
+inherit perl-module
+
+DESCRIPTION="CGI Interface for Fast CGI"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-perl/CGI-4
+	virtual/perl-Carp
+	>=dev-perl/FCGI-0.670.0
+	virtual/perl-if
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Temp
+		virtual/perl-Test-Simple
+	)
+"
+PERL_RM_FILES=( "t/006_changes.t" )

dev-perl/CGI-Fast/Manifest

@@ -1,3 +1,5 @@
 DIST CGI-Fast-2.13.tar.gz 8844 BLAKE2B ece86a8ead5a83c0407f6c2713bf0848bfc895d9062811b5ce03ad68caa78aeb8b9d9f0f6f68abaafd1a652be2c53ece008f403e05ff49ac6538282f2a36fc65 SHA512 58e7010f5cdfa13e8ba4e528dfe2d7bcc4ac33f48482de186ef27ec0a38ac091c9d534761231c7dd947516532c78520259e841533690ffba7b90fb3d0069f53c
+DIST CGI-Fast-2.15.tar.gz 9277 BLAKE2B 95de6374611d8719195a65ef9a9575b34b82922f4a87c8844fc9ac4e62f219b3b19dafe10baaef8431e297cafe495a43c1761b9d3b275d471fed3855e95b4386 SHA512 b984cbcf5d1d96dd9fcb58b704ae643e127fcdbe37b4d7e7560e5e1219abb849d72c4ff5a2eb45d7f076a126543b06fda282aabf2c3788b8a87f075c081d30c1
 EBUILD CGI-Fast-2.130.0.ebuild 709 BLAKE2B 576a443159235baba14f2707ee25e88d5a7e3cc84944f20dfec799879f1f94d89328e5d555cc7d7eb774017e624ef905f4cd13cac5b38e59d45a7f796a280a6e SHA512 64770ded6de73090ac2eb86ecdf6f7ba14772cf965cb9e03a72f05cbc0b0cad544d33dfa822b4007ec2438fe3ebe710d7ff78f54bb369e813a93e3ea31e141fc
+EBUILD CGI-Fast-2.150.0.ebuild 713 BLAKE2B c6198ba41e599625cf7c1a792b3df6f5a764cc6c14d0dc76510eb0dad690349cc2e4915272cda418aebfb674d4c4ef581bcfd74026f0aa422bed1318ae913384 SHA512 61f8ee53b0dd2b5ccfdce0d869959a2661ee54dd39c46e8561d96a250de7652fc98b04a456d07c4a2141f3de7c9ea425d92a46a930a33424801fe5e0da259648
 MISC metadata.xml 388 BLAKE2B eae3b4d4c39119e174a7ba3675bae1fc2f284c6e36739cbe42f886ce5aa927c57df46afd0ec8fe9cfd0904807f0e41dcb07514baa23c6f3e930d8a3f9a03f10b SHA512 9381464ca55695107f53c7ded8490e9bfe24f3ffe77a4587a84624786c2125f28eb0b3141711bc27f934954c8816c72e7e6ef453918bcd16b832b7d370c76f1d

dev-python/astunparse/Manifest

@@ -1,3 +1,5 @@
+AUX astunparse-1.6.2-py38.patch 8802 BLAKE2B e6e303142bd91147fa6c90193c15319b77cb9b34535bcfc0eeec19de4233a22e8f954ae8460bf624590227a3f92e68be3d17c35330862fe9e447e63873276bca SHA512 18cf287f965c6cc9de961854e1bb3b344eb46557149a25f6f28bb70c4361ae15431a5a4579bf5c38a14ddad29e85fd2c13da3fa810c2e7474c4c7f6a5f001049
+AUX astunparse-1.6.2-tests.patch 707 BLAKE2B 00d45b4b6bfdc70828d173985533345798a5982fa4f345e83c07e39c58dafffbf2a50ae1657df02769351a402e66faec443f7e63604ef457517e570803c50b3b SHA512 d1a86860548e0b904cc70017e0b5fa3a4e8da6bd1c03571e196e01a660d31a3ae03dec77c36945d7b5e53920b2531f0a7a0a5e3edc15b5a61c53ddafe83156d4
 DIST astunparse-1.6.2.tar.gz 16339 BLAKE2B d35d63b8313718c1d873d55b7da824465be9b4bc9e486ff82dac7db2df5185f8a59bfb283844d7108927b04ee02879fe921c87f9da8bd87c157341e6022b40cc SHA512 1e344354481dab7345d8790791e15e2ce733b8985839972a1771b97adebbfc2b42c8fb258ea36f245baed553d3b8e5007872d6559ebcc5ef1eb6f6c6a5d66c81
-EBUILD astunparse-1.6.2.ebuild 528 BLAKE2B 6ced8b8c0cc1d5bff0e3a9ab8bdbd064eb667f287df9c49592f8186d7bfe2363e5996815b19736bd2c6dc0146334669de3250a806ded9aea9269993b6e955875 SHA512 56a3355afb74fb6f5601ff36bbd13d50d752a8df87012fb153fba7712317572672cd3cac28a3db20316137d0430fc1159cef1a41bab1aea6193aaabd5df952bf
+EBUILD astunparse-1.6.2.ebuild 758 BLAKE2B ed28575ac18b3737755b6a7b3b53d31949cabceea4a1c673f564563bb433fb8029918a2f3dfbbe28aa2f550dcf0e2f8c2234d812615ae5eec8b680cbea352cdc SHA512 d8681984f8ec4942a9011fae5cc9ad936d3f3ffd7f04e90f0d76a53eb7035869e18ed734529eceb93e05262e76e12c9d21dbadbedeaa95d1f25c60e684eaf108
 MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0

dev-python/astunparse/astunparse-1.6.2.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 python3_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Astun parser for python"
@@ -12,12 +12,20 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
 	>=dev-python/wheel-0.23.0[${PYTHON_USEDEP}]
 "
+PATCHES=(
+	"${FILESDIR}/astunparse-1.6.2-tests.patch"
+
+	# https://github.com/simonpercivall/astunparse/commit/2bd946919076f993cee1173611914372a0a25f00
+	"${FILESDIR}/astunparse-1.6.2-py38.patch"
+)
+
+distutils_enable_tests setup.py
 
 python_install_all() {
 	distutils-r1_python_install_all

dev-python/astunparse/files/astunparse-1.6.2-py38.patch

@@ -0,0 +1,259 @@
+diff --git a/lib/astunparse/unparser.py b/lib/astunparse/unparser.py
+index edf8c68..0ef6fd8 100644
+--- a/lib/astunparse/unparser.py
++++ b/lib/astunparse/unparser.py
+@@ -29,7 +29,7 @@ class Unparser:
+     output source code for the abstract syntax; original formatting
+     is disregarded. """
+
+-    def __init__(self, tree, file=sys.stdout):
++    def __init__(self, tree, file = sys.stdout):
+         """Unparser(tree, file=sys.stdout) -> None.
+          Print the source for tree to file."""
+         self.f = file
+@@ -89,6 +89,13 @@ class Unparser:
+         self.fill()
+         self.dispatch(tree.value)
+
++    def _NamedExpr(self, tree):
++        self.write("(")
++        self.dispatch(tree.target)
++        self.write(" := ")
++        self.dispatch(tree.value)
++        self.write(")")
++
+     def _Import(self, t):
+         self.fill("import ")
+         interleave(lambda: self.write(", "), self.dispatch, t.names)
+@@ -120,11 +127,11 @@ class Unparser:
+
+     def _AnnAssign(self, t):
+         self.fill()
+-        if not t.simple:
+-            self.write("(")
++        if not t.simple and isinstance(t.target, ast.Name):
++            self.write('(')
+         self.dispatch(t.target)
+-        if not t.simple:
+-            self.write(")")
++        if not t.simple and isinstance(t.target, ast.Name):
++            self.write(')')
+         self.write(": ")
+         self.dispatch(t.annotation)
+         if t.value:
+@@ -189,6 +196,14 @@ class Unparser:
+         self.fill("nonlocal ")
+         interleave(lambda: self.write(", "), self.write, t.names)
+
++    def _Await(self, t):
++        self.write("(")
++        self.write("await")
++        if t.value:
++            self.write(" ")
++            self.dispatch(t.value)
++        self.write(")")
++
+     def _Yield(self, t):
+         self.write("(")
+         self.write("yield")
+@@ -328,12 +343,19 @@ class Unparser:
+         self.dispatch(t.body)
+         self.leave()
+
+-    def _generic_FunctionDef(self, t, async_=False):
++    def _FunctionDef(self, t):
++        self.__FunctionDef_helper(t, "def")
++
++    def _AsyncFunctionDef(self, t):
++        self.__FunctionDef_helper(t, "async def")
++
++    def __FunctionDef_helper(self, t, fill_suffix):
+         self.write("\n")
+         for deco in t.decorator_list:
+             self.fill("@")
+             self.dispatch(deco)
+-        self.fill(("async " if async_ else "") + "def " + t.name + "(")
++        def_str = fill_suffix+" "+t.name + "("
++        self.fill(def_str)
+         self.dispatch(t.args)
+         self.write(")")
+         if getattr(t, "returns", False):
+@@ -343,14 +365,14 @@ class Unparser:
+         self.dispatch(t.body)
+         self.leave()
+
+-    def _FunctionDef(self, t):
+-        self._generic_FunctionDef(t)
++    def _For(self, t):
++        self.__For_helper("for ", t)
+
+-    def _AsyncFunctionDef(self, t):
+-        self._generic_FunctionDef(t, async_=True)
++    def _AsyncFor(self, t):
++        self.__For_helper("async for ", t)
+
+-    def _generic_For(self, t, async_=False):
+-        self.fill("async for " if async_ else "for ")
++    def __For_helper(self, fill, t):
++        self.fill(fill)
+         self.dispatch(t.target)
+         self.write(" in ")
+         self.dispatch(t.iter)
+@@ -363,12 +385,6 @@ class Unparser:
+             self.dispatch(t.orelse)
+             self.leave()
+
+-    def _For(self, t):
+-        self._generic_For(t)
+-
+-    def _AsyncFor(self, t):
+-        self._generic_For(t, async_=True)
+-
+     def _If(self, t):
+         self.fill("if ")
+         self.dispatch(t.test)
+@@ -586,8 +604,9 @@ class Unparser:
+
+     def _comprehension(self, t):
+         if getattr(t, 'is_async', False):
+-            self.write(" async")
+-        self.write(" for ")
++            self.write(" async for ")
++        else:
++            self.write(" for ")
+         self.dispatch(t.target)
+         self.write(" in ")
+         self.dispatch(t.iter)
+@@ -612,26 +631,27 @@ class Unparser:
+
+     def _Dict(self, t):
+         self.write("{")
+-        def write_pair(pair):
+-            (k, v) = pair
++        def write_key_value_pair(k, v):
++            self.dispatch(k)
++            self.write(": ")
++            self.dispatch(v)
++
++        def write_item(item):
++            k, v = item
+             if k is None:
+-                self.write('**')
++                # for dictionary unpacking operator in dicts {**{'y': 2}}
++                # see PEP 448 for details
++                self.write("**")
+                 self.dispatch(v)
+             else:
+-                self.dispatch(k)
+-                self.write(": ")
+-                self.dispatch(v)
+-            self.write(",")
+-        self._indent +=1
+-        self.fill("")
+-        interleave(lambda: self.fill(""), write_pair, zip(t.keys, t.values))
+-        self._indent -=1
+-        self.fill("}")
++                write_key_value_pair(k, v)
++        interleave(lambda: self.write(", "), write_item, zip(t.keys, t.values))
++        self.write("}")
+
+     def _Tuple(self, t):
+         self.write("(")
+         if len(t.elts) == 1:
+-            (elt,) = t.elts
++            elt = t.elts[0]
+             self.dispatch(elt)
+             self.write(",")
+         else:
+@@ -656,10 +676,9 @@ class Unparser:
+             self.dispatch(t.operand)
+         self.write(")")
+
+-    binop = { "Add":"+", "Sub":"-", "Mult":"*", "Div":"/", "Mod":"%",
++    binop = { "Add":"+", "Sub":"-", "Mult":"*", "MatMult":"@", "Div":"/", "Mod":"%",
+                     "LShift":"<<", "RShift":">>", "BitOr":"|", "BitXor":"^", "BitAnd":"&",
+-                    "FloorDiv":"//", "Pow": "**",
+-                    "MatMult":"@"}
++                    "FloorDiv":"//", "Pow": "**"}
+     def _BinOp(self, t):
+         self.write("(")
+         self.dispatch(t.left)
+@@ -689,7 +708,7 @@ class Unparser:
+         # Special case: 3.__abs__() is a syntax error, so if t.value
+         # is an integer literal then we need to either parenthesize
+         # it or add an extra space to get 3 .__abs__().
+-        if isinstance(t.value, ast.Num) and isinstance(t.value.n, int):
++        if isinstance(t.value, getattr(ast, 'Constant', getattr(ast, 'Num', None))) and isinstance(t.value.n, int):
+             self.write(" ")
+         self.write(".")
+         self.write(t.attr)
+@@ -760,18 +779,22 @@ class Unparser:
+     def _arguments(self, t):
+         first = True
+         # normal arguments
+-        defaults = [None] * (len(t.args) - len(t.defaults)) + t.defaults
+-        for a,d in zip(t.args, defaults):
++        all_args = getattr(t, 'posonlyargs', []) + t.args
++        defaults = [None] * (len(all_args) - len(t.defaults)) + t.defaults
++        for index, elements in enumerate(zip(all_args, defaults), 1):
++            a, d = elements
+             if first:first = False
+             else: self.write(", ")
+             self.dispatch(a)
+             if d:
+                 self.write("=")
+                 self.dispatch(d)
++            if index == len(getattr(t, 'posonlyargs', ())):
++                self.write(", /")
+
+         # varargs, or bare '*' if no varargs but keyword-only arguments present
+         if t.vararg or getattr(t, "kwonlyargs", False):
+-            if first: first = False
++            if first:first = False
+             else: self.write(", ")
+             self.write("*")
+             if t.vararg:
+@@ -839,14 +862,6 @@ class Unparser:
+             self.write(" as ")
+             self.dispatch(t.optional_vars)
+
+-    def _Await(self, t):
+-        self.write("(")
+-        self.write("await")
+-        if t.value:
+-            self.write(" ")
+-            self.dispatch(t.value)
+-        self.write(")")
+-
+ def roundtrip(filename, output=sys.stdout):
+     if six.PY3:
+         with open(filename, "rb") as pyfile:
+diff --git a/setup.py b/setup.py
+index 6f62fd9..e5a277a 100755
+--- a/setup.py
++++ b/setup.py
+@@ -48,11 +48,10 @@ setup(
+         "Programming Language :: Python :: 2",
+         'Programming Language :: Python :: 2.7',
+         'Programming Language :: Python :: 3',
+-        'Programming Language :: Python :: 3.3',
+-        'Programming Language :: Python :: 3.4',
+         'Programming Language :: Python :: 3.5',
+         'Programming Language :: Python :: 3.6',
+         'Programming Language :: Python :: 3.7',
++        'Programming Language :: Python :: 3.8',
+         'Topic :: Software Development :: Code Generators',
+     ],
+     test_suite='tests',
+diff --git a/tests/common.py b/tests/common.py
+index c8db903..95b9755 100644
+--- a/tests/common.py
++++ b/tests/common.py
+@@ -215,6 +215,7 @@ class AstunparseCommonTestCase:
+         self.check_roundtrip("not True or False")
+         self.check_roundtrip("True or not False")
+
++    @unittest.skipUnless(sys.version_info < (3, 6), "Only works for Python < 3.6")
+     def test_integer_parens(self):
+         self.check_roundtrip("3 .__abs__()")
+

dev-python/astunparse/files/astunparse-1.6.2-tests.patch

@@ -0,0 +1,23 @@
+diff --git a/tests/common.py b/tests/common.py
+index 95b9755..41123de 100644
+--- a/tests/common.py
++++ b/tests/common.py
+@@ -1,6 +1,7 @@
+ import codecs
+ import os
+ import sys
++import site
+ if sys.version_info < (2, 7):
+     import unittest2 as unittest
+ else:
+@@ -175,9 +176,7 @@ class AstunparseCommonTestCase:
+     def check_roundtrip(self, code1, filename="internal", mode="exec"):
+         raise NotImplementedError()
+ 
+-    test_directories = [
+-        os.path.join(getattr(sys, 'real_prefix', sys.prefix),
+-                     'lib', 'python%s.%s' % sys.version_info[:2])]
++    test_directories = [os.path.dirname(d) for d in site.getsitepackages()]
+ 
+     def test_files(self):
+         names = []

dev-python/boto3/Manifest

@@ -2,7 +2,7 @@ DIST boto3-1.10.2.tar.gz 272071 BLAKE2B 9c3b90ae751784946a84d0cf31ed0111526ed97b
 DIST boto3-1.12.48.tar.gz 292124 BLAKE2B 0baf8fb4cfa040ba05b296d15a523a5de32677684143145b12dd54182d4fedbffa5656d36ab854006c0cc6009a1bca351bb5ac2ea757cb70b446924bcae625a8 SHA512 3cf5533dd5d9aa51cf46ef81ba25bb7afbc73b1e745ea5ae47935b22da290c7d2101e377b3225f970168201dde0bf2ee967e24eed86548f9045eb72840afea6b
 DIST boto3-1.9.122.tar.gz 258061 BLAKE2B 68903edd97e10693675e4c2fa77c2c54f2d3aab79307ee0a856f43aabe256f7782d027b0a23f433c593962c90f7364c26a87c27fe8770e67b5052e4ced73a9bc SHA512 31b8d8c2369b9076d825196d400c8a8b5579c38f87c7f41634eedbdaf6c2be01072018312e90e25d81b850c51f7c22a13fa565cd4e8b7672c238bad61e6a0810
 EBUILD boto3-1.10.2.ebuild 1232 BLAKE2B ea39ddf5aac9ceab82200259373aa821257c5662938abf976d444bd9ed950e7e4591d842fcb13b8f7a286f84e1ea555ba0d23b11e4ad3aa8b14fc38612b25d68 SHA512 2fcb3b55ab0ec0ab308bc5ca9014f6ff0ea199d47f1997fa7081f798667f70f9cb5d3d3f0396eacb20ca0163f82f508a7eef4717616032def79a1b581a112b26
-EBUILD boto3-1.12.48.ebuild 1286 BLAKE2B 5c835ede1c85a0d847b56c98e512fa34b95fe5edf01ed71eed44e0c849844a85070d03794cd57c1abde99e5f4c44e8c528ab987601ce33d426b49e20144155d3 SHA512 686f5d3e2a204b50ab55c518277ed718188aad5240e548aa31e01facaea330540cae9feb7fa5e56559af342cba6c0c09382e8805cfb6026440899c9a723221fe
+EBUILD boto3-1.12.48.ebuild 1293 BLAKE2B 92aad28866a299a2a734ff0d36a31a8bfd25e9ecef8e055415c99efee0cd5e23b0d1ab29830d70ca15531b830472b9e07f3cffff2e3c5085800a64a6cc138a1c SHA512 3d0310fccc683e421bce7b4eefca8c469bcaea84f191e6758b2aff6cd267910b7bb96bf0045c81eac26d5ffc11709a8cc0ae2ba6969f3d8b0d3b3e581d359805
 EBUILD boto3-1.9.122.ebuild 1230 BLAKE2B 28aca5308ca0056019875d735de0d04a7332a3f995358a7646d454a48c37ed95f7d731bbb56f6635d82504742dea02f87357ed679435ed6c40d33a5aec47449c SHA512 9da14dcf92737efed3232f787430800eb897cd010a4ba33d49090d8146beea685e355f8a47bbe962122c04d4a86d0994f4e3f66ce898f0acfd13cfb42f7f1556
 EBUILD boto3-9999.ebuild 1286 BLAKE2B 5c835ede1c85a0d847b56c98e512fa34b95fe5edf01ed71eed44e0c849844a85070d03794cd57c1abde99e5f4c44e8c528ab987601ce33d426b49e20144155d3 SHA512 686f5d3e2a204b50ab55c518277ed718188aad5240e548aa31e01facaea330540cae9feb7fa5e56559af342cba6c0c09382e8805cfb6026440899c9a723221fe
 MISC metadata.xml 326 BLAKE2B 0ee2d830daa48d21aa34b2bec8f8b9d6ff03edaffc6bf8f5b47c05b5a83aa0947e22651dcf9ef4d8153b3b0f21913069a77bcfb7b25f55a67c147938bfd6c0a5 SHA512 0e38efcdc960343f3b92fdfca7d91719b2b3b66969cd100fd8e0d53eab876e062ffe2cfb370b605881631f1077861cd6e0aa1b103477933bfa949d297193e109

dev-python/boto3/boto3-1.12.48.ebuild

@@ -34,7 +34,7 @@ BDEPEND="
 
 RESTRICT="!test? ( test )"
 
-distutils_enable_sphinx docs \
+distutils_enable_sphinx docs/source \
 	'dev-python/guzzle_sphinx_theme'
 
 python_prepare_all() {

dev-python/google-apitools/Manifest

@@ -1,4 +1,8 @@
+AUX google-apitools-0.5.30-abc.patch 2828 BLAKE2B 52f328e0701002fbc95f2749329e03a682a15113c693030cc3648ca7432b05a4975d2b4437a76bb1e40232d8317cdf3db7e3e3a14fab780326526a494fe05311 SHA512 d53104ebded8c19a4ef74f721056c107b7be42c5936215d4722672e8ace02d4adc2d7fb8589d92b3025950c2535879c4e79e1ab43fa6ac2dfa1ea6e48594aa47
+AUX google-apitools-0.5.30-py37.patch 5938 BLAKE2B efc0962d612017903092b7ed37561a09eb78f8b2c189d7c8bf902fd11b711676a230fed57f2671ac0d0c9fdddfbe66ac911d84ce1cfab64ed6b3a865d3ba1aaa SHA512 0cbeaf85568a23224c32647c1e3f6ce3a173093df1d40e36a8f2dd9155f19b3211fc926c054add955934104a069787d7cac03aa86efad526556f3255cdff98f0
 AUX google-apitools-0.5.30-skip-enum-test-on-new-python.patch 807 BLAKE2B 7753d11545ffbf40abd7003e3efa777ec7245151eae2a3ee825e4fd5905af99cee3d5306a9b745d749785f818f6cf6daeca1f25895a179d2ac5aca2a58c18865 SHA512 a614ebefabc75ced727dece6a5a531e857b1282c7e7053c4a5fff90514f8240177ebfac8af8d000791f2adf69d624a2e5d68c16bfd1ec8e1083e354121d6f434
 DIST google-apitools-0.5.30.tar.gz 363524 BLAKE2B ed8477c85911f5855a449abe81b465635d3cc4e08d2915de5e882608e634f3dd9ffdda929bd8b25eb3daa5922851aa9304ffe07778cdf3a3aa629e215633515a SHA512 2dffffada829b9b962c64aab22b19cd227981819128c34f3e32515ee599297b3d5e8c97152d954110c2ef27c02737d3c30c785840b9f9767068688f62dc0b5c7
+DIST google-apitools-0.5.30_p20200507.tar.gz 365250 BLAKE2B 58d52016775b387b494d8b5897886f059fe74a360098f6527089039469d4d4e3c0d9ec63a12be1215741fd15a1a03e2204f54ace7c9eaf8bbdc8236c9c1fe576 SHA512 94879360c5de3d7405b7377b2baf0fa303c1b0bace56cf75d203b0a509ac028e1d3208a82ba08de7d17e4e26571c9b8601cb07e6897b658eeede9d06fd384fe3
 EBUILD google-apitools-0.5.30.ebuild 1090 BLAKE2B 1d1490909f7a4e806967b719a28f02375e3b76c5b0bb0aa011a529efc5ab4090caf170308e61ea89bcdf309e52f19634a8fcb894e778e40950ddc63b2371cc68 SHA512 3ce729efd5aab9986bdf37a1e16c7b488167ed49b20571e14531981d448937b4efe307cf87de8c47441ad626a6ceb5c539020c4634e29413eafdcff6228637d0
+EBUILD google-apitools-0.5.30_p20200507.ebuild 1053 BLAKE2B e52b88a54e0140f768849d625eb80208c4bb0831785d4f630bf84ff71f5a350e8c3b3e8dafcd64d77ef588289e457e392bb7da130d33e7ca000962f7d5a254c5 SHA512 bcc2bd37d218564d257f3b72de3200398851a0816fbc2bd9e373ee6700d9b0d49b3433d55bebc835e383d246b3c48385ad7f76297c6a3a183b3e4df3dd2c30ab
 MISC metadata.xml 330 BLAKE2B cea2ae09b3468b95764b84c8891b9840e918db4961a77f4d514a4c15a33248a011b79f235728883e31a968c69a07c436a31a282f1e4a2baed2cbb2c7ba3c4982 SHA512 a4b6c01f3d8c411c5e96b911585770af30c8a1f262e92bf01748447111798a8e6ede7aa5979f16c3cf7068b3f158842023546e234049e2345f1a2f2891e51296

dev-python/google-apitools/files/google-apitools-0.5.30-abc.patch

@@ -0,0 +1,81 @@
+commit cfefe5a8322b40c6e7bd3cc794fd644edcc3a6d6
+Author: Karthikeyan Singaravelan <tir.karthi@gmail.com>
+Date:   Mon Jan 27 20:21:15 2020 +0530
+
+    Import ABC from collections.abc instead of collections for Python 3.9 compatibility. (#286)
+
+diff --git a/apitools/base/py/extra_types.py b/apitools/base/py/extra_types.py
+index 847dc91..e40a785 100644
+--- a/apitools/base/py/extra_types.py
++++ b/apitools/base/py/extra_types.py
+@@ -16,7 +16,6 @@
+ 
+ """Extra types understood by apitools."""
+ 
+-import collections
+ import datetime
+ import json
+ import numbers
+@@ -30,6 +29,11 @@ from apitools.base.py import encoding_helper as encoding
+ from apitools.base.py import exceptions
+ from apitools.base.py import util
+ 
++if six.PY3:
++    from collections.abc import Iterable
++else:
++    from collections import Iterable
++
+ __all__ = [
+     'DateField',
+     'DateTimeMessage',
+@@ -129,7 +133,7 @@ def _PythonValueToJsonValue(py_value):
+         return JsonValue(double_value=float(py_value))
+     if isinstance(py_value, dict):
+         return JsonValue(object_value=_PythonValueToJsonObject(py_value))
+-    if isinstance(py_value, collections.Iterable):
++    if isinstance(py_value, Iterable):
+         return JsonValue(array_value=_PythonValueToJsonArray(py_value))
+     raise exceptions.InvalidDataError(
+         'Cannot convert "%s" to JsonValue' % py_value)
+@@ -212,7 +216,7 @@ def _JsonProtoToPythonValue(json_proto):
+ def _PythonValueToJsonProto(py_value):
+     if isinstance(py_value, dict):
+         return _PythonValueToJsonObject(py_value)
+-    if (isinstance(py_value, collections.Iterable) and
++    if (isinstance(py_value, Iterable) and
+             not isinstance(py_value, six.string_types)):
+         return _PythonValueToJsonArray(py_value)
+     return _PythonValueToJsonValue(py_value)
+diff --git a/apitools/base/py/util.py b/apitools/base/py/util.py
+index ac1a44c..ad086e4 100644
+--- a/apitools/base/py/util.py
++++ b/apitools/base/py/util.py
+@@ -16,7 +16,6 @@
+ 
+ """Assorted utilities shared between parts of apitools."""
+ 
+-import collections
+ import os
+ import random
+ 
+@@ -30,6 +29,11 @@ from apitools.base.protorpclite import messages
+ from apitools.base.py import encoding_helper as encoding
+ from apitools.base.py import exceptions
+ 
++if six.PY3:
++    from collections.abc import Iterable
++else:
++    from collections import Iterable
++
+ __all__ = [
+     'DetectGae',
+     'DetectGce',
+@@ -78,7 +82,7 @@ def NormalizeScopes(scope_spec):
+     if isinstance(scope_spec, six.string_types):
+         scope_spec = six.ensure_str(scope_spec)
+         return set(scope_spec.split(' '))
+-    elif isinstance(scope_spec, collections.Iterable):
++    elif isinstance(scope_spec, Iterable):
+         scope_spec = [six.ensure_str(x) for x in scope_spec]
+         return set(scope_spec)
+     raise exceptions.TypecheckError(

dev-python/google-apitools/files/google-apitools-0.5.30-py37.patch

@@ -0,0 +1,144 @@
+diff --git a/apitools/base/protorpclite/messages.py b/apitools/base/protorpclite/messages.py
+index 0d564e9..5b2346a 100644
+--- a/apitools/base/protorpclite/messages.py
++++ b/apitools/base/protorpclite/messages.py
+@@ -757,6 +757,7 @@ class Message(six.with_metaclass(_MessageClass, object)):
+       order.check_initialized()
+ 
+     """
++    __hash__ = None
+ 
+     def __init__(self, **kwargs):
+         """Initialize internal messages state.
+@@ -1079,9 +1080,9 @@ class FieldList(list):
+         if not field_instance.repeated:
+             raise FieldDefinitionError(
+                 'FieldList may only accept repeated fields')
+-        self.__field = field_instance
+-        self.__field.validate(sequence)
+-        list.__init__(self, sequence)
++        self._field = field_instance
++        self._field.validate(sequence)
++        super().__init__(sequence)
+ 
+     def __getstate__(self):
+         """Enable pickling.
+@@ -1098,10 +1099,10 @@ class FieldList(list):
+                 None.
+ 
+         """
+-        message_class = self.__field.message_definition()
++        message_class = self._field.message_definition()
+         if message_class is None:
+-            return self.__field, None, None
+-        return None, message_class, self.__field.number
++            return self._field, None, None
++        return None, message_class, self._field.number
+ 
+     def __setstate__(self, state):
+         """Enable unpickling.
+@@ -1115,41 +1116,43 @@ class FieldList(list):
+         """
+         field_instance, message_class, number = state
+         if field_instance is None:
+-            self.__field = message_class.field_by_number(number)
++            self._field = message_class.field_by_number(number)
+         else:
+-            self.__field = field_instance
++            self._field = field_instance
+ 
+     @property
+     def field(self):
+         """Field that validates list."""
+-        return self.__field
++        return self._field
+ 
+     def __setslice__(self, i, j, sequence):
+         """Validate slice assignment to list."""
+-        self.__field.validate(sequence)
++        self._field.validate(sequence)
+         list.__setslice__(self, i, j, sequence)
+ 
+     def __setitem__(self, index, value):
+         """Validate item assignment to list."""
+         if isinstance(index, slice):
+-            self.__field.validate(value)
++            self._field.validate(value)
+         else:
+-            self.__field.validate_element(value)
++            self._field.validate_element(value)
+         list.__setitem__(self, index, value)
+ 
+     def append(self, value):
+         """Validate item appending to list."""
+-        self.__field.validate_element(value)
++        if hasattr(self, '_field'):
++            self._field.validate_element(value)
+         return list.append(self, value)
+ 
+     def extend(self, sequence):
+         """Validate extension of list."""
+-        self.__field.validate(sequence)
++        if hasattr(self, '_field'):
++            self._field.validate(sequence)
+         return list.extend(self, sequence)
+ 
+     def insert(self, index, value):
+         """Validate item insertion to list."""
+-        self.__field.validate_element(value)
++        self._field.validate_element(value)
+         return list.insert(self, index, value)
+ 
+ 
+diff --git a/apitools/base/protorpclite/messages_test.py b/apitools/base/protorpclite/messages_test.py
+index 3ad75e4..1acdab3 100644
+--- a/apitools/base/protorpclite/messages_test.py
++++ b/apitools/base/protorpclite/messages_test.py
+@@ -508,7 +508,8 @@ class FieldListTest(test_util.TestCase):
+     def testPickle(self):
+         """Testing pickling and unpickling of FieldList instances."""
+         field_list = messages.FieldList(self.integer_field, [1, 2, 3, 4, 5])
+-        unpickled = pickle.loads(pickle.dumps(field_list))
++        pickled = pickle.dumps(field_list)
++        unpickled = pickle.loads(pickled)
+         self.assertEquals(field_list, unpickled)
+         self.assertIsInstance(unpickled.field, messages.IntegerField)
+         self.assertEquals(1, unpickled.field.number)
+diff --git a/apitools/base/protorpclite/protojson_test.py b/apitools/base/protorpclite/protojson_test.py
+index 7a8f875..69804f5 100644
+--- a/apitools/base/protorpclite/protojson_test.py
++++ b/apitools/base/protorpclite/protojson_test.py
+@@ -440,7 +440,7 @@ class ProtojsonTest(test_util.TestCase,
+         """Test decoding improperly encoded base64 bytes value."""
+         self.assertRaisesWithRegexpMatch(
+             messages.DecodeError,
+-            'Base64 decoding error: Incorrect padding',
++            'Base64 decoding error: (?:Incorrect padding|Invalid base64-encoded string: .*)',
+             protojson.decode_message,
+             test_util.OptionalMessage,
+             '{"bytes_value": "abcdefghijklmnopq"}')
+diff --git a/apitools/base/py/batch_test.py b/apitools/base/py/batch_test.py
+index 90cf4fb..e1384c5 100644
+--- a/apitools/base/py/batch_test.py
++++ b/apitools/base/py/batch_test.py
+@@ -357,7 +357,7 @@ class BatchTest(unittest.TestCase):
+         self._DoTestConvertIdToHeader('blah', '<%s+blah>')
+ 
+     def testConvertIdThatNeedsEscaping(self):
+-        self._DoTestConvertIdToHeader('~tilde1', '<%s+%%7Etilde1>')
++        self._DoTestConvertIdToHeader('#hash1', r'<%s+%%23hash1>')
+ 
+     def _DoTestConvertHeaderToId(self, header, expected_id):
+         batch_request = batch.BatchHttpRequest('https://www.example.com')
+diff --git a/apitools/gen/client_generation_test.py b/apitools/gen/client_generation_test.py
+index 4e382dd..c26db39 100644
+--- a/apitools/gen/client_generation_test.py
++++ b/apitools/gen/client_generation_test.py
+@@ -42,6 +42,7 @@ class ClientGenerationTest(unittest.TestCase):
+         self.gen_client_binary = 'gen_client'
+ 
+     @test_utils.SkipOnWindows
++    @unittest.skip('needs network access')
+     def testGeneration(self):
+         for api in _API_LIST:
+             with test_utils.TempDir(change_to=True):

dev-python/google-apitools/google-apitools-0.5.30_p20200507.ebuild

@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+COMMIT_HASH="02db277e2bbc5906c8787f64dc9a743fe3327f90"
+DESCRIPTION="Python library to manipulate Google APIs"
+HOMEPAGE="https://github.com/google/apitools"
+SRC_URI="https://github.com/google/apitools/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN#google-}-${COMMIT_HASH}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.14[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.5.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+	>=dev-python/python-gflags-3.1.2[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-18.5[${PYTHON_USEDEP}]
+	test? (	>=dev-python/mock-1.0.1[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/google-apitools-0.5.30-py37.patch"
+)
+
+distutils_enable_tests nose

dev-python/hgdistver/Manifest

@@ -1,3 +1,3 @@
 DIST hgdistver-0.25.tar.gz 9879 BLAKE2B 71caa059359b8ea1be58b6463b260741586ab81e6d8afac5dcadbb35604a564b947032ae645cec683a3c692de8307b23f7abea40d0a1f3802b5257870b7e3e02 SHA512 3fef872af3c8fffb3ba612d2505260468b510c17219257640a4bcf3dc6568fdf59eb3cc544ef41b7eab32ee6cedcd81bfffce753c98bbc7d1e538fe4937d039c
-EBUILD hgdistver-0.25.ebuild 812 BLAKE2B 002ea0ca0d73980ba355be1d5c3636f51bd396ee79fa569f8ca2bef5cd8443b7b60fa03dc05364b6361dc92e073bd646cfb3979621cc19945650c45d3fddf43e SHA512 6077fa4c58ad2d5755918385c7835f18ee12aa957e141c58577ba8db77e8d81a84cd1bd1ce5662977878e05ff48cc801e2fca9af9d4327a503e294dded874ef5
+EBUILD hgdistver-0.25.ebuild 791 BLAKE2B 163b7865b5d579fc13285436f77bdf10a3eb6cee35cf5e228d5898c690e2998e6cc76aa92f552a555eaecfa00484639f5acdceebdf3d667557682ca080a510ee SHA512 d530785223ed11b740a6ae4206f2c19d1e838797414cd1088b581297eb6fcb0e61b490d2d7d6f223fe59bf0736d049ed078305105553e5d2bf3e6877336d7f3a
 MISC metadata.xml 394 BLAKE2B d2ea329a11dc2b88867e41b22717505a260db3715d8b254fd4fe51224541a428fe7d6b6180dff00ce82b74309f51fb5d8c3a47aa8664bb3492155e8282a112d7 SHA512 01c27a5f8d42a579acc1d21bd2f4b7a569183652c9637403b3efe7dfa515b9c86cee97f505ed909f0f34443cf2912cd1ae6b568a11954b6cf756815a5db82cc7

dev-python/hgdistver/hgdistver-0.25.ebuild

@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-python/oauth2client/Manifest

@@ -1,3 +1,5 @@
+AUX oauth2client-4.1.3-py38.patch 1782 BLAKE2B 751b62649cd7222230f809c7e957636e351cddb3588c1da112443b09067c73cc6ada588697dd36f9b6ed2115238f8f811bc5502b17c75b2f65be655b4199dc9f SHA512 3e03d7105e76206e63858a32a25dfd5bbf997ced6abafd75d0f4973528ee91cb28200854ccfa519945573992f454c18d2acad5784693acffc7509ddcb13908a8
 DIST oauth2client-4.1.3.tar.gz 185589 BLAKE2B 6cd61448e0d55cef7f2ba640c8cbb50ac83e76d0993391eb0acb3e156f937fcdee80576c9d45d505235a9f266495069664ccbfafd649a4e2d7a0990517ee8cb6 SHA512 80f49e09a6dd6767307a2c278544926fbf20b4f55e4cf83563ac7a7c1043622bd3c8c7fcf6de62896b623ca8c7947b309a5e6bf2b7cb0fccff3ff7634386b287
+EBUILD oauth2client-4.1.3-r1.ebuild 1805 BLAKE2B 909428391f8b2ea08e45e7dcaf36c846bbc25c0051a45d50d9f5f063157c2f92a2ab55898f7883a5f3a3c3aafe07db7cef21479a5722252724fc8a393a19b1cc SHA512 01c53dc5dd9bfcd42b03ec6d7465688454ceab352fdee846836873fd7b2660c9df57c0a26b6cbdf5b157219405e1e26ee68b8063ff78e202a107fd6935b993a4
 EBUILD oauth2client-4.1.3.ebuild 1675 BLAKE2B 45e8323c902abc49e1f3f5813114935a57a545c89f5f4609220bab244e14e7d16c102654679f85aa3fcaa5c03c1a0b20e96a5df311bd8059741e9a5ce5b4368f SHA512 6de3dbeae6b0aafaf8f8c23c5e133716eda43a3e959a1880223969de8e3dbb87d587b9b1f60ef5ef0cb17234909d4c6273aba740eb586a87363e9343a9bd5781
 MISC metadata.xml 334 BLAKE2B 474087a66809e8ad113f10c3f674b5684858d0eb67d58f54d19557f9a32295f96c587aa945eb6b4fbe338690a096fb59109f907902cd4e08f40c4d62f5dc7e54 SHA512 585f6ddeaa1a11022fcb9bab897e02392157abca2e638cfef57d76a97be2d85071405bbd70a256172d6202e4a4deca47ddb2374b98cd810e60541c2d4d3d373c

dev-python/oauth2client/files/oauth2client-4.1.3-py38.patch

@@ -0,0 +1,35 @@
+diff --git a/oauth2client/contrib/xsrfutil.py b/oauth2client/contrib/xsrfutil.py
+index 7c3ec03..20f35c9 100644
+--- a/oauth2client/contrib/xsrfutil.py
++++ b/oauth2client/contrib/xsrfutil.py
+@@ -44,7 +44,7 @@ def generate_token(key, user_id, action_id='', when=None):
+     Returns:
+         A string XSRF protection token.
+     """
+-    digester = hmac.new(_helpers._to_bytes(key, encoding='utf-8'))
++    digester = hmac.new(_helpers._to_bytes(key, encoding='utf-8'), digestmod='MD5')
+     digester.update(_helpers._to_bytes(str(user_id), encoding='utf-8'))
+     digester.update(DELIMITER)
+     digester.update(_helpers._to_bytes(action_id, encoding='utf-8'))
+diff --git a/tests/contrib/test_xsrfutil.py b/tests/contrib/test_xsrfutil.py
+index 3115827..deae568 100644
+--- a/tests/contrib/test_xsrfutil.py
++++ b/tests/contrib/test_xsrfutil.py
+@@ -54,7 +54,7 @@ class Test_generate_token(unittest.TestCase):
+                                             TEST_USER_ID_1,
+                                             action_id=TEST_ACTION_ID_1,
+                                             when=TEST_TIME)
+-            hmac.new.assert_called_once_with(TEST_KEY)
++            hmac.new.assert_called_once_with(TEST_KEY, digestmod='MD5')
+             digester.digest.assert_called_once_with()
+ 
+             expected_digest_calls = [
+@@ -87,7 +87,7 @@ class Test_generate_token(unittest.TestCase):
+                                                 TEST_USER_ID_1,
+                                                 action_id=TEST_ACTION_ID_1)
+ 
+-                hmac.new.assert_called_once_with(TEST_KEY)
++                hmac.new.assert_called_once_with(TEST_KEY, digestmod='MD5')
+                 time.time.assert_called_once_with()
+                 digester.digest.assert_called_once_with()
+ 

dev-python/oauth2client/oauth2client-4.1.3-r1.ebuild

@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for accessing resources protected by OAuth 2.0"
+HOMEPAGE="https://github.com/google/oauth2client"
+SRC_URI="https://github.com/google/oauth2client/archive/v${PV/_p/-post}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${P/_p/-post}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( $(python_gen_useflags 'python*') )"
+
+RDEPEND="
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	!<=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/sqlalchemy[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/oauth2client-4.1.3-py38.patch"
+)
+
+python_prepare() {
+	# keyring is not fuly supported by pypy yet, because dbus-python can't support pypy
+	# oauth2client -> keyring -> secretstorage -> dbus-python
+	# https://github.com/mitya57/secretstorage/issues/10
+	case $PYTHON in
+		pypy|*pypy|*pypy3|pypy3) \
+			find "${BUILD_DIR}/.." -name '*keyring*py' -delete ;;
+	esac
+}
+
+python_test() {
+	nosetests -v \
+		-e appengine \
+		-e django_util \
+		-e test_multiprocess_file_storage \
+		-e test_bad_positional || die "tests fail with ${EPYTHON}"
+	# appengine - requires appengine
+	# django_util - requires django
+	# test_multiprocess_file_storage - requires fasteners
+	# test_bad_positional - expects TypeError, gets ValueError
+}

dev-python/pebble/Manifest

@@ -1,3 +1,5 @@
 DIST Pebble-4.5.1.tar.gz 23693 BLAKE2B b9302bf12baf0b4e3b93387af86b945db504e94349664b1f1b98c15637e95729d971a2883d0f67bc3e80cd56a6471e4214425610ef50558258d99e68061ed6bf SHA512 5d33df8dbd779665ebdd23f92e1bdebb0ba48c4c1ff7a7ce4f42c996ad4fc7b15847fb86ca2e7c6c27cb53edb8bfddbfdacc6693c1f0e6bc1912be8f3255cd84
+DIST Pebble-4.5.2.tar.gz 23719 BLAKE2B 62db1c273ca0d27ecd16a7dc2508d288ff95ed7f0f123d58e345fcf1d48eb17fd829f963be53e63b377c765548769654d695322e7ee8c8a13369b0e74eba0eb8 SHA512 83391dc29c98615e1308dff9e4619471c7407c2981421b00e77155042d41f4a19c819c2ba32103929333d71621be47fa2eb5fd9f36ae7580379789b2c870e59b
 EBUILD pebble-4.5.1.ebuild 501 BLAKE2B ec552afb3ed8f214ece0f957a302e58e5b4fbccf7c826b1cb473b5710d6de4f487bcc135bba0c2994e717d22d4d018f6d4af577ae5833ba0b74fe803eb285021 SHA512 bd524b376f44790712d703c855641da169d74ea8ba3745d00c6e65e4d15bde02412923c5b6cf53af8b907d8b52a32f64d0a38af4a8752d0027e2f492d345993a
+EBUILD pebble-4.5.2.ebuild 501 BLAKE2B ec552afb3ed8f214ece0f957a302e58e5b4fbccf7c826b1cb473b5710d6de4f487bcc135bba0c2994e717d22d4d018f6d4af577ae5833ba0b74fe803eb285021 SHA512 bd524b376f44790712d703c855641da169d74ea8ba3745d00c6e65e4d15bde02412923c5b6cf53af8b907d8b52a32f64d0a38af4a8752d0027e2f492d345993a
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781

dev-python/pebble/pebble-4.5.2.ebuild

@@ -0,0 +1,22 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+MY_P=${P^}
+DESCRIPTION="Threading and multiprocessing eye-candy"
+HOMEPAGE="
+	https://pypi.org/project/Pebble/
+	https://pebble.readthedocs.io/
+	https://github.com/noxdafox/pebble"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${P^}
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest

dev-python/python-gflags/Manifest

@@ -1,4 +1,4 @@
 AUX python-gflags-3.1.1-script-install.patch 1178 BLAKE2B 26f5694548762a2d6b8e6787027862edba91e8baf39a7c8dfc573be61af48cebf7a280646c948c0b59fab48d3b46fd4049d8422f8d4e6d9a57afe6e363c63999 SHA512 7247303c33a845949b1db7104f3170497da980334cb02155501d194eb53eb61ae2231cd4ece06194ca64514271252f8f1fc7c7683cbff2bb8f96d6d4e88123d5
 DIST python-gflags-3.1.2.tar.gz 52093 BLAKE2B 4275b43ecf2c58f76fee0b1ff4645eb3176a9ae3b68fdd4a059c2f6f659ca1d9b6e4fad152a2fa48f1eb22c467dbc006835c241c21f89c0ca92367e484f34c6f SHA512 7a3c08b6b212cdb9cb7feaa48e3875d1204a4b3a57182508a078331565f70509d00c315400fa0316dbf61ed4d6a6a04ca8c1a2303567d37650d8dfbb329e2f6c
-EBUILD python-gflags-3.1.2-r1.ebuild 850 BLAKE2B ca84bc8c6831d379d3080799d8dcad1a39edaf4edbb32526f54d51b1f291f0f516ea2946eadc286ed14b3c6aade0dd49a81d0d56c638ad765c82ec7934f17725 SHA512 248fd773cff31831d05bcd830fd59e3ed799c89e0e15f47509c1c6f3fc99349593aad17fb65c244785aced829c6cfa00077545562f80303fc7c2fdff18549b4e
+EBUILD python-gflags-3.1.2-r1.ebuild 852 BLAKE2B bff1637027d8af42849e142ec4052331766ec49def48b0f8ea9e540f36ea09358d72d0228f988836291a7ca73f09bc5b63e82ac24bae5bc7ca6f50f7963e7c93 SHA512 d41597b6f6e97315311df14778db479947f3e4b7e89a2e3a5200afb9901af835745dd1290a2fc9e80bd9df03198ec8571dc249fad0618137307666a14fb5d609
 MISC metadata.xml 400 BLAKE2B d273614233adf08aa64eb4339fe8c55899901d86405dba1be0a80e20b3efcb9856a399fa76883bc96e4dbe66b52e223b990d638fd4523c0e1e974606ca2902ed SHA512 35469aeba6e9273b765361e6543c6019bacb3a1a42c5aa232d62d82284bc59f5e04c392f3934b3097fba63d9101530046f1f93119561ea0d426259374c5d6fb9

dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild

@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1
 

dev-python/recommonmark/Manifest

@@ -1,5 +1,5 @@
 DIST recommonmark-0.5.0.tar.gz 22356 BLAKE2B e22c6741e704b7017ff81282bd3297272f36396628b3a85e9e2ac5548b363a8b02f6aeb3db256b885a3a9a0ebe681da10f4f29c18f1bdb33490da55bf375b444 SHA512 e11a86961e477e9ae258df90c666fd0129a0ae858a8d5399b7f768b9e9ec5b4952ef5f9383ea91d8ccb1379e2753151387f7250588a98f43929bf3ebe78b7df9
 DIST recommonmark-0.6.0.tar.gz 24537 BLAKE2B 47f667ca0799394dc88964709efc59d1e2a68973b1c00fb41abfb514166e939b8dd0b6a0827285cfa1bb60669e08868b7a0993b6a32880fc0dd22cfefa6cf273 SHA512 44005b3fd0052cd8d4fce8a64f9d66a1ac75dc3041a28c115e922254956b2143296cbfbc0a2396b9f95691145645c4242e3be68e695b2c62ae37964014511679
 EBUILD recommonmark-0.5.0.ebuild 841 BLAKE2B 98b6949faa585d2c21bc4f14259069390401a8ce82ff3ce3f3981a36034087398406e6a3c283961bfd73e220426c745ed817db8db79e7e451b450886911914fa SHA512 ad4c8bcf0dcec54515441711334f86a649671438c1aceeea3f0affbb326983d99e751597f124f126451688c352268ec2d58d91f4c5779c74942348ca3f62343c
-EBUILD recommonmark-0.6.0.ebuild 963 BLAKE2B 40d45397785c30007a44c1a30d7b2328d59e2ee4520851c5bdddba427e56616dda799bffa83f6d9184f85614d914f00394f0d3463fad40695e408ef86e9525bc SHA512 5a26fcf0d1290b17594cd46a694101af0cbd83ff3ea214b5d28d7ae509f707c6f4f89532679b5dcde773292a9f1f87578ae18aecc50ac3e717ea432983f741ae
+EBUILD recommonmark-0.6.0.ebuild 958 BLAKE2B 8c6da3bfef68f358b78c984cc86a4ec92dfa6136f6ab1f7c4f2e88f909198012b73c7255c3e7dc12b457b9e8d18bca62f16396c1186f56fe029cc4ed18ede6d6 SHA512 bf44e9fbfbbcb6a7ed95aafa188e950d446022beba10fc0a9c52cea056515e6568af362f030e48c76e9cd659d2248c74d0531fa4813209cf5742ffc4819792af
 MISC metadata.xml 416 BLAKE2B 5bad43d7b568ac13930ffb19460e330e651f7681ef216f4f8a095d181007633ba49912b847520bdfa3a42f41bff688d201977303114f72a3075d20b42c442fe4 SHA512 03d09c52d6e3dc5297c5e4e57ed87ebb376ceb1d244a07bcdf5def6193ec1dca22af943264e28314f05875080c3e9c0630f6f4914e73b179930776bad0b01db5

dev-python/recommonmark/recommonmark-0.6.0.ebuild

@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rtfd/recommonmark/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/commonmark-0.8.1[${PYTHON_USEDEP}]

dev-python/scripttest/Manifest

@@ -1,3 +1,3 @@
 DIST scripttest-1.3.0.tar.gz 14885 BLAKE2B 1984bb175b49248bd369d2d2ed6f70051113285b6870bce67e0c2203d29b4c5b2735fa96dfef7ee11aa38db74e9beb026bbc946c8549b2810f6b90e896bcae0e SHA512 038bfb1726bff85b6e3675be51db829d3519b47665266f6ae1d3c5c6f4f06e7b16742262ca1ba240544e9bd39ae96c1be0bd5e8583736f72bb04241a1bb8acf6
-EBUILD scripttest-1.3.0.ebuild 602 BLAKE2B 7e7c3af50d7124f382181c92a4060eb8d9769fec0579dab0e53c8cd6fea6e75b1c965bf68b5ddd93ae5bd57a608e62a148b32346ee8607de8e04a6a7e45953e7 SHA512 023f2074707d359378c721fa92e72719ace2a5bdffc12851bb972ee5b67b9846a856f58d322283c333c78b1d96588efbedd80da5cddc283ccc9f20fc034a72a8
+EBUILD scripttest-1.3.0.ebuild 601 BLAKE2B 08c2a58517f2b40caf67430d4db2e3798fb1eb48104cf3e1fa6bf394dc533bb81d1e0d1af267c0d3542a348da43944ae74a6f8315c08b4b099abdb6f9328633c SHA512 af5f0f50947e052fe11862d9a233a901f5587f631856c97d2e1b1689b3552f1923fdf9434cb910a8812701fe7e99be9b0e3202fe7cc5cb32484c04a28a51bc0b
 MISC metadata.xml 313 BLAKE2B 70bc88a2b745b46e0da17a41ef420dd6b0ae2fcb3f444ed6be3d6bcdea63a4b0019790e0dba51b46c3a5d82c93f667f25b116793623604edad4d01841af723f5 SHA512 ae1c2257d3367ea3bdba8e040c0efd98674fe833f7a025c1b554e8cae6e1a41de6867e63c3d792593fa2f4baab158b046d2efaa08d6c8376f8ec749cdc7d4ff9

dev-python/scripttest/scripttest-1.3.0.ebuild

@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pypa/scripttest/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 

dev-python/snapshottest/Manifest

@@ -0,0 +1,4 @@
+AUX snapshottest-0.5.1-remove-fastdiff.patch 1978 BLAKE2B 49bbd2118bd8defc3134b1863614a6da7f45f8702c9b65db35329a74b270a511ef6c87952eafefa5e64080c136e21fe7abbfb1e304ff1744983bfa6fcbcc27ee SHA512 804223af644f67a7ad22996572bdb35c88d3c87bfd67ef821b4ebcfb581281f305f9d96edfda9d8a20d5cd1d07397899dc10b629f7d02b91c2b8804e02fd1ac0
+DIST snapshottest-0.5.1.tar.gz 19312 BLAKE2B a8acfb09de9e58c7a929f71d10f3cc68d7eec31a9fa1ea0fe74ae8a574ceec315f7eab2f9e7cd326c34d981b5ede4c398b5f1352bd59c23be219eeb9a2c0e861 SHA512 1541c327c4238c816b55cf797f6104ad54ff62a2332517b3bf9a455bbee0abd49f6983a54dc7510d1e1c659d88e5f7d6c6aa396c0ece19e19957ea8cff42c673
+EBUILD snapshottest-0.5.1.ebuild 1261 BLAKE2B 999553c2154032ff0734263eff74db28e9fbd085bc1723e034e60e425e18fee14e72461d78c064794474ce1707c7a209ded62ca10e31b6fe8deb9d3de975377e SHA512 8cce1a9e48ea066f2d6e266b35309a56ec99a8984695336c936a238055acccfb29a5e93e750efb8dd45771cc400f51ea55cd29751534f1efd119a73d168acf5d
+MISC metadata.xml 407 BLAKE2B cf0e92bcd492b79892ebc97b7639c016b4d1853a87bed8fcd1e367a9f6cbadce01015895d22011425aba76a4895b245bee0e5536fc959224a6bed08daef74a88 SHA512 155696e449933084fbe56dd900e15d17e12d52d6af29eb4fcb6c05ddfe8c6fa716974fa27085c34ae2e1af0d1739dba2616eb12092c606b2645f2008e51d64a3

dev-python/snapshottest/files/snapshottest-0.5.1-remove-fastdiff.patch

@@ -0,0 +1,57 @@
+From 3e31b54d349eb136f0d96eb81309fdaf4ad35fcf Mon Sep 17 00:00:00 2001
+From: David Shepherd <davidshepherd7@gmail.com>
+Date: Sat, 15 Feb 2020 11:48:52 +0000
+Subject: [PATCH] Revert "Use fastdiff for faster diffing"
+
+This reverts commit 56d9efdaa37c39c7f644726e0d34c89b09ff9568.
+---
+ setup.py             | 2 +-
+ snapshottest/diff.py | 9 +++++----
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 1baefd8..690713e 100644
+--- a/setup.py
++++ b/setup.py
+@@ -23,7 +23,7 @@
+         'nose.plugins.0.10':
+         ['snapshottest = snapshottest.nose:SnapshotTestPlugin']
+     },
+-    install_requires=['six>=1.10.0', 'termcolor', 'fastdiff>=0.1.4<1'],
++    install_requires=['six>=1.10.0', 'termcolor'],
+     tests_require=tests_require,
+     extras_require={
+         'test': tests_require,
+diff --git a/snapshottest/diff.py b/snapshottest/diff.py
+index 5fddf66..83c599a 100644
+--- a/snapshottest/diff.py
++++ b/snapshottest/diff.py
+@@ -1,5 +1,5 @@
++from difflib import Differ
+ from termcolor import colored
+-from fastdiff import compare
+ 
+ from .sorted_dict import SortedDict
+ from .formatter import Formatter
+@@ -23,6 +23,7 @@ def format_line(line):
+ class PrettyDiff(object):
+     def __init__(self, obj, snapshottest):
+         self.pretty = Formatter()
++        self.differ = Differ()
+         self.snapshottest = snapshottest
+         if isinstance(obj, dict):
+             obj = SortedDict(**obj)
+@@ -35,10 +36,10 @@ def __repr__(self):
+         return repr(self.obj)
+ 
+     def get_diff(self, other):
+-        text1 = 'Received \n\n' + self.pretty(self.obj)
+-        text2 = 'Snapshot \n\n' + self.pretty(other)
++        text1 = ['Received ', ''] + self.pretty(self.obj).splitlines(1)
++        text2 = ['Snapshot ', ''] + self.pretty(other).splitlines(1)
+ 
+-        lines = list(compare(text2, text1))
++        lines = list(self.differ.compare(text2, text1))
+         return [
+             format_line(line) for line in lines
+         ]

dev-python/snapshottest/metadata.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">sphinxcontrib-httpdomain</remote-id>
+    <remote-id type="bitbucket">birkenfeld/sphinx-contrib</remote-id>
+  </upstream>
+</pkgmetadata>

dev-python/snapshottest/snapshottest-0.5.1.ebuild

@@ -0,0 +1,49 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+# no tests on pypi, no tags on github
+COMMIT_HASH="4ac2b4fb09e9e7728bebb11967c164a914775d1d"
+
+DESCRIPTION="Snapshot Testing utils for Python"
+HOMEPAGE="https://pypi.org/project/snapshottest/
+	https://github.com/syrusakbary/snapshottest"
+SRC_URI="https://github.com/syrusakbary/${PN}/archive/${COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT_HASH}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/snapshottest-0.5.1-remove-fastdiff.patch"
+)
+
+python_prepare_all() {
+	sed -e "s:'pytest-runner'(,|)::" -i setup.py || die
+	sed -r -e 's:--cov[[:space:]]*[[:graph:]]+::g' -i setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv tests examples/pytest || die "Tests failed with ${EPYTHON}"
+	"${EPYTHON}" examples/unittest/test_demo.py || die "Tests failed with ${EPYTHON}"
+}

dev-python/sphinxcontrib-httpdomain/Manifest

@@ -1,3 +1,5 @@
 DIST sphinxcontrib-httpdomain-1.5.0.tar.gz 13981 BLAKE2B ca08a5cdc22d9898c6972ce8b7585fc4f185e3a0c8e49302bfafbfc88b4bb69d9d3deaf15cca2dfcd2f218199f509023aeb542129fea2003cecb2e8ef8215fd4 SHA512 e393690314cb7a7b81207ee42826eb5360ca6cfa8ad1b57c9a8dd5897ed1ed97bad4a46d8348aad9d5f6b6145e5456af629b14973ad2561d5b90b2f8dbf2163a
+DIST sphinxcontrib-httpdomain-1.7.0.tar.gz 37493 BLAKE2B e34682029ed2f59cb8c70b2a5270a2f89c4cb08179fdf3a53c65f1ad23eebba71bff5385b5d3fd971a6e3341457b253e4187632a8bf856ca208843938bbde056 SHA512 8c6e40dfaa29a552164078fbc96de578b2aac269cb0ce5e228293a85f87c4db4ef8c902868caccaca709df938d4e3917cc77b3da9bd889b9c6f8c6fa242dcc0d
 EBUILD sphinxcontrib-httpdomain-1.5.0.ebuild 800 BLAKE2B eef5af929417398dad90c696df9bdfe95dbbf1daa9e751db894af5310a27f6b5b4de7eaa54aa5a41256da940ec37149b9e705e1c9060556e2eb71d8d5b8171a2 SHA512 732195d97558f0a8b2ad135f051214c99a46d675bb74a6262cee3ad011743f5658e7a2915f3f187459a98cf069979ba8572ef99edfefa8e00287d17e4e24ed75
+EBUILD sphinxcontrib-httpdomain-1.7.0.ebuild 863 BLAKE2B 397b03758a9698a27ba60a4210b6b8c6bd597444516295132687dd01dc05c9921c15d9cedfabcf0fdfe0334eb5e43bdecd89fe62c311d838c6d74e5b3bda309c SHA512 e58310c3110c80c9dd18eb31e09e17140412c9b0744d6c1b5059644cb5d8069c1267f85c90df8bafcd4af02ccb92ab42fb67240806f18628dd249194d80bce6c
 MISC metadata.xml 407 BLAKE2B cf0e92bcd492b79892ebc97b7639c016b4d1853a87bed8fcd1e367a9f6cbadce01015895d22011425aba76a4895b245bee0e5536fc959224a6bed08daef74a88 SHA512 155696e449933084fbe56dd900e15d17e12d52d6af29eb4fcb6c05ddfe8c6fa716974fa27085c34ae2e1af0d1739dba2616eb12092c606b2645f2008e51d64a3

dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.7.0.ebuild

@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Extension providing a Sphinx domain for describing RESTful HTTP APIs"
+HOMEPAGE="https://github.com/sphinx-contrib/httpdomain
+	https://sphinxcontrib-httpdomain.readthedocs.io/"
+SRC_URI="https://github.com/sphinx-contrib/httpdomain/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN#sphinxcontrib-}-${PV}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}

dev-python/sphinxcontrib-httpexample/Manifest

@@ -0,0 +1,3 @@
+DIST sphinxcontrib-httpexample-0.10.3.tar.gz 30489 BLAKE2B 1100f28398d0d23559fb7ebea8263be5da6f2db09e9d5f48513d80d2cd580d2ff436df84b532eba8fb0c30eb3787a86f57f75750aeb0857b52af09885ba9a124 SHA512 de776f20e566a5b2ec4fcbad82d2ac39988ccf651a14d38d353dfd9cda7c15289acbb41db56df9189e42c2637bfd70fd4915d19d4ee718ddd4de476ddc34151f
+EBUILD sphinxcontrib-httpexample-0.10.3.ebuild 1115 BLAKE2B e0ab292866364fec136fbc8e71a85d51e338a0f603bab1f57b6d95a59036884f7aab1041b05f7636d62bfa91fdfaeafd08b668c820a80eb0afe96f4bb1e86bc3 SHA512 0af0f77ca785c6a4bb9ea0cabc913c31abb1a89a076e72acf55eca2dadeefb0227369b62cdb3ac8afb11b42dad4f4709d867b235a14be6a42e225d5bbf38414d
+MISC metadata.xml 488 BLAKE2B e6597d8c074fbd398a11ba571a37a5b38d8c9de175622a706ff04d6a1d7933c9196b3ce4ae1c8c2a843f44333de7b22ec8bdaa429f46a2134bd8e019a76dc6ca SHA512 3bdb4e01cbf129f1cccb57c52cb7f2f15dd9977b77a625bf91c6a4fbd7807c101c45dfc5d516e1a91b66284871265748e54cb19bb18fb68e44661272af008862

dev-python/sphinxcontrib-httpexample/metadata.xml

@@ -0,0 +1,16 @@
+<?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>
+  <maintainer type="person">
+    <email>williamh@gentoo.org</email>
+    <name>William Hubbs</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>vpayno+gentoo@gmail.com</email>
+    <name>Victor Payno</name>
+  </maintainer>
+</pkgmetadata>

dev-python/sphinxcontrib-httpexample/sphinxcontrib-httpexample-0.10.3.ebuild

@@ -0,0 +1,44 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Adds example directive for sphinx-contrib httpdomain"
+HOMEPAGE="https://github.com/collective/sphinxcontrib-httpexample"
+SRC_URI="https://github.com/collective/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/astunparse[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-httpdomain[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/snapshottest[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		dev-python/sphinx-testing[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e "s:pytest-runner::" -i setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "tests fail with ${EPYTHON}"
+}

dev-python/zstandard/Manifest

@@ -2,6 +2,6 @@ DIST zstandard-0.12.0.tar.gz 648827 BLAKE2B bb644150e4126997d447dad3e5aec9f6e15e
 DIST zstandard-0.13.0.tar.gz 659422 BLAKE2B 8ebdb7f7ca1671fa87cc1bb8a67cde4f408c49b9146041ca2a713a1457d9a4acfed5335484294d61b076f4a8e42ab3b2bcd0d09b4af54fca3a82a511c73d6d83 SHA512 3a6151de640515f21626d150e1295c1f2e524d377b3b1ccabf2719fae6da89f95480a50ec80eac4d07d317c7abe50ed7a26162b3291169e139c4ddd71b6ada98
 DIST zstandard-0.8.1.tar.gz 463785 BLAKE2B ac4dce58cefa05d265824004464bad89a7f4c4e5f19ac1d8b5b8b0ad6f806318e2b82ffb6f3a290e3605961801909b339b1e5d89fdccd76fd28c75a695a92e0a SHA512 0ddbe22381397443c6c9f84e64f9358160bede104c4f48351119d880ac4f88994739b0b3915454567d2b2b04930c6ead5aa290a40323ba4b0bacf5e97809793c
 EBUILD zstandard-0.12.0.ebuild 859 BLAKE2B 97e7550806562e05879ba14d5fd2794d2b24607b87c8bfc582bd405740c7843a4e1a23802bdf23020662ac4e7931778819771be6ecab6ff5c5b5cb83c11e4ff2 SHA512 3bfd23c6f6ebea1c12ef618449915e6103f2b304a92e8ee56707d8938d5542482a6d4a35baac041c7884c348fd41047033ccb21fc181f89dcefa80a9dd07f2da
-EBUILD zstandard-0.13.0.ebuild 880 BLAKE2B 37f5d67188a06cf6836331f5a1af529b64326e5c4b5e12f95cb136b3d23498cd97d2d3b6f1da1cac4a0ded372dfd15b872b0f6371795bf30556a902282823cac SHA512 731d4140e038285fcf4b7160af6505e7c5276811417df81545a8fdf111a31b88b49ed459c1a1422f68e28bbe3ddcf405b1d139735effb4a405dad065694abd40
+EBUILD zstandard-0.13.0.ebuild 873 BLAKE2B 5610297a5178f1b5075ab86d0abeddb812544d73871e9466632ad8b00fe07126eeca8a6e77eec5d6868a139b469c876fa1a0ff6a7437c80376e3c491bc8caf99 SHA512 812e63663b202fce41ad560a3b5d1ab61d61cf3703cb33d71f341ff5ec5faa54fdb6212747c5cb188d1df5283485cec078f2877454590a97acc2bcfcaa12dc60
-EBUILD zstandard-0.8.1.ebuild 670 BLAKE2B 7d2afb88852c5b2af366e2413a3f21554ea37f50cec5887a14380830281969f899d2ddc7273910557ac4b9414d670e608df5e112acabaa107cbde8b97738f046 SHA512 30d7cd3ea79a1683fd523bd747f0e4a047b3909a2eb858c19eb618a83866f97993a093ef0ce58ff317c55b20dcf23217fa0d69c3ef6601905ecc0332554bbf1e
+EBUILD zstandard-0.8.1.ebuild 664 BLAKE2B 1b8903a1d059e9e3f8a903784a03658d733fb55648acd4c9b5fa49e89e49898263a48b77c38ef38d50612102b8d7cf46ff140b28ffa14890be691baeed24e4f5 SHA512 b8da1b96c32dda93794ee527971e607500097b8227f0e9cbb5dfac03ee4ed6a81846b60f88a295f31753bfad5d913adf49831bf61d946362ad4b54040e829c56
 MISC metadata.xml 377 BLAKE2B 987c1e1f5a7a37a8686acf05929a8c7cfa702358d5c8fcb678ebec0e28ab590d2dbfe92892330d006b202cc4fbc22eb4fec8876902ab56f44990a59932d6c0f3 SHA512 54b4b2a4b98fda27659ac1cb39e16ff788687aa814d882822ffdfa9c085b04bb3a24885f9a08ea73b05b959ed6441a6ff5090c1159300c1d024f1abf239cb141

dev-python/zstandard/zstandard-0.13.0.ebuild

@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 

dev-python/zstandard/zstandard-0.8.1.ebuild

@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/cffi:=[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]

dev-ruby/oauth2/Manifest

@@ -1,11 +1,5 @@
-DIST oauth2-1.4.0.tar.gz 21299 BLAKE2B 1fe4640b374450279e556477c23972030d3aecac4c96e9174e57458deaccfbfa012e3bb66fe3db5e845a4004b91b763dab6f68b885ed7c1ddb2710cda29a8486 SHA512 2db67cba2403be8ea5d6f88f9818f295c29c08201f8ea5876c55cffe2fa926be465a11061654adffd77d13da9c7e56353ece7e4595cd9501acdcfeb58573b300
-DIST oauth2-1.4.1.tar.gz 27946 BLAKE2B e6edd113db26bdad09697c45efa5490bfb49b5c3fafdb7337c5f5c2b135025cc43fe7de450b3e106c6abfb8acb3afd676181ebd6aa1c18f6c5255597b04006df SHA512 14c039d19bcd177506e2f6189797b1791b54bd3fbe53973ad471c44744e3179c02e2f7a855a0cafe332e66819f1708d86c1dd89cbe57668ad642efa49e924b25
-DIST oauth2-1.4.2.tar.gz 27168 BLAKE2B 687149a111247a9636985447e82f5776ed42333e85bea6e0c61ff8f05759ba66dd1d418ca6efd7f1b5de5b56a731f889fc53f3413f5fd426b73ee6d4ef9ca929 SHA512 14075637431c6636a51d49930eae14c0328b0325add4829703d539c70b8cc35285acb02948a90717ab44f9153a0a9425b2d1b6559641b790ec133935904391f6
 DIST oauth2-1.4.3.tar.gz 28278 BLAKE2B 6d0055875073dca48e94a0449a5fff22b7be280c5b2f8e0b5b3234b3c8b079fde0671e211b0eb8d562bfc0cb437917adccb3f13c38450a8cd6a43f0f1a2373a5 SHA512 6ffdc7675ed301cd52e3320c01723fe2530a9dedc2b1fe534b42d01dacb7d4b017d79dbe0f9768f06ed8ace7ba596f9824a38d5509e82d09a3456f3a6b1fe453
 DIST oauth2-1.4.4.tar.gz 28477 BLAKE2B 925008fcf4dd48da3b17c539713bf0f05f649d431ab1676293de625bef4165f31153271d48bbb0c6265c67d7bb6a3cbc7217ce155ba331b22a00d572a855a8ef SHA512 5398a25664e53d1942b0ecbe5d74ca9cc8f04a928c96073f40cfff207c4bf220634185320954a0d1f36944547fb48264855c9523318fbb79dd4a3779a7a46e79
-EBUILD oauth2-1.4.0-r2.ebuild 1393 BLAKE2B 8d85f689841ea25380c6c22cf8aa2b0abadb615e6df260980901790ea77718f11c28055a47863593f4b13f163d2afa15aa0cd6098c896a946f16f6f22b0822aa SHA512 9b68eedf5b6305ec3c87d441c24a43ea0129afc57bfc7547a0a493ccce0e4ff51052a41811b1f5eef946e8683aae8c32002d1a8bf1bf4bccbeda25397ca9a507
-EBUILD oauth2-1.4.1.ebuild 1407 BLAKE2B 71f2f6bc31fe735d4f9a9f5f8f1f40ea9b4d6ec7fe1663a0851936dd440944e0881248130a51bc350f1ab65cb8c052af68ddb818e1ae513c22924e570905d9dd SHA512 c0f7fb8eee1453e790c815f143c978adc07075f566da7d08e52a63c67e8bd27380e897ac419c14d98c42c3a187736fee9c42c145d95d83494b829ad067e60ac3
-EBUILD oauth2-1.4.2.ebuild 1394 BLAKE2B 6e12ba3e453dea8defd9bb1252cf8110946f20273963423034586b657073848ee4e5a348b4e47d249aabafdfffcad9d4672bc1382889802d379717329745a412 SHA512 3b3ecec40baaf8b7c6a7a22f7c9d35c501df39c75e2c16d8eaa18bd2fe43ea8deb1a3685d9e2312934692a4055e02b414f45b2e5129e22ae279e493db0d5a05d
 EBUILD oauth2-1.4.3.ebuild 1394 BLAKE2B 6e12ba3e453dea8defd9bb1252cf8110946f20273963423034586b657073848ee4e5a348b4e47d249aabafdfffcad9d4672bc1382889802d379717329745a412 SHA512 3b3ecec40baaf8b7c6a7a22f7c9d35c501df39c75e2c16d8eaa18bd2fe43ea8deb1a3685d9e2312934692a4055e02b414f45b2e5129e22ae279e493db0d5a05d
-EBUILD oauth2-1.4.4.ebuild 1411 BLAKE2B dadd213629a0223a6d540bfc6fd4a1581d9a328ba5be8d28250c3bcc5cc990f307f8a59950b5a55496eb70fb756d3daea3c1d1aa7265e6986e8be01ba492055a SHA512 317937a7c11632ff2665eb52f171196e3022a4d82481048d3017a368335e15760b909c638faa2833b3dbb899a80138c5e81c6ff77fabff2e2c7e7e5a453f0539
+EBUILD oauth2-1.4.4.ebuild 1441 BLAKE2B 429bfa3448a7eea2c5eba926c8834df457f73d31e1c9a3fb54e6739d8fb96228d1968548cd42bd934e8923614fbce8a5304ed7c8f506280d3e2fc82c92d96060 SHA512 b2b07b1348fc2243556ee02e5534317509570d872c75862299a63ec7af04e170a68a135dd6017d5c254959415b958d7f4a3040d821e98043f62824d51997a617
 MISC metadata.xml 341 BLAKE2B e2896d1d266992c01ed373b489cf71b9c4a7a5f57a2af37899ff63793dad41b9213eee0fd94f269735f630815819f0a08e51e8739b89a7e251b60c2f6894e26c SHA512 33c5be74161557ae3e5888730256536cd02baac6c26913add84d8ce90854c4a3bb57c31fec1287bf560268c681ea3acf2119f2fea3162dd07e3962ee34d74f9e

dev-ruby/oauth2/oauth2-1.4.0-r2.ebuild

@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_TASK_DOC="doc:rdoc"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="oauth2.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem"
-HOMEPAGE="https://github.com/intridea/oauth2"
-SRC_URI="https://github.com/intridea/oauth2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/faraday-0.8 <dev-ruby/faraday-0.16
-	>=dev-ruby/jwt-1.0 =dev-ruby/jwt-1*
-	>=dev-ruby/multi_json-1.3 =dev-ruby/multi_json-1*
-	>=dev-ruby/multi_xml-0.5:0
-	>=dev-ruby/rack-1.2:* <dev-ruby/rack-3:*"
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/faraday/ s/0.13/0.16/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '/simplecov/,/^  end/ s:^:#:' \
-		-e '1irequire "uri"' spec/helper.rb || die
-
-	sed -i -e '/yardstick/,/^end/ s:^:#:' \
-		-e '/bundler/I s:^:#:' Rakefile || die
-
-	# Avoid spec that is too fragile in relation to ENV
-	sed -i -e '/outputs to $stdout when OAUTH_DEBUG=true/a skip "fragile ENV stubbing"' spec/oauth2/client_spec.rb || die
-}
-
-each_ruby_test() {
-	CI=true ${RUBY} -S rspec-3 spec || die
-}

dev-ruby/oauth2/oauth2-1.4.1.ebuild

@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="oauth2.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem"
-HOMEPAGE="https://github.com/intridea/oauth2"
-SRC_URI="https://github.com/intridea/oauth2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/faraday-0.8 <dev-ruby/faraday-0.16
-	|| ( dev-ruby/jwt:2 dev-ruby/jwt:0 )
-	>=dev-ruby/multi_json-1.3 =dev-ruby/multi_json-1*
-	>=dev-ruby/multi_xml-0.5:0
-	>=dev-ruby/rack-1.2:* <dev-ruby/rack-3:*"
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^  end/ s:^:#:' \
-		-e '1irequire "uri"' spec/helper.rb || die
-
-	sed -i -e '/yardstick/,/^end/ s:^:#:' \
-		-e '/bundler/I s:^:#:' Rakefile || die
-
-	# Avoid spec that is too fragile in relation to ENV
-	sed -i -e '/outputs to $stdout when OAUTH_DEBUG=true/a skip "fragile ENV stubbing"' spec/oauth2/client_spec.rb || die
-
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	CI=true ${RUBY} -S rspec-3 spec || die
-}

dev-ruby/oauth2/oauth2-1.4.2.ebuild

@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="oauth2.gemspec"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="Wrapper for the OAuth 2.0 protocol with a similar style to the OAuth gem"
-HOMEPAGE="https://github.com/intridea/oauth2"
-SRC_URI="https://github.com/intridea/oauth2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/faraday-0.8 <dev-ruby/faraday-2.0
-	|| ( dev-ruby/jwt:2 dev-ruby/jwt:0 )
-	>=dev-ruby/multi_json-1.3 =dev-ruby/multi_json-1*
-	>=dev-ruby/multi_xml-0.5:0
-	>=dev-ruby/rack-1.2:* <dev-ruby/rack-3:*"
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^  end/ s:^:#:' \
-		-e '/silent/I s:^:#:' \
-		-e '1irequire "uri"' spec/helper.rb || die
-
-	sed -i -e '/yardstick/,/^end/ s:^:#:' \
-		-e '/bundler/I s:^:#:' Rakefile || die
-
-	# Avoid spec that is too fragile in relation to ENV
-	sed -i -e '/outputs to $stdout when OAUTH_DEBUG=true/a skip "fragile ENV stubbing"' spec/oauth2/client_spec.rb || die
-
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	CI=true ${RUBY} -S rspec-3 spec || die
-}

dev-ruby/oauth2/oauth2-1.4.4.ebuild

@@ -28,7 +28,11 @@ ruby_add_rdepend ">=dev-ruby/faraday-0.8 <dev-ruby/faraday-2.0
 	>=dev-ruby/multi_json-1.3 =dev-ruby/multi_json-1*
 	>=dev-ruby/multi_xml-0.5:0
 	>=dev-ruby/rack-1.2:* <dev-ruby/rack-3:*"
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 dev-ruby/rspec-stubbed_env )"
+ruby_add_bdepend "test? (
+	>=dev-ruby/addressable-2.3
+	dev-ruby/rspec:3
+	dev-ruby/rspec-stubbed_env
+)"
 
 all_ruby_prepare() {
 	sed -i -e '/simplecov/,/^  end/ s:^:#:' \

dev-ruby/zentest/Manifest

@@ -1,5 +1,3 @@
-DIST ZenTest-4.11.1.gem 71680 BLAKE2B 27bd94ca98a6739829526c06689ee5a890aa254bef3cb7b7b02d79d82a4fa96faa1853d36069aa801983b4927d44b2af2c852c111ece3b64459c99d63a7a072d SHA512 6f3b5dfb8cc8154856e94f20134e9a6bd2d54e052d05d3e7a250f831ee0a3d3196b497cf118322c51201fb8dd30a05b8a0a0462c58a8852354c4dee2a10d867b
 DIST ZenTest-4.12.0.gem 48128 BLAKE2B 32d2d5cdd95b8355b31ce81957cad823c1d5209f0c24cbdf920fe1276d952df4995484af7e576e498273c01fbfb70eb5ed99271405977820f68cd8feac08d388 SHA512 cbce7059ed48fba1a265c9a4360d032492cbc3a67131480e11bc06c1cc7fadcd82139231f16c5ff4fd2a9b771a574f834a71eae21392ee5fdbf335366748150c
-EBUILD zentest-4.11.1.ebuild 785 BLAKE2B eba85278b2741ded6997e8e25c1c5c9f0429dd9fceb19fccbe13cca99a68cb8815359c0dd202461778988c55bed96151b69a0a9eccc917316986b54c033f5d67 SHA512 dd8e9e992366ca526e30c686523a2b2e37b216666b60764f5a1ae5d86a7f266c0e641f7cdb47f19ea70fdffaee05580381b5c20140190fdb79708e19c807450b
 EBUILD zentest-4.12.0.ebuild 807 BLAKE2B 13a87ee24ea2680e45c17e682330836f00a2b02351aea3fc1df34360e1fea9106befe940bdd748d923d9de0cc20afb4284befdaf6a1aed9f38baa2905a518d93 SHA512 5543135cc8b9088f252327d9b17924cc11c37136da3b98b938d15f9c22352931166e9c7331c38128ee3a7b322fa5e1ae4f5e764501c27b24f4f92e7cbabf4219
 MISC metadata.xml 333 BLAKE2B cf1ac3fbb6994dc96110bdb974b726f53fdfe34db473f272ba78ede47b65e26350b807bf291c65f8a8bcf9e12fc3366e431ca32a277d9ac38cf9d4ed7ea46e62 SHA512 d02fdcc6c8ef63d22d0df77a6c7c82ac1d629d29685e6fc653c70079d56fb1b28574bfc7c372a5298dd4a3e20061aecc705d6824c569ce0f99e3dea464f04fcb

dev-ruby/zentest/zentest-4.11.1.ebuild

@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_NAME=ZenTest
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.txt History.txt example.txt example1.rb example2.rb example_dot_autotest.rb"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Testing tools: zentest, unit_diff, autotest, multiruby, and Test::Rails"
-HOMEPAGE="https://github.com/seattlerb/zentest"
-LICENSE="Ruby"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/hoe-2.10
-		dev-ruby/hoe-seattlerb
-		dev-ruby/minitest:5
-	)"

dev-util/idea-community/Manifest

@@ -1,10 +1,8 @@
 DIST ideaIC-1.0.201.6668.121.tar.gz 524536881 BLAKE2B 645e7c0390d89d0e0f1710682a5608dc226154e83ea7368434cf5da61f73064467fe7884d90c13d0d33b8feb0a237ca83446a155a135e3884bdaeca5254191ae SHA512 e2688788188726e418cddeef2bf46a54e8b1bcf4770d7daf5b2ee0d1de7d5ab9c84fef0078622b17e884d9b9cb5b826873b4c120aaec3c592e18ee2ddca2c7f6
-DIST ideaIC-1.1.201.7223.91.tar.gz 529101163 BLAKE2B a8f7847c6fb673a58678f02c1933ee1d6a3a89946583c9488d30bbcb320c743694c5bd8a6d53f327ffdce602f93c92e6c17396af3ab4e235b24f28eaa77342ee SHA512 f272cc8ef90fb4c0ac5fba905caeb459e9657a0f4f643c8e19e5330812477acb57e558808d290ad6e9bfe9c5835d700b59546f57733310e629915c88b2533304
+DIST ideaIC-1.1.201.7223.91.tar.gz 524536881 BLAKE2B 645e7c0390d89d0e0f1710682a5608dc226154e83ea7368434cf5da61f73064467fe7884d90c13d0d33b8feb0a237ca83446a155a135e3884bdaeca5254191ae SHA512 e2688788188726e418cddeef2bf46a54e8b1bcf4770d7daf5b2ee0d1de7d5ab9c84fef0078622b17e884d9b9cb5b826873b4c120aaec3c592e18ee2ddca2c7f6
-DIST ideaIC-3.4.193.6911.18.tar.gz 563415699 BLAKE2B d7f76da2251042c2141c39861b9a737cd7350e4140c6d9ff39182b489e5f14b8cdd033f402cecd08ff367e2a171b2137227813e6bf6d120b97cbf81e3eca3684 SHA512 39fb2aca3da78cf8282beae812662d237eba1ea2f55c30db5ebfcadd74af001d8fe07dc5cbb99794c3723487814eb096e5e70c4f654a6dafd0930432dfa86b83
 DIST jbr-11_0_2-linux-x64-b164.tar.gz 131483925 BLAKE2B fb9c55094aeb4a9e6b89ef41699252355895fa4bf55eaa0d3c0a637b6485b5a91a0445b5f4af1872b62cd67b639f7354e05770970d41dcfa58ffeda7ae43c5b6 SHA512 4f32940166cc8ad5a138866e18d4cbfcd07f4326a85c051b7a622c9dcb8ee4b6d493331ef24d0c01999134fa2a9bad901f026982c16780fdc5e6b9308821db34
 DIST jbrx-8u202-linux-i586-b1483.37.tar.gz 80726147 BLAKE2B e4e5a076a541fd7153e861193ff4247c02ecbc144396ed28737afa7440f7771569b8d968b7c67b3dac333a89ff0b54cc9e5e76d1651b174cc7c0c21b1deb033c SHA512 53693f2ce994f4891807873ae3fe46ce60bee000b78be03c5d3df06b436328abe5b5d7e75d43e57f35f24187f49915187d034b39589e29806f55deeb14a029f2
 DIST jbrx-8u202-linux-x64-b1483.37.tar.gz 81812743 BLAKE2B 86ddf0c8dc992a27e680caa821f54fa4d647a8bff78b9fdbef82996bfbba828a2f68f1a00ed64bd92ce24a62bfc6c0240837c396644c6e91244cb0d980b6c704 SHA512 cd31a3c4da7b8c65e9ae89326c2c8b260b51890258d30f64b1e8a7c6c1442bb2cb68ea2aa80387ce0c1a8f50e3533e8231f72c5935b639e3cf82bc1ffedee8e9
-EBUILD idea-community-2019.3.4.193.6911.18.ebuild 4754 BLAKE2B ef634f522764d63b63ab4b8c333fc9bf38b496f9f9ed370a2e4f1c3393acba58888e08e47c4801552d80ded55e50b356c6152fa1bed8248a02895d2003fa24eb SHA512 334e344deb40b90a6ca5789f48fc667930791d3f365a04d0afba8218459ee2f92eaec5131e89b0c443a116a2cc52c7e852c1be9f2ba759a48536aa8e6c34cc9f
 EBUILD idea-community-2020.1.0.201.6668.121.ebuild 4754 BLAKE2B e737eda8211926ecf893c02036c4df691fa46d530ec2f874d9ebd3540c0a386b82aea8292698f501f2951e6d0fe58c801221306cfe3f62f74ed144457cf50523 SHA512 f5dda7212751fd6895367c13604951d47481b054ccfd313a32b4969797b50f28a14aee04382ae650fbb02dea2af01e4d55e5bca1ed7d0eb7295d5f6e6d8d5c1d
 EBUILD idea-community-2020.1.1.201.7223.91.ebuild 4754 BLAKE2B e737eda8211926ecf893c02036c4df691fa46d530ec2f874d9ebd3540c0a386b82aea8292698f501f2951e6d0fe58c801221306cfe3f62f74ed144457cf50523 SHA512 f5dda7212751fd6895367c13604951d47481b054ccfd313a32b4969797b50f28a14aee04382ae650fbb02dea2af01e4d55e5bca1ed7d0eb7295d5f6e6d8d5c1d
 MISC metadata.xml 758 BLAKE2B ab45d0a8508bed2b64d02ca83d0aaffab9dfceb13a6a188accbb18f0648593ef1a9cfa03f375292b9858c05b17f003f4c6c2261b9d962ddaf679eebe7cea2eda SHA512 15ad0429ec342e939f3406e83b736ec9a273cb4ba33998a83584cee7af4ad0433a5a4758c8d01feb24efef51e4a4d9761db18d0bfc054bf9a0980ac8806eb459

dev-util/idea-community/idea-community-2019.3.4.193.6911.18.ebuild

@@ -1,146 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils desktop
-
-SLOT="0"
-PV_STRING="$(ver_cut 2-6)"
-MY_PV="$(ver_cut 1-3)"
-MY_PN="idea"
-# Using the most recent Jetbrains Runtime binaries available at the time of writing
-# As the exact bundled versions ( jre 11 build 159.30 and jre 8 build 1483.39 ) aren't
-# available separately
-JRE11_BASE="11_0_2"
-JRE11_VER="164"
-JRE_BASE="8u202"
-JRE_VER="1483.37"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(ver_cut 7)"x = "prex" ]]
-then
-	# upstream EAP
-	KEYWORDS=""
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
-		jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz )
-		amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz ) )
-		jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz ) )"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
-	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 jbr8? ( GPL-2 )
-	jbr11? ( GPL-2 ) GPL-2 GPL-2-with-classpath-exception ISC
-	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
-	MPL-1.0 MPL-1.1 OFL ZLIB"
-
-#Splitting custom-jdk into jbr8 and jbr11 as upstream now offers downloads with
-#either (or neither) bundled
-#Defaulting to jbr8 to match upstream
-IUSE="+jbr8 -jbr11"
-REQUIRED_USE="jbr8? ( !jbr11 )"
-
-DEPEND="!dev-util/${PN}:14
-	!dev-util/${PN}:15"
-RDEPEND="${DEPEND}
-	>=virtual/jdk-1.7:*
-	dev-java/jansi-native
-	dev-libs/libdbusmenu
-	dev-util/lldb"
-BDEPEND="dev-util/patchelf"
-RESTRICT="splitdebug"
-S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-# jbr11 binary doesn't unpack nicely into a single folder
-src_unpack() {
-	if use !jbr11 ; then
-		default_src_unpack
-	else
-		cd "${WORKDIR}"
-		unpack ${MY_PN}IC-${PV_STRING}.tar.gz
-		cd "${S}"
-		mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
-	fi
-}
-
-src_prepare() {
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-
-	if use jbr8; then
-		mv "${WORKDIR}/jre" ./"${JRE_DIR}"
-		PLUGIN_DIR="${S}/${JRE_DIR}/lib/${ARCH}"
-	else
-		PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
-	fi
-
-	rm -vf ${PLUGIN_DIR}/libavplugin*
-	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
-	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
-	rm -vf "${S}"/bin/libdbm64*
-
-	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
-		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
-		do
-			if [[ -f "$file" ]]; then
-			  patchelf --set-rpath '$ORIGIN' $file || die
-			fi
-		done
-	fi
-
-	patchelf --replace-needed liblldb.so liblldb.so.9 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
-
-	sed -i \
-		-e "\$a\\\\" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
-		-e "\$a# package manager. See bug #704494" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
-
-	eapply_user
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-	if use jbr8 || use jbr11 ; then
-	if use jbr8; then
-		JRE_BINARIES="java jjs keytool orbd pack200 policytool rmid rmiregistry servertool tnameserv unpack200"
-	else
-		JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
-	fi
-		if [[ -d ${JRE_DIR} ]]; then
-			for jrebin in $JRE_BINARIES; do
-				fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
-			done
-		fi
-	fi
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}

dev-vcs/mercurial/Manifest

@@ -4,7 +4,7 @@ AUX mercurial-3.0.1-po_fixes.patch 1396 BLAKE2B 2de846558d2d2f8f4d4ccd7d8e0d65fd
 AUX mercurial-4.8.1-unbundle_zstd.patch 393 BLAKE2B 8556147baa6e493ee81aef1a68b2b6372ba094c6d5c73e97faa3f2da48179085ad475fe8d646916d3fb3294a166abec4a8b2a5b5e00cfd8fdaf55290a745ef2a SHA512 003844caff3dd4df15db8a6a084ee71d456026dc9222bf469f9489a9946a9205a57db274a26dabdc2d73fdff24cfd291f70b99141f2c9aad6e58d0fe1a1e7254
 DIST mercurial-5.2.2.tar.gz 7333065 BLAKE2B 9cec5a6ebe4693a1b96fe268211aa2eaa06643d5b8812c427757839d5389319f0e2ff3c1ed964a56bf8a3c46f7630321abf508c61691102856dfbdbd72fed662 SHA512 875e75587ab1f1c54edd2f7198dff21e6b287425f215a9d28ef98d5359420df90ca7ef0128ec7b772c4a31dc95b1082b4d6d28f1754968a08408516ba9ec91ee
 DIST mercurial-5.3.2.tar.gz 7514256 BLAKE2B 250ecd5c0a64138cbcda599513efba7b040c0fed0f020c73ade2525e0ef8a9ad06c10c5df4e16eb9bbeb3ab0f2cbb622a65f6d4827b269654c662810ef0385fb SHA512 b0afcf82b51676d2e7592eb9b29f9611d59816399166400027b6c8b29c10c9ddc96b57f7913e78f938b1345bb7ac29ecd4ddc793165b7cf192c3c7a95712cc99
-EBUILD mercurial-5.2.2-r1.ebuild 4260 BLAKE2B dacafbc137616dee14931e46b4e59a72c04ab878ca2492110258720fc9a2dfd8eea444cd6d88607c29d7039b2c8cc59d4e0c10fd9682d14dfdf24a21db426666 SHA512 156c151fa6a92d731f336a145b512df75d599a818892ae3b071be084150251450b9e9a48a55ed57f4948a719a31cabd217e0bbe0fbfcacd1be668c6213f6d19a
+EBUILD mercurial-5.2.2-r1.ebuild 4254 BLAKE2B 543b201e0a2e3b5f1b0aab0a923232d08827644cf0f8037b6e085b7fa3f2db1941fa1bc37168d4424af46da351c7b47a8cfa38ed7bd775d3848aa4a65c457098 SHA512 7c514839c68522b7fc97ef8af14abe0a7595612d6fb7daca714e1f7e53f9627d5ef63e096e459c80a47e66177ba9704df8db3193ef621bc9b7d4ae35da98e39d
-EBUILD mercurial-5.3.2.ebuild 4273 BLAKE2B 4f4406b42a28133842cf93d85f5fbf11a17ad2b90128f51544b83db8ae32a0c140e9083d3e3a93812cd97b1b591fba02db48d6f667147d12ad2072008d343fa8 SHA512 06639342b94328556a84c7b51fac33bfa1771e50668d50b29f23a3610a26fa39894efe9b14d1e3a60f0aacb3903b623edc5606d1a9fed64844374b8999812e85
+EBUILD mercurial-5.3.2.ebuild 4266 BLAKE2B 070746bf6e8b7a1ab4ee60dba7cfaf9d3e6c7e9ed513cbdc31039c28eef80e7aa0f7c4749a5527a511d8627d4d4e43e157482fe2f164af8f79f0761cd3b900bf SHA512 725e6dda70241f4688783104c9cddc5048d61c071f4be85ea37c16d12a7b1257da8666031e3b4bd8b00b7d95f4b199adb1f0bb95755b71cc2b067791d3020a39
 EBUILD mercurial-9999.ebuild 4219 BLAKE2B 567a43e6491cf5317dd96998a57a6d562d07583a9b45ff4f45d01f1f2e1b61243ac646356efb90d86da51dad6634d5ea9a574a348ed73f4a2acf484a2608083f SHA512 d4e0373b8374205a72141e1376b7b17a209cd0e83456e5a0f95d382fa8b20173274f65cac74151a7dd99afb56a50cddf1fe352007fa5e1d7e198b5a37529f3c1
 MISC metadata.xml 483 BLAKE2B f81d3e855c41f0f5bef819cf4fbb537591f187917c76b5d153f9bf5f4cc14959c5aeef17ec9e5a0596d8e6bd2d8db0ad86dd4dea5ddfdd44a4c063acdc6a8a81 SHA512 3132d4cf6a2ba22ee8f93aef8de590bd576143dd80f56d515afb14cd5962899c0dfc4aee8552f041bac77b997055b2b407bad104591286be985de839f159fc83

dev-vcs/mercurial/mercurial-5.2.2-r1.ebuild

@@ -14,7 +14,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+chg emacs gpg test tk zsh-completion"
 
 BROKEN_PYTHON="

dev-vcs/mercurial/mercurial-5.3.2.ebuild

@@ -14,7 +14,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+chg emacs gpg test tk zsh-completion"
 
 BROKEN_PYTHON="

dev-vcs/subversion/Manifest

@@ -6,5 +6,5 @@ DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5b
 DIST subversion-1.12.2.tar.bz2 8506584 BLAKE2B 535e4c6c369537baa7f9fc9123d0314de1bb8d4b3c51e0216662047fd1084ceb6a1f349de54bf575f0eb8e1041fcd6525e6cf27dbd908e2148578cb9fb807bb3 SHA512 b1f859b460afa54598778d8633f648acb4fa46138f7d6f0c1451e3c6a1de71df859233cd9ac7f19f0f20d7237ed3988f0a38da7552ffa58391e19d957bc7c136
 DIST subversion-1.13.0.tar.bz2 8508122 BLAKE2B 761def1bb3a1fe5333534ebda0940b618c343f919688055cdef69552bc515ad6cd9db3ac67c8c73075487d4f45d93bb57fa467288756dfa163fc72c8e8c7b548 SHA512 36f390b412bf772bf894efc2aadc247f12ca30ac407e04f664c14411c3519e1bb242d1239f2f44cbcb86eafc7c413efc8eadbfe1d1e75118235a7b7adc6c85b2
 EBUILD subversion-1.12.2.ebuild 15517 BLAKE2B 6a8573f750eb273d22f67a7857652305284e8b8fc7a32fda5a00f9f826854635ef7c708cae0196a10c41804881ec5f3fa68f35415eaf3073efe4a6dae79fd965 SHA512 051325815cbea5de0ecc001c5c7d30156dce016082a92ec038f0298de24d8fde4b07b506d82567c3ae932b98466fed13da1cf790c98956f73c37a277ab1ca5fe
-EBUILD subversion-1.13.0-r1.ebuild 15514 BLAKE2B 66ec84ec4ed73c0f6c3083add81ae68936a80de22af26f79085b6103b588d51aafd6c197201e32bcadb1010871fa90e2e70943aceb323061d63a7605ed317b26 SHA512 e471674085aa9d6c719aa55d81e9082a32540703914927b9d26df6f15aab8b34c8801b629e0d65c1037bffae67ff0fe35e29e2f7929601ee377c41772747eab4
+EBUILD subversion-1.13.0-r1.ebuild 15771 BLAKE2B 11ddd4bbb4c697c2e5960dff4498644d3aba2d43ff9c8e4de41fd17237150ea07b3b27f636f8f1f58dbcdcf6f507f8778bea522120bca36c4ff064e1f48607d1 SHA512 39edac6ad38b16d280bb08b2fb13a7ec6e99e6173a05d3b19e9cbef0b03dd39c7af847f2182acd71afc98f49fd7608773815193ed98911bf563c449608cb139d
 MISC metadata.xml 575 BLAKE2B 10cda26a50a50e6ac6b16d578d1a3856f88ac12b56ac6ff1768c4a0e0240b2e6abea6b1f66a6ea7d3f817e75eb9e2d5e14999ad2ba330b55784ec5028781b994 SHA512 f2a6ff822a11d452c133aca4abeb1ffb214d946c7e706d1caa269564c4dc55374c17449a4912df54b12ce562d66058baf2e710f3e9e46ca3602e9d8483555584

dev-vcs/subversion/subversion-1.13.0-r1.ebuild

@@ -154,6 +154,9 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# https://bugs.gentoo.org/721300
+	rm "${WORKDIR}"/patches/subversion-1.10.0_rc1-utf8proc_include.patch || die
+
 	eapply "${WORKDIR}/patches"
 	eapply_user
 
@@ -260,6 +263,10 @@ src_configure() {
 		export ac_cv_python_compile="$(tc-getCC)"
 	fi
 
+	# Remove when >=dev-libs/libutf8proc-2.5.0 is stable
+	# https://bugs.gentoo.org/721300
+	append-cppflags -I"${EPREFIX}"/usr/include/libutf8proc
+
 	# allow overriding Python include directory
 	ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \
 	ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \

media-libs/exiftool/Manifest

@@ -1,7 +1,7 @@
-DIST Image-ExifTool-11.91.tar.gz 4723460 BLAKE2B 186d7f4df45fd67b42a7cc509873e234f8a29c7889daf10608405c2795db2cd7e8be16401d2894b5e0831ace7f96f2e676fdf2ed257e5a2534290cdc2a1ba706 SHA512 5d00ac834f44908346a8b8125064bbfeb1887d5024d04a346a9a679248a45ebaf76c067511a245b96553a3881d1d3b06845cc6a39fef7293b9ad13bc70ebd650
 DIST Image-ExifTool-11.93.tar.gz 4799548 BLAKE2B 29867c0407bed7568d92a4b8a0df1ea1377ad9ea54ea9496d09b5b76d946999db312247d6044c179cb064471f888c50c31bc85ddd44475a78a122eb413d73bba SHA512 e8d9dd34710e3346788e10a3b50e4d2a4ba1aeef1969efeec1ddcb7507378b313554e00587cda9c71a325f7d4d7238c91f743c67051d9cef8a012798551dcc59
 DIST Image-ExifTool-11.95.tar.gz 4802010 BLAKE2B c1486ed0c84d6837b9bcdbdee31af5c4c3038442cac8a516b6b7f079bdfb28858ddee18284fa3a88925cdea70a87c1cd444e35fa99ce1b201af03bf1c084d796 SHA512 9def56bde479312584c60ec847338aa55fb3697b6c0e8f894291f6cd67cd16440b563a3982bcec3d787860ba35046f73089f90065891f6f6d93d46243a08c485
-EBUILD exiftool-11.91.ebuild 543 BLAKE2B d445606330f27e933b1c4b98e141b9aeb22a5ef53c866abed26fdef9b858c833d9ba4ada11b01c6384d6e5248fe4f12413d4abf7e5bf8c49593436e219f6e945 SHA512 e53b79e6f457d0f004ba8d12a994934746d1f14382e41350c317eeb61dd1518e01ccb437b2aeac503676d8de4908290bec6d35e3f249c6675e9e2242d0e8a1b0
+DIST Image-ExifTool-11.98.tar.gz 4804406 BLAKE2B 86bf7fdcc9781fa22e379e3f04ec01b43451978ae33f1c811796ba820198ca417a9ca94b634a8c39acb01604bc8004f47c20e747e6b19f5b4833d29c5cee8fb1 SHA512 d992173a16679b0c3b9fcc466713d5c208e7b161c542535e88088f9695ec14f0ff76ae5fa46d0d6065a8ee366464d0602783170438e2f8fe02d21e458365bbb0
-EBUILD exiftool-11.93.ebuild 548 BLAKE2B 9c445a8b1392e1479a5b207a2d5bf27dc49933ffef2ff6d1cd60d2d0db74ca7334dafbd378e4fa584cb76c38aba1499acc0bb6c89184b2509f609794ca53b619 SHA512 0e2d98eaabc1d5eeb821bb6d96abe38a14297140d01b8f07fcd8533b6b5a03eb0e25e86291452eec8f7763e6ed4fbb5d2d4d9bd44c4851de063f99c264c78d01
+EBUILD exiftool-11.93.ebuild 543 BLAKE2B d445606330f27e933b1c4b98e141b9aeb22a5ef53c866abed26fdef9b858c833d9ba4ada11b01c6384d6e5248fe4f12413d4abf7e5bf8c49593436e219f6e945 SHA512 e53b79e6f457d0f004ba8d12a994934746d1f14382e41350c317eeb61dd1518e01ccb437b2aeac503676d8de4908290bec6d35e3f249c6675e9e2242d0e8a1b0
 EBUILD exiftool-11.95.ebuild 548 BLAKE2B 9c445a8b1392e1479a5b207a2d5bf27dc49933ffef2ff6d1cd60d2d0db74ca7334dafbd378e4fa584cb76c38aba1499acc0bb6c89184b2509f609794ca53b619 SHA512 0e2d98eaabc1d5eeb821bb6d96abe38a14297140d01b8f07fcd8533b6b5a03eb0e25e86291452eec8f7763e6ed4fbb5d2d4d9bd44c4851de063f99c264c78d01
+EBUILD exiftool-11.98.ebuild 548 BLAKE2B 9c445a8b1392e1479a5b207a2d5bf27dc49933ffef2ff6d1cd60d2d0db74ca7334dafbd378e4fa584cb76c38aba1499acc0bb6c89184b2509f609794ca53b619 SHA512 0e2d98eaabc1d5eeb821bb6d96abe38a14297140d01b8f07fcd8533b6b5a03eb0e25e86291452eec8f7763e6ed4fbb5d2d4d9bd44c4851de063f99c264c78d01
 MISC metadata.xml 10159 BLAKE2B 3b879f3679b07864e8e32d0223d1512919d56ede4b51bc5a550a83694c8c956c6e6e60a92309ceafef61ed738ccd0b5a6817094b4132be013560d3d7830f6349 SHA512 88662e634877bf2b67144fd37a862626e247f7df5daa82ed8d7a91a00611290d3976687221b5f58b78111a8894d45d55c8999966436f621baebf1bc7b3561484

media-libs/exiftool/exiftool-11.93.ebuild

@@ -11,7 +11,7 @@ HOMEPAGE="https://exiftool.org/"
 SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos"
 IUSE="doc"
 
 SRC_TEST="do"

media-libs/exiftool/exiftool-11.98.ebuild

@@ -11,7 +11,7 @@ HOMEPAGE="https://exiftool.org/"
 SRC_URI="https://exiftool.org/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
 IUSE="doc"
 
 SRC_TEST="do"

media-libs/libmediainfo/Manifest

@@ -1,6 +1,4 @@
 AUX libmediainfo-0.7.63-pkgconfig.patch 291 BLAKE2B b13ee095a9f1f322222bb10013ffda778eef68dd2f161553b96bdd24f0c0ba81281185604547c355c14190580fd36cbb019778674e8c72a02ef3e3fda9229f76 SHA512 4cc11f6219a68ad59971a3d85f3184c16ec25e60b96ac56ac73796493c516575e0ccccee814610d5c248ba4c8a0a2a590041464d2aa1ac3f8a717839127c91fb
-DIST libmediainfo_19.09.tar.xz 1764640 BLAKE2B aa1a93cbbdf17e2b1eb20efed4909c5d86e897796e1e184f1bb5eed50e1eb154f426b420551e25cb220f66059618b6f719c47333b816258eea6e3c30304892b2 SHA512 7f3afbb1c2df6e2dec44485a4eda8609d6b95c1b8e41354cef6b94549f77a506e237c7d43f5472aadf1c0ef2bd88dc24ba0eb493a763ba51871bb287233ae779
 DIST libmediainfo_20.03.tar.xz 1799940 BLAKE2B a0c50ab27e29b010e33334c207872aefc110396401065d3bebdc6cf34aba325453b87e9f1f1ecfe9882bf5f63aaa26f3bbfe3d791cb0c16fa75ca4bb7ff081f0 SHA512 97dd847edf0e290f7ea0153c71a442cc54944bf295f195486f37fa81230cf4463ae2ecc154e73cf75b876b33c038020a9ff082013d57381ab5516a4a2db5ef87
-EBUILD libmediainfo-19.09.ebuild 1851 BLAKE2B 09ec6c25ec9977f1764f24ca6c39ed2013b3ddda62864fbdf727f9ee308b28c9d0010884c6fdfa4913ab0b91b9c72a4498f1fcf04dc8bcf79de36812391b42c0 SHA512 b74be9f0fa84c180f328546668d94b7db01cd8b4ad5d05ece46f67f7895fe2e2b76849f03ecd6bc6a42af18754b5e1ab1337650c0f8afd9a4426becd7ef78120
+EBUILD libmediainfo-20.03.ebuild 1851 BLAKE2B 09ec6c25ec9977f1764f24ca6c39ed2013b3ddda62864fbdf727f9ee308b28c9d0010884c6fdfa4913ab0b91b9c72a4498f1fcf04dc8bcf79de36812391b42c0 SHA512 b74be9f0fa84c180f328546668d94b7db01cd8b4ad5d05ece46f67f7895fe2e2b76849f03ecd6bc6a42af18754b5e1ab1337650c0f8afd9a4426becd7ef78120
-EBUILD libmediainfo-20.03.ebuild 1853 BLAKE2B 668269c8a1db1c58e8033ee508ed9e9c55fa64165e6d7b55f967aeb2949ba71dfeb9c50ea2e5c03bdcda020c54857ab057929be9b6b727bc1b74fd41c01a8f05 SHA512 a56f9890c60876c346118f37618cf3a73f9284781a95fdd5130f620220508a41d550cca50cb636edd2a90a8e2d44819dac581f0610dba570a7a34f21ec60d90e
 MISC metadata.xml 346 BLAKE2B ace7bcc20d5e1a949db03a632f4f181353c530a0aad6b6839ea4d682bcdde0f3184c1886fd3015ba73f6ad63ace53e07f21bcf7f8383f12bf6ad73374d895c7c SHA512 bc66ca588f3042de05db14d4036fba4637f5dd0d03d3cbdbdf7118b90f5a6f8ad0e86a30d9263e7d283d94f61e54da6c92ff03acf1cf83db376366c0c4f76c93

media-libs/libmediainfo/libmediainfo-19.09.ebuild

@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools eutils flag-o-matic
-
-MY_PN="MediaInfo"
-DESCRIPTION="MediaInfo libraries"
-HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib"
-SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="curl doc mms static-libs"
-
-RDEPEND="sys-libs/zlib
-	dev-libs/tinyxml2:=
-	>=media-libs/libzen-0.4.37[static-libs=]
-	curl? ( net-misc/curl )
-	mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-# tests try to fetch data from online sources
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library
-
-src_prepare() {
-	eapply -p4 "${FILESDIR}"/${PN}-0.7.63-pkgconfig.patch
-	eapply_user
-
-	sed -i 's:-O2::' configure.ac || die
-	append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--with-libtinyxml2 \
-		$(use_with curl libcurl) \
-		$(use_with mms libmms) \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs staticlibs)
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc
-		doxygen Doxyfile || die
-	fi
-}
-
-src_install() {
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/${MY_PN}Lib/Doc/*.html )
-	fi
-
-	default
-
-	edos2unix ${PN}.pc #414545
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
-	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
-		insinto /usr/include/${MY_PN}/${x}
-		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
-	done
-
-	insinto /usr/include/${MY_PN}DLL
-	doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
-
-	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
-
-	find "${ED}" -name '*.la' -delete || die
-}

media-libs/libmediainfo/libmediainfo-20.03.ebuild

@@ -12,7 +12,7 @@ SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="curl doc mms static-libs"
 
 RDEPEND="sys-libs/zlib