From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C72D31580EB for ; Wed, 28 May 2025 09:05:43 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id B3126343123 for ; Wed, 28 May 2025 09:05:43 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 8BC8111047D; Wed, 28 May 2025 09:05:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 7945E11047D for ; Wed, 28 May 2025 09:05:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 277963430DF for ; Wed, 28 May 2025 09:05:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8DBFE2816 for ; Wed, 28 May 2025 09:05:37 +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: <1748422578.e7b09045c08e0e64e092c5dc8ff28df7a903fd01.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/python/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/python/python-3.9.22_p1.ebuild dev-lang/python/python-3.9.9999.ebuild X-VCS-Directories: dev-lang/python/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e7b09045c08e0e64e092c5dc8ff28df7a903fd01 X-VCS-Branch: master Date: Wed, 28 May 2025 09:05:37 +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: 9e8ec1bb-a5b1-4b4c-b1fb-e0533c5e21c5 X-Archives-Hash: b1248f6a59cffc6582f3f07ee008fc92 commit: e7b09045c08e0e64e092c5dc8ff28df7a903fd01 Author: Michał Górny gentoo org> AuthorDate: Wed May 28 08:56:18 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed May 28 08:56:18 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7b09045 dev-lang/python: Add 3.9.9999 live ebuild Signed-off-by: Michał Górny gentoo.org> dev-lang/python/python-3.9.22_p1.ebuild | 25 ----------- ...hon-3.9.22_p1.ebuild => python-3.9.9999.ebuild} | 50 +++------------------- 2 files changed, 7 insertions(+), 68 deletions(-) diff --git a/dev-lang/python/python-3.9.22_p1.ebuild b/dev-lang/python/python-3.9.22_p1.ebuild index 79af6007d03f..64eb614624d2 100644 --- a/dev-lang/python/python-3.9.22_p1.ebuild +++ b/dev-lang/python/python-3.9.22_p1.ebuild @@ -555,29 +555,4 @@ src_install() { -e "s:@PYDOC@:pydoc${PYVER}:" \ -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" - - # python-exec wrapping support - local pymajor=${PYVER%.*} - local EPYTHON=python${PYVER} - local scriptdir=${D}$(python_get_scriptdir) - mkdir -p "${scriptdir}" || die - # python and pythonX - ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die - ln -s "python${pymajor}" "${scriptdir}/python" || die - # python-config and pythonX-config - # note: we need to create a wrapper rather than symlinking it due - # to some random dirname(argv[0]) magic performed by python-config - cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die - #!/bin/sh - exec "${abiver}-config" "\${@}" - EOF - chmod +x "${scriptdir}/python${pymajor}-config" || die - ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die - # 2to3, pydoc - ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die - ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die - # idle - if use tk; then - ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die - fi } diff --git a/dev-lang/python/python-3.9.22_p1.ebuild b/dev-lang/python/python-3.9.9999.ebuild similarity index 89% copy from dev-lang/python/python-3.9.22_p1.ebuild copy to dev-lang/python/python-3.9.9999.ebuild index 79af6007d03f..f738efdb3046 100644 --- a/dev-lang/python/python-3.9.22_p1.ebuild +++ b/dev-lang/python/python-3.9.9999.ebuild @@ -4,13 +4,11 @@ EAPI="8" WANT_LIBTOOL="none" -inherit autotools check-reqs flag-o-matic multiprocessing pax-utils -inherit prefix python-utils-r1 toolchain-funcs verify-sig +inherit autotools check-reqs flag-o-matic git-r3 multiprocessing pax-utils +inherit prefix python-utils-r1 toolchain-funcs -MY_PV=${PV/_rc/rc} -MY_P="Python-${MY_PV%_p*}" PYVER=$(ver_cut 1-2) -PATCHSET="python-gentoo-patches-${MY_PV}" +PATCHSET="python-gentoo-patches-3.9.22" DESCRIPTION="An interpreted, interactive, object-oriented programming language" HOMEPAGE=" @@ -18,17 +16,13 @@ HOMEPAGE=" https://github.com/python/cpython/ " SRC_URI=" - https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz - verify-sig? ( - https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc - ) " -S="${WORKDIR}/${MY_P}" +EGIT_REPO_URI="https://github.com/python/cpython.git" +EGIT_BRANCH=${PYVER} LICENSE="PSF-2" SLOT="${PYVER}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE=" bluetooth build debug +ensurepip examples gdbm +ncurses pgo +readline +sqlite +ssl test tk valgrind @@ -76,14 +70,11 @@ BDEPEND=" dev-build/autoconf-archive app-alternatives/awk virtual/pkgconfig - verify-sig? ( sec-keys/openpgp-keys-python ) " RDEPEND+=" !build? ( app-misc/mime-types ) " -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc - # large file tests involve a 2.5G file being copied (duplicated) CHECKREQS_DISK_BUILD=5500M @@ -100,9 +91,7 @@ pkg_setup() { } src_unpack() { - if use verify-sig; then - verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc} - fi + git-r3_src_unpack default } @@ -534,7 +523,7 @@ src_install() { ln -s ../python/EXTERNALLY-MANAGED "${libdir}/EXTERNALLY-MANAGED" || die - dodoc Misc/{ACKS,HISTORY,NEWS} + dodoc Misc/{ACKS,HISTORY} if use examples; then docinto examples @@ -555,29 +544,4 @@ src_install() { -e "s:@PYDOC@:pydoc${PYVER}:" \ -i "${ED}/etc/conf.d/pydoc-${PYVER}" \ "${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed" - - # python-exec wrapping support - local pymajor=${PYVER%.*} - local EPYTHON=python${PYVER} - local scriptdir=${D}$(python_get_scriptdir) - mkdir -p "${scriptdir}" || die - # python and pythonX - ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die - ln -s "python${pymajor}" "${scriptdir}/python" || die - # python-config and pythonX-config - # note: we need to create a wrapper rather than symlinking it due - # to some random dirname(argv[0]) magic performed by python-config - cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die - #!/bin/sh - exec "${abiver}-config" "\${@}" - EOF - chmod +x "${scriptdir}/python${pymajor}-config" || die - ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die - # 2to3, pydoc - ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die - ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die - # idle - if use tk; then - ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die - fi }