gentoo resync : 24.06.2021

5 files changed, 2 insertions, 49 deletions

diff --git a/dev-python/vdf/Manifest b/dev-python/vdf/Manifest
index d4808b3135e1..3808b8e13539 100644
--- a/dev-python/vdf/Manifest
+++ b/dev-python/vdf/Manifest
@@ -1,7 +1,3 @@
-AUX vdf-3.2-mock_from_stdlib.patch 144 BLAKE2B 8a32644d40f90620c050b64cd80aec42d564e0b5f032b0972d2c4219b0b21630b861163bfa716e9d826451b7050cfbae74c2930417f4b0fbbedb9beb1cdfd246 SHA512 aa9226aae713472d10eabdc113e37ae80989c7b4e0b03922a4ce49d5f228ce012c05ee29353caf5a930f5b948b138b5f9ff1fe100f39f839d5638e25f0a51dd6
-AUX vdf-3.3-collections_abc.patch 297 BLAKE2B 0dec9027cfe3a39d06807604a896a8ebccf9acc244eb53e8fac3fc4b01b0c6f2e99f495edc01593b35cdfce1ef3080135eab62a72bc276a6b6a6e2065c3d6310 SHA512 3bdd6ebc8a282edbc79908e6e308982d6afbc93a42c9edf9672ca330bf1f63d3ff89634c736b7af2ec64801f66c4bfcebe777b98359a7b5f5c694723b53ca634
-DIST vdf-3.3.tar.gz 15799 BLAKE2B 48e12d6456f776ae7bf3a3dfec3bbe49f6089ce57720f4ab7beec7502604da290018c7af75f7bb58b1d8a25dc44daea7e028f70d75f7eecdaa9277e9f75a6fd0 SHA512 10b944ff88313001cdfd416b04f13daa7350aad75d3f790b6562cd3953fb5adebf7a0b54be24d853d68eb7ef2b8b469569ed37b3aafb0a2f4d0c6caa6816335f
 DIST vdf-3.4.tar.gz 17082 BLAKE2B f4f65134d5b1b5e52fcbc438b3bfd9000006659d8198e37e377edfda1c6166df0687ce44caf704feffeaa0d23356fffbfce11d467a093e8eb623ccb39a3da9d0 SHA512 a22668039d32cb1ef4660ea187a3a144a32e55e5b02c4c567b850d059a47beac111f9164c67bbe3e7b67d15117efe7b207882465b2353a65b7e0f0c107e88d5c
-EBUILD vdf-3.3.ebuild 579 BLAKE2B d585b8267baee46f72d63e898c4b5541d23041fd99ad668112d476bc6c95553f5729b6a3cc3f49986efd174f42fa70938a7301e0fbae62bf47cc34fde7879169 SHA512 101c87d0699365d26d91de7f85de10aee59e905f7360035526480422dea07353b6da75e5fde76b62837a9c8a1709fadf34d6c2016cf1fa4d5599ae0b80f42758
-EBUILD vdf-3.4.ebuild 472 BLAKE2B 856f9ddbfd031a21bdb597bd23aae9c787df8ab0f2436a21b866021cf7834ba25e6c242a9f237a173d20c0f33a4be1bfa6e9569b2a94d6c572fc2b1b268b9e78 SHA512 e75982715bb6567b58c2ac9989236789ab971352b2cb840bba81096efbdd29d3a5fefb52c1070cc2f37889c833e9f55696b72b26bffe9c2ea4eb49db7a486f99
+EBUILD vdf-3.4.ebuild 471 BLAKE2B 94ae3cb1b3f124112eb2903964b0fdce98acfb353d86a0be51e8f7e0ec74e9acab1de7862daf38427e8275e70d75275a0f63df20166de9c271b28c49ba01d399 SHA512 d0ef5d9d92d3eeb36d860d5bfc80ccbe2a2fae8d5617cf7cbded15d73f79e302ab0640731527d8af214ec8a16ac0439fdab5a6ade657fbeab574d567b4fc7cf9
 MISC metadata.xml 491 BLAKE2B ae8b7f22935105a1a3e989ea0e27430a7e789b71f42416ce24f13334fd9de3b60e45d07d8fb157374517b01a3a5d751dfd2dc7847f39022740170f47570c0617 SHA512 86b89ec8e8956298106ae6d5aafff2b896df9ad9bf6dd397215972eec60a71462470f0fce423e8ee88c2c90070015dfb5a2581836d7e8db26f97de543350350e
diff --git a/dev-python/vdf/files/vdf-3.2-mock_from_stdlib.patch b/dev-python/vdf/files/vdf-3.2-mock_from_stdlib.patch
deleted file mode 100644
index 511e5dd1ddc3..000000000000
--- a/dev-python/vdf/files/vdf-3.2-mock_from_stdlib.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/tests/test_vdf.py
-+++ b/tests/test_vdf.py
-@@ -1,5 +1,5 @@
- import unittest
--import mock
-+import unittest.mock as mock
- import sys
- 
- try:
diff --git a/dev-python/vdf/files/vdf-3.3-collections_abc.patch b/dev-python/vdf/files/vdf-3.3-collections_abc.patch
deleted file mode 100644
index 22c647601688..000000000000
--- a/dev-python/vdf/files/vdf-3.3-collections_abc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/vdf/vdict.py
-+++ b/vdf/vdict.py
-@@ -5,7 +5,7 @@
-     _iter_values = 'values'
-     _range = range
-     _string_type = str
--    import collections as _c
-+    import collections.abc as _c
-     class _kView(_c.KeysView):
-         def __iter__(self):
-             return self._mapping.iterkeys()
diff --git a/dev-python/vdf/vdf-3.3.ebuild b/dev-python/vdf/vdf-3.3.ebuild
deleted file mode 100644
index d4f3fdcce980..000000000000
--- a/dev-python/vdf/vdf-3.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A module for (de)serialization to and from VDF, Valve's key-value text format"
-HOMEPAGE="https://github.com/ValvePython/vdf"
-SRC_URI="https://codeload.github.com/ValvePython/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2-mock_from_stdlib.patch
-	"${FILESDIR}"/${PN}-3.3-collections_abc.patch
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/vdf/vdf-3.4.ebuild b/dev-python/vdf/vdf-3.4.ebuild
index c8883f862819..98c07a5e8ca3 100644
--- a/dev-python/vdf/vdf-3.4.ebuild
+++ b/dev-python/vdf/vdf-3.4.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://codeload.github.com/ValvePython/${PN}/tar.gz/v${PV} -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 distutils_enable_tests pytest