gentoo resync : 20.03.2022

4 files changed, 19 insertions, 47 deletions

diff --git a/app-misc/khal/Manifest b/app-misc/khal/Manifest
index 3d9c2f72588a..0e36629eccb6 100644
--- a/app-misc/khal/Manifest
+++ b/app-misc/khal/Manifest
@@ -1,5 +1,4 @@
-DIST khal-0.10.1.tar.gz 173636 BLAKE2B 97158bc78dfbda3a3555df3588c61f6a5e8b20d71921099a74ba997eb7ccef05ed931e930afbb09f9c125f3e0e782143dd2cdf4d0da6bd09952765b9117d6ac4 SHA512 5b81a60099c201fa112ab17740b73edb17b29efa1548086766d57d9d595451e7d779aad5a2ce7a2afc78050116782ff6696c4bd284021a5e12c87fe361d15e47
-DIST khal-0.10.2.tar.gz 182534 BLAKE2B 0c7c4ab1234ebe90ef9ad8291f2a0087a3f6a60d25f5426445eedadb25f236b3598dacc051e959a108ad472efc56628bf7ba11ed714c885d956f1a8f905029ca SHA512 e15449b73175190f02b6fe5774a8feef8a5390966da3836624c94a044d146cc6e8a73985d991042fbb617f736c6759ded387a65292529e71f5b2f34bc80a686e
-EBUILD khal-0.10.1-r3.ebuild 1180 BLAKE2B 95253a48aede5078a011d1b5e0dcaff0fad65385f5564aafb716361f63b38202851f2c4a501a4914dc5a91475fd35dc6a0a3be8cc8024dcdbe70de5b8c5049ce SHA512 3b2b621c7a1dd9b8a23c7da6e7b6fd9d1462ea89fc7b5b21a3e8317c6945f9f990539f82ba0a677b39211ec5074a3a5258d9ca5a17da6b0bca9c478c11bdd097
-EBUILD khal-0.10.2-r2.ebuild 1186 BLAKE2B 7ff0a112e53f9c32bb503820820c9f2881715ffeb9e4576c0f34dbd2e0fdd80c5df47ee53e0f464c62c642b05a895ce0ab1a994741602168770a582101411c8a SHA512 6e64c68fc2b6b7f0aaa66a2495f92394778c635d928bbf42e2a91623210e1ab3a45546267fadc05d53ff1edfa81bf7dd40230b09e2146a5dc6e43b9dd8ba35e1
+AUX khal-0.10.4-add-etag.patch 417 BLAKE2B 2eadf7cb5ba1a4bd179a4f8b37278407819de7f798ce9f23723a11694fe9954bb67a267932d85416644a7dcf09544d13ca0107c02c832e63d36122cdab1e00f9 SHA512 ff5cd23b3351e474f8d9327bee52733587f8e5f8ab8973beff3736bd59af017865512c53b0c42b81f1b4fbb8212099b2d0d3751aa67e190f0e57349ffedd87b2
+DIST khal-0.10.4.tar.gz 185736 BLAKE2B 0cb9deb793f577bbcedcbba4788988973ee9d0ab71fdd30a01142a54434767d74b1d10e5bfa5f6a2feb9f18a8a9fe22717d4a38a07ab5e30b331c87b79a79f39 SHA512 b32f1bfe5d3a3976278726a6570eb345a5ad44f63a52b75f045fd0509d145edd5b76e11a10acffd9c3982edc124f93daec34a37c39299c2311796c0314016eb6
+EBUILD khal-0.10.4.ebuild 1309 BLAKE2B 6e434cf11da9566a73c8332178c191d412bc630b3eadb74817e6c0db2053e1077379f3c3ac21880fb43628073ef872eeab1ff79de851cf730c1c34326f3b7924 SHA512 2812692b896baa76082173b808995ee8b0ec54fa2a88101b27de63198bbe86bc3141e002754f1f0bd130d8b94ff7db8b0541f995ce87558a5d8e77fe3cc56873
 MISC metadata.xml 285 BLAKE2B 5e4543b327c8dc84cecfda51b540cccf8722c584a44ce5146beb390ccb3105af8789c8dfefe614e92723eb12a3c167baab09d6e83bd1d7ad2feb3f5ae31f7c81 SHA512 6309634c2ea8e5cbe7ce1627098b90fc90ae12829000332f83e967dd3ef1677dc807b78332cc9c790155323086d901b9db1c5acb23252c1f5e5d241d8b0b73d9
diff --git a/app-misc/khal/files/khal-0.10.4-add-etag.patch b/app-misc/khal/files/khal-0.10.4-add-etag.patch
new file mode 100644
index 000000000000..14b9e6df71bf
--- /dev/null
+++ b/app-misc/khal/files/khal-0.10.4-add-etag.patch
@@ -0,0 +1,10 @@
+--- a/khal/ui/__init__.py	2022-02-02 16:30:20.507169060 +0100
++++ b/khal/ui/__init__.py	2022-02-02 16:30:46.497378047 +0100
+@@ -1109,6 +1109,7 @@
+             account, href, etag = part.split('\n', 2)
+             event = self.collection.get_event(href, account)
+             event.delete_instance(rec_id)
++            event.etag = etag
+             self.collection.update(event)
+
+     def keypress(self, size, key):
diff --git a/app-misc/khal/khal-0.10.1-r3.ebuild b/app-misc/khal/khal-0.10.1-r3.ebuild
deleted file mode 100644
index 008437f04e00..000000000000
--- a/app-misc/khal/khal-0.10.1-r3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_8 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="A CalDAV based calendar"
-HOMEPAGE="http://lostpackets.de/khal/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND=">=dev-python/click-3.2[${PYTHON_USEDEP}]
-	>=dev-python/click-log-0.2.0[${PYTHON_USEDEP}]
-	>=dev-python/icalendar-4.0.3[${PYTHON_USEDEP}]
-	dev-python/urwid[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/atomicwrites-0.1.7[${PYTHON_USEDEP}]
-	<dev-python/tzlocal-3[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]"
-BDEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
-	dev-python/vdirsyncer[${PYTHON_USEDEP}]
-	dev-python/freezegun[${PYTHON_USEDEP}]"
-
-DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample )
-
-src_install() {
-	distutils-r1_src_install
-
-	insinto /usr/share/zsh/site-functions
-	doins misc/__khal
-}
diff --git a/app-misc/khal/khal-0.10.2-r2.ebuild b/app-misc/khal/khal-0.10.4.ebuild
index 7d70c3055f83..3fb13770ef22 100644
--- a/app-misc/khal/khal-0.10.2-r2.ebuild
+++ b/app-misc/khal/khal-0.10.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="sqlite"
@@ -31,8 +31,12 @@ BDEPEND=">dev-python/setuptools_scm-1.12.0[${PYTHON_USEDEP}]
 	dev-python/vdirsyncer[${PYTHON_USEDEP}]
 	dev-python/freezegun[${PYTHON_USEDEP}]"
 
+# https://github.com/pimutils/khal/issues/793
+PATCHES=( "${FILESDIR}/${P}-add-etag.patch" )
 DOCS=( AUTHORS.txt CHANGELOG.rst CONTRIBUTING.rst README.rst khal.conf.sample )
 
+distutils_enable_tests pytest
+
 src_install() {
 	distutils-r1_src_install