From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1177276-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 13D0D13835B
	for <garchives@archives.gentoo.org>; Fri,  5 Jun 2020 19:27:01 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 0C865E08DA;
	Fri,  5 Jun 2020 19:27:00 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id DD97BE08DA
	for <gentoo-commits@lists.gentoo.org>; Fri,  5 Jun 2020 19:26:59 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 9A24934F266
	for <gentoo-commits@lists.gentoo.org>; Fri,  5 Jun 2020 19:26:58 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D49B31
	for <gentoo-commits@lists.gentoo.org>; Fri,  5 Jun 2020 19:26:57 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1591385212.7cae49e6e65a023b37b111e0d16f662f3208abaa.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pycairo/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-python/pycairo/pycairo-1.18.2.ebuild dev-python/pycairo/pycairo-1.19.1.ebuild
X-VCS-Directories: dev-python/pycairo/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 7cae49e6e65a023b37b111e0d16f662f3208abaa
X-VCS-Branch: master
Date: Fri,  5 Jun 2020 19:26:57 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: a332b437-c39b-423f-8afd-f2c82be04aeb
X-Archives-Hash: 163d57c57560d6683849e00d193a1441

commit:     7cae49e6e65a023b37b111e0d16f662f3208abaa
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  5 16:55:45 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jun  5 19:26:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cae49e6

dev-python/pycairo: Port to py39

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/pycairo/pycairo-1.18.2.ebuild | 26 +++++---------------------
 dev-python/pycairo/pycairo-1.19.1.ebuild | 22 ++++------------------
 2 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/dev-python/pycairo/pycairo-1.18.2.ebuild b/dev-python/pycairo/pycairo-1.18.2.ebuild
index 7621e8dfbef..7ee4d6f3216 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,9 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-RESTRICT="!test? ( test )"
-
-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 +38,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 66921d842bb..01000a3ce9a 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,16 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-RESTRICT="!test? ( test )"
-
+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