[gentoo-commits] repo/proj/blender-gentoo-logo:master commit in: dev-lang/python/

[gentoo-commits] repo/proj/blender-gentoo-logo:master commit in: dev-lang/python/

[Sebastian Pipping]

commit:     f45e1bf31ce9b37f6c8c4375b29c93ba80378699
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 12 13:08:59 2021 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Apr 12 13:11:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/blender-gentoo-logo.git/commit/?id=f45e1bf3

dev-lang/python: Quickport from EAPI 2 to EAPI 7

Closes: https://bugs.gentoo.org/782265
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Manifest-Sign-Key: 0xB00BC66A401A1600

 dev-lang/python/Manifest                           |  2 +-
 dev-lang/python/metadata.xml                       |  4 ++++
 .../{python-2.2-r8.ebuild => python-2.2-r9.ebuild} | 23 +++++++++++-----------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 0f571e3..647058f 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1 +1 @@
-DIST Python-2.2.tgz 6542443 SHA256 0b9e29c77d405eb7ce7a263c1ce2fc8c006cd9391790120ebfb83310a83f1fd3 SHA512 b395ee2965c2d6ee078d5a1be154e854a1920d104ce655f154e262126da8abd9fc0fdc2ea7fbea8f3070a23905b28d4414be87cc2163ed4dbcca2e2e481a7f82 WHIRLPOOL f7acb9f03332109ae91197f8c84b3126efa17324a01fc2d5d28e79d7d9253ff4f3856f7075da8d9a07d2fa3f3bba32b28a92b17627a9b11d0cf76c9fd864c1ea
+DIST Python-2.2.tgz 6542443 BLAKE2B aefb6a3d53bae8f95f9e380ed159fd4afd584cea7c180f7aa1b0e43af9711eb432f4eefa2ebc50ef5db1282022e189ae440f8ff90f99e4c296892dbd491bbc26 SHA512 b395ee2965c2d6ee078d5a1be154e854a1920d104ce655f154e262126da8abd9fc0fdc2ea7fbea8f3070a23905b28d4414be87cc2163ed4dbcca2e2e481a7f82

diff --git a/dev-lang/python/metadata.xml b/dev-lang/python/metadata.xml
index 6d22988..ec63da0 100644
--- a/dev-lang/python/metadata.xml
+++ b/dev-lang/python/metadata.xml
@@ -5,4 +5,8 @@
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
 	</maintainer>
+	<use>
+		<flag name="build">TODO describe flag &quot;build&quot; here</flag>
+		<flag name="bootstrap">TODO describe flag &quot;bootstrap&quot; here</flag>
+	</use>
 </pkgmetadata>

diff --git a/dev-lang/python/python-2.2-r8.ebuild b/dev-lang/python/python-2.2-r9.ebuild
similarity index 89%
rename from dev-lang/python/python-2.2-r8.ebuild
rename to dev-lang/python/python-2.2-r9.ebuild
index 6ea21fb..f1f7490 100644
--- a/dev-lang/python/python-2.2-r8.ebuild
+++ b/dev-lang/python/python-2.2-r9.ebuild
@@ -1,32 +1,29 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/Attic/python-2.2-r7.ebuild,v 1.12 2003/04/01 00:05:24 liquidx dead $
 
-EAPI="2"
+EAPI="7"
 
 MULTILIB_STRICT_DIRS=  # Dirty hack to bypass failing multilib-strict testing
 
-inherit versionator eutils flag-o-matic
-
-PYVER_MAJOR="$(get_version_component_range 1)"
-PYVER_MINOR="$(get_version_component_range 2)"
+PYVER_MAJOR="$(ver_cut 1)"
+PYVER_MINOR="$(ver_cut 2)"
 PYVER="${PYVER_MAJOR}.${PYVER_MINOR}"
 
 DESCRIPTION="A really great language"
-HOMEPAGE="http://www.python.org"
+HOMEPAGE="https://www.python.org"
 SRC_URI="https://www.python.org/ftp/python/${PV}/Python-${PV}.tgz"
 
 SLOT="2.2"
 LICENSE="PSF-2.2"
 KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="readline tk berkdb bootstrap"
+IUSE="build readline tk berkdb bootstrap"
 
 DEPEND="
 	>=sys-libs/zlib-1.1.3
 	readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.2 )
-	berkdb? ( >=sys-libs/db-3 )
+	berkdb? ( >=sys-libs/db-3:* )
 	tk? ( >=dev-lang/tk-8.0 )"
-RDEPEND="$DEPEND dev-python/python-fchksum"
+RDEPEND="$DEPEND"
 
 # The dev-python/python-fchksum RDEPEND is needed to that this python provides
 # the functionality expected from previous pythons.
@@ -89,7 +86,9 @@ src_prepare() {
 	scmd="$scmd  s:#\(resource .*\):\1:;" # Jeremy Hylton's rlimit interface
 	sed "$scmd" Modules/Setup.dist > Modules/Setup
 
-	epatch "${FILESDIR}"/${P}-readline.patch
+	eapply "${FILESDIR}"/${P}-readline.patch
+
+	eapply_user
 }
 
 src_configure() {