gentoo resync : 25.08.2020

4 files changed, 8 insertions, 89 deletions

diff --git a/app-misc/khard/Manifest b/app-misc/khard/Manifest
index e10be4f41fe1..290024119b93 100644
--- a/app-misc/khard/Manifest
+++ b/app-misc/khard/Manifest
@@ -1,7 +1,3 @@
-DIST khard-0.11.4.tar.gz 5060159 BLAKE2B 2c176c8bc9651dfd05f3792a66a242eae44b64f9114098916ec8c6e91643c5d57a19f916a0f6e0c559738e1a6c59f88596a54068ba048219a7e4a4d60447a0fe SHA512 f8dda3dd34e529e24276933f5f7354891b8259dfabb8818b4d3898174fb3d8b8a1f24cf81038901e521ef8aeeacec37b45b34c6e4c7eb0022b212a2f476cd9ab
-DIST khard-0.12.2.tar.gz 5064055 BLAKE2B 5dde8d4e535e5eecdbcd679e96db51e6d96cf4ad4c8266acd7fb1c02a89c74e3af8fc3537d7b3febbc1a16578a5208ec608396d36d3f3d4c380cfcc247fb08d4 SHA512 476a90b111e903669a34729bf48f28a4108612f65ed7b85a495d3246461f7b82f378e13e417aba2006cf1bf853245d5466d1bb5eba539b840c9e7b6abfb20c76
 DIST khard-0.13.0.tar.gz 5083020 BLAKE2B 6dc95335f89d5034ddc5fdfafca06b2bfc96c2dd05e966d975eea508a939cc4d64b749c3c6c2a7ce6e74ac40835b33f90442d357b871e47b8f0b2df351225c16 SHA512 353a51a06d6c7aa27b0f1cf35b3f7c113097ea4fa5e27bcb400f00de0cdd65ccaeadcc835b1cba541361a0395265cb967f731b23d875162f2be13381bc0979a6
-EBUILD khard-0.11.4.ebuild 1047 BLAKE2B 5a49a1924187a58ea0bf40b424d401ee0baae588df144cc5e108861f96de4cf46589a8c99ed52df38ec8c73060f8f23bfa46ee082aad7bf77df4b72d0211f025 SHA512 4eb9eab539505f09a209f0e85ee00f0279ef8ede395932db733e9edd1f647d271594c3a96add9a5879b399ab0201a4b763294ac5d757016dd75b373ced314583
-EBUILD khard-0.12.2.ebuild 1088 BLAKE2B 302dfb8248572c15237119721c0fab8ce08aea7932f60df758c4ea60d204a1e18e506362bd5ac986cb768a1fb99dc1ac230939d4ec266e1693c51c43f155f657 SHA512 bc1b6f651bdaa91d218744c8e36ce757cb3f0411e58b7bbbf625bf486d55d85f73bed6ced12357b3d6d0561d84fcbee60f6952cd73c8d1856b19b9971499cdc8
-EBUILD khard-0.13.0.ebuild 1193 BLAKE2B 226590ecf10851053f081775381fb60052e0de8f0dbb9c6d31652ebc2e64400b3bb976d0b84e37d7d27c27f2edfd1e7336154667fc4b92e6da9b38f569fa238d SHA512 cf660d793764431e3ad8929f6112a86a3c6a721e16049109c2ea4244933889c98e1b691f654e0f00e62073fb1aa9294378e6bc6487aaed0e869eb78be0fd1096
+EBUILD khard-0.13.0.ebuild 1235 BLAKE2B 55db533885da6339c122802a22806fb789d7d10af7d9fdfe07eeff2ac6716ae69ff6cb48e85535bedc2a4d04b302e8045f8e8d3f8ae5a43b04c6efc4297daea2 SHA512 199f0c7adf2192b699926113a62813c9c3ef6fb357e8afb7a51fae19b655bb5dfce8ba9311f700fe26b8f55e65f2ffce5185f4268487eaaf396a98d3c7a5edcd
 MISC metadata.xml 343 BLAKE2B 1a688d33284f7637df291ff450cf9c22ed072b2c27b23ced515d0aefc17a82a85d7e6bfbaa35c8c80f676306f26abadd1505c782e9c091734cee17a0541ca464 SHA512 44a220e1d5235c955a516289b53ff2728982ac353a237be83b167373a5ea039ed69d275c16144a8a86059a189dbd74be357e0609bd55b97d820fd92b0731b054
diff --git a/app-misc/khard/khard-0.11.4.ebuild b/app-misc/khard/khard-0.11.4.ebuild
deleted file mode 100644
index f2d17514103f..000000000000
--- a/app-misc/khard/khard-0.11.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-DESCRIPTION="Console CardDAV client"
-HOMEPAGE="https://github.com/scheibler/khard"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="zsh-completion"
-
-if [ "${PV}" == "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/scheibler/khard"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/atomicwrites[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>dev-python/vobject-0.9.3[${PYTHON_USEDEP}]
-"
-# vobject-0.9.3 breaks khard, see
-# https://github.com/scheibler/khard/issues/87
-# https://github.com/eventable/vobject/issues/39
-
-DOCS=( AUTHORS CHANGES README.md misc/khard/khard.conf.example )
-
-src_install() {
-	distutils-r1_src_install
-
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins misc/zsh/_khard
-	fi
-}
diff --git a/app-misc/khard/khard-0.12.2.ebuild b/app-misc/khard/khard-0.12.2.ebuild
deleted file mode 100644
index c66bad5ddb82..000000000000
--- a/app-misc/khard/khard-0.12.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-DESCRIPTION="Console CardDAV client"
-HOMEPAGE="https://github.com/scheibler/khard"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="zsh-completion"
-
-if [ "${PV}" == "9999" ]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/scheibler/khard"
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64"
-fi
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/atomicwrites[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]
-	>dev-python/vobject-0.9.3[${PYTHON_USEDEP}]
-"
-# vobject-0.9.3 breaks khard, see
-# https://github.com/scheibler/khard/issues/87
-# https://github.com/eventable/vobject/issues/39
-
-DOCS=( AUTHORS CHANGES README.md misc/khard/khard.conf.example )
-
-src_install() {
-	distutils-r1_src_install
-
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		doins misc/zsh/_khard
-	fi
-}
diff --git a/app-misc/khard/khard-0.13.0.ebuild b/app-misc/khard/khard-0.13.0.ebuild
index 4cb2597381ae..7b7ff564f1b5 100644
--- a/app-misc/khard/khard-0.13.0.ebuild
+++ b/app-misc/khard/khard-0.13.0.ebuild
@@ -2,11 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 )
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
 inherit distutils-r1
+
 DESCRIPTION="Console CardDAV client"
 HOMEPAGE="https://github.com/scheibler/khard"
 LICENSE="GPL-3"
+
 SLOT="0"
 IUSE="test zsh-completion"
 RESTRICT="!test? ( test )"