gentoo auto-resync : 12:11:2023 - 22:22:00

4 files changed, 3 insertions, 194 deletions

diff --git a/dev-python/textX/Manifest b/dev-python/textX/Manifest
index c6e2a8f2135e..d9a68b87e57c 100644
--- a/dev-python/textX/Manifest
+++ b/dev-python/textX/Manifest
@@ -1,6 +1,3 @@
-AUX textX-4.0.0-flit.patch 4041 BLAKE2B 0f3a1520b419056c56e28299b00ce5145c9a5c9500b386360822fb0d30f4a08921f21cdfd892e30c6bb7ce30e870a8412aa4cfd6650a693a96ac943b4d58f754 SHA512 646b39bf71f805dcec963f59eba646e1305819a15ba21f6fe4fe6fd03a8460bb850aa83e976108e479bfe17e42cdafddb709e4a6f6e242dea4dcf205b66ffe08
-DIST textX-3.1.1.gh.tar.gz 1824060 BLAKE2B 48c2faeaff52b9f4a3acd1cf36dabc5edc38bb264bd3efbddd2aacaf0aca80a50445a7b30716bd5acdae0219cc2c63fbe2b26c90923758a4fa2a0b9cffb71e65 SHA512 33fa803a5bc2b4cd3782790625304e952e52b64f8791ddbe0fef100b521b36aa8be5291a3cd467771bd9a2d32fac41209e7895a18cc7c4c0f9a672f0ec4211f4
-DIST textX-4.0.0.gh.tar.gz 1824285 BLAKE2B ad5b1f0e7b839ffeca4e5609f1ff9fd4d9828629a5da807870a7ff2ec2fdac35ac80c362086cc1ca037ce2ba37fc3a9ccff9bc9ce8e2c9db26562a9c26de0180 SHA512 137ce6ef24defcd38bf2a65fb87e79d5313dcf6ec6cd363712781870dacfd1328b52e6e5a4124fc607a7abb5a284821e300072c7087310953c652191d1b69991
-EBUILD textX-3.1.1.ebuild 1276 BLAKE2B 25bf42290de4e9d6c0a1fef9e842c39f643e9e44e4c476bcde6235ad574ca04e4e200f7e7a6398023a89bb843f7af72cb54dd1a7a64122cfe78bb2fe2e51c335 SHA512 dc920b598f8d32bf48ca278c144bc8f3fa3c1fa19a985fc79c5b71f2efc6738b84ee1dd9e0821434d8c7ab55b95cdcfa87223e27d161c31ab44d3a2ecce79d77
-EBUILD textX-4.0.0.ebuild 1314 BLAKE2B 1efec7e20493c2227dd658e025b4a2e3f1fbc7ba7581f43c763fb12f9ede7ff981bf264204dcc51c18c21882397225524ed193badc66ace2c6813eb8b81e977a SHA512 edf4bed4f611bbf86010e91ec9758669d8be5af24e70d75f352a14911f63f74185b4cf40a56f60ad5e9b41d9dced2f8edea2ebb4f4d1b1434d4879afa587c61b
+DIST textX-4.0.1.gh.tar.gz 1824450 BLAKE2B 35c18f4f3acbccb57a027c40438099c17eaf97b6124f6cd2fef5b407fb51fc0810ec46daf563ab724ee3e3e6a2775308a0513dab91d6cff5e88d2c18fc6f6af0 SHA512 036eab82760f5f7f11f5da553097a3c1264070516d868568aebc09c6f143ca5f94fcaa21bff90c94e136860269789eda7b704e66e3396d25db491155dceb5bf0
+EBUILD textX-4.0.1.ebuild 1270 BLAKE2B fc1213105e49fdc2c1e2329ebf26ec181c9e54a8c04976e1480e7a26621c3e225c3ba70fa4128c47a98ba4c02e6cccf6bdd6e38b65e9cd290fa7ace7e2aa7bb8 SHA512 e5b83f5ed38d89612ee95c8808e36bdd7f7732b3347156d8fe0e83394bf6ffef86a52ceef947acce36dc157f98c847d465515d64763d595e795286cfd5c82393
 MISC metadata.xml 463 BLAKE2B ce9526aea5bf618a5298b38ccc6d9e734bfd221dfb770f3a7e6b061030d3a14e0e49c91eea239bed273479b4befe43b15cdf50f1c349f8da391247d44edb1737 SHA512 4006ba591063ec8844817d9becc1f8d41167b102df24216d77540bf2d1c934982bab523bed396e24987193c6f2a3880729278910cfda3192e356ceea7828ed7c
diff --git a/dev-python/textX/files/textX-4.0.0-flit.patch b/dev-python/textX/files/textX-4.0.0-flit.patch
deleted file mode 100644
index da53f2c333de..000000000000
--- a/dev-python/textX/files/textX-4.0.0-flit.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From aaac277940c70190c126f6775743c59226abd694 Mon Sep 17 00:00:00 2001
-From: Igor Dejanovic <igor.dejanovic@gmail.com>
-Date: Fri, 10 Nov 2023 22:13:36 +0100
-Subject: [PATCH] add flit-core as a build backend for test projects
-
-closes #418
----
- .../registration/projects/data_dsl/pyproject.toml          | 7 ++++++-
- .../registration/projects/flow_codegen/pyproject.toml      | 7 ++++++-
- .../registration/projects/flow_dsl/pyproject.toml          | 7 ++++++-
- .../registration/projects/types_dsl/pyproject.toml         | 7 ++++++-
- .../functional/subcommands/example_project/pyproject.toml  | 7 ++++++-
- 5 files changed, 30 insertions(+), 5 deletions(-)
-
-diff --git a/tests/functional/registration/projects/data_dsl/pyproject.toml b/tests/functional/registration/projects/data_dsl/pyproject.toml
-index 4db8e9e..15129a5 100644
---- a/tests/functional/registration/projects/data_dsl/pyproject.toml
-+++ b/tests/functional/registration/projects/data_dsl/pyproject.toml
-@@ -1,5 +1,6 @@
- [project]
--name = "data_dsl"
-+name = "data-dsl"
-+description = "Data DSL"
- version = "1.0.0"
- 
- dependencies = [
-@@ -7,5 +8,9 @@ dependencies = [
-     "types_dsl"
- ]
- 
-+[build-system]
-+build-backend = "flit_core.buildapi"
-+requires = ["flit_core >=3.8.0,<4"]
-+
- [project.entry-points.textx_languages]
- data_dsl = "data_dsl:data_dsl"
-diff --git a/tests/functional/registration/projects/flow_codegen/pyproject.toml b/tests/functional/registration/projects/flow_codegen/pyproject.toml
-index 191a3b2..cec623f 100644
---- a/tests/functional/registration/projects/flow_codegen/pyproject.toml
-+++ b/tests/functional/registration/projects/flow_codegen/pyproject.toml
-@@ -1,5 +1,6 @@
- [project]
--name = "flow_codegen"
-+name = "flow-codegen"
-+description = "Flow code generator"
- version = "1.0.0"
- 
- dependencies = [
-@@ -7,5 +8,9 @@ dependencies = [
-     "click"
- ]
- 
-+[build-system]
-+build-backend = "flit_core.buildapi"
-+requires = ["flit_core >=3.8.0,<4"]
-+
- [project.entry-points.textx_generators]
- flow_dsl_plantuml = "flow_codegen.generators:flow_pu"
-diff --git a/tests/functional/registration/projects/flow_dsl/pyproject.toml b/tests/functional/registration/projects/flow_dsl/pyproject.toml
-index e2ac207..5d57387 100644
---- a/tests/functional/registration/projects/flow_dsl/pyproject.toml
-+++ b/tests/functional/registration/projects/flow_dsl/pyproject.toml
-@@ -1,10 +1,15 @@
- [project]
--name = "flow_dsl"
-+name = "flow-dsl"
-+description = "Flow DSL"
- version = "1.0.0"
- 
- dependencies = [
-     "textX"
- ]
- 
-+[build-system]
-+build-backend = "flit_core.buildapi"
-+requires = ["flit_core >=3.8.0,<4"]
-+
- [project.entry-points.textx_languages]
- flow_dsl = "flow_dsl:flow_dsl"
-diff --git a/tests/functional/registration/projects/types_dsl/pyproject.toml b/tests/functional/registration/projects/types_dsl/pyproject.toml
-index 345d964..9ca7cd3 100644
---- a/tests/functional/registration/projects/types_dsl/pyproject.toml
-+++ b/tests/functional/registration/projects/types_dsl/pyproject.toml
-@@ -1,10 +1,15 @@
- [project]
--name = "types_dsl"
-+name = "types-dsl"
-+description = "Types DSL"
- version = "1.0.0"
- 
- dependencies = [
-     "textX"
- ]
- 
-+[build-system]
-+build-backend = "flit_core.buildapi"
-+requires = ["flit_core >=3.8.0,<4"]
-+
- [project.entry-points.textx_languages]
- types_dsl = "types_dsl:types_dsl"
-diff --git a/tests/functional/subcommands/example_project/pyproject.toml b/tests/functional/subcommands/example_project/pyproject.toml
-index 5ee7009..636065a 100644
---- a/tests/functional/subcommands/example_project/pyproject.toml
-+++ b/tests/functional/subcommands/example_project/pyproject.toml
-@@ -1,11 +1,16 @@
- [project]
--name = "textX-subcommand-test"
-+name = "textx-subcommand-test"
-+description = "Test project for textX subcommands"
- version = "1.0.0"
- 
- dependencies = [
-     "textX"
- ]
- 
-+[build-system]
-+build-backend = "flit_core.buildapi"
-+requires = ["flit_core >=3.8.0,<4"]
-+
- [project.entry-points.textx_commands]
- testcommand = "textx_subcommand_test.cli:testcommand"
- testgroup = "textx_subcommand_test.cli:create_testgroup"
--- 
-2.42.1
-
diff --git a/dev-python/textX/textX-4.0.0.ebuild b/dev-python/textX/textX-4.0.0.ebuild
deleted file mode 100644
index 8ac8e2aa8b58..000000000000
--- a/dev-python/textX/textX-4.0.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Meta-language for DSL implementation inspired by Xtext"
-HOMEPAGE="
-	https://pypi.org/project/textX/
-	https://github.com/textX/textX/
-"
-SRC_URI="
-	https://github.com/textX/textX/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/Arpeggio-2.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/attrs[${PYTHON_USEDEP}]
-		dev-python/click[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/${P}-flit.patch"
-)
-
-python_test() {
-	cp -a "${BUILD_DIR}"/{install,test} || die
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	# Update the shebang
-	sed -e "s:install/usr/bin/${EPYTHON}:test/usr/bin/${EPYTHON}:" \
-		-i "${BUILD_DIR}"/test/usr/bin/textx || die
-
-	# Install necessary plugins
-	local plugins=(
-		tests/functional/subcommands/example_project
-		tests/functional/registration/projects/*
-	)
-	local p
-	for p in "${plugins[@]}"; do
-		pushd "${p}" >/dev/null || die
-		distutils_pep517_install "${BUILD_DIR}"/test
-		popd >/dev/null || die
-	done
-
-	epytest tests/functional
-}
diff --git a/dev-python/textX/textX-3.1.1.ebuild b/dev-python/textX/textX-4.0.1.ebuild
index c1b43647ed4a..38d9669826ff 100644
--- a/dev-python/textX/textX-3.1.1.ebuild
+++ b/dev-python/textX/textX-4.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_USE_PEP517=flit
 PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1