gentoo auto-resync : 23:11:2023 - 22:30:19

4 files changed, 2 insertions, 104 deletions

diff --git a/dev-python/vdirsyncer/Manifest b/dev-python/vdirsyncer/Manifest
index d04867690da2..76fbdaaf526a 100644
--- a/dev-python/vdirsyncer/Manifest
+++ b/dev-python/vdirsyncer/Manifest
@@ -1,6 +1,3 @@
-AUX vdirsyncer-0.18.0-no-cov.patch 533 BLAKE2B 08f6d9dd09aeeb057bfa17fcd8a590ccef68bb9bed8c84c6682471ba53886bc80011990086c9b51673e272ce15fd9096847dab6bb9a6087670e5b01417cbc981 SHA512 00d4f334e1def6295f2b1aacfc2a7fd33f250a0bee39957288fe83a5179c0461f71273051687b53435b0cdd78a3ece618b1dec5a8e253cec3f3c3733528dba10
-DIST vdirsyncer-0.18.0.tar.gz 115125 BLAKE2B d81bb9b51658d16a3b9ea044846561a1ce2dac3a839d7e0a165f0136069fcd0716525ab2b908be7cafed60846a1aed6fd72aa1d31fc2a38dbe6de8d0e6585226 SHA512 7fb3d0f7d982d8390d278de1a620231e6ead1ec64057c5dbac98dcff491fa3e6b9ed8ba953995458e393aab73b0b9ab8ba14010e06f90a04d8ee2c28c7c7fbfd
 DIST vdirsyncer-0.19.2.tar.gz 123389 BLAKE2B 35cf5e52f669307c7bc545404135bfb5ded3ca6a1b151735ddacd73835054a2e0ab518201ad206929ca845c2a2828c025a918bba54b739db3fa0a8e4e9f5de33 SHA512 056c58011d0a054a8cc215e9eabc706dfffb7d38deab5ae47311565b3bdb6de7a4772e97a0a50cdce33c82b09d559f1ec9cf9c84746553badf1d25791c7e08ce
-EBUILD vdirsyncer-0.18.0-r4.ebuild 1792 BLAKE2B fdefa6bff9cff57b53f2ffa240e49bf31a121980cf75d8e19f3c9f3611be1c0d4bc8cd23191920e5e895bfb63f461f3d01a0e638427256ec2bbebe1647e74891 SHA512 6545c7fd57d722aee712a860806d05450c5c19820beed5061be578c1cb0baa2ec01fc43b40c06f0ae40f6d120534ffda114c9b9ee2ce80f98a893944c9f1283f
-EBUILD vdirsyncer-0.19.2-r2.ebuild 1796 BLAKE2B 7bcde8fa5f311c625da785d9fe429194985171a22e2ee920f87a5d7d473f9c8253937968dc234e2ad3a87944881ce80b20b6ebfef375af6b1c1bdeba83d31d36 SHA512 98c5cf622599480e1d8f6adb13eab080d066c7efcefb62561e992be698e0b92d45779a6ba09d7bb6c17492feaea4d7278c127ec47858abfea7d5908d99a97be0
+EBUILD vdirsyncer-0.19.2-r2.ebuild 1801 BLAKE2B dfe4b449fc9fc2c0cb785eda1f1892884544cfddd9d6c77f2e65e5854e083952906e996cbf0feed616f0634e0852e12345ab1864c13ef427b96062decb19f68d SHA512 47254f9978eb6af74e81b8093223a59ab83e49c4665dea9ebd7db69615b33094dedc827ade540733933873e6567b4e8522c9fded0742b93b74eee22ba15acf20
 MISC metadata.xml 475 BLAKE2B 368524aa96e63a09f0bb25a2d2cfd0a20fd80a7723faa3c076e0a3a10f4fc0e06be1c0521afedbcfd39fc99e2e726627c7ad13622ceefa2fd90d317756386e3e SHA512 5a4150a6e7f0ad92c1b80291e5700f875e619b6b155903189a97ca7f820fff2b656309a27fcd7bae94d5fe6a7cd36cb93633ff0cc0ae7fcaac1399a3f132bb99
diff --git a/dev-python/vdirsyncer/files/vdirsyncer-0.18.0-no-cov.patch b/dev-python/vdirsyncer/files/vdirsyncer-0.18.0-no-cov.patch
deleted file mode 100644
index d7e1d537ce49..000000000000
--- a/dev-python/vdirsyncer/files/vdirsyncer-0.18.0-no-cov.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Avoid pytest-cov involvement:
-
-https://dev.gentoo.org/~mgorny/python-guide/pytest.html#avoiding-dependencies-on-other-pytest-plugins
-
-Signed-Off-By: John Helmert III <ajak@gentoo.org>
-
-diff --git a/setup.cfg b/setup.cfg
-index 2428e44..117f237 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -1,14 +1,6 @@
- [wheel]
- universal = 1
- 
--[tool:pytest]
--addopts = 
--	--tb=short
--	--cov-config .coveragerc
--	--cov=vdirsyncer
--	--cov-report=term-missing
--	--no-cov-on-fail
--
- [flake8]
- application-import-names = tests,vdirsyncer
- extend-ignore = 
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild
deleted file mode 100644
index fb656166c00a..000000000000
--- a/dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 pypi systemd
-
-DESCRIPTION="Synchronize calendars and contacts"
-HOMEPAGE="
-	https://github.com/pimutils/vdirsyncer/
-	https://pypi.org/project/vdirsyncer/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	>=dev-python/click-log-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/click-threading-0.5[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-	dev-python/atomicwrites[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.18.0-no-cov.patch"
-)
-
-DOCS=( AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst config.example )
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin click-log
-	# https://github.com/pimutils/vdirsyncer/commit/ea640001d0ad6e56369102e02b949c865c48726f
-	sed -i -e '/click-log/s:, <0.4.0::' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	# skip tests needing servers running
-	local -x DAV_SERVER=skip
-	local -x REMOTESTORAGE_SERVER=skip
-	# pytest dies hard if the envvars do not have any value...
-	local -x CI=false
-	local -x DETERMINISTIC_TESTS=false
-
-	local EPYTEST_DESELECT=(
-		# test CA is too weak for modern python
-		tests/system/utils/test_main.py::test_request_ssl
-		tests/system/utils/test_main.py::test_request_ssl_fingerprints
-	)
-
-	epytest
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	systemd_douserunit contrib/vdirsyncer.{service,timer}
-}
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.19.2-r2.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.19.2-r2.ebuild
index e07a4bae59ca..f67c5a31bc85 100644
--- a/dev-python/vdirsyncer/vdirsyncer-0.19.2-r2.ebuild
+++ b/dev-python/vdirsyncer/vdirsyncer-0.19.2-r2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/click-5.0[${PYTHON_USEDEP}]