gentoo resync : 08.07.2021

4 files changed, 2 insertions, 89 deletions

diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest
index 0500c12d0c81..4cb4ec98f537 100644
--- a/dev-python/cbor2/Manifest
+++ b/dev-python/cbor2/Manifest
@@ -1,7 +1,3 @@
-DIST cbor2-5.2.0.tar.gz 81467 BLAKE2B ac35cf682f15eba2c2bff81f562fe2f22906ab8da39c04cbf65f403eeacb5e640e200b15a8cca0d7eede1d0106cd8674640b3093d166a4414a2d42452a374322 SHA512 101aed37c3921ace2f4a5fbb9964ddd2ec2ffcd23fb1a9f838b2f8925f17ffaf5eb39a40b5426e176f0c97a2ba1d3a045e96ceb53312b283101900eddacc6af4
-DIST cbor2-5.3.0.tar.gz 81162 BLAKE2B 41bb0f74998260e2612dbd1990970554b906eaca40e52c21fd90d026ce0aad706830b98f10a226bdc23b819d3f1c52f93f25892a1de04f2a673b4d150a5c47fa SHA512 05eacace46c4b2f7025f12613ae6a755aa7fab14f15d0131d4d856ec5c37bea547d3c4a8afdde28c8653139be741f47351de5460df7dd3ec662325c8d1e2f3fd
 DIST cbor2-5.4.0.tar.gz 84850 BLAKE2B f615667fbf0a823606d55e36de42af6ff4cdc0f039e540750ec2663ba660bf11f26b75ed21ffa61ba6de05fcb6eb76982757321430506a4cfde11c1487cc788c SHA512 9fb110ebadbd803af94bbe5b6f35bf6d28dd2c30609d1bacca08dfa01efb07e670fee72aa29010ef6c64051eda6e772d3ada0fd64c444ccc0e94061483131c60
-EBUILD cbor2-5.2.0.ebuild 894 BLAKE2B 36b608216833f231b1474c89d4eb003114e1b1de750ff2044aab51af212c48010275d67ba2849063bed943b423d6cede889cac39bd0f0b215dddd71e213a138f SHA512 32d3439ee5126da0d3574f81683c1b776a8814e7c7fe084f12f54dafaec703c6da3cd10e365ff371bed5a24e5da954399724cf6384417cf69e384fd85a12700f
-EBUILD cbor2-5.3.0.ebuild 956 BLAKE2B d084c44504bc9bcaac1425ed500f4f4f7aead2791155ccf06f46816693775c30f3f0694fd05ce0681638ddbb515aa0578237c92762db35b8e0a9f1a29518d414 SHA512 ccf5ed460c7fb3bd9a751bc9183fd2bca5cc456d4d3ff9736d7796c0b8ecafb42e1badcbfd64ef59d6ab7189d001783060d9cd551dcf553b289238aa796ad196
-EBUILD cbor2-5.4.0.ebuild 671 BLAKE2B ae44d926fd32f69bb540d9ca3c79e687afecf89e399b952fbc10598cbe7a9db112772a06c7d7fb51acb2f65d5f411b8eedc2205a34b50764960db9545f652c3b SHA512 346dee83e92a04da852747a76a6dbd08883439a89a0a698cb6e1c98631b0c9d1430da0d37c84847735d92084fe0f2ce5acd52604ce727eff9a181ab3e95df726
+EBUILD cbor2-5.4.0.ebuild 669 BLAKE2B 94402bbe05e2501dce140e2dadfcdc5da42a4c945cfd8760e1701d9688ea19eb8fdbb65337c3a53fdfd6375c452906369cbd3d751305580aefa64e9fa4946002 SHA512 65336ad97d2334d121ad28cdb5b0508c6c8b427db4522c5242363457679b8d64620121b77c3f3f26e2695e11740f189ac74c78446e915d78b437f89733485e18
 MISC metadata.xml 994 BLAKE2B 1cbdb43b43bbbdc4eb6e316cca38500fcb11bcb2f4114ed4febda09976b992c5e033b42a8d2669c785a54d310c0513fa665b77f40784a91244942556c8dc0a61 SHA512 977635a48f9e914c7c6d9cdb7acdc4db5eef968214a3e814bd448fda55f418402672f58405278e3594b43cd72825e053cff0a3a38f31d556fb898a190755a4b2
diff --git a/dev-python/cbor2/cbor2-5.2.0.ebuild b/dev-python/cbor2/cbor2-5.2.0.ebuild
deleted file mode 100644
index ee466b902b56..000000000000
--- a/dev-python/cbor2/cbor2-5.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support"
-HOMEPAGE="https://github.com/agronholm/cbor2 https://pypi.org/project/cbor2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -e "s/pytest-cov//" \
-		-e "s/--cov //" \
-		-i setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local deselect=()
-
-	if use arm || use x86; then
-		# https://github.com/agronholm/cbor2/issues/99
-		deselect+=(
-			tests/test_decoder.py::test_huge_truncated_bytes
-			tests/test_decoder.py::test_huge_truncated_string
-		)
-	fi
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/cbor2/cbor2-5.3.0.ebuild b/dev-python/cbor2/cbor2-5.3.0.ebuild
deleted file mode 100644
index 08eedaa0341c..000000000000
--- a/dev-python/cbor2/cbor2-5.3.0.ebuild
+++ /dev/null
@@ -1,43 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support"
-HOMEPAGE="https://github.com/agronholm/cbor2 https://pypi.org/project/cbor2/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dep
-	sed -e "s/pytest-cov//" \
-		-e "s/--cov //" \
-		-i setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local deselect=()
-
-	if use arm || use x86; then
-		# https://github.com/agronholm/cbor2/issues/99
-		deselect+=(
-			tests/test_decoder.py::test_huge_truncated_bytes
-			tests/test_decoder.py::test_huge_truncated_string
-		)
-	fi
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/cbor2/cbor2-5.4.0.ebuild b/dev-python/cbor2/cbor2-5.4.0.ebuild
index 1654cebdaf94..f928522c497e 100644
--- a/dev-python/cbor2/cbor2-5.4.0.ebuild
+++ b/dev-python/cbor2/cbor2-5.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]"