gentoo Easter resync : 12.04.2020

4 files changed, 13 insertions, 9 deletions

diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 474844c71291..b8d8a2da45c3 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,7 +1,7 @@
-DIST pycurl-7.43.0.2.tar.gz 214212 BLAKE2B dae74be194334809048782de6a1adef8405e123464ffb0cad02d998d82fb59579d54bb7c5150895224d7622edfe4375f7b2336abd381270b5f64f44b09c8612f SHA512 8635fb33107c9351b7527036b8ab16d76aad72c2170643928034641770d07ab1507a8b2adc8b1a1dcfff29272f55cb00fee65abfcc0c639db14fdc20fc3a0fd0
 DIST pycurl-7.43.0.3.tar.gz 215003 BLAKE2B 2f1e61bd52873906a2d0480ab316c9026f2722cde14c059884ee552a2340fe6b646b4021326f72730aa9eed82f57b5ba923d19c2b8dfadb7a8f8819982116e7a SHA512 eec5c5f10b9a78bcf7e786368cdd5dc165faa4bb646df39ad52c1dfe8110e3e56456f5961f63ab7b460e51e56c41e66a0fc4652c8132411f1dee4074b3cffc00
+DIST pycurl-7.43.0.5.tar.gz 216877 BLAKE2B 57605fa3426a76e0cdcc1bb4f247985a27439d67d32769945332f94c49eead7fadb2847accf98f0d0994e461fc9d6fd100a181ff6d3ac0765dad31d546a75ff4 SHA512 835ed6cca25d2dd3e7084f905f3b0b082d4af04761fa9d4dc4714865863a97c095c08e6f55ada91b9f60ccad7838328a82fb2add8108aea12056200cf1f12845
 DIST pycurl-7.43.0.tar.gz 182522 BLAKE2B af6c85934565d851ea2280253ec6c61ab85f2dea047c83fc5ad65a6f05d3b8bf97932a161ae171c573a7333a99f2a25d4280c70be7ed3aef5eae19b5c392f5c7 SHA512 7442462c74c19964b9d72976e9b92bf68bb37debc1401bc399590bea42704065da13d6de710e795eeae79a4651b9a08841d50454243cb0994c7eb1c1bab233a5
-EBUILD pycurl-7.43.0.2.ebuild 2684 BLAKE2B 32630309a398f22925bfe159d328d9c7f7224cc941b0e720c53e9103bdcf0138a4bbdc21c582c24782e7f13894c4a29fb90f2f2fb6122f1a7c83c600c5daf0f9 SHA512 9d80f4ce5c51267c32aca53570df9f3327c75ee157cd901e94b2091d93ea521613467f0ca9b02b9a16de72645d1cccb69c0a4c0489d84067d74121bc890b77cb
-EBUILD pycurl-7.43.0.3.ebuild 2684 BLAKE2B 32630309a398f22925bfe159d328d9c7f7224cc941b0e720c53e9103bdcf0138a4bbdc21c582c24782e7f13894c4a29fb90f2f2fb6122f1a7c83c600c5daf0f9 SHA512 9d80f4ce5c51267c32aca53570df9f3327c75ee157cd901e94b2091d93ea521613467f0ca9b02b9a16de72645d1cccb69c0a4c0489d84067d74121bc890b77cb
-EBUILD pycurl-7.43.0.ebuild 2627 BLAKE2B bf8f5f94b4d74abcfe7b244f7f64f42174147900b945cec049c8310db6e41b1371eba57a38491cbcdebca1c362d65e8856a05142936ea4c6269af5e4cd36df1f SHA512 855b5de29db29093e690a91244eb7f3765db796134ccadffb4f52e26443372356c7b1a49fb629105046f258f55ae8a5e0cb68beefa364ef30c5cbbf3f35beca0
+EBUILD pycurl-7.43.0.3.ebuild 2671 BLAKE2B fd73be6647ac15afe8e6770c6cdd47d835b2efce1abc02895aebe2a29c70d6791589557056f493d79510d2c531e745521fef7ab69f552008110646232eb7ccaf SHA512 7b51cee2882727f5a4dd9e15f1e14f598d9c00be43b5b2d567cf9d556137ffcbbc1a8ee5efa6d4311983a906fb41e2c043a5f01dcb50c050c2ea3a6c56988bc3
+EBUILD pycurl-7.43.0.5.ebuild 2682 BLAKE2B 8a25ff0492292c77d8d367d85a5c047708ec968ddbb9f80f365cc05c71918387f4620f852ddaee8febd3230e15acf7c08ee8b5983e91189035e17ad9ea658354 SHA512 2f1bd2af432ad24bd4860ff71c7fcf60a7dd514e035bb76dc04d5f9afeea2df4af168651cccaaed991533b08ba640dacb4cc7303c87f945586b56819162c0664
+EBUILD pycurl-7.43.0.ebuild 2671 BLAKE2B dfd7855ea16196ba05ac6c335968217b20d1cb44fb7c2097bf36ad66979321bb66552dfb4975dfd17fe916a7c6c32494030266fd222a2c383333d955e8b37ed4 SHA512 d665cb761e5792155cb68e5f218d3840d665f9cae7dd21ef56cddeffc367ba3ad1d9376009a7d751612018095f8ecf6de4844e57c10ac067abb7fd5cbaffe518
 MISC metadata.xml 1099 BLAKE2B d96159920135d8d85a01449423d1638889d2c6ed9f84d08eabd7405a3271efe85315cece0fc4f6832bd43b622089c819df3d20fd725150c89a0910ec26ac339a SHA512 8f8b3a10d2f72aa67d1b5f7462ea62803d9150cab3d96792adbd65b379a45c074d68809b25d4a2b558bf28dae72e095c598bd0485fce4c5dafba0784de517a6c
diff --git a/dev-python/pycurl/pycurl-7.43.0.3.ebuild b/dev-python/pycurl/pycurl-7.43.0.3.ebuild
index 965a025834d9..20694a2260f7 100644
--- a/dev-python/pycurl/pycurl-7.43.0.3.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pycurl/pycurl-7.43.0.2.ebuild b/dev-python/pycurl/pycurl-7.43.0.5.ebuild
index 965a025834d9..83c007551994 100644
--- a/dev-python/pycurl/pycurl-7.43.0.2.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 # The selftests fail with pypy, and urlgrabber segfaults for me.
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pycurl/pycurl-7.43.0.ebuild b/dev-python/pycurl/pycurl-7.43.0.ebuild
index 709ce8c1f28c..097d0f8347b0 100644
--- a/dev-python/pycurl/pycurl-7.43.0.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
 RESTRICT="!test? ( test )"
 
@@ -72,6 +72,10 @@ python_test() {
 
 python_install_all() {
 	local HTML_DOCS=( doc/. )
-	use examples && local EXAMPLES=( examples/. )
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
 	distutils-r1_python_install_all
 }