From 71fb24e4cc15fe73651423df81c5e6a79fa8c142 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 22 Feb 2023 20:29:22 +0000 Subject: gentoo auto-resync : 22:02:2023 - 20:29:22 --- dev-ada/gnatcoll-bindings/Manifest | 3 +- .../files/gnatcoll-bindings-23.0.0-py_3_11.patch | 18 ++++ .../gnatcoll-bindings-23.0.0-r1.ebuild | 98 ++++++++++++++++++++++ .../gnatcoll-bindings-23.0.0.ebuild | 96 --------------------- 4 files changed, 118 insertions(+), 97 deletions(-) create mode 100644 dev-ada/gnatcoll-bindings/files/gnatcoll-bindings-23.0.0-py_3_11.patch create mode 100644 dev-ada/gnatcoll-bindings/gnatcoll-bindings-23.0.0-r1.ebuild delete mode 100644 dev-ada/gnatcoll-bindings/gnatcoll-bindings-23.0.0.ebuild (limited to 'dev-ada/gnatcoll-bindings') diff --git a/dev-ada/gnatcoll-bindings/Manifest b/dev-ada/gnatcoll-bindings/Manifest index 84edb7a1771c..344cd206507e 100644 --- a/dev-ada/gnatcoll-bindings/Manifest +++ b/dev-ada/gnatcoll-bindings/Manifest @@ -1,3 +1,4 @@ +AUX gnatcoll-bindings-23.0.0-py_3_11.patch 412 BLAKE2B 3d327f02b5305a7e0aa5414ec83be80ae62b6a2b93581846acf6306a3ab364c8ae07137bdffea1fce69a51c6bfa707daa0555ae49b7e69db0301c227896836ff SHA512 2539d5d96ec00cccef5b42fe5795d5cedffc528bb9e4d328007718f5189c61657cc77daf80a5f7da0a157c482e7146116ab6da8a9dd10afe68e1a3f30e3c548d DIST gnatcoll-bindings-23.0.0.tar.gz 251006 BLAKE2B 8cc5ada5c76d146d80c1b83bfbcfea28b9951339eb5dcdca40a4b40fdeb2ed2ad1971deea60b6fdc7cc2565745958d13fcc1acbd012465dea4cb2535e947af34 SHA512 3f92d3c95ffbcf96df53a1db39c9b829ae3d0a9ee3695d3d7726168bd6744ca4d4dfe4b224b50b50603c6295e1c0c6dd3d9940cf9e20c147a3bed8e6cc39c1ce -EBUILD gnatcoll-bindings-23.0.0.ebuild 2475 BLAKE2B 493290385f6ca4e32aea5f66d50a5cb0a5234418a82016d8e9e5c533e37d80580fab3f8e60b8635dc95574a76d7dd4c0ef79d83ca097d4058f7313ecaebe3661 SHA512 88937778a4d09187e913ada43f9d3b72eb698d486094c7090b79ae2ebe98ae8a0f98d0ae74011981672726ff46e01a60520dd826c8f3a0414c65646b4fe52af2 +EBUILD gnatcoll-bindings-23.0.0-r1.ebuild 2529 BLAKE2B 4eb33ade69bcf27b7f834bf8ff7c1163e392da17687ac85147869fcbdffd851c0c8eebb586c51c6727ac1a232daa4b947ed5fcf56c39cbb642ec3088b8a7e642 SHA512 067fc749430f589cbd8b2173367dd1f0ece21a1c05dad3653e0373196b7f194ef523414b298e13b5570dd4266b01d66aeb9d6d57082e9027e2b90139d2485187 MISC metadata.xml 1172 BLAKE2B 23758b9a71c24a6e635488947a6491713dd69750c62715b1fe0eb12db380d1ecc80ebb4941a00a9ae01ce2009316849e802560bc52402fed64b671547951cf89 SHA512 1ea356da231ee9b42df8733e0ca6c3cbb5e3a2f0eb143bc894a8961e82b69f2e05b0f5d8dba309dc6b0556c4340bb51175fe9aa5a272aae006eed4a2cf449098 diff --git a/dev-ada/gnatcoll-bindings/files/gnatcoll-bindings-23.0.0-py_3_11.patch b/dev-ada/gnatcoll-bindings/files/gnatcoll-bindings-23.0.0-py_3_11.patch new file mode 100644 index 000000000000..e4c3960c236f --- /dev/null +++ b/dev-ada/gnatcoll-bindings/files/gnatcoll-bindings-23.0.0-py_3_11.patch @@ -0,0 +1,18 @@ +--- a/python/python_support.c 2023-02-22 20:16:04.746476700 +0100 ++++ b/python/python_support.c 2023-02-22 20:18:46.762891565 +0100 +@@ -814,13 +814,13 @@ + PyCodeObject* + ada_pyframe_get_code (PyFrameObject* obj) + { +- return obj->f_code; ++ return PyFrame_GetCode(obj); + } + + PyFrameObject* + ada_pyframe_get_back (PyFrameObject* obj) + { +- return obj->f_back; ++ return PyFrame_GetBack(obj); + } + + PyObject* diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-23.0.0-r1.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-23.0.0-r1.ebuild new file mode 100644 index 000000000000..763e56aeaffe --- /dev/null +++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-23.0.0-r1.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +ADA_COMPAT=( gnat_2021 gcc_12 gcc_12_2_0 ) +inherit ada multiprocessing python-single-r1 + +DESCRIPTION="GNAT Component Collection" +HOMEPAGE="http://libre.adacore.com" +SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz + -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0/${PV}" +KEYWORDS="amd64 x86" +IUSE="gmp iconv lzma openmp python readline +shared static-libs static-pic syslog" +REQUIRED_USE="|| ( shared static-libs static-pic ) + || ( gmp iconv lzma openmp python readline syslog ) + ${PYTHON_REQUIRED_USE} + ${ADA_REQUIRED_USE}" + +RDEPEND="${PYTHON_DEPS} + ${ADA_DEPS} + dev-ada/gnatcoll-core:=[${ADA_USEDEP},shared?,static-libs?,static-pic?] + gmp? ( dev-libs/gmp:* ) + lzma? ( app-arch/xz-utils ) + openmp? ( dev-lang/gnat-gpl:=[openmp] ) + " +DEPEND="${RDEPEND} + dev-ada/gprbuild[${ADA_USEDEP}]" + +QA_EXECSTACK=usr/lib/gnatcoll_readline.*/libgnatcoll_readline.* + +PATCHES=( "${FILESDIR}"/${P}-py_3_11.patch ) + +pkg_setup() { + python-single-r1_pkg_setup + ada_pkg_setup +} + +src_prepare() { + rm -r python || die + mv python3 python || die + default +} + +src_compile() { + build () { + gprbuild -j$(makeopts_jobs) -m -p -v \ + -XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \ + -XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \ + -XGNATCOLL_VERSION=${PV} \ + -XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \ + -XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \ + -cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed" + } + for kind in shared static-libs static-pic ; do + if use $kind; then + lib=${kind%-libs} + lib=${lib/shared/relocatable} + for dir in gmp iconv lzma python readline syslog ; do + if use $dir; then + build $dir $lib + fi + done + if use openmp; then + build omp $lib + fi + fi + done +} + +src_install() { + build () { + gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \ + -XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \ + -XGNATCOLL_VERSION=${PV} --build-var=LIBRARY_TYPE \ + -XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2 + } + for kind in shared static-libs static-pic ; do + if use $kind; then + lib=${kind%-libs} + lib=${lib/shared/relocatable} + for dir in gmp iconv lzma python readline syslog ; do + if use $dir; then + build $dir $lib + fi + done + if use openmp; then + build omp $lib + fi + fi + done + rm -rf "${D}"/usr/share/gpr/manifests + einstalldocs +} diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-23.0.0.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-23.0.0.ebuild deleted file mode 100644 index c265ed8ecc08..000000000000 --- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-23.0.0.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{9,10} ) -ADA_COMPAT=( gnat_2021 gcc_12_2_0 ) -inherit ada multiprocessing python-single-r1 - -DESCRIPTION="GNAT Component Collection" -HOMEPAGE="http://libre.adacore.com" -SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz - -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0/${PV}" -KEYWORDS="amd64 x86" -IUSE="gmp iconv lzma openmp python readline +shared static-libs static-pic syslog" -REQUIRED_USE="|| ( shared static-libs static-pic ) - || ( gmp iconv lzma openmp python readline syslog ) - ${PYTHON_REQUIRED_USE} - ${ADA_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - ${ADA_DEPS} - dev-ada/gnatcoll-core:=[${ADA_USEDEP},shared?,static-libs?,static-pic?] - gmp? ( dev-libs/gmp:* ) - lzma? ( app-arch/xz-utils ) - openmp? ( dev-lang/gnat-gpl:=[openmp] ) - " -DEPEND="${RDEPEND} - dev-ada/gprbuild[${ADA_USEDEP}]" - -QA_EXECSTACK=usr/lib/gnatcoll_readline.*/libgnatcoll_readline.* - -pkg_setup() { - python-single-r1_pkg_setup - ada_pkg_setup -} - -src_prepare() { - rm -r python || die - mv python3 python || die - default -} - -src_compile() { - build () { - gprbuild -j$(makeopts_jobs) -m -p -v \ - -XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \ - -XLIBRARY_TYPE=$2 -P $1/gnatcoll_$1.gpr -XBUILD="PROD" \ - -XGNATCOLL_VERSION=${PV} \ - -XGNATCOLL_ICONV_OPT= -XGNATCOLL_PYTHON_CFLAGS="-I$(python_get_includedir)" \ - -XGNATCOLL_PYTHON_LIBS=$(python_get_library_path) \ - -cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed" - } - for kind in shared static-libs static-pic ; do - if use $kind; then - lib=${kind%-libs} - lib=${lib/shared/relocatable} - for dir in gmp iconv lzma python readline syslog ; do - if use $dir; then - build $dir $lib - fi - done - if use openmp; then - build omp $lib - fi - fi - done -} - -src_install() { - build () { - gprinstall -p -f -XBUILD=PROD --prefix="${D}"/usr -XLIBRARY_TYPE=$2 \ - -XGPR_BUILD=$2 -XGNATCOLL_CORE_BUILD=$2 \ - -XGNATCOLL_VERSION=${PV} --build-var=LIBRARY_TYPE \ - -XGNATCOLL_ICONV_OPT= -P $1/gnatcoll_$1.gpr --build-name=$2 - } - for kind in shared static-libs static-pic ; do - if use $kind; then - lib=${kind%-libs} - lib=${lib/shared/relocatable} - for dir in gmp iconv lzma python readline syslog ; do - if use $dir; then - build $dir $lib - fi - done - if use openmp; then - build omp $lib - fi - fi - done - rm -rf "${D}"/usr/share/gpr/manifests - einstalldocs -} -- cgit v1.2.3