gentoo auto-resync : 20:03:2023 - 00:35:55

7 files changed, 2 insertions, 222 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index fc8af3989c7e..f283379fa1d8 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest
index aead58991751..933f44cece2c 100644
--- a/dev-ada/langkit/Manifest
+++ b/dev-ada/langkit/Manifest
@@ -1,8 +1,5 @@
-AUX langkit-22.0.0-abc.patch 1129 BLAKE2B 05c136aeca2f6cb07f84d11043ba64ab67c65a9927794d9b67fad088cb39af42552ca48b6c6fe271b9c124dfa69585fdb3e60253ec6b15ba736a4c08afcce9ec SHA512 9af42ece8b8ffa9b5462dfafe84812bc40b7e03c24ae479f3458d0a8137d4439e0d509443e8df117a3c4d7e55090f2267960b43e6caafe60b28bb01af2d2cbc5
 AUX langkit-23.0.0-gentoo.patch 357 BLAKE2B 3408d89156a55658881a65d9d180d361d6f516308c0e55f44d7aa78ca261fdd5426e66de25b004c9496d610a16b93054abe98a81fe213af0e1e9a6aa628c37c4 SHA512 8dff9eb7cd914eb112c53d38b3d47f02cd48aa56d65319ae537967baab328e2f4ac94483bf5760455e68e7f621a9d2188bef25025a17e6a19dee9cb381e8e8e5
 AUX langkit-23.0.0-py311.patch 3488 BLAKE2B fee31cc4e09a69c357791eaca65152ca56ef5934d3cedf36f4940ba842c595d2b79bfd72fb11c9d60c8cacf208969421ca39db5f528d61b34ae03e99755b5032 SHA512 a022ab4f31e7fa49912382fbdef3f446209f6daa2c78b2443a1e52c5a9ca7d7c078a94e0d8cc2ecda1fcb925320223943dbbf65ded961be9a06ad9457ce0d3ea
-DIST langkit-22.0.0.tar.gz 1008946 BLAKE2B 2b4ee37c9af1c95f9a6e9ad81f37b6bb112d5bd70f36b78e95d969580eacc1101b824ea24de39d04ccf8bc9f9850906fa1c660a29de05e90d12106b10792c37d SHA512 4c6207b650ae8352c65f3edda3192fc66c9b5d2c351665d78ca83b549960a0a41e7828e8974cb8daa3c415281b50253aa15a247407bcedc2c13e573aaa804909
 DIST langkit-23.0.0.tar.gz 1178557 BLAKE2B c3b81cafea3afcfd90a87192dca5abd0f19c5ff4e195515dd7c4df70824bf328c24855a6761264b89bf44a56afc8dd77b78fbf322c6f92299082507aa65d61e5 SHA512 6cc6adacb157a47ebc8da46591e45a4ff212fba2cd5ac80c12adb2e84f4508735d98dc68ffce86aa5e5e8d873e6f51efb4f88f4d76a190b9eb0024bf69deefc1
-EBUILD langkit-22.0.0-r3.ebuild 2323 BLAKE2B e477e2adcddbf67acf6d2805dfe1e738abfe837f6da4fcf4bcc65e1111bb1015c0f0111a16d4c55802e8138c3fa08b4e0072b8bdc008fd8262b0c630c0a36286 SHA512 4f5d17cf42ca4792711c7afd426bbe5adf61c0ebcd901b5fd81c8383ecdbcdb070fac4f7989523ecf46b2539c5ba2af3baa5af9acc89dcd088493853cdb24cb5
 EBUILD langkit-23.0.0-r1.ebuild 2975 BLAKE2B 210a3dfc70046952be6d09f3bd52b143283573500fa88ae771aab82a070ea491d1fb668860a779e206fb8b413b007fba7e95647e7c29473e20e5dfbaa0c3746b SHA512 cb09d2dcd95133295d890c6f4fa2b29367b84beec9a7c547c368197e1fa4fad5ab54177c4f5f0433defcdd1f7264f0e4eac8c44f594810bdf0ba9b52c795ea6b
 MISC metadata.xml 930 BLAKE2B 5ec7305df09ee1011fc0a0b93f75bbbf315a153a835d0e3c074e95b717d6c95c7f0b29e99537375be3c6aa73e5cf089cd32fcc3567f78bb3c6768e171c3d4521 SHA512 8f0056d87158d87dc3fad08ceffcfc2a6c065977669b8d0f8560b72627f8b050ed34886e4cad19e51062b8a2e412f37b1c3ff983f1d33da79cb6283f6532df85
diff --git a/dev-ada/langkit/files/langkit-22.0.0-abc.patch b/dev-ada/langkit/files/langkit-22.0.0-abc.patch
deleted file mode 100644
index 0b3e9bbf8f4f..000000000000
--- a/dev-ada/langkit/files/langkit-22.0.0-abc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From cdc5768fb8db416e4eede97639f381a537ae9336 Mon Sep 17 00:00:00 2001
-From: Charles Pigott <charlespigott@googlemail.com>
-Date: Wed, 10 Nov 2021 20:42:12 +0000
-Subject: [PATCH] Use collections.abc.Sequence as the alias is set to be
- removed
-
-Alias has been in place since Py 3.3, and minimum (test) version is 3.7.
----
- langkit/templates/python_api/module_py.mako | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/langkit/templates/python_api/module_py.mako b/langkit/templates/python_api/module_py.mako
-index 831fb6044..65373fdbc 100644
---- a/langkit/templates/python_api/module_py.mako
-+++ b/langkit/templates/python_api/module_py.mako
-@@ -1503,7 +1503,7 @@ class ${root_astnode_name}:
-         if isinstance(ast_type_or_pred, type):
-             sought_type = ast_type_or_pred
-             pred = lambda node: isinstance(node, sought_type)
--        elif isinstance(ast_type_or_pred, collections.Sequence):
-+        elif isinstance(ast_type_or_pred, collections.abc.Sequence):
-             sought_types = ast_type_or_pred
-             pred = lambda node: isinstance(node, tuple(sought_types))
-         else:
diff --git a/dev-ada/langkit/langkit-22.0.0-r3.ebuild b/dev-ada/langkit/langkit-22.0.0-r3.ebuild
deleted file mode 100644
index a5c90c452b7b..000000000000
--- a/dev-ada/langkit/langkit-22.0.0-r3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_10 )
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
-
-DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1 ada multiprocessing
-
-DESCRIPTION="A Python framework to generate language parsers"
-HOMEPAGE="https://www.adacore.com/community"
-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="+shared static-libs static-pic"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	${ADA_REQUIRED_USE}
-	|| ( shared static-libs static-pic )"
-
-RDEPEND="${PYTHON_DEPS}
-	${ADA_DEPS}
-	dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv,shared?,static-libs?,static-pic?]
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/funcy[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-ada/e3-core[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-abc.patch )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	cd testsuite/tests
-
-	# missing gprbuild option to build libraries static/relocatable
-	rm -r {langkit_support,adalog,misc/link_two_libs} || die
-
-	# require railroad-diagrams
-	rm -r contrib/svg_railroad_diagrams || die
-}
-
-python_compile_all() {
-	build () {
-		gprbuild -j$(makeopts_jobs) -p -v \
-			-XLIBRARY_TYPE=$1 -P support/langkit_support.gpr -XBUILD_MODE=dev \
-			-cargs:Ada ${ADAFLAGS} -cargs:C ${CFLAGS} || die "gprbuild failed"
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-}
-
-python_test_all() {
-	export GPR_PROJECT_PATH="${S}"/support
-	${EPYTHON} ./manage.py make --no-langkit-support || die
-	eval $(./manage.py setenv)
-	${EPYTHON} ./manage.py test --verbose |& tee langkit.testOut
-	grep -qw FAIL langkit.testOut && die
-}
-
-python_install_all() {
-	build () {
-		gprinstall -v -P support/langkit_support.gpr -p -XBUILD_MODE=dev \
-			--prefix="${D}"/usr --build-var=LIBRARY_TYPE \
-			--build-var=LANGKIT_SUPPORT_LIBRARY_TYPE \
-			--sources-subdir=include/langkit_support \
-			-XLIBRARY_TYPE=$1 --build-name=$1 || die
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-}
diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest
index 2d4a7404f750..a565c32a0010 100644
--- a/dev-ada/libadalang/Manifest
+++ b/dev-ada/libadalang/Manifest
@@ -1,6 +1,4 @@
 AUX libadalang-23.0.0-test.patch 554 BLAKE2B 3f9dd2b8bba0defd745e18e00162116c56cef11395ebea09730337a844824e0b3c231ed650dd2510fca431c12c5d1991bbcf9b772899f85d5f9af90a3acb51b1 SHA512 0f53b76eb2dbdf8c4fdea5d1e582e2402fae31367d48f95e9fb15726af5b32d8a26bb4295c4c60a68fd4e3bf600dd82cbfa4b8b28cadcd626c6c9f652dccb175
-DIST libadalang-22.0.0.tar.gz 2364531 BLAKE2B 3992baa7180dce696b2c8aa0d451117a12b90072e83274d96a8d971b627c82bc66c5c21fa1eb6dbdd7ce95e0264852c5702b3d7c90f7bdf093915178e0a4a659 SHA512 b874feb102fe221595ad4b9b95b3ea4c6593686f96097ace17ad3c57534dc801000819de0cf898489e3407fd201eb003dd75f4f743a53dfb76cadfa6c727d789
 DIST libadalang-23.0.0.tar.gz 2604724 BLAKE2B 0e415c92fdd150e19288cee87a011c448962531b629b7f77be3b22a7e6662017a6cfd5132a5895c68ffee4b28b7ac35e4b5abc07f015a84638ecb1843976e3e5 SHA512 ed80d751d3a2e07b0d612bda24c0f1d753d15237cde3d9e3bbb6c79c8c98d6af050151c499d161e619282ed8cb742968bbfb5423008aa593a6673fcf0375c7d3
-EBUILD libadalang-22.0.0.ebuild 2350 BLAKE2B 226d2cea0435f8a355ed6cf34b1c4ac1949982c15ec67215196ea880642ae455b013209687eadd95997e7f867853949372349a0ad2641e3d12b2873662597ec6 SHA512 56d30b13e86bb15b959ee0d8e4dc24d9cfab1a541e921ba06a570d410c440e753307e8cbad85ff057c609e6210781cc67745bb8e329f80a85c38ee4fdf914cec
-EBUILD libadalang-23.0.0-r1.ebuild 2636 BLAKE2B c685ccb1ac32bf1c7fef98bd37f94558970c338175d5067947a224806ae523e55e0eb6d3d7bd74d925ee94ae3caafbc2c6ab3c9fc84614574372db47403e706f SHA512 fa8ed0a056e89563d31ec3b956de71d7ba27686d594a641a0a06489e37d76ea3197925f7bbed8b4bbf0b2a7b63d5c903fc7d6e7de97799fb5235761ac80cd4ea
+EBUILD libadalang-23.0.0-r2.ebuild 2594 BLAKE2B dc5676fe54186e96291095588eab8d8589b13c2ddc0aa46dcc2cfc80e5a31797ac99aed43e674a3fd1193475346299f5f83682faefa3137d8e00e49fd405841b SHA512 da92c65aa2300e9e3d97fee06ea48414abc8eacb43622b1d2e096a0549c909d1d3ac0f44d48549f46cfee1fd5408b1f6c6d7726aca7e2ae6b754fb5f88d2b6e5
 MISC metadata.xml 676 BLAKE2B 085445f4e10891044b544d0885a3887a5f8b2d0188ead82eee9e3a351042b171cd3cbfe5ac5910a008e723f74c1f9e96cec5239b91567af28f10c136d5372d6f SHA512 7165db10f2d58592cdf3197778ed42a99d6fa05730ab89ed9faa05146e6d54e3888f7f2841f129c5d2ef5897910348058de4303b105e1ba50ff08e2cbc7831ce
diff --git a/dev-ada/libadalang/libadalang-22.0.0.ebuild b/dev-ada/libadalang/libadalang-22.0.0.ebuild
deleted file mode 100644
index 08e8d1ec59bb..000000000000
--- a/dev-ada/libadalang/libadalang-22.0.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_10 )
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
-
-inherit ada python-single-r1 multiprocessing
-
-DESCRIPTION="high performance semantic engine for the Ada programming language"
-HOMEPAGE="https://libre.adacore.com/"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="test +static-libs static-pic"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	${ADA_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pyyaml
-	dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv,shared,static-libs?,static-pic?]
-	${ADA_DEPS}
-	${PYTHON_DEPS}
-	~dev-ada/langkit-${PV}[${ADA_USEDEP},shared,static-libs?,static-pic?]
-	$(python_gen_cond_dep '
-		dev-ada/langkit[${PYTHON_USEDEP}]
-	')"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]
-"
-BDEPEND="test? (
-		dev-ml/dune
-		dev-ml/zarith
-		dev-ml/camomile
-		dev-ml/ocaml-ctypes
-		dev-ada/e3-testsuite
-		<dev-lang/ocaml-4.14
-	)"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ada_pkg_setup
-	libType=''
-	if use static-libs; then
-		libType+=',static'
-	fi
-	if use static-pic; then
-		libType+=',static-pic'
-	fi
-	libType+=',relocatable'
-	libType=${libType:1}
-}
-
-src_prepare() {
-	default
-	rm -r testsuite/tests/misc/copyright || die
-}
-
-src_configure() {
-	${EPYTHON} manage.py generate -v debug || die
-}
-
-src_compile() {
-	${EPYTHON} manage.py build -v \
-		--build-mode "prod" \
-		-j$(makeopts_jobs) \
-		--gargs "-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} -largs ${LDFLAGS}" \
-		--library-types=${libType} || die
-	GPR_PROJECT_PATH="${S}"/build \
-		gprbuild -P contrib/highlight/highlight.gpr \
-		-j$(makeopts_jobs) -v \
-		-XBUILD_MODE=prod \
-		-XLIBRARY_TYPE=relocatable \
-		-XXMLADA_BUILD=relocatable \
-		-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} \
-		-largs ${LDFLAGS} \
-		|| die
-}
-
-src_test() {
-	${EPYTHON} manage.py test \
-		--build-mode "prod" \
-		--restricted-env -j 1 \
-		|& tee libadalang.testOut
-	grep -qw FAIL libadalang.testOut && die
-}
-
-src_install() {
-	${EPYTHON} manage.py \
-		install "${D}"/usr \
-		--build-mode "prod" \
-		--library-types=${libType} || die
-	rm -r "${D}"/usr/python || die
-	python_domodule build/python/libadalang
-	rm -r "${D}"/usr/ocaml || die
-}
diff --git a/dev-ada/libadalang/libadalang-23.0.0-r1.ebuild b/dev-ada/libadalang/libadalang-23.0.0-r2.ebuild
index 6df305d7916c..b01004d4fb5f 100644
--- a/dev-ada/libadalang/libadalang-23.0.0-r1.ebuild
+++ b/dev-ada/libadalang/libadalang-23.0.0-r2.ebuild
@@ -22,8 +22,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/pyyaml
-	<dev-ada/gnatcoll-bindings-2021
-	>=dev-ada/gnatcoll-bindings-23.0.0[${ADA_USEDEP},gmp,iconv]
+	dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv]
 	dev-ada/gnatcoll-bindings[shared,static-libs?,static-pic?]
 	${ADA_DEPS}
 	${PYTHON_DEPS}