gentoo resync : 13.06.2020

3 files changed, 20 insertions, 39 deletions

diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index 6349aa9ed15a..aacae6bbea80 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -4,6 +4,6 @@ DIST cairocffi-0.8.0.tar.gz 79217 BLAKE2B fefcee32e486c150d089b7d13b046c864b83fc
 DIST cairocffi-0.9.0.tar.gz 84652 BLAKE2B 9f09c038619b0f44c568d6636861b0e12ffd7e9ab546f3a65bbd8e77eee7ff5f0c6f4d92a841696492b786d0067af86e25949b723ef6ef73ede370fbf2576d6d SHA512 0d3d54e0d54b3696c8336d8b3a6d745628da51d9d9f8c50f36006c007e1432a95dd9bafd8d865923059d040cc4e9f7989b3670a5318383b357ffc979eeb920d5
 DIST cairocffi-1.1.0.tar.gz 68744 BLAKE2B 604812572bb1a39ab52e41e03714acc93ddc7532e07ac36b693f53ad71cf0bcfd5d2f3bceb56b8e352fe7f179b174a244238b9cfcee690cbc0cb96e5b2934c75 SHA512 a9bc9ec5be767388aad9d06cc3b386b474dbacf097d3558b4033834cfb2f5418eede2f4b4080bec7e4725c6821f6e54d6c3366e8c4ee73bd3fa1cf444b395197
 EBUILD cairocffi-0.8.0-r1.ebuild 1142 BLAKE2B 4d5aeaf534b104e6869e25d24de9ec10df350d5fc27b0cfd624d8e1e7bf9399839bdcd63958404b27592bdf71468a534760b51fdf8273135913378c5985f04c2 SHA512 fcb08dc478ef62f2e0fb748fdb4e950f4465eb4f9ba0f0e3bd789f1d95b03f2b93a7d47cbf8ed7f15d78527959c39bf6ffbdd84271b6bdcae18c4c43d79316d8
-EBUILD cairocffi-0.9.0-r1.ebuild 1114 BLAKE2B aa6c295b033d43ccd66033ada4b767998794b32031088d7d386b1195b4da9af3d1979a5b0b4b6141d8147651f5a38948afd08ae7dc200a5d237859578cb16908 SHA512 64a5b85a396b094f3130fb81f963aea74b18ec357071c485c09b853cb35e62f10ce2b8c23b2a9cb6e683a6a02636978746a9cdb046d3f85fc8a670c360f5d972
-EBUILD cairocffi-1.1.0.ebuild 1186 BLAKE2B 7896f3801e24fdafd3e17333d96fcf4d80be02f023fb331d855ace8d66c1bd4f95a8533847e4afacb03e03325a7ddfde5c8457abd8a2069670f406534a4461b9 SHA512 f492f28424e0533681a19e2e50e7b39f54a5dbfb9203a66e1607179029003524f7d32ba43ec6bf655f821c71578530d249cc61f84df134a15d1cbc161748993d
+EBUILD cairocffi-0.9.0-r1.ebuild 1146 BLAKE2B b6f2c3a480e75ba1dea7ac544bb6a36288437b9b02b0b4a8d0bb0654f0a61305cf04ba67226aca73b270763f0dc0347a2f1d8058ca8e26772633e2041eca6564 SHA512 2551858fc4cc26cf16fe17cdb5ddb5191a7da822f479d3905b0201613eadcd9bd46f5e7a5b1b1818263d65027c64e8ca7ffdc3e48cd5384e227cbb26858e5b32
+EBUILD cairocffi-1.1.0.ebuild 781 BLAKE2B fd97362eea8415a40d9cc60e7bfca532b3f095c2ce3cac892269c6bfd6865ba8b79fddbcb1640ecf8ecb798d5295dc311a7fa47d3d50d87f601dab22257e2d8a SHA512 2a0e41a651bc2918ffe90624ede77ae31d6a7e6cba871ac0c416efcc22cff4f6032817438a67a8e9eb9af2d0230c9bac580cc5f79c29e64cff9d18f9003ee8a9
 MISC metadata.xml 379 BLAKE2B 75baee69a9fff6d3c571bded0b1e6cfd8abbdfae7262faa2215fb3251ace498c33119ebe3bf74e4e4e0b2d1ba620b9bc60d4daf244917098e17c62af24d4b401 SHA512 b0bdbb3b144675f9e90a0421c694e0f0a782dbf315dd8203574bea69b9389d49d377797a28d9d86588d062e15071c1fe226dd4166a4fbf8e95a852d46cc20215
diff --git a/dev-python/cairocffi/cairocffi-0.9.0-r1.ebuild b/dev-python/cairocffi/cairocffi-0.9.0-r1.ebuild
index 45e349b58087..6793e7f9b0ea 100644
--- a/dev-python/cairocffi/cairocffi-0.9.0-r1.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.9.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
 
 inherit distutils-r1 virtualx
 
@@ -17,9 +17,11 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="doc test"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
+distutils_enable_sphinx docs
+
 RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
 	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
@@ -28,7 +30,6 @@ RDEPEND="
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
 		${RDEPEND}
 		dev-python/pytest[${PYTHON_USEDEP}]
@@ -36,15 +37,15 @@ DEPEND="
 
 S="${WORKDIR}/${MY_P}"
 
-python_compile_all() {
-	use doc && esetup.py build_sphinx
+PATCHES=( "${FILESDIR}"/${PN}-0.8.0-tests.patch )
+
+python_prepare() {
+	if python_is_python3; then
+		# Remove deprecated statements for python3
+		sed -i -e 's/tostring/tobytes/g' cairocffi/test_cairo.py || die
+	fi
 }
 
 python_test() {
 	virtx py.test -v --pyargs cairocffi -o addopts=
 }
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cairocffi/cairocffi-1.1.0.ebuild b/dev-python/cairocffi/cairocffi-1.1.0.ebuild
index 457f63121118..29fbbca716f4 100644
--- a/dev-python/cairocffi/cairocffi-1.1.0.ebuild
+++ b/dev-python/cairocffi/cairocffi-1.1.0.ebuild
@@ -3,53 +3,33 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1 virtualx
 
-MY_PN="${PN}"
-MY_P="${MY_PN}-${PV}"
-
 DESCRIPTION="CFFI-based drop-in replacement for Pycairo"
 HOMEPAGE="https://github.com/Kozea/cairocffi"
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
-	$(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]
+	' 'python*')
 	>=dev-python/xcffib-0.3.2[${PYTHON_USEDEP}]
 	x11-libs/cairo:0=[X,xcb(+)]
 	x11-libs/gdk-pixbuf[jpeg]"
 
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
+distutils_enable_tests pytest
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.8.0-tests.patch
 	"${FILESDIR}"/${PN}-1.0.2-test-deps.patch
 )
 
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
 python_test() {
-	virtx py.test -v --pyargs cairocffi
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
+	virtx pytest -vv --pyargs cairocffi
 }