gentoo auto-resync : 29:07:2022 - 21:08:17

4 files changed, 2 insertions, 112 deletions

diff --git a/dev-python/ini2toml/Manifest b/dev-python/ini2toml/Manifest
index 2cf26646c097..e8e1a81474b4 100644
--- a/dev-python/ini2toml/Manifest
+++ b/dev-python/ini2toml/Manifest
@@ -1,7 +1,4 @@
-AUX ini2toml-0.10-test.patch 1883 BLAKE2B 88402feed5aa7e51587f7297b8c3afa058d04e0f878acf1a6af5dfab77cb50d0c5708cfe9e1a45d704f7fbaca068cf9f3d0838bdcb6e1aa3145129f6239180c9 SHA512 1df613aa1e793716e4b0e7a83b3f15bb69f7abd5c43831e0d09dd4ec42ee8ed617586188bfb9bfc6863f93f4cdeb0114226e9da44c8b3a73b04705f7c9139c87
-DIST ini2toml-0.10.gh.tar.gz 93535 BLAKE2B 8d8a5b31c53b9194e578b473dfd562b1b569d701b36b267ec4f59ea75ec03abd6e1df5541327b9414a2f1c04b1cb41ec57c6f900007f69a3c51a172143d2eacd SHA512 3d88f97c50a13fe3878e3fa35d70c9051874bec99d278411dcc7098d86898deb0e490be26f293e9a304d4c9a2842274e68126a2d20dac77b526161fde682dd75
 DIST ini2toml-0.11.gh.tar.gz 93696 BLAKE2B 0fb52b346065421049fd377a62de4189a6d261ad12c00679c97568a0e7b7f8fc7bf1aae2196b8fc70489d547c0ce9be1347336d25769c7fb383f9fec4d4aa205 SHA512 7329fd3ba31567638fffce22f2370c2055503bd4abc3d7dab30b1828eb54204d31036753efddfab52e79703ce7583f6070e1207c95345096c0751c2d429fd6ea
-EBUILD ini2toml-0.10.ebuild 1755 BLAKE2B 4c7a421ba090d291b492c5284c77ab8d606d720e377f94e8b7da7a15188fea23694be7d1bae37f5d3c05fbe2e9a29a6111dde08c389456204faeb8446c4ab23f SHA512 0e1aae211ad3a54bfb2964b0a0e08572a5832ee351f40fc92019ce9c5f9ae3e36091f62ea94478076f97a381aa049fbc568df3ba190ba13224e7aa19500e617b
-EBUILD ini2toml-0.11-r1.ebuild 1177 BLAKE2B 6d323c7ce812c44219351aef4a7f51b736df0753f0679b345f86be6ea24bb74ac00db4e608445c03e14bb68e75a9f3870889c6169203281c4253c88bb21e1886 SHA512 1442de3fa0b5941f566e687701cb65ab55830797338b8ce18bea71ad374253d7287bafb5003f13d607cea6f0bcfd9540a0d6769888b98a477dc4ae10db37f9c4
+EBUILD ini2toml-0.11-r1.ebuild 1182 BLAKE2B 27c7a6da18517f83420827a10be7aa53f7202b7e8b1ab22d91269973b2140f773da4420085a2313ee1175964bfa7de123f00dbaa3c0296c375e0e47758609476 SHA512 9cf37c417b63d1e006de423a9154d505d4c007ddb19d10dddfccb0cb32159acf078f2f718a518b9b3bbda347d186142d8472579f892356495ddd0ff6221dc7ab
 EBUILD ini2toml-0.11.ebuild 1711 BLAKE2B 1837c2f2e3af0b878a7e3c0a58aec8139ad2582048ffa89d5b80720c700bf53f8180db7221678209bb3aa1de89f938416df22822a4a37316281ad549bdc8525b SHA512 2bb9474cbdbe15c9d2c9ec4f59fb2661171b54d27a40722996f22b5c5a2886c0676b2ae4a8a1ffb65cc8e7c56236a9d2a8c8cbb3fb0714ec5c9a0e47b6572127
 MISC metadata.xml 374 BLAKE2B d1d096c2db4d1975e07553486be8e1ef66a63338b6a6617f71131565b80f612b9d50ca7c039d0b37b02eec56421231f52833390eb8536de44d4edd7c90d307f2 SHA512 21a272e9c3a7eb3e0950358f8ffb90b961ff0e39073519ed0b36660dfae91b24f8e09e3b89a20dbeadba45d995eea4bb89d484acc04a7251dfb9f33603bef998
diff --git a/dev-python/ini2toml/files/ini2toml-0.10-test.patch b/dev-python/ini2toml/files/ini2toml-0.10-test.patch
deleted file mode 100644
index bd1d8b093a33..000000000000
--- a/dev-python/ini2toml/files/ini2toml-0.10-test.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 1a40d273d6671657ef10081123a675bd22e4bf06 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sat, 2 Apr 2022 18:21:39 +0200
-Subject: [PATCH] Support duplicate plugin instances in
- test_list_from_entry_points
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Account for the possibility of the isort plugin occurring more than
-once in the plugin list, in test_list_from_entry_points.  This is needed
-to avoid test failures on Gentoo where tests are run in a venv
-with --system-site-packages.  As a result, if ini2toml is installed
-already, it grabs all plugins twice — once from the venv, and then again
-from system site-packages directory.
----
- AUTHORS.rst           | 1 +
- tests/test_plugins.py | 3 ++-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_plugins.py b/tests/test_plugins.py
-index a1e96eb..9b52432 100644
---- a/tests/test_plugins.py
-+++ b/tests/test_plugins.py
-@@ -46,6 +46,7 @@ def test_list_from_entry_points():
-     # Should return a list with all the plugins registered in the entrypoints
-     pluging_list = plugins.list_from_entry_points()
-     orig_len = len(pluging_list)
-+    isort_count = len([e for e in pluging_list if "isort" in str(e.__module__)])
-     assert all(callable(e) for e in pluging_list)
-     plugin_names = " ".join(str(e.__module__) for e in pluging_list)
-     for example in EXISTING:
-@@ -54,5 +55,5 @@ def test_list_from_entry_points():
-     # a filtering function can be passed to avoid loading plugins that are not needed
-     pluging_list = plugins.list_from_entry_points(filtering=lambda e: e.name != "isort")
-     plugin_names = " ".join(str(e.__module__) for e in pluging_list)
--    assert len(pluging_list) == orig_len - 1
-+    assert len(pluging_list) == orig_len - isort_count
-     assert "isort" not in plugin_names
diff --git a/dev-python/ini2toml/ini2toml-0.10.ebuild b/dev-python/ini2toml/ini2toml-0.10.ebuild
deleted file mode 100644
index 0e0c3b630fa1..000000000000
--- a/dev-python/ini2toml/ini2toml-0.10.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Automatically conversion of .ini/.cfg files to TOML equivalents"
-HOMEPAGE="
-	https://pypi.org/project/ini2toml/
-	https://github.com/abravalheri/ini2toml/
-"
-SRC_URI="
-	https://github.com/abravalheri/ini2toml/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/packaging-20.7[${PYTHON_USEDEP}]
-	>=dev-python/tomli-w-0.4.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/tomli[${PYTHON_USEDEP}]
-		dev-python/tomlkit[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test.patch
-)
-
-EPYTEST_DESELECT=(
-	# pyproject_fmt is not packaged
-	tests/test_cli.py::test_auto_formatting
-
-	# fails on whitespace/comments/formatting
-	tests/test_translator.py::test_simple_example
-	tests/test_translator.py::test_parser_opts
-	tests/plugins/test_setuptools_pep621.py::test_move_entry_points_and_apply_value_processing
-	tests/plugins/test_setuptools_pep621.py::test_split_subtables
-	tests/plugins/test_setuptools_pep621.py::test_entrypoints_and_split_subtables
-	tests/plugins/test_setuptools_pep621.py::test_handle_dynamic
-)
-
-EPYTEST_IGNORE=(
-	# configupdater is not packaged
-	tests/test_examples.py
-	tests/test_transformations.py
-	tests/drivers/test_configupdater.py
-)
-
-src_prepare() {
-	sed -i -e 's:--cov ini2toml --cov-report term-missing::' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/ini2toml/ini2toml-0.11-r1.ebuild b/dev-python/ini2toml/ini2toml-0.11-r1.ebuild
index 4ca42b40bd3c..64386dec26ae 100644
--- a/dev-python/ini2toml/ini2toml-0.11-r1.ebuild
+++ b/dev-python/ini2toml/ini2toml-0.11-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~ppc ~ppc64 ~riscv ~sparc"
 
 RDEPEND="
 	>=dev-python/packaging-20.7[${PYTHON_USEDEP}]