gentoo resync : 05.03.2021

4 files changed, 2 insertions, 92 deletions

diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index 5892736d1778..bb671fc4fccf 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1,6 +1,3 @@
-AUX bsddb3-6.2.7-py39.patch 898 BLAKE2B 5d4c6cf6f4cdd1e65aec5d959f31cbe47a37cf4df803512b28dd4692961ef0184642abeb3d8eeac68f074c50d639d1944393785eb0ca30f5aedbdb9e0adc4de2 SHA512 584e65fef1dd7ccc8c75404fc73780db9845e7a73796dcce80e4506f0d7c51ff7234d9d2d48c8ea873e4f304d7abaf3f6fe2662ccf847c094b7e54b567969cce
-DIST bsddb3-6.2.7.tar.gz 437325 BLAKE2B ed7931a32766338c5674cc017a8528d30acf9397443f270bf93974c9ed7ae4abdc6b704d85d48f68e0c4b6d85c4ad71edf891e342e5f9b9a597453140adde742 SHA512 edd85fb697142ac152a10a299899c52b637a3b1e3d28d913c61f9de91ef292fc2055daeb18fca62242284b4189a61d5bf318aca6e2966849879043a46db000e0
 DIST bsddb3-6.2.9.tar.gz 230475 BLAKE2B 68c7c498d581dd5ca860060a3152f7ae135bbc75d00714764446d071e8ea88d303a73d1aa411db1ff8fc922aa6d486632fe38bef3596550150ed511a97fc9c9c SHA512 9e878ef865cba608fafe4274b660234927b9106323c3e4ddd728682b0f11b3c7edb9a3dd56cdfe8665eba890df4121695c9710b95bb2f43b8a0be3ec4050f61e
-EBUILD bsddb3-6.2.7.ebuild 1706 BLAKE2B d1b9f0e5e0fc8ff856bc8453ec95edabb5ef0591dc49cbe8404dd43d17f45e3988f072ff3346eea54452cc418d354fd80618fd847574fb0958f134b4438b684c SHA512 41f9974c61054faf11db07650491e4e30440e3e87185a4544852906170e75f0aa2184a2f8a456b1a89cef7f8e7a3b5698d9c97f6af73689df0360640da6058d7
-EBUILD bsddb3-6.2.9.ebuild 1662 BLAKE2B ac77f8ca00747dcd3dc268f6b5862399be05a7e07d102eaee22760b53ac24d28386c16c086ad7a362d13f7833c850e2bf63821810a31cb7b657b3b3883a3f1f7 SHA512 bab21c96fb66db16dd4ea1b2afbf42cc1663f2c1ad16970c75b78978a353ecbd632b359494d20bc2e12d2b389fe5f44acb4b1e90af3f9c3fc25ac42f0ffb687e
+EBUILD bsddb3-6.2.9.ebuild 1660 BLAKE2B fd8e6f97ea1733ae47a30f4244731785b30443bb92062cc9f03698032813e2839e4cf54a7f1d71cbb4bce299ef32c674ae0d7acd35eecb560968e537318ac0c2 SHA512 a66c57468e88fefddf0925ce93f45cdde111681722435002eb92d4d566d4e364a35d5f953597ea65abd76bb2d14891b996f87f7c7d5389a2709748440b3b9011
 MISC metadata.xml 309 BLAKE2B 2a491c74fd8f64d284bbe32aea28da5790bb54ba0105fd61f477f725bb00fa729e976c20d35cfdead53483fef8d711ea0d9000cc2dd9663ec498b02e9e082083 SHA512 edf575ec4a06047d837caffa6c8c8a35d53c5236d806e6d2b4804943617000d8f745f1b94fecfe2af117be823821669e6b7e9aea2a427aa2d97b1eb6ec11eb20
diff --git a/dev-python/bsddb3/bsddb3-6.2.7.ebuild b/dev-python/bsddb3/bsddb3-6.2.7.ebuild
deleted file mode 100644
index baea2b392f2b..000000000000
--- a/dev-python/bsddb3/bsddb3-6.2.7.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit db-use distutils-r1
-
-DESCRIPTION="Python bindings for Berkeley DB"
-HOMEPAGE="https://www.jcea.es/programacion/pybsddb.htm https://pypi.org/project/bsddb3/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	<sys-libs/db-6.3:=
-	|| (
-		sys-libs/db:6.2
-		sys-libs/db:6.1
-		sys-libs/db:5.3
-		sys-libs/db:5.1
-		sys-libs/db:4.8
-		sys-libs/db:4.7
-	)"
-DEPEND="${RDEPEND}"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py39.patch
-)
-
-python_prepare_all() {
-	# This list should be kept in sync with setup.py.
-	if [[ -z ${DB_VER} ]]; then
-		for DB_VER in 6.2 6.1 5.3 5.1 4.8 4.7; do
-			has_version "sys-libs/db:${DB_VER}" && break
-		done
-	fi
-
-	# Force version.
-	sed -e "s/db_ver = None/db_ver = (${DB_VER%.*}, ${DB_VER#*.})/" \
-		-e "s/dblib = 'db'/dblib = '$(db_libname ${DB_VER})'/" \
-		-i setup2.py setup3.py || die
-
-	# Adjust test.py to look in build/lib.
-	sed -e "s/'lib.%s' % PLAT_SPEC/'lib'/" \
-		-i test2.py test3.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	# These are needed for both build and install.
-	export BERKELEYDB_DIR="${EPREFIX}/usr"
-	export BERKELEYDB_INCDIR="$(db_includedir ${DB_VER})"
-	export BERKELEYDB_LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-	export YES_I_HAVE_THE_RIGHT_TO_USE_THIS_BERKELEY_DB_VERSION=1
-}
-
-python_test() {
-	PYTHONPATH=Lib3 "${EPYTHON}" test3.py -v || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/bsddb3/bsddb3-6.2.9.ebuild b/dev-python/bsddb3/bsddb3-6.2.9.ebuild
index 2c50b6decd17..b30ba33d00f0 100644
--- a/dev-python/bsddb3/bsddb3-6.2.9.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.9.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<sys-libs/db-6.3:=
diff --git a/dev-python/bsddb3/files/bsddb3-6.2.7-py39.patch b/dev-python/bsddb3/files/bsddb3-6.2.7-py39.patch
deleted file mode 100644
index 77d4626912af..000000000000
--- a/dev-python/bsddb3/files/bsddb3-6.2.7-py39.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/Lib3/bsddb/test/test_replication.py b/Lib3/bsddb/test/test_replication.py
-index 2fd6aa0..9d78241 100644
---- a/Lib3/bsddb/test/test_replication.py
-+++ b/Lib3/bsddb/test/test_replication.py
-@@ -105,8 +105,12 @@ class DBReplication(unittest.TestCase) :
- 
- class DBReplicationManager(DBReplication) :
-     def test01_basic_replication(self) :
--        master_port = test_support.find_unused_port()
--        client_port = test_support.find_unused_port()
-+        try:
-+            from test.support.socket_helper import find_unused_port
-+        except ImportError:
-+            find_unused_port = test_support.find_unused_port
-+        master_port = find_unused_port()
-+        client_port = find_unused_port()
-         if db.version() >= (5, 2) :
-             self.site = self.dbenvMaster.repmgr_site("127.0.0.1", master_port)
-             self.site.set_config(db.DB_GROUP_CREATOR, True)