From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 5FC73138351 for ; Thu, 19 Mar 2020 09:41:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BC604E0BBA; Thu, 19 Mar 2020 09:41:11 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 90542E0BC1 for ; Thu, 19 Mar 2020 09:41:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 BC69534F31D for ; Thu, 19 Mar 2020 09:41:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A4ED7199 for ; Thu, 19 Mar 2020 09:41:04 +0000 (UTC) From: "Michał Górny" 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" Message-ID: <1584610860.0a2c520e735f285a11e2486cb7b4fe1c8e4d0dac.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/portage/metadata.xml sys-apps/portage/portage-2.3.69.ebuild sys-apps/portage/portage-2.3.79.ebuild sys-apps/portage/portage-2.3.84-r1.ebuild sys-apps/portage/portage-2.3.89-r1.ebuild sys-apps/portage/portage-2.3.92.ebuild sys-apps/portage/portage-2.3.93.ebuild sys-apps/portage/portage-2.3.94.ebuild sys-apps/portage/portage-9999.ebuild X-VCS-Directories: sys-apps/portage/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 0a2c520e735f285a11e2486cb7b4fe1c8e4d0dac X-VCS-Branch: master Date: Thu, 19 Mar 2020 09:41:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a70d7e79-5ba2-44bc-82cb-ff2f17e7871d X-Archives-Hash: 940b63fdfc0ce0c9da0ed9e92fe67d3d commit: 0a2c520e735f285a11e2486cb7b4fe1c8e4d0dac Author: Michał Górny gentoo org> AuthorDate: Thu Mar 19 08:52:09 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Mar 19 09:41:00 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a2c520e sys-apps/portage: Drop py2 Signed-off-by: Michał Górny gentoo.org> sys-apps/portage/metadata.xml | 1 - sys-apps/portage/portage-2.3.69.ebuild | 20 ++++---------------- sys-apps/portage/portage-2.3.79.ebuild | 20 ++++---------------- sys-apps/portage/portage-2.3.84-r1.ebuild | 24 ++++-------------------- sys-apps/portage/portage-2.3.89-r1.ebuild | 6 +----- sys-apps/portage/portage-2.3.92.ebuild | 6 +----- sys-apps/portage/portage-2.3.93.ebuild | 6 +----- sys-apps/portage/portage-2.3.94.ebuild | 6 +----- sys-apps/portage/portage-9999.ebuild | 6 +----- 9 files changed, 17 insertions(+), 78 deletions(-) diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml index bf8c5a54f96..9f4e43e394b 100644 --- a/sys-apps/portage/metadata.xml +++ b/sys-apps/portage/metadata.xml @@ -11,7 +11,6 @@ Build html API documentation with sphinx-apidoc. - Build html API documentation with epydoc (deprecated). Enable features required for Gentoo ebuild development. Use inter-process communication between portage and running ebuilds. diff --git a/sys-apps/portage/portage-2.3.69.ebuild b/sys-apps/portage/portage-2.3.69.ebuild index 9079277e5cc..40994d24509 100644 --- a/sys-apps/portage/portage-2.3.69.ebuild +++ b/sys-apps/portage/portage-2.3.69.ebuild @@ -4,11 +4,7 @@ EAPI=5 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( - pypy - python3_5 python3_6 python3_7 - python2_7 -) +PYTHON_COMPAT=( python3_5 python3_6 python3_7 ) PYTHON_REQ_USE='bzip2(+),threads(+)' inherit distutils-r1 linux-info systemd prefix @@ -19,14 +15,13 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" LICENSE="GPL-2" KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86" SLOT="0" -IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" +IUSE="build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) - epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" + doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )" # Require sandbox-2.2 for bug #288863. # For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's # quite slow, so it's not considered in the dependencies as an alternative to @@ -73,8 +68,6 @@ PDEPEND=" # coreutils-6.4 rdep is for date format in emerge-webrsync #164532 # NOTE: FEATURES=installsources requires debugedit and rsync -REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )" - SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives" prefix_src_archives() { @@ -97,7 +90,7 @@ pkg_pretend() { } pkg_setup() { - use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) + : } python_prepare_all() { @@ -182,7 +175,6 @@ python_prepare_all() { python_compile_all() { local targets=() use doc && targets+=( docbook ) - use epydoc && targets+=( epydoc ) if [[ ${targets[@]} ]]; then esetup.py "${targets[@]}" @@ -215,10 +207,6 @@ python_install_all() { install_docbook --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" ) - use epydoc && targets+=( - install_epydoc - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - ) # install docs if [[ ${targets[@]} ]]; then diff --git a/sys-apps/portage/portage-2.3.79.ebuild b/sys-apps/portage/portage-2.3.79.ebuild index 5b5f4e791f7..36088bf91f0 100644 --- a/sys-apps/portage/portage-2.3.79.ebuild +++ b/sys-apps/portage/portage-2.3.79.ebuild @@ -4,11 +4,7 @@ EAPI=5 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( - pypy - python3_5 python3_6 python3_7 python3_8 - python2_7 -) +PYTHON_COMPAT=( python3_5 python3_6 python3_7 python3_8 ) PYTHON_REQ_USE='bzip2(+),threads(+)' inherit distutils-r1 linux-info systemd prefix @@ -19,14 +15,13 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" LICENSE="GPL-2" KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86" SLOT="0" -IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" +IUSE="build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) - epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )" + doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )" # Require sandbox-2.2 for bug #288863. # For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's # quite slow, so it's not considered in the dependencies as an alternative to @@ -74,8 +69,6 @@ PDEPEND=" # coreutils-6.4 rdep is for date format in emerge-webrsync #164532 # NOTE: FEATURES=installsources requires debugedit and rsync -REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )" - SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives" prefix_src_archives() { @@ -98,7 +91,7 @@ pkg_pretend() { } pkg_setup() { - use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) + : } python_prepare_all() { @@ -183,7 +176,6 @@ python_prepare_all() { python_compile_all() { local targets=() use doc && targets+=( docbook ) - use epydoc && targets+=( epydoc ) if [[ ${targets[@]} ]]; then esetup.py "${targets[@]}" @@ -216,10 +208,6 @@ python_install_all() { install_docbook --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" ) - use epydoc && targets+=( - install_epydoc - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - ) # install docs if [[ ${targets[@]} ]]; then diff --git a/sys-apps/portage/portage-2.3.84-r1.ebuild b/sys-apps/portage/portage-2.3.84-r1.ebuild index 0e07eb5927e..82cfc09d2ff 100644 --- a/sys-apps/portage/portage-2.3.84-r1.ebuild +++ b/sys-apps/portage/portage-2.3.84-r1.ebuild @@ -4,11 +4,7 @@ EAPI=5 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( - pypy3 - python3_6 python3_7 python3_8 - python2_7 -) +PYTHON_COMPAT=( pypy3 python3_5 python3_6 python3_7 python3_8 ) PYTHON_REQ_USE='bzip2(+),threads(+)' inherit distutils-r1 linux-info systemd prefix @@ -19,18 +15,13 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" LICENSE="GPL-2" KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86" SLOT="0" -IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" +IUSE="build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr" DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch - doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) - epydoc? ( - $(python_gen_cond_dep ' - >=dev-python/epydoc-2.0[${PYTHON_USEDEP}] - ' 'python2*') - )" + doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )" # Require sandbox-2.2 for bug #288863. # For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's # quite slow, so it's not considered in the dependencies as an alternative to @@ -78,8 +69,6 @@ PDEPEND=" # coreutils-6.4 rdep is for date format in emerge-webrsync #164532 # NOTE: FEATURES=installsources requires debugedit and rsync -REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )" - SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives" prefix_src_archives() { @@ -102,7 +91,7 @@ pkg_pretend() { } pkg_setup() { - use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) + : } python_prepare_all() { @@ -190,7 +179,6 @@ python_prepare_all() { python_compile_all() { local targets=() use doc && targets+=( docbook ) - use epydoc && targets+=( epydoc ) if [[ ${targets[@]} ]]; then esetup.py "${targets[@]}" @@ -223,10 +211,6 @@ python_install_all() { install_docbook --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" ) - use epydoc && targets+=( - install_epydoc - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" - ) # install docs if [[ ${targets[@]} ]]; then diff --git a/sys-apps/portage/portage-2.3.89-r1.ebuild b/sys-apps/portage/portage-2.3.89-r1.ebuild index c4cd0f48891..780cf80fb58 100644 --- a/sys-apps/portage/portage-2.3.89-r1.ebuild +++ b/sys-apps/portage/portage-2.3.89-r1.ebuild @@ -4,11 +4,7 @@ EAPI=5 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( - pypy3 - python3_6 python3_7 python3_8 - python2_7 -) +PYTHON_COMPAT=( pypy3 python3_5 python3_6 python3_7 python3_8 ) PYTHON_REQ_USE='bzip2(+),threads(+)' inherit distutils-r1 linux-info systemd prefix diff --git a/sys-apps/portage/portage-2.3.92.ebuild b/sys-apps/portage/portage-2.3.92.ebuild index 0188237e0e1..bd25531263b 100644 --- a/sys-apps/portage/portage-2.3.92.ebuild +++ b/sys-apps/portage/portage-2.3.92.ebuild @@ -4,11 +4,7 @@ EAPI=5 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( - pypy3 - python3_6 python3_7 python3_8 - python2_7 -) +PYTHON_COMPAT=( pypy3 python3_5 python3_6 python3_7 python3_8 ) PYTHON_REQ_USE='bzip2(+),threads(+)' inherit distutils-r1 linux-info systemd prefix diff --git a/sys-apps/portage/portage-2.3.93.ebuild b/sys-apps/portage/portage-2.3.93.ebuild index 0188237e0e1..bd25531263b 100644 --- a/sys-apps/portage/portage-2.3.93.ebuild +++ b/sys-apps/portage/portage-2.3.93.ebuild @@ -4,11 +4,7 @@ EAPI=5 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( - pypy3 - python3_6 python3_7 python3_8 - python2_7 -) +PYTHON_COMPAT=( pypy3 python3_5 python3_6 python3_7 python3_8 ) PYTHON_REQ_USE='bzip2(+),threads(+)' inherit distutils-r1 linux-info systemd prefix diff --git a/sys-apps/portage/portage-2.3.94.ebuild b/sys-apps/portage/portage-2.3.94.ebuild index 0188237e0e1..bd25531263b 100644 --- a/sys-apps/portage/portage-2.3.94.ebuild +++ b/sys-apps/portage/portage-2.3.94.ebuild @@ -4,11 +4,7 @@ EAPI=5 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( - pypy3 - python3_6 python3_7 python3_8 - python2_7 -) +PYTHON_COMPAT=( pypy3 python3_5 python3_6 python3_7 python3_8 ) PYTHON_REQ_USE='bzip2(+),threads(+)' inherit distutils-r1 linux-info systemd prefix diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index 58aa5a833ab..e510a7a02ab 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -4,11 +4,7 @@ EAPI=6 DISTUTILS_USE_SETUPTOOLS=no -PYTHON_COMPAT=( - pypy3 - python3_6 python3_7 python3_8 - python2_7 -) +PYTHON_COMPAT=( pypy3 python3_5 python3_6 python3_7 python3_8 ) PYTHON_REQ_USE='bzip2(+),threads(+)' inherit distutils-r1 git-r3 linux-info systemd prefix