diff --git a/Manifest b/Manifest
index c5935fb0ac4f..b03d1106944b 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-MANIFEST Manifest.files.gz 29438 BLAKE2B 6dddf5d9ac0311030eb8f6a945670c6cadd81e855f9935dd42b19596a1d3360e6a109860c7ca7c1364912cb692b39d79e3bb270d675b1601be3e5219c095b116 SHA512 d696b2d1fa39204f41c8045e2a5369a5674ad66d0023f943eb508e6a8fd718b08287d9a28359553b3f47e5adb0687acc38292a9622938eec1afecdb1463ec922
-TIMESTAMP 2020-05-27T06:08:23Z
+MANIFEST Manifest.files.gz 29461 BLAKE2B 2b08e4a56f28db9ba565ab36c4c21e8ce7018e8ba81b8f5e12ab139b40b64aeb0a71dd0d4867340d0945347dea9395cb3ffd360ef61f25dde6b03db2bbe9e918 SHA512 d7ec8be15f947eecb858be0ce5f043e555527549bec3f3a776111727065df5c3b5097f1b3f52dfab3a87cbc063f4410684462be5b1fb296bb5d3978c3212ada7
+TIMESTAMP 2020-05-28T05:38:24Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl7OA9dfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl7PTlBfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klA6MhAAjm5eApdCQz1YOjil5BLJEUA2FcV5M1cGNC/K3Ugt0+j718/NPC1exDO7
-ljV5U035BXj5xxXi4nY0CoTcgNtEQh+RPAQszm8UPLD9L+V1Zey5PBK6ViCOt4L0
-YiOsnFMcIhWI3LCzzP5Ha126M+iyRo3OkekoA8UhBE4SnoQUmIS8Me65VMF+6hoS
-T6zntUUl5DYFXmstFfBfZyKjMNKUr/4QhBzOV9qkKdMZRkH4vGsnCOSKePf05VvS
-R/FvG7Bws06ZEUjqe+iPLDsFmD1o/WaQmUN/OvCdnZ7zbpbZ2u4sb+ZszLyGijV4
-hRqAxSZjQ8GFZ0pDN4HhlYxvto/cZTFVlOwy0SbTQtfMGXSUHNM+zrRf/ZLld2oX
-cdLCccfmvHt0uP46MGCIj9oZ6PsmLnKlYYS/qmPKRiHT6w4sTAmn82N5bS1M63hB
-ajHUXuxGc9uIVst8n5izsqqSSrrjSf/7d6SkzUZwit9mATyrVdYiRAqTaZ4hK1dN
-lef+7lCrptCgqHVth8J7tJY0MYGQPJd01PS5uPUdP6YoELi+MnX97aMFUCuKr4wd
-oU/pJ/4zwWWaDcbGbFymfr7NivuByzypZ5zEGB5e4AhG7Cg7jIw25VBzHwGYd4J2
-OgCzsx03Z9tp3QrTiKT4dJ75QVJ5kx6ArYBaNWPCobDMM7cOVsE=
-=ZehH
+klCMfg//XQ/nad7KlAfkb/1qtYK10tnmXZlCnWJmF/AXFUixxt7r1bUwAp2RmG2u
+hLw1SjoTlMlfMuqNHLqAjlBPZ2WA0Q4kpkUtdL7RJM2Cfd0dZnVraeQgntobnjeP
+zeYufgwugeXtNmPScggDdZgYGR6xls20GnQI4b0z81RNN3QeUnAi+dYhaLrzg5k2
+1a+s74xQ2SKOvozSAtAYKXk9RN5bH1EONruRZBYf3rbe59Zl2C8ysFC53Pvx+H4b
+GE6Ohll8iachgCA4P9cYDfTw3wh3/UCtPYZqdrIBLH4vd+YTLHjPswNKnuQ9moeT
+DP5QlBbhWZtgsHCh8mhEm7RILx5Cmr8hZqIZ5O+2wD1ikOQwRx1LhGjDvVruBazn
+/qfIQXa0nFxbmaYqfb8U1UnUjG+q+iqNxujxWMqlENWP8hEX2xHTjqnhfMe/3igc
+tacbgsnKwj4RbZh1lqRNC/jfMG7JSAXjeVzq2wPxrmKFnuKQdDmKo6Nyjy1MjHBu
+CpTQEqewPdRBHN0CXKWpZ2bsLt3x4bTbe+UvfoSmQzAgOiT4JViTbHTIHrzDviPF
+ONQeMl0kcfvq3qTTbUoa++un0WTAsx5btxmFt2iihPhxq4z6or6mPz7u5axBA0qK
+xDmsXvxQJXj1xCjDD732BhlKf6o5N2GRZ95zghgitIKtdjIXH8I=
+=URx1
-----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index b1e81b4b407a..bb5d595ca1d8 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 5eaa8eb40aa1..69c6c842adc5 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/checksec/Manifest b/app-admin/checksec/Manifest
index 1f54493b639a..c4985d73268c 100644
--- a/app-admin/checksec/Manifest
+++ b/app-admin/checksec/Manifest
@@ -5,10 +5,14 @@ DIST checksec-1.8.0.tar.gz 52391 BLAKE2B 3720e4faae5aa82172c673ce7ddc662db1433b8
DIST checksec-1.9.0.tar.gz 196168 BLAKE2B f9095a516f166e9a407c9796e28ed7da4ffd97686923745e46b0ab4110f084690781995b6cc190234b8a26fe1e6eb2c8f32f7f15191f0dbc26b38048c87e9a2d SHA512 8bf68dd0b86a6eceb6f5eb016a15ed1bf7d086777c3ec1c62848ec23e62dceed4579404d76824f17b8e1305e679ba6204f0dc4c224f7a11067651f33c2d96515
DIST checksec-2.0.1.tar.gz 199903 BLAKE2B 726d3f868cc73649f7a3cd42270ab1c6965d6bed772f3c612064c54dad569e748f5a2d24df2b8663328442ba8126fe0edac04b0034ba6a23bf6e32ca93a78e30 SHA512 b2466b621b6ddb3fa01cfc5eb3dc301d6d616b26ddd2017a622ba2a24e9daf8f5e294236d1dda695fd9ab25fa411724b5f7dbdabc944cdc124e4369c176f35b4
DIST checksec-2.1.0.tar.gz 200384 BLAKE2B 6e954f574c632da1aee629aecd7ded6286879ba6156252c3d4b5d11f52e3c457bb1d9223934c70f402aaa1e8a8f8d530b55c7f860c024c86c2c2bbcbe9216646 SHA512 66090777de15c492090da3494127037ffe20a169b426b054b3a8f642e9c980b2a99d5c8f8411715d74b1faed41023fb17770d3f07eec5b9efda0a43b64c07a74
+DIST checksec-2.2.0.tar.gz 2241197 BLAKE2B 33e76d1e74188f0944cbce2fcec3daab5a3bbef28802f36252a5bd8de33c96497cafbce0bbe91ce0bb2ccedf9aae1904224b5f68e31772723523179e76b69070 SHA512 a77e5f798ab651c509e0a75c6ca13e556ba354149acbd2e32d54f7a3318fef5f8a05bdb537374868836d5bf3c4d4e86e8354d6202dd1ba0e45a221e2d8688544
+DIST checksec-2.2.1.tar.gz 2241504 BLAKE2B 65d71e4ad589494d34ae0458f4b3e453f6bfb86ec0ce46b5c18b6e5c49e1820b9721b616da22bafe7614fca59473a736058584a488a84b85e9799dbf59f7b3e4 SHA512 7c6474479b51f70a627515a0d770f4d70df0350253547b3b8c1a5be83e2976b127172167ca9890d5e0848627c582adddde5acb2f7b30ff7d12d4a81370b43b0f
EBUILD checksec-1.11.1.ebuild 757 BLAKE2B cb3a4bb1505399b4b6b8f13e5237bb17f74d153a088d782427e2e8c53b2422f740455dca99ff29de6bf3fccaff2b1c8b1bea7ba760d08fadf8eb99bfee9f6150 SHA512 5669162f5f0d7e6c679bbf4cbb374d71c18452c7ac59451d5a4d39979f14dee9cebb91d63a37b61e38ea09d62e6931c3c48e853219dca6109c1cba32aceba52c
EBUILD checksec-1.7.5.ebuild 761 BLAKE2B 928d7f91b7ac04ac04a9bcfaa14f8ea781eaaf2be75182d7b8d0f3cf63e0bdf9178d03da87732da11286ba172e2368eb5fa490021c3d5d71f3419d426b7b911d SHA512 5a15da1104314647688e68017189e1b661f0efd58d3a7ad5a788ab2cdda79249dce9c07e9db48d775ace6d8fb8679f2cb6669c1f16758f9c6e736e9eca2d57ba
EBUILD checksec-1.8.0.ebuild 763 BLAKE2B 3456a3d42a58795e00cf46689bc60a99357dfec5a8ea7c43841584c10d4fe8bceb3d3c0e3a4965cd38e7c718b6c716a36cdbf895635a458122aaa34324f13600 SHA512 dd2af6317e19baef0e21112b6a64783dd1ccffaf2f0f2d80acf802b4ee14b021be23548375c9c86c8a073da38bbe4f1c58c533cb5b16cf60e082f8164dc84738
EBUILD checksec-1.9.0.ebuild 757 BLAKE2B 526fb5bd77d4f06d01dafef1174eae285b5ee2a1ae72882f1d05d07ec141b519ef39f622f16f4e098c3df0b31f8419b6460f2d51a462b09324519efa3235fa67 SHA512 29ec62f61fbf71e19aae933ea6b01e6f606c043e50d4c004214219a04cbc96d8ede61a444a822e1a83c0245e0e379ee553e5f4bc2d7d11a2577aa0b2e9f9eeae
EBUILD checksec-2.0.1.ebuild 759 BLAKE2B 18b155566819f22cd16c0c13798bda4b70da1bbdc5cbf94c0977d2edcf6877f7819fc91421d6be8619c8a20f7d2fac3fce2f698a41f25aea727e3f843b1ddaab SHA512 3b34ecfcc2c1c73ec5a8565e9c07415bf6b1d6a682c6f7c8b17db07917706c9247c7c67aaca7d03d894547892a978efe11e4fa01322e80c9093d0a6d3b0d0386
EBUILD checksec-2.1.0.ebuild 757 BLAKE2B f638f3ec54f7d6f7ed1d6b5affb2cc8801ea61686f962e7e7d43391ec7512dc6902e8a0a5ba3c7efc1ac8cb549b7ecf0baa5558acba9d4ee969fab635d1eb36a SHA512 974d9f5c147385193d1525bf5cfac3dc7a9c027d0fde69cdbdd33de9ad384c3de624643da737f978c6efb7f121f3c7d71a5152582cc92a767f23ede3b2a74974
+EBUILD checksec-2.2.0.ebuild 759 BLAKE2B 114f4b61410767dcbe0828b48bc6e67b047ce0fa0293b51da79e19870f654a20ca11ccef4abd684fc1f7ab992a0491ac46c634104d514e7752c77eca9975a00b SHA512 d8eaaaa60e82cfc7d063cd1f20441abfc16ad9caf9ea0b3a67a81aa0fc910817ec4d1ba0411c2bb051fab7ce458d544d0cbdfccc046163a2fb59beece440d10b
+EBUILD checksec-2.2.1.ebuild 759 BLAKE2B 114f4b61410767dcbe0828b48bc6e67b047ce0fa0293b51da79e19870f654a20ca11ccef4abd684fc1f7ab992a0491ac46c634104d514e7752c77eca9975a00b SHA512 d8eaaaa60e82cfc7d063cd1f20441abfc16ad9caf9ea0b3a67a81aa0fc910817ec4d1ba0411c2bb051fab7ce458d544d0cbdfccc046163a2fb59beece440d10b
MISC metadata.xml 334 BLAKE2B 96b933c9475a18c3957d46b58c41162e396f27ff7c53eaf4ba5be2a24e22e8a136a0814cce5c0d3c113e5d18a286fdd34a1b3cd46e509a7eec986f82d7d8ea9c SHA512 dd9373f93f165e576bd930ae4a49019d0c53359c4ef288c5d1ed5fc1033b82afff7d0421551eb9518bbfb3f25bc7cdab09cf89b1e0bd9c1ffe0137432d70b716
diff --git a/app-admin/checksec/checksec-2.2.0.ebuild b/app-admin/checksec/checksec-2.2.0.ebuild
new file mode 100644
index 000000000000..894f6578719b
--- /dev/null
+++ b/app-admin/checksec/checksec-2.2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PN=${PN}.sh
+DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
+HOMEPAGE="https://github.com/slimm609/checksec.sh"
+SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+DOCS=( ChangeLog README.md )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.7.2-path.patch
+)
+
+src_prepare() {
+ sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die
+ default
+}
+
+src_install() {
+ default
+
+ doman extras/man/*
+
+ insinto /usr/share/zsh/site-functions
+ doins extras/zsh/_${PN}
+
+ dobin ${PN}
+}
diff --git a/app-admin/checksec/checksec-2.2.1.ebuild b/app-admin/checksec/checksec-2.2.1.ebuild
new file mode 100644
index 000000000000..894f6578719b
--- /dev/null
+++ b/app-admin/checksec/checksec-2.2.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PN=${PN}.sh
+DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
+HOMEPAGE="https://github.com/slimm609/checksec.sh"
+SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+DOCS=( ChangeLog README.md )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.7.2-path.patch
+)
+
+src_prepare() {
+ sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die
+ default
+}
+
+src_install() {
+ default
+
+ doman extras/man/*
+
+ insinto /usr/share/zsh/site-functions
+ doins extras/zsh/_${PN}
+
+ dobin ${PN}
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index c8c664f1f3ed..6f7cfe0ecf50 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 5cc6d66ee343..d7f0edac3768 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -2,5 +2,5 @@ AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048
DIST gnupg-2.2.19.tar.bz2 6754972 BLAKE2B fc1b9afb398ef78a6d239c62fc88cba7148679b1b666ac39dbd9644847e99de1a683a7938bc112cb33adafe555472319dde4f64860071446a66cd79934f7d69c SHA512 d7700136ac9f0a8cf04b33da4023a42427fced648c2f90d76250c92904353b85fe728bdd89a713d847e8d38e5900c98d46075614492fdc3d1421f927a92f49dd
DIST gnupg-2.2.20.tar.bz2 6786913 BLAKE2B 43cf9402a26e67d6c7c2444eb2faaee3f06ea0bf6c07708a50834c5d7424db2f9c38e1f0046dd3a35082abc08d401b2951655e7e068f0873db297560b87d2667 SHA512 3e69f102366ec3415f439ab81aae2458182fa1a18dfb86565b1d9dc638f3fc4c179a5947f0042b7c5a813345676285a662793664a1803ea9ad8328f0548e0edc
EBUILD gnupg-2.2.19.ebuild 5324 BLAKE2B 5c294c51bd7a8866f64b1c10e8dcfe4cca8e3ba11ab17b21a057654d969bdb8b9b598461f757ed61f1a00bfdf49632b97c53642e6549c9d9a75434c2885f328a SHA512 67fbaa708dcd39a31a4d61a413e1c27eec94758e8e7dca56303c9d6dd97ea750e74a3a8ef551f42df0d5575e23e0916bb0b99d6834f9bd2930f4b72d8f1e0255
-EBUILD gnupg-2.2.20.ebuild 5117 BLAKE2B 28661bf7d706f17224c523e880604bf8ff74b441cf73fe37d1ba5f29d40d3fad4afd0080b84597d16521223c9b50d5977579892642928948b88a213c4ae8dfd0 SHA512 3b5229e8f5823642714eb30d8bf47616ef90b774b27283f46926067ad1f20577b32265a616b2215de7af6290f4ccfd76068e8255db4011ec4d91603ffd9da9a8
+EBUILD gnupg-2.2.20.ebuild 5116 BLAKE2B 23b115e992bd0a12f516f93766a1b67d1d7e26d1b22c11480a41276101173182bfa3cd8db2f01bea9c09409a2e6214c4846c2d84cca9cace67cbd3778bd7b2ad SHA512 7e768ea8c3304312f11a04eddec071e81a0619b0c54f49ec0fdfacfbba4e411bc9edbe9696b572993b866fd389eb09dc57ff32d93f6b482cc5fdd36dddd033dc
MISC metadata.xml 1212 BLAKE2B 36bd1e7478abbb579b33292418dc621c65869151cfd0cbe9cb7b553adf92b606273f415db763ec5c3884e91f29929f79de1cbf15cc47626b1115b168d567790e SHA512 646ec87262b7069808976e17fae4b2101f9a8aae7ad5bbd10abce6077a5e4e741eb5692997af4383cf8cd3e6b03ded83f9dd5245ed112533c6a6e4c752b1060a
diff --git a/app-crypt/gnupg/gnupg-2.2.20.ebuild b/app-crypt/gnupg/gnupg-2.2.20.ebuild
index 1f486666dc29..cd7106ae9204 100644
--- a/app-crypt/gnupg/gnupg-2.2.20.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.20.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~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 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
# Existence of executables is checked during configuration.
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 2ed3535c68b0..b73a3388a1e0 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -18,9 +18,11 @@ AUX mit-krb5kpropd_at.service 162 BLAKE2B ccd1dea2419656a95ea1e5068457ea45a765a8
DIST krb5-1.17.1.tar.gz 8765399 BLAKE2B 46be864e2db9c70d164532d82776195bf57342ce4f1fd7dfcf3cf6bd72a3639a69954f742607a2b8950b4dea8acfac5d633aa379d669de20bafe54b407bab94b SHA512 e0c3dc0a6554ab3105ac32f3f01519f56064500213aa743816235d83250abc1db9a9ca38a2ba93a938d562b4af135a013017ce96346d6742bca0c812b842ceef
DIST krb5-1.17.tar.gz 8761763 BLAKE2B 76f636836c67e9eefca91c9417118efdcf4437c1220691f43f3d246daf3eabd53b40a30956f0e57703c3fde5d7193b1d86b68becf3ae1c0c803d2462e79d3014 SHA512 7462a578b936bd17f155a362dbb5d388e157a80a096549028be6c55400b11361c7f8a28e424fd5674801873651df4e694d536cae66728b7ae5e840e532358c52
DIST krb5-1.18.1.tar.gz 8711772 BLAKE2B 98ea02b686760d1e080e1b038601fedcb85ceb4c61dbbba717c300f54a784e8494ff0fc7c0139e95fffd6b1cbe2a65158c9a3af71ea76c1b86905642c29cd93a SHA512 c96c9ed676c8ccb9b65d17bb1d982c266228c75030a2d8fd5d7952ee8cdf362a22d202e93018d1011a5e7bd9a9fabe69aa1578d1d2e4839a78b9916d8b8019ce
+DIST krb5-1.18.2.tar.gz 8713927 BLAKE2B f0eb34e67adcb86f347c59ec6ef74970a57530cc56336a84909f852cd6135079ea89828e77c906a272f54e0faf6a4a0497f2b648446eb9d048d1c51e4ec513af SHA512 7cbb1b28e677fea3e0794e93951f3caaa2c49bb1175dd187951e72a466cc69d96c3b833d838000fe911c1a437d96a558e550f27c53a8b332fb9dfc7cbb7ec44c
DIST krb5-1.18.tar.gz 8706395 BLAKE2B d2b700c2f869733a7fc9ac735ec27e3973868efcf62c6b130fb5ff33aaaed0571816af519123e9077fc0bc240ee71a6179e87a4f724ae06dba8a70fd1d594b9a SHA512 36a01ea310b4b3d0a3d209b641739575239e1ca5e93b3de99cb1fec83e82f9a70ad0761dd6eb77cda5c18c53044ab80168b00725642a0c2dfde0e492c42af6a9
EBUILD mit-krb5-1.17-r1.ebuild 4312 BLAKE2B 2ddf3073cc5e7c8f5e811a065a9d1ba7d55defcded9800090b32c31bc591d37d720ee1efbef20fe92605bbda2eb5ee938af6e5277bef1bdc24e498994577c19e SHA512 1818e9165f0d0f3afb60579351ff723aa9e8d6705fae6a52c921c71de3e89922c714b7e15432f98e7ffb789d79c7458599b39bf5b44dd947a813e0b566c23986
EBUILD mit-krb5-1.17.1.ebuild 4348 BLAKE2B 21649609464816912876ee382b330fe8beb2ff6f63ce77e35bef5c983bc2e5a81eac9db78b2a0915487a735252f8a7bb98150cdd91655cfd21988b7f94836c53 SHA512 b4341d509c5b0ae46dfdc751f6494aa4ae9288bcb5fb5cb604cf16bd8940f2a1eaf831a50553d084ab7a68bc34493258c8ecde4d904555f1bcaf8b0ecc87d644
EBUILD mit-krb5-1.18.1.ebuild 4338 BLAKE2B 22ec1538e980d8e590cfe65ec64e5350eca7c883c2e278c238e535080ae01a8246c343f899528111a92eb7733ab5d61807944ab127e62fd3b4659071e6c29fe0 SHA512 a9317837e3f5f80b3a602f6483632055b2337d6742be8fca209ea138ad9f8836168da11b2cc7de505721892c6db641067c88fc49eb4d1bd3940e474084ba1042
+EBUILD mit-krb5-1.18.2.ebuild 4336 BLAKE2B b6e2266ab5d4c5e3a1fadd5b13cd23a79a6c281317d1989648d16b8c505e35505f617c6e85a57a3420bd13c1cca88fda4add1b35f392560cc2d66c36c3517554 SHA512 04586cc2d4bf81d102e0308ead9141c5dab63d1973158dadf32cef17c44008beba810e6fb8305f3c21f4fe3ab3a17b4dae5a4162377fa750515b99fe8e50cb80
EBUILD mit-krb5-1.18.ebuild 4359 BLAKE2B cca19a22d28b67765aa56c3c63e858312892d12053f114b34583b9330125f841bdccc2529276a8f45fb92bf0cf57c877a98c3bd4fa3e14b5c015f190172482d5 SHA512 7da11ab4c00e5551c17a1a442829a71a7e0ac01175255c22bcccb658564dad312a8f55dfb4900ab5c69e26bf549d4f3a7fc88ae364a1895fde5a43a8c290075c
MISC metadata.xml 903 BLAKE2B 57a48ed1fb3f046b8a4a6a80ae6223bc923f30ddf350b8ee0f5769c78b28c0bd14c35539d9552bfca02901e054332a4dc22f88c48d4eb4db4d143a7f0b938d74 SHA512 44909c99698b78ad01f72cd1d74ad6807f12154c8675b7fe31f4bd95744d8e7dca53446875c57408a294e5f87fc5aa038e6f869d3ff957cab870cd75f8e45464
diff --git a/app-crypt/mit-krb5/mit-krb5-1.18.2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.18.2.ebuild
new file mode 100644
index 000000000000..b47db6eeb0ce
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.18.2.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd
+
+MY_P="${P/mit-}"
+P_DIR=$(ver_cut 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="https://web.mit.edu/kerberos/www/"
+SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd"
+
+# Test suite requires network access
+RESTRICT="test"
+
+DEPEND="
+ !!app-crypt/heimdal
+ >=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
+ || (
+ >=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
+ >=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
+ >=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
+ )
+ keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
+ lmdb? ( dev-db/lmdb )
+ nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+ openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+ pkinit? (
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+ )
+ xinetd? ( sys-apps/xinetd )
+ "
+BDEPEND="
+ ${PYTHON_DEPS}
+ virtual/yacc
+ cpu_flags_x86_aes? (
+ amd64? ( dev-lang/yasm )
+ x86? ( dev-lang/yasm )
+ )
+ doc? ( virtual/latex-base )
+ test? (
+ ${PYTHON_DEPS}
+ dev-lang/tcl:0
+ dev-util/dejagnu
+ dev-util/cmocka
+ )"
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-kerberos )"
+
+S=${WORKDIR}/${MY_P}/src
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+ "${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
+ "${FILESDIR}/${PN}-1.16.3-libressl-r1.patch"
+ "${FILESDIR}/${PN}_dont_create_run.patch"
+ "${FILESDIR}/${PN}-1.18-libressl.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/krb5-config
+)
+
+src_prepare() {
+ default
+ # Make sure we always use the system copies.
+ rm -rf util/{et,ss,verto}
+ sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ # QA
+ append-flags -fno-strict-aliasing
+ append-flags -fno-strict-overflow
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ WARN_CFLAGS="set" \
+ econf \
+ $(use_with openldap ldap) \
+ "$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
+ $(use_enable nls) \
+ $(use_enable pkinit) \
+ $(use_enable threads thread-support) \
+ $(use_with lmdb) \
+ $(use_with keyutils) \
+ --without-hesiod \
+ --enable-shared \
+ --with-system-et \
+ --with-system-ss \
+ --enable-dns-for-realm \
+ --enable-kdc-lookaside-cache \
+ --with-system-verto \
+ --disable-rpath
+}
+
+multilib_src_compile() {
+ emake -j1
+}
+
+multilib_src_test() {
+ multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+ emake \
+ DESTDIR="${D}" \
+ EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+ install
+}
+
+multilib_src_install_all() {
+ # default database dir
+ keepdir /var/lib/krb5kdc
+
+ cd ..
+ dodoc README
+
+ if use doc; then
+ dodoc -r doc/html
+ docinto pdf
+ dodoc doc/pdf/*.pdf
+ fi
+
+ newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
+ newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
+ newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
+ newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
+ newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
+ newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
+
+ systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
+ systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
+ systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
+ systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
+ systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
+
+ insinto /etc
+ newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+ insinto /var/lib/krb5kdc
+ newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+ if use openldap ; then
+ insinto /etc/openldap/schema
+ doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+ fi
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}/kpropd.xinetd" kpropd
+ fi
+}
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index fecc79e969a5..a3875a54ab24 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -9,5 +9,5 @@ EBUILD pinentry-1.0.0-r2.ebuild 2847 BLAKE2B 8d93187c84bbc2ad6d5e0c26dde48d53473
EBUILD pinentry-1.0.0-r3.ebuild 2918 BLAKE2B c565bd9e341bd92ef915ba37820215659b04026a019a8bf035a21880611bea2844c543d3a7ccf39195eddd43f3bb610efe6e7da00eecf8d9da2e9a6950139f5b SHA512 c6ba7579ab5a52b4490d343f971224a3a21f5c0e2d930138c4fc722f26e673be25699c384152d34e38c8fa2eee7a711f131d04767da3e2375cebc6e2bead9fa7
EBUILD pinentry-1.1.0-r1.ebuild 2769 BLAKE2B 6c82a5f1cf18bf438acdfa972d74231b890e03d6a4d561d6cc4e1b157157805da3ed1d44ef636fd8d9f8e6080e8923798257bf6881e46f4d986b08ed20216806 SHA512 4f8162867d7af98f586a65a12871e136c211dafe4edf4d46121282120f371180b684b828e0c593b7d3f0001fd723eb8c068dba3c68638f0efa49ea4b55cec7ab
EBUILD pinentry-1.1.0-r2.ebuild 2827 BLAKE2B eb7650162db93d6fe5d98e0935d71237092395ef4610d3f879dd756791b7894c8d331f5eec642264bc0e075237024da189eff471c393819458b58bb3be19e092 SHA512 cb3ada0c71c47d4628662a94401a8e3ccc9ea3416b9dde2b61f8ee1c99a244ee8f4d8c5c7088baeb6aab6de47aea36fd366dc93efc5bb29cbf0dcb1b2ab7aa26
-EBUILD pinentry-1.1.0-r3.ebuild 3088 BLAKE2B f78b29f5abdb6be127d9d8052aab674f6fb5d05593ad3aeed7edeab953887f9f68fc89c4907d6b170eb661afb79a6f73f24ba003db26cb1da65a79302955deb1 SHA512 050d3aaac04c7e2afcaa91bc327d5d2c7feec0e12d731aae363a91c2f1e6efb6a0161f4f916bc99bbd9636549ef03c1b1dd4e4c0cd121302941bfcfc0778eafc
+EBUILD pinentry-1.1.0-r3.ebuild 3087 BLAKE2B 44d32fa76bd750fd7da7fab10d765c5f3cacf681152bffdb64b312eed6363aec3ac5a22d415d1173925aa3ad2f5f4ff1b5310f80ea7c2f447a913b12449de95d SHA512 fd784da8b021c8d9405422be5f4afd831a4a870729b51dfb3356b9e7db6d6ced9d1b5b8b1888be7abb81fe199603918038bd208aa9d3a54ba1450ab196099758
MISC metadata.xml 251 BLAKE2B 958e5ce6ef310471d4c88ef4cfd054eb9476b56abe4e8b82b003632bae4d56a800530601a7fd4b0129fdf22fe5124e8642f60835c6792cdfe38e09afb2d701ec SHA512 10bbd614739518c3b33fc05f34caa511ad71c599e2df0cb58514f05186b9c4ef73e00e3c78018c38581376a90a7968a01c35620fca32fdc5a91a762233a8c5fd
diff --git a/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
index a9139e052511..0ff90bda9f48 100644
--- a/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~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 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="caps emacs gnome-keyring fltk gtk ncurses qt5 static"
DEPEND="
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 8816f50b0569..a4f8f853bd36 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/qemu-guest-agent/Manifest b/app-emulation/qemu-guest-agent/Manifest
index 88769010af55..7b41f41a1c7e 100644
--- a/app-emulation/qemu-guest-agent/Manifest
+++ b/app-emulation/qemu-guest-agent/Manifest
@@ -9,7 +9,9 @@ AUX qemu-guest-agent-4.2.0-sysmacros.patch 367 BLAKE2B c52061d00b354917f701dadd3
DIST qemu-3.1.0.tar.xz 36070104 BLAKE2B 9ed7d1b3256d84f2b73d61763e20f5e4bc5b47d56e4e0d56cf4c29cd25669457b0f08e90d7255589c9666400bb310df3dba3b9290232cad18057b20f08013a3b SHA512 7e8dae823937cfac2f0c60406bd3bdcb89df40313dab2a4bed327d5198f7fcc68ac8b31e44692caa09299cc71256ee0b8c17e4f49f78ada8043d424f5daf82fe
DIST qemu-4.0.0.tar.xz 55628624 BLAKE2B 8afd1f54aa13d2e61fd36c4f4544b7c4ffb1a7eee5c69d3aa1d40a432ca296ad8abe6cb83d7c66ac4045ca624d2a00e737f51e4e62ed46fef9766ef71f43b98b SHA512 952e94194ce9e64c15388c59035cb31fb9f761d30095c2fb9441012b609c18c9976285727b93bf37b95e15675802d73f8e1c4619ebecd23606675bb503646b13
DIST qemu-4.2.0.tar.xz 62222068 BLAKE2B 27c9fbcd5093af425764674817ab9299224bd03f37b5983786f6f437fff1fab3b7da247c55c4ca8b8c42726b9867005944a2f7f04f2d0d94d753961615f901ef SHA512 2a79973c2b07c53e8c57a808ea8add7b6b2cbca96488ed5d4b669ead8c9318907dec2b6109f180fc8ca8f04c0f73a56e82b3a527b5626b799d7e849f2474ec56
+DIST qemu-5.0.0.tar.xz 62426192 BLAKE2B 785d02ef79c95b5c4f0556186054885f9893d4e8a9f4b4f2d6199a4e1ae9c31d7c79dd900305469217f85d61bbe74134b601d5c6c1b0eee2b74792d010f1fd63 SHA512 21ef0cbe107c468a40f0fa2635db2a40048c8790b629dfffca5cd62bb1b502ea8eb133bfc40df5ecf1489e2bffe87f6829aee041cb8a380ff04a8afa23b39fcf
EBUILD qemu-guest-agent-3.1.0.ebuild 1724 BLAKE2B e8bc0ef4afe0a500816c317e405e937fa6fdd3bcc4e7315903a5333be428d17d1627ef8dd20ee9314ec9aa29ab11f87280407f84242222bc3dec852723527fa8 SHA512 69be0c816457a38030c24f1852975ef203276daf8a54069468acb00d61440052679bc01046bf14495da05db6dfe79d2addd2d813e45f96a686bf46d8ad02a8d6
EBUILD qemu-guest-agent-4.0.0.ebuild 1724 BLAKE2B e8bc0ef4afe0a500816c317e405e937fa6fdd3bcc4e7315903a5333be428d17d1627ef8dd20ee9314ec9aa29ab11f87280407f84242222bc3dec852723527fa8 SHA512 69be0c816457a38030c24f1852975ef203276daf8a54069468acb00d61440052679bc01046bf14495da05db6dfe79d2addd2d813e45f96a686bf46d8ad02a8d6
-EBUILD qemu-guest-agent-4.2.0-r1.ebuild 1778 BLAKE2B 7c4d7f058efcdbb4e3c047babe19602c74e2242f0d6954d630b89f917d6e0fe9c7e2c44ac71018c3ebf756a5078f51aa2e386f7e41b81333638f4ecdd10eeb50 SHA512 ecbe35457a6f0d4b15c323c68f620aeeff1b9586412c18b18b3f06cf0f7a541e5344fa540e087f295121446130f29381042d4e5c5d41132f5e02fbab13f3b986
+EBUILD qemu-guest-agent-4.2.0-r1.ebuild 1784 BLAKE2B 31524abc404888ac6a08708965573ce2bf49493b5e3d2696ee2ee6b324ce1a194f8946477294111f1c3248d4400b4b57cefde0073a61737ddd43a658dc8065f9 SHA512 42b9bfcaa90a650806cbbfd1a7694563a09a503ba731766f60bdf5601d4f44fbc838729846328e2dc8563a8dce101d35d34c6dc9c082622927b16a36be4200fe
+EBUILD qemu-guest-agent-5.0.0.ebuild 1786 BLAKE2B ddbd42e2d0e941a8456c0e1fa2c5bed62cf7c213fb5f8bc919f3f18e76837f581deb287914343ef76b6a7de9c90f5eb751bf8803cbb4e92de8e34ad447fb7c52 SHA512 9cb8eb0748c02590f220b8e08048db96c1c1fb4a6f3ef2dde8c18e09a691f0a4298944f1cb979a27fa4f38a82e60a0434bc167c20b61a5d353eb6951b9352e10
MISC metadata.xml 379 BLAKE2B d27991e18ed82ad5892cd44e50c965f8eacef9e8f2e11a6655306cf6913ec8e6d871c898cc8763140d5fd7d2be97ea7b4fc6377a0cab1978113a311dffaecdb4 SHA512 ee5deeb07591c7adb54bee8b80ea5a35e6047c308265d5363d239ed067416967c87cba01d6369bb5f2cd7792d1b65b9d0f1e7068b362ff5a2bad35232e272f05
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0-r1.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0-r1.ebuild
index ec59e153ca27..46783392cf0b 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0-r1.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI="7"
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit eutils systemd toolchain-funcs udev python-any-r1
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-5.0.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-5.0.0.ebuild
new file mode 100644
index 000000000000..513caae41cee
--- /dev/null
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-5.0.0.ebuild
@@ -0,0 +1,83 @@
+# 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 eutils systemd toolchain-funcs udev python-any-r1
+
+MY_PN="qemu"
+MY_P="${MY_PN}-${PV}"
+
+SRC_URI="http://wiki.qemu.org/download/${MY_P}.tar.xz"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="QEMU Guest Agent (qemu-ga) for use when running inside a VM"
+HOMEPAGE="https://wiki.qemu.org/Features/GuestAgent"
+
+LICENSE="GPL-2 BSD-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-libs/glib"
+
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.2.0-sysmacros.patch #580924
+ "${FILESDIR}"/${PN}-4.2.0-fix-shutdown.patch #681874
+)
+
+src_configure() {
+ tc-export AR LD OBJCOPY RANLIB
+
+ local myconf=(
+ --prefix=/usr
+ --sysconfdir=/etc
+ --libdir="/usr/$(get_libdir)"
+ --localstatedir=/
+ --disable-bsd-user
+ --disable-linux-user
+ --disable-system
+ --disable-strip
+ --disable-tools
+ --disable-werror
+ --enable-guest-agent
+ --python="${PYTHON}"
+ --cc="$(tc-getCC)"
+ --cxx="$(tc-getCXX)"
+ --host-cc="$(tc-getBUILD_CC)"
+ )
+ echo "./configure ${myconf[*]}"
+ ./configure "${myconf[@]}" || die
+}
+
+src_compile() {
+ emake V=1 qemu-ga
+}
+
+src_install() {
+ dobin qemu-ga
+
+ # Normal init stuff
+ newinitd "${FILESDIR}/qemu-ga.init-r1" qemu-guest-agent
+ newconfd "${FILESDIR}/qemu-ga.conf-r1" qemu-guest-agent
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/qemu-ga.logrotate" qemu-guest-agent
+
+ # systemd stuff
+ udev_newrules "${FILESDIR}/qemu-ga-systemd.udev" 99-qemu-guest-agent.rules
+
+ systemd_newunit "${FILESDIR}/qemu-ga-systemd.service" \
+ qemu-guest-agent.service
+}
+
+pkg_postinst() {
+ elog "You should add 'qemu-guest-agent' to the default runlevel."
+ elog "e.g. rc-update add qemu-guest-agent default"
+}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index a855b4632a91..eac07c770679 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/fbterm/Manifest b/app-i18n/fbterm/Manifest
index 42d44bda412d..4260ab5c342d 100644
--- a/app-i18n/fbterm/Manifest
+++ b/app-i18n/fbterm/Manifest
@@ -1,3 +1,3 @@
DIST fbterm-1.7_p20190503.tar.gz 187225 BLAKE2B 9efa290c73dae49e12bb53d44c502a58fa5baaf517248b18ae1218285a3785fe276bf028613eac0a78ccee51c8b392153533dffd1e2b88201cccf8badb6d34e1 SHA512 13a57f8c5fff1d9c70021cd01f554a76e5465ae49b05a5aa49949caf31eb2b8fc231bdfba6ac42840542b73edc4ab66e487eebd0fa9d92761c7193294edadf81
-EBUILD fbterm-1.7_p20190503.ebuild 1332 BLAKE2B 55fa0089196c7a9727f0bb48f482a30d8b08bdc168ffa782847f268849311ae855179c431b516907b42403d34e604acce4c0ee177341571bbb7bf15613a4f0fe SHA512 708d6f3cf512df87afa6d0a48df96ca88fb1b6bdf0faf59c37fa5d78c073414ccffbcbc74c7e821644304967259e1e273e30d733e7f086d9bd7c956a3f3c6df0
+EBUILD fbterm-1.7_p20190503.ebuild 1352 BLAKE2B 89de8a5b38761d10f4ffb9ee068473d730d323573e1c4bf6b7f07a7ede104c9e7d0db38342cce16c8ef36331214a2f7f68b7c0b73c540f678785634173780a99 SHA512 4b9ba3b2e374a591d60d49db989fdc71454ea239d8cf86895d55e32c2fcc9648564c5e0ed36eb99165a9d44d8241eb0faa5e493e0acb9c48387bb0c40535106b
MISC metadata.xml 313 BLAKE2B 75b2f15a670ffc2bf3aa397e6ee043442f326d0f9764e469e591dc495022b9df9df533bb2fe2b6715830c1ef780f0ce97fd635e00c2ba8def1e27bf222f0d59d SHA512 f5f73637bd468db6f5b40acd14c2cba5d4d27183099ee300e40ebf6d67673fa1b3f06410f1cbeca304cc321ec57f64bd0af23be8899dad0afefa63c636bcd1f7
diff --git a/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild b/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
index b8c3d875a618..c6271dc437cd 100644
--- a/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
+++ b/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild
@@ -16,12 +16,13 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="gpm video_cards_vesa"
+BDEPEND="virtual/pkgconfig"
DEPEND="media-libs/fontconfig
media-libs/freetype:2
>=sys-libs/ncurses-6.1
gpm? ( sys-libs/gpm )
video_cards_vesa? ( dev-libs/libx86 )"
-BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}"
FILECAPS=(
cap_sys_tty_config+ep usr/bin/${PN}
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index 9b46e5a3c6c0..422d0e0808aa 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,5 +1,5 @@
-DIST ibus-typing-booster-2.8.2.tar.gz 8161995 BLAKE2B 79c7bacb7c5a07139c710ddf063b58ed6bc15d1f58529dfaa0d8f1935cb513fe27ad5e95af0ca7383922f5642d1197cf74183ba2463a3fa81637add5d8376691 SHA512 3dffc21aae59ebc8c7b3ef3df588f958b4a42a2025dc6a82613e9bb1b324f8c999d01b8d98ed48794b3ea8fd5c3221df489a88f8c54c154a69be9908beda85b5
DIST ibus-typing-booster-2.8.3.tar.gz 8184044 BLAKE2B 06b7bc3c39f8c135d5e6d2c90ceaa2df8c38041cb4cc7d583cc335bb3bbdbf4915a6bcb0fff80bbaae797e8bda74bed26077ab4739a8f9584ecfaade833eefbb SHA512 18cee36b5f5c3d6da1cb455e785317c0e2b9826e49e3b2655f4f7a3fce4bdd279ff24614083559996031876702879530799a709e196dc5d68345f0d942972dff
-EBUILD ibus-typing-booster-2.8.2.ebuild 1101 BLAKE2B 9e4f83cb5209d9e7f49e2716957c517d5d952d8e64a1e8756f380034a8ee0c7971028bdfb1af96180a0a4dbcc13e9dc813e083cbad5e5e630f8659a5710c8b10 SHA512 8b9d7d3bccb894abf60b112fd6061cb535910d78685c184162d5a27f174417bd2ad16439417602ed79142bd2a123d6db483b53b2446453dc5b508ef4265c3f53
+DIST ibus-typing-booster-2.9.0.tar.gz 8191076 BLAKE2B 4b0e53679b907fce56361c60aed2d50f0ac3bef422f9c56b4b5ca8733734c0341f90dfbcf2a9db747a801d999a49198de2b091badf8efe141d22fddb9b35ec6c SHA512 33e0c53e3f16e312eee7db2395d0a5506150e60a47882a7531c9d082e0ca405aabd922b4774a507399d31f38feed78fb87a09efc5550f08dd3794703f1fab235
EBUILD ibus-typing-booster-2.8.3.ebuild 1101 BLAKE2B 9e4f83cb5209d9e7f49e2716957c517d5d952d8e64a1e8756f380034a8ee0c7971028bdfb1af96180a0a4dbcc13e9dc813e083cbad5e5e630f8659a5710c8b10 SHA512 8b9d7d3bccb894abf60b112fd6061cb535910d78685c184162d5a27f174417bd2ad16439417602ed79142bd2a123d6db483b53b2446453dc5b508ef4265c3f53
+EBUILD ibus-typing-booster-2.9.0.ebuild 1101 BLAKE2B 9e4f83cb5209d9e7f49e2716957c517d5d952d8e64a1e8756f380034a8ee0c7971028bdfb1af96180a0a4dbcc13e9dc813e083cbad5e5e630f8659a5710c8b10 SHA512 8b9d7d3bccb894abf60b112fd6061cb535910d78685c184162d5a27f174417bd2ad16439417602ed79142bd2a123d6db483b53b2446453dc5b508ef4265c3f53
MISC metadata.xml 331 BLAKE2B 85b93b548e9cbef93b09e59ebf23c10b1cb4c392bcb6aeeab697cdaa775afa06874b5a6965ab09ffd8c937a0842699cdb27ad70c6146d5c37b516d82a92c80b2 SHA512 e0524c2ebad138f51a5d79d639e809196029a83f46dc331c2bd21d94417d5adf8d059f15694b484f4fcb107dff2aba7d3ad4c87a19accaccf75429bfa2c92b63
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.2.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.0.ebuild
similarity index 100%
rename from app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.2.ebuild
rename to app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.0.ebuild
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 0a64308cf23a..38a08e060527 100644
Binary files a/app-metrics/Manifest.gz and b/app-metrics/Manifest.gz differ
diff --git a/app-metrics/fusioninventory-agent/Manifest b/app-metrics/fusioninventory-agent/Manifest
index 734b76693954..264a829e64b4 100644
--- a/app-metrics/fusioninventory-agent/Manifest
+++ b/app-metrics/fusioninventory-agent/Manifest
@@ -1,6 +1,6 @@
-AUX fusioninventory-agent-2.5.2-dirs.patch 1195 BLAKE2B 606cd273d5b4a3e0bc73d1abf19ed200060c8b8dcc426996986f5a113c62ea15cd2bf22e5205ae2c310749e9fada4c848c9bc7e0b70782338686dc32a8bf959f SHA512 98f42947f94546ec97be1f007380396d9169fec6fe747f398156527090a3d4ea450ea3f0212709665a4183c2c4daff767fe1050a3f08a8997885f7854b8c29af
+AUX fusioninventory-agent-2.5.2-dirs.patch 2227 BLAKE2B d75dbaf7a9dd1bb1a90e7d0597eae39e3448b20aac62caf291166956de1bd4b0574518ba990bf4e14b3c9d6b33c1f260ec87327a555b4170a5515c1cf50fa087 SHA512 8ef5d6b8994be1ca3803b814f5ecc472445a451c7c4cf9e043a928cfbe4309f1e7f174a3c23488c8873004b6e6d05fe431727bb21543c2a04a45e4816899f37e
AUX fusioninventory-agent.confd 71 BLAKE2B b00ff3f7d15e332956498ff1896f9c358b34f89382a272d7aa94fe2b6985b63ff3b62cdb7bbcaaad44bceb7500c61a9ba343627ccb3311bc9c71d5d6089890dd SHA512 d64c9c66857ce69ec566dcd720534ec8327aff5ee7a6919235f6bb6e62472096fa54d64d996cccef8e59a87bb38ade3e403f1f5ecb835361c0419d16d4c36bfc
AUX fusioninventory-agent.initd 531 BLAKE2B 90e40812e76ad9d2d16e50b32dd228f9b55f7e519aae96ab8814ae3c977114dfd21e71b20497492f0dd52e0075110af0c50909c8eb23f311a6bd86a72444b626 SHA512 216814ea13b092bed24813914e5f1a481d6d6e75b2a4e3fc2d5b5393a21e516792550436546c59d364a8234a076fd6910de22002f1513763ed640576d14cbed7
DIST fusioninventory-agent-2.5.2.tar.gz 2728830 BLAKE2B c6a26c4adb6b8e6bdaf829e46dffa47cc629731411f8b6e55a17eb83bd69536ca0e07899c5e3536ee3962326e643157c60ab8825971b2f44995e42f04e689321 SHA512 5bd39652fd3b857a4364fa300b07b8a2580bdafc6b84f95ab852b60b887ce8278bd99f85b74991b6da5cc21e1636f33c7125dbc27a02df915df4ea6f0ceffaed
-EBUILD fusioninventory-agent-2.5.2.ebuild 950 BLAKE2B 9e20b5a75cbe22b1f1d4b14743e3569fd15fa6f40e7b4abe5b23d8320e58f36b1409aed6295fcf9139f24b461172e2b98998fa3796063196d0ae4d3ebc96d648 SHA512 302845a10e527a0a81d50c2f1954a2ed6742688e12348867495a7f39a6f901eb3ae0e81fc3f5a3c7391768faecae276edf58841dc8ba676224f29460442231af
+EBUILD fusioninventory-agent-2.5.2.ebuild 984 BLAKE2B 51aa8f0d4977edd6982a3b0e72858e5dc6f95828b53db1bbb2adff0d668e3ee6d9660e15aa77a5ce59eb9ae828896dc943f87f851dd56793bd8d57df0f0f87a5 SHA512 09c9dd855f9d781271778c0b42426aa234c29d566e39d17c0f23b060642585bff5ce342dd139f22722aac58df5881be78e8c005d422f813a1172a3c22af16516
MISC metadata.xml 248 BLAKE2B 946598a9bc9f658d98c3282fd6affeb3834a4b6071beca852a2f2381d5c17799b6ed17ed427a8f6e10fb3f715cdf2aad9e4fed2886f0dd67dacfdffcd5137f80 SHA512 89d637e180ed3a2c2096be2210633dc5df0760a7d6acd7b2d2ad8a06d473943ee86bad7e74c7df238a50168d1da8044471713e9b044007b9c2f4eb604fb710d5
diff --git a/app-metrics/fusioninventory-agent/files/fusioninventory-agent-2.5.2-dirs.patch b/app-metrics/fusioninventory-agent/files/fusioninventory-agent-2.5.2-dirs.patch
index d4c0f4eadb0f..a3a6b439713c 100644
--- a/app-metrics/fusioninventory-agent/files/fusioninventory-agent-2.5.2-dirs.patch
+++ b/app-metrics/fusioninventory-agent/files/fusioninventory-agent-2.5.2-dirs.patch
@@ -1,5 +1,33 @@
---- a/Makefile.PL 2020-05-27 02:16:42.106531746 +0300
-+++ b/Makefile.PL 2020-05-27 02:17:30.568531767 +0300
+diff -urN a/lib/FusionInventory/Agent/Config.pm b/lib/FusionInventory/Agent/Config.pm
+--- a/lib/FusionInventory/Agent/Config.pm 2020-05-27 11:09:31.969999393 -0000
++++ b/lib/FusionInventory/Agent/Config.pm 2020-05-27 11:09:39.833332729 -0000
+@@ -67,7 +67,7 @@
+ my ($class, %params) = @_;
+
+ my $self = {
+- '_confdir' => undef, # SYSCONFDIR replaced here from Makefile
++ '_confdir' => '/etc/fusioninventory', # SYSCONFDIR replaced here from Makefile
+ };
+ bless $self, $class;
+ $self->_loadDefaults();
+diff -urN a/lib/setup.pm b/lib/setup.pm
+--- a/lib/setup.pm 2020-05-27 11:09:31.989999393 -0000
++++ b/lib/setup.pm 2020-05-27 11:11:02.233332727 -0000
+@@ -11,9 +11,9 @@
+ our @EXPORT = ('%setup');
+
+ our %setup = (
+- datadir => './share',
++ datadir => '/usr/share/fusioninventory',
+ libdir => './lib',
+- vardir => './var',
++ vardir => '/var/lib/fusioninventory',
+ );
+
+ # Compute directly libdir from this setup file as it should be installed
+diff -urN a/Makefile.PL b/Makefile.PL
+--- a/Makefile.PL 2020-05-27 11:09:31.966666059 -0000
++++ b/Makefile.PL 2020-05-27 11:09:39.833332729 -0000
@@ -170,18 +170,15 @@
INSTALLSCRIPT => '$(PREFIX)/bin',
INSTALLSITESCRIPT => '$(PREFIX)/bin',
diff --git a/app-metrics/fusioninventory-agent/fusioninventory-agent-2.5.2.ebuild b/app-metrics/fusioninventory-agent/fusioninventory-agent-2.5.2.ebuild
index 3350194f9c03..50d906752ad4 100644
--- a/app-metrics/fusioninventory-agent/fusioninventory-agent-2.5.2.ebuild
+++ b/app-metrics/fusioninventory-agent/fusioninventory-agent-2.5.2.ebuild
@@ -21,6 +21,7 @@ DEPEND="
dev-perl/Text-Template
dev-perl/UNIVERSAL-require
dev-perl/XML-TreePP
+ dev-perl/XML-XPath
virtual/perl-IO-Compress
dev-perl/HTTP-Daemon
dev-perl/IO-Socket-SSL
@@ -36,7 +37,7 @@ PATCHES=( "${FILESDIR}/${P}-dirs.patch" )
src_install() {
default
systemd_dounit contrib/unix/fusioninventory-agent.service
- doinitd "${FILESDIR}/${PN}.initd"
- doconfd "${FILESDIR}/${PN}.confd"
+ newinitd "${FILESDIR}/${PN}.initd" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd" ${PN}
keepdir /var/lib/fusioninventory
}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 5058bc304893..c12ecefc32b8 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/media-player-info/Manifest b/app-misc/media-player-info/Manifest
index 5d4e61c862f2..a672b4a3cc25 100644
--- a/app-misc/media-player-info/Manifest
+++ b/app-misc/media-player-info/Manifest
@@ -1,5 +1,3 @@
-DIST media-player-info-23.tar.gz 100849 BLAKE2B c64e33cb92c7f7b3fd77dd165fa5d33e433d09fbf171aba8ded2a274a24a544a85b7c874552951be25fe266090a882305416908975409b7c294d9435378c465d SHA512 4555456945f6f8c2fb23c86f80dc61e8e5448f3c402ac685e7eccd2df9f7861cdd41da842b0917349f7d83200ef10c810eb8b75fa6d62829834fdbdb81560f04
DIST media-player-info-24.tar.gz 90017 BLAKE2B 4b8dff7ebc910cdee986756d211f7cec0c08d5089bc5478360bcea3d24613118d3e2557633866345b1970a39a1de5ff10648ea71b7ae6ec7e7ae5635b6d46bc3 SHA512 b762f82280d7ddc3ecc4cf612f6fb3bf887c56a3ece7d9e4a45ebc7e750d71a20ba70dbff63c2b5abaae0f1c3e079545e95d8eff07ae25e27add09e92b2b1544
-EBUILD media-player-info-23.ebuild 1041 BLAKE2B 3a1852063e09a2abde60b36c507c42adae4db2129d9bf14b79eb89510156fc29450bbe40a5bbfc1b6043532d436d4b3472f5f59ebb57b58043c4288101abc0d2 SHA512 12171293c4a653e040adf57536b8e0a57ce39903735304954a6ef5733ddb4f48feeea797aecacb1b4b9e15c9aeaa826712e9495bf246f49652fd554c02be5ea2
EBUILD media-player-info-24.ebuild 1005 BLAKE2B 824da1611293537632eb756b2c454642f2968a26a8746a90d0cadb9816e375791dec2bbef8f8c760c8a12a16e1f630edfeb7ee289da4dfb9a82711c5197c0e09 SHA512 32d1d1a076ce47ddccdc7f372205aee7be6efa786d3dd99dd3aefc8871ce6c26d7c560fbed76816553a7cb24a56091dd77c25c67c08217d8a1b1f8f9eba6bf0e
MISC metadata.xml 266 BLAKE2B 9c01787259e2c33e012f96ae52558f21518e2dc4e2bae1e528e8d53b897a698d9d205226aaf5c3796002ac10335d09b57de0d7a0ec079ea9982c7e05d1f67091 SHA512 c4dde7027a929519d75bf240bdf01edee88b6ab874e56c9e524f783b801eb26b5e86a9378cf23b21f7fd2f0f9ee45764daa7deef9173a05e0fedd997e648313b
diff --git a/app-misc/media-player-info/media-player-info-23.ebuild b/app-misc/media-player-info/media-player-info-23.ebuild
deleted file mode 100644
index a55c9acc30b7..000000000000
--- a/app-misc/media-player-info/media-player-info-23.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-inherit python-any-r1
-
-DESCRIPTION="A repository of data files describing media player capabilities"
-HOMEPAGE="https://cgit.freedesktop.org/media-player-info/"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
-IUSE=""
-
-# https://cgit.freedesktop.org/media-player-info/commit/?id=d83dd01a0a1df6198ee08954da1c033b88a1004b
-RDEPEND=">=virtual/udev-208"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- virtual/pkgconfig
-"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-pkg_postinst() {
- # Run for /lib/udev/hwdb.d/20-usb-media-players.hwdb
- udevadm hwdb --update --root="${ROOT}"
- # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
- if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then
- return 0
- fi
- udevadm control --reload
-}
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 18058f0d3dac..6cc62cb8945e 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,5 +1,5 @@
DIST pax-utils-1.2.5.tar.xz 679604 BLAKE2B 348c6ab52a5e950f346115802d596fd33142fe2d93a83d686fbec917d3f74c53c332f2fcbd197c5bdd38b545f48568c7b461143fa328433ce3ee931901012601 SHA512 bf2f47393a66b4218eba7981100fc6936c7c9d6d98970f5337e7b3097ce6f7b2ca13de486ff7450e4395b74ba2308d37105508234f323230376ec5814cfe54f9
DIST pax-utils-1.2.6.tar.xz 680696 BLAKE2B b271e19ed5ec1024d7c6e5723c12464c6ab07646dfbfd4738bfe0250629205051642421425d7c7c5f540b1ac3d100c13d1beca398d9766f7f477830ab128eef2 SHA512 59fe16c5573414aa2952a99c5b85c16cf10dbbee76943f263d31d5b1aa8818a9b00fa78c8b6dadbe02216de54fc32b26d80303a17e2d854de6bb9dd8b431f617
EBUILD pax-utils-1.2.5.ebuild 1761 BLAKE2B 53b8fbc3524893c641669ab51b3de78f8d6d9e55ff1dec7736531762274e175a0965ab9060fb69ac1f2617ed4c2d045a30166393ec4ce44d3e13fad3d054def3 SHA512 c2a0d5459815b64725429b90bf81788c908265028562c667a215791da4152d3e094e356289d0abc8f013b5c66dfb15d6217cb615843396c1f4e2ea9a972f0086
-EBUILD pax-utils-1.2.6.ebuild 1768 BLAKE2B c1fa8091f98849da875aa52a619f53cf5a2afba7a6b0a0a6a607fafd47ed6da78504482a0eadbcb440ccb671b59aa5f88fcdc69f8ce5ba9979810578707d3420 SHA512 c150c05f7070538b20d012e39e502e2896afdd1d86671a26e15238bffe9a15cf35b89b52ea029035230171e3038a2c8cd5c1385e8ac118ecde789b706ee3a5a7
+EBUILD pax-utils-1.2.6.ebuild 1767 BLAKE2B 0c99f21c138d27658ced7ef5275d5d613b85c8aff5f89f7d0117ca46502475b98a543e791c25c8c930dad7e2651b9de4385bc78d0b22722a2d0c34548b913009 SHA512 1e48b3d18f9076cb695041e360253ced97b31556194a065fab810e995cf41683124cb66811dc8fafc2050e332a41325b411747b149748119620daf698662233c
MISC metadata.xml 795 BLAKE2B 410a2dbab6104e5da8b29d92f288ac82619bea027e1e452428c9bb993d8b34475a2ce6d7d0ed8c40244f0ac31b619cc7a221c3545b46b8029284adbcbd45d9e5 SHA512 97e8fafd52f62a3db3d28a61f55895ecf667592516be68977599dd82d10c2107eb325218ccfc102d51cf8ce453c3f64e8ab4b82b25a5298bcf3ff0e33cdf40f3
diff --git a/app-misc/pax-utils/pax-utils-1.2.6.ebuild b/app-misc/pax-utils/pax-utils-1.2.6.ebuild
index f68d63944b9c..8934306fee08 100644
--- a/app-misc/pax-utils/pax-utils-1.2.6.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="caps debug python seccomp"
RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index a1dc0211cde2..2c702f044419 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 55f77a8e2bed..956a10813fb0 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,3 +1,3 @@
DIST kmymoney-5.0.8.tar.xz 11753276 BLAKE2B 0c4967b3f39ec675b9bd7e8e81e230c7f5efa574671138db57396984add802d9b6c28e383eaaddb4ee8d486e6dcc2b0ac54f5cf1129aa4dafb9bd1cf4235914f SHA512 f332327dd40cc5667cd0141bd8e0c9cd81a2d996a4d482b2976f6bbd258cc27c73b2190d4631b8e0b9ee9d435ef8934312da399234830eb51b3e4ec942350988
-EBUILD kmymoney-5.0.8-r1.ebuild 3457 BLAKE2B b10c5eadeddfbef04896112beceb76bfcd883df2f339d7fbd64f6c3975783a7ab59e419ec4e2e55ea8d1e207ecda492a3f18e14767299c397a98e7998d4beec2 SHA512 53348923634478b3126ca95d6f42bbeec105ac73aa04254d2c5080e709c87d5747c010a26b62cb07f686ed8f8ae6d6e70faed195ffb5b87c8608fe7515e1d80a
+EBUILD kmymoney-5.0.8-r1.ebuild 3462 BLAKE2B 331250e84ccd0c2529f9fa2a403d4ace132291cec1464e4e04c21e8403b3775d351c34510aefcaa893cf915ee4e1501cef2e28b90c73b49d86be05ad58a585c2 SHA512 ed3ac3d35531752656a072b610fe201a5a365447d2e10d209835e66538db12b23cc61a6f0c0af97556a3651643effb25caf2999875b88457e44e5c56a73abbde
MISC metadata.xml 793 BLAKE2B 0ecca47b6d189eb9d19c4b61d43579429def819e075267f203a382fe3fb55cedfc14faeb409efed1e975688df260e3574bf03c29601e102f9cce662ecc15d81c SHA512 5c52ef57a4c75b2b439036ba561fed505a9bb331e1eac61a0816287b068687cfe3c22c260baba788aae68c0a304ad9e6aa72599d12a1fb511765d9722749e06c
diff --git a/app-office/kmymoney/kmymoney-5.0.8-r1.ebuild b/app-office/kmymoney/kmymoney-5.0.8-r1.ebuild
index 3ec213f7944d..51b2398057d0 100644
--- a/app-office/kmymoney/kmymoney-5.0.8-r1.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.8-r1.ebuild
@@ -31,7 +31,7 @@ BDEPEND="virtual/pkgconfig"
COMMON_DEPEND="
>=app-crypt/gpgme-1.7.1-r1[cxx]
>=app-office/libalkimia-7.0.0:=
- dev-libs/gmp:0=
+ dev-libs/gmp:0=[cxx]
dev-libs/kdiagram:5
dev-libs/libgpg-error
>=dev-qt/qtdbus-${QTMIN}:5
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index cb0d33e96451..221c73b84f53 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,5 +1,3 @@
-DIST skrooge-2.21.1.tar.xz 21487048 BLAKE2B 64eeb2e14a18e57f8fd89985e28e3b2736e4ece2ffc5132478531ba19a6f7ad821a5198570f01fd6bb3ad79410ba69bc7b0cdf8c5a85243bff3a879ad2458a2d SHA512 7d87576b38bd0dea1718babd818115b56cdae9183ca6b7b7631bcf749f2ed2b6a49989275fa5603906e08457bcaaf66404b4a76e31c6b84653f40e5b249d31c5
DIST skrooge-2.22.1.tar.xz 21559588 BLAKE2B 1f08a5357af4b792ba3d3eb4d460604fa23914aa5924ac9405019fbcce50efa96441b84bcd1142469f00eab89daa7c8175c5c33821190b7a09b7c565880f55b4 SHA512 0bbc4e98293f73a3ffe1243246fbd88c5d4d45fec8d67e8daebbe8ed08365c897b734cc5dd2a2104e608a13546f383b618d12c3523425d1a513511301c510f43
-EBUILD skrooge-2.21.1.ebuild 2756 BLAKE2B 8635c6811904b0fa990e4751b1c45cca81f6840c8a5c6b9633d2b232faec20e796cdccef508aefa88d7bf1a5fe48ad30fd190e4bcce39769c4a0ee45e5662f7e SHA512 b278fca5a79b40daccfeeaea726a73bacbe5d8a88b6d12d42001cc70e2b2dcd5c7cc1c73b9c5ad786881ab610314db819129e04dbfa7018ea5bb31bcdaf8ea33
EBUILD skrooge-2.22.1.ebuild 2756 BLAKE2B 8635c6811904b0fa990e4751b1c45cca81f6840c8a5c6b9633d2b232faec20e796cdccef508aefa88d7bf1a5fe48ad30fd190e4bcce39769c4a0ee45e5662f7e SHA512 b278fca5a79b40daccfeeaea726a73bacbe5d8a88b6d12d42001cc70e2b2dcd5c7cc1c73b9c5ad786881ab610314db819129e04dbfa7018ea5bb31bcdaf8ea33
MISC metadata.xml 508 BLAKE2B b55c79406982c895e2c0a3f680944fb561823a3713408f67b4f8de74d03246cd9b52a654d4ec97935d4f7740b9d9f4ebf27d81a9c226dc67d9922500c6e6bde0 SHA512 0b38f9d35783e7fbf2b86b9ead3772416b7080d3df07b801ecd9ef4e5329f7690e6e1b9f817d2fd8947d6735f89cfa57fb516fbcc2b383d5278f27fd89390e97
diff --git a/app-office/skrooge/skrooge-2.21.1.ebuild b/app-office/skrooge/skrooge-2.21.1.ebuild
deleted file mode 100644
index 49a210b9ac01..000000000000
--- a/app-office/skrooge/skrooge-2.21.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
-HOMEPAGE="https://skrooge.org/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
- KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities designer kde ofx webkit"
-
-REQUIRED_USE="test? ( designer )"
-
-BDEPEND="
- dev-libs/libxslt
- virtual/pkgconfig
-"
-COMMON_DEPEND="
- app-crypt/qca:2[qt5(+)]
- dev-db/sqlcipher
- dev-libs/grantlee:5
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtscript-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5=
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/knotifyconfig-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
- kde? ( >=kde-frameworks/krunner-${KFMIN}:5 )
- ofx? ( dev-libs/libofx )
- webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
- !webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
-"
-DEPEND="${COMMON_DEPEND}
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- designer? (
- >=kde-frameworks/kdesignerplugin-${KFMIN}:5
- >=dev-qt/designer-${QTMIN}:5
- )
-"
-RDEPEND="${COMMON_DEPEND}
- >=dev-qt/qtquickcontrols-${QTMIN}:5
-"
-
-# hangs + installs files
-RESTRICT+=" test"
-
-src_configure() {
- local mycmakeargs=(
- -DSKG_BUILD_TEST=$(usex test)
- -DSKG_DESIGNER=$(usex designer)
- $(cmake_use_find_package activities KF5Activities)
- $(cmake_use_find_package kde KF5Runner)
- $(cmake_use_find_package ofx LibOfx)
- -DSKG_WEBENGINE=$(usex !webkit)
- )
-
- ecm_src_configure
-}
-
-src_test() {
- local mycmakeargs=(
- -DSKG_BUILD_TEST=ON
- )
- ecm_src_test
-}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 1efcec504744..cf140b891d9c 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index 06838dbcc234..79eafb56be1f 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,6 +1,6 @@
DIST gemato-14.3.tar.gz 71325 BLAKE2B d42a5182c12bcc0281df47ddb6b933bb332b9b842b2a5c874c3fa4030ab5a8a16759ee289609d428a3fc1338078cd73d234060354513be88c184d5a6bbec545d SHA512 99904b1a38b8a05ff7bf7c265aa463a56ea3aa6c77dd844dc2d154faae5460e3535f4e9799e8863fda256ee6cd374e051ed98193c9b1fc52dc30c9c2655010cd
DIST gemato-14.4.tar.gz 72630 BLAKE2B c8956b979d7c8629e245ba339e8ee707cd51ffe545a85c712c31b97ee2aaabef7a4964cac46c9cd8c4954c33529623293a94a26ae40b578a6b640aab15d47835 SHA512 0b514e4ff7773eefd2d9adc063a4fbc6a1e7d9ea3dfa783b1d5a8e6ec1e482533a8c70cd5e200a8b9671161d77e14254ad14aee6659e3c96eb9be3bbedcf11af
EBUILD gemato-14.3.ebuild 780 BLAKE2B 1ac922c75d8d39da0e49405369da67be4ceb80251f4587c340809b48191558bffe4d19ac7ef70c3c437a3d0bd90a23df3aeb48e5a16836eca50a8312491dfc58 SHA512 114486b6846c47d70ef8f038f2c777d323313af764b690e3ac736654d19c9d477761479c0101a8d34c2e6648d795e0dde4874b862b0ce47f451758eb5970fa75
-EBUILD gemato-14.4.ebuild 789 BLAKE2B a08bde5ee997061ffeb7f22219b821d82dbb21bc7761b023821b458d0c4daf4f2cf8fbaf29bbbc18ac4eedd4053afb631c169971cef6a0bb5267925697df41e2 SHA512 41a5d2bf574e5515c136a88c3d0db4cc8e9f8a29d3824390bdd0483adf6ccdcec9bcea04f36244581f1e56191676f9ba2b09b0da652f34f435e7b026630a8d8b
-EBUILD gemato-9999.ebuild 687 BLAKE2B c8e143e634db7c8303840c4c8f873b0bb93d23146b98ab10a127a6695c4973b4ee7dc06045723c8cb2d0ca6c7ce1fb0960636ad98d31efc47c01ed0f67304610 SHA512 c6c10008ca64470bc06f29b0cde937541e9d26530048c03d23f961d3709c2f4983c63e88a20627aed5e1db6990e69c9e21dda07287d43bc1e4b7a48b19e94f7a
+EBUILD gemato-14.4.ebuild 784 BLAKE2B 486b3f39b89142b5985c805d6f7186289b0b30677f981dde61cdbebb119fed9a93a6e441bca58c2bf3e3bb7063bfc721e6aa028f5b5267dae66e9dbf5bc4df43 SHA512 fe7878567b7880e91baf5d4aad9a1f8265a299c5c0b7a0255e7d9ab8819e0be267b047d6b0eca6b2906d71f13b8dda79ccb7fd1e8dce78908156c5eebd9e6c72
+EBUILD gemato-9999.ebuild 682 BLAKE2B c76c514445c1459ea22799e13905b51960e7fdb7ef6ef89e616226245abb511f183c4be47505e5b73fcfbf3887aad134284d28eb00bbe9810a403333bc114000 SHA512 62583ab3b00c75fabe12a460e54fa027b4b6b7bea9149a63d0c5a70252608624f09d3a4f78c058b5145b57d1c27991c8e4569395e9698bfe161f3c9f00c27248
MISC metadata.xml 646 BLAKE2B ce8d4e7827c80e3df9ce44daf9172fe44250be5aedbaac1f4752b08d4e243ca07446361f51734816c9efa7718f21ceec436ac02684c48b4a3b8bf275a397d34f SHA512 b6518de76383e67810105503337e24ef252c0109afc395df30213ffa52279b6fea4981ff5ff87df773a6ed991c8028a653ed952cb86860236a7f463a74528adf
diff --git a/app-portage/gemato/gemato-14.4.ebuild b/app-portage/gemato/gemato-14.4.ebuild
index 37b5909bc6e6..e472f6f72173 100644
--- a/app-portage/gemato/gemato-14.4.ebuild
+++ b/app-portage/gemato/gemato-14.4.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{3_6,3_7,3_8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
PYTHON_REQ_USE='threads(+)'
inherit distutils-r1
diff --git a/app-portage/gemato/gemato-9999.ebuild b/app-portage/gemato/gemato-9999.ebuild
index 9dbc15846eda..5b490f34718e 100644
--- a/app-portage/gemato/gemato-9999.ebuild
+++ b/app-portage/gemato/gemato-9999.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{3_6,3_7,3_8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
PYTHON_REQ_USE='threads(+)'
inherit distutils-r1 git-r3
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 71bf7b4de252..d6285f3e45cf 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/fzf/Manifest b/app-shells/fzf/Manifest
index a0be8ea15c1d..4fa0603da623 100644
--- a/app-shells/fzf/Manifest
+++ b/app-shells/fzf/Manifest
@@ -47,4 +47,4 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191011211836-4c025a95b26e.zip 287793
DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
EBUILD fzf-0.21.0.ebuild 6476 BLAKE2B 963c8c04123e93eb681e3f9bfc1e50f2636f1b89710623c2c6d52d21107369050455b356c53ab7d74c9ba6fe760f0665da7b4d1d774c842957047d701269c5e8 SHA512 3112aea2d3289b0450d11d6a3f40d29fbcce9d6ff1d9dc14cb6a48d43990c98572bf33d7d675f3e3ca31770938cde0758b73f7bcfe4fb3d476d9ea2c4da3b490
EBUILD fzf-0.21.1.ebuild 4117 BLAKE2B a461ff1ccb839ca31ba79e72ac2825fdf8b5ba3d7246160c1e6581c71575a0e00d1fabb72984518b677d565bdb7cc6767455093e793af2281c2a264042bc2830 SHA512 050c6952140386b356e966c7600e300e805222d8adefe027c8b18422c4805841b17aa400d490d35a125ee494ce013f510e8b7ab259ae70ef7b5f90480e03ac83
-MISC metadata.xml 1466 BLAKE2B 7157dc754dbbd229dcc15e449274bafd3a87f73285ef609d09f6585a326cd43d13cf103928a0ec9cd10fe9fdb5803c1b0fe227e9111b67d0e773afc308a56d87 SHA512 d191d571b3626cdadfbd81728dce0180807c8b091bd7b3e73b8489b2b000414d02ec8b41e975312045bbf84fabb8fe1bd11ba46f19be0363126ad05ff30c04f7
+MISC metadata.xml 1574 BLAKE2B 6e971949fbb1f63ed4b9dde31eed159d3d2d0e903120020d4e49159e0dd6d07d582c9952bfdecf727663aafe8d50397ef15d69ee4ba050b33712ef5b67619d71 SHA512 81dc9b9b9f1d597356cbecf84c12536d3467bbc8ac29a79f1aa2566078df9f344ac031efbf0d6690ac9321f4e7c0713769c4cc30959ab86284c2b0f09dcf2397
diff --git a/app-shells/fzf/metadata.xml b/app-shells/fzf/metadata.xml
index aedb67ebbf2d..55c90b89b4ec 100644
--- a/app-shells/fzf/metadata.xml
+++ b/app-shells/fzf/metadata.xml
@@ -5,6 +5,10 @@
rafspiny@gmail.com
Raffaele Spinelli
+
+ consus@ftml.net
+ Olaf Torvaldsson
+
proxy-maint@gentoo.org
Proxy Maintainers
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index a418981ac9be..dfc2eda955b0 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 5323efbc7985..e545342fb9eb 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,7 +1,5 @@
DIST asciidoc-8.6.10_p20181016.tar.gz 576694 BLAKE2B 4d255606675346d00ab03398bf48cb30d357f9f9366944e4faf66ae4c96dafce49acdd930fc848f3dbb2d704a004bb5815d17b53416a76c8368a92e4716328b2 SHA512 801f360b0c444e932f1c50897d446de0ec3f0fb2206080b5aa6dda396fede96065f7bb629a84c8a8e40c5d8897f305fdb1877512f04ae757f3b142fd3a7305d0
-DIST asciidoc-9.0.0_rc1.tar.gz 1143528 BLAKE2B 97e2ee77cf7554e2e0d53e792213377e6cb233853717487b0c0ac1c70d233a5d58a08f3aa69ae840c90f98185b595f9feb7396795b2de47ff0cfc0147920bc2a SHA512 965d65df18ff90596e5cd72bec8d0f7daf2f6ad585ec77af2a6ae9637569b613e2384cc7015c1823fcde99be8170107789505a543fe8b6d3273f2c75a6a92960
DIST asciidoc-9.0.0_rc2.tar.gz 1145229 BLAKE2B e820a957a5e03f8b28e94fb0e9514b2beebe5b08a30357b7ab70db326894270972cfee1b44c30d51dc1c4794e91a09e36acbf9e464386d9e932ac7d32e2f8e93 SHA512 61ea1eb74a2e2da76f92e32ef279f8940fa4ea77a82078e15b54c7c6f134e9d177b0425c6eb8a239cfd2dc6a6f85ad5e93883a447a3e0e92850c0898747b5ea3
EBUILD asciidoc-8.6.10_p20181016-r1.ebuild 2619 BLAKE2B f0ae58d358cd1399aedac9776787d2a0e28261521d31b0bf6ca9fc02777469cbf5ac8d992eb51eb82a968510a1abb33dba35a24a9e9faa196acc172d60434db3 SHA512 9756d4447b3d8e77a21a182dbb865ce8ce1af6c523258aabb4b5aa7daedd49e7d446cca88654f8197d61e8b7157d2db631a1c08fdfc7f36b920d4f5cea33a183
-EBUILD asciidoc-9.0.0_rc1.ebuild 2723 BLAKE2B 4c300f19755be00bad844c09c252f5ba06985c7efbad1acddd7683d6fa5b261479eb6ced3554df9163b841cb23c23e2f3744376bb0bd733f68d2363b5f908f9d SHA512 45e514127164f15dea2c3715309beadd08c8dd1f6d999a7399769d5511d4bda48b5972a63bc6d237830d5eb8fc14a4d01ef3e0de6f08f67b8f4c127f7dbc19e1
EBUILD asciidoc-9.0.0_rc2.ebuild 2717 BLAKE2B af40448addb4dc1cab464a8770573a63d185024a64eec0cb3c3fede736e8918e27d81896e9511b63979a3eecb44bae416011e011fa1166555f711abcd77e60d0 SHA512 cc6e444bbc783d2f4ef336c41caeab9ee76895beafc9ed72088ab6cbaa4716865245acca901500d5552e470eb5de6aae0638247e31a0c0669d902aa5d8705eba
MISC metadata.xml 514 BLAKE2B 89fefee3e8081fc45a8251255bf365f58eba6aa9eef92a23bd8f234703b7062b1dd2a415260fcda1b799cffa4b46d0da22b153ba8de6b77cb6076666ff43ccb7 SHA512 2587ac6d8c24ceca295eef2dc6e0735461dd09864d6a1f282d67fc3c58cd18aa565099a2c280edec143024295b74a251152918932c37d3be450aef68d367ca70
diff --git a/app-text/asciidoc/asciidoc-9.0.0_rc1.ebuild b/app-text/asciidoc/asciidoc-9.0.0_rc1.ebuild
deleted file mode 100644
index ea4593547f48..000000000000
--- a/app-text/asciidoc/asciidoc-9.0.0_rc1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
-
-inherit autotools eutils python-single-r1 readme.gentoo-r1
-
-DESCRIPTION="A plain text human readable/writable document format"
-HOMEPAGE="http://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
-SRC_URI="https://github.com/${PN}/${PN}-py3/archive/9.0.0rc1.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- app-text/docbook-xml-dtd:4.5
- >=app-text/docbook-xsl-stylesheets-1.75
- dev-libs/libxslt
- dev-libs/libxml2:2
- "
-DEPEND="
- test? (
- ${PYTHON_DEPS}
- app-text/dvipng
- app-text/dvisvgm
- dev-texlive/texlive-latex
- dev-util/source-highlight
- media-gfx/graphviz
- media-gfx/imagemagick
- media-sound/lilypond
- )"
-
-DOC_CONTENTS="
-If you are going to use a2x, please also look at a2x(1) under
-REQUISITES for a list of runtime dependencies.
-"
-
-DOCS=( BUGS.txt CHANGELOG.txt README.asciidoc
- docbook-xsl/asciidoc-docbook-xsl.txt dblatex/dblatex-readme.txt
- filters/code/code-filter-readme.txt )
-
-S="${WORKDIR}/${PN}-py3-9.0.0rc1"
-
-src_prepare() {
- default
- # Only needed for prefix - harmless (does nothing) otherwise
- sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
- "${S}/asciidoc.py" || die
-
- eautoreconf
-}
-
-src_configure() {
- econf --sysconfdir="${EPREFIX}"/usr/share
-}
-
-src_test() {
- local -x ASCIIDOC_PY=asciidoc.py
- "${EPYTHON}" tests/test${PN}.py run || die
-}
-
-src_install() {
- default
- python_fix_shebang "${ED}"/usr/bin/*.py
-
- readme.gentoo_create_doc
-
- # Below results in some files being installed twice in different locations, but they are
- # in the right place, uncompressed, and there won't be any broken links. See bug #483336
- if use examples; then
- # examples/website is full of relative symlinks,
- # deref them for copying, which dodoc doesn't do
- cp -rL examples/website "${ED}"/usr/share/doc/${PF}/examples || die
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- optfeature "\"music\" filter support" "media-sound/lilypond media-gfx/imagemagick"
- optfeature "\"source\" filter support" dev-util/source-highlight dev-python/pygments app-text/highlight
- optfeature "\"latex\" filter support" "dev-texlive/texlive-latex app-text/dvipng" "dev-texlive/texlive-latex app-text/dvisvgm"
- optfeature "\"graphviz\" filter support" media-gfx/graphviz
-}
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index d6494e4370c4..f6280d7a1299 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,9 +1,9 @@
AUX po4a-0.45-614122-no-dot-inc.patch 473 BLAKE2B 1ff10a5637d25c57500b6cb953442bf8e9ddd57f778e8772ffbed27e9d5a98be6d55f77e7665b0ab7fd975d886bd2893a432c6c9c9713a090a37727cecf0f3f7 SHA512 0a651b9de200b3ca08b3c849f24eba6cfbac93dd5f35911c9bf2aade174cbec27ad2c5a061a628db1b308dc9c576e2dad3db71da9a507d6337bed9ce620ad042
AUX po4a-man.patch 621 BLAKE2B abdbac744d7395ec5f008e2ac2bcfd9aecf0f24726acd1e32a2a243995d9f26b0099e2194848a9a4d3b01dc24d4657cdc4470977838a96a1979495871dac5b8b SHA512 0d797b92c551eb75fa144e9b39d1aacc8acb00104a6d9e0dbdf4d00219b4c0c074637c953764e8cf1d67bdb1f3941fa0727da242b7761a96a8dafe66af224397
DIST po4a-0.57.tar.gz 3079550 BLAKE2B 54b1d3263aa0ebd90eec61d735c3422efb5f67b2d88f91a87a6893bcdb7f06131aedadeb3577d221cf75ba07f8001f6e23409375756afec8357e26e8f0f0a1c2 SHA512 7ac2e614c126b049feeb8edbafb71a875cee78fb85d8cd74f3bf5b555cc8b2d19d5e4606b732e714e937c34e178729d73edfe559de594c5ffe811b5162b27d81
-DIST po4a-0.59.tar.gz 3607872 BLAKE2B 4c8671507ec544690f9030df4f24dbaef2f7ac6adf85b3478762600bbbb97ab510817b21a9af8ee59cd8ec9bde726f66982442df62575325512f43bda43582d5 SHA512 d0453af140cb94ad28b1641c6437a4ec276eec2d71c63477a81ba866ad4e905ac9badb6ce167f8c00a2433c4f03de3a8ac8e1e7a9b6b0a932f1bfdde9157d4fa
+DIST po4a-v0.59.1.tar.gz 3624434 BLAKE2B 9837a7317eecd3db540bc7c23b3d26a9110f00d9c441b1bf1d61af80bae1fe0952f875425f14d66a939456f3a90e9ea74c189d94da7471c7c9a4d0b15f3875ce SHA512 904cb5817586fef19de55e76f3a33c264f9864b5c720b727a75e78a3b690e1ecd7b10603304a762d07b340320143b83b686c9918b9fe95499ceb55482950a4d4
DIST po4a_0.47.orig.tar.gz 2389750 BLAKE2B 72cd81e10f638a660e201b0c733b08c316aa75dd29b054bbc4c645c265b9e7745ce762305a8296f8cc37d2f182755dfa1394861f6c471cff1c7c398d13ac28cc SHA512 9c459a9795977a39aacc09cfb6ddbdc7dd2174e22896fa7bde90510a43ea833054aef558f7ca798991addc052a2c7f91ee11e5d49658a5c80a9ecb9c135ff97a
EBUILD po4a-0.47-r1.ebuild 1656 BLAKE2B d648029b8afc30b50ff4b216bc46b37731ff7bb471aeec21ada1244f37f9b431c392e0f32b1bf3f16cc15e7fc79946a23aef976548382b998057812d8366a593 SHA512 1ee6216f7c8f1aa4ba51cd96c6a2fd4b5361d8727fa056a333d96f1413aa76fe19480d5e77602a32b526d99a4b436a103fbe93a58856c2e4021c85c5cc20d53c
EBUILD po4a-0.57.ebuild 1321 BLAKE2B 1b21b1f84467ff062d888f126133dd76d61200b3e0efcd10485f68bcb654d4015dd8d8c0e55b8ef6a9a9c4959ddc68477f6e8489f92e808734063924902c631e SHA512 deedbdc30a91b4e7b8e7a7cc9d54629d6affe9744f3c8b1a38eb882a6f5000594939a0eed60fceeaf064d858e40e7d543f764fd02092dedfdddbaa60a7e5ac43
-EBUILD po4a-0.59.ebuild 1321 BLAKE2B 83b561ea73a885c4ac5c1a971eff02de024a344651d5d2c6bfdf5d6b4e65544d24c4ff0b39f7c58824dd72a8fe710157274487feec79c543b9ce012b7551c754 SHA512 9e3d46532ca4eff48b15e0cd0b8f077869006f48d8ed796c0326cc9e24334bf13067613117ec56a7ae8a47462039a942dc3ba4abfa4f6fd1355ed26bfd9de027
+EBUILD po4a-0.59.1.ebuild 1365 BLAKE2B 1d2364833b47fd38ad32290cd4942da8bebe13a266dd27dcc21b6265361bea45689a86771c49aab3a4f2478f6a350188f80bbaa9cca9572ca70619405ed52d02 SHA512 291da03d42b6039bcb35505161b8da6d7198b7f995130293d9d2582e26d7c01adaeee344791c84b55693c45ebbfc974743387f604bcbea6efcbfec6acf1536ad
MISC metadata.xml 326 BLAKE2B 6ec11e49a2b25069f1e2eeac2eaa7ce8adb48704986f873ba92de8a1328e7d2963cd79efac7d2672bdde1fc6c71cddbfa11fbb4bfd4cda28fa1f92e350ef5be6 SHA512 2fbc62c1bbc9a555103e9ba0eb3389004f9770eaff51e00fea853051ac6da43312366d3a50ba63ad28453219dfc8970f9a78c7af2bf7799f58911a33e0bfd3f9
diff --git a/app-text/po4a/po4a-0.59.ebuild b/app-text/po4a/po4a-0.59.1.ebuild
similarity index 95%
rename from app-text/po4a/po4a-0.59.ebuild
rename to app-text/po4a/po4a-0.59.1.ebuild
index a32ddb065e15..6d9d46d247b7 100644
--- a/app-text/po4a/po4a-0.59.ebuild
+++ b/app-text/po4a/po4a-0.59.1.ebuild
@@ -6,9 +6,11 @@ PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_B
inherit l10n perl-module
+MY_P="${P/-/-v}"
+
DESCRIPTION="Tools to ease the translation of documentation"
HOMEPAGE="https://po4a.org/"
-SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
@@ -34,6 +36,7 @@ DEPEND="${RDEPEND}
dev-perl/Test-Pod
virtual/latex-base
)"
+S="${WORKDIR}/${MY_P}"
PATCHES=( "${FILESDIR}"/${PN}-man.patch )
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index ae5e9fa59c05..e6a398810193 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/qdbm/Manifest b/dev-db/qdbm/Manifest
index 039c6e522db7..5efa691af8ef 100644
--- a/dev-db/qdbm/Manifest
+++ b/dev-db/qdbm/Manifest
@@ -3,5 +3,5 @@ AUX qdbm-perl.patch 1260 BLAKE2B e180ba6c2d57f6d813bbc6ae01ed787f6262a290eb59253
AUX qdbm-ruby19.patch 10116 BLAKE2B 9a15c5d2e0cf8237edb78e68b2f9fde4868841bcca6abc08a33d110b9f25283e37fcb306c18bcca5495c7e5cedc778e3a2de2fe8414ce46c661a7c40d517cddc SHA512 f3e6c320a600ad3355fc74a333c28fc2dd904a2a52ca91a51f21b3dd14c7527bf312f5040dbc3e4f61d2dbcc0ade185e226333c79f9a04fc05437a156befc0e7
AUX qdbm-runpath.patch 1133 BLAKE2B 9b1c8c211d8e4075a77a34f3d79ca15cb3d833801777bdb328293047539bdd1a51c08031b3400c11d10732aa7864078ca8db02713a95cd90704e1a9e26f5bd10 SHA512 de8bde4a614617d742131e8025fd661019ec81b803817ef32ffca461b2c8b60c20756f6e6f84d6f23124eed3947ab3573b8c4a05b254f8b4d3e53f0cf7bc8452
DIST qdbm-1.8.78.tar.gz 1015429 BLAKE2B 1b985d856ff18ddfeb2d779694ba9a76006908b4b2a7509d4e3668aded80e08bbde28bcc24762ec27048cdc01dc84f9872dbfc221e8eea6f1c68f5e81cdc69d3 SHA512 480549c56071bf82edf714a611aef863599c858ed63702820ae0890fd2c0029d1a231ed94a8090c74420dd648bd3625d270a5c078b113cbb86a12ef509e19037
-EBUILD qdbm-1.8.78-r2.ebuild 3331 BLAKE2B 8e25cd8be385f4a87b7d06f4ec49171bc6ee1d10d04c0b09cff343f00de6eedc5be95b3bfe3db1c4a7e0895ccd49483b44d6df6633f2538bbba619f6b784a07d SHA512 9f1b389f512718a00a32f9ad7932d98aad94556d284811dad35d3eca0364769f412a1e9b3ba47429eb6430ceeb4a3933d75f0ced71d9a36fd61fa33af36f6cd3
+EBUILD qdbm-1.8.78-r2.ebuild 3403 BLAKE2B 23967de1b107a6f912ca47808a47a9aa4f7b29dba650eb137b4603b40e9e8948380fa191d98333bf8e70a10b97195a919e01faced7256617beb2cf5dfa5616be SHA512 a3f8ff8dbeb8705bd96684d55c04dfa4d835096e44dd4fcd1137f7803ad8bb8d43fdf76c9aac21cc40985e76785df815fac22bcca0283943f698ada4e7d30352
MISC metadata.xml 221 BLAKE2B 6fb71e3c82061054a0c2d88c1ce8e591d5742628fe53032c9efd2c371ce1e8b0135b00ac91fa1905df39a507d5faa5871fb3a30d167dd46cec581682ba17c8ff SHA512 a11e9bbbabc9ac96985c5dc247e601b065fa762f12bce74224896c27aee34eb908187622bfc849c39c6c722a8ef8ee72b248afc84da1b0eb72f1ff5eeb13bbf0
diff --git a/dev-db/qdbm/qdbm-1.8.78-r2.ebuild b/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
index 034733d2ae95..40f5281fa882 100644
--- a/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://fallabs.com/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
-IUSE="bzip2 cxx debug java lzo perl ruby zlib"
+IUSE="bzip2 cxx debug java lzo perl ruby static-libs zlib"
RDEPEND="bzip2? ( app-arch/bzip2 )
java? ( >=virtual/jre-1.4:* )
@@ -153,6 +153,7 @@ each_ruby_test() {
src_install() {
default
qdbm_foreach_api
+ use static-libs || find "${ED}" -name '*.a' -delete || die
rm -rf "${ED}"/usr/share/${PN}
diff --git a/dev-db/qt5-sqlcipher/Manifest b/dev-db/qt5-sqlcipher/Manifest
index e6c63f1b2a36..c259c3e61473 100644
--- a/dev-db/qt5-sqlcipher/Manifest
+++ b/dev-db/qt5-sqlcipher/Manifest
@@ -1,8 +1,6 @@
AUX qt5-sqlcipher-1.0.10-install-path.patch 566 BLAKE2B e2d5d854ebe12233c55dbc213df033dbf0d26ebe0ec8c87bc41a1d8aa1d9775331a8080d6263fccd6de14cfa0d7dbacfa005109d2f69de987cac339b1e652322 SHA512 f07d7d1659fc120ae00bc1bb6256895fcdfddee7054c77b5f25793945921e1d9f95dc26088edd57af3488728df857d1f567e0a9c4ecb61a21c7db055f77eda06
AUX qt5-sqlcipher-install-path.patch 542 BLAKE2B 099aec88aa739615c444478dcf946a11782d34bcda0ea9905d88a766745a063b97f1198d0e03bb7222f338293178dad2c00d430eab7754475766ebfdf95a785d SHA512 a46bb590fe8f56f61d404b4c5deba362f70ecf3044fd746f5de3a897cf884aada1bd2345e768774e674ee8e91bd162775b6f2131e4f822cc91fae22c4d71bb13
-DIST qt5-sqlcipher-1.0.1-qt-5.14.0.tar.xz 8248 BLAKE2B 0cc717deecf2ff1d212a5b510be0c57d5cdac6abf9dc5db8f5d69762adb2a0d79298aa0e2f453417a5aa5b242637094e7ebaf6d7fe777539e0f8896f6adc3709 SHA512 a61231756967f0596b3903db1ca40937f1140a3d06ff9b6b6f6a6195650c170e0d4f42a3d51ac3f3cb35f4e173b78986a8fb31ed7a7e01e125ae78c7dd851246
+DIST qt5-sqlcipher-1.0.10-qt-5.15.0.tar.xz 8240 BLAKE2B 93541d04b1ce25e01438e7d9282645b4e9ae613390160e7a76ee106d9b4dcb42cd8b979918952ef151beac17e0bc3a1e52b03607c30c1005ce3d03875532830b SHA512 db506bf37373822c784aee533318a5899bdf46f5d89548b5ff8a6017e5e6f1ba7e5a4b856a28623e464ba34182382b8ada95b4f73dd47ba8e5b651dc6a747e35
DIST qt5-sqlcipher-1.0.10.tar.gz 245054 BLAKE2B edb36a47881e2d5801cf07cc9b6094ea53b9e0e595c0078d3a09b493979222a6ad655b074b015c0a152073e0f39d1e31ecb9e2021f7788dda04a0547cd47eddd SHA512 1a23da7d7c6de020ee0739154abe83f94208a3a6d385fd58eff38d3ea27ce51b37a66994e8ad0ff5102525c3573134f9b9362accf2032b7386ea174b12ea1338
-DIST qt5-sqlcipher-1.0.1_p20191025.tar.gz 200293 BLAKE2B 5a0c6401353bc1c9dc511ac585ebce8556742278c303032b3434116c5a778034df01a5133913f8eaac187863b91ef8432b20184b75882c738ed6d850682ac765 SHA512 9e5294ff4c25dc18ef83ecec6c7ef985fec73744f36b27d21591983eb9976b8a13151ef0a31ce3af9767ee3f6388b8f008404002345d328bf0094d03ca4dd8d0
-EBUILD qt5-sqlcipher-1.0.10.ebuild 1213 BLAKE2B 043a9bffc8f3973066220edb6bea8fa4aa5203dd6e351e1b6d3eae9bc6e741a521bb362dd3dcbcd7cf61f3d09847b4de3b5b28603e80ee545879931cdff7d816 SHA512 4d5d1a7f41998f60429cc1b9dddbeff1531651f474bbbbcb9c3da217f29998e386549c77cd78de7c4ad4bcf3a9175577b7013e439111072531f5a35de8fc06db
-EBUILD qt5-sqlcipher-1.0.1_p20191025-r1.ebuild 1416 BLAKE2B 19c8479a8f3817b3b3493f1b11bd47c0ec069f6bda93c43341e1f66c125445c5e11cd7395aaccd5c453620982565b41e0e965488773943816e4a77ab3802181b SHA512 c26b6b985db7d5f3980ddc799de0c39355fef69609c49638359893e83a719cdc016a03794fc2b75e6e600c1f4266797e0d252c8f8395e4c472b7e727c2b81764
+EBUILD qt5-sqlcipher-1.0.10-r1.ebuild 1353 BLAKE2B b3d69bf7b075873fb24ba3c16826f16364f1cc4ddaee9f99418c0d3e5652c3bbc912a58c224849f145a26b5b3b17d42f1432407ee4d777466b25773ba6458d53 SHA512 0ab78003fea0323ad7ba04964f60df0ee308da7ce6a41aeb51d82261127e6260b174e97d85ff0e2868038db4e0558bb08b40593a5fd1e303e64bc34cdcf160e7
MISC metadata.xml 212 BLAKE2B ecb53eb3efac6ceef048d345601c5ca0430e2f62d6409dc2a18494ee188f792d4763892816f197418d2e9a6d04452091a0c69d83afc207b366fca816632209ee SHA512 3919b8b096abf61c7edaa6a76898603b6ca2e206e2eccd27c671957a9d085bc2591a2fb4839a85ef2a51dcbf887bb2c752d4b38e82ea19c48dfd6d99b67954fa
diff --git a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.10.ebuild b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.10-r1.ebuild
similarity index 83%
rename from dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.10.ebuild
rename to dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.10-r1.ebuild
index 2e1c4834cc6c..1a5c9d0bfc5d 100644
--- a/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.10.ebuild
+++ b/dev-db/qt5-sqlcipher/qt5-sqlcipher-1.0.10-r1.ebuild
@@ -7,7 +7,8 @@ inherit cmake-utils
DESCRIPTION="Qt SQL driver plugin for SQLCipher"
HOMEPAGE="https://github.com/blizzard4591/qt5-sqlcipher"
-SRC_URI="https://github.com/blizzard4591/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/blizzard4591/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~ulm/distfiles/${PN}-${PV%_*}-qt-5.15.0.tar.xz"
LICENSE="LGPL-2.1" # version 2.1 only
SLOT="0"
@@ -15,12 +16,14 @@ KEYWORDS="~amd64"
RDEPEND=">=dev-db/sqlcipher-3.4.1
>=dev-qt/qtcore-5.12.3:5=
- >=dev-qt/qtsql-5.12.3:5=[sqlite] =dev-qt/qtsql-5.12.3:5=[sqlite] ${P}.tar.gz
- https://dev.gentoo.org/~ulm/distfiles/${PN}-${PV%_*}-qt-5.14.0.tar.xz"
-
-LICENSE="LGPL-2.1" # version 2.1 only
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-db/sqlcipher-3.4.1
- >=dev-qt/qtcore-5.12.3:5=
- >=dev-qt/qtsql-5.12.3:5=[sqlite] quickcheck -> cabal
+
+RDEPEND=">=dev-haskell/mtl-2.1:=[profile?] =dev-haskell/parsec-3.1.13.0:=[profile?] =dev-haskell/text-1.2.3.0:=[profile?] =dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=("${FILESDIR}"/${PN}-2.0.0.2-no-bootstrap.patch)
+
+CABAL_CORE_LIB_GHC_PV="PM:8.6.1 PM:8.6.2 PM:8.6.3 PM:8.6.4 PM:8.6.5"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-bundled-binary-generic
+}
diff --git a/dev-haskell/parsec/Manifest b/dev-haskell/parsec/Manifest
index f6d5c82152a5..610567b44468 100644
--- a/dev-haskell/parsec/Manifest
+++ b/dev-haskell/parsec/Manifest
@@ -1,7 +1,9 @@
DIST parsec-3.1.11.tar.gz 32412 BLAKE2B 7e463d37b1da799820079500d96d719e2f34781ba1d443391d5a49b60c3ad935c6c4e766aaa5963c1128ca12a0070f86b17fcbdf6e96224573742e0f9341c7f6 SHA512 f913c172295b184fc118a59ad5fd66c35133885c39aac62239fc3a1aa98b4741465f67d0cffafc1706262ada42259a4694bfbb9175a399997e5b8840da4a809f
+DIST parsec-3.1.13.0.tar.gz 35207 BLAKE2B d5d39122bdc8117aa45b7fc83c15162ac5d366ede01fbf99a94909c0b8ff6a31b6058bbd52ec6aa2366c6e9b1c909acb78c90a697821f8a88b67fa01c7655ff4 SHA512 4efa52bf5f8cdfe81ea97f1ea0bb5522331217976feaf98bb5ebfdf37f4685263f653de091c0ec0ecb0fc26cf6f8525639f9728c9e92afc154e91c6d4239c9b3
DIST parsec-3.1.5.tar.gz 27894 BLAKE2B 4c0daaa10d2307f59770747662b387cd286b46d27c3dff27c581d0e295f7bc652cc7e6e0f141ce69ef15da2af0e9f612f732b9bf09f17c9bab56dba0dc596481 SHA512 58bd5e1ea878349a678c4a8d77caf42962ab65f801411bbbad4fa1e4f387de743f2f64944b5d7ef82042507552f281f70a7f4b40984a0ca4fd37618a0d1ec662
DIST parsec-3.1.9.tar.gz 29668 BLAKE2B 296049551258044915936afa0928b0d73b30ec7cbb217b3ac76972cfc3f9cb49efbe5091c49fe1232f5bb24951efc0c56d89b7818046cc5b8edeb67796de28f6 SHA512 bc5209813ad0742c68c275f0ecd3e284b6249d2651f75daf16ad9a776003591217eb7d47fdaad88530af90455fe7d3e014c3c1d7d0893482721d4997b23a2d16
EBUILD parsec-3.1.11.ebuild 907 BLAKE2B ed849d5079142a4e9c35125fd20a05cd3ba1c0eadb6046a79a657722ca09796202a1c6bab97d67bf2ee1757eba46516d4b39c68481fee16affbb84d5a9047270 SHA512 41b60b20578535e65d2e86adf171001893504e804466bc21c7219fbd9c8e7a7ecb0c7c4a6097cecd2135703d945d5ed80780548802774264f570960a3e6ac594
+EBUILD parsec-3.1.13.0-r1.ebuild 1487 BLAKE2B 19d19b9a05c77810d032135254746a483e5bec18affb3406b149e58a45202971145f15e41005fe43a989a8b5ca54c12dc54bcd2732458b564c8ac4a7d77f89e8 SHA512 c0182c6ecbbb800a305016f38f3a115c9eece16201208362f7fd3c86833d0ef2e1e7b3aee7bb36cc8cd187cfb849bef748466324f59599f228b53e961917f446
EBUILD parsec-3.1.5.ebuild 702 BLAKE2B 0520e9997df96a1412c7a07f6e3ee30f7699445f4946dd2c6c6c79c9a48c78cdc52d3d117abd17b3cd755dcee7f972bb79f26cf5e41ccf93118004ccb84f06b1 SHA512 933688625f831ee6f93c0456e6d7bc2c4f4a101bab1747dbf6d0af3eee092a3847d280cbaedc754b966022af87e292e9b988c318b0f4afffbb0c883bf1e1276e
EBUILD parsec-3.1.9-r1.ebuild 955 BLAKE2B 568caf15f4a8e90f552467f2c1d9b420c9c14015bfbb74db446c168700f6bfccd9300e11c76031eb6899d135cf46fa749ea727090ff6089d309f4626ce801565 SHA512 f560bc02130b0c05197ba43e586797efb70210ccfe2c704449187489d5d3f49b62600b53fea34eb8b39c1a06cac9212b5bf8feb8387fca94e750254a5ec72277
MISC metadata.xml 307 BLAKE2B 16cc6920f5961ab10f92062508514149a785fb6011d4c68de20b40083cd8c80cc6e284a1ec8ab90a8937f14ffffe05602e753e91cc25cf2a28664c292fb5aa47 SHA512 bfda6d40cdde23fd32b6640ef6089cf3060a0d608ae4ba12954df60fd27d86fd3c0e1336a362754927bb00651db8e1a541be195c4cc464fd8bb417f3811b7a51
diff --git a/dev-haskell/parsec/parsec-3.1.13.0-r1.ebuild b/dev-haskell/parsec/parsec-3.1.13.0-r1.ebuild
new file mode 100644
index 000000000000..9999fac242a9
--- /dev/null
+++ b/dev-haskell/parsec/parsec-3.1.13.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Monadic parser combinators"
+HOMEPAGE="https://github.com/hvr/parsec"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+#keep in sync with ghc-8.6
+#KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # circular dependencies
+
+RDEPEND=">=dev-haskell/fail-4.9:=[profile?] =dev-haskell/mtl-1.1.1:=[profile?] =dev-haskell/semigroups-0.18:=[profile?] =dev-haskell/text-0.11.3:=[profile?] =dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ test? ( >=dev-haskell/test-framework-0.8 =dev-haskell/test-framework-hunit-0.3 =dev-haskell/hunit-1.3.1.2 =dev-haskell/hunit-1.6 = 4.5.1 && < 4.12' 'base >= 4.5.1'
+}
diff --git a/dev-haskell/syb/Manifest b/dev-haskell/syb/Manifest
index b5fe61c110ff..145c4ee09407 100644
--- a/dev-haskell/syb/Manifest
+++ b/dev-haskell/syb/Manifest
@@ -2,7 +2,9 @@ AUX syb-0.4.3-ghc-7.10.patch 3685 BLAKE2B 6efb3319b7feb2acf3d9626a56b3fa821dec49
DIST syb-0.4.3.tar.gz 38860 BLAKE2B a4587047b9fbf9a33b9f9e1c94afd4abe87e4f284d91255c9e02863cd1efed9bf4e59fe8441e433adf0aaf81556cfdba2988746f37b6b672d604749f57669035 SHA512 d351eb020dba7c257904b81504cacc233b33864bcc54aad48267db313755243206a2dc4a89d473062d5ca4eff09dd57f0610e99f944717a8e3bbd724775fd6b3
DIST syb-0.4.4.tar.gz 39215 BLAKE2B 5ef855075b5516ec1c3504ce54a997877873dcb32d6b3050eb7768ded0e10e6b4ef1f652bcb332d3823afb04ffd05724baa9d0e32cdbc271528467e0666d2b93 SHA512 fc916ec2ad4c76c7aa979f2b5040df5088b0a75b1e33e3b2325e2212b59d22db5773fe0803beb1b8b2e0a0a292f5620bcb23201dce8b790b8f4fa2252bd64a33
DIST syb-0.5.1.tar.gz 39469 BLAKE2B d69ba87a733bc81eb8e4cb24c5a2b6ac3f90a67f6da576f7fdb3a9191b7301805af8029847a578b3750fd672ae238697f7c5e91d34ca4ac1f7046684dc5f4184 SHA512 087bf9a51abe0a09edc0b920f9b91733016701d6ed24184d8f82da87d3b1912b96af4845a3b0ddb41868efede48f90b52d1940633cf0d366559e176cc7771257
+DIST syb-0.7.1.tar.gz 39594 BLAKE2B c7304aac08dde400d26bb296b2f9d5c5d148949d8d5469daadd83110d63f1c3865c21fc187494f5fc11f21708717d917f26fee1bca611d2ea4c998dc0fdfa62a SHA512 63a3138f7f824a9bc611b9d025d4e7adc2da8d420d260b66d56190db683a0afac58e4794e94b13d4aa7b423d949e55a1ed0220c99d368973117b5056fd0f4e65
EBUILD syb-0.4.3.ebuild 673 BLAKE2B 15355251aa115bdc40736796b569d6720380a9fe7d58bd44bab4c05a2b33d15976ab6e79795458e7f4554f899a307d28bfef88c83ae7806c0721e9f0efef0626 SHA512 b8eb1718a9ce976546859b0c59787e74cdaf83571e0d36361a755fcad90c5cce714db55af5b30b71bc660ace3faf0f081e83f05935b817a5ed31a53970eb8fa4
EBUILD syb-0.4.4.ebuild 671 BLAKE2B 19cf046a1feb9ddf70202dba272b4bf5573daf55ff063f6e66bf813684ca73246f08a4e0a9a8033b002b6bd4c0223a553314792604c7ebcbe766b398ae84fcc7 SHA512 87d9bb4cbc4d7d50777e5a411f3aa28805abbd9f78eb5640ae00f8f3911276e780fec2f7f48fd7fc29a33f6c27007af801a19b2159291ba77d373944fe515119
EBUILD syb-0.5.1.ebuild 671 BLAKE2B bb2aa60a30f68ead38a623befa9f297e8af46d8d9bd91c8868947e4c22719d907fd2f45b08cd64c3ce39c2403420949a439c71d518b021b3f0bc99645784b1bb SHA512 91df3e43b741051b6cfe63d1db939ade501b487202b0192bd1704d6440d5b74b58e39fae425d2d9269d87696cf561604fde500936bf4935c68880c5c24cc9477
+EBUILD syb-0.7.1.ebuild 611 BLAKE2B 75ab45a9b9ae8ebfc5d35f1e32995154fd69fa2590eb457e422d99ad8f009a65705ffa5643739d244cad440b304fdc6e2d2011ef2a484e54ef93fc0813311386 SHA512 93659e07d32252d7a5156ba0068ed619cfef7ea041e6e79b59b8db4cf972f81cd72f1533f4437ee51772c387a6b15b91592fe87942a7e16accd69e1bf9ef9ff8
MISC metadata.xml 617 BLAKE2B 18bef7e9fbae8a7be42c015ba247798e8d905e6aed2597109e48b7332608bbf96af3160fd25396142528a61c0d96d394b6186d934d90b2c2199f0acf14f3ce31 SHA512 0c378d2efe45acd20b0437dde07ba0988234120d132aa6764ec35e585149313739748ae25f5b05deee78722b21f8e861ebbc22f96dc800ee8205c74a32be96ff
diff --git a/dev-haskell/syb/syb-0.7.1.ebuild b/dev-haskell/syb/syb-0.7.1.ebuild
new file mode 100644
index 000000000000..6a9f610af793
--- /dev/null
+++ b/dev-haskell/syb/syb-0.7.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Scrap Your Boilerplate"
+HOMEPAGE="http://www.cs.uu.nl/wiki/GenericProgramming/SYB"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+ test? ( dev-haskell/hunit
+ dev-haskell/mtl )
+"
diff --git a/dev-haskell/text/Manifest b/dev-haskell/text/Manifest
index 1d56bdd8b722..5b65767c5d0a 100644
--- a/dev-haskell/text/Manifest
+++ b/dev-haskell/text/Manifest
@@ -4,8 +4,10 @@ DIST text-0.11.3.1.tar.gz 126477 BLAKE2B 27c135a5815eeeabd5791e4f0a16cce12def262
DIST text-1.1.1.3.tar.gz 138063 BLAKE2B 150151cd991c2e905d75087dde7b889850a5b51bb1d95838c1969dd851f64af5d8594c333d49e4e1fe269479d8e59bf17bca33ad64e7ff36fcf45f529354bd99 SHA512 bfa5301827c72cbb3346fdb485e10094326a7cac71e01bba700ca0344bd4069c5b16c590dd7c38ee85969be06a2d3fcd760b34ff6f98eef176e7e8c325739490
DIST text-1.2.2.0.tar.gz 148894 BLAKE2B 9a3e2d72f38f10b9e1e021ad7cf5cf182657a32f98fe5889befe1bf9fbd8da5a2a1e405177805774fca911b57279e3db73cd7e0ee22315210cb3c0f728633ad7 SHA512 832b0430581a06cfdfa2a5c83fa2720e3f4825ee0aa9c6b12ff6ccd424a9e3a061c9ae7eeda48fe7a9f077c50e379abe2eee3fb05bdbdec4d38115b5e3695f20
DIST text-1.2.2.1.tar.gz 149888 BLAKE2B 6ef907f42f89f0d1a0b109ef3f277cb3a653fae9564e35a772945f88eca64b3250d7db1d5124d73358046f6c729c0b7f345b4e747383f305af8a66f9f55acae1 SHA512 f0615f7614127d86dbfb3fba5dd1753af3d0774c46e11ee4a99d4510f73b59cf1bd8c73ca0387dba4fbcea3936aaaf0e92561cf6aab1a98d08fcad481d3795e4
+DIST text-1.2.3.1.tar.gz 157382 BLAKE2B 551012a6b7bfc1b1ad838f977d67981a35b9d13f1cd1b568ce0beed3583c50887cf1ceb1033fbeab215806c5a0d0c5ca39ce2f1aa20fd06365440c3324e8a6bc SHA512 643eb3306761c3e29e05dcd7d64abc505789cd00c60f7a4562e5747f63bcc0ae6f0cc54bb5ed92cc85dbf6406942bf40289baf30aca91bf92ac5215af5eddc98
EBUILD text-0.11.3.1.ebuild 925 BLAKE2B 07f91f44c93459935efff682838fb8b5589a1939683e53f8651c86ba54899ca0dc8271968921da8fd9fed1c07a45d3ff9f5236e1f70de779bbff108a3fc8fa43 SHA512 df6a270b4fdaa4bcf2164b448b2531223d587937e5fe3be03714de011323f0e496b07e3aef3ea8b9d2422f30b6ea1df9996d7ea1359be05607b47fb40fdbe92c
EBUILD text-1.1.1.3.ebuild 1069 BLAKE2B 14146b23e9294a8a8bf335e998fa6d29e21c9d39da92d0cfddee1ae3aedf8bab9b268668ea8dca012e17e2f6296d22ed5330faaedaf9eecebe0955a60a0a6159 SHA512 b8491127fa107a2bc5abd9e7f7cfaa1928312292bd8a0d70d6d2be9358b3830ef6252c76531ae394d6ddec0e86c0cb79ab56fc4e68c83d958f7d391127d86c2d
EBUILD text-1.2.2.0.ebuild 1110 BLAKE2B 47979429cd5f2fc9674ecde508a74ff86865be5c5819931dbc10bf5f919c647edc17379dfbd8115f40bab7b6c2a346d5ad6f74e4ced6446d26be1b927596a854 SHA512 5f089d1540e05c93aa7c50306066fdbc31c35901e7cf432586b7c4cae4cd8426c9b58b83e369961cd4a350efd14473ea51cbf7b86da9506a8f3b64a393af53c2
EBUILD text-1.2.2.1.ebuild 1029 BLAKE2B 2c39f84487f91c01fcc2f69ea6045ce1f26162ac1368ad2f738dfdf7d659a442b9c8f66ed93b54b507ebeed77f8dba637ecf02654760e6d5e16d7dfd013bdeb3 SHA512 0050b6bc9ebca34311fb352f14adfe4e7c117c6d2c26f60daa47e825852bb2cb6a8c7610602393198f8dbc64dc977b3a63beeea5853e042ea5da5da8cdc81e16
+EBUILD text-1.2.3.1.ebuild 1089 BLAKE2B 319ec3faafa5bffa20281d4cd48a1897e8dd09f1f0e272677665a9986daaa5e7130649982bbb50c21f72d7360ffe2957e9f6d53e85990ba90c9e8d3ebdca2a52 SHA512 e98ba12aa0f535c8055ab234975b5a35f55b4482a66e9449b7ea016f8cc5718ce836f33a8b09f8ea34a2cc38197354fffc5786451af124fba9db8d129b9f0cff
MISC metadata.xml 1581 BLAKE2B 104f716f948006fb03fdfca08393a442a26767588a86e5f98ca12cbe54157b9448720e096888b47e0d4f6fdf30491fd6a77e62176985571a045d86f22d0de31a SHA512 398b1ba4d7eb16bd1517cd446278b42f2f15196faad1a59b0d9b04fefc9a63ccef0e871c614561ac7f0db5a3807ea4bd6a4ee5082a1a6915d525cdaedb6752c0
diff --git a/dev-haskell/text/text-1.2.3.1.ebuild b/dev-haskell/text/text-1.2.3.1.ebuild
new file mode 100644
index 000000000000..9bc3d4248bb2
--- /dev/null
+++ b/dev-haskell/text/text-1.2.3.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.6.9999
+#hackport: flags: -bytestring-builder,-developer
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # broken test-suite
+# break circular dependencies:
+# https://github.com/gentoo-haskell/gentoo-haskell/issues/810
+CABAL_FEATURES+=" nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="An efficient packed Unicode text type"
+HOMEPAGE="https://github.com/haskell/text"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+# keep in sync with ghc-8.6
+#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+# break cyclic dependencies, test suite requires porting to >=QC-2.11
+RESTRICT=test
+
+RDEPEND=">=dev-lang/ghc-7.8.2:="
+
+DEPEND="${RDEPEND}
+"
+
+CABAL_CORE_LIB_GHC_PV="PM:8.4.4 PM:8.6.1 PM:8.6.2 PM:8.6.3 PM:8.6.4 PM:8.6.5 PM:8.10.1_alpha1 PM:8.10.1_alpha2 PM:9999"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-bytestring-builder \
+ --flag=-developer \
+ --flag=-integer-simple
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 8a6f21923936..3c4934987ba0 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/mozart/Manifest b/dev-lang/mozart/Manifest
index ccfd5a3e02fc..d7730eefebb6 100644
--- a/dev-lang/mozart/Manifest
+++ b/dev-lang/mozart/Manifest
@@ -1,7 +1,8 @@
AUX 50mozart-gentoo.el 482 BLAKE2B f98c3c44f0e9ddfad7ee957e4c0dd3b24a01905ce09289322b6a3e391b515cb82e3334ac30c5b18c84aa86e57c22c1bd1622687d66858ca42a25556d1a26c4c8 SHA512 d9319273051e3d485e35af29710a3df1b7bd66f47ec7ee60cf37af364ec2dbe42d6507ed573d39577479a6c58ba2f15c52052b32d37371ea0b5aebf39bd46bbf
DIST mozart-1.4.0-gentoo-patchset-5.tar.gz 24700 BLAKE2B c3b14bd7d8a762b84a098a9e42dfe09b5b902fdfe6c8e8dcebe7198eaaf0e89cbb101ec3765713db0fbddb6f3b9741ed927af98df48aed496d7864f6bc5f6999 SHA512 99db9bf62682fd306c4b665d99ab3b48a787c26230d5e8db2e3564684eff2e41ac0c6bb6a612afa0446555dcb1e419ae7ef1dbfec4c918d769d51dafeeee8462
+DIST mozart-1.4.0-gentoo-patchset-6.tar.gz 25878 BLAKE2B 831fa3accc587c769ab40ae4289e45ca28171af572095b7c3b93b69e82ff4bcaeb425d68c7a76aa9b2724b610ba21020647b6d1e3aa525ce58edbc9446d88791 SHA512 5a292bcc81c8062ebd5a948b224e8131302fc61b60303b8e3257ed20e751d0a874303611aeba6d1aacddbf92ec611428e49c2c17bc1dff5e182d0198afe655bf
DIST mozart-1.4.0.20080704-doc.tar.gz 4085020 BLAKE2B 33eaf57c91dd62d9aa79651095aa5d095086d76dfa16bd5f520962229338c00556fcf3ac01eca1769c687f990110e95fa887d56391346af780d55166708338a1 SHA512 25f8f4b603ae7f4ef054a79a2baa4e10074f8a95f762b75fd88480526fb073b5b4874c269d116a960017a9e7ef989dd9f41853b0ff76e08b2cad2de2090c2eb4
DIST mozart-1.4.0.20080704-src.tar.gz 11848201 BLAKE2B 0ceeb7dbd3f6858d1a4fee76f2a99eeb3127a07fd31b6760748ac8b8b638c36caaa873154be6481c3dc4b5196ef04cb0c10be421bd87dc3bc4e6b29357622d8d SHA512 f1114662c8c603cc2ac530d4ea1d22a0581f6e1b4d5cb57ccf899b8051ea48dbcf2fa2b62173359a754367a5456a7cb121a208d6a246248207599b0470525229
EBUILD mozart-1.4.0-r3.ebuild 2907 BLAKE2B 51d3f72aa2e7fa96029a9ff8abb21f52153dbaf044a6a9c84ea6c9ab6431447e5b2c469166bede84c5f6fb9e2a3b62a059424d569f455eb9723db7cff1783a7f SHA512 f860e6013bb7e8efeecb8ec020f7884718e082ea7917b70e9c9343961ae0f72d188b256ce647897d7e2f284dc6ac3cb349ace59eaf00fd69d775f43fae11b11f
-EBUILD mozart-1.4.0-r4.ebuild 2899 BLAKE2B 39c2530e3a87f38a29291ff44e861b287d1413463c1c7fcd80ccf611cbd9d8ea3f6c976f92fe3136ecce7453f9194dd99999e1600cf8ca81e8226e130ea51ef4 SHA512 c1324e8ae65b5f23d0727bc6a5c87238d5413df4ac31c45e9e8259531bf2cacf7764e9646a9ace1427fe197995c4a79d972131e39c0204ec6bc04c927930acf3
+EBUILD mozart-1.4.0-r4.ebuild 3080 BLAKE2B 1363240805a389a5e111d30a5e38287dff565d1716b39b10f7a80ac73aa5f0c6f3e4c8fb2ab8ed93dc7512c8e18ed045421db1a750105d4098761425606769ea SHA512 e4347d58bf3233a4db2aebb7c94d71ff3a1e5408179e72975a84e8f31a0a53b59b75ebffa0a3c510a6fb80d6b3995095abdd07b955cc259047bdb71b1a76b029
MISC metadata.xml 248 BLAKE2B 15dcca8e423036aaf3d73f9557507d39f7a22a6fa36d83405d8180df441adc50b9d61f8dd720a9d0045f5b3e6ebc9785fcf8f1340c253b2d277404672d395c1b SHA512 b296da55efb17a1040203bc1f5f3bfa8160711fdb72f0543739e6efe48b75427c082eb6c405d99b3256e8d536d3d29f71fdd0fd8d281cb9a9967060ea467a034
diff --git a/dev-lang/mozart/mozart-1.4.0-r4.ebuild b/dev-lang/mozart/mozart-1.4.0-r4.ebuild
index ab9ddf42868e..25aff0bfbc8f 100644
--- a/dev-lang/mozart/mozart-1.4.0-r4.ebuild
+++ b/dev-lang/mozart/mozart-1.4.0-r4.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit elisp-common
+inherit elisp-common flag-o-matic
-PATCHSET_VER="5"
+PATCHSET_VER="6"
MY_P="mozart-${PV}.20080704"
DESCRIPTION="Advanced development platform for intelligent, distributed applications"
HOMEPAGE="https://mozart.github.io/ https://github.com/mozart/mozart"
SRC_URI="
mirror://sourceforge/project/mozart-oz/v1/1.4.0-2008-07-02-tar/${MY_P}-src.tar.gz
- mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz
+ https://dev.gentoo.org/~keri/distfiles/mozart/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz
doc? ( mirror://sourceforge/project/mozart-oz/v1/1.4.0-2008-07-02-tar/${MY_P}-doc.tar.gz )"
SLOT="0"
@@ -43,9 +43,15 @@ S="${WORKDIR}"/${MY_P}
src_prepare() {
default
eapply "${WORKDIR}"/${PV}
+
+ mkdir -p "${S}"/build/contrib
+ ln -s "${S}"/configure "${S}"/build/configure
}
src_configure() {
+ cd "${S}"/build
+
+ append-flags -fno-tree-vrp
local myconf="\
--without-global-oz \
--enable-opt=none"
@@ -70,6 +76,7 @@ src_configure() {
}
src_compile() {
+ cd "${S}"/build
emake bootstrap
}
@@ -81,24 +88,26 @@ src_test() {
}
src_install() {
+ cd "${S}"/build
+
emake \
PREFIX="${D}"/usr/lib/mozart \
ELISPDIR="${D}${SITELISP}/${PN}" \
install
- dosym /usr/lib/mozart/bin/convertTextPickle /usr/bin/convertTextPickle
- dosym /usr/lib/mozart/bin/oldpickle2text /usr/bin/oldpickle2text
- dosym /usr/lib/mozart/bin/ozc /usr/bin/ozc
- dosym /usr/lib/mozart/bin/ozd /usr/bin/ozd
- dosym /usr/lib/mozart/bin/ozengine /usr/bin/ozengine
- dosym /usr/lib/mozart/bin/ozl /usr/bin/ozl
- dosym /usr/lib/mozart/bin/ozplatform /usr/bin/ozplatform
- dosym /usr/lib/mozart/bin/oztool /usr/bin/oztool
- dosym /usr/lib/mozart/bin/pickle2text /usr/bin/pickle2text
- dosym /usr/lib/mozart/bin/text2pickle /usr/bin/text2pickle
+ dosym ../lib/mozart/bin/convertTextPickle /usr/bin/convertTextPickle
+ dosym ../lib/mozart/bin/oldpickle2text /usr/bin/oldpickle2text
+ dosym ../lib/mozart/bin/ozc /usr/bin/ozc
+ dosym ../lib/mozart/bin/ozd /usr/bin/ozd
+ dosym ../lib/mozart/bin/ozengine /usr/bin/ozengine
+ dosym ../lib/mozart/bin/ozl /usr/bin/ozl
+ dosym ../lib/mozart/bin/ozplatform /usr/bin/ozplatform
+ dosym ../lib/mozart/bin/oztool /usr/bin/oztool
+ dosym ../lib/mozart/bin/pickle2text /usr/bin/pickle2text
+ dosym ../lib/mozart/bin/text2pickle /usr/bin/text2pickle
if use emacs; then
- dosym /usr/lib/mozart/bin/oz /usr/bin/oz
+ dosym ../lib/mozart/bin/oz /usr/bin/oz
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
fi
diff --git a/dev-lang/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest
index afaa6a81e999..7ffeab4f3007 100644
--- a/dev-lang/qu-prolog/Manifest
+++ b/dev-lang/qu-prolog/Manifest
@@ -1,7 +1,8 @@
-AUX qu-prolog-10.1-qt5.patch 1037 BLAKE2B 91287f26c97c0c2f1c9cd3bae3a007cf27e4b8121aca4a42cabbbb37c224b7399ed06468b7a725977f27bad2fcda8d2165bfeb569f36491d227dd472036de5ed SHA512 9dd1c8245f725d552bf23ad9ef1bb858a06c69b66778fa851013775081751a77923e2145f6575966e8394666b8dc2e04724d102be28b32efaa44b7e474b3dd7f
-AUX qu-prolog-10.2-qt5.patch 1037 BLAKE2B bcb3728a1439430c2b3f9ffe4788f98af276376a7513fc8f8c8bc3b49636df04bc907b52a134475750c17b33db9e83437b3376be441e81f479c887427a1e3331 SHA512 8d0faa258386e76eb2764207d92f5ab7216975d31547db9b61287dd365ad357d7bef351f4545a24bdd61e3abfae22549a9ce9c40af71aa1d4b36eec6c21c9952
+AUX qu-prolog-10.x-qt5.patch 1037 BLAKE2B 91287f26c97c0c2f1c9cd3bae3a007cf27e4b8121aca4a42cabbbb37c224b7399ed06468b7a725977f27bad2fcda8d2165bfeb569f36491d227dd472036de5ed SHA512 9dd1c8245f725d552bf23ad9ef1bb858a06c69b66778fa851013775081751a77923e2145f6575966e8394666b8dc2e04724d102be28b32efaa44b7e474b3dd7f
DIST qp10.1.tar.gz 1521610 BLAKE2B a4d6d277a35284accfff1afd70901218df198b2b33f5c95ca5649bf06abcb153890f2f21b0e8d62ed93484b452a230074f93c983ab231c8fc58b51a29119d838 SHA512 8fb30fcbc086384d7e265695a7d24a9599ed306b5da0ea964e60aef4bb01c7b6789fc361449f908736c57d86c204e574d745f277d5b0ec2b725a8eca52f14f1a
DIST qp10.2.tar.gz 1667066 BLAKE2B fe466bc892a0923f463347bfa22618061d8a8baf9e2fc60ea27694c66be6dc8ac9b0bacd3084bccff95ff06ef949660cb9a0637a8e3e3595d04c44eb2b682bc9 SHA512 5cfebab17a812513bb4ddf4c04890af32339bef18d746dd6503cee13d295c43f1ef687a6c7814b2f40473766c695459f8234541ae8a6945a0f2930556985ad96
-EBUILD qu-prolog-10.1.ebuild 1944 BLAKE2B fe102881c65e68fd6003c37da96195ef4f8f709c296f4679531b7c12e336182efacd29792103a0c8c5761e9adc53079d1615fdd8365de448f58c406f5027937c SHA512 c3119e71e850850ab4d7689f70da79de78ad7aa34386880c641bb20c1765dddf0379bf0371e0e831e7a9c08adc17efb7e44e4a79fed33894f24935f628c72e59
-EBUILD qu-prolog-10.2.ebuild 1944 BLAKE2B 48d2f0752d26d047dd3608f4a3b756ec5ee6a7593135cbe5ee5fe1a99206b64b6cdde840bd0bb5df9bda6250aa01294331ed448491f5293a37297e389f71c3b1 SHA512 26269b3b773af8f6ffe76f0831c1f6e565bbe29a96567abb0fe94561fdc807db653cb22fabbc0e505d55de458c91551116ca5086dcdff33de997722af7808ebe
+DIST qp10.3.tar.gz 1669345 BLAKE2B 9dc14f683555b22e7bb2119dd6d29cad7c934bb162def4358d69da65cd259b586fac593c7770dc1d665ab56da2e1129a696e84b01a271b747a9e3a8598c0d7fa SHA512 e28519fccf58f2b755382f2b8e56c15f2622508822c920975577feb6b837f96346a14eb23a5209ed126e617264ed7846b8a35d5936e99284503d5c435c0a1c18
+EBUILD qu-prolog-10.1.ebuild 1947 BLAKE2B 2c5dff2cf601a8822592aed684a241ae61b17e42a4ea7bbeb704778cddadc97208813b656a8b44a581c46decfaa17fdc9cadd5be2c0d0aaabbe7e08feb3f0c93 SHA512 38a37103ab77155890f9fd59ce921a9211357f26dd00b7d211908c77d39371cb780ed1e498e04fc0486d9e38578af71adea0ac97d0e16731b0bcea40126367d0
+EBUILD qu-prolog-10.2.ebuild 1950 BLAKE2B 7afc003d0f75a3abaa8459188c10dd06e422eb60a985e69a00559e8dcb83455408932817302468a689af01061d2b3ce0201e65f88d5bb98c2644b95f6ad3a5ab SHA512 dc8389b186f7a84a14593bdce6bd33829061287f338e68894ce117dcf7e5e5f32f5e9099f324d5f7cc17ce7295f393e7ba49d49f442559bad5bd010ed0235e3e
+EBUILD qu-prolog-10.3.ebuild 1909 BLAKE2B 772953fc1daee919d422764968f6df52da0f7ea04b316ee353cf188ef6e276a64d648c2da2c5312b257f5c7f255a86c3949c9462e9afaeafa67d471115efec2a SHA512 1ce44624dcbc29f65f20d232836556837641d75cf2b6ba002f20b6de351f08ccb6a8937949add4b13969370dcc24f3b6da6f09dd6a628d353d88ad264dfa80c4
MISC metadata.xml 347 BLAKE2B d0d2ead501a46ff84953eceee649d58e406ebf5a83e7b7862b9501b2e665ad71b5c9c31f4790161074debb7b86ce7e53ff8d0904c39c37ddcac6250668685aca SHA512 7a7bb3ccaa42fa120c3702d963719d5fdfcf0a413685cad98bd34a515a4cc83a213a71e7f3b6b0ce67947fa347229caecf699879192f0d930c9c6577e0ce59cc
diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.2-qt5.patch b/dev-lang/qu-prolog/files/qu-prolog-10.2-qt5.patch
deleted file mode 100644
index 4d5ec768be9c..000000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-10.2-qt5.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ur qp10.2.orig/src/xqp/term.cc qp10.2/src/xqp/term.cc
---- qp10.2.orig/src/xqp/term.cc 2008-07-09 07:32:37.000000000 +0200
-+++ qp10.2/src/xqp/term.cc 2020-03-21 14:08:16.842059351 +0100
-@@ -38,7 +38,7 @@
-
- bool graphic_char(QChar c)
- {
-- switch (c.toAscii())
-+ switch (c.toLatin1())
- {
- case '-':
- case '/':
-diff -ur qp10.2.orig/src/xqp/xqp.cc qp10.2/src/xqp/xqp.cc
---- qp10.2.orig/src/xqp/xqp.cc 2011-07-14 01:08:42.000000000 +0200
-+++ qp10.2/src/xqp/xqp.cc 2020-03-21 14:08:16.842059351 +0100
-@@ -167,7 +167,7 @@
-
- void Xqp::send_cmd_to_qp(QString cmd)
- {
-- write(qp_stdin, cmd.toAscii(), cmd.length());
-+ write(qp_stdin, cmd.toLatin1(), cmd.length());
- }
-
-
-diff -ur qp10.2.orig/src/xqp/xqp.pro qp10.2/src/xqp/xqp.pro
---- qp10.2.orig/src/xqp/xqp.pro 2008-07-09 07:32:37.000000000 +0200
-+++ qp10.2/src/xqp/xqp.pro 2020-03-21 14:08:16.842059351 +0100
-@@ -4,6 +4,7 @@
-
- TEMPLATE = app
- INCLUDEPATH += .
-+QT += widgets
-
- # Input
- HEADERS += interact.h qpconfig.h qthelp.h term.h xqp.h xqpqueries.h
diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.1-qt5.patch b/dev-lang/qu-prolog/files/qu-prolog-10.x-qt5.patch
similarity index 100%
rename from dev-lang/qu-prolog/files/qu-prolog-10.1-qt5.patch
rename to dev-lang/qu-prolog/files/qu-prolog-10.x-qt5.patch
diff --git a/dev-lang/qu-prolog/qu-prolog-10.1.ebuild b/dev-lang/qu-prolog/qu-prolog-10.1.ebuild
index df4cb97f00be..66036b4f69a1 100644
--- a/dev-lang/qu-prolog/qu-prolog-10.1.ebuild
+++ b/dev-lang/qu-prolog/qu-prolog-10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
S="${WORKDIR}"/${MY_P}
src_prepare() {
- epatch "${FILESDIR}"/${P}-qt5.patch
+ epatch "${FILESDIR}"/${PN}-10.x-qt5.patch
eapply_user
}
diff --git a/dev-lang/qu-prolog/qu-prolog-10.2.ebuild b/dev-lang/qu-prolog/qu-prolog-10.2.ebuild
index 4f85be09a082..d7dbcab7d77c 100644
--- a/dev-lang/qu-prolog/qu-prolog-10.2.ebuild
+++ b/dev-lang/qu-prolog/qu-prolog-10.2.ebuild
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
S="${WORKDIR}"/${MY_P}
src_prepare() {
- epatch "${FILESDIR}"/${P}-qt5.patch
+ epatch "${FILESDIR}"/${PN}-10.x-qt5.patch
eapply_user
}
diff --git a/dev-lang/qu-prolog/qu-prolog-10.3.ebuild b/dev-lang/qu-prolog/qu-prolog-10.3.ebuild
new file mode 100644
index 000000000000..c6f3783e7484
--- /dev/null
+++ b/dev-lang/qu-prolog/qu-prolog-10.3.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib qmake-utils
+
+MY_P=qp${PV}
+
+DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions"
+HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html"
+SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc examples pedro qt5 readline threads"
+
+RDEPEND="
+ !dev-util/mpatch
+ !dev-util/rej
+ !games-rpg/kqlives
+ qt5? (
+ dev-qt/qtwidgets:5
+ dev-qt/qtgui:5
+ )
+ pedro? ( net-misc/pedro )
+ readline? ( app-misc/rlwrap )"
+DEPEND="${RDEPEND}
+ dev-lang/perl"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+ eapply "${FILESDIR}"/${PN}-10.x-qt5.patch
+ eapply_user
+}
+
+src_configure() {
+ econf \
+ --libdir=/usr/$(get_libdir) \
+ $(use_enable debug) \
+ $(use_enable threads multiple-threads)
+
+ if use qt5; then
+ cd "${S}"/src/xqp || die
+ eqmake5 xqp.pro
+ fi
+}
+
+src_compile() {
+ emake OPTIMISATION="${CXXFLAGS}"
+
+ if use qt5; then
+ cd "${S}"/src/xqp || die
+ emake
+ fi
+}
+
+src_install() {
+ sed \
+ -e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \
+ -i bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die
+
+ dobin bin/{qc,qecat,qp,kq}
+
+ use qt5 && dobin src/xqp/xqp
+
+ into /usr/$(get_libdir)/${PN}
+ dobin bin/{qa,qc1.qup,qdeal,qem,qg,ql,qppp}
+
+ insinto /usr/$(get_libdir)/${PN}/bin
+ doins bin/rl_commands
+ doins bin/{qc1.qup,qecat,qg,qp}.qx
+
+ insinto /usr/$(get_libdir)/${PN}/library
+ doins prolog/library/*.qo
+
+ insinto /usr/$(get_libdir)/${PN}/compiler
+ doins prolog/compiler/*.qo
+
+ doman doc/man/man1/*.1
+
+ dodoc README
+
+ if use doc ; then
+ docinto reference-manual
+ dodoc doc/manual/*.html
+ docinto user-guide
+ dodoc doc/user/main.pdf
+ fi
+
+ if use examples ; then
+ docinto examples
+ newdoc examples/README README.examples
+ dodoc examples/*.ql
+ fi
+}
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index e18f1cd1875a..3323717c40a2 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -3,9 +3,11 @@ DIST swipl-8.1.29.tar.gz 10902999 BLAKE2B 2163cbe4ce772fc0ba8dc961aabf5d3940e0b7
DIST swipl-8.1.30.tar.gz 10921576 BLAKE2B ce163c7600554e5a2f62a75c4fc17444c115adda96527068f6ee707f390c9383e8e2f7a24cf493903edd895fd5ece186b7645cad50d44805d57617c7182ba120 SHA512 1b8be8d4f987bb4ce4e3ea82ab02c0e89f2fba68818a15bf2b86593ba53724005cf617f69e41a4394009dcd0abda84103cba4d4bb3ae562b29d942d0f55cad9a
DIST swipl-8.1.31.tar.gz 10949562 BLAKE2B 60a4dd1da1cce309f45e557b25d7fa384ac0d75bf819b5e49d8303cae260d6576b01adb9c26bd7496962ae64a3b012c146408f8adaf6a253c526d50f5ed6b74c SHA512 629dd038fac868b0a2bcf71807ff6e795fd9c83a21358ef679b27bde8197b6f0aaf588a033720db9b1dd88c27dfeb0a42a13bc04e938f504524b48fa34891f1d
DIST swipl-8.1.32.tar.gz 10959244 BLAKE2B d67a1f675d70862df4afa103b118d88750ee5937920dd7ecbc02773ddc1c4762a4d7d8afc7e822b5989cbcdd2feb0980d150c59b67dc129873619cbb40721564 SHA512 d0fbfe85b375bdba2a585b609c1a66cbaca50081d0946803a43b10813f4d7b6e138b644632dde7f8ac06f590f2de9aa3dbc927a128f105c1c3547ac6ae9a9c25
+DIST swipl-8.2.0.tar.gz 10955744 BLAKE2B 3f1a534a967c86054596fe8ec5fda41ae2ab09d5617de2082f549211dec39674c2d53a210e697a9399be6061f7cea1f0fb241243c9c6226e64aa4ab22c990c85 SHA512 aa0d5e8e8c35e3ff1b6827c9a1ea53de44fa71698b98c974c9e65f2071545d0b71fba7f897327db38791f3cb706072c5dffdb46b4865cc26b9b25ad97522de4b
EBUILD swi-prolog-8.0.3.ebuild 2490 BLAKE2B edc287a8138d4d5e1c1638e316a860aded0a514a76b3b4e66d03977ba277ed280523544a2c6b8187ffb8f3f67035a475e2de80e0bce333dddcab385b06797eb4 SHA512 1c689254578253eb4f138f0ee2f498690c280148c6b544f3995827ed4a11bc61b63e95e1bf85bd83e7ccd0939267964679cf102f7bffb072b122a521d6521a96
EBUILD swi-prolog-8.1.29.ebuild 2553 BLAKE2B 9a4f63d674d380cbae06fd7d67432970e8c5f6f76ddbd77a2ada30dbd0cf8e6f28751cd8fd321bcdb6857a9ee99ba2f1632a8921e68c87ffc168e47ca356f73d SHA512 31745cc81c863c8062743be5960cf253e1c00173c1a11fdd0fa5d90457f94d5c8df615354275af865cd24b982372a35c6c3f45e0fb581e8b20f1183ff3610ef5
EBUILD swi-prolog-8.1.30.ebuild 2553 BLAKE2B 9a4f63d674d380cbae06fd7d67432970e8c5f6f76ddbd77a2ada30dbd0cf8e6f28751cd8fd321bcdb6857a9ee99ba2f1632a8921e68c87ffc168e47ca356f73d SHA512 31745cc81c863c8062743be5960cf253e1c00173c1a11fdd0fa5d90457f94d5c8df615354275af865cd24b982372a35c6c3f45e0fb581e8b20f1183ff3610ef5
EBUILD swi-prolog-8.1.31.ebuild 2553 BLAKE2B 9a4f63d674d380cbae06fd7d67432970e8c5f6f76ddbd77a2ada30dbd0cf8e6f28751cd8fd321bcdb6857a9ee99ba2f1632a8921e68c87ffc168e47ca356f73d SHA512 31745cc81c863c8062743be5960cf253e1c00173c1a11fdd0fa5d90457f94d5c8df615354275af865cd24b982372a35c6c3f45e0fb581e8b20f1183ff3610ef5
EBUILD swi-prolog-8.1.32.ebuild 2553 BLAKE2B 9a4f63d674d380cbae06fd7d67432970e8c5f6f76ddbd77a2ada30dbd0cf8e6f28751cd8fd321bcdb6857a9ee99ba2f1632a8921e68c87ffc168e47ca356f73d SHA512 31745cc81c863c8062743be5960cf253e1c00173c1a11fdd0fa5d90457f94d5c8df615354275af865cd24b982372a35c6c3f45e0fb581e8b20f1183ff3610ef5
+EBUILD swi-prolog-8.2.0.ebuild 2554 BLAKE2B bb6772dc66a33fb77f0151499856766586edb458fb4cf2ae9b81f41d8a412e64ca7bbe3ba7268bfc53ca1a26084514a54fa1f99bf008a30b53833c87a6636088 SHA512 bca5df7dfe17dbdd56d54f457c3c0ebd91d7f97de3329e304da123d9620a70588b6ede401f2ed1f187b2a02ca9ea8ab113a4d37453d28ac8d12ccc8092f532b3
MISC metadata.xml 419 BLAKE2B 6d92e0713ed8da803ff8b6c778e616882af2fdb1426a62ea7bb6a265bbfff9a5c7debb8bf6a25c4ab60ed54a865b79fa3da4a09bc8a9123acf63dcb32107f54e SHA512 f805393c909e4108fe72b94f131d37d45279af1a4b501f9c3ae12d21590ef9c19227ca2a4b2966239ddb84847ce979cfbfcf3f3a2d24b60cb23977c522ff59c3
diff --git a/dev-lang/swi-prolog/swi-prolog-8.2.0.ebuild b/dev-lang/swi-prolog/swi-prolog-8.2.0.ebuild
new file mode 100644
index 000000000000..f1cf278d9e4e
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-8.2.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils eutils flag-o-matic multilib
+
+PATCHSET_VER="0"
+
+DESCRIPTION="versatile implementation of the Prolog programming language"
+HOMEPAGE="http://www.swi-prolog.org/"
+SRC_URI="http://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="archive berkdb debug doc +gmp java +libedit libressl minimal odbc pcre qt5 readline ssl test uuid X yaml"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-libs/ncurses:=
+ sys-libs/zlib
+ archive? ( app-arch/libarchive )
+ berkdb? ( >=sys-libs/db-4:= )
+ odbc? ( dev-db/unixODBC )
+ pcre? ( dev-libs/libpcre )
+ readline? ( sys-libs/readline:= )
+ libedit? ( dev-libs/libedit )
+ gmp? ( dev-libs/gmp:0 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ java? ( >=virtual/jdk-1.7:= )
+ uuid? ( dev-libs/ossp-uuid )
+ qt5? (
+ dev-qt/qtwidgets:5
+ dev-qt/qtgui:5
+ )
+ X? (
+ virtual/jpeg:0
+ x11-libs/libX11
+ x11-libs/libXft
+ x11-libs/libXinerama
+ x11-libs/libXpm
+ x11-libs/libXt
+ x11-libs/libICE
+ x11-libs/libSM )
+ yaml? ( dev-libs/libyaml )"
+
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )
+ java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/swipl-${PV}"
+BUILD_DIR="${S}/build"
+CMAKE_USE_DIR="${S}"
+
+src_prepare() {
+ if [[ -d "${WORKDIR}"/${PV} ]] ; then
+ eapply "${WORKDIR}"/${PV}
+ fi
+ eapply_user
+
+ sed -i -e "s|\(SWIPL_INSTALL_PREFIX\) lib/.*)|\1 $(get_libdir)/swipl)|" CMakeLists.txt || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing
+ use debug && append-flags -DO_DEBUG
+
+ mycmakeargs=(
+ -DSWIPL_INSTALL_PREFIX=$(get_libdir)/swipl
+ -DUSE_GMP=$(usex gmp)
+ -DINSTALL_DOCUMENTATION=$(use doc && usex archive)
+ -DSWIPL_PACKAGES_BASIC=$(usex !minimal)
+ -DSWIPL_PACKAGES_ARCHIVE=$(usex archive)
+ -DSWIPL_PACKAGES_ODBC=$(usex odbc)
+ -DSWIPL_PACKAGES_BDB=$(usex berkdb)
+ -DSWIPL_PACKAGES_PCRE=$(usex pcre)
+ -DSWIPL_PACKAGES_YAML=$(usex yaml)
+ -DSWIPL_PACKAGES_SSL=$(usex ssl)
+ -DSWIPL_PACKAGES_JAVA=$(usex java)
+ -DSWIPL_PACKAGES_QT=$(usex qt5)
+ -DSWIPL_PACKAGES_X=$(usex X)
+ -DSWIPL_PACKAGES_TERM=$(if use libedit || use readline; then echo yes; else echo no; fi)
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ XDG_CONFIG_DIRS="${HOME}" \
+ XDG_DATA_DIRS="${HOME}" \
+ cmake-utils_src_compile
+}
+
+src_test() {
+ USE_PUBLIC_NETWORK_TESTS=false \
+ USE_ODBC_TESTS=false \
+ cmake-utils_src_test -V
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index a58e2a125da9..93f9617f80bb 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index 4eb06e43c6fa..b3489ffa3549 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -2,6 +2,5 @@ AUX check-0.12.0-fp.patch 1727 BLAKE2B 8643aa3b1ebaece72c9bb6bad52077f554baea2d5
AUX check-0.14-xfail-tests.patch 310 BLAKE2B a4b3e9a58ca841cffffa0754ef429db19cf92ddcac1f214ac13d655af505c6e660aa0ea865c3e7fedf993f6ef77c5504301a4d7ad7017e2aba5f6d3785208f73 SHA512 1be74226886d47acae417e5b871459bd96d768115c97576a142bccb8e50ea1b0ccc69b6068cc44743a8e9bfa3341739402342697cde32686ae6cfb4fd413ee18
AUX check-0.14.0-r2-disable-automagic-dep.patch 769 BLAKE2B 286eeaa0e45e524c400f1967756b2e2912d76826c2fb92d9008afc338f19a4edc55b23e2751ce46f52e2fccc3e091f7143647a42a017c02ee580e138c3a50536 SHA512 4370bb6551c3e2f414b6580f26ed3a7429278139d5835b44c8769f1583363aaf8e25982e6f86bbcf2e7fc06d3c406d9a2af4a47fbb99377c6589f276aa9f29a3
DIST check-0.14.0.tar.gz 303471 BLAKE2B d602bb56d205eccf06e4177e3f6d3f7270c3a0cba0e1d397480f0409a916ec4118c48340ad6f6a8955ea30d9e22252ff8381a687d000c3f8e62828cf656f1245 SHA512 54ad175c00cf0c73b4386cf6b3d6a404a5da4f57897d099e772f148f410108c44767c3266a940113be73a6861b3f3ee1706c558cc71ec51df99687f19f3a3bb4
-EBUILD check-0.14.0-r2.ebuild 1500 BLAKE2B 9719980e95ef562ee6cf5b23f138e7dc97e540eeb7273ee57ee693b2cfa8c816f8f14bfdfc4fe4ddc340c3f9c3ebeb53eb51521376585c6e04dd5d5c9fadae36 SHA512 0e4a30769f47efce5806b414729eed51696677d70fb6d6b22676fbdd56ff63418ae8a6c9d8d0d44574108c942e5038b34e288f0f50f17bf1bbebe39d09a15667
-EBUILD check-0.14.0.ebuild 1554 BLAKE2B 3bbb3e62ce8f784fe940d402af3136ab906006d5880abb03e51a2154d7816be353b7cdde134de5fb04b0f059aebeabcb072d3ebfb0e67a778c0e2c509221e791 SHA512 d53a839fd83aa14817159b917e291d99f1b76127147fcb9249757d8629b4ff698460e455051e86e08a349bc9e318beb651f6090073188f19dcd44be7591002d8
+EBUILD check-0.14.0-r2.ebuild 1498 BLAKE2B f9c8ceaf6000ce5c0878bf85a2a88f3098d40f6c77c7f928f81fd91624bd9293fc447f94498e5e475b3f699d115b80b5705169ab99560b15fa779c924be81a14 SHA512 815f57a1c3474e680dbd55b1d514daea2626fea087aef056b5d0547cce11ba9815f6ff4ef5e36d4e9b1b8264191d3ba30b40d29b882446c09ea6e90c1b91b100
MISC metadata.xml 488 BLAKE2B 27eb0323a4d7cac50b2f4ee935c75e7a35c34066a0dbc5bf21f8b4fb93abe82aa79a5fa1fafed0e623417ceaa553dc8395f201a24c3e0123df3104be44106bb7 SHA512 4b69b4b1ca91bfe4b04d03935d3d6e9b8ca10ecaa538884834f357708db5380a90e9cf1fdcef7996b7c4d8a23c0cb8e1d9eb9d34faa584637804ebc67657be69
diff --git a/dev-libs/check/check-0.14.0-r2.ebuild b/dev-libs/check/check-0.14.0-r2.ebuild
index e104b81ce89c..565a288bac27 100644
--- a/dev-libs/check/check-0.14.0-r2.ebuild
+++ b/dev-libs/check/check-0.14.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1+"
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 ~x86-solaris"
+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 ~x86-solaris"
IUSE="doc subunit test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/check/check-0.14.0.ebuild b/dev-libs/check/check-0.14.0.ebuild
deleted file mode 100644
index 40aa0e80af0f..000000000000
--- a/dev-libs/check/check-0.14.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="A unit test framework for C"
-HOMEPAGE="https://libcheck.github.io/check/"
-SRC_URI="https://github.com/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs subunit test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="subunit? ( dev-python/subunit[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- sys-apps/texinfo"
-BDEPEND="doc? ( app-doc/doxygen )"
-
-PATCHES=(
- "${FILESDIR}"/check-0.12.0-fp.patch
- "${FILESDIR}"/check-0.14-xfail-tests.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- $(use_enable doc build-docs)
- $(use_enable subunit)
- $(use_enable test timeout-tests)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
- default
-}
-
-src_compile() {
- if use doc; then
- cd doc/ || die "Failed to switch directories."
- doxygen "." || die "Failed to run doxygen to generate docs."
- fi
-}
-
-multilib_src_test() {
- # Note: test-phase takes a long time.
- emake -k check
-}
-
-multilib_src_install_all() {
- use doc && local HTML_DOCS=( doc/html/. )
- default
-
- rm -r "${ED}/usr/share/doc/check/" || die "Failed to remove COPYING* files"
- find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index 34840b41baed..8f65473c0aa1 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -5,6 +5,6 @@ AUX newt-0.52.21-python-sitedir.patch 954 BLAKE2B ed2a504cc2e2c06200e209fdf55e9b
DIST newt-0.52.20.tar.gz 181163 BLAKE2B c6def9fae612f8dcffb396ea4013cf3e034da8f346fb7bf71de6fc5a59ee3d9d43bb4ad3bdfab7535d4d2eddeed62f72cea1861ac537f2bd7a62e7f76069c692 SHA512 0c10c373c6a5299a85fc38f32d3590fff3b26c4be40e6c85ed73c20724ef2fb094bf37a8c3b1b80a4bcdfc14fe59254d4419c391245c298a4e16788954b88236
DIST newt-0.52.21.tar.gz 174895 BLAKE2B a0d6a15f87fe04dc535e65fcd28606cd666142d006a53b6ee0c8387a6295215e44f1815ac56ceb56b561ca9b5bc8f3cab2d04b5decd62642f46b744333dc7e34 SHA512 d53d927996d17223e688bf54dccfabb2a3dc02bfe38ffc455964e86feaca3cd9f9ab5b19774433be430fa4d761cd9b6680b558f297acb86f80daeb6942f7d23c
EBUILD newt-0.52.20.ebuild 2010 BLAKE2B 5511040fa591a77591849582adb578a69c38af1b7884cc8741e102ef6e602d5dc8b57c53ebf105593ef04e4773398f817e6e0ccb6a2b46eb230c51d6bb79155d SHA512 9dc54c30ba5c8d920b6c75576282bdd6e454e8db321af39cecd3fe3f11164b865f6a8cd802fa64c931f3f38226f2999c90525eabd5dfdedb0c01bef36b27f688
-EBUILD newt-0.52.21-r1.ebuild 2243 BLAKE2B 029971d40f19499331d8acd76201bdd374dcb256febf3361d25fd5fd7e5e71f4a9567863fe1ec6f0b54ff4e21d1446f0a6d038988f9dce71644f00630d39d9c9 SHA512 1253cce7f50357cd47771b49d07ca507899e43f9f10e1db8a3d9aea932b86927ec945504a3dfe19932c8e6c382fb06835600038d797e12f88d76fe1a0cbd2f79
+EBUILD newt-0.52.21-r1.ebuild 2245 BLAKE2B 9a0d5fb29521c38714710175ad18a4c5de5b1b0a1988d255d809497dfdb272489b876420a1622b45299e8e7c452c5c12cb2b67a40813590ad53a349d6cf9a5db SHA512 e647f52683d7df3ca43e8ba31dd5de4add226f9ada32fc7e257a2bf17c71fb08acd035d97a2ce3d6cf7d530f08e5d1946eb40bcb641f90494c9a2c443ed57aae
EBUILD newt-0.52.21.ebuild 1963 BLAKE2B 6f13f195dbcb4673bab8f816d81eb3c681ae1df05d0e331dcef12999644e8d2edf982c241277c902f2068e7a7cf1e3080da172a5358caa7b5a8924aa8360427d SHA512 cf562a3657a555797e45bba86fa4e49015cb20c096c70dd994396eeafe0e458aa5d76f599a6988d0e744505ba85793318e4af89478a7a774009012848f8a9182
MISC metadata.xml 250 BLAKE2B b9f4109bece0ad2b6afb8c0b16fe12f39bf1851a9b1201e3a26cfd1eb86d9a9999ebbae97a6fdf8bbfc18cb213c9cfd8eba72c3731742429c44659795f33d87a SHA512 4ebf7bc5513be89eaf0f32aa1b41c095085cd95486e7ecc7cdc61e3f3a16119318f821a954cb2ba16e8408f6d00f1bee3923d7b4ae35aab54c0e21c6f33e56cd
diff --git a/dev-libs/newt/newt-0.52.21-r1.ebuild b/dev-libs/newt/newt-0.52.21-r1.ebuild
index a3aadea62ece..0e660b1c0512 100644
--- a/dev-libs/newt/newt-0.52.21-r1.ebuild
+++ b/dev-libs/newt/newt-0.52.21-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
inherit autotools python-r1 toolchain-funcs
diff --git a/dev-libs/tinyxml2/Manifest b/dev-libs/tinyxml2/Manifest
index 1240deb0e081..1d60a248bdd1 100644
--- a/dev-libs/tinyxml2/Manifest
+++ b/dev-libs/tinyxml2/Manifest
@@ -1,3 +1,5 @@
DIST tinyxml2-7.1.0.tar.gz 592717 BLAKE2B 5936356d472b8642bebb9f02579e6beda14446d57749f1e7a869ff941a03a5ad30624c4db4b2eaaaca48d7f339e3100fddfd58f96bbcfc22737a23d9c9198c9a SHA512 09d5f37018f79a593ff35e33d4296c9ec643a22e83c0cee4c37949300f86201eee07e9b7e6ba55044d8abb438d5d21b70d5843a96ae4652389bb164047ec31e1
+DIST tinyxml2-8.0.0.tar.gz 593833 BLAKE2B afc21220e28a1c139b1abd89e67f8e64980d2ba9bc6f60a33d435a4a02cb40ecacc27ac28bd9702ac3a435f66764ebb752b597a1b1e178d0b549e366d5b669dd SHA512 bcbb065c2af34ea681ec556377fd22e720b6f5d4caa73f432b1e34e08603a96f2233763f0ec5ae86b9ee71ddbe3062f58d3794cd3a162ce6903435530de0bba6
EBUILD tinyxml2-7.1.0.ebuild 606 BLAKE2B 7980b36673f2a60aad432f55140272d670894ad51c50256d14559a6f54f6224cd6df4a7bf668c64a2d26fa8a9f141cbd6dee2b4eea81390b694a34fe5163f664 SHA512 8352ffc9ce6d44da1703252801c86b03dfbe93952c601932892d25759bc28f36ce29e24abe2391d8cff778a09cd7690a1774903ec8b72ad9833b71357f460cb8
+EBUILD tinyxml2-8.0.0.ebuild 612 BLAKE2B 5c0539f1e15338342806cde79e5e7e3a94cfd58d47f16c7c2f81ccc6dfe2e49efe64e00157a72b1b533ee0814bf5a3d3cd4677f845a148cc69acb3812fca1158 SHA512 3621df8001f4c76bde1662657b3c0f078a5fbeba02ca5bbedbd7c87e86d044a73b65bc31ff67af12e5657a686725a35f16cb55ed9923b97f9d077637b707c85c
MISC metadata.xml 354 BLAKE2B cb692d32ecdd37f9399e3170e72c3f171f1e69c5e8515f8e8c3fe762baaabc897835c4f0dc6575c1bd51703fbaf8d12ca5f0aae91fac13ecd97589d153364510 SHA512 33c2fcd747ec03012ae0c132005c59ac90b36f7757a96c442c4409b4a2b5b63f5fdd101537b966624b78becf2feedccff27068129926c2e94bec6f32d66ed3b4
diff --git a/dev-libs/tinyxml2/tinyxml2-8.0.0.ebuild b/dev-libs/tinyxml2/tinyxml2-8.0.0.ebuild
new file mode 100644
index 000000000000..7dd8bbfaa182
--- /dev/null
+++ b/dev-libs/tinyxml2/tinyxml2-8.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="A simple, small, efficient, C++ XML parser"
+HOMEPAGE="http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/"
+SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0/8"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+ local mycmakeargs=( -DBUILD_TESTING=$(usex test) )
+ cmake_src_configure
+}
diff --git a/dev-libs/tomsfastmath/Manifest b/dev-libs/tomsfastmath/Manifest
index acf246541518..a8916b38dc15 100644
--- a/dev-libs/tomsfastmath/Manifest
+++ b/dev-libs/tomsfastmath/Manifest
@@ -1,4 +1,4 @@
AUX tomsfastmath-0.13.1-makefile-fix.patch 1703 BLAKE2B 2182f88b8569fac105eb179fdc7c10a7c9b7b17619a725c30d8374a2589f048e0ca0fe71ffb2431e058a264b104bc091deb800215a490399e722055b39adee0e SHA512 f5e5df821ecc7beb8684116294322dae8bf166bfbc7cf3d5262534e036f1d486854e58ad2c2da382b8f08aa6b9db71d91607289587c4247837bdfc3313ad5cff
DIST tfm-0.13.1.tar.xz 322684 BLAKE2B 393c0e0e018b199c9fc975ab3013466399ea337f520f4634649a9e61b2218b9a6b218d11212b535fc8bbd2bf40d8722fc413dc60756f1b8ff7c78da049765083 SHA512 84225fe81bbcd1df7e40ed0b8c8077d60612246a76f3149b672dfd1066eb0179262fa4f5a42ffd2034e60cb74cfd86e0b49139371971ebbb4f41a4ecebca2111
-EBUILD tomsfastmath-0.13.1.ebuild 1594 BLAKE2B a8e01f6fd5b17bb06e0836669d01a3762ddd9256b573c3e83ce71d54cbad08fae7357be11ac8882f971d7c7175e27d65edd189881fefd05917e7389c0da3d96f SHA512 29ee2921329f090bb4b0921e3c8f860bbe85f68b4288e8f0fbcc2c73886d1ce56a9eaf53a0ad9c0cbcbafdf5bccd878c228267f504d7fb6c0984347c0eaf1d7e
+EBUILD tomsfastmath-0.13.1.ebuild 1601 BLAKE2B 79aa135532b1572e92c8e189682d18dec5968c5bad44760e433fe9f392ca62d5b87eb38f82f0098a97229b4024d236075a13dbc12561146d98786cfad12aa841 SHA512 2d63a27aed1a3b7c380257a30810d2f5b1969773d7a7f8675c11120575698b5fa1697e7cf227e853b5a9f6af25394bc77e1c8ae083047bcee6af749b79a7d359
MISC metadata.xml 481 BLAKE2B a61b20b9947cf71dcc385a04643a32c161c3314a65210f3d18d0743611890a066b9f9e7ddebb02c9ba39e6c6e82058dd78c796903357c432813f4e4323c06038 SHA512 1235eb2954bd7b7ea6e0ce326e50003255a49f558c7e2c08f40f2f7db71532643f1abd3ef28aaf3fa0c2f3e32d57ae07af7f9d49338bbe35bf9d690a023c5655
diff --git a/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild b/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild
index 9518b0945ad2..ad32150329de 100644
--- a/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild
+++ b/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild
@@ -17,7 +17,7 @@ LICENSE="Unlicense"
# https://abi-laboratory.pro/index.php?view=timeline&l=tomsfastmath
SLOT="0/1"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
PATCHES=(
"${FILESDIR}/${P}-makefile-fix.patch"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index c556f71c957b..103bdf24118e 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/automat/Manifest b/dev-python/automat/Manifest
index 7bbbeb83e646..a49c2a6a223f 100644
--- a/dev-python/automat/Manifest
+++ b/dev-python/automat/Manifest
@@ -1,4 +1,6 @@
AUX automat-0.8.0-no-setup-py-m2r-import.patch 826 BLAKE2B 835956b8e3ab657d09d683a173c43626f0af59056ccd25e3a7bc9167da4d5d081e095e91e96ee943e7329d28c3a70b9e001e8977d64bb85581ef19f73a9ecf93 SHA512 b89fd865e8b95283efdc96614b1230d3e8e6d70cdb0ba07842cdf07e1a546a5a89b7c88a0cd774ec47148579981d41cd7261cdd7069e2736807b64422b3ca56f
DIST Automat-0.8.0.tar.gz 59687 BLAKE2B 56e4ec76564d321ca9a709c484077a4003eea2842160e226728aaaa4ec6ebc2486482f79cd919bef7bbec8baeee7a34ca2a11d48665bb36c79c5a45a3c97e992 SHA512 2dbd4e784f65b02a8c93fc5f15236df3649d667a9792f6cac929dbac5d971495bdab4825df0fcd6817b9a9f79b7a5d8cfbdf8e4d18605f0761546b31b3091ad7
-EBUILD automat-0.8.0-r1.ebuild 1548 BLAKE2B 635a91ebc4a7effe4287ff1ef6c32a67925a3b97587c4dbe19f89749d278267e695290fa6c9e917586caf72ca6f8d31dbd078aea883870b5540ad247be54117b SHA512 bc621f2ac1dcdefd3f718d9c1811f06742220c77091edf1a49277eda34e65ce956d1d9cd208abff00a205e9c3a9359c79b501b94313cf117699a0effc56a09de
+DIST Automat-20.2.0.tar.gz 61679 BLAKE2B 9dfb93a0bf0a348d8f7de0796b3e5715947eb84cc0aa507a453f438d2027ae877280ed6d7896192cee46f31c7d1c0eb6cb3dee36e1f13a315071513920c5b6d0 SHA512 715cb5dc087288492e6465a29e7d8502a84fadf451bc3d29da86335ea1c20f8efd9549f0c1eaac8800559dd8001dd73736c3bfacdc6321c83a35d2288d69632c
+EBUILD automat-0.8.0-r1.ebuild 1547 BLAKE2B 22be2cedb2f609248eab28f92f5d8e4652833422af207545d11745bf68e91acb3e4e492f12045c5d8042fdd342bd678abcb63b9a5dcaf5f5a069753f2ccbdb1d SHA512 fcdc8a52942ec97c40f3dc7253f292679723f3442a2b0ad2cf815877870478fb6420dfb4f823d9041943706c50fa1b15553f015bd50d4e51333eebb501f97014
+EBUILD automat-20.2.0.ebuild 1565 BLAKE2B 25ca6ecec9f117413ddcf59cd3c3aa051783bf6451bde538b55ed2a932b3ff45f1befc123d6afc9cd867ee5d1d4c9cceb77f31fde0cd42ba55ec10602b4a45fb SHA512 78bda25e1d32b8e9c3d7c104f5691db077159310aa18c1aac951602bfafba50d9e0271742c3093fbcc619d5c06424c0d5896f1531d010f7c69469b588fb73b63
MISC metadata.xml 572 BLAKE2B 26d7ccc6325a7ff3f051d90ffd36a50485575cd78a2bb35e2f471b2ae5c0f2a579269633db2fa98be1682b5a53271acfd97f079d8c040e30188dd07ef886d509 SHA512 6514fa4351ceffc03f98fbafff044548b350b69d78b0926e598e230fbf6ba52e8a2e0346e89b14d8c4fee914d0a846e457bebe62354ea10186dcd24c1daef590
diff --git a/dev-python/automat/automat-0.8.0-r1.ebuild b/dev-python/automat/automat-0.8.0-r1.ebuild
index 27f988b68f47..d31a2e5ccc38 100644
--- a/dev-python/automat/automat-0.8.0-r1.ebuild
+++ b/dev-python/automat/automat-0.8.0-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
diff --git a/dev-python/automat/automat-20.2.0.ebuild b/dev-python/automat/automat-20.2.0.ebuild
new file mode 100644
index 000000000000..d07dff713074
--- /dev/null
+++ b/dev-python/automat/automat-20.2.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_PN="A${PN:1}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Self-service finite-state machines for the programmer on the go"
+HOMEPAGE="https://github.com/glyph/automat https://pypi.org/project/Automat/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+RDEPEND="
+ >=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ ${RDEPEND}
+ dev-python/m2r[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}/automat-0.8.0-no-setup-py-m2r-import.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ if use test ; then
+ # Remove since this is upstream benchmarking tests
+ rm -r benchmark || die "FAILED to remove benchmark tests"
+ fi
+
+ # avoid a setuptools_scm dependency
+ sed -r -i "s:use_scm_version=True:version='${PV}': ;
+ s:[\"']setuptools[_-]scm[\"'](,|)::" setup.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+ if use examples; then
+ docinto examples
+ dodoc docs/examples/*.py
+ fi
+
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ einfo "For additional visualization functionality install these optional dependencies"
+ einfo " >=dev-python/twisted-16.1.1"
+ einfo " media-gfx/graphviz[python]"
+}
diff --git a/dev-python/betamax/Manifest b/dev-python/betamax/Manifest
index 8a6e33dd482e..5217df998dd7 100644
--- a/dev-python/betamax/Manifest
+++ b/dev-python/betamax/Manifest
@@ -1,4 +1,4 @@
AUX betamax-0.8.1-tests.patch 867 BLAKE2B d161db0b79eff7591bf87cf256a50357e1d82f7eeb0fdf39c27be287c97bf6a536a4e62defd173305ba598f388f2b49d22545443c6fcb589f66988930ae29a55 SHA512 001b26d84e4a02b242ee90b36df0a30c9c4890623191655a8eae5a87e106679197fa8090354b52a72ad07da97666190ebb3a7dcb9b4ffba7b9bea9c18bfed115
DIST betamax-0.8.1.tar.gz 77526 BLAKE2B 2ce88326c5ef80082908912c4b14f149793c4457c47446ebcabaaffaa6b0ee64528096acc6bdd868fce0fad3d10ad66697cad5dc422c15b324e1cc9ae20eafa6 SHA512 89bfb56cf4004a70ec8c1f2342cfa0e02f850b8ed80b67f8b2b02c1a2093e8ac1cf1b9980354551e9d3a21fadde0d77d717f1559487024941973cd80bd451734
-EBUILD betamax-0.8.1.ebuild 770 BLAKE2B 9ae44a27384d8b24400c79489d079556f90b4883a04482aa3e6df605e813e947c4c8e50e6241c32dbf6e3b454898576bab5e1cfe6c68fe58d61eb5bfc248664c SHA512 f571e546ae774120c84b618c78031b3f04e731400a2cf6e4f6cdad2c70da31dd1175a7574567b7cb988fdb799dfa7cf33a3167166c9e649bbf409a3dc9579d51
+EBUILD betamax-0.8.1.ebuild 1186 BLAKE2B 6c1a3902a18378aee683814c6d2b874fe2183e4e700c13e6ba69d1971c399da4a5d85fbaa4620513d2b3167146a295e05607d9e00b2a3e7dc107380564a68755 SHA512 3b49fe8ee63ab920887332ef2645df245174d725e2636a0507aafee9ef1586262ad8dc3f467238f0480767e6dc42a5b1ebb2237b173abbf53ab7f1a0bd7dbd26
MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/betamax/betamax-0.8.1.ebuild b/dev-python/betamax/betamax-0.8.1.ebuild
index 4bdaeeb01282..d4fd29f0af6f 100644
--- a/dev-python/betamax/betamax-0.8.1.ebuild
+++ b/dev-python/betamax/betamax-0.8.1.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
inherit distutils-r1
@@ -16,17 +17,28 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc x86"
IUSE="test"
RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
test? (
+ ${RDEPEND}
$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
)"
-# Tests require Internet access
-RESTRICT=test
-
PATCHES=(
"${FILESDIR}/betamax-0.8.1-tests.patch"
)
distutils_enable_tests pytest
+
+src_prepare() {
+ rm tests/integration/test_hooks.py || die
+ rm tests/integration/test_placeholders.py || die
+ sed -e 's:test_records:_&:' \
+ -e 's:test_replaces:_&:' \
+ -e 's:test_replays:_&:' \
+ -e 's:test_creates:_&:' \
+ -i tests/integration/test_record_modes.py || die
+ rm tests/integration/test_unicode.py || die
+ rm tests/regression/test_gzip_compression.py || die
+ rm tests/regression/test_requests_2_11_body_matcher.py || die
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index 45ce93e68dad..cc25bf4fa8e6 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -1,3 +1,6 @@
+AUX bleach-3.1.5-py39.patch 1043 BLAKE2B 9af8ba9c8e05eecc96ba6e85424e748cbc8c36ff251144fc32b78987f3c1b902fa725c05aa0d750184cd4ca98ee0a3f577020d7351cb0869949cbe038f819444 SHA512 c1b9b81b3a2c79a468aed858d75be143d441a10ceea5ea95f131e9e84502633a7c35dfead709fffce1c137093200123bbdcaec4d71180f747d839cb945e98afa
DIST bleach-3.1.4.tar.gz 177813 BLAKE2B 446740fcb7f2aa137d7353b0fbbebd57db9d571248b67f4d0a6a47baf3581aa3793431f68cf340bc8a0478d21e84aafca17538d069d74657285fdc4a06869586 SHA512 da233794954aad4e63e334d3c3bab9089e7767e0d784b8c51d12d2862ac6ed73ad5122b4d9cfd291ba7d9fc86a4a3b515429d7e383f241a46e3290acefa2ffc6
+DIST bleach-3.1.5.tar.gz 177972 BLAKE2B 6033871f757247f05ee67f66b3596c7a76a9bc5105113206bc8749f9ed103fb6a7c91630540f5f17ddc17e261b24043cc2edcc2562ea7f4cf54774080854de32 SHA512 20db9ab6924a1e884107f30e1059f774b45fd169d3965a61a4ff028e3de17e30be81474d7da89d9275b2173a005c5504a9d11f0e0ca528bf36a9bf08aeed0607
EBUILD bleach-3.1.4-r1.ebuild 867 BLAKE2B 4ee516e3b87a244dd4e065ab8ebc75e17ce257ec5d32826add063b5f71ac53409a63c3d2be2a1b4459087250dcd9be96768fc1254a1735f7ddca0619f411347d SHA512 be209bccb8f10374c9090042f030177176684e9cde540a18c30976405ebbb59a7a4e5fff7a2dfc45c6fa02c559ce8a3b5626a7f9e95b04892e8c22a07d873d0f
+EBUILD bleach-3.1.5.ebuild 959 BLAKE2B 8368842a064f8f783ae464dcfa75ea555e799c0c7cc54dd2e341d4304327c389dcf684334bb3bc06efcd6edda44969adcdc3111b76e9a476ad417020e0bd6986 SHA512 804bcad8b8f390120a7db8f40fe269a842fc68ac7242eb6f298256689cd2aae67d635d2a93606490d14db847fa87efa973256734db90f1c25221ac0ddeb917e5
MISC metadata.xml 375 BLAKE2B eb46fe64fd2800b8222ce88a2ef34be12f68a5a014417ebbfcf3466beda9c64f6a6d1ef4431d83b4948c1513de81840d1f5c65961d851213f928fcc6a66045e5 SHA512 9f8329e1fe0a9a7a6268dee15c098bdd7893da00a3c4f4dcab207586dccc5f6b471754be0eacb21fbd7fcce5e3130a631fbf1fe60a27ea525552d7ef2d9c173a
diff --git a/dev-python/bleach/bleach-3.1.5.ebuild b/dev-python/bleach/bleach-3.1.5.ebuild
new file mode 100644
index 000000000000..db2a844f98ff
--- /dev/null
+++ b/dev-python/bleach/bleach-3.1.5.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=( python2_7 python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="an easy whitelist-based HTML-sanitizing tool"
+HOMEPAGE="https://github.com/mozilla/bleach https://pypi.org/project/bleach/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+ dev-python/packaging[${PYTHON_USEDEP}]
+ >=dev-python/html5lib-1.0.1-r1[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/webencodings[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+ "${FILESDIR}"/${P}-py39.patch
+)
+
+src_prepare() {
+ # unbundle unpatched broken html5lib
+ rm -r bleach/_vendor || die
+ sed -i -e 's:bleach\._vendor\.::' \
+ bleach/html5lib_shim.py tests/test_clean.py || die
+
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/bleach/files/bleach-3.1.5-py39.patch b/dev-python/bleach/files/bleach-3.1.5-py39.patch
new file mode 100644
index 000000000000..ce1296236b6d
--- /dev/null
+++ b/dev-python/bleach/files/bleach-3.1.5-py39.patch
@@ -0,0 +1,36 @@
+diff --git a/tests/test_clean.py b/tests/test_clean.py
+index 133cd82..4dcb9f4 100644
+--- a/tests/test_clean.py
++++ b/tests/test_clean.py
+@@ -597,31 +597,16 @@ def test_attributes_list():
+ {'protocols': ['http']},
+ 'valid'
+ ),
+- (
+- 'valid',
+- {'protocols': ['http']},
+- 'valid'
+- ),
+ (
+ 'valid',
+ {'protocols': ['http']},
+ 'valid'
+ ),
+- (
+- 'valid',
+- {'protocols': ['http']},
+- 'valid'
+- ),
+ (
+ 'valid',
+ {'protocols': ['http']},
+ 'valid'
+ ),
+- (
+- 'valid',
+- {'protocols': ['http']},
+- 'valid'
+- ),
+
+ # Disallow implicit http if disallowed
+ (
diff --git a/dev-python/cli_helpers/Manifest b/dev-python/cli_helpers/Manifest
index 996026c303b7..db1877844fd5 100644
--- a/dev-python/cli_helpers/Manifest
+++ b/dev-python/cli_helpers/Manifest
@@ -1,4 +1,6 @@
DIST cli_helpers-1.2.1.tar.gz 31104 BLAKE2B ded2b9b7825ddaeb33acf64b65362251f773a4a0a74aec1c79bdd8ef77f8f6953dd8761fd926f7a2b210c69534bee220f88e816dd63277b27db15b400510c9f3 SHA512 299fa4984b7c76e6be0527f040582242a746938f8725b6193895f9bbb835c82078658bbb8d1ea0000c26f3c8d2dad93139fd600e7c8d7c2d89777de27a5b26cf
+DIST cli_helpers-2.0.0.tar.gz 31320 BLAKE2B dbda2c7128ac7a5f21ce9f12f866cffde1be9a4bb422c1233b32d9f346c54a73df5e5ea7734cb64ca13f3aeec7c11678c8090499cb5aa4b6d385c4fbc394f8e9 SHA512 fadee3d356d5a687d2f618801f31d0cd4b6c9a4ea1fad4d5fed087a95c3343ab90622e6c246d9a3bd878bc8324d3e9b3626ed3f1436c5d68698562ff6abec3a5
EBUILD cli_helpers-1.2.1.ebuild 886 BLAKE2B 0cb3c52b0b5003ada7377bbcc43e7ab53c8c4f3adb03e2947b2c2f62d3ee6831caddbc44aea0ea183c5ff2a2ddfd4e1b37de926bce79fd39f855e6d14ed6876f SHA512 7e22d252333934ccc6c3147b47ca3f1edec559151cb12b523376175b6a46099244959c54ec446bf7c5c30ff0852f0343895cd298a54305288bcda483b4944892
+EBUILD cli_helpers-2.0.0.ebuild 886 BLAKE2B 0cb3c52b0b5003ada7377bbcc43e7ab53c8c4f3adb03e2947b2c2f62d3ee6831caddbc44aea0ea183c5ff2a2ddfd4e1b37de926bce79fd39f855e6d14ed6876f SHA512 7e22d252333934ccc6c3147b47ca3f1edec559151cb12b523376175b6a46099244959c54ec446bf7c5c30ff0852f0343895cd298a54305288bcda483b4944892
EBUILD cli_helpers-9999.ebuild 874 BLAKE2B 264e01caabf592d971c871cbbf2b93088bd4ad42b294f14593c6c5ce5e66858687d1c95c0614d8f25665e408cbd9ed2864ccdffdf995e5ee86495e75ad4bafb1 SHA512 96ceb09ac285d034eb14ca543f545de513b44b42983401b111ec48737879068695fe361b25bcf663850fc389c38b8b9f7af7ace5389665db273b39a4f292165d
MISC metadata.xml 407 BLAKE2B a1128f59da6b44295f47017d6c08b582d58b51b551e4ec866ca0b40778c4353f9c633fbbd3423df0d89b7c85f81caece2fa3a9ce40be2fbf4231961dde1aaf92 SHA512 19d20ea5cc6006d8b35576e7d68167b797eb677cbd62a150f82ac6738ae43d658d9461ae3ed0499b259812ab7b1e4aeb30348436c25fd96e95cc75667fad803c
diff --git a/dev-python/cli_helpers/cli_helpers-2.0.0.ebuild b/dev-python/cli_helpers/cli_helpers-2.0.0.ebuild
new file mode 100644
index 000000000000..0de3c188e8b8
--- /dev/null
+++ b/dev-python/cli_helpers/cli_helpers-2.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit distutils-r1
+
+DESCRIPTION="Python helpers for common CLI tasks"
+HOMEPAGE="https://cli-helpers.rtfd.io/"
+SRC_URI="https://github.com/dbcli/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-python/configobj-5.0.5[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
+ >=dev-python/tabulate-0.8.0[${PYTHON_USEDEP}]
+ >=dev-python/terminaltables-3.0.0[${PYTHON_USEDEP}]
+ dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ >=dev-python/mock-2[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )"
+
+python_test() {
+ pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/constantly/Manifest b/dev-python/constantly/Manifest
index a5f41c3fff4a..e2e7008dcba4 100644
--- a/dev-python/constantly/Manifest
+++ b/dev-python/constantly/Manifest
@@ -1,3 +1,3 @@
DIST constantly-15.1.0.gh.tar.gz 40635 BLAKE2B d400336901f7df7b1535a0e46fe092a2542546964ea144014210e8be3807aabfe8e8370e94f426061a0c3a6257ee66a6ceb963b159717def7e047405368d910e SHA512 eeaa74552fe8e01c40566ac3c8b3d41085f800863ac516e30fe1242f40d3401e4e872279149776f29d3ba78a7a16337a794ad26230efab4dd1847d42bffa81ce
-EBUILD constantly-15.1.0-r1.ebuild 707 BLAKE2B 4e89e81e1b537c721128d1b49fb6da5c861f5e3418c67213f88faa7e09a649e40f65316a4d377a9a3ee37155e3edec2f70fb353ef0db622abd91701fc668e769 SHA512 7b1d0cff341730d89e84e51ecb80514d352ea97c16e367c3bfddef6a131ec4028081f7bb5ac9c5fd9799a57790cd2d77a968851316947aab4cb525d79e1e301e
+EBUILD constantly-15.1.0-r1.ebuild 706 BLAKE2B 89ec5c18cd709ff564ac90f3f019ebfe45d2f33fc4e89c4e94b5c769ea6bbb9371554aa2ec4bb09cfa78b5ca7f1bb510c59454d4073000effefc6a0a3f347282 SHA512 dd002208873a9fb4674611a709ace9a79dbe521e4581c5d51ae9c98141a54c7c0c59608fb80f1dc64e0376086e63c039c7e5b9f40f7814b7a86f22af6ced3dfc
MISC metadata.xml 664 BLAKE2B c08531b4ad0b05cd57b529174a364c5761e99f333515728204112e81552e40e4bd016e80e7e848a532203314b1a2ff525a0f984e7bc0c2147d4e6eb7446d98ab SHA512 5570cfa8d4c71931cc24c1dc8dfdd3610447cee11097f92c7794a3850a946755991a3f3ad043e3d6a4b05f87bb85d4a819799623fad6e1b10021fb37afcf3c22
diff --git a/dev-python/constantly/constantly-15.1.0-r1.ebuild b/dev-python/constantly/constantly-15.1.0-r1.ebuild
index 9815b0863868..b0d5fedc7464 100644
--- a/dev-python/constantly/constantly-15.1.0-r1.ebuild
+++ b/dev-python/constantly/constantly-15.1.0-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
DISTUTILS_USE_SETUPTOOLS=bdepend
inherit distutils-r1
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 9c03acf83d76..3f7d68c2e17c 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -2,7 +2,9 @@ AUX coverage-4.5.4-tests.patch 5117 BLAKE2B 2a0642f71b8504d542e97fdd3258670c0c50
DIST coverage-4.5.2.tar.gz 384845 BLAKE2B a7b4f249a68e025449d26ef8ee2194b9ce355c979d1f5192a7863a0ab0089f9deb3a8e63a39bef528ed7c58fbcc7cd4bc193fea3a135f5996a6655268a6b7a93 SHA512 0d98c8118648a319ac6f3b4c4c6f1ff8a92085bbe8276dd5504c8df4638933f920d7382d8e6de8e16bff43b62091310e0eab7b7722c6d28c976baedbfae3d03e
DIST coverage-4.5.4.tar.gz 385185 BLAKE2B 9d040bff13cebd1cb7147f15c3ec03bb08648cf801b5b2bb046a6b5bcadb3d3886be8bf0a624d225f25d10a5ca82fe5fb88f55e44e92a0a3285836b837972970 SHA512 ba534e04fe35cbadc4b16735f25c08f579a49a6677ec106680f222f2dfb3d0f1e011d0962f1c2108c375173ac4588bea1619ecda05ff9ba6fd888daddfd27b0e
DIST coverage-5.0.3.tar.gz 679171 BLAKE2B b87b256ecdae0b63ae08ed1aea9ff1f4177ec5da63c18615d66f207c3b7c71da4730432bfbdb66a8b55fa2056016226b09befdfc5d0fae57ccc56f08b2690b38 SHA512 51c648b4529cc84534865ee804bcd3dd35a6dcb23f20feb3c4702025b924de3a010fd8d08238eea926ae1874c5510ff006bc120e10d01db795ea0af6fb82834c
+DIST coverage-5.1.tar.gz 687427 BLAKE2B f4eee548cd6fb58c4a527b9e0ac5ee4133c984358f42ca0c87301f95eb60253a2748ccf9d4e88358941d7897998e68e3c5e70e6dc7387bf5e60eda950f4a679c SHA512 7bd3ca158fe2eab1946c52161fb877623d4ed0382de193aa6eb267443fdda86089ec7aaae518115d6a3b5487fd1400320eb503b9afe83182fb3c3621ccbfb6d7
EBUILD coverage-4.5.2.ebuild 1237 BLAKE2B e34bf2b12ce2f78f0882e690ed2d8fb9dccc805a3ba05ffbb25e5a69e9590fbf5706800b0b5fdcb055e0044afa92feb6b7903b23f85343d8b5d56ad724a4145a SHA512 24f1e3624cbf90d7debff9fe521cda8c4ee9cc368377cfa7d1143768ea7f674f534a3c94201e5f3154b0fc5499e953b53b79958bd5aa0e40d0e424ce6f28f02c
-EBUILD coverage-4.5.4.ebuild 1744 BLAKE2B 0f54105c2729c476df45f27c24f76a46bd8d09cb9db844911ddf82597a82bfcbf5047ab1c5256afebc7492402a6b261e4512b0e1a66b1588c266857bb1256e0c SHA512 2f1083fcf55fadb08fe5ac1ae960c41ff285d05d8887187d78542d7768f9cf1e48838684faf2120774e14f5bc6ff62d0a671c8d601217b9c02e04435b2b925c7
+EBUILD coverage-4.5.4.ebuild 1746 BLAKE2B 278721be0a4cd86f48b60fee68a560d2b21763b2ce212c769d03c3d64471b87700059e77e091ec344b89c318ca436c345028b46d4a99dc1f70a34ccbb5d90ba8 SHA512 b01baa28ba081dbb09eed68f103bc8973a9230afbe6a6ca92d24351539139a77249f4ed6e4e23217410de1c668332cf3172d24264789e736236f144100d80f7d
EBUILD coverage-5.0.3.ebuild 1646 BLAKE2B ecd044c83b02a4ee483312266265e63c821a861684bd520d4a9cbf9d9d1d92b8e81f91221b0f11c91e9c7a0c5c952973793c6b9a929443af4007271c96ef0ebf SHA512 d674c6104d6747409a33612f90b93960fc13fd7316cf14e76a75c948812977f428496e467d22280a9f79445649670ddb996475f1739ad1a89fd7cb07cddff354
+EBUILD coverage-5.1.ebuild 1786 BLAKE2B 355fc9daa2cca386ea8d8a7396306e46accec016ac9da57825d7896c838ce7d9c764dd73cab7348be9e30068647ad3a007ca44656c9e63aa81731573ccaab1af SHA512 94f92528522b1f584922446155dd44c6436f6ad20462d3f8a1f13e88952da09c65a30a3df02dc6b93d42013de24e582bd794ddd58ad13b9b98d54d2e6da3a19a
MISC metadata.xml 713 BLAKE2B af0e3d7e3b503581edb2552d0eaddcc9cf3ea5cb92db247cbae4dc66edfb1da6608f472cd2e76e1c17537b6907b991fbf2b4c250792ba6654fd0d4924da599db SHA512 d836604218fc48fd477b27744c6f97a40c3102b859b25e327cd0775ecc54390db62c9f4096c8c54af26557c38dd48ae138a8bed742aaa759572189974522ede5
diff --git a/dev-python/coverage/coverage-4.5.4.ebuild b/dev-python/coverage/coverage-4.5.4.ebuild
index 63581cb813ec..da84a5f4f6fe 100644
--- a/dev-python/coverage/coverage-4.5.4.ebuild
+++ b/dev-python/coverage/coverage-4.5.4.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
PYTHON_REQ_USE="threads(+)"
inherit distutils-r1
diff --git a/dev-python/coverage/coverage-5.1.ebuild b/dev-python/coverage/coverage-5.1.ebuild
new file mode 100644
index 000000000000..b0e701db5f01
--- /dev/null
+++ b/dev-python/coverage/coverage-5.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc"
+#IUSE="test"
+# The tests are impossible to appease. Please run them externally
+# via tox. Or fix the ebuild if you have hours of time to spend
+# on something utterly useless.
+RESTRICT="test"
+
+#BDEPEND="
+# test? (
+# dev-python/PyContracts[${PYTHON_USEDEP}]
+# dev-python/flaky[${PYTHON_USEDEP}]
+# dev-python/mock[${PYTHON_USEDEP}]
+# >=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+# )
+#"
+
+src_prepare() {
+ # avoid the dep on xdist, run tests verbosely
+ sed -i -e '/^addopts/s:-n3:-v:' setup.cfg || die
+ distutils-r1_src_prepare
+}
+
+python_compile() {
+ if [[ ${EPYTHON} == python2.7 ]]; then
+ local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+ export CFLAGS
+ fi
+
+ distutils-r1_python_compile
+}
+
+python_test() {
+ distutils_install_for_testing
+ local bindir=${TEST_DIR}/scripts
+
+ pushd tests/eggsrc >/dev/null || die
+ distutils_install_for_testing
+ popd >/dev/null || die
+
+ "${EPYTHON}" igor.py zip_mods || die
+ PATH="${bindir}:${PATH}" "${EPYTHON}" igor.py test_with_tracer py || die
+
+ # No C extensions under pypy
+ if [[ ${EPYTHON} != pypy* ]]; then
+ cp -l -- "${TEST_DIR}"/lib/*/coverage/*.so coverage/ || die
+ PATH="${bindir}:${PATH}" "${EPYTHON}" igor.py test_with_tracer c || die
+ fi
+
+ # clean up leftover "egg1" directory
+ rm -rf build/lib/egg1 || die
+}
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index a6fe3d81286f..9a78860cbbd1 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,5 +1,5 @@
AUX docutils-0.15.2-tests.patch 1547 BLAKE2B 361285ad1ffd4d32a7e04b5e9e56a9dd91c69475a5c7b9fffd64b6735d789b4793ec35d0fa733d016ffd4eb5c97a8a8baba64bbb79b8f5cece71e9f4d3d947bc SHA512 83856452008c041295659c95e45d477672a1faedfae642d3980c3ac416864a77f21bdaebc88b67f43f7da87a92b3bd6baf04e37f44c66a46e2bbc941c0d75131
AUX docutils-0.16-tests.patch 2986 BLAKE2B 70c80ad50998dafe3d26ddd0afd1d8d176949ed875ddfc4ec79687f81d6ebacbd5f06355c77ee457450515e4902f56746fe72c4773cd51cba37c9109d898185e SHA512 ea0c01a37494c5e13996c2652c99cf341cfe064365ca17dbe76a0b4b21b914a59c4ca83ab8e261f80878c22f971234478951f360df5f0fa2321d8f9bc974d28d
DIST docutils-0.16.tar.gz 1962041 BLAKE2B 64d045d43433e944686b5d9077de0b544d49d041adf398f9b66612db432860853df4a84f4c4b44461789b3039f83e3847547062b2f5bc5d2bde3a0f1ffc9ffba SHA512 4e0c6662924cac6b8f28bb77a4f50eafd637c1083990a23dbd905d8a05362a18dae96e63408ed43b595b693ca755c7961d1282129d3215ed3774af0dddcc0466
-EBUILD docutils-0.16.ebuild 1869 BLAKE2B 97858dfc461eb3671d84ebb9de53265f893861723bc110ee5ea81507731ed7cb952bbad847fd0ec28dbec15851bcf4df9cdfee7b5f8210d9bf903cc2cc795ee7 SHA512 bdbcc1869e20abdff5a7a5112bb617d0bc9a0f05334257c12a6f85c621c31dfc8e1cd124e60182d96a4fac301efdf406a60dab6d65ca8bef335867f875714366
+EBUILD docutils-0.16.ebuild 1871 BLAKE2B bd400bcb45b3c0c403c36af98b18a5b9e2ca199b7753f00419c286399e7f641375aa86873aa92b36fe2d72f93c6a54fe2aa3c222f12fa443f21dd862549eec8c SHA512 56b6647e9c484334a1bca6b41ea80f13d31a37295e7cf24b3b9389e2df198651b39f1fa2655f0f84ef0bf9b1c96bca4b960af2e6cded0bc469c05187ad505ae8
MISC metadata.xml 342 BLAKE2B 18746f74840cdf8a245c4ac3233e4ffefdc8fd4768b5b995f4c9232c6ce4c47b6cb965c8077ca8d73fa6af5c4a9216e8661d2c8afe6d9f1c3153b04495549ab1 SHA512 df1b48b67e1588314ce5109bfffe84c23f5ea8036e7726b9c120f4fda220795015a02ef7ba6b4cc7da9aef579eea8f17a96aa1afa089fb01967be9ec4ef6be63
diff --git a/dev-python/docutils/docutils-0.16.ebuild b/dev-python/docutils/docutils-0.16.ebuild
index 462d023f8a46..2e88fd1d63a1 100644
--- a/dev-python/docutils/docutils-0.16.ebuild
+++ b/dev-python/docutils/docutils-0.16.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
inherit distutils-r1
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index d32dfd75bfaf..42bf6be9c166 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,5 +1,5 @@
DIST elementpath-1.4.4.tar.gz 119577 BLAKE2B 65724afc715dcdb4903779933559e85c833cc262cecf2f53a86fd58e542717dc26137270bde13b5bdfcd81bb768a2dd74d7ed7213ad4292c0a1a2a4771855370 SHA512 39ce9f8e8f0a75690d5ccf5faa7e28113f971015c2baeec8b8f443b568c71154589d36dc2c5a3965eeb1d3d4257f65090cf44078747c7711bc7fc8c9ad051d43
DIST elementpath-1.4.5.tar.gz 120091 BLAKE2B c9ac74c4b76b3a3204364532831563c5600bdc159cfe5e853852c08de0c7abbaec952304120da4f13b14d2239880c9c1612ae8db3535cf4ad1d8ea8498cc3f1a SHA512 be3908056af67f892696edd31d1c836bbd7083a96eca1217d2dc972c5fc3bc583d89b825bed3fedeebd775d5fca53dd9b9a918ff9a3238bba54efe8ac0a51e21
EBUILD elementpath-1.4.4.ebuild 693 BLAKE2B a5c69a7d2c34beef1c29d2d5394c5db94ec27ff6d44712813ad0cbf363ff4eb1da1e2665842d6fc829704adadc64071447b8942e29aaa524f64d9f8faf979c24 SHA512 b55d339102ba114133a7f0157037391e50f3dc3efa50563d064b95b0fbd82f347baa0cd5c064f61d96b3bb18321932084f2fb6c45d6bf7b18fd41ccda043d04c
-EBUILD elementpath-1.4.5.ebuild 654 BLAKE2B 7b47d47872ad342db1139b09217cde8cc545600b35317740f293ef2e93810ccb03c1b0713fdb7bc321d1b444745eb73deb002d554bebc326bc2c58d9551a46d5 SHA512 e36a5c635d48aca07b7a9b7d8f89f2682fc7d41ce87da916b5e607878545dda825d45a8c87ac24f16878f9556769185540905a35fcecc9eae9f741f18a8922b2
+EBUILD elementpath-1.4.5.ebuild 653 BLAKE2B d3919813eddf35164fc364320ee3e8f0015ce6f56419c7622ff461b20f5f9a95c6f34b41a87c8e232714c9baa932abd4e8162c7d50bcc3ed3d5ab8f5eecaa87f SHA512 009713cd0edde992c2e1a1d41919b9f8b0873b9b9496fe414ba061b58c589a7561795f7d2460e771ba23808407a032c3b5fc933214af2dc412679ffff3820fd0
MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/elementpath/elementpath-1.4.5.ebuild b/dev-python/elementpath/elementpath-1.4.5.ebuild
index dd056a9406a4..514f9ea85824 100644
--- a/dev-python/elementpath/elementpath-1.4.5.ebuild
+++ b/dev-python/elementpath/elementpath-1.4.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/entrypoints/Manifest b/dev-python/entrypoints/Manifest
index 06d765d8aa07..423730781863 100644
--- a/dev-python/entrypoints/Manifest
+++ b/dev-python/entrypoints/Manifest
@@ -1,4 +1,4 @@
AUX entrypoints-0.2.1-init.py.patch 243 BLAKE2B 79706eacd51f9eb2b9bb319befc01c44894e2fa0c394585d2ad578b07e64fa4a6fce5e7c8f1c50752b1fa63e05776186759bc1ce426559405fd0a0e6c8b14aa3 SHA512 f25cb047aa8743dd9145c8e5913c53b5faa6a2b0ed3a50a957d69739bef43b3a6612ec38754bb088c2f9a8e116df61e00962fd1a78c45e5c107cbdd40a9569d0
DIST entrypoints-0.3.tar.gz 12315 BLAKE2B f548d98eeb9dcf5760b26f66e5dec0849c9a9027cd68447c07a585e7b80f79a7c66712d0dd270b6960db167d26f9cf0c9c221edd21f2692c2221d36e952ede65 SHA512 aa1274362d3a4b00266103319ca51aa266605b4999c89a9d0673eb61bfae9e646cb0ec6b86c95544493f6fe048385a2c7641d64adca8f45815546fb1e663c858
-EBUILD entrypoints-0.3-r1.ebuild 979 BLAKE2B 647309b215807343f41998921cc068048bd69273aa72d26c799e8fce9907d61bc889a975fe525a363a0c1d84019650601310e67791526e8dbcb8acf8283f9335 SHA512 009946d521588c132be71fdadce89f278895b8dac1af8b52b70cabc58bbc8d551685638237e9c94da5266940f7ceadbb423364949284705b995575afaac487a2
+EBUILD entrypoints-0.3-r1.ebuild 981 BLAKE2B c17ddd8fe5238dd3998375164a4e3df4f8eff3e6ed2b187432d29cd0c4ee605a2dbbfdb5200ea4dd5d34d918146dbd91f5a5ff5190041f0e55aeab35a5e56929 SHA512 81b7e534b212e4c90de6c7b8ca543346d35ad6972405e4c3eeec34c20dae16f8b6f65ba7ef9d23700c2f655f3b21666bc9b1ef7f044cd06d6c0af883fda1c4ad
MISC metadata.xml 623 BLAKE2B 997ce85b64d32c5c365c929f73349582978e299e71b2e304c54e37b0886b19d468270a63d2d766ed7ee52de4a9fc45eb02d11e3289154b03769dab99306d0940 SHA512 0cba95670dc165b6d6d173947a0a6bd567db198cdc6f10617ed68eeb55f3ee4392e5f95fdd136a6a1886a2f9b1e33b0ba8e098ff8c07f7e11b2374ae544ad506
diff --git a/dev-python/entrypoints/entrypoints-0.3-r1.ebuild b/dev-python/entrypoints/entrypoints-0.3-r1.ebuild
index b99df4226a9d..b2cf6654d153 100644
--- a/dev-python/entrypoints/entrypoints-0.3-r1.ebuild
+++ b/dev-python/entrypoints/entrypoints-0.3-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8,9}} )
inherit distutils-r1
diff --git a/dev-python/hpack/Manifest b/dev-python/hpack/Manifest
index 0bdb5726be02..3a1aed101169 100644
--- a/dev-python/hpack/Manifest
+++ b/dev-python/hpack/Manifest
@@ -2,5 +2,5 @@ AUX hpack-3.0.0-hypothesis-healthcheck.patch 549 BLAKE2B 6177deb0b6a4de5fe5f2c65
DIST hpack-2.3.0.tar.gz 41610 BLAKE2B 65fe4f07f64dddff5b24b3a84f7e49de32e358fa59bb1b21e619135ef33d282d4cd24283e93c71bb71c89d7b5b2a3f8ed36f6d406751c54247472a75192bf50b SHA512 a3d13da105482bb258ee3a2314b2629215028777f84127f71359f08819c96af088a3952bb0a74435472035d10ee6e3943cdad689a28f04cbc12cddcc4af9a8a7
DIST hpack-3.0.0.tar.gz 5305971 BLAKE2B d1df8a1b2a1ce8b91e63cab475d3957f937fb74c0bec343d342971be1bb7cfbc929c53cf041845df2965cef0cfb098345bf0612acabc7ef3e5e23f6f0aa44f2f SHA512 7b9cf5e643dff2a6454bfe419b797c8ed1a0fe6ec3b725d2696da5a820ab96fe87a64e600b1831c7024bd82616b155a0aa058301acb32172155b6538ba0a73c6
EBUILD hpack-2.3.0-r1.ebuild 1057 BLAKE2B 63ea72588bf2808508439d03d8796b3156de41d5716297c00573e765849111f264ab91833f6881973558b124cac3cba3c935f9c65ee8e9bd92af5868bb6b6d2d SHA512 dae03fc39bb37a279f33f1dcad2b05ab59dca8726e1b1c7fad67f8a94a2a27cc75967143f704ad6a800726640d930d6a5ecc6f4cab5a905cb0e8bf7af81571f2
-EBUILD hpack-3.0.0.ebuild 1142 BLAKE2B 5eacbd46bc2497fb33b1e5b28efb84423eeeda4b09859a230a3e51f26961ded2144aa6eaaedb66f06cd864082d93f12efdfb6f5bdd9edfa750ef468a3764e2ab SHA512 7a5b1423de3b6b666d6de0b80e766ee89cbfecadd1c67e22aef169edb0d535b12a7197c7b8079f9de2f4493c651726832dc6021e68d219011b1ba58080df14c3
+EBUILD hpack-3.0.0.ebuild 1144 BLAKE2B c65cb0666b676355623d19c4985d9f8dd9c20f1712a493b9b8cd1a0668ebba480161c10c03521f564ba13128b5376168b5f0e892a2475e72ec25811a5b55bf8b SHA512 c1f59638cc93565b3f42be3f6576609583dd66bb79e544e29bb1620091ae4019e2902cc119bbf5ae2351dc71a09f12f5869d4ce96aa86731e6d2364fa9d498e1
MISC metadata.xml 677 BLAKE2B 1440fcf100740188ffc8ae85da9bc014004feb2aa04d5f5db73546e62a01ffbe0975b9b588e6d579c45a2b1c803958999dbdd1cad8c1cbee597a3202556b7d4b SHA512 b7d64d3fa13e9e2f7a794aab733b511ec37809294b0c353d9cff55950dca47e57da8b5b5b80ffb0763f509a498816f94586c11dfdb569ecc6fa604f75c7a6132
diff --git a/dev-python/hpack/hpack-3.0.0.ebuild b/dev-python/hpack/hpack-3.0.0.ebuild
index de96e1d0134f..3a62a22097ce 100644
--- a/dev-python/hpack/hpack-3.0.0.ebuild
+++ b/dev-python/hpack/hpack-3.0.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7,8})
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9})
inherit distutils-r1
diff --git a/dev-python/httplib2/Manifest b/dev-python/httplib2/Manifest
index 0f01e2a4ce8c..8350df2c1ba7 100644
--- a/dev-python/httplib2/Manifest
+++ b/dev-python/httplib2/Manifest
@@ -1,6 +1,8 @@
AUX httplib2-0.12.1-use-system-cacerts.patch 582 BLAKE2B ee2a407452ab557eec0934a175958ac7f1d1af3ad588b7f288b9e9f0a3d2b08146fdee05943e2681a1462986098256fa818d9561a4541ba0ed3b95984172271f SHA512 ff1b982e9f95f6efa53064b2a8d2748bf5a91a26fdaeb584f044d8e036b91034dbcf4719cb08855de412d6abcc33fe82e18fbd250c14d0ae2fea47b412fcafc3
DIST httplib2-0.13.0.tar.gz 219494 BLAKE2B 5bb46582b9962266c9b431be7d323720f780075d6c60527e29c45415a001fc671b4bac95912f023e198250013a3b5a2442c02fa3284abba19bb3828bbc96ddb6 SHA512 b447531f18eb7d288cce9b1ab4b59c4302bd8db8eb095a102f9d730cb49644a1dc531ca007bb9c9a7321c9876ec0ce953317561fc94a51b02bcb749d2de1fa83
DIST httplib2-0.17.0.tar.gz 220694 BLAKE2B 9e9a3c0e3fa13dfc2b58331ba1b52f77ebb8642126994125595c344e19c2e0a430ca556a213938f5f9da1aea69f1cc30e1c89ccf2c64c2389641973f89aa8f4e SHA512 8724e5784990e7315762e5f8333197d6f6820aa6cc66aebbeb981ccedb57e35fa998e623d7e0cd8fcb18178895bc73b16bdf015c90d2adf208d6d5320f3551bb
+DIST httplib2-0.18.1.tar.gz 262930 BLAKE2B d8130dfbbee71dae1319a8a65fb2ae96d667bba08cfc586c0a9239d6bf6cb475fbd4548d6b5276b8001a02417eebff4a7565024d43c630b8ed51e467cdd3de71 SHA512 a1bb527279bdc92fb75bffebc317ff549bb6efb678580cbe40d187921b7ace66b1a5bc1d98bdf065ec5667fe69632da086b0eb201ff911497324fd817bfe1b7a
EBUILD httplib2-0.13.0.ebuild 950 BLAKE2B 405c5eb3ccd397910dbc997d7ae3652a238465ef9d54dc2b99b762981e4a61aa878c2f89dcf8d8ac99650f51dc59be64d27ac283a1936d53b95353124b7181f1 SHA512 cc67cc96ab139db8fd445edb429c47a8b891c1fbd2558b6718387181752ce27617f3f18cc661d20bd80aaf376e9c95062552f24269e1dbbee8bafb2f9de20a7c
EBUILD httplib2-0.17.0.ebuild 923 BLAKE2B 603b57487fb24e9f70bd4bbbec7ad2094298bdfe6404eeaea152377076898cfffad2203e4de758a18c44b91728e8c025102bd50880165893bc3490edf3d832b6 SHA512 07dd1892b78409715b982cf4c1e45773486d8e4bd6842781e533d2ba9c7ffa2b28e4fe030c7f080c6cd59f2202d1eb8c5ae1ae3d35e6b95c8fa021719b03d58b
+EBUILD httplib2-0.18.1.ebuild 1271 BLAKE2B 38f2505fcfffcf3c2afc666122bb897dd68c5247892f057bad5339ea22080684d0815c6e202043c0b44f7338cca374d4feb99e08cc2c437525aeb986f6c51971 SHA512 d429c4bcf7baa1a51632fcccd8e7fe4fe2034b749fa605afa20735118358f8dc1785bf2c63e0e4153b60a1a4e2ee37537ffc839728b843010b293148f91fa153
MISC metadata.xml 462 BLAKE2B 9e3eb8c4bcf82d868f8c77f40cb62f4b0fd8b3d32d3a61b7d46dc4161ca9ef5e39de4540ca5f22694ea3c185f9f1b0c8e32d476f6b4883f2ebd2ed7a32bb8cbd SHA512 586ff0cb09ead1571157ece3bbeec4121490f2a53d6c6925c71d31f7182e3da62efb1a16c235299669110730725802b5c1b09f39c58ae53ec97b1a7be19cf935
diff --git a/dev-python/httplib2/httplib2-0.18.1.ebuild b/dev-python/httplib2/httplib2-0.18.1.ebuild
new file mode 100644
index 000000000000..a88d198375f7
--- /dev/null
+++ b/dev-python/httplib2/httplib2-0.18.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A comprehensive HTTP client library"
+HOMEPAGE="https://pypi.org/project/httplib2/ https://github.com/jcgregorio/httplib2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-misc/ca-certificates"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.12.1-use-system-cacerts.patch )
+
+src_prepare() {
+ sed -i -e '/--cov/d' setup.cfg || die
+
+ # broken by using system certificates
+ sed -e 's:test_certs_file_from_builtin:_&:' \
+ -e 's:test_certs_file_from_environment:_&:' \
+ -e 's:test_with_certifi_removed_from_modules:_&:' \
+ -i tests/test_cacerts_from_env.py || die
+ # broken by new PySocks, probably
+ sed -e 's:test_server_not_found_error_is_raised_for_invalid_hostname:_&:' \
+ -e 's:test_socks5_auth:_&:' \
+ -i tests/test_proxy.py || die
+
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ # tests in python* are replaced by tests/
+ # upstream fails at cleaning up stuff
+ pytest -vv tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/hyper-h2/Manifest b/dev-python/hyper-h2/Manifest
index e93ad284cd72..9cebf7bc07ba 100644
--- a/dev-python/hyper-h2/Manifest
+++ b/dev-python/hyper-h2/Manifest
@@ -1,5 +1,5 @@
DIST hyper-h2-2.5.1.tar.gz 92713 BLAKE2B d00baea98dfab43c2d6157f4dec3b04b2a42d0ad280980cb8b7d03d1c6f75de59e188745e7cc29fb36fd8c0799f9d5cb50a94282c70f045289daccfdcc12dabd SHA512 e82a7e6b592b43d74defbd4c729ad287ed019881f6ddf0d2dff9d3eb4fdba29cab8d988848ec64b693da77df5cbcacb06eecf1ecd77843c66c9eea8808fc949c
DIST hyper-h2-3.2.0.tar.gz 2203333 BLAKE2B 245bab162852070e850613c41162c75efe5e43535945dacf448afdc948cade83402f77259aa46f375d0772a5287e42d8842b1259cb36392cc8fc222dec7cef75 SHA512 103a4ea2cd29037ce03ae676864125b4111c7d31a82bbbe7028557da886d88fb5363d885f08d5d3f68dfa29013b7b03350cc0cb4d9dddf32735e98dae5d7fc7c
EBUILD hyper-h2-2.5.1.ebuild 957 BLAKE2B 888cec5e7d877d63b2c0b5499d1638a0d0494908091612a5dd0c5ae0ec28e211544dd92382eb7270de0cc17cc6c4744e284a8c283fa7535ea4b6fa94efb0e93b SHA512 06c5c5a40cf9db89417431b7b97a65fc86a06620cccebde8e1012f7b75c30c5a88c12e37fcaa37358700628e57572589b541f39be34fd440df029926241bc9ea
-EBUILD hyper-h2-3.2.0.ebuild 1080 BLAKE2B 8bdf443e8c0ad45f525a4eb876696f963504fe7db16a8bad28be1500bf9f94a311b61a1599a76236ecbbc5c96e0de04fbdc63ca31386e68e925be85e357ca917 SHA512 69e82d10a6c15a7d3795afc4943ee33ef2fd0c08108c75c97460e73041c31964f6d9b9df85d000e31cd99ebb639d59fa96585a588c382a5fe396bc2a312f997e
+EBUILD hyper-h2-3.2.0.ebuild 1082 BLAKE2B 5a2718f6bd99210a6f037d96e9dc451cfe705e8c3ccfcde90396df66732cf275078fe3822e643ad002ead27285c80ad0a049d6bca5ddba3eece122e905c58da1 SHA512 0d72a55910770a0533d7a397ab06197c1cfb7fc637efb5237c08c7cc2786692f794599a1e2035e1352b6308557854eab35f16896b4c81306558a396cf76ee28f
MISC metadata.xml 693 BLAKE2B 40bdc58c6b6541754e1fb5d2b3a6fa4ffd234f84768061f7ac1c1183f2f944a72948ca54824488ed2f177d96f9a0a74dc990ff6e97e6b9dabc4602522c0d27a0 SHA512 3f083b3de6499dfc1dbe59c4aa201f7b159847cf72076e0a7a9f80b029f668dd668395c2219e01dc5035677b21e6cd60f3ccf646fbef6bf458e208a0d79cb94d
diff --git a/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild b/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild
index c77d49b5bd36..cb7769975da4 100644
--- a/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
inherit distutils-r1
diff --git a/dev-python/hyperframe/Manifest b/dev-python/hyperframe/Manifest
index b3d5cb691c06..7a2dde30a8b6 100644
--- a/dev-python/hyperframe/Manifest
+++ b/dev-python/hyperframe/Manifest
@@ -1,5 +1,5 @@
DIST hyperframe-4.0.1.tar.gz 16110 BLAKE2B 44e99247a818c1f7b7b31b5170b72aed08511aef2af2d3a55a4aa7609f86c067d14821b510b0ca1433a9de9213be6a0048f2e1eef4e25676807815aff7c14e27 SHA512 0970faf8711b12b4be2cb4a41b4be6d067eea57c40ee063e2ea0c15b148f1eed0214b29c9e8a4341ed453edd8679b55f290c3818157d66f247dc4ab8e3d369b9
DIST hyperframe-5.2.0.tar.gz 19115 BLAKE2B 6dfd7c6e7f07eb52a499794709fb498a30bc4b534fb49d57295cf280afa200342139fa6c794613e518bbd0e2301672b05826d2adcdd7eebf528469af5e9441f7 SHA512 2e04b48c6d31adb0893a3246046b447c32f3d4485ffe9b08370b6c534ed4273c19e2e2c1a23d48268e333d91d8e911578829776076d8f73743cd9ef597926e3c
EBUILD hyperframe-4.0.1.ebuild 486 BLAKE2B f7ea74e2b99715c39f73abcde4fd026744df92876ea37dafe54bfea7623101f57d18538c3ea4216e74c4c3444fb6cc2bb39fa4de6243802d2952b5eb7554a0b2 SHA512 1e8ce163e9083e37cd7d550a672e366e2046bb858221aaf9649a8d04fc9f640c649b347514978edc4ca19d3a43051fb16d9147341723c9dc7a8875fce67ffb6f
-EBUILD hyperframe-5.2.0.ebuild 536 BLAKE2B 4d30bddbe3e19b7f4385505248920aed728337e16bbb071a8c6bc306d3c59b4936f4872ced324400febdff918ea2f40da18f189ddbc2d96815f2eaa57f59ba03 SHA512 524d1f4425d9269b8859fbafeb9994530a292c55b29bc25ac403d3d0a8679feb37513d9866ae5955ff90dfc98bd578595fe08e39d83ddd305330435b7bad6717
+EBUILD hyperframe-5.2.0.ebuild 538 BLAKE2B 959c562c759063eefdc85fb631645a94212664eca4c9e0f3e81dc540d00415fc909c4220f9bb5f2657b4534e9e767df72fe92da733765833c8695ae1f1367e2f SHA512 e5ab7aeba5eeaf73bedd5a3551be1618fe28ca6f1ca2807e8dd44cfa7e62e1836e257e1de1caf3aa3f9469c15daed26b9b176726bcba2e8bb65a139431636941
MISC metadata.xml 624 BLAKE2B 8c5eb7949a6b19a3341658ac90103bfa5829ebfac29aea3c5b1bb7861a0abe6d562ef304b3182d31402a45ad142f772c2887e5969f93ab4c8301abbe0d65cd44 SHA512 11667c2401c1c98563d96e63e08f9a013330c29688219dcf502afd751cb2259c688c55cae250f5ccb676c00dcd8bdc59988ec9bc9f8f92a25a985a784031e562
diff --git a/dev-python/hyperframe/hyperframe-5.2.0.ebuild b/dev-python/hyperframe/hyperframe-5.2.0.ebuild
index 2384de66b83a..737863453dfa 100644
--- a/dev-python/hyperframe/hyperframe-5.2.0.ebuild
+++ b/dev-python/hyperframe/hyperframe-5.2.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
inherit distutils-r1
diff --git a/dev-python/hyperlink/Manifest b/dev-python/hyperlink/Manifest
index dbe283e7eec2..a468b9407d65 100644
--- a/dev-python/hyperlink/Manifest
+++ b/dev-python/hyperlink/Manifest
@@ -1,3 +1,3 @@
DIST hyperlink-19.0.0.tar.gz 99099 BLAKE2B 1213bbc404ebf04f178e3f8b986c343f64cd6a75202942d1cfaeab640d1523388beaafcd2662f414c9fb1eb87f746f3edeb5b5e395b9fc0acb7e82697f45f7a2 SHA512 5d5723bc0bd0c381edd3a9ef7bab3ba9ad4252027d5a4afa61e6cfff3e5b8457994b6dd36ecc356e638d41f797fe3367a3010249e0e77bee6e9e94336c1e7c2e
-EBUILD hyperlink-19.0.0.ebuild 628 BLAKE2B 16909ce8121c63ae9f84e650d72f6d2cee4585090598359185c01755e599d170bad8dd3072b9bb42394b628d0e7cecdefb3afe7c0e2da747e0de710d1f3966fa SHA512 1fa8b477214ec81b6f2353eacf6081eac6b9e9329a16892fcc66a9da4e058fbc1e8db419613904c40f84e2f4d207e3243f4682e19441bf0012f217e5457c794b
+EBUILD hyperlink-19.0.0.ebuild 578 BLAKE2B 07923943659db3f4b9d2b1f32d4d2fb1d84ad82c7409a660f62007d97093d2e0864bed9ddbd355a71a37d57f3adb687f9e166f7c1b6a0ddb0b8eb9fe7f4fcd79 SHA512 09d4cdda6b666d8013f66bf14e8f0dba506bd3ca9cac28a7613771ad3cd4c698454abfd40e5a561be7fef76e8aaa125655597b804d0e4fd5725c7953109e0e19
MISC metadata.xml 673 BLAKE2B 054899b405550c1b1e891ad235cf2dd553275aa2d791c874073c83510123d4c995656d9777b022211369b705b3c068fa48abf2b6f3f63e5a78bd0a77fa367248 SHA512 4ddbf3e9d95f7699b5099d8c296aa3a777d9685e93e7f84734773c49d2a9174055cbed229cc0a1ddd2e10e3f414a6c93dd08eb3bfbc0717a4bf828ccf350060d
diff --git a/dev-python/hyperlink/hyperlink-19.0.0.ebuild b/dev-python/hyperlink/hyperlink-19.0.0.ebuild
index 63b5855ee120..4457f97f42f9 100644
--- a/dev-python/hyperlink/hyperlink-19.0.0.ebuild
+++ b/dev-python/hyperlink/hyperlink-19.0.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
inherit distutils-r1
@@ -16,7 +16,5 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd6
RDEPEND="
dev-python/idna[${PYTHON_USEDEP}]"
-BDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]"
distutils_enable_tests pytest
diff --git a/dev-python/incremental/Manifest b/dev-python/incremental/Manifest
index 2cd57625286d..94cffc4e94d0 100644
--- a/dev-python/incremental/Manifest
+++ b/dev-python/incremental/Manifest
@@ -1,3 +1,3 @@
DIST incremental-17.5.0.tar.gz 15527 BLAKE2B a967ba891b69e91768db213a9692da10eb9987bf962bdbc3b6fe70e337322686d58901878b72934a5abc8d9b0c9884d6e03de5b8912067f07b7562427bcba38a SHA512 91443205f7c92ec8f6502f38379c5ac2fe441435ff9490af01e5420d6bb05bb1c666dd612fc45204199a34afd533fd3de1390ca482bb554dfec7d3a22958a4bc
-EBUILD incremental-17.5.0.ebuild 583 BLAKE2B 6140fe870408ea44c66c4bb3c0fde02bb38888837eae909dc22950c953c23406e33ac5fd59d578d506303c608668d1298b7e6f054130e21f2d3c604796db6545 SHA512 d45e56dce9d3aa090dd05a6688c7e0de505f40d06f207dcd6debe9f958eebf1210eca596fc85bc297c2445687d14729905a853c454bc8e80241af80bd0cbf59a
+EBUILD incremental-17.5.0.ebuild 583 BLAKE2B fcd3a5136058dba1c7e10f1393b6d0973724bd6556467b09e0abbd5157bf78808f65e0ee14eac8fc6a22a420045440e331170c6486d343ba387c9af10e8a0102 SHA512 a53e97d3b5eb0833a4f46d8a029eb99de4f71fa78c0136028c785b54cfb69c9be3fde479f06af1cda851780ea6f3cbc676dc11a1b618bc075cb4a12b32283dcd
MISC metadata.xml 476 BLAKE2B 0735d3636617ba9b856e46daba71508248af3f6f8f4edaf0b09fbbf14a08704876ff40d2ccd0df5f8804120f63a4869bfb9411c3f8ed2206179ebbacd21375cc SHA512 1ff0b8bca8dcb14df175291256c1c429e18799429e395230be47dde473c1541ba2e1a229513fc079ea4465e92dd82d974a65e055540b9b4cc423160ad8c1343d
diff --git a/dev-python/incremental/incremental-17.5.0.ebuild b/dev-python/incremental/incremental-17.5.0.ebuild
index 7b21e8749522..4ef2d97ce5f4 100644
--- a/dev-python/incremental/incremental-17.5.0.ebuild
+++ b/dev-python/incremental/incremental-17.5.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8})
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index a4e0768ae253..c7c497ebe519 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -1,5 +1,5 @@
DIST jaraco.classes-2.0.tar.gz 9911 BLAKE2B aa5e5c90f16c9536239ed61e6dccbc426244c98a33a944de32239bd42a0a4944e5df3529cfd525e05cf276a4a4b028edcec734006b549053ac8817032f52b2ea SHA512 83c9a570f951ef6c3708243dce6397cfbfe963db5920550ac807878a69860b34831af5f277f956fd0b327d85462676fd6386a22d6d97c7616e01ca81d7ace694
DIST jaraco.classes-3.1.0.tar.gz 11616 BLAKE2B 5b438f7582a9a93ca4fc97a71725c1fe3275e4bfb48f5e06b549f7ac8fb6900262165b1ad0638114d3a8d11c10f449b7930d4c2d66fa928665aaff820af88937 SHA512 697d892a01c4e8ad83f57e69dcd744f976cea67fa3efcd55b10eda02f6bf1916162c0fa952d0d711e62f62fdff62740ee55a93be9fc46ebd4ab22416092f0ff6
EBUILD jaraco-classes-2.0-r1.ebuild 1653 BLAKE2B 0debe2ad86864beccbb67d70d725a8ab4b228006cc7f63fce7981c69cc0a8ce0661c3b5bc79996f0bcb79d1e1539a393fe2847e2b97d5de0ca49dfa149c40090 SHA512 54fbd8c51e0471920e04dc42f6634bf84719a879417cb577d4634b1cb851dc5479b2a8f93f54b0ee7ff6e4b7a2a54cb0340cac4ba16f29e6aedcdf5839b35306
-EBUILD jaraco-classes-3.1.0.ebuild 1651 BLAKE2B ea0584964b0052f51943e7cf912bc03404697202e4ac68eced3249cf1458d6a46020ab062d23735e2bb26b8456b1eb575c68c564b728b2291436d1641b37bc1f SHA512 a3eb1d04a3c540a043a1bf7218ee7753c30f45d77dafe38fe1db564c41d50ea2a689ba9979c4726ae5059594aee5c6e1b90ea3f50ed382b8aa65b109d40466b1
+EBUILD jaraco-classes-3.1.0.ebuild 1653 BLAKE2B 3792df63a58581cee829720d04effab64bef7105ec8b5f719aa467a8816e9b0a6ac242982fa95d30060de6af65a47bf121b4c4802d5104a58bcf51aa1b5e99d8 SHA512 ce9e7850fd67b776e3fb14e3d3491260fd65ec7302437b599879edaf0433f949d537e47dd459f9cf7a54e9456c2e77f0af3551f3bca8deaa83f46578bbe585c8
MISC metadata.xml 452 BLAKE2B 21134cdd1ed697f4c18617cf812678e3369ed58334419ce74ec5bc0956145cbd8080085d207d37d257d5ed480bd81670f98a38289c773ba7f8b905cbb49077d9 SHA512 0107c5f161fb935b84251fe078da9a6be29f4ab53fc16c8f9f4aecda8e8de3df00b396c54ae53461a76cf794f6bd0f96697ac1ecb2bc59d2cbdadc8a6fdfa2da
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
index b9b5feb71b9d..360b3c03b645 100644
--- a/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
@@ -4,7 +4,7 @@
EAPI=7
# Tests fail with pypy
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
inherit distutils-r1
diff --git a/dev-python/jaraco-envs/Manifest b/dev-python/jaraco-envs/Manifest
index 7a5356da5ccd..6920254f7d57 100644
--- a/dev-python/jaraco-envs/Manifest
+++ b/dev-python/jaraco-envs/Manifest
@@ -1,3 +1,5 @@
DIST jaraco-envs-1.0.1.tar.gz 8133 BLAKE2B 05ec6b0ea7532dcf6efe32fe7d1d6a1346d60294ed09743a6f7a47599406bb798f1250525b241aa24b971849f485f89440a56e8ca6b94b2f6847c48aab281be8 SHA512 df5aa3fe06be5091745697cb5f9dda6110fa60e1330515dddbb3e8441eb2232ba1036cfaef7ac8f054958c1a890601330b04b81a0887c4ebc6b41f29335df76b
-EBUILD jaraco-envs-1.0.1.ebuild 1219 BLAKE2B 5de330f1c5aa220abff10b5bdfe066d312155213ebad879cb8d893c26787e269b87e8a1bb3ddf6c3f74dfcb1718322b4b5588a6a60ce13652b45a8b0590485d0 SHA512 f5ca00a653d0c47c1bc417f2d8bfaf0ea3f56046bc24f68796790a872d447dbc14c35a2abefff52dad89a230d780eaa211b9b62e41e5a77a537d0e4a9d31361b
+DIST jaraco.envs-2.0.0.tar.gz 10018 BLAKE2B 8ad47fb7cb8f68081bba0e83368fe3a2f069130153b78be375a7a4543cf85e00ca1e365f9fb5a76d54f771879e87ff4737fe2991a9c520a9f86f21cf5d9aa8ce SHA512 f121c25ecce75beece7ed7218e69616f7cec6e493f9734b8ce040368d0fedc1ca4d7d343ba41c1367451a744f28ed98d9d2f3abc4610bfa8709fc29480c5ccbd
+EBUILD jaraco-envs-1.0.1.ebuild 1221 BLAKE2B 015713b033bdae73a9dea9b427136846855b5b239ea321936a9e2ac355fadf0d5d40e09d21c6b40dfd36997192c670787c58d7c39c78a6ffc25c4f5c0a7aa1e2 SHA512 2cd85cc698f8eef5511e4005f2c97b3e3f4bff58be6d2f48d9c0d1c5f6eb757c08f6d5143cdb5a3882ca0a803ff1e6a02b22c8c2d44d33b284f74f14371cba1b
+EBUILD jaraco-envs-2.0.0.ebuild 943 BLAKE2B 870d811d97661127cb47aa42db13a27e03e00a423d57c7b9dd793f3b99ad0efac8bdbe81ac1faaa870b7efa4be5fb9380db4251642bec247f2cbb2e0e58228c2 SHA512 6d4d72f0dd96d386ec0749642b7a513a85beddceadc28443dcd51c1d3d37ade1fc7dea25306e1f76688b88f70a7f4daa356d72f876e2bfcd9cc13d7cc4632821
MISC metadata.xml 372 BLAKE2B 217b1b3b2a1884ca5bc3c4eea5ce22fb8d529f7b29fbf02870b5c9b88ed0e6aeb5dca1e88997fdda5d00f0bda6aa627f4195d51863dee3c93c93addc0d0025f1 SHA512 693e651230d179571ad77d6ad9fcf48a5b4bd2002b9d3b017ba6999538079ac10ccfd014542713d3ca5c438f127cb1b53d2ad04b1f137b353885e43bd4aea798
diff --git a/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild b/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild
index 19150c3ae89d..17dd0999bac8 100644
--- a/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild
+++ b/dev-python/jaraco-envs/jaraco-envs-1.0.1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
inherit distutils-r1
MY_PN="${PN//-/.}"
diff --git a/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild b/dev-python/jaraco-envs/jaraco-envs-2.0.0.ebuild
new file mode 100644
index 000000000000..3d3446b9761a
--- /dev/null
+++ b/dev-python/jaraco-envs/jaraco-envs-2.0.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=( python3_{6,7,8,9} pypy3 )
+inherit distutils-r1
+
+MY_PN="${PN//-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Classes for orchestrating Python (virtual) environments."
+HOMEPAGE="https://github.com/jaraco/jaraco.envs"
+SRC_URI="mirror://pypi/${MY_P::1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~sparc ~x86"
+
+RDEPEND="dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+ dev-python/path-py[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' 'python3_[67]')"
+BDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+# there are no actual tests, just flake8 etc
+RESTRICT="test"
+
+python_install() {
+ rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+ distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index b094615089a0..71387cbab411 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -2,5 +2,5 @@ AUX jaraco-functools-2.0-fix-py37-tests.patch 1120 BLAKE2B 8fe7c807d7582ffd2c324
DIST jaraco.functools-3.0.0.tar.gz 15618 BLAKE2B dbf542148d18069e7e78c718f3f6b62c7a07c674c96d54dfb3c1cebded13f6e24ca579844453352d001d312e718acf58d311c198076e85217362ee1a1446dc23 SHA512 f1ec725e132477f7361f7d0a77f72b69603499c24df25c9e8e0cc9a6d34a4bd4bb10fde60dc324b8176c46035e2babde04de90fcb0aa82273bc2f8559b8b31f5
DIST jaraco.functools-3.0.1.tar.gz 16996 BLAKE2B 8cad1532753ae5c941038d4b8cda17b49f2d131405bb010d3747ecafc1ea4f72ad2c91b1ce2c499cd2885b18a9fe2cd1ac1bf06d58ed6f13a7a379cf9deb0e66 SHA512 96696839d3405e571bd0120443c5494f13d737b7e0fd9324a7a003c88ff45bdaa89a717c81b9c5ecb4eded9781ba2c05f4735e5cf24c1d1c162fc3d55d38eedb
EBUILD jaraco-functools-3.0.0.ebuild 1747 BLAKE2B 5bc3c6ec8723e01dff7b9953ce1653a77603e5bf10a913cf526cbe2546f09d05c85809e37254c7a504855c0d85d708b168b58f82710e4f1ce2e219f74ad11883 SHA512 ce4135a8607d136b7866d8c47401ed4c8d2d1c2412b8b3c3ed480963ab03f061a846ddf6bc1f54225c618e0a2594fa17f65e03cecc24eb638a59359db3437a6f
-EBUILD jaraco-functools-3.0.1.ebuild 1567 BLAKE2B 41b27083779485bb5f60b5cdae86fbbd4b544a312f20690ad548d55518db1210fbda2b27bac7980e1b05ffd2e9ee9d5f7b571784eb254127fe9681b21f373f56 SHA512 d1deef16b97a4be80120c5741ce668fa5384279708f27167d72f26d113bce75b3723b47504dd4d3620baf257245524a8ee0b3976b2e2e94af3d8a17baa7a014a
+EBUILD jaraco-functools-3.0.1.ebuild 1569 BLAKE2B e38c6cfbfeb98e8b278d0c9e07c210da51e2eefd7a3cded1f144b33cfa15866a45ce185c7cae0e30b624b5921339d8cff6b9390f1592838d7efd75438552059b SHA512 3635fe36926a4ed1d9e091ce5da803d962ab1ae1173260e7fea58f0f6372330b49b6706f4e03c7805e291a9754a6f4790df5e6478cb75e4834c2671f010f63ba
MISC metadata.xml 651 BLAKE2B 3b8c3e620ec97e632d9d67c336e08989f662e36cd55ed0c283f7f9f4020717e099f00a438e550d38ddde73ca2736e728e74e8110ac957c797b109aa4252503b2 SHA512 04cef990bef9e5c53188b1c5997549644588a0053c06109992ae4d1757c3cc76553b3a3bcb535f4e3a0b33d679083d4c2247a73bbe69a6b1b606f99a6c96abc0
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
index d4b3d6ee6cf3..b997d09613d0 100644
--- a/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
# [options.entry_points] is present in setup.cfg but it is empty
DISTUTILS_USE_SETUPTOOLS=manual
diff --git a/dev-python/jeepney/Manifest b/dev-python/jeepney/Manifest
index 4cab1c3018bf..69bd619a2ca1 100644
--- a/dev-python/jeepney/Manifest
+++ b/dev-python/jeepney/Manifest
@@ -1,3 +1,3 @@
DIST jeepney-0.4.3.tar.gz 28121 BLAKE2B 2c9b5b5ec26a9af25d28af602827c73c8ec9377a88a4aa79b9a986675c1ef3f195763a338f3efa4ee371f7751dcf05a9f9cfed06c8d6677d81da3699773d5561 SHA512 bfb12c9259a57324759f8be44d1faf2c0535762e72db5f1370e64cb144c0fc537c9bc9cfb9b075932fb3a20e3ef4e0c990c10905cc5a69e3fb088e8de4193689
-EBUILD jeepney-0.4.3.ebuild 760 BLAKE2B ac90001eeb15d9e68fdaa10a5d8c63adeadeb0d93ec9330ce47535ea594e8b1986233acf80fd99408f2266e32816d98cc2a1147970d6fa688485fb9faea483b9 SHA512 f9bff1c857fe886dba52decfead96f699b5d4c608859f020c5fffd4b8fc2bd3bf2ff3c761a0ce90aae976168401be76a31f0f373ff6811ef1d9c5c7ca4ea5112
+EBUILD jeepney-0.4.3.ebuild 790 BLAKE2B 68c5623c5453fb466850ab36055d82f95a0435f69f1619445b4b8b0c6d4c8bde595e761cc9d94ead87ffb73ba95864c327ab42d626a8120dd19bd2f0cec68136 SHA512 ef870b78a967b7b216afe8401fc452ea10218da228f55185c4e9a9abce936da8680c510c96b051634e1a68c6e66890aa26f3fe82c006211771d9046902b16c14
MISC metadata.xml 432 BLAKE2B 57cc148c4580f5dd579dfbec20c85c80e7d5f2b75397c96f4daa2382e86dbe0547b15ac628fc46bb62c3845becb46cfcfb65027f37839d2d1f843c6872d45e80 SHA512 124413d7ca2a366a651128cd8346aeeb3bd5ceed9b43136fad32861844a078694fa8603e4a11df4d7b37343434bf29bf21d0a0ac6999bf9e9b13f474b93914e4
diff --git a/dev-python/jeepney/jeepney-0.4.3.ebuild b/dev-python/jeepney/jeepney-0.4.3.ebuild
index c3bfa612cbcb..56491b219744 100644
--- a/dev-python/jeepney/jeepney-0.4.3.ebuild
+++ b/dev-python/jeepney/jeepney-0.4.3.ebuild
@@ -3,7 +3,8 @@
EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
inherit distutils-r1
@@ -17,7 +18,7 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="examples"
BDEPEND="
- test? ( dev-python/testpath[${PYTHON_USEDEP}] )
+ test? ( dev-python/testpath[${PYTHON_USEDEP}] )
"
distutils_enable_tests pytest
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index d2fdd05586bd..742afe4992ad 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,5 +1,7 @@
AUX keyring-19.1.0-tests.patch 978 BLAKE2B f5ffbef3fbda93c4f1ac4373129931b4986209cb0898c363e2ce82c8b08b530ba15f6409f59e99f68d7bd06547c3e00b2f5dfd3957319485ab3db74dbadad1bb SHA512 aa33abc4ccb4bece799add8a766665f0405a69f3c5485b3ffffb5116365b10d965ba5f9458ad1006c36132b6a83f26fe9a6d83f118e46ae59a76af84c6acefb1
AUX keyring-19.3.0-tests.patch 939 BLAKE2B 8537c22ba56a24e5f8fee3907023098dbbdaf208a5e3edfff27c0a9537214caba2d4383efd79ab8ea0d02ed6ef3ebfb3630e53f7846a1af993d440407a3f20c8 SHA512 4aa8ed401181fe14e98e855d537aec5dcf5e413728df52edfbaa16cb0babaed68f29402f0a83143248e51cbc2e3f6211b68efaf4b54d76dcf8b5ee2748f46d55
DIST keyring-19.3.0.tar.gz 43587 BLAKE2B a1003aa55ac48f39e84431c50fe3e24e1da76a0db177eed08bd2c2110b78d10cbfcf7188519435732be68452a0318119cca1563168410b16fc529a3a7e98125c SHA512 b1d26f665203b11712ef91057ecd78cce58b35038b259605c42997283f6c41449baf242ecf43510b29598559b8aecf733eb66be6e0c439564256f40eb0f6982c
-EBUILD keyring-19.3.0.ebuild 1716 BLAKE2B e2bd07f11e9e5a1673fb32cc4a10c6fd32fdfddcd4caebf00964b7d34e4c9c0c6d0d1853cb6feb4038d83a62c321e2919d4bb4753ea3aad4c9fdf23ca7a33990 SHA512 454f31e3d7edb21ebb28e85e5d51c0c07c2afc66c513e6143eaae8b0d007412468ef8fec8baee482ab241174aa7ef64ed485eb4f8741b92d698c74949edd6eae
+DIST keyring-21.2.1.tar.gz 45535 BLAKE2B b276f5b973c418794561e0d0872761847d4cb81531dde61b75439c73039f49ffc8abf679d622a9381bc6663ffc452c8b6aabc0a4c8e4cfe5ad1c63566b78082d SHA512 35869e37b234d15799907f0efd0193ab3eb9c0799a6da2d843fdad24212b4ab983658b32bd8b09b658174dcb1ddb6d70a85d0af95730d34d8c571f2ecc9a7c8b
+EBUILD keyring-19.3.0.ebuild 1643 BLAKE2B c902a24962b88f11287b55e957a10c50410dead3a252d0827edb6bb72747b7e0686a896b93be67aac3e60f066ace99addc3f798a853d69374b6761b4b54019a9 SHA512 5ef0899592a3284f2a05de1a66b846532af35de7143a5f57b7933dad689cd1a2b94de5b83ca0038a8288c402ddb71ba538eb0f48885496a986f221aea30c5e78
+EBUILD keyring-21.2.1.ebuild 1392 BLAKE2B beb1dfb2cba8fe275874c4446560e430d311f83b719d011c9a1d9dde5f8f018942fc76a370e8e55237bb88a7f7c51af101e7a476dea6f56ef4bcc63d035165dc SHA512 00ac908ade6be82a4708e6dfe5ad3726aee7b76125029b0397b3ce2028793e6c71e77236793389ea9f92154843d6531e31897c6f5fd7b9c8eb32efeec8094271
MISC metadata.xml 652 BLAKE2B 7b1d1ad76e12349a4b18514812900a0847e43339299997512aaccf1f8646b6f1197a81d89fc1d43daf3a0ae0a65d635087222456bd317eb52c6cdd76be027327 SHA512 cbc87333b3907d4e210a49f566ef9ad8062801f8fb4c36951b4fc72c85f7e411c1919db71082768730c45338d6dcb1d907b5d1a7e1c5288782457cb942677a37
diff --git a/dev-python/keyring/keyring-19.3.0.ebuild b/dev-python/keyring/keyring-19.3.0.ebuild
index d9dbd7b1f35a..448afd7a7d74 100644
--- a/dev-python/keyring/keyring-19.3.0.ebuild
+++ b/dev-python/keyring/keyring-19.3.0.ebuild
@@ -3,7 +3,8 @@
EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
inherit distutils-r1
@@ -14,19 +15,13 @@ SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0"
LICENSE="PSF-2"
KEYWORDS="~alpha amd64 ~arm ~arm64 x86"
-IUSE="doc test"
+IUSE="doc"
RDEPEND="
dev-python/secretstorage[${PYTHON_USEDEP}]
dev-python/entrypoints[${PYTHON_USEDEP}]
$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{5,6,7})
"
-BDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( ${RDEPEND} )
-"
-
-RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}/keyring-19.1.0-tests.patch"
diff --git a/dev-python/keyring/keyring-21.2.1.ebuild b/dev-python/keyring/keyring-21.2.1.ebuild
new file mode 100644
index 000000000000..1e3cfa450ea7
--- /dev/null
+++ b/dev-python/keyring/keyring-21.2.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides access to the system keyring service"
+HOMEPAGE="https://github.com/jaraco/keyring"
+SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+ dev-python/secretstorage[${PYTHON_USEDEP}]
+ dev-python/entrypoints[${PYTHON_USEDEP}]
+ dev-python/jeepney[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ dev-python/importlib_metadata[${PYTHON_USEDEP}]
+ ' pypy3 python3_{5,6,7})
+"
+BDEPEND="
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+# "${FILESDIR}/keyring-19.1.0-tests.patch"
+ # https://github.com/jaraco/keyring/commit/411204df606bdf02c99f3360ec033e3c235d5f67
+# "${FILESDIR}/keyring-19.3.0-tests.patch"
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+ dev-python/jaraco-packaging \
+ dev-python/rst-linker
+
+python_prepare_all() {
+ sed -i -e 's:--flake8 --black --cov::' pytest.ini || die
+ # relies on cpython's gc behavior
+ sed -i -e 's:test_traceback_not_referenced:_&:' \
+ tests/test_errors.py || die
+
+ rm tests/backends/test_kwallet.py || die
+
+ distutils-r1_python_prepare_all
+
+ export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
diff --git a/dev-python/m2r/Manifest b/dev-python/m2r/Manifest
index b660dcd76aeb..4b7fc3e9d82b 100644
--- a/dev-python/m2r/Manifest
+++ b/dev-python/m2r/Manifest
@@ -5,5 +5,5 @@ AUX m2r.1 9244 BLAKE2B d7ac673d0750695f8b21b6e9d0c5328ab8934dd20eb88835c655affab
AUX test.md 34 BLAKE2B 88eac9a501f3fd54ac3c9555612c7d3860d5c692170fcfeca3d75b665611b75e627443e8a54d8dbba4c820b2f793c5b933a76493381d295aefdd5ef55b7fc1d5 SHA512 c4b98b3256e14d46187d4c5cf5d3b26e4e4e0b1c6f2f61618987c234f49ea5a9bf31a94b9d2c4907bbd0685fb30138a5916b5dd3c8f92cd80bf0c7c2e657ae26
AUX test.rst 45 BLAKE2B 1bdb710270f83f8a5177fe457f3ea40bd0bd8ddd36e5acabb4d6fcbdd1cded336a736978a79efff42c7cebcd1a420d8bc4485593d675b3a66e3f427434147c9a SHA512 a2d44de89e17b5a023928fa695c8dd61163a2b59968a514b9a976f92923881ce53625930f0e05f7f257250e46f25747928f71e8f25fcb9c05445b221688077d7
DIST m2r-0.2.1.tar.gz 24455 BLAKE2B 42ec5a919301b6dee2b345a5eca9e62a1bd44186fb61dbd8cc9de6cacc34821e912f242355cc7368b755f923a433353cfa567afc480e9b8c63bf209ff9d3c624 SHA512 847f04538ee52f0b0a88cee9474ed889e8114a3a7b1fb221cdaa867ab70ca52f517250f2c8bbf795ae598c7b6614e6d03d9f6f05b7e3d56fb8087d63eb52f1bc
-EBUILD m2r-0.2.1.ebuild 1415 BLAKE2B b42e06c0a3e0ac684110bff42d9cb5adc40fb9df1f2c3db4d6a2c94a1dd9df6fe8451f48b4bd860f7dc9cc905af82d83ef2dbb4d7ab180188792a69b8dd14186 SHA512 c1c89d6f160d15a065910c5b65b0937c452ac61e2d55a143c3905aad0c65c1ce61d3e84396c795402af57ba22e219c86e5e63a54baa89eba40501cdd9e0d7918
+EBUILD m2r-0.2.1.ebuild 1414 BLAKE2B 3767158c460d5f80b2beca40a7341e35268bd66933fd96822d7fa73f339ef38cb68d62226387958bb74116bb185c15436af94a8cc27c8c6bc10a26d396892e35 SHA512 766b5c42697cef00e1b0e5f13f3ba67d40f8fe0ef8e3ebc6c5ddfa77ef0179667dcd69edb2951b8fe23e477a66faace30bf296227dd88a8c42dbc9a373ff5671
MISC metadata.xml 387 BLAKE2B 9afa0632ca2c8320eef24f538949e83fa74c290c2d0845b097d7d5c9fc8a34534b53766e41acbc6efb4a9c2956a798f54f3ead47fc2d36e489b847612d7ca73e SHA512 1466a5630e24d76f8ef99192d8d8c993b1e6085aee4c38e0750214d119cdfc9bfea3f193a9f47f6bd8c72d5797ec15acdbcbd26e962f53a26722c128281aee6a
diff --git a/dev-python/m2r/m2r-0.2.1.ebuild b/dev-python/m2r/m2r-0.2.1.ebuild
index f0824021a453..524fde1d1afb 100644
--- a/dev-python/m2r/m2r-0.2.1.ebuild
+++ b/dev-python/m2r/m2r-0.2.1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
diff --git a/dev-python/mistune/Manifest b/dev-python/mistune/Manifest
index de136544336d..f0c11a0aed63 100644
--- a/dev-python/mistune/Manifest
+++ b/dev-python/mistune/Manifest
@@ -1,3 +1,3 @@
DIST mistune-0.8.4.tar.gz 58322 BLAKE2B e65d45c5c95706a49a7fd407afe5f10e82a475766ca272ec3bebba8c89e670fe6efced7b09537efb69d3fd36e75091e370170a15ad7488b5cbe9186e2ccaf4db SHA512 36c3ef5d5537f5cceaa43e4da20a84b27c378cb744a93f0380024faefde490bcb42c453f79002ca049083fc437278f4afb3e10de5462f9eeb9077ca2a2fcaea7
-EBUILD mistune-0.8.4.ebuild 615 BLAKE2B 4f253fd40b92f9c3267b17c54d67139d9834f2d34d4d64ce710b4f5bce92356faaccae17fb6e9e4d729b338806a46c5ad0e435c5b2160c678c94814bc3eee0a4 SHA512 2f28951da567f55f396ca0fc4cfc9673c3b95a7a31daee2a5fe98814cc1d765bd834ef76cdf0cf26cb71e25176c4e25f452cc00bc039fb81a5accd6707904a20
+EBUILD mistune-0.8.4.ebuild 526 BLAKE2B 2725b9ab5fa413d4e28b8e00059dfbf8292a6714b91a8703f2722ce9a6d2ad99c74b2d5757ec001bdb3acc8ca79e0ccac7f44ba8e82fb967c3d68a52737d64a2 SHA512 f8c227de2b1bd8de2dcdde2a00fa0d6e6608639789023c77da9b81850cd8aea49806f1d1a42ab5de662aee8907e3855c6938b1f3fa32a8c5f475eaad82781625
MISC metadata.xml 377 BLAKE2B 6c495d3d88811994e4baf0aabb5267343c09162239cc655b5fe4f9b8b63df4cb08dff0186cbe6b63018eac2cc2489a3f612f72d49885df3055591da74f5fa5a5 SHA512 3630e9ba514f3f3b1ecf532ca928c3bc89c05ab50a9113ab4b1d609edf07a6421796774ee4a71cf17ea3c2939acea24e22a74f33b66fe630706dcd6482cf817e
diff --git a/dev-python/mistune/mistune-0.8.4.ebuild b/dev-python/mistune/mistune-0.8.4.ebuild
index f667b37ae194..63b21c2482ff 100644
--- a/dev-python/mistune/mistune-0.8.4.ebuild
+++ b/dev-python/mistune/mistune-0.8.4.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
inherit distutils-r1
@@ -15,9 +15,4 @@ SLOT="0"
LICENSE="BSD"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-BDEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
distutils_enable_tests nose
diff --git a/dev-python/munch/Manifest b/dev-python/munch/Manifest
index 9654bc37c26a..777ff460d345 100644
--- a/dev-python/munch/Manifest
+++ b/dev-python/munch/Manifest
@@ -2,5 +2,5 @@ AUX munch-2.5.0-revert-pbr.patch 1301 BLAKE2B ab22d6d9e73444d5e5240a5bd64662acce
DIST munch-2.3.2.tar.gz 7598 BLAKE2B 0ff607c4821b675bb0710e185c82135ba031e2ad0e18aae07f8736e102ee73c53a6977155f250ff20e26e87671f8a20ed7bac625bb96625017be047704f63bc6 SHA512 7cbcd79b9506940f88a2090649e5ab6678164b468ed04feebeab8f85c9af861a1a8012aaafc869755c3c7957feefb231bc15426c382c014e82e9b806a879b8e7
DIST munch-2.5.0.tar.gz 17015 BLAKE2B 17af271ae082a6e5f91781ba48a440f11cbe85ecb81d47ee2bc51910307080e3ba6c95e99e7475534400b2915a86d8f853bc65d419c3d3b7138bf021e66de25c SHA512 7eca31111f40782a19b49535322bc56d723022d52b0842c4beff512f32fa415a6c75851eb84950358cb6a11693095cafe56364028e48385b11135de414edca21
EBUILD munch-2.3.2.ebuild 503 BLAKE2B bc9c75e8e823ff370cd75d59c326653ac1ff16f0f923d43b600314e42ac2ab9c6672ddd07b2999cf566efaf19a78d7802eaea1f918f6c86bb20930dd5e1a6ce5 SHA512 f4246ccdab778286cac951a7895d98a36916468231902f5c83a9a075ebe025efa475c9105d195d98f431ceff8d4eba564db6763ab646d790e71f2472636f8280
-EBUILD munch-2.5.0-r1.ebuild 753 BLAKE2B de629937070aee6aa664ac4dbbc65e715b4b092ae0c636220c26f35aef463a75e5f59846f7a871b418771b762ac0c031bdf517c33c255dbebc0cae2fdfb0d8b5 SHA512 c803b3e886e29d0760a0c80798a2b637fd77c51437962194c13db23dc643d6bba8d691ab8678ebcae8381911cbf72e65165089c06bfa5e0473b402e2a2ef3096
+EBUILD munch-2.5.0-r1.ebuild 714 BLAKE2B 984209e34ae5623bc4a15111e3a3c8a673120db8a506ed53b15d9a24250e8848bad2da55a9d69afb4ff3ad6245fd15b5612468087846d52f4a9c25c3b5fa06f9 SHA512 d557ceae8c915e0caf4292ca1edf8ae6170cafee0fc63fea80cfdf91c52b842ed7df1acc1f33c45180b111f9ae9e5df0beb9520c4cad35a3a30a9c683750108c
MISC metadata.xml 297 BLAKE2B f25a8e5e6202cf3368d7d979e07e1c0dab3dbdb9fbf6341b51d28910a246d217ac4da6c217550e0618b5df92ca309b68f23844834e9a03082ca841d2d58f428a SHA512 4cb74cf412c11219c7d9cdaa3b7ecac661c890dd225de89640893bca6a77615735138ef8fed3887ac85e6bb06acb8f4aebf344060427b0839aa708da7820938e
diff --git a/dev-python/munch/munch-2.5.0-r1.ebuild b/dev-python/munch/munch-2.5.0-r1.ebuild
index 5ca61b94eef8..7b59d900eacf 100644
--- a/dev-python/munch/munch-2.5.0-r1.ebuild
+++ b/dev-python/munch/munch-2.5.0-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
inherit distutils-r1
@@ -15,7 +15,6 @@ KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~sparc ~x86"
SLOT="0"
BDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
test? ( >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}] )
"
diff --git a/dev-python/namespace-jaraco/Manifest b/dev-python/namespace-jaraco/Manifest
index d27649597d8d..06487c326da4 100644
--- a/dev-python/namespace-jaraco/Manifest
+++ b/dev-python/namespace-jaraco/Manifest
@@ -1,3 +1,3 @@
-EBUILD namespace-jaraco-1.ebuild 872 BLAKE2B 89f3085b3719dfe105b14169ef0bf30444fe40c426fedde359000a3fc1ad0df64df9c43320fd87490c739fe67728def96805c14f2b78493fa1ad3af6da5942dd SHA512 6bdd8e69904f1335970a7aace19304551fc7451fc7fb902e1592d31e9da844fbb238959f7760eb252e3f1786c62936b6feed5683cdc12bc5786ae163ec6a15bb
-EBUILD namespace-jaraco-2.ebuild 800 BLAKE2B 82abf8c3cbc4a78e911e872e4333af43014bba9cc63ad63734b25c809d579bdd3fbc0eaa3269fc3d9843249a31fa0d35d818ad4b9d8abfd2fab0284bf2eb56da SHA512 63276ec8fc2c14a5cae76b590ee0fce4dee0ff88e3f3c46c8726d3f3604d40ac25e15867342191f1f9773dec15160e15a1a21ade57d4275f703ff1a438750bc3
+EBUILD namespace-jaraco-1.ebuild 876 BLAKE2B c926f0984079e1e5c22c8e09e624f2449dd89714f70e985877989b506e86899ecd5bd4be0eecd0e79740816799fcb83cc2805c49afdc079323cbfcb57c550d8b SHA512 59eb2bac6cdbe986929dc557b29abe0e77d087452a2608c49f385d457fe1e8b16dabd80442b0c1b67da142cad55a86733feae1fcd5069984bf5b914cab7fb21f
+EBUILD namespace-jaraco-2.ebuild 802 BLAKE2B 9962312b8a6ab98c8de61911297395824c3971de11ab6df9c0266677b6c83d60c32e24f1e7b75548291338efbf3fe5a317be523f9a22635e35762d218949808a SHA512 b429a8f406b2b0e03d237bcdad954be5d82851181ffb363f54ed41e475ad5d1b312ac5b8c027790d2e3b9e97882d1fb56f7e326f356547623b12d64afda8a02b
MISC metadata.xml 346 BLAKE2B bf549c97be0470c6694566c73fb27eda911bd1c7e38641ccfc90e0cbf33717499177dcd4d6b6ce475d430a04ba395500d41aa5cf7d7938ae8bdd1c0840e0a6e0 SHA512 747d2fe0daa0213a7f9d737cc8c5037438ef9262ba049a7a687e944cb1251b9b3dc39ea03a810b5ca61c7b95c7f1360bc397c4d75fc26746cab5029f7736efdf
diff --git a/dev-python/namespace-jaraco/namespace-jaraco-1.ebuild b/dev-python/namespace-jaraco/namespace-jaraco-1.ebuild
index 0f9fcee48099..ad4e6536633a 100644
--- a/dev-python/namespace-jaraco/namespace-jaraco-1.ebuild
+++ b/dev-python/namespace-jaraco/namespace-jaraco-1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8,9}} )
inherit python-r1
DESCRIPTION="Namespace package declaration for jaraco"
diff --git a/dev-python/namespace-jaraco/namespace-jaraco-2.ebuild b/dev-python/namespace-jaraco/namespace-jaraco-2.ebuild
index 5719f0cd5b48..8277cdf3e768 100644
--- a/dev-python/namespace-jaraco/namespace-jaraco-2.ebuild
+++ b/dev-python/namespace-jaraco/namespace-jaraco-2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8,9}} )
inherit python-r1
DESCRIPTION="Namespace package declaration for jaraco"
diff --git a/dev-python/pathlib2/Manifest b/dev-python/pathlib2/Manifest
index 5a47b970a420..1d468502d452 100644
--- a/dev-python/pathlib2/Manifest
+++ b/dev-python/pathlib2/Manifest
@@ -1,3 +1,3 @@
DIST pathlib2-2.3.5.tar.gz 34393 BLAKE2B 7e03214a53f1ebf7718d04f653e24ffa4b06070b0ae21583d98ea0ce956c5aced5ea63bf6062d8e8d979bef4c82137cd2d2d5d6121dc3dda0ae1f713c1868d36 SHA512 3f0f212bf5208d0965ac02a590bef6ac0ec5e3b702828c06c3c9d37119b3db422cc7873de614fdc37ebfb3f52239a6517008d9672a176ca15d03fe13baeeddc8
-EBUILD pathlib2-2.3.5.ebuild 914 BLAKE2B 86cd9735887770bc0eec1fddd8cb1c81a868a508a1e06298afb52fa0bfc21b7772c04161496f8b33047f37a7f7fcae8f13a8a80cec5e6df8b605161f1690a5db SHA512 02284d6e3412275cfbd67f31781439f8be7665d51712cacb26cd07a63e7e0147f23332f1500681e94e478a63a487494e98a56d5ba642e12eca59866bcdda078e
+EBUILD pathlib2-2.3.5.ebuild 902 BLAKE2B 9a955b4c1476c5be0a053b753ff60aa3f0a6cbec32ce2b90ba8bfc40e7beb15791abc6539def8ee9ea05d260a45d0d24990ec0fb2d6a90d0b421f94fb745d6b7 SHA512 affddf04601e994abb90c2c914256087c915b9f9d0a9b3ac13be2c85ea0a5ba5c49a531c908c619300d486c979545410a14e2d0d0ce7fe6069b5af8e5cabcc7b
MISC metadata.xml 463 BLAKE2B c5e8381d9902bc251a106ec336aa4981170fb7fedf69c4b71ddd884a7e9389d906fb9b51328b80bff434bd69f8103826783fc12f827b30866a1dec5405e63c98 SHA512 e00cb650f5e170feb4186dd440ee85e28ce345447b16264e323a50ec719b19c68bdfeb5c691d468045aa1c57df43e5b12e569b410ec04d39d2d6d1e1c61e2003
diff --git a/dev-python/pathlib2/pathlib2-2.3.5.ebuild b/dev-python/pathlib2/pathlib2-2.3.5.ebuild
index e080b52fd1ad..fcfb7cdfd59b 100644
--- a/dev-python/pathlib2/pathlib2-2.3.5.ebuild
+++ b/dev-python/pathlib2/pathlib2-2.3.5.ebuild
@@ -3,7 +3,8 @@
EAPI=7
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8,9}} )
inherit distutils-r1
@@ -18,11 +19,10 @@ IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="
- $(python_gen_cond_dep 'dev-python/scandir[${PYTHON_USEDEP}]' -2 )
+ $(python_gen_cond_dep 'dev-python/scandir[${PYTHON_USEDEP}]' -2)
dev-python/six[${PYTHON_USEDEP}]
"
BDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
test? (
${RDEPEND}
$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
diff --git a/dev-python/portend/Manifest b/dev-python/portend/Manifest
index b57b4d9c3a47..547846cde81e 100644
--- a/dev-python/portend/Manifest
+++ b/dev-python/portend/Manifest
@@ -1,3 +1,3 @@
DIST portend-2.6.tar.gz 12295 BLAKE2B 307bb77bb7d73e201f00ca203204149bb4fba8a00277da08f804626be4d01b15bdd38ade7a49c7acafd37263cad6e8c62e0eb6e6bdec0d9e10267c1fbf469aa9 SHA512 9e53c668ba9d0ddb2e92d9b4c97d2b8a4d858a6fc44123414ee3c8ac433f51f50a4773ee08f85bb134e49aeace2a17baffd32962d36df0b19b505a2c6634bf7e
-EBUILD portend-2.6.ebuild 983 BLAKE2B fc15f4a599c9a671b2ac6ef4d828c824965adc7d910168837cb5e4d3e50cccf41dc6adca0db8eb0712b566930475e71c2101dd8cd859b60e6291bbf34a61a98d SHA512 7593d483eca9bf109997f15ead643d1bc7222921e4fc0885fe2590fc8571293a9b13969ca51117bf8828612765718572a28d4075ec4a6c725382c7924002f15a
+EBUILD portend-2.6.ebuild 935 BLAKE2B 5ab99520aad767a0f6cc7c8b5993799db2652f0c03f62d2f90e31f023b37a657c5edb04ba704f14d6a7553d632a3e11a6ee6f2fef2f3b85d388d44fd3978e1e2 SHA512 5d7aeeb4b4255969f5d15c8e4c49b5770c451e8413d63801ecb446c80eb6f8cf79745e85260b97b6d0d9eed8d1d7717897c034fb439a16381a4dc449bc5bcd89
MISC metadata.xml 368 BLAKE2B 3f51a162e0c69485b7fb54960635b24ccb4741cf053ad4ac314f7f45798cc56056a7416e2207b6eb1084dffeb9bed043053eaa2ae5ac3b8d0dec142a47d1fe36 SHA512 269ed8048e3bcf73a693874ab0a6a269fa24169a1a95d9cb5bebad5e87193c443be8883682df973b4a461447ebd6042cdc7a932f81019b0ea53b3da7c566bf82
diff --git a/dev-python/portend/portend-2.6.ebuild b/dev-python/portend/portend-2.6.ebuild
index 4d79fd9e5ec4..3fc08e4c32cd 100644
--- a/dev-python/portend/portend-2.6.ebuild
+++ b/dev-python/portend/portend-2.6.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
inherit distutils-r1
@@ -17,7 +17,6 @@ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="test"
RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
distutils_enable_tests pytest
diff --git a/dev-python/priority/Manifest b/dev-python/priority/Manifest
index d483ac9ac1dc..d17357e4410b 100644
--- a/dev-python/priority/Manifest
+++ b/dev-python/priority/Manifest
@@ -1,4 +1,4 @@
AUX priority-1.3.0-test-timeout.patch 716 BLAKE2B b48691b508a4116c9656acaa3a31871e5c8a66c45d6724506590c95e09eac027969def8198c5bdaa14e50cd77ea105881b7ddb7f36c95665502799f5ea751b6d SHA512 9e809600bc972baf4e1f5366c65db5e5d050bcfd0df23da3d1f75f653a0fdc27f7e4a59e96e13bd42636360653dfdc1de1991e6684e95bfffbf0c4384d7dc550
DIST priority-1.3.0.tar.gz 13827 BLAKE2B 8c100eb44ed42f4f624bfb37dd6f698a3da84812783bd44ba82afef565562379a7677b3cbc9e16c4ea5a5dcc91d0897fa47c341a81bc1875461a72aff328fcff SHA512 cefb13b15e99ef98c37fdd1486466c9e1d7d04b4574cbca1665fde7b7b44cc7d66964bed41184315a9b51bd6f9d0e02bbe113bfa004a754ac270170309b71e0a
-EBUILD priority-1.3.0.ebuild 739 BLAKE2B 5eabd2a7609b67ea7af19064ea64166aef3e79f340b22724b0f16b13968699003554398340e4d6c3f9d7d754a1c954a7e8bc9cd8d95b01069282773a147d248c SHA512 8319d72af73560b1c4d9ab4f835745b39b45a449333963f66c90a94d92a780a50698f7ba5607b8a352742aab611a3706c66aa9bf75406671170aa48cd38fe0d6
+EBUILD priority-1.3.0.ebuild 700 BLAKE2B b3501fe09a8ab77ba6323998c0a74c411d160f2f01a40040a5dacd06d0fac16fb87010bdd6f9490ca9ca5f75ab64073c1e05a69858c5a548b73bbce588db1b29 SHA512 8742397898ecf0cd587d7071805144bb63e9f3f43eb01bbe26c03aeeb0c2af3a1d615c6d5e7159f463957435fb9f8c66b269325f5035389ecfa5946e1d616203
MISC metadata.xml 839 BLAKE2B 2a922ade07ccabbde2eaaeaac310e1c89206f7a6194ea14cd83f53182270edfd2cca4b1d13072d8a4c81c96563ba3b81251626eb777ced188bc9a22a37dcbffb SHA512 fbd62fe6b97e29566a18a29d155b8b08124d5c1561a21ad7aef7daac1a68b75b48b82d3edc612a27888da0d24ecde73b808cb90dfb7fe78ee97adc5fb507b003
diff --git a/dev-python/priority/priority-1.3.0.ebuild b/dev-python/priority/priority-1.3.0.ebuild
index 5720fc1668f2..5ed8bbaa6c9c 100644
--- a/dev-python/priority/priority-1.3.0.ebuild
+++ b/dev-python/priority/priority-1.3.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7,8})
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9})
inherit distutils-r1
@@ -17,7 +17,6 @@ SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
test? ( >=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}] )
"
diff --git a/dev-python/pydns/Manifest b/dev-python/pydns/Manifest
index 5358502d2262..2819c58511fc 100644
--- a/dev-python/pydns/Manifest
+++ b/dev-python/pydns/Manifest
@@ -3,5 +3,5 @@ DIST py3dns-3.2.1.tar.gz 30691 BLAKE2B 336ed91a3bf8b33db258667ac96eba6df361bb2a8
DIST pydns-2.3.6.tar.gz 28220 BLAKE2B 81d48c57bc90641c2e1667a951e3af3dc75dc1055e6f3f7b45e57d66bb1d391fc55ef0fa9fd261821de22c9119564cfc2b5a18f7a9780fe708b676c427824261 SHA512 261598c085c7d9f7adf5ce881814e444cdcf48a946dc17db467268ab6164f6045c204507cc58eff8e6f826b9786715ad2a9e766a72193ac8666969913180954b
EBUILD pydns-2.3.6-r1.ebuild 1203 BLAKE2B 77a25c92f33ad293a92442c2ca1f73679ab8371decc41133b19f575336e031a33497b9010e5e349fb8ecbe46c425b2ddb75b424908d47f535c3f4393cab049a4 SHA512 0a04f978ccca14d006d4acfd6a710ec0036a114838f742615273dfa33dc7cd87c2a5775ce520fc3c8f4c1ab5e422b23012668b1090d95acf24eb0d888dda6fdd
EBUILD pydns-3.1.1.ebuild 851 BLAKE2B 37571b62035bd609f1741a5b44968d0898e9076badd60d71e6b3bbb8364d13171ed0fd5fcdd172d381596cd85d1943bb848f498227ad85e014fc178a2cf9b06b SHA512 261ec06fba2111eb45e63dc2762cb46f459f28f726f582f3b86fa7dddd495f1bbfad303bdfac8a06c878346a2470ce533e665daba2da790641fcc6ef7cbb0086
-EBUILD pydns-3.2.1.ebuild 757 BLAKE2B 4a619e1aca3865dad3f0f61379c5552231e86b998213d990a4f2637833e5594872e9ad1a208f1154125033aa4cfa35cfb74d5f0650c7af68cd9dbf4f85a8019e SHA512 f381d8b3303fed7914ab8a9baf2615822c883dda516ac50360e6c15b55e7273dcc586feef1311b7dfa33175218655c06f4aa4b8373c37ed1a6bfad083b2828b0
+EBUILD pydns-3.2.1.ebuild 756 BLAKE2B c5778de45438146309d7c1f6630db9493972db23d2811c53a703a5b924a77e0ea3c4870303078f93c456623df5dae01344151a3a3c2698ac03cb76c05a527c7b SHA512 bbbd42c42203e03c1410f27ecda618013d35ea2456d80ba441c2ba4059a7346fb7dc180c09204d6d493a6bbc43febd20196c81702b003d70956affabb386a782
MISC metadata.xml 662 BLAKE2B a86ca878eddec2ae971f3fdbda533d9fff639c7619aeb25997bf335de25d0738c9370a1b68d6e6fd8fe5eca6237d124a0fa629c048ba9e1772b42e42a1b0edd8 SHA512 a87cafcd69bb347d9737d97589211360b71181b80caa73c4f117790596f5482e0b3177dc712eb89afb200c7a56669eb8a805f7c3f4974f9527dcaff8c4cbc821
diff --git a/dev-python/pydns/pydns-3.2.1.ebuild b/dev-python/pydns/pydns-3.2.1.ebuild
index eb1339ba6054..a3c44a707996 100644
--- a/dev-python/pydns/pydns-3.2.1.ebuild
+++ b/dev-python/pydns/pydns-3.2.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="CNRI"
SLOT="3"
-KEYWORDS="amd64 ~hppa ~ia64 ~ppc sparc x86"
+KEYWORDS="amd64 hppa ~ia64 ~ppc sparc x86"
IUSE="examples"
# Tests require network access
diff --git a/dev-python/pyhamcrest/Manifest b/dev-python/pyhamcrest/Manifest
index a306db5b8752..5c944a1a042b 100644
--- a/dev-python/pyhamcrest/Manifest
+++ b/dev-python/pyhamcrest/Manifest
@@ -1,3 +1,7 @@
+DIST PyHamcrest-1.10.1.gh.tar.gz 59019 BLAKE2B 1a090533ea8fe2dff9ad232b2e6dbf82841c38f3699e57750e2309b06a46e70ae5a9c7d087baf06de53e17323a5e36edee1a01d7a4442374d15b76a7723c2031 SHA512 f7e79f7d26c4c6add042052e451898bbf5adf21b05a234cc62bce890d68f5997693b042a9daf136f7026040a8ab7bf28b829288417b947973dcb959bf613a37b
DIST PyHamcrest-1.9.0.gh.tar.gz 57650 BLAKE2B c497688f03ec3b072d8ab076fc096a442d5cbbd94493eae57779879ccb6f281477aeeb7f7a67e539442010e60194f9f04a6deddd1d2267e9743742b45433f124 SHA512 3a878637ed5138365416c170871a63640f089047b723c7ec8db893dd716c0b1cdad16a98584700405693b954af7d4868a8543d1a3fc58ded22b493c8c61661b4
-EBUILD pyhamcrest-1.9.0-r1.ebuild 1772 BLAKE2B 5b9c0a8b7184f02f50419cc777236a7133cc14cb33dfcc9189523680520bf5c54542ff4b5d8999f9e94ddb29298dcb73502bab128137f0f6c9097c376fd40606 SHA512 ae150e08377198b9336d81bbf21e5a4ad1e3f444a7cdf67cff1252b820c3ea579ed164bf5019f883c829a28445b1b66eaa6d0dd2335295e26e8284224ae145d0
-MISC metadata.xml 297 BLAKE2B 1d304f6e46130d706190ceaa75f188fba8b3934ebcb42b48d7209f9a9dc67e3561cc2a823b9a591cd58a945161c382698178979e4dacf776178367e43c5519a7 SHA512 999f2517a446b5911d475789246dcb70a08566fba9ecec5f2b69fa29180fdfbb17f4f24b4c87ef71c422814bf7502da2812e5c7938293e96affe721d92e428fd
+DIST PyHamcrest-2.0.2.gh.tar.gz 55491 BLAKE2B 749f227b8cb1180a64e24cdbf97b6f610b9871b21215a761642d19fdd43ad8e175718b12cfb0de2cdb5c6ae8c3c5271e04b7c3b489e01ac689769e24202ece56 SHA512 d6e510ca1e6533b425b424d411e23c4ee2a6bad2d635695e4e68f991fbdc57269c3a433361e431cb5dda7891278951d5de7a05f5c1c167714eecdaf74644d1c8
+EBUILD pyhamcrest-1.10.1.ebuild 905 BLAKE2B 503de3051f8cb82d602a0c193661fa6a6e5d5fac4913e92370504fea9522a80af5fa3c64f2e6ce6a81a0f6b9076bf3ee4a05acdcc1c0fc5cba39527a6b15e519 SHA512 aa475c5f14a7de091b2f3ea7883a7276621a59fd5d85c9447d2165a1b6b7716f9a2e50976ff1cc53e0c9c4568eec2fb937d82b186899d4d8d8331edfda7ecc58
+EBUILD pyhamcrest-1.9.0-r1.ebuild 1732 BLAKE2B 1462d6b579517b98dba0b0cbbba8794586ae6350f389f8c50bea47eaf43d3c34ec59407e6da42aecb4c40e88892236c9ba77dfe47b13c86624643f810f655905 SHA512 604cbaaf356da559abc145c90649ab0ab5e52c6c8fd19852bf8ea57e08c7e3b531580b7a2970681c61cd5159a08b57a82e58518e8a12b16682b688855f1175ce
+EBUILD pyhamcrest-2.0.2.ebuild 754 BLAKE2B 3bcc31478f8459da9dd0eddfd8cc393a17b8444e3cb572a4a78d00fb11b32aeb6209d3abbdc8cba10832290e63601620e37a5b4ef7426666f1876313fa71f624 SHA512 02cf49fc3ec5b4f93e3182008bd16794bc727020fb65809fc06f91cffe692d655689e070d2bd935cbe94441cbf8ead69633a1e9e8186ea1ae40fcad2036771a3
+MISC metadata.xml 372 BLAKE2B 73836583934bf3547c74ffa03d6187a30d71b50e6ad9d7b8c25a5f2fdbd276c735c3d3c39636aaa3e48c84daa0d559ee70621331c211a259148a771a7dc4f9b7 SHA512 7b8e3214627548449a3f0c6d70120978fd2afa5636db2cdfe0bfe71d5a2c46aa33975e29661afd851ce920508559c98d98285265297425b2ca7de043b887ac6f
diff --git a/dev-python/pyhamcrest/metadata.xml b/dev-python/pyhamcrest/metadata.xml
index c9e22b107cd4..bb75201b6495 100644
--- a/dev-python/pyhamcrest/metadata.xml
+++ b/dev-python/pyhamcrest/metadata.xml
@@ -1,7 +1,10 @@
-
+
+ python@gentoo.org
+ Python
+
PyHamcrest
hamcrest/PyHamcrest
diff --git a/dev-python/pyhamcrest/pyhamcrest-1.10.1.ebuild b/dev-python/pyhamcrest/pyhamcrest-1.10.1.ebuild
new file mode 100644
index 000000000000..85ed0b0e2a84
--- /dev/null
+++ b/dev-python/pyhamcrest/pyhamcrest-1.10.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
+
+inherit distutils-r1
+
+MY_PN="PyHamcrest"
+
+DESCRIPTION="Hamcrest framework for matcher objects"
+HOMEPAGE="https://github.com/hamcrest/PyHamcrest"
+SRC_URI="https://github.com/hamcrest/PyHamcrest/archive/V${PV}.tar.gz -> ${MY_PN}-${PV}.gh.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-python/six-1.4[${PYTHON_USEDEP}]"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ )"
+
+distutils_enable_sphinx doc \
+ dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_install_all() {
+ use examples && dodoc -r examples
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild b/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
index 46bbf1b22e5f..6c7080cb324b 100644
--- a/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
+++ b/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
inherit distutils-r1
@@ -21,9 +21,9 @@ IUSE="examples test"
RESTRICT="!test? ( test )"
RDEPEND=">=dev-python/six-1.4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
test? (
+ ${RDEPEND}
>=dev-python/pytest-2.6[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
)"
@@ -50,7 +50,7 @@ python_prepare_all() {
}
python_test() {
- py.test -vv || die "Tests failed under ${EPYTHON}"
+ pytest -vv || die "Tests failed under ${EPYTHON}"
"${EPYTHON}" tests/object_import.py || die "Tests failed under ${EPYTHON}"
}
diff --git a/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild b/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
new file mode 100644
index 000000000000..ec73612b5ef1
--- /dev/null
+++ b/dev-python/pyhamcrest/pyhamcrest-2.0.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+MY_PN="PyHamcrest"
+
+DESCRIPTION="Hamcrest framework for matcher objects"
+HOMEPAGE="https://github.com/hamcrest/PyHamcrest"
+SRC_URI="https://github.com/hamcrest/PyHamcrest/archive/V${PV}.tar.gz -> ${MY_PN}-${PV}.gh.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+distutils_enable_sphinx doc \
+ dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_install_all() {
+ use examples && dodoc -r examples
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index 24e82c6ba4fe..bb3b07743d3e 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,5 +1,5 @@
DIST pyproject2setuppy-4.tar.gz 7947 BLAKE2B 882aaf98c37560c9dff577cd7392830a0fc3a4bb9a1ed774037582c3c9bf2e74d15bc2fcb9fe1eea221dc65b9d0f8f6c9d677fca1a2045214440818712d7802e SHA512 1721ea0ba9bbd579af88543e2487863803eb002ba2eacd7db7b7dfad663a87a1f8248afff92964fedc0d5edffa92929dfb3e613f8ba0ec884ee98e44fb38544d
DIST pyproject2setuppy-5.tar.gz 8314 BLAKE2B 7cb93fc0d427603adb8439d7549c276e8792d5a555f0ed229114e1083e6d741493938fc03507f60eb6bf9809a65d578099a20b1c779d817f396bceea418874ac SHA512 b32d9f5eac6df24c3eb10878c7cf7c2b7945471d2f221877572a98d1b06cd28d3a61ed250e3724619e1afbffe86f02e23452e7eee85bd702c0a64d32e36d0367
EBUILD pyproject2setuppy-4.ebuild 669 BLAKE2B cb4782795a5b614b67f8c8afc14ad8064d3a5d8cb50fc4c17f74669e72add6b00bd8024e5b0c3d24ef2b508f01cc5b53c3a1913e4da80701e3e534fe75b1f254 SHA512 2fec72adbb740c9f25492f53aebcf77d9b71bf36bebdf70b07d55728ec76df9dd12749257a6c54ead26dbd981c138fdc70b5f352dde0e3ca998135b9be3f1a73
-EBUILD pyproject2setuppy-5.ebuild 671 BLAKE2B 6de43af3523276b3fff10a0c4fd488a4ad6d73643f3ae443d66e90f0171730e6247e1d5250596a89dafd43edd955f62a263484f9a7589baf8d1d9da1111c64f4 SHA512 6e55e4f8089353bdb66448c96c4867a3d72ad53adf39978f47896bfaffef7b3716798777d73797d3892a7a429fa2e72237aefa5cfa07eff910fc95a388b18ea9
+EBUILD pyproject2setuppy-5.ebuild 673 BLAKE2B f710e85ba57a344c5b0ff22f7a2173ddfef9267d9ecf508822c765718c75651bba689fbbb85a479662062dc382c4abfb9b478ef441c7c77a0adccd0641a7e4a3 SHA512 a70728a7911c47a4241920c51caee7dec86bd7a1acec16da2cb1023f22e2317601f562daf0a3817f9f95ae809679ae376944e778f0ffe467b6e9bfe1256c8168
MISC metadata.xml 326 BLAKE2B 465cb8f46170cfced4ed1ba3af61210b58fba1c1fe0af7f5f9b5d498f1a32993ff19f860231ac84b5f6661a67cc7837aa8a19b81afc108cd44e5d836f3fb93e3 SHA512 19656915996f8905a7c2ea398da098d5ae704445273471730c82c3bc391d4662a6e7fe8bf9b416ce23d3c171008d93bd6b462fe278c7bef64b304b2e467d894a
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-5.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-5.ebuild
index 563167554f1a..b8ca661b51cc 100644
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-5.ebuild
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-5.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
inherit distutils-r1
diff --git a/dev-python/pyserial/Manifest b/dev-python/pyserial/Manifest
index 337248e246b7..eeac9beb6feb 100644
--- a/dev-python/pyserial/Manifest
+++ b/dev-python/pyserial/Manifest
@@ -1,3 +1,3 @@
DIST pyserial-3.4.tar.gz 151657 BLAKE2B cf47aba4a6f3bb2fe39d99e72907496faa1c9f37857810fef4d826cca72c361d0e43dbc33d9cf2291a589bf0193d17355d149e6eb61b4f9e28250207708ef09a SHA512 d71dffc330704e41caac6054adf192bee2f1c119691faf2ea93fe22e8e3ba000dc4a1434293f6f80d05a5577d85b96791f656e28d5c63fb0ce6a6605467a117f
-EBUILD pyserial-3.4.ebuild 878 BLAKE2B 0ee38020a2985d469f5f36df16c0b2a85b7c0ba7a598d06b8e260bae0a2b5bdebf9c633eafcc2bed32950f2df6aa3ec44988bc79da36d984e3b886ccab34ba5f SHA512 971d7ceb3c61c2f2bf0f620d090cd66603318ba1b2624d951c26a60c0e88abfd8fa19d9cc7029e8329560df942309c5c5f13ab624b31ba526fc0d297a1d5df09
+EBUILD pyserial-3.4.ebuild 877 BLAKE2B 79e180d35c6faa13612fdd628406ea97038917085913c7d04d40b6ffc17aec146ea6393b2088c3270554c876e6a500387d064a63091e9b7c34252db5012d741d SHA512 bcd0559ebdf31bcef7fd26ab43f55fdf42125d5040f51091dead3eff20da8aa229ac1fcd94fc07c76b4524ea11df4a2b323d9b556523cda70b2144003cb54957
MISC metadata.xml 421 BLAKE2B f3c94b0b72c3df17d9c539e8b76e1f644e0b4ae1bb3d905652b568084e449bf11cab07f27e7775031eee857095671debd28bf1d2eb8c1992c6b980620b32109b SHA512 30c1232aed930c665c2603443cbff9efbb843b1866d6a4d034a517e0669f28f1e6e7562103a8badbd8fb1efd9e69b058870b9c4fcea8fa5e74e7a1ec8ba17fde
diff --git a/dev-python/pyserial/pyserial-3.4.ebuild b/dev-python/pyserial/pyserial-3.4.ebuild
index d1032630f810..1e2985aed603 100644
--- a/dev-python/pyserial/pyserial-3.4.ebuild
+++ b/dev-python/pyserial/pyserial-3.4.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
inherit distutils-r1
diff --git a/dev-python/pytest-localserver/Manifest b/dev-python/pytest-localserver/Manifest
index b96ad45f895e..01567ddb0b36 100644
--- a/dev-python/pytest-localserver/Manifest
+++ b/dev-python/pytest-localserver/Manifest
@@ -1,4 +1,4 @@
DIST pytest-localserver-0.5.0.tar.gz 20409 BLAKE2B 62376065ee1aeb698ea5e3bd2d5ea3d6b511cc6793142aad458423513b0e3b358a0d0269a78a0f5aeda44fc53757ff85da786627840ee48cbed8b78ee34c2227 SHA512 aedf1e1c9563396457070df13df228ad0ebdd19173fa2ac5a598288d3e1a1ac8b8a0c0288cba0d8478e43d2e1de4848f2393bf640705916957f12ab31171c6cc
-EBUILD pytest-localserver-0.5.0-r1.ebuild 696 BLAKE2B ec9e091cb470e5f68e0715558dc9b4a8e72177383bc035f857d8db3dd943a0bd4d07dad8644d9709ccafa81f4a046afa5f9441fa719720031c3bb576f26eb293 SHA512 a7f7a38919c362a747a901c0d573b22bb1a817d9b7e0dab0a4d606b48e4ce042dd0cd7b020f85a2493803f809aa8c8b7ffb71e9270e7e5ece1765e47869531a0
-EBUILD pytest-localserver-0.5.0.ebuild 700 BLAKE2B f422f3887fe1273fba570348de89202c24253ff364f90e578501e99916a42b40c45e8973e2cdb93b1451a1c7f12a7a0dfb217d32304aa7e1d68f52c4c7a8a931 SHA512 cb67cabfa431b04ec4c860e17d52559cce2e1f883ac1a5b950d1bad290ffa6553cefa1e67c4cfa5de9719be74b3120fd90fdfa55dd35968394f39ee3700bc816
+EBUILD pytest-localserver-0.5.0-r1.ebuild 698 BLAKE2B 8c3042702366876a2a1b5d44b05ba9a815e6fa846a37fdabe41202d2ba2485f312578038dfb4836beb7e79856c0fa1b4f36017f038bca020c4c11b927f34dc77 SHA512 88f607f2d5842637d5b4d792f532d43cdce4aa8ee1dfcaac1d42cef5e22c66a5f16cbd1285f51b381490b9b9fd64713ddab0cdf6e81e95124390e9b33dfa133a
+EBUILD pytest-localserver-0.5.0.ebuild 702 BLAKE2B fa538a139fbdf71ac64fd8a43c18d91847a7920ccabef95b0bf95445967ede3ec7cccf3e93b208e5ee2d96f1bec0b52d547f9f7ed74fceb68ce8732e50d204c4 SHA512 d5c61a7116cf0a727f2db59d0a4a1a6e20242dea20e724bdf7c7f8b08c0f4eaf56d9701ca53cecd4a5add771dd89aa49cae9f509de4fbd233faed62d97110f41
MISC metadata.xml 321 BLAKE2B 1965ab8ae78a55b07a92b65e39549bee5e4136a133deaf3c510aa52005dd7e97a030ec30779a8d9223048b90c9146513f761d61b30b78e5f772e2ae4b98f1609 SHA512 db2e0fe334587804689d91759326ad5dabf3aad411c9046943562273f89485b1524b0f62173c9bda2daaaab2e0d09309d23896e91b3e2716e36472c87bf5f883
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.5.0-r1.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.5.0-r1.ebuild
index bdee1047cae3..8bf452f00dfa 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.5.0-r1.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.5.0-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
inherit distutils-r1
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
index 2397a128ff90..78b1e4c7523d 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
inherit distutils-r1
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 8fc157577526..556aab491e19 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,4 +1,5 @@
AUX pytest-4.5.0-strip-setuptools_scm.patch 674 BLAKE2B 4eab3e26423d81614223a88a0124dc4f35892b18ecbcce34280a00774012822fced0045ac7113a50f8f88d042b88e404dbf4d8d3760140c66a48daa3da2a44c6 SHA512 d34d7c1db57804f0d1ff71f3f51c9a736592945fdf564f54c0c20c398c86f08616eb21f75d77457a71738df4d254ec3d69e46aa3378dea6f7913933bcdf45c08
+AUX pytest-4.6.10-timeout.patch 1297 BLAKE2B 3a5b4005b1aff72b17a366283e692bca19ebd952ef1d5e10f6c702962cb20a83fec48cce5fb0cc35a8da47df2370e85879bf01b9e95f4c271d2d3241f9ea9545 SHA512 f1d2270644e43dfc2ff31ed900456c5707ea19a83447ab80a4d3013e44db36f726676917156930385547f8a75bdbc8835d46d7e6f3301fd51f187c281a5425b0
DIST pytest-3.10.1.tar.gz 892420 BLAKE2B 38849ae69bf4380bc1a99aa105cac04be078da4460373dfc16fa555238b2830fa2f5ae6c19de8aa2af9ac18d87c5d2705d62f7b2e67e4a62d843f6a28bbd76fd SHA512 30ff79c0fdcbeef68e1191ff400a20428e391717f06957f554b694b94baaaa565dca01346fe989c3e443c4402f3b2bdbd5564f6303a4447f933fb54cba45628f
DIST pytest-4.5.0.tar.gz 943607 BLAKE2B 49a0e91fda7f4231fdd39f90eb2daa344d3034c10faff221330ea0ae7482a2a7d0fb9443a0a264db00f1d92568d5a6005cb73e07d8643b46906f7ecff831adcb SHA512 cbffc6216f83491b1de241058315c116697bfaa5206b5f558192a7f861d43dd036d30d0d689bedae7bdee4f0258dd19ef5827c356e11863dd596a5fabe8249fc
DIST pytest-4.6.10.tar.gz 951516 BLAKE2B f87d00c3d69990f39369ec6af8c4b88d8b7da9bbdc9fcb324243ea2164a501e1b23d1c2a7f92049b58786fc2f1006673a5b5348e2367a8ca476650623c1f67ed SHA512 73668967f6568654cdf92e260ada79d9685fcfc30967499709caeb12527e39a9e886f057c4c73e8a39125c0fbfcd674d905b7023402ce0ab9e836aa77d3888cb
@@ -7,8 +8,8 @@ DIST pytest-5.4.1.tar.gz 1017924 BLAKE2B 2892b06655384c8453963e8444e7c1659f4ce60
DIST pytest-5.4.2.tar.gz 1020640 BLAKE2B e10ce7a2dbc1ff42ffbe02c3a9f72b4c829c5cc80ba9a50ae015d181c03916a807ee2b13d40e0d7590844f67f8b68e926c770d298fd839c3cf24d9daa4b4e1e7 SHA512 c92ffa613a02cee2580d690c24b76f16957082b138cf7c51d277b0fb5098fab2272ab73295e5e368cbd908026130a9185a35f8792054e36b7ade0a05f7f3f192
EBUILD pytest-3.10.1.ebuild 2366 BLAKE2B 7f7617f2d4bb90edbd0350297870c823f7525e2f18d984fe9a12cd8bbcd4dcce461e3a7f43c1d5ba8ecbb90d7606f76f0ecf336d7a0933baa6cff22417aa4efe SHA512 1104eea0003f68645660eebc1b3ca8736cea46f99de40637955169168c1efe07ca90ef8967d31bcb470f5e1aa831ed0b572b9156671bc718dc1da8d18c96a8cb
EBUILD pytest-4.5.0.ebuild 2082 BLAKE2B d2e9edae4f7751ccdbccd6b3c98e77a67aa3aacc77eaec413fd05d1cb65eb6e48c52a181993d8e0cb83ce9d26d23ce4590d398ecddb2c6a72a15ec4d57538ffc SHA512 41dc00468a3b5f16275ced0ff703e9fe53a618a82b8da9e11a0a4a1dc5dc82c1eb666679498e1df1c7ff67540f786e8f419570a93be0d361fbf44678b7dd527b
-EBUILD pytest-4.6.10.ebuild 2440 BLAKE2B 5d350e7a9f7b068566f6549a064b9a0b11bfce84a11c55b215602fc7bfc72334b4a9e7b00297b8cd6fb322b0b44bff1cd3dbd74e020363b239119583a1bde551 SHA512 a6462a384174b1f0dd27613631e6e36f78e1c9c5a2f182a32786d17a4a13cfb982ba3ebda3bc7bd42e98f2502873114eff3103794a477bb4bb438314ba1a291b
+EBUILD pytest-4.6.10.ebuild 2474 BLAKE2B 91ab3acadcc8833e7e9b5414d20e2a55ed054563a8d4642b60065d27e6521e9817ef7d487b96ad4a88cc1ba6c9b2a58b83257a43f731b710555fa857f3ad6a80 SHA512 653f26ab3dab287537285a382b7b35b1e2fcc3383a7b06ba362bf84aaf104083ae047d0563f858470f459c804052081c04c1eadfdbd2a9023ee19927ae79909f
EBUILD pytest-4.6.9.ebuild 2436 BLAKE2B f4bdbba1e7731e8dbfe4294acd1fc9e72d498bdb13c9cfa57c17da5f9d3aa0089caff3e32b6d68b5b66f4b48bd50f4d9310eeedb8502c50fff189ed2edc8c8bc SHA512 b4ead0e0d0d88175ee79b11af0f7e94790e0d82931defd425c71e138fec6008e6d244fa311e86549e11cc5a02c8a3df8ee9f55565a42f26855021c64f3561059
EBUILD pytest-5.4.1.ebuild 1641 BLAKE2B 7e4fbe80e3ad011c67d7260bdef6044d5aa852bce7f4ebee0553c3699919ec69fe9da867cd000041b2cdca7443607c3adaf550e4ee5031cb339541bc56fe1b65 SHA512 c9c0eb717a245e038900b63f8db6929045686cc43df3aef51cd0d134f9e9840b05896ce5f926625eefcadaf336dca0ff7252c9143370e1e4962e3e87717f5f42
-EBUILD pytest-5.4.2.ebuild 1930 BLAKE2B 3f65984aa46947a73c03ab9847f17c533dccf59b908577fc576e38211ee6c0f0c025e27657034c78636c2d1800f49d4d016a8a76f16c6d8f09cbad9f7733a8f4 SHA512 9b1e959d6e251ecd37f1af5c67532262d5d61fec9bc5faa0e58de563a2a0d501ca8465302ba7f5f9c22eb30d70a04fcb5fff7e237545d3f3d9b2531e3222c63e
+EBUILD pytest-5.4.2.ebuild 1929 BLAKE2B e55eaeae20fb8ac31b76082db9c7051f48f24a2ea7aca6bd8deb5ed9e80801354b756988d99e5545d5a5bae73e6e4fef92bb106d72ba38007bb6991c82d2f63a SHA512 0dfa6b66d9a5c7b227099df96a08afbe5f232aba57bd8d598665f2713f136fa20dd2a0cf2cb743f15c4db90112c6a3ea98b54825fb0454921fb5e0a582f81cd3
MISC metadata.xml 333 BLAKE2B 2155c30735de72aace8fe3e88a16c011f3961b4b644d761be31c45094f243f1eeeac1803f5a74219198039dcf1f7474531b2ec814a3ed591c59fd6d9ad5a914a SHA512 c59e04710dd640b2e7bb0214e52b05ec50367d895d057886ae9bf9342312006e7b21f5625e1c4f5d7a9e12a7f7b64a968e5371f8c2c45a8ac8b1c8ca6d39b10b
diff --git a/dev-python/pytest/files/pytest-4.6.10-timeout.patch b/dev-python/pytest/files/pytest-4.6.10-timeout.patch
new file mode 100644
index 000000000000..5bf9bcdbd8f5
--- /dev/null
+++ b/dev-python/pytest/files/pytest-4.6.10-timeout.patch
@@ -0,0 +1,35 @@
+diff --git a/src/_pytest/pytester.py b/src/_pytest/pytester.py
+index f1d739c99..72406b85d 100644
+--- a/src/_pytest/pytester.py
++++ b/src/_pytest/pytester.py
+@@ -1209,7 +1209,7 @@ class Testdir(object):
+ args = self._getpytestargs() + args
+ return self.run(*args, timeout=timeout)
+
+- def spawn_pytest(self, string, expect_timeout=10.0):
++ def spawn_pytest(self, string, expect_timeout=60.0):
+ """Run pytest using pexpect.
+
+ This makes sure to use the right pytest and sets up the temporary
+@@ -1223,7 +1223,7 @@ class Testdir(object):
+ cmd = "%s --basetemp=%s %s" % (invoke, basetemp, string)
+ return self.spawn(cmd, expect_timeout=expect_timeout)
+
+- def spawn(self, cmd, expect_timeout=10.0):
++ def spawn(self, cmd, expect_timeout=60.0):
+ """Run a command using pexpect.
+
+ The pexpect child is returned.
+diff --git a/testing/test_terminal.py b/testing/test_terminal.py
+index 1b2e46c7c..52ba80f46 100644
+--- a/testing/test_terminal.py
++++ b/testing/test_terminal.py
+@@ -138,7 +138,7 @@ class TestTerminal(object):
+ """
+ def test_1():
+ import time
+- time.sleep(20)
++ time.sleep(120)
+ """
+ )
+ child = testdir.spawn_pytest("")
diff --git a/dev-python/pytest/pytest-4.6.10.ebuild b/dev-python/pytest/pytest-4.6.10.ebuild
index 76710136e68b..c8234af1fa7a 100644
--- a/dev-python/pytest/pytest-4.6.10.ebuild
+++ b/dev-python/pytest/pytest-4.6.10.ebuild
@@ -60,6 +60,7 @@ DEPEND="
PATCHES=(
"${FILESDIR}/${PN}-4.5.0-strip-setuptools_scm.patch"
+ "${FILESDIR}/${P}-timeout.patch"
)
python_prepare_all() {
diff --git a/dev-python/pytest/pytest-5.4.2.ebuild b/dev-python/pytest/pytest-5.4.2.ebuild
index b5c05300772f..b33a2dedd9d3 100644
--- a/dev-python/pytest/pytest-5.4.2.ebuild
+++ b/dev-python/pytest/pytest-5.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/pyxattr/Manifest b/dev-python/pyxattr/Manifest
index 28b68cf39666..d9535814a88f 100644
--- a/dev-python/pyxattr/Manifest
+++ b/dev-python/pyxattr/Manifest
@@ -2,5 +2,5 @@ AUX pyxattr-0.6.0-xattr_header.patch 1780 BLAKE2B 43244b281bec7166d539155c66e604
DIST pyxattr-0.6.0.tar.gz 31057 BLAKE2B cf6e99c499dbcc74305970413803e5cf59508e7ee1bf247afe42e576c2dfaf118a374ad6f8721b9d9c482f8be0c222d26b82997dc1ccc79248d5f52b2064ed8d SHA512 c56bf57729b5f8c8e3e19e29fd903b7365c6644abe3dcebf57ffc2f97a1e92d0e22cdc0a967c5abee3a74ba61a2a379e31a1734f45449095bdb7895b8357a9bb
DIST pyxattr-0.7.1.tar.gz 30580 BLAKE2B 748ce0610ebc1a074dee87dffc67a88e1def0ea467f13758d2d85f9f5c37954586d85dfb8ceb1b77f4ef637295d57a153849b00d773e2e79b06902974fe01663 SHA512 093cb3f9b9637194b9737c07da7dde45b3d5083ec16a9209af80d30c86da8f93badff5aada395415be3dd48da73004286e47d0aa0671c95e65b0492d02e86009
EBUILD pyxattr-0.6.0-r1.ebuild 1965 BLAKE2B 57c3eef93b9bbe7d289106f010a7de133cc9dc41262699ce33d02c3ef93a349d21fb58f3fd60e7f6c7cdd4e575d183ee074cd4f21f9e2ca2578c5d9776df1241 SHA512 0aa606e1da1e7adb5ebbaec3224c0d38abaa11c39da1c8937577c3b2ec302a966a8932e74376cf5809b3e52bbfe32039c93466e31b6272363e0b75919d4b7479
-EBUILD pyxattr-0.7.1.ebuild 825 BLAKE2B 32ae1321142853e7c5c33cfe62bd962c3de2ec56e77832490dabc5264b2d75e9d8592a0be64b8fb5f33a8b0328f350c0577fe52cb08fbd6f4018e83f00c1fbef SHA512 22ea2f57d0b5b55e8f6a1d655469c2d644ccea1e1b8b6b02f4a18e67bbf1c191e2bfd431a5f3efb56ac683177e80483c8cd9deab22190f5da446c8d32132fb60
+EBUILD pyxattr-0.7.1.ebuild 824 BLAKE2B c8fb7d37db1934f76961b52187fa258c08b99179ee5c144951066e0d5ac15c119b9058c9c5f22de680110cab6ae6a6276a6a7970f2e8482d81185d9694f2c900 SHA512 0061e5ca98400094f1d340e42c16a65b7c034fb9c7aaf02554126b533a1c82ab52fb24ef1b2a9dd5ecc8fdbc04ec320c1e0fdf40342b123f692565a8217c0a6a
MISC metadata.xml 609 BLAKE2B 8f3429390129e4438c5bb4c8d82ae11e9824863d4b200a57d660d0ae93692711b96c6cbcfd9e7e8ad46848beba86dd2ee971acde59c08c9fc6f317283358157f SHA512 8a18175143b319bf6f623304ad8f534ad34eaf8b67c57ee1addb8886e34d79bd3a74723bce4f66fb5e9e3dad4768aaf253cec8fb8e97365f152d0b8f772d7df6
diff --git a/dev-python/pyxattr/pyxattr-0.7.1.ebuild b/dev-python/pyxattr/pyxattr-0.7.1.ebuild
index 50c185dfb287..7c3ca1076353 100644
--- a/dev-python/pyxattr/pyxattr-0.7.1.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.7.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
inherit distutils-r1
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index fe3527815846..eb9afb7e6aaf 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,3 +1,5 @@
DIST readme_renderer-25.0.tar.gz 24116 BLAKE2B 978fc6cb9d92e35a618af89996abaeecb4611f0351975af44341198dc26ccdba4c0a4e32c126ce22fdbd77ca1d2dba4e11f70ea814a5084c204f4cd53d95f7d2 SHA512 2decdae26c07824c7148b0d49f58fb585fa4e78f06ea97cd7a1fe2fa4ca17601d255eea4b96dcb384c676bc6b671caa0a1bf51615223cd48081ab18da76944a5
-EBUILD readme_renderer-25.0.ebuild 831 BLAKE2B 839277b309b20f4a2bbfb469a5b3ba52ee41a3d8afd3d41ec76d0f6d2b5be71fda6401b9cc6d0a07a247ff483672eb8d97f9e2afdba5a50cbd0d3db29a3679a9 SHA512 2372f304785f38a7ed04d4a0e25132659b36e2d4ea7989fcf9ae0045a1c56a6f8ac2cbee3754bec4fd148c30daf0e0e5af9030774f9de6f70ab2bb6d4a5bce72
+DIST readme_renderer-26.0.tar.gz 27068 BLAKE2B 7a58d550e792ffcbf6fedbdf0464714ac7c7a0395297d165493167947c733a29ff5cc4dd2a346c4276f52ca0516282b3049f28bdc8eb38717d1ff8d03709084c SHA512 a5e7cfa47257fd3ceaf417cc814226b5aef6aacf72ffb2eeed3e6affa4a09aa1f6c752a8c4311910c258d090d94f03e3f5c2603819f5dceb37440c9bfd9090ea
+EBUILD readme_renderer-25.0.ebuild 833 BLAKE2B b6086ea8e3005725db305877461bf23aed9c50f55ce333b6930aeff5763ea3d27cc5fdac9405ede7535af3175da733227ca8b26c7055400bf3663d54628c8684 SHA512 9c663b704b916d931d0ad0da53aee5b083b00b90b597d35d537aae408abe1738dc2bdc20799a1e63c66bd71b20947df954b5665b48881ecfa25290bcc4e8a34d
+EBUILD readme_renderer-26.0.ebuild 819 BLAKE2B 2f019d393d41c720d6e3130f4264e73926653e3176b760fe553c1a7e91ba04ab9c1fe913298c5726e54a9072f744cd7d0a2202e5f855eb81346b925b76519446 SHA512 fef21be967e82121e41d5bfb191d98fd070ac1de29d4dddf3f290f3b9fefb4a7f4a1276283638f64c5dd9d67018d7e76d3c7ab5337460f2c4b0c5b408b11d3d7
MISC metadata.xml 390 BLAKE2B 2a81aedd6207fe28eafb76c0eca7ead7543282f84979e07f3b417a4fb9ed6be27a33e6e41f60c37b649cea7c8bd6977703e596760d44a734a0ba3fa023339bd2 SHA512 8594fa46429779b659f2a382d3a6607bc36476387c17c493cc7b9217c5e8600694f597ba5657e46ab7b1d3a75aabf3c113a538372b9a4db58a4b986c41bd6b7f
diff --git a/dev-python/readme_renderer/readme_renderer-25.0.ebuild b/dev-python/readme_renderer/readme_renderer-25.0.ebuild
index 938626a32565..bba087598141 100644
--- a/dev-python/readme_renderer/readme_renderer-25.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-25.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
inherit distutils-r1
diff --git a/dev-python/readme_renderer/readme_renderer-26.0.ebuild b/dev-python/readme_renderer/readme_renderer-26.0.ebuild
new file mode 100644
index 000000000000..7f0be18898e0
--- /dev/null
+++ b/dev-python/readme_renderer/readme_renderer-26.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
+HOMEPAGE="https://github.com/pypa/readme_renderer https://pypi.org/project/readme_renderer/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~sparc ~x86"
+
+RDEPEND="
+ >=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
+ >=dev-python/docutils-0.13.1[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.5.2[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+DOCS=( README.rst )
+
+distutils_enable_tests pytest
diff --git a/dev-python/readthedocs-sphinx-ext/Manifest b/dev-python/readthedocs-sphinx-ext/Manifest
index 259c2fb99642..9e9f6900ebb5 100644
--- a/dev-python/readthedocs-sphinx-ext/Manifest
+++ b/dev-python/readthedocs-sphinx-ext/Manifest
@@ -1,3 +1,5 @@
DIST readthedocs-sphinx-ext-1.0.3.tar.gz 11589 BLAKE2B 9c6ac1bd3baa2a92cbc67d18f5fd6b3f63ce0fe7cc16832ad23940c7b8d85d88f299c8cba6623d0c2b229cbcc43e43ece926aefa01d6a3055ef9c252ddf68dfd SHA512 571336adbb3f6c9077d2530562f5d72092f8df440b282187fca5aaeb2a9c281aa49bc29423e550905696a200f692ebcea5fe6f83e023f64759224697c49e2f03
+DIST readthedocs-sphinx-ext-1.0.4.tar.gz 11686 BLAKE2B 3c188e52682f8c24633f79b9ec0eed7f06c922989f7578f06e0ede0e3844ca019e1905450df8d12150d05f3a82a1103a0786cb2c60dc3551e3e3097849cdc301 SHA512 52f45c26ae934b44a41073a9e77096ea8ed97f2a36ed1ea9b63084be0af58dcff24c6b729cda7a8b631f9fe5f56822ceabdbbd2e11056b44df18212986cb445a
EBUILD readthedocs-sphinx-ext-1.0.3.ebuild 744 BLAKE2B 5dde443b18bf511655f0223083aca5ad11ebcc97840c336dc0ad3ed31ff416642aac3f2f5ce9322123073cdb96055a3db7ec2ff233cbc26ff82fd57ec0f24e36 SHA512 ec5b906cb67edebec5c0be395a80be33d925e6313f8cd2a2b7c6a2bdbb3e49a2b6ee3510ab9d29d54b0fc8c99122c31dace0af5798c0b15252ee9417703ff67b
+EBUILD readthedocs-sphinx-ext-1.0.4.ebuild 744 BLAKE2B 5dde443b18bf511655f0223083aca5ad11ebcc97840c336dc0ad3ed31ff416642aac3f2f5ce9322123073cdb96055a3db7ec2ff233cbc26ff82fd57ec0f24e36 SHA512 ec5b906cb67edebec5c0be395a80be33d925e6313f8cd2a2b7c6a2bdbb3e49a2b6ee3510ab9d29d54b0fc8c99122c31dace0af5798c0b15252ee9417703ff67b
MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-1.0.4.ebuild b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-1.0.4.ebuild
new file mode 100644
index 000000000000..e8bb844066b9
--- /dev/null
+++ b/dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-1.0.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Code specific for Read the Docs and Sphinx"
+HOMEPAGE="https://github.com/readthedocs/readthedocs-sphinx-ext"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+ >=dev-python/jinja-2.9[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]"
+PDEPEND="
+ dev-python/sphinx[${PYTHON_USEDEP}]"
+BDEPEND="
+ test? ( ${PDEPEND} )"
+
+# unittest should be sufficient but tests are very verbose, so pytest's
+# output capture is most welcome
+distutils_enable_tests pytest
diff --git a/dev-python/requests-toolbelt/Manifest b/dev-python/requests-toolbelt/Manifest
index b7d4a2cb48c9..6a9f7383a2a1 100644
--- a/dev-python/requests-toolbelt/Manifest
+++ b/dev-python/requests-toolbelt/Manifest
@@ -3,5 +3,5 @@ AUX requests-toolbelt-0.9.1-tests-internet.patch 1225 BLAKE2B 54af195690d8ac4754
AUX requests-toolbelt-0.9.1-tests-py2.patch 3100 BLAKE2B 39ecfd8f0bbf2a4d0731c485ada404f405413117e7451d36eefbc4f05b0073f86310e66ad4320e8ce648175aa072306acab551a50a4a516470b0beb4b981124a SHA512 540813a2d69c84d37a4a6ec5b98d2b71693ba34bbf661bb44be69c646d164134702e9fadd341d07085205b476239260167c858983978488553a07bdbf205ba24
AUX requests-toolbelt-0.9.1-tests.patch 5781 BLAKE2B ff7339a1daf0ba2df49914847000f0b8b5ff2d097a59bcb02bcb2b20a885f18223a1da1f44a99d846dcff423239108411c193da5092bbb27fdf50bf211dd59f7 SHA512 86919154164274efe8bceb42eb9fc17524d4e144a541e82bc10692da66e533220cdc7186362d77fd4f3acdc639744cdf5273c2e4e2091eb4d33c1fdc6c631ec5
DIST requests-toolbelt-0.9.1.tar.gz 207286 BLAKE2B 6123677a9abafebddf7dffde2150b2426b5132ebe0c330ff891322ecc3d69232a5b15a0c66e3e1fb4832dc04f5a636a939613fba041e499e9fbca9814f548c7e SHA512 12229928df5df71cb57bc65ef453dc0e4a2bbe190c1579811b2c2823673bd81aeba856b00000fa20b253d0f0fa4fff55ea1e750794ca3785f71c376b1df7fd93
-EBUILD requests-toolbelt-0.9.1.ebuild 1170 BLAKE2B 42885472994e37ed518855c8a52faf80cc4cf16b2ef4fff4aeac76783e5f04a062e16a8169e23c06dc1bb8338bf48120c6f9c2c6fc10cc9148d5a3c057b1dd63 SHA512 0ec1ab6368f1e3b39541be12d0381bda160bb570ddfbfa8b7a8f53761690c69e2547ab68c1dd8a051f5bf35ad7cb742aa9d100741e86d3fafb362690e53d4608
+EBUILD requests-toolbelt-0.9.1.ebuild 1131 BLAKE2B aa0ae04f47f16018084e05107eb6d354c65fc38f82bb2023e6b58cd8d20e6174a912f138652d791495444a9d15d0bafff263569dfb508ba551f4f80cf3c98c15 SHA512 a3243b1502c7a5e2de3b4f294fb3de6d979c033187388059578c293c1352e5a910b1955a5fbaa4e242759752d5178d10c805863a09e188b006359270eb514ff5
MISC metadata.xml 297 BLAKE2B 0dbab9c3d9697a1ac5ab03c7111a1862d977546c23cf42967669a6e3a19eff6e81b2a0701cfc2e11904c220026a5bc7b19934cca17339ab7f9037891ab5b2c8f SHA512 46897583f3474724b466e1d1a6b5e0d4c4d557730ce38c809ac2224d2b1dec3e844c0b66b7b6d9f5e60f82cd51a791c1a3ddf545d9898d70038ea2af183a8691
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
index f6b8f41d9d89..56521569fd3b 100644
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
inherit distutils-r1
@@ -17,7 +17,6 @@ IUSE="test"
RDEPEND="
+Date: Mon, 13 Jan 2020 13:54:08 +0100
+Subject: [PATCH 1/2] CramMD5ClientAuthenticator now specifies the digestmod
+ argument to hmac.HMAC constructor explicitly.
+
+---
+ src/twisted/mail/_cred.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/twisted/mail/_cred.py b/src/twisted/mail/_cred.py
+index 9d3646948..43c406f90 100644
+--- a/src/twisted/mail/_cred.py
++++ b/src/twisted/mail/_cred.py
+@@ -8,6 +8,7 @@ Credential managers for L{twisted.mail}.
+ from __future__ import absolute_import, division
+
+ import hmac
++import hashlib
+
+ from zope.interface import implementer
+
+@@ -28,7 +29,7 @@ class CramMD5ClientAuthenticator:
+
+
+ def challengeResponse(self, secret, chal):
+- response = hmac.HMAC(secret, chal).hexdigest().encode('ascii')
++ response = hmac.HMAC(secret, chal, digestmod = hashlib.md5).hexdigest().encode('ascii')
+ return self.user + b' ' + response
+
+
+--
+2.26.2
+
+From 694bc67f3cf7d36a6f512f0b76882e85d0966dd2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Poisson?=
+Date: Sun, 17 Nov 2019 19:48:53 +0100
+Subject: [PATCH 2/2] Fix parsing of namespaced attributes with Python 3.8 in
+ twisted.words.xish.domish.ExpatElementStream
+
+---
+ src/twisted/words/newsfragments/9730.bugfix | 1 +
+ src/twisted/words/test/test_domish.py | 17 +++++++++++++++++
+ src/twisted/words/xish/domish.py | 11 +++++++++--
+ 3 files changed, 27 insertions(+), 2 deletions(-)
+ create mode 100644 src/twisted/words/newsfragments/9730.bugfix
+
+diff --git a/src/twisted/words/newsfragments/9730.bugfix b/src/twisted/words/newsfragments/9730.bugfix
+new file mode 100644
+index 000000000..5c91305c8
+--- /dev/null
++++ b/src/twisted/words/newsfragments/9730.bugfix
+@@ -0,0 +1 @@
++Fixed parsing of streams with Python 3.8 when there are spaces in namespaces or namespaced attributes in twisted.words.xish.domish.ExpatElementStream
+diff --git a/src/twisted/words/test/test_domish.py b/src/twisted/words/test/test_domish.py
+index a8f8fa76b..cd16e3a4d 100644
+--- a/src/twisted/words/test/test_domish.py
++++ b/src/twisted/words/test/test_domish.py
+@@ -350,6 +350,23 @@ class DomishStreamTestsMixin:
+ self.elements[0].attributes, {(" bar baz ", "baz"): "quux"})
+
+
++ def test_attributesWithNamespaces(self):
++ """
++ Attributes with namespace are parsed without Exception.
++ (https://twistedmatrix.com/trac/ticket/9730 regression test)
++ """
++
++ xml = b"""
++ test
++ """
++
++ # with Python 3.8 and without #9730 fix, the following error would
++ # happen at next line:
++ # ``RuntimeError: dictionary keys changed during iteration``
++ self.stream.parse(xml)
++ self.assertEqual(self.elements[0].uri, "http://example.org")
++
++
+ def testChildPrefix(self):
+ xml = b""
+
+diff --git a/src/twisted/words/xish/domish.py b/src/twisted/words/xish/domish.py
+index 2063c410a..fc49285f5 100644
+--- a/src/twisted/words/xish/domish.py
++++ b/src/twisted/words/xish/domish.py
+@@ -807,11 +807,18 @@ class ExpatElementStream:
+ qname = ('', name)
+
+ # Process attributes
++ newAttrs = {}
++ toDelete = []
+ for k, v in attrs.items():
+ if " " in k:
+ aqname = k.rsplit(" ", 1)
+- attrs[(aqname[0], aqname[1])] = v
+- del attrs[k]
++ newAttrs[(aqname[0], aqname[1])] = v
++ toDelete.append(k)
++
++ attrs.update(newAttrs)
++
++ for k in toDelete:
++ del attrs[k]
+
+ # Construct the new element
+ e = Element(qname, self.defaultNsStack[-1], attrs, self.localPrefixes)
+--
+2.26.2
+
diff --git a/dev-python/twisted/files/twisted-19.10.0-py39-b64.patch b/dev-python/twisted/files/twisted-19.10.0-py39-b64.patch
new file mode 100644
index 000000000000..f67d6240558a
--- /dev/null
+++ b/dev-python/twisted/files/twisted-19.10.0-py39-b64.patch
@@ -0,0 +1,165 @@
+From f56133a2e0d7ddf9ee6e43bf9e1d62e970cb0b3a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
+Date: Wed, 27 May 2020 13:23:37 +0200
+Subject: [PATCH] Replace base64.*string() functions to fix py3.9 support
+
+Replace base64.decodestring() and .encodestring() functions as they
+were deprecated since Python 3.1 in favor of (equivalent) .decodebytes()
+and .encodebytes(), and were eventually removed in Python 3.9.
+
+While at it, replace most of their uses with base64.b64encode()
+and .b64decode() that are preferable to the former wrt ticket #6446,
+and they do not introduce line breaks that the twisted code usually
+discarded.
+
+Use .decodebytes() and .encodebytes() in DirDBM as it seems to rely
+on the exact presence of newlines, and changing that would break
+backwards compatibility.
+
+Fixes: ticket:6446
+Fixes: ticket:9831
+---
+ src/twisted/conch/scripts/tkconch.py | 2 +-
+ src/twisted/conch/test/test_keys.py | 2 +-
+ src/twisted/mail/pop3.py | 4 ++--
+ src/twisted/mail/test/test_pop3.py | 4 ++--
+ src/twisted/persisted/dirdbm.py | 10 ++++++++--
+ src/twisted/web/http.py | 2 +-
+ src/twisted/web/test/test_http.py | 6 +++---
+ 14 files changed, 18 insertions(+), 12 deletions(-)
+
+diff --git a/src/twisted/conch/scripts/tkconch.py b/src/twisted/conch/scripts/tkconch.py
+index 9c48e8a7f..5e007ebdc 100644
+--- a/src/twisted/conch/scripts/tkconch.py
++++ b/src/twisted/conch/scripts/tkconch.py
+@@ -409,7 +409,7 @@ class SSHClientTransport(transport.SSHClientTransport):
+ "known hosts.\r\n" %
+ (khHost, {b'ssh-dss':'DSA', b'ssh-rsa':'RSA'}[keyType]))
+ with open(os.path.expanduser('~/.ssh/known_hosts'), 'a') as known_hosts:
+- encodedKey = base64.encodestring(pubKey).replace(b'\n', b'')
++ encodedKey = base64.b64encode(pubKey)
+ known_hosts.write('\n%s %s %s' % (khHost, keyType, encodedKey))
+ except:
+ log.deferr()
+diff --git a/src/twisted/conch/test/test_keys.py b/src/twisted/conch/test/test_keys.py
+index 41e49f415..795e7b8d7 100644
+--- a/src/twisted/conch/test/test_keys.py
++++ b/src/twisted/conch/test/test_keys.py
+@@ -352,7 +352,7 @@ SUrCyZXsNh6VXwjs3gKQ
+
+ self.assertRaises(
+ keys.BadKeyError,
+- keys.Key.fromString, data=b'{' + base64.encodestring(sexp) + b'}',
++ keys.Key.fromString, data=b'{' + base64.b64encode(sexp) + b'}',
+ )
+
+
+diff --git a/src/twisted/mail/pop3.py b/src/twisted/mail/pop3.py
+index ffe9714c9..057389e3a 100644
+--- a/src/twisted/mail/pop3.py
++++ b/src/twisted/mail/pop3.py
+@@ -728,7 +728,7 @@ class POP3(basic.LineOnlyReceiver, policies.TimeoutMixin):
+ self._auth = auth()
+ chal = self._auth.getChallenge()
+
+- self.sendLine(b'+ ' + base64.encodestring(chal).rstrip(b'\n'))
++ self.sendLine(b'+ ' + base64.b64encode(chal))
+ self.state = 'AUTH'
+
+
+@@ -747,7 +747,7 @@ class POP3(basic.LineOnlyReceiver, policies.TimeoutMixin):
+ """
+ self.state = "COMMAND"
+ try:
+- parts = base64.decodestring(line).split(None, 1)
++ parts = base64.b64decode(line).split(None, 1)
+ except binascii.Error:
+ self.failResponse(b"Invalid BASE64 encoding")
+ else:
+diff --git a/src/twisted/mail/test/test_pop3.py b/src/twisted/mail/test/test_pop3.py
+index ea513487c..36780d9c9 100644
+--- a/src/twisted/mail/test/test_pop3.py
++++ b/src/twisted/mail/test/test_pop3.py
+@@ -1097,12 +1097,12 @@ class SASLTests(unittest.TestCase):
+
+ p.lineReceived(b"AUTH CRAM-MD5")
+ chal = s.getvalue().splitlines()[-1][2:]
+- chal = base64.decodestring(chal)
++ chal = base64.b64decode(chal)
+ response = hmac.HMAC(b'testpassword', chal,
+ digestmod=md5).hexdigest().encode("ascii")
+
+ p.lineReceived(
+- base64.encodestring(b'testuser ' + response).rstrip(b'\n'))
++ base64.b64encode(b'testuser ' + response))
+ self.assertTrue(p.mbox)
+ self.assertTrue(s.getvalue().splitlines()[-1].find(b"+OK") >= 0)
+ p.connectionLost(failure.Failure(Exception("Test harness disconnect")))
+diff --git a/src/twisted/persisted/dirdbm.py b/src/twisted/persisted/dirdbm.py
+index f97c526d0..d9f29cce2 100644
+--- a/src/twisted/persisted/dirdbm.py
++++ b/src/twisted/persisted/dirdbm.py
+@@ -81,14 +81,20 @@ class DirDBM:
+ Encode a key so it can be used as a filename.
+ """
+ # NOTE: '_' is NOT in the base64 alphabet!
+- return base64.encodestring(k).replace(b'\n', b'_').replace(b"/", b"-")
++ try:
++ return base64.encodebytes(k).replace(b'\n', b'_').replace(b"/", b"-")
++ except AttributeError:
++ return base64.encodestring(k).replace(b'\n', b'_').replace(b"/", b"-")
+
+
+ def _decode(self, k):
+ """
+ Decode a filename to get the key.
+ """
+- return base64.decodestring(k.replace(b'_', b'\n').replace(b"-", b"/"))
++ try:
++ return base64.decodebytes(k.replace(b'_', b'\n').replace(b"-", b"/"))
++ except AttributeError:
++ return base64.decodestring(k.replace(b'_', b'\n').replace(b"-", b"/"))
+
+
+ def _readFile(self, path):
+diff --git a/src/twisted/web/http.py b/src/twisted/web/http.py
+index fe88d3373..602a58f31 100644
+--- a/src/twisted/web/http.py
++++ b/src/twisted/web/http.py
+@@ -1540,7 +1540,7 @@ class Request:
+ bas, upw = authh.split()
+ if bas.lower() != b"basic":
+ raise ValueError()
+- upw = base64.decodestring(upw)
++ upw = base64.b64decode(upw)
+ self.user, self.password = upw.split(b':', 1)
+ except (binascii.Error, ValueError):
+ self.user = self.password = ""
+diff --git a/src/twisted/web/test/test_http.py b/src/twisted/web/test/test_http.py
+index 6001d1e40..70065e232 100644
+--- a/src/twisted/web/test/test_http.py
++++ b/src/twisted/web/test/test_http.py
+@@ -1513,7 +1513,7 @@ class ParsingTests(unittest.TestCase):
+ requests.append(self)
+
+ for u, p in [(b"foo", b"bar"), (b"hello", b"there:z")]:
+- s = base64.encodestring(b":".join((u, p))).strip()
++ s = base64.b64encode(b":".join((u, p)))
+ f = b"GET / HTTP/1.0\nAuthorization: Basic " + s + b"\n\n"
+ self.runRequest(f, Request, 0)
+ req = requests.pop()
+@@ -2139,9 +2139,9 @@ Hello,
+
+ u = b"foo"
+ p = b"bar"
+- s = base64.encodestring(b":".join((u, p))).strip()
++ s = base64.b64encode(b":".join((u, p)))
+ f = b"GET / HTTP/1.0\nAuthorization: Basic " + s + b"\n\n"
+- self.patch(base64, 'decodestring', lambda x: [])
++ self.patch(base64, 'b64decode', lambda x: [])
+ self.runRequest(f, Request, 0)
+ req = requests.pop()
+ self.assertEqual(('', ''), req.credentials)
+--
+2.26.2
+
diff --git a/dev-python/twisted/files/twisted-20.3.0-py39-b64.patch b/dev-python/twisted/files/twisted-20.3.0-py39-b64.patch
new file mode 100644
index 000000000000..f475614df408
--- /dev/null
+++ b/dev-python/twisted/files/twisted-20.3.0-py39-b64.patch
@@ -0,0 +1,158 @@
+From f44c2ff111a8961d295409186cc07aaf414c76bc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
+Date: Wed, 27 May 2020 13:23:37 +0200
+Subject: [PATCH 1/4] Replace base64.*string() functions to fix py3.9 support
+
+Replace base64.decodestring() and .encodestring() functions as they
+were deprecated since Python 3.1 in favor of (equivalent) .decodebytes()
+and .encodebytes(), and were eventually removed in Python 3.9.
+
+While at it, replace most of their uses with base64.b64encode()
+and .b64decode() that are preferable to the former wrt ticket #6446,
+and they do not introduce line breaks that the twisted code usually
+discarded.
+
+Use .decodebytes() and .encodebytes() in DirDBM as it seems to rely
+on the exact presence of newlines, and changing that would break
+backwards compatibility.
+
+Fixes: ticket:6446
+Fixes: ticket:9831
+---
+ src/twisted/conch/scripts/tkconch.py | 2 +-
+ src/twisted/conch/test/test_keys.py | 2 +-
+ src/twisted/mail/pop3.py | 4 ++--
+ src/twisted/mail/test/test_pop3.py | 4 ++--
+ src/twisted/persisted/dirdbm.py | 4 ++--
+ src/twisted/web/http.py | 2 +-
+ src/twisted/web/test/test_http.py | 6 +++---
+ 14 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/src/twisted/conch/scripts/tkconch.py b/src/twisted/conch/scripts/tkconch.py
+index a662cabc8..744734343 100644
+--- a/src/twisted/conch/scripts/tkconch.py
++++ b/src/twisted/conch/scripts/tkconch.py
+@@ -412,7 +412,7 @@ class SSHClientTransport(transport.SSHClientTransport):
+ "known hosts.\r\n" %
+ (khHost, {b'ssh-dss':'DSA', b'ssh-rsa':'RSA'}[keyType]))
+ with open(os.path.expanduser('~/.ssh/known_hosts'), 'a') as known_hosts:
+- encodedKey = base64.encodestring(pubKey).replace(b'\n', b'')
++ encodedKey = base64.b64encode(pubKey)
+ known_hosts.write('\n%s %s %s' % (khHost, keyType, encodedKey))
+ except:
+ log.deferr()
+diff --git a/src/twisted/conch/test/test_keys.py b/src/twisted/conch/test/test_keys.py
+index 650a19bfb..f76cbd1b4 100644
+--- a/src/twisted/conch/test/test_keys.py
++++ b/src/twisted/conch/test/test_keys.py
+@@ -404,7 +404,7 @@ SUrCyZXsNh6VXwjs3gKQ
+
+ self.assertRaises(
+ keys.BadKeyError,
+- keys.Key.fromString, data=b'{' + base64.encodestring(sexp) + b'}',
++ keys.Key.fromString, data=b'{' + base64.b64encode(sexp) + b'}',
+ )
+
+
+diff --git a/src/twisted/mail/pop3.py b/src/twisted/mail/pop3.py
+index ffe9714c9..057389e3a 100644
+--- a/src/twisted/mail/pop3.py
++++ b/src/twisted/mail/pop3.py
+@@ -728,7 +728,7 @@ class POP3(basic.LineOnlyReceiver, policies.TimeoutMixin):
+ self._auth = auth()
+ chal = self._auth.getChallenge()
+
+- self.sendLine(b'+ ' + base64.encodestring(chal).rstrip(b'\n'))
++ self.sendLine(b'+ ' + base64.b64encode(chal))
+ self.state = 'AUTH'
+
+
+@@ -747,7 +747,7 @@ class POP3(basic.LineOnlyReceiver, policies.TimeoutMixin):
+ """
+ self.state = "COMMAND"
+ try:
+- parts = base64.decodestring(line).split(None, 1)
++ parts = base64.b64decode(line).split(None, 1)
+ except binascii.Error:
+ self.failResponse(b"Invalid BASE64 encoding")
+ else:
+diff --git a/src/twisted/mail/test/test_pop3.py b/src/twisted/mail/test/test_pop3.py
+index f7fbfaf1e..af335ab2d 100644
+--- a/src/twisted/mail/test/test_pop3.py
++++ b/src/twisted/mail/test/test_pop3.py
+@@ -1096,12 +1096,12 @@ class SASLTests(unittest.TestCase):
+
+ p.lineReceived(b"AUTH CRAM-MD5")
+ chal = s.getvalue().splitlines()[-1][2:]
+- chal = base64.decodestring(chal)
++ chal = base64.b64decode(chal)
+ response = hmac.HMAC(b'testpassword', chal,
+ digestmod=md5).hexdigest().encode("ascii")
+
+ p.lineReceived(
+- base64.encodestring(b'testuser ' + response).rstrip(b'\n'))
++ base64.b64encode(b'testuser ' + response))
+ self.assertTrue(p.mbox)
+ self.assertTrue(s.getvalue().splitlines()[-1].find(b"+OK") >= 0)
+ p.connectionLost(failure.Failure(Exception("Test harness disconnect")))
+diff --git a/src/twisted/persisted/dirdbm.py b/src/twisted/persisted/dirdbm.py
+index 3ba7a59d4..7659ff765 100644
+--- a/src/twisted/persisted/dirdbm.py
++++ b/src/twisted/persisted/dirdbm.py
+@@ -77,14 +77,14 @@ class DirDBM:
+ Encode a key so it can be used as a filename.
+ """
+ # NOTE: '_' is NOT in the base64 alphabet!
+- return base64.encodestring(k).replace(b'\n', b'_').replace(b"/", b"-")
++ return base64.encodebytes(k).replace(b'\n', b'_').replace(b"/", b"-")
+
+
+ def _decode(self, k):
+ """
+ Decode a filename to get the key.
+ """
+- return base64.decodestring(k.replace(b'_', b'\n').replace(b"-", b"/"))
++ return base64.decodebytes(k.replace(b'_', b'\n').replace(b"-", b"/"))
+
+
+ def _readFile(self, path):
+diff --git a/src/twisted/web/http.py b/src/twisted/web/http.py
+index 0e115741e..e9a080d21 100644
+--- a/src/twisted/web/http.py
++++ b/src/twisted/web/http.py
+@@ -1544,7 +1544,7 @@ class Request:
+ bas, upw = authh.split()
+ if bas.lower() != b"basic":
+ raise ValueError()
+- upw = base64.decodestring(upw)
++ upw = base64.b64decode(upw)
+ self.user, self.password = upw.split(b':', 1)
+ except (binascii.Error, ValueError):
+ self.user = self.password = b''
+diff --git a/src/twisted/web/test/test_http.py b/src/twisted/web/test/test_http.py
+index 112e56f46..02a4674a7 100644
+--- a/src/twisted/web/test/test_http.py
++++ b/src/twisted/web/test/test_http.py
+@@ -1604,7 +1604,7 @@ class ParsingTests(unittest.TestCase):
+ requests.append(self)
+
+ for u, p in [(b"foo", b"bar"), (b"hello", b"there:z")]:
+- s = base64.encodestring(b":".join((u, p))).strip()
++ s = base64.b64encode(b":".join((u, p)))
+ f = b"GET / HTTP/1.0\nAuthorization: Basic " + s + b"\n\n"
+ self.runRequest(f, Request, 0)
+ req = requests.pop()
+@@ -2209,9 +2209,9 @@ Hello,
+
+ u = b"foo"
+ p = b"bar"
+- s = base64.encodestring(b":".join((u, p))).strip()
++ s = base64.b64encode(b":".join((u, p)))
+ f = b"GET / HTTP/1.0\nAuthorization: Basic " + s + b"\n\n"
+- self.patch(base64, 'decodestring', lambda x: [])
++ self.patch(base64, 'b64decode', lambda x: [])
+ self.runRequest(f, Request, 0)
+ req = requests.pop()
+ self.assertEqual((b'', b''), req.credentials)
+--
+2.26.2
diff --git a/dev-python/twisted/files/twisted-20.3.0-py39-combined.patch b/dev-python/twisted/files/twisted-20.3.0-py39-combined.patch
new file mode 100644
index 000000000000..0ed1f7b8d9c6
--- /dev/null
+++ b/dev-python/twisted/files/twisted-20.3.0-py39-combined.patch
@@ -0,0 +1,115 @@
+From 2d30860a8b71e90513ead9958f5dd312802b0d36 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
+Date: Wed, 27 May 2020 14:40:53 +0200
+Subject: [PATCH 2/4] Fix imap4-utf-7 codec lookup function for Python 3.9
+
+Python 3.9 normalizes the codec name into 'imap4_utf_7' rather than
+'imap4-utf-7', and therefore the lookup function needs to account
+for the former name. Transform the latter locally to preserve support
+for all Python versions.
+
+Fixes: ticket: 9832
+---
+ src/twisted/mail/imap4.py | 2 +-
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/twisted/mail/imap4.py b/src/twisted/mail/imap4.py
+index 736ef111d..3f32982ca 100644
+--- a/src/twisted/mail/imap4.py
++++ b/src/twisted/mail/imap4.py
+@@ -6369,7 +6369,7 @@ _codecInfo = codecs.CodecInfo(encoder, decoder, StreamReader, StreamWriter)
+
+
+ def imap4_utf_7(name):
+- if name == 'imap4-utf-7':
++ if name.replace('-', '_') == 'imap4_utf_7':
+ return _codecInfo
+
+ codecs.register(imap4_utf_7)
+--
+2.26.2
+
+From daf928bf0f0371816dddbd4929948c4213d0cdcb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
+Date: Wed, 27 May 2020 15:12:54 +0200
+Subject: [PATCH 3/4] Fix verifyCryptedPassword() for crypt.crypt() throwing in
+ py3.9
+
+In Python 3.9, the crypt.crypt() function may throw an exception
+if the underlying crypt() function fails. Update
+verifyCryptedPassword() to account for that, and preserve the existing
+behavior of returning False in that case.
+
+Fixes: ticket:9833
+---
+ src/twisted/conch/checkers.py | 5 ++++-
+ src/twisted/plugins/cred_unix.py | 5 ++++-
+ 4 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/twisted/conch/checkers.py b/src/twisted/conch/checkers.py
+index 917567a39..e4e327b16 100644
+--- a/src/twisted/conch/checkers.py
++++ b/src/twisted/conch/checkers.py
+@@ -53,7 +53,10 @@ def verifyCryptedPassword(crypted, pw):
+
+ @rtype: L{bool}
+ """
+- return crypt.crypt(pw, crypted) == crypted
++ try:
++ return crypt.crypt(pw, crypted) == crypted
++ except OSError:
++ return False
+
+
+
+diff --git a/src/twisted/plugins/cred_unix.py b/src/twisted/plugins/cred_unix.py
+index 211b4ccbc..a662719b6 100644
+--- a/src/twisted/plugins/cred_unix.py
++++ b/src/twisted/plugins/cred_unix.py
+@@ -43,7 +43,10 @@ def verifyCryptedPassword(crypted, pw):
+ pw = pw.decode('utf-8')
+ if not isinstance(crypted, StringType):
+ crypted = crypted.decode('utf-8')
+- return crypt.crypt(pw, crypted) == crypted
++ try:
++ return crypt.crypt(pw, crypted) == crypted
++ except OSError:
++ return False
+
+
+
+--
+2.26.2
+
+From 4fc435df0d1eba3e5d6416a2b86d39d3404f82fe Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?=
+Date: Wed, 27 May 2020 15:37:10 +0200
+Subject: [PATCH 4/4] Use xml.etree.ElementTree instead of deprecated
+ cElementTree
+
+The xml.etree.cElementTree is deprecated, and has been removed in Python
+3.9. At the same time, xml.etree.ElementTree has already been using
+cElementTree implicitly since Python 3.3. Update test_flatten to use
+the latter to provide compatibility with newer Python versions.
+
+Fixes: ticket:9834
+---
+ src/twisted/web/test/test_flatten.py | 2 +-
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
+index 677401c55..61d50e20a 100644
+--- a/src/twisted/web/test/test_flatten.py
++++ b/src/twisted/web/test/test_flatten.py
+@@ -9,7 +9,7 @@ L{twisted.web._flatten}.
+ import sys
+ import traceback
+
+-from xml.etree.cElementTree import XML
++from xml.etree.ElementTree import XML
+
+ from collections import OrderedDict
+
+--
+2.26.2
+
diff --git a/dev-python/twisted/twisted-19.10.0.ebuild b/dev-python/twisted/twisted-19.10.0.ebuild
index 53a20c32ca01..720e3b98f647 100644
--- a/dev-python/twisted/twisted-19.10.0.ebuild
+++ b/dev-python/twisted/twisted-19.10.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
PYTHON_REQ_USE="threads(+)"
inherit distutils-r1 virtualx
@@ -17,6 +17,7 @@ HOMEPAGE="https://www.twistedmatrix.com/trac/"
SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN}"
SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
+S=${WORKDIR}/${TWISTED_P}
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
@@ -79,9 +80,15 @@ DEPEND="
)
"
-S=${WORKDIR}/${TWISTED_P}
-
python_prepare_all() {
+ local PATCHES=(
+ "${FILESDIR}"/${P}-py38.patch
+ "${FILESDIR}"/twisted-19.10.0-py38-cgi.patch
+ "${FILESDIR}"/twisted-20.3.0-py38-hmac.patch
+ "${FILESDIR}"/twisted-19.10.0-py39-b64.patch
+ "${FILESDIR}"/twisted-20.3.0-py39-combined.patch
+ )
+
# upstream test for making releases; not very useful and requires
# sphinx (including on py2)
rm src/twisted/python/test/test_release.py || die
diff --git a/dev-python/twisted/twisted-20.3.0.ebuild b/dev-python/twisted/twisted-20.3.0.ebuild
index 47624031dc76..3ee3d08b812a 100644
--- a/dev-python/twisted/twisted-20.3.0.ebuild
+++ b/dev-python/twisted/twisted-20.3.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
PYTHON_REQ_USE="threads(+)"
inherit distutils-r1 virtualx
@@ -84,6 +84,8 @@ python_prepare_all() {
local PATCHES=(
"${FILESDIR}"/twisted-20.3.0-py38-cgi.patch
"${FILESDIR}"/twisted-20.3.0-py38-hmac.patch
+ "${FILESDIR}"/twisted-20.3.0-py39-b64.patch
+ "${FILESDIR}"/twisted-20.3.0-py39-combined.patch
)
# upstream test for making releases; not very useful and requires
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 5ab0c2d3edcc..16134f42e692 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -3,5 +3,5 @@ DIST urllib3-1.25.8.tar.gz 261077 BLAKE2B 9625c8bce484e3a0ae8b49a776377d5420a496
DIST urllib3-1.25.9.tar.gz 254921 BLAKE2B bd78d7a1de71ffe3b1f62352bb49f94fd402870f57e86ae07ea5462706c19b0ae1f8e23a7e8a4a83482b57e007cb95f5ae242d179cec7e9568fcb440b9d95b82 SHA512 505f1d9137e469a48ee0de417f2be36946cf1d9bbcf1233280be399a6c6d8650b5b3c6cfcf884b04e0156974da703f48843381b9aab377738a2e60f7d2d3799b
EBUILD urllib3-1.24.2.ebuild 1786 BLAKE2B 3c413607941e08872efa7f4f598e69d6a858adea7505b183ae2efeb7bf418edf8b06fbd04d0f3aa640a50f9ee18616f8b5186f382fb8fc6f250a667348c7d088 SHA512 4f217cb09fc22adb26371a336d42c274be4ca2aa1e8ea5404b8ac97f573b7d7f6c577b8e12a5f9281e1df39e4967614c8f9d9aa626c3544bef20c86053f1a95e
EBUILD urllib3-1.25.8.ebuild 2536 BLAKE2B 1a5167611d39195efd2367a47f709e4e0350f879a27f90ef4ede33fc5c167aabd1b3cfca4e24177649e2a1b12cbb1924860d2ee930bc683d581dd3d857d7be3f SHA512 c257bc9443f3f5464c5d33a79cace27e9305bfbc2b1c2e374a46613cd5d926acf24b298bb79b4fe55a30ea816f6b41f8f9fd3b16fbe129b96e48e45e8ec2af4e
-EBUILD urllib3-1.25.9.ebuild 2166 BLAKE2B d918443a58279ce1574e3db4d122faac53e4b536cd4da9d28dfa17573412db56678841aad75ea843521e5ee67d75f1295f52cc433e52825f9f7b2dcd67953d48 SHA512 f93df055166559b3efe38988a7fd7a5d3e4db9f7334d09a5ef0e96156de9e4a15cc39e8d10a1694ead6e5cd56a8bc15bf9bf159d5e2683f6b4b9cbff9a083c22
+EBUILD urllib3-1.25.9.ebuild 2108 BLAKE2B baf4fc80008da78cbecfdbd23bf43eda778c04df3aa4b833c8da23505a1e01ce2844e719c917715ac5c2ec5f9fdee8120cc25fd4c32e81da745489fd05a431c1 SHA512 56e0175d192771e81513167872a0df697ed6fab1ffad6447e6ec11659656b3d2052e117290c829a2202d7839c439cfa1a0792c2cfb27bea0dd410e859cc2165b
MISC metadata.xml 523 BLAKE2B b5104cb8130aa670af99f36a2853f4ccbe78f367d5e80a3626a5323237af5f7da1ba6fa5d83586afa1072753f63d918197aa97a578f7e2f1faa82f457c7947a9 SHA512 3c384cd1d75e038ba7b7d3aee93f2f9cc05b61710cd6f45f2f250392994caa253b6c783ce5f321dc72a94e1e94e12527a229d652920492637dfca4eb7b13c457
diff --git a/dev-python/urllib3/urllib3-1.25.9.ebuild b/dev-python/urllib3/urllib3-1.25.9.ebuild
index 3b908729ee89..a3c2ed92451e 100644
--- a/dev-python/urllib3/urllib3-1.25.9.ebuild
+++ b/dev-python/urllib3/urllib3-1.25.9.ebuild
@@ -39,7 +39,7 @@ BDEPEND="
dev-python/pytest[\${PYTHON_USEDEP}]
>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
- " python3_{6,7,8})
+ " python3_{6,7,8,9})
)
"
@@ -69,9 +69,6 @@ python_test() {
ewarn "of circular dependencies for Python 2 removal. Please test"
ewarn "manually in a virtualenv."
;;
- python3.9)
- einfo "Tests not yet ported to py3.9"
- ;;
python3*)
pytest -vv || die "Tests fail with ${EPYTHON}"
;;
diff --git a/dev-python/webtest/Manifest b/dev-python/webtest/Manifest
index b8b40b65a9ac..93275781d617 100644
--- a/dev-python/webtest/Manifest
+++ b/dev-python/webtest/Manifest
@@ -1,4 +1,6 @@
AUX webtest-2.0.33-no-pylons-theme.patch 1556 BLAKE2B e108d05467d87aa0dcc50e8a9fcb8032eeabdf6801d5a66fa9cbe6f51b6dd4539c71b4ff1cf0ef39edfee689e51a6e67e30e473fffa8f2db9225ff23e3b4619b SHA512 6423cc275c2774b07819079d8fe8478cf2b322c16860b600dbd039480a8883252046a6c9fc2136ec4ff54a8adbfceeb3a8ee4a7e43faea17ec588f42a5eafd5e
DIST WebTest-2.0.33.tar.gz 76081 BLAKE2B 6c06d7cf6573282342ac190fe2365d041679fd9a75571a525cf0214f22a0631d5f97e94261090d9c2a372f77b005d22be5976f612c27c6b4c832c71469b33ee8 SHA512 9f5c614f8215837dc5cecc9c3e844c5e1678eb8275f9e27a0ec6a68648e9f4f09155aa72f6c731c34028b8671b7776a94235f3e54d7dbf5ff55de94840171ca8
+DIST WebTest-2.0.35.tar.gz 76227 BLAKE2B 2f10520a66a00cf61834d5ebe2b8eea469d4ca32155c9af3c0b78234607ea5443e695730a7db4476f5296f9b848f3950027d7485a4116e7d736fd9c33d8e78ae SHA512 ecad031702a9d2031d4e2230dc8213aaa6b1a3e9e6add296ee796aa2ef77d81c992dc24e481f721bc34711d1e33f3932d56cec4be3d62ee82a71fb405942c339
EBUILD webtest-2.0.33.ebuild 1411 BLAKE2B 10c8762873ce7fb712480e3e9ce6cbcf848ed9a3db274e2306a09bb496dd223d29b40eac61604283f9fbba222579bfc8f6ba55b5a3bfc2355d561d45ded511e1 SHA512 da877093e91a7d899ca6dec376eacb2a65a9d26017b20a1c18d249ff33c498baf893d3433ca6e3c5561adbddb32d30584f9d1b99b67217c55d05ce82bcb87c89
+EBUILD webtest-2.0.35.ebuild 1162 BLAKE2B f1fda1ee580d5a4c79c3be2c36633ddd5e5480dafca14f52ef37cb6bfafd7ae68d5f85186506d1ab0956d5fa1bd646b5ec944726b58f5c18ce445ce4b7aadf1e SHA512 b42c00e6957cce26bb99243af8099d74571cd52f6ed0c2935d34e769347eacbd9974bf4d0485e28add61fa2cfb6d9f2e1a2767eda2b8530a34ed5f1b9d4fec95
MISC metadata.xml 334 BLAKE2B c00ab66872fd16dfbec0b6aec890b3c086a48238228928c0149854ed30cc03d28f4677a1a222ef07c0099f9fb27eb9ae8406c4080306d06fa1895a20b2ccbbc2 SHA512 fafa09470ada71c4218cbd60b579491fe9f9dbe5c2e89cdebbd1f298fd1181ec3af3f45de60afc2f4326e044008e06c58c84f2f733367a1ab4a421fa350cb8a9
diff --git a/dev-python/webtest/webtest-2.0.35.ebuild b/dev-python/webtest/webtest-2.0.35.ebuild
new file mode 100644
index 000000000000..2b07d79efb43
--- /dev/null
+++ b/dev-python/webtest/webtest-2.0.35.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="WebTest"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Helper to test WSGI applications"
+HOMEPAGE="https://pypi.org/project/WebTest/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-python/paste[${PYTHON_USEDEP}]
+ dev-python/pastedeploy[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ >=dev-python/webob-1.2[${PYTHON_USEDEP}]
+ >=dev-python/waitress-0.8.5[${PYTHON_USEDEP}]
+ dev-python/beautifulsoup:4[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+ app-arch/unzip
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pastedeploy[${PYTHON_USEDEP}]
+ dev-python/pyquery[${PYTHON_USEDEP}]
+ dev-python/wsgiproxy2[${PYTHON_USEDEP}]
+ )"
+
+PATCHES=(
+ "${FILESDIR}/webtest-2.0.33-no-pylons-theme.patch"
+)
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index b5a1c07c93d9..9b2bcfe3e149 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,3 +1,3 @@
DIST xmlschema-1.1.3.tar.gz 298490 BLAKE2B 70c24424fd6a5e87e07591451db920d22c1bf2c63c1908e008401eafe210b759894ba508011ee58e2c242ca5b3d424c86cdf7a65312e9df1cda426802af8e861 SHA512 df277cd75058e10b8e0505db51fc167c688fe4c3d319de289ac77faa37913f60d2697f4456e00d637c4a3c3f83d164619e0ce1b849e8c8ea3b5e1932b56044dc
-EBUILD xmlschema-1.1.3.ebuild 711 BLAKE2B 3c8debc9ab32a83d32b8c8b12fc3b4b151f905e3242d1cb7cfd2a9b227ccfe5f6fef7f68b4e42a20096255cc735bb92b7009ab82c63c823300f0c77b7e6ad6d4 SHA512 c429a24980d6311cbf2269312a62fbcbe203ed3614467f4e834d658fb23fa390d9925f5ee65e03eaa1add18c2d52d89f7eac9c5b1fb1e453e8ca2576ba862a0b
+EBUILD xmlschema-1.1.3.ebuild 710 BLAKE2B 453db7eb841e2687b8fb4162415d50587a9ae3071431b6b7fc89f0f4299b18835543bd02d481da182dc87492ddf98f158795576cfb3c5383bf15415fefd0cca5 SHA512 87e5e8b091aa9cd422e81408cf72c74c6417b209559f9c7605c6a6f04e4f3dd4e5c4f2908df8aee031275c952b91902e608c3d3137c8b823e23c5ce2aefcef04
MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/xmlschema/xmlschema-1.1.3.ebuild b/dev-python/xmlschema/xmlschema-1.1.3.ebuild
index 39121bed8bc3..9f4db749364c 100644
--- a/dev-python/xmlschema/xmlschema-1.1.3.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~sparc ~x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 9afe4be54433..1172b305676b 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 3ea3de47c881..8a4d1b60f5f0 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -4,10 +4,11 @@ AUX qtwebengine-5.14.2-gcc-10.patch 3616 BLAKE2B 079a8ef993b793ddb45a4ff5e3f579f
AUX qtwebengine-5.14.2-icu67.patch 7348 BLAKE2B b1e4af1fa83c5168600f32c7a58e968dfcbc40016183a41e7df0340742504d441474a2b3f57a5128d32f1b74a2f02a2ee58d14ce34f731fecd19a1e8fef6e540 SHA512 cbcdf51a00c30717ab6aa5d76656138888dc436f278d352a838ac98338613aa0e915114d7a3a0657e2110faaed04af5334077de0c6bc02cea01016d8c2413de7
AUX qtwebengine-5.15.0-disable-fatal-warnings.patch 414 BLAKE2B 531523ee8c85d6ac51637b3bfd4fbcd56476e1231103c0db62b7c27ace4d5e070becb97beb74526806101c138669adc81a00eefe319ff96582df4743ecabcef8 SHA512 4e3ae727f2738bcc011c9fdd27593d9689206573ff7f17a51fd78d3aa25d427b899af78c098c278f6e7ab4ce88bf415e7382a8a635dd880448a75e6756abc680
AUX qtwebengine-5.15.0-gcc-10.patch 910 BLAKE2B 9cbcb19a0c17fa05cf1ac88e4cb1b80c1049f962844ef79b1d9fa8ef565d9c023cc2de2a7df58814fa060b0c3b037a036baea80406ba4ed7a3763da8587b471b SHA512 d42e08100334aa7b1d19f3d8a5770d5fc1c2c1cf9dcfe68c0e719758013c446575e643f3bad7a924591b72a8425965da2d4f7eba4b9726868c64281fcc45994a
+DIST qtwebengine-5.15.0-ppc64.tar.xz 48156 BLAKE2B 6901b04ca869e6980e7f624000dd292fad2b514d8b1853d2796a11fa0e1b1c3a80f284cc1e3c242133b6886bb56329430229645af1ad8cac927371e3941b9fab SHA512 c2613a8d889bb9d7184a65ab6127c8329a945386f23cb860219b8e161d0a43683fa66f69d8d1441f5920fa370fda7c4629865fa452be9ab8a8b1515e5f93504b
DIST qtwebengine-everywhere-src-5.14.1.tar.xz 242438244 BLAKE2B d24210b2e04522b27409cc5ccfe722114f711c1c5e9aaff76882c178b0c455b475b90fd2acd5f7ba4f5dfba85c228c4baf2c231d3661eadf83e984d7e7b9e30f SHA512 fafa2fbc789941e837e35945857a6da00e73bd2abe512290674b9957719b998d8b8b95a35c709a171c9d0d111e6f418cec630dfcdbe47ecbae25a3b94e4c99f9
DIST qtwebengine-everywhere-src-5.14.2.tar.xz 242467568 BLAKE2B 2b69af846d9f6b1b1bd6380f56868e7fe86c88baf00e4b596e6a825d636472f837c1fc3b9ed41182dcc20dc0ba03360182aba39aee4adca66f407a8346f90fbf SHA512 bcfd9ece04bdbfded5272ce1b3ab482e88349b1f5c5a071f58f6e66fcb9604d1fc38fe909ae3d9631bdf0bf7c081d7590620c3388f1a577b5236f68b084699bf
DIST qtwebengine-everywhere-src-5.15.0.tar.xz 278257432 BLAKE2B 832b15a0a542297f47ecaa057f29e24eb99dd142b314aa15243d864b715c74ec9dfc2ba23aa9be417581151d684d08dfcba173ea2d9311e19ca7af3d941f590b SHA512 11983470f0da9abfffba072406b2c67b475d8cf65412fdcfd925758e2a9449f509780e5b1001fb6868445c2c9540e5aa0e754954b70f1795b47335bad7c749b2
EBUILD qtwebengine-5.14.1.ebuild 3398 BLAKE2B 09f99f74123804158d4077e779f7def2ae28bc2d34cd2e9d303817874e80b9e9ebe54b6d1c1d68e933f22f8a86d691339a4ab867133f812ca97a83fc2373ba06 SHA512 b713b9c5a2ac86dbbccc90cfd62d2d2b9489db91c8bfb3288f09987f23f3dae5d49d787d528a6bece0e1b50a87975ac62866024b4078587573613adf8690b1af
EBUILD qtwebengine-5.14.2.ebuild 4498 BLAKE2B 73e51c2c4f4f9df2ad875de15898e4b8bcd0540a77e81b01988799eae88b130cea8fa8dbdf29d9e337a0ba2493bf4bfc50f6e0d9607f2efafdc1159688b3975f SHA512 fba03353839de8ba680bb1c78c4a9a772d1b6c2454cef505cb16f65c60a92cefe5cf3c2b821e5f927416448d94038dcf220c763031aa2dc6235a9617ed279b9b
-EBUILD qtwebengine-5.15.0.ebuild 4519 BLAKE2B 2de67b4fcf7dc542f7aba550bbb8e7d07ade6f884ad68faa75fd6dfa9504a03b563ddfdbdeef92f09626b5b3f390de47b346227c4634dffb735e3bae059d7ea0 SHA512 96518dc8453110d93b04b0fe21b840d33d3dc860bbc445448a805a3c094526f0ee74bfbdda356f6ed2d6c4927b5626cb9b442340c154d8a1f0ec1b0cf1ebda99
-MISC metadata.xml 1102 BLAKE2B 7ba2157c180e35ea470d8296d157d73f2fa565cbc8319f41f5ae533b02dc981a4d4352efb1ad94f1e298047a3b56cea097aef3ff09a19d33cf861cfb64ee9119 SHA512 d96e13fa5eddde448bce28c9373022909035f9b63e75584e7f320510f853e1c89dc9417f4280d307e29c9a7f75c89c75b5cc00c19c2d6cd6360812719dd0acc8
+EBUILD qtwebengine-5.15.0.ebuild 4744 BLAKE2B 5cac2753b32824024e43787d093d51bbb7648e1552deb182fdff83b7f8d89bdd101f77fbe0721482874f71456c016f63d34a633a03be7b6e851084b11830bd0c SHA512 01357ac86af5299bb76e1961c9fae117e2003c79f7eb6916f0abd65eceb95dd40acf7fe57a575437b3af3c497050a83cdb0bb1dee9d6d8c79e8beef83dad039c
+MISC metadata.xml 1269 BLAKE2B f95392929bcecbce9334108e3446d631e2a91d1aceb0fa6347496d2d0eeaff8cff55e08b7c3bb39fb8b51667988a6cc2b8e500143f2ebe0d78e6985a6f7af3c1 SHA512 7949854cf55f26750ded6787ce295762af7fd16600f8b251b25e1c9dd4d643338ed4c3b2a8a3405a2c427ed8b5a9ad13a8566a640161768d4dbf6db7e54811a3
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index 180beb2cfc87..ea633503ac72 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -5,6 +5,11 @@
qt@gentoo.org
Gentoo Qt Project
+
+ ppc64 patchset maintainer
+ gyakovlev@gentoo.org
+ Georgy Yakovlev
+