commit: 4fb7a78a9c4aa2e4a9ba7bb1370ecad011a76b82 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Tue Apr 22 10:50:08 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu May 1 11:36:10 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fb7a78a
dev-lang/pypy: Remove python-exec/symlink from 3.10* Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> Part-of: https://github.com/gentoo/gentoo/pull/41697 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> ...0.7.3.19_p2.ebuild => pypy-3.10.7.3.19_p2-r1.ebuild} | 17 +---------------- ...0.7.3.19_p3.ebuild => pypy-3.10.7.3.19_p3-r1.ebuild} | 17 +---------------- dev-lang/pypy/pypy-3.11.7.3.19_p5-r1.ebuild | 2 +- dev-lang/pypy/pypy-3.11.7.3.19_p6-r1.ebuild | 2 +- 4 files changed, 4 insertions(+), 34 deletions(-) diff --git a/dev-lang/pypy/pypy-3.10.7.3.19_p2.ebuild b/dev-lang/pypy/pypy-3.10.7.3.19_p2-r1.ebuild similarity index 93% rename from dev-lang/pypy/pypy-3.10.7.3.19_p2.ebuild rename to dev-lang/pypy/pypy-3.10.7.3.19_p2-r1.ebuild index 71b0224f5834..9c152a12f7b3 100644 --- a/dev-lang/pypy/pypy-3.10.7.3.19_p2.ebuild +++ b/dev-lang/pypy/pypy-3.10.7.3.19_p2-r1.ebuild @@ -29,7 +29,7 @@ LICENSE="MIT" # also check pypy/interpreter/pycode.py -> pypy_incremental_magic SLOT="${PYVER}/pypy310-pp73-384" KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="+ensurepip gdbm +jit ncurses sqlite +symlink +test-install tk" +IUSE="+ensurepip gdbm +jit ncurses sqlite +test-install tk" # many tests are failing upstream # see https://buildbot.pypy.org/summary?branch=py${PYVER} RESTRICT="test" @@ -39,7 +39,6 @@ RDEPEND=" >=dev-python/pypy3_10-exe-${PYPY_PV}:${PYPY_PV}[bzip2(+),ncurses?] >=dev-python/pypy3_10-exe-bin-${PYPY_PV}:${PYPY_PV} ) - dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= dev-python/gentoo-common ensurepip? ( dev-python/ensurepip-wheels ) @@ -50,9 +49,6 @@ RDEPEND=" dev-tcltk/tix:0= ) !dev-python/pypy3_10 - symlink? ( - !<dev-python/pypy3-7.3.17-r100 - ) " DEPEND=" ${RDEPEND} @@ -225,15 +221,4 @@ src_install() { # remove to avoid collisions rm "${PYTHON}" || die - - if use symlink; then - dosym pypy${PYVER} /usr/bin/pypy3 - - # install symlinks for python-exec - local EPYTHON=pypy3 - local scriptdir=${D}$(python_get_scriptdir) - mkdir -p "${scriptdir}" || die - ln -s "../../../bin/pypy3" "${scriptdir}/python3" || die - ln -s python3 "${scriptdir}/python" || die - fi } diff --git a/dev-lang/pypy/pypy-3.10.7.3.19_p3.ebuild b/dev-lang/pypy/pypy-3.10.7.3.19_p3-r1.ebuild similarity index 93% rename from dev-lang/pypy/pypy-3.10.7.3.19_p3.ebuild rename to dev-lang/pypy/pypy-3.10.7.3.19_p3-r1.ebuild index 35830df8d6c3..f623a4529096 100644 --- a/dev-lang/pypy/pypy-3.10.7.3.19_p3.ebuild +++ b/dev-lang/pypy/pypy-3.10.7.3.19_p3-r1.ebuild @@ -29,7 +29,7 @@ LICENSE="MIT" # also check pypy/interpreter/pycode.py -> pypy_incremental_magic SLOT="${PYVER}/pypy310-pp73-384" KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="+ensurepip gdbm +jit ncurses sqlite +symlink +test-install tk" +IUSE="+ensurepip gdbm +jit ncurses sqlite +test-install tk" # many tests are failing upstream # see https://buildbot.pypy.org/summary?branch=py${PYVER} RESTRICT="test" @@ -39,7 +39,6 @@ RDEPEND=" >=dev-python/pypy3_10-exe-${PYPY_PV}:${PYPY_PV}[bzip2(+),ncurses?] >=dev-python/pypy3_10-exe-bin-${PYPY_PV}:${PYPY_PV} ) - dev-lang/python-exec[python_targets_pypy3(-)] dev-libs/openssl:0= dev-python/gentoo-common ensurepip? ( dev-python/ensurepip-wheels ) @@ -50,9 +49,6 @@ RDEPEND=" dev-tcltk/tix:0= ) !dev-python/pypy3_10 - symlink? ( - !<dev-python/pypy3-7.3.17-r100 - ) " DEPEND=" ${RDEPEND} @@ -225,15 +221,4 @@ src_install() { # remove to avoid collisions rm "${PYTHON}" || die - - if use symlink; then - dosym pypy${PYVER} /usr/bin/pypy3 - - # install symlinks for python-exec - local EPYTHON=pypy3 - local scriptdir=${D}$(python_get_scriptdir) - mkdir -p "${scriptdir}" || die - ln -s "../../../bin/pypy3" "${scriptdir}/python3" || die - ln -s python3 "${scriptdir}/python" || die - fi } diff --git a/dev-lang/pypy/pypy-3.11.7.3.19_p5-r1.ebuild b/dev-lang/pypy/pypy-3.11.7.3.19_p5-r1.ebuild index 070eefb0cf95..ecd19ecf06a9 100644 --- a/dev-lang/pypy/pypy-3.11.7.3.19_p5-r1.ebuild +++ b/dev-lang/pypy/pypy-3.11.7.3.19_p5-r1.ebuild @@ -50,7 +50,7 @@ RDEPEND=" dev-tcltk/tix:0= ) symlink? ( - !dev-lang/pypy:3.10[symlink] + !dev-lang/pypy:3.10[symlink(-)] !<dev-python/pypy3-7.3.17-r100 ) " diff --git a/dev-lang/pypy/pypy-3.11.7.3.19_p6-r1.ebuild b/dev-lang/pypy/pypy-3.11.7.3.19_p6-r1.ebuild index f8d4c20d0010..3601b5226f4d 100644 --- a/dev-lang/pypy/pypy-3.11.7.3.19_p6-r1.ebuild +++ b/dev-lang/pypy/pypy-3.11.7.3.19_p6-r1.ebuild @@ -50,7 +50,7 @@ RDEPEND=" dev-tcltk/tix:0= ) symlink? ( - !dev-lang/pypy:3.10[symlink] + !dev-lang/pypy:3.10[symlink(-)] !<dev-python/pypy3-7.3.17-r100 ) "
