From 71fb24e4cc15fe73651423df81c5e6a79fa8c142 Mon Sep 17 00:00:00 2001 From: V3n3RiX <venerix@koprulu.sector> Date: Wed, 22 Feb 2023 20:29:22 +0000 Subject: gentoo auto-resync : 22:02:2023 - 20:29:22 --- dev-ada/Manifest.gz | Bin 4566 -> 4566 bytes dev-ada/e3-core/Manifest | 2 +- dev-ada/e3-core/e3-core-22.2.0.ebuild | 2 +- 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 -------------------- dev-ada/gnatcoll-core/Manifest | 2 +- dev-ada/gnatcoll-core/gnatcoll-core-23.0.0.ebuild | 4 +- dev-ada/libgpr/Manifest | 2 +- dev-ada/libgpr/libgpr-23.0.0.ebuild | 2 +- 11 files changed, 125 insertions(+), 104 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') diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz index d111ba798eb0..6c736bf509e0 100644 Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ diff --git a/dev-ada/e3-core/Manifest b/dev-ada/e3-core/Manifest index b3877db7fb5d..777148f1ac23 100644 --- a/dev-ada/e3-core/Manifest +++ b/dev-ada/e3-core/Manifest @@ -1,5 +1,5 @@ AUX e3-core-22.1.0-distro.patch 1143 BLAKE2B ebe7fd0b37ed6dbbe506f4bb86aa8b3bbf59b5e1475b65db07b2a8b28ab86f30998f381c976e9b1eb0f5222171a3c6a592bf7d6a3364a0a0a6c1eb307c0261ef SHA512 16ba2640ecb260702272da1d87b92ce779459da47ef4c1cdc6ad4f5fe98740501df88bc2ef849c55f0eb482a99ab376876af1f5a38a02fe0aeef085c190ecba0 AUX e3-core-22.1.0-test.patch 1057 BLAKE2B 4a8d5ea01e2cd51c297f58db18a25844197bdbaa725260de3eeace06dc3afa74332f10df685947b8bb21e4554920c72eb2c5d08d334d2f77989241510ee00098 SHA512 0771e4d08c611c3b39a695830a30b279470a97e0ccc4c2d6ef0ed184bcbc784240231a93942b89919b4718ed8ede1d3e7b9ff9acf66b547b369fa702cc05f384 DIST e3-core-22.2.0.tar.gz 383417 BLAKE2B ef595dc785b0073a53ddb06ab1ab7b1a0e9eea0131d2a15318f6355a581f83d14f61f6b0f23d4e3df4afe31e0c03a6b1b4ca8b5aefdb3f982ccaa3454f127f0d SHA512 a2bc2a183b3fed9ad2f0119406dc26857254e4a68014f618a75c062518b990e5f1f3af72e9dc321dea3f9248bd97bded87a20b5389a3e03f2d3b76bb83f56216 -EBUILD e3-core-22.2.0.ebuild 1424 BLAKE2B 19cb1f1c0dbfa00e06c25e7c0be8c49c41b01c2b79f3ec63fe51f1b094989a36564bd3bb28a29cbf285f8b4fdfba5efe7c8a1a2408a4a8c6472d3124846fd338 SHA512 fae4f93f5444f2cc6ea641443c7f661e908ec65de3aad7e5a1824267e803a6f01557c3f15eba2877803efee4af0557ad7b7ca0278d19b2debe9d1376e6bcf421 +EBUILD e3-core-22.2.0.ebuild 1430 BLAKE2B 96acd15cc3f6d01bcc1f459d48df3a42b4c2abee2d8a75592aa2d1611bf0384c8796ae38adbf2c154eba4d0c5a7fb312033de83e76e8ea7d1c64b12be0b1b219 SHA512 da19773ac2b09ed0e04fb20acddc2a6c8b48e44e1d6751a0d28b388eddf1a9db1a386326e60a2283331236fb7f26bdfd9c8a81383de979975938117ec2689806 MISC metadata.xml 1257 BLAKE2B c5170ed783bde8d288632069c3e5496d50dfd77a0f7fb62e00964660bd7b3c482509bdf8983af16d1aa7be6bd9ee20708711fc688f002d5bace078c93c4ed212 SHA512 d7fd1018cb701d777e3246fe91b018ea25ebd5bc641e6897d683dee0fcfdd1841d13f9701212d15e81cde531f8e26d10cc156c9ed47125dfbcbc6bd5bacf18af diff --git a/dev-ada/e3-core/e3-core-22.2.0.ebuild b/dev-ada/e3-core/e3-core-22.2.0.ebuild index 1d932fed8927..f205b8d8327d 100644 --- a/dev-ada/e3-core/e3-core-22.2.0.ebuild +++ b/dev-ada/e3-core/e3-core-22.2.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_10 ) +PYTHON_COMPAT=( python3_{10..11} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 toolchain-funcs 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 -} diff --git a/dev-ada/gnatcoll-core/Manifest b/dev-ada/gnatcoll-core/Manifest index bdbc226efabd..aaa12289cdb0 100644 --- a/dev-ada/gnatcoll-core/Manifest +++ b/dev-ada/gnatcoll-core/Manifest @@ -1,4 +1,4 @@ AUX gnatcoll-core-2018-gentoo.patch 555 BLAKE2B d0913c845f4f7d96afbcec5d400599535417ee1c7b0d9f3c1e0c8766218c6a2556ff2de3e39febc1882b31e947876ca0849fad1564970f422530e58a8966c638 SHA512 90ef785337cb85aa7e2e2b5d0a24efc963512aa19780b215a96a1db6d980e55ff3b1409939e6d77913bf6416d158402ca900fd3ccc4cfb5362ee7440dfb42b64 DIST gnatcoll-core-23.0.0.tar.gz 745131 BLAKE2B 25e5f17adf88c48f45cc30cfbd82e2213233aecd78c9c22455ac6458e2f336f527604911c9eaaa1ab8853e0a16bbe9e1a7b8f31481ee9c2894287ec16e961123 SHA512 49f33abe07d2c4b51a6e69be550d05c5794953f4fbe8cb15e29c9834b9c5600724acaff4156fb53e4146620f1e4335f4c22453215a39ec5ee95b3992528b9828 -EBUILD gnatcoll-core-23.0.0.ebuild 1625 BLAKE2B 7cb9e754208f652aa094dac888bf92c31531c1b5165643478055f9a7b645b5a51ea034b2e456e45c3afb528e624e87fc80748249c36533299823a7e569af519d SHA512 3e33fb347a77ef0830d69d93d29e2d253879d6e044b19c094e8631d618e231b4dffb0b62edf51e8cf9e2d57e6fd8569aebf07861465a40e264740d8d98731328 +EBUILD gnatcoll-core-23.0.0.ebuild 1632 BLAKE2B 17804bbfd6d18093318dfb71c48018d351366294d0a2aa2b291685d66a79d7bb8d2fb8971077bc452250093abfe68ec658ab4334ed7ce4791e2ef256422c4c90 SHA512 cd3a4e14f3f29b11604f80f9b1568bdb990bba796c8c0747b1bd7d67be95ad9755f02ed24f96e6b66751bbbc8cc94bce1e96514aacd20658f9414c542d7a5967 MISC metadata.xml 1182 BLAKE2B 3f9bf3841b3006cc8ca840bab94c1324f2fca7ceab33eabcb2d6b6d6a7b27562a24821129285ded3e764b3185ca81b6774fa11e54b27f392b6234fd66223e5b4 SHA512 ec28eeb7f441eb5e5181dbc6bab19b647fba1cf2786238353040d409afaf520803c34b26a94c8583fc2858cb3e674a3ac525e42f6b447f478fb2cdae4c9add18 diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-23.0.0.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-23.0.0.ebuild index 02fc254f60e5..692235f6c84b 100644 --- a/dev-ada/gnatcoll-core/gnatcoll-core-23.0.0.ebuild +++ b/dev-ada/gnatcoll-core/gnatcoll-core-23.0.0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -ADA_COMPAT=( gnat_2021 gcc_12_2_0 ) +EAPI=8 +ADA_COMPAT=( gnat_2021 gcc_12 gcc_12_2_0 ) inherit ada multiprocessing DESCRIPTION="GNAT Component Collection Core packages" diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest index f303a1f12785..bab41b083868 100644 --- a/dev-ada/libgpr/Manifest +++ b/dev-ada/libgpr/Manifest @@ -1,4 +1,4 @@ AUX libgpr-2020-gentoo.patch 321 BLAKE2B fe3affe50712460474125d074936fd9db526c4392e6ecb8bbcb07091e9971042368ee134112d9550ffc9fd2a0ab23371e7bb760b3d8e53cd4ca0e54e0522f604 SHA512 2bcae85d30a41333664f17f097f31cf21b270c43092e823dda256098c928d4ccdab62f9d349b57f941b50bb676649aedf5f978a05f3afaf1ee234e4515c305b5 DIST gprbuild-23.0.0.tar.gz 952887 BLAKE2B a0de49e838dd41ca927d728dc2e7f23298bb3e7f865146ed6807e1da0f20fe9ce345d972ef93340f1a1fec91082ce14b575ad4e6642d759cb9d696602f291508 SHA512 d3b1af5295c0216eaa93e52b63ca51ceeaea324a3a3f40644e294f9048170f9294335e7e8ee2d77d99d4d9bb359267921632a01d43485d841b6e771143fb47a5 -EBUILD libgpr-23.0.0.ebuild 1504 BLAKE2B a229f3c7ce451cf24947e06890de4639684a61a5dac10a08961cc3f44da9b1959f2add75618f1740ed1e543e9098bf91b17f6dd43c838d76f00bc3c7748b1f00 SHA512 f38fb8515c9dbe6b65d94eff2224705c241edb8d081944bc2188f060ec395413349c4986f38e2d655c836840805c1c5cb352b92c78b594f8ef6b0e2c372ff232 +EBUILD libgpr-23.0.0.ebuild 1511 BLAKE2B a7bcda3a99e1821d358aab276eb4dfb20afe1db3f58f5accfc4e283106c2bb63d20872b83baa4f2ef00656bb95f4ba4da8c9c76fde0d02299db4410d1fe8dc12 SHA512 c983ea9e4ef9dd5c74145137178388d26e6b23cde3c96c52fc6bed1a6bb120f9ff721b5326b497d38f5d608a804700b65124b7739786f2074474b19c7583703d MISC metadata.xml 1021 BLAKE2B 448e77605bee95104afac31b48193217ee6c38af0b4e63cdee2c5d8e420a7f9b9a13c1302cfe49a109ab5c878808582a6f4a3ca3315e41b256f529d202bc1b4b SHA512 71427b65c100cba3e66d889124f27f1e378ad72559e7165ec93a4ffc68b7efe12db81ee5ec83aa92939b922d3efcfb3a5641c46db772a25bae21ce51acec5f47 diff --git a/dev-ada/libgpr/libgpr-23.0.0.ebuild b/dev-ada/libgpr/libgpr-23.0.0.ebuild index 9e4923a635c3..f659d4abc905 100644 --- a/dev-ada/libgpr/libgpr-23.0.0.ebuild +++ b/dev-ada/libgpr/libgpr-23.0.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -ADA_COMPAT=( gnat_2021 gcc_12_2_0 ) +ADA_COMPAT=( gnat_2021 gcc_12 gcc_12_2_0 ) inherit ada multiprocessing MYPN=gprbuild -- cgit v1.2.3