gentoo auto-resync : 25:09:2023 - 23:26:33

4 files changed, 2 insertions, 144 deletions

diff --git a/dev-python/poetry-core/Manifest b/dev-python/poetry-core/Manifest
index c63675c0d864..b56836f2355d 100644
--- a/dev-python/poetry-core/Manifest
+++ b/dev-python/poetry-core/Manifest
@@ -1,6 +1,3 @@
-AUX poetry-core-1.6.1-pypy3.patch 2127 BLAKE2B 65a7c7540c70502467cc5019e47cb9eef492d69efc8f27e513d5fea6ccaaf1dcb09a30e724e9b539adc4d9dc84d7aac8d9642855916a68ddf8242db7b69d4030 SHA512 8e18dba351b1b2babee0bb40d3c4f22136c78cfb11b45e6113d04596b313a0616dae17afe5326aaced776b35aedaeaf0b9b0cd09463028ecd936b1937899a049
-DIST poetry-core-1.6.1.gh.tar.gz 477291 BLAKE2B 4e1bd77302005d344693fe7a08b0c55e8a9ea0aad3112915a18950e40cc51116740b9eff5ae851b1d7280454716e3a86b1d8d37d85749f64fcef3bc726eeaf83 SHA512 53db0e4f4d5bc6ed2b201cd88a84e07dc6421e910292b8b5efb0dcce1af6e8c62836458a6409aac0394b5063b7c4a6be93784b0bce8592d74f61800f54916706
 DIST poetry-core-1.7.0.gh.tar.gz 459637 BLAKE2B af42d3e44ccecfa2746fcde1f7c48a4a6376d3391ebd9b660658593c32058bc812460ed1df4999f18c929724c2750a13b8ca44d92791c34cef8544862e8c061a SHA512 cbad311ed53a4b39b027674e8c76cf8822b0cc33b69eca3d79a31e910111efba5021b156d95f51327dca24d584bd96ec1a8cde23b3912e4ed6ca66b11e1bce9b
-EBUILD poetry-core-1.6.1.ebuild 1980 BLAKE2B b1cea95a643036f7c5590a1a6576be6b654412caf4cfd9e617be7e046e28f57b36ceeb3a41a3eb6f12af8b58c8f9eba0cf8e1c7df479136daf0e883d12331d98 SHA512 e0d7370d6805484cb372c2b5a65967239c8037b874f4b75bcdd2f7666ba11e5ab5b9b239741375456858f108dfdf973a6aa14abccae0a28b264ecabddf2a4a99
-EBUILD poetry-core-1.7.0.ebuild 1884 BLAKE2B 9edde61cf917379be7928801ab753dff8964c6d1fc5b6c57f92666315d025e4d4602334521df9bd6c3aae89aa6795e6d822d8bf19b5223d4dc930a4534e36b6b SHA512 5e598b404632e4eb22647bd44251e09b1f11db4fccae7547d9a82574d877eaedb8d0f7855349498ff4d778a6ec6ee15685a5a8baa73bee719061aeeab0d9e0bb
+EBUILD poetry-core-1.7.0.ebuild 1876 BLAKE2B a2b08c67ba6eebd0d7536878dcc4eefed136dd11de898fd9a957880d499a5b167d6d6d19f2e2ea7de599e29e225e695f5e1cb3c0df8a0c2d035fe4e42cf44b6c SHA512 1da70f943bc725ca6dc43fe8f631487778331d4afb90de60a8a133f1ca5d42a371e7163c38c7f6a995bbc50108f60f6b5371a100349adf69f676fe7c6440d6a0
 MISC metadata.xml 382 BLAKE2B 82dfc3f146cf3b669fed67ab2e21694b00d5473fdf855cae9fb3a0481785b32c4cf1ed9743a5d64cd055c1cb544377f936a9ec26c9d1dec2cf5fbef6749f5587 SHA512 032fd4dca8f8138c2b527e517f041889e15600ccca876fc3c9e53050196186ad2a9346168bce9c4bae7ffd8a77ff4dd19cc2559fd1da1fd4c7c181056fd49a13
diff --git a/dev-python/poetry-core/files/poetry-core-1.6.1-pypy3.patch b/dev-python/poetry-core/files/poetry-core-1.6.1-pypy3.patch
deleted file mode 100644
index ab0979a71cf0..000000000000
--- a/dev-python/poetry-core/files/poetry-core-1.6.1-pypy3.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 12d231eeb3d853217dd6e0527da7e286cdc1346b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Randy=20D=C3=B6ring?=
- <30527984+radoering@users.noreply.github.com>
-Date: Mon, 29 May 2023 18:40:35 +0200
-Subject: [PATCH 1/2] chore: update dev dependencies for Python 3.12
- compatibility (#597)
-
----
- poetry.lock                             | 170 ++++++++++++------------
- tests/masonry/builders/test_complete.py |   3 +-
- tests/masonry/builders/test_wheel.py    |   5 +-
- 3 files changed, 91 insertions(+), 87 deletions(-)
-
-diff --git a/tests/masonry/builders/test_complete.py b/tests/masonry/builders/test_complete.py
-index 4e4dff0..c9429c1 100644
---- a/tests/masonry/builders/test_complete.py
-+++ b/tests/masonry/builders/test_complete.py
-@@ -19,6 +19,7 @@ import pytest
- from poetry.core import __version__
- from poetry.core.factory import Factory
- from poetry.core.masonry.builder import Builder
-+from tests.masonry.builders.test_wheel import WHEEL_TAG_REGEX
- 
- 
- if TYPE_CHECKING:
-@@ -82,7 +83,7 @@ def test_wheel_c_extension(project: str, exptected_c_dir: str) -> None:
- Wheel-Version: 1.0
- Generator: poetry-core {__version__}
- Root-Is-Purelib: false
--Tag: cp[23]_?\\d+-cp[23]_?\\d+m?u?-.+
-+Tag: {WHEEL_TAG_REGEX}
- $""",
-                 wheel_data,
-             )
-diff --git a/tests/masonry/builders/test_wheel.py b/tests/masonry/builders/test_wheel.py
-index d25d642..c41e4a5 100644
---- a/tests/masonry/builders/test_wheel.py
-+++ b/tests/masonry/builders/test_wheel.py
-@@ -25,6 +25,9 @@ if TYPE_CHECKING:
- fixtures_dir = Path(__file__).parent / "fixtures"
- 
- 
-+WHEEL_TAG_REGEX = "[cp]p[23]_?\\d+-(?:cp[23]_?\\d+m?u?|pypy[23]_?\\d+_pp\\d+)-.+"
-+
-+
- @pytest.fixture(autouse=True)
- def setup() -> Iterator[None]:
-     clear_samples_dist()
-@@ -365,7 +368,7 @@ def test_tag(in_venv_build: bool, mocker: MockerFixture) -> None:
-     if not in_venv_build:
-         mocker.patch("sys.executable", "other/python")
- 
--    assert re.match("^cp[23]_?\\d+-cp[23]_?\\d+m?u?-.+$", builder.tag)
-+    assert re.match(f"^{WHEEL_TAG_REGEX}$", builder.tag)
-     if in_venv_build:
-         get_sys_tags_spy.assert_not_called()
-     else:
--- 
-2.40.1
-
diff --git a/dev-python/poetry-core/poetry-core-1.6.1.ebuild b/dev-python/poetry-core/poetry-core-1.6.1.ebuild
deleted file mode 100644
index 7930932b3f97..000000000000
--- a/dev-python/poetry-core/poetry-core-1.6.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=standalone
-PYTHON_TESTED=( pypy3 python3_{10..12} )
-PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
-
-inherit distutils-r1
-
-DESCRIPTION="Poetry PEP 517 Build Backend"
-HOMEPAGE="
-	https://github.com/python-poetry/poetry-core/
-	https://pypi.org/project/poetry-core/
-"
-SRC_URI="
-	https://github.com/python-poetry/poetry-core/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
-
-# check inside src/poetry/core/_vendor/vendor.txt
-# (note that some are indirect deps)
-RDEPEND="
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lark[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.9 3.10)
-"
-BDEPEND="
-	${RDEPEND}
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/build[${PYTHON_USEDEP}]
-			dev-python/pytest-mock[${PYTHON_USEDEP}]
-			dev-python/tomli-w[${PYTHON_USEDEP}]
-			dev-python/virtualenv[${PYTHON_USEDEP}]
-			dev-vcs/git
-		' "${PYTHON_TESTED[@]}")
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/${P}-pypy3.patch"
-)
-
-EPYTEST_DESELECT=(
-	# These "fail" bacause of glob file path resulting from newer versions
-	# in our tree than vendored. But those don't affect anything.
-	tests/masonry/builders/test_sdist.py::test_default_with_excluded_data
-	tests/masonry/builders/test_wheel.py::test_default_src_with_excluded_data
-)
-
-src_prepare() {
-	# remove vendoring of dependencies
-	rm -r src/poetry/core/_vendor || die
-	sed -e '/__vendor_site__/d' -i src/poetry/core/__init__.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	if ! has "${EPYTHON/./_}" "${PYTHON_TESTED[@]}"; then
-		einfo "Skippin tests on ${EPYTHON} (unported deps)"
-		return
-	fi
-
-	# needed for migration from <1.1
-	distutils_write_namespace poetry
-	epytest
-}
diff --git a/dev-python/poetry-core/poetry-core-1.7.0.ebuild b/dev-python/poetry-core/poetry-core-1.7.0.ebuild
index 6c7dfcec450c..5178ff2ebadc 100644
--- a/dev-python/poetry-core/poetry-core-1.7.0.ebuild
+++ b/dev-python/poetry-core/poetry-core-1.7.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~arm64-macos ~x64-macos"
 
 # check inside src/poetry/core/_vendor/vendor.txt
 # (note that some are indirect deps)