From 7c5ebaf83da4c538dd11b56fdd5dfdf39dcbc096 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 10 Mar 2025 01:49:12 +0000 Subject: gentoo auto-resync : 10:03:2025 - 01:49:12 --- dev-lang/Manifest.gz | Bin 22670 -> 22666 bytes dev-lang/pypy/Manifest | 2 +- dev-lang/pypy/pypy-3.11.7.3.19_p4-r1.ebuild | 239 +++++++++++++++++++++++++ dev-lang/pypy/pypy-3.11.7.3.19_p4.ebuild | 239 ------------------------- dev-lang/python-exec/Manifest | 2 +- dev-lang/python-exec/python-exec-2.4.10.ebuild | 4 +- dev-lang/uasm/Manifest | 5 +- dev-lang/uasm/files/bool-fix.diff | 18 ++ dev-lang/uasm/uasm-2.56.2.ebuild | 3 +- dev-lang/uasm/uasm-2.57.ebuild | 1 + 10 files changed, 267 insertions(+), 246 deletions(-) create mode 100644 dev-lang/pypy/pypy-3.11.7.3.19_p4-r1.ebuild delete mode 100644 dev-lang/pypy/pypy-3.11.7.3.19_p4.ebuild create mode 100644 dev-lang/uasm/files/bool-fix.diff (limited to 'dev-lang') diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz index d256bf3e8c03..c5ef9eb94983 100644 Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ diff --git a/dev-lang/pypy/Manifest b/dev-lang/pypy/Manifest index f6826af68cc7..421c9c74cc00 100644 --- a/dev-lang/pypy/Manifest +++ b/dev-lang/pypy/Manifest @@ -12,5 +12,5 @@ EBUILD pypy-2.7.7.3.17.ebuild 7390 BLAKE2B b840b2c94b60e9d39aae7d5062c56f398428e EBUILD pypy-2.7.7.3.19.ebuild 7392 BLAKE2B 4b35786d65011016b75f0e173c047582b025d4f7f89f9f86e2c7fd7dcfb388b77a31f6f515393a47101756999ee495b7620de43c4275732d221ba964b066c412 SHA512 45baadb55e445268f792ff4bf75d40e611482e5c68635e411266d10c899de08d784e4ec6137a951b7e43ad9e2c2aae2f5c1818d686cfeba684bf07acbfba8c34 EBUILD pypy-3.10.7.3.17_p4.ebuild 7140 BLAKE2B db6bfe1c3d44cdf9f4a1639c6bf8e35253c0ac3687f3a1315bfd52ca82c4a6fa0c3626c2aad938f8bcf2b2b6851db6fa1ed5f1847a891a08800040e0e4c27ea4 SHA512 efe64c07cfbdcb2fafbbbb93adeda1fd3ba22164130cb908d8bf26d0d82713fca179463f44673fb262573dca96a468573b53e67ab97d3f51563e23888afadfff EBUILD pypy-3.10.7.3.19_p1.ebuild 7156 BLAKE2B a7fe73c92496bda2a55a45cea4cb8a22df0d736571c9e616d4852d06128259326b66961169f7241a40aad26df17e336234947f0cd50dc81061e0936f5def653a SHA512 c3faeb02451b5cf360df330446468da253201fe5e234f055bf627dbcd72aae47d59049dd38cfafc0fcbe8ddc3df7147625bbfef5a3061e8d5a54bea861d0334f -EBUILD pypy-3.11.7.3.19_p4.ebuild 7092 BLAKE2B 8d4ae9c0cc4a63598eecf8b7235bb9b98564ba658046abeae26b63109a86d921e4e867eb373c592aa65ded09c725c341be4ca6f467794d7de2b1f8d9d7118cc5 SHA512 4a533c9c434bebd91c69d8389f9231c8760a9a57a25827720924459ee14737d5a29a481c9071c71b67c3c799180048e4ded046fcd8db39cec20ebff73fa7dc31 +EBUILD pypy-3.11.7.3.19_p4-r1.ebuild 7108 BLAKE2B 95193522904c4fbf328320216c44b325e81902bbe5e6e06a489ea32276342d6a4ad7812a150aafc1b549dff48c9e7608d4e6c9dc42d3648c4d17f86b5f6d1978 SHA512 837f0f743512358cd5d3b3ccd6a56f1893dbe660a8bf17cdb639ff25c2b4aa32cd1c9510ff1e6ea31d8074e1655d1042ee63cc3e058be167e73b9cc25f83521d MISC metadata.xml 1124 BLAKE2B f1d09d26175cf20d1440a9a83352cf6f2f2e514d35d95116caf4a5ee86547f0165a6369e7a6b129ded75d28ba5a0c1c8f4da7d664d7c1e3c1e95153593057b3c SHA512 ae95400c9a1efc75372201c2353b128302355d1d087094953d73c325fa72bc24662d31c7287ae6a2583448ac345bb60744ac19391e07f8da8ef0327627e0e462 diff --git a/dev-lang/pypy/pypy-3.11.7.3.19_p4-r1.ebuild b/dev-lang/pypy/pypy-3.11.7.3.19_p4-r1.ebuild new file mode 100644 index 000000000000..1f0343dc478f --- /dev/null +++ b/dev-lang/pypy/pypy-3.11.7.3.19_p4-r1.ebuild @@ -0,0 +1,239 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multiprocessing pax-utils python-utils-r1 toolchain-funcs + +PYVER=$(ver_cut 1-2) +PATCHSET_PV=$(ver_cut 3-) +PYPY_PV=${PATCHSET_PV%_p*} + +MY_P="pypy${PYVER}-v${PYPY_PV/_}" +PATCHSET="pypy${PYVER}-gentoo-patches-${PATCHSET_PV/_rc/rc}" + +DESCRIPTION="A fast, compliant alternative implementation of the Python (${PYVER}) language" +HOMEPAGE=" + https://pypy.org/ + https://github.com/pypy/pypy/ +" +SRC_URI=" + https://downloads.python.org/pypy/${MY_P}-src.tar.bz2 + https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2 + https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz +" +S="${WORKDIR}/${MY_P}-src" + +LICENSE="MIT" +# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))' +# also check pypy/interpreter/pycode.py -> pypy_incremental_magic +SLOT="${PYVER}/pypy311-pp73-416" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="+ensurepip gdbm +jit ncurses sqlite symlink +test-install tk" +# many tests are failing upstream +# see https://buildbot.pypy.org/summary?branch=py${PYVER} +RESTRICT="test" + +RDEPEND=" + || ( + dev-lang/pypy3-exe:${PV%_p*}[bzip2(+),ncurses?] + dev-lang/pypy3-exe-bin:${PV%_p*} + ) + dev-lang/python-exec[python_targets_pypy3(-)] + dev-libs/openssl:0= + dev-python/gentoo-common + ensurepip? ( dev-python/ensurepip-wheels ) + gdbm? ( sys-libs/gdbm:0= ) + sqlite? ( dev-db/sqlite:3= ) + tk? ( + dev-lang/tk:0= + dev-tcltk/tix:0= + ) + symlink? ( + !dev-lang/pypy:3.10[symlink] + ! lib-python/3/epython.py || die + + einfo "Generating caches and CFFI modules ..." + + # Generate Grammar and PatternGrammar pickles. + "./pypy${PYVER}-c" - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed" + import lib2to3.pygram + import lib2to3.patcomp + lib2to3.patcomp.PatternCompiler() + EOF + + # Generate cffi modules + # Please keep in sync with lib_pypy/pypy_tools/build_cffi_imports.py! + # (NB: we build CFFI modules first to avoid error log when importing + # build_cffi_imports). + cffi_targets=( + pypy_util blake2/_blake2 sha3/_sha3 ssl + audioop syslog pwdgrp resource lzma posixshmem + ctypes_test testmultiphase + ) + use gdbm && cffi_targets+=( gdbm ) + use ncurses && cffi_targets+=( curses ) + use sqlite && cffi_targets+=( sqlite3 ) + use tk && cffi_targets+=( tkinter/tklib ) + + local t + # all modules except tkinter output to . + # tkinter outputs to the correct dir ... + cd lib_pypy || die + for t in "${cffi_targets[@]}"; do + # tkinter doesn't work via -m + "../pypy${PYVER}-c" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}" + done + # testcapi does not have a "build" script + "../pypy${PYVER}-c" -c "import _testcapi" || die + + # Verify that CFFI module list is up-to-date + local expected_cksum=a4138e48 + local local_cksum=$( + "../pypy${PYVER}-c" - <<-EOF + import binascii + import json + from pypy_tools.build_cffi_imports import cffi_build_scripts as x + print("%08x" % (binascii.crc32(json.dumps(x).encode()),)) + EOF + ) + if [[ ${local_cksum} != ${expected_cksum} ]]; then + die "Please verify cffi_targets and update checksum to ${local_cksum}" + fi + + # Cleanup temporary objects + find \( -name "*_cffi.c" -o -name '*.o' \) -delete || die + find -type d -empty -delete || die + cd .. || die + + # Generate sysconfig data + local host_gnu_type=$(sh pypy/tool/release/config.guess) + local overrides=( + HOST_GNU_TYPE "${host_gnu_type:-unknown}" + INCLUDEPY "${EPREFIX}/usr/include/pypy${PYVER}" + LIBDIR "${EPREFIX}/usr/$(get_libdir)" + TZPATH "${EPREFIX}/usr/share/zoneinfo" + WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip" + ) + "./pypy${PYVER}-c" -m sysconfig --generate-posix-vars "${overrides[@]}" || die + local outdir + outdir=$( pypy_incremental_magic -SLOT="${PYVER}/pypy311-pp73-416" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="+ensurepip gdbm +jit ncurses sqlite symlink +test-install tk" -# many tests are failing upstream -# see https://buildbot.pypy.org/summary?branch=py${PYVER} -RESTRICT="test" - -RDEPEND=" - || ( - dev-lang/pypy3-exe:${PV%_p*}[bzip2(+),ncurses?] - dev-lang/pypy3-exe-bin:${PV%_p*} - ) - dev-lang/python-exec[python_targets_pypy3(-)] - dev-libs/openssl:0= - dev-python/gentoo-common - ensurepip? ( dev-python/ensurepip-wheels ) - gdbm? ( sys-libs/gdbm:0= ) - sqlite? ( dev-db/sqlite:3= ) - tk? ( - dev-lang/tk:0= - dev-tcltk/tix:0= - ) - symlink? ( - !dev-lang/pypy:3.10[symlink] - ! lib-python/3/epython.py || die - - einfo "Generating caches and CFFI modules ..." - - # Generate Grammar and PatternGrammar pickles. - "./pypy${PYVER}-c" - <<-EOF || die "Generation of Grammar and PatternGrammar pickles failed" - import lib2to3.pygram - import lib2to3.patcomp - lib2to3.patcomp.PatternCompiler() - EOF - - # Generate cffi modules - # Please keep in sync with lib_pypy/pypy_tools/build_cffi_imports.py! - # (NB: we build CFFI modules first to avoid error log when importing - # build_cffi_imports). - cffi_targets=( - pypy_util blake2/_blake2 sha3/_sha3 ssl - audioop syslog pwdgrp resource lzma posixshmem - ctypes_test testmultiphase - ) - use gdbm && cffi_targets+=( gdbm ) - use ncurses && cffi_targets+=( curses ) - use sqlite && cffi_targets+=( sqlite3 ) - use tk && cffi_targets+=( tkinter/tklib ) - - local t - # all modules except tkinter output to . - # tkinter outputs to the correct dir ... - cd lib_pypy || die - for t in "${cffi_targets[@]}"; do - # tkinter doesn't work via -m - "../pypy${PYVER}-c" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}" - done - # testcapi does not have a "build" script - "../pypy${PYVER}-c" -c "import _testcapi" || die - - # Verify that CFFI module list is up-to-date - local expected_cksum=a4138e48 - local local_cksum=$( - "../pypy${PYVER}-c" - <<-EOF - import binascii - import json - from pypy_tools.build_cffi_imports import cffi_build_scripts as x - print("%08x" % (binascii.crc32(json.dumps(x).encode()),)) - EOF - ) - if [[ ${local_cksum} != ${expected_cksum} ]]; then - die "Please verify cffi_targets and update checksum to ${local_cksum}" - fi - - # Cleanup temporary objects - find \( -name "*_cffi.c" -o -name '*.o' \) -delete || die - find -type d -empty -delete || die - cd .. || die - - # Generate sysconfig data - local host_gnu_type=$(sh pypy/tool/release/config.guess) - local overrides=( - HOST_GNU_TYPE "${host_gnu_type:-unknown}" - INCLUDEPY "${EPREFIX}/usr/include/pypy${PYVER}" - LIBDIR "${EPREFIX}/usr/$(get_libdir)" - TZPATH "${EPREFIX}/usr/share/zoneinfo" - WHEEL_PKG_DIR "${EPREFIX}/usr/lib/python/ensurepip" - ) - "./pypy${PYVER}-c" -m sysconfig --generate-posix-vars "${overrides[@]}" || die - local outdir - outdir=$(= 1070 && defined(__cplusplus)) +- #define BOOL_DEFINED +- typedef unsigned char bool; +-#endif ++#include + #ifndef TRUE + #define TRUE 1 + #endif diff --git a/dev-lang/uasm/uasm-2.56.2.ebuild b/dev-lang/uasm/uasm-2.56.2.ebuild index 5a0d38620ed2..71f4e7f3518f 100644 --- a/dev-lang/uasm/uasm-2.56.2.ebuild +++ b/dev-lang/uasm/uasm-2.56.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2024 Gentoo Authors +# Copyright 2024-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,6 +16,7 @@ KEYWORDS="amd64" PATCHES=( "${FILESDIR}/build-fix.patch" "${FILESDIR}/makefile-dep-fix.patch" + "${FILESDIR}/bool-fix.diff" ) src_prepare() { diff --git a/dev-lang/uasm/uasm-2.57.ebuild b/dev-lang/uasm/uasm-2.57.ebuild index bb8e70dfc0ff..4aff172e02f6 100644 --- a/dev-lang/uasm/uasm-2.57.ebuild +++ b/dev-lang/uasm/uasm-2.57.ebuild @@ -17,6 +17,7 @@ KEYWORDS="~amd64" PATCHES=( "${FILESDIR}/build-fix.patch" "${FILESDIR}/makefile-dep-fix-2.57.patch" + "${FILESDIR}/bool-fix.diff" ) src_prepare() { -- cgit v1.2.3