gentoo resync : 13.06.2020

4 files changed, 40 insertions, 39 deletions

diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index 83f88860bda8..e2ba5db8f984 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,5 +1,6 @@
+AUX pycairo-1.19.1-py39.patch 890 BLAKE2B 8ee84005e17fd485f568213e751dd30bcb904806d4016088d0c6882958ce7edeba2517f3ab4b8139a8f923e3baec435bc9a21cf3546b60f4459c5cc9ad7a54d6 SHA512 607d6f2cf6bcaec394b755f452d3c4bc0f6edb39bea185a18258c1ee0db11a99d84c7605dbe9db83906518d41baf065b2b8d9261db3736f8a737a2a8f7dff266
 DIST pycairo-1.18.2.tar.gz 200462 BLAKE2B 1f755dc90fe3ee50aa68273a0816752312f144831ff857709e1a4695a58646ffe6be518733480ed37231c213a11d4e5aaf8dfd1cfa68104873bc7d4192435b89 SHA512 279ea80413ba55d493d51455685da09afa1f5c45e2930c3fca3e417a8afe6645a0d8131201f79482de59e5ec56cfef62eac65ed88fe88866bfcc06503dcc59e0
 DIST pycairo-1.19.1.tar.gz 205196 BLAKE2B 504334628daf75dd9145c97fbd86ea133b4be225ce7fa911b48231ebd5434678ffa7b1f185e0527f96b4b36955e788d0bb4fa4d308843e5ae9b20a41d2126301 SHA512 a7955a2566d5e5586154b62f3aeef824e1e6076cbd3eb86af8288fedcc7d61c4e36a53691298cf9df2e2df7fc96292f96dec92c5d4343e6c1b4c971e97d0650f
-EBUILD pycairo-1.18.2.ebuild 1414 BLAKE2B e7937011d1cd2853a5aea1eb60dc1d4723976847970f56696c948b3a1ad0d8739028922ea8f7a7ec7b843c89745179877d481bfe32c8ea14c6a69af3246a2dbf SHA512 20832beb5081377bb6618d13065852df1bedb032f6a4db33084224bb341e0368393bd4dc5e22cb2093f17a8dcbb2e7cdc17ac9a9a79ee1cfdd85fc6165345236
-EBUILD pycairo-1.19.1.ebuild 1411 BLAKE2B b1395befcf35cad2a87984cec394b94841d4b7993cc77870af548974277b86682eb9f83ed405ca609ca874556e4ae72e51dcb2c742ea49e9220c790021b9dc17 SHA512 5ac52c24c84538d5033efc1b3dfb0b33ec79106c5f6dad791f77131cac9cf5285f357520e48e4ffc69fc2e6a9e8121fc3d5c2213fa3bc21dcfc1a385b91da89f
+EBUILD pycairo-1.18.2.ebuild 1170 BLAKE2B 417a4ef2d7d9d89b9c39931007a9b41eebe49f1184f967c536d2816847c521523659ceaf02865b0093b02c09109586213e9fd8ef21fc234f291c6fff51ca895b SHA512 e9aa24118efe4d0d8b456e7c8a7bff9cf7408a23bff1559f2c44f463ad97ceecfed5c39af90397ebbaed5de430f8fab3cec02d9d06319960349068cc38001840
+EBUILD pycairo-1.19.1.ebuild 1167 BLAKE2B ec7f7443d44d189c15c8bac9cb19c3e74fcd6ac765833734078a1050ebb14774179b60a5dd92b326ea74fff6626c062fb7afe076dd0b0fb36112ab6e34fc149e SHA512 41f22e0c13532bf8ee42c62efedc29ef3a6dbe1f71c3149a32fdb37012a385e72a9632a4fac6e2d16935ad3bc9fdec346148c8776360c4d460cd654983a5efc6
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/pycairo/files/pycairo-1.19.1-py39.patch b/dev-python/pycairo/files/pycairo-1.19.1-py39.patch
new file mode 100644
index 000000000000..97b20227ce8b
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.19.1-py39.patch
@@ -0,0 +1,26 @@
+From 3ecf0a4060d6de3b92a77a393ece663455cf6add Mon Sep 17 00:00:00 2001
+From: Christoph Reiter <reiter.christoph@gmail.com>
+Date: Sun, 10 May 2020 11:22:40 +0200
+Subject: [PATCH] tests: Fix syntax issue with Python 3.9
+
+https://bugs.python.org/issue40246
+
+I haven't actually tested with 3.9 yet, so this is just what I found
+with grep.
+---
+ tests/test_enums.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_enums.py b/tests/test_enums.py
+index 4bc2e3d..02756d0 100644
+--- a/tests/test_enums.py
++++ b/tests/test_enums.py
+@@ -79,7 +79,7 @@ def get_prefix(t):
+         # special case..
+         if name == "PathDataType":
+             name = "Path"
+-        return"_".join([s.upper() for s in re.findall('[A-Z][^A-Z]*', name)])
++        return "_".join([s.upper() for s in re.findall('[A-Z][^A-Z]*', name)])
+ 
+     for t in types_:
+         for name in dir(t):
diff --git a/dev-python/pycairo/pycairo-1.18.2.ebuild b/dev-python/pycairo/pycairo-1.18.2.ebuild
index 7621e8dfbeff..b8e47a44e65b 100644
--- a/dev-python/pycairo/pycairo-1.18.2.ebuild
+++ b/dev-python/pycairo/pycairo-1.18.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -15,10 +15,9 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples test"
+IUSE="examples"
 
 BDEPEND="
-	doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') )
 	test? (
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
@@ -29,22 +28,11 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-RESTRICT="!test? ( test )"
+PATCHES=( "${FILESDIR}/${PN}-1.19.1-py39.patch" )
 
-python_check_deps() {
-	use doc || return 0
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs -b html _build/html || die
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests setup.py
 
 python_install() {
 	distutils-r1_python_install \
@@ -52,8 +40,6 @@ python_install() {
 }
 
 python_install_all() {
-	use doc && local HTML_DOCS=( _build/html/. )
-
 	if use examples; then
 		dodoc -r examples
 	fi
diff --git a/dev-python/pycairo/pycairo-1.19.1.ebuild b/dev-python/pycairo/pycairo-1.19.1.ebuild
index 66921d842bbe..b05ecffc14d0 100644
--- a/dev-python/pycairo/pycairo-1.19.1.ebuild
+++ b/dev-python/pycairo/pycairo-1.19.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -15,10 +15,9 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples test"
+IUSE="examples"
 
 BDEPEND="
-	doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') )
 	test? (
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
@@ -29,29 +28,18 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-RESTRICT="!test? ( test )"
+PATCHES=( "${FILESDIR}/${P}-py39.patch" )
 
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
 distutils_enable_tests setup.py
 
-python_check_deps() {
-	use doc || return 0
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs -b html _build/html || die
-	fi
-}
-
 python_install() {
 	distutils-r1_python_install \
 		install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
 }
 
 python_install_all() {
-	use doc && local HTML_DOCS=( _build/html/. )
-
 	if use examples; then
 		dodoc -r examples
 	fi