From feb0daf81d888e9160f9f94502de09b66f2a63fd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 21 Jun 2020 17:50:24 +0100 Subject: gentoo resync : 21.06.2020 --- dev-python/bsddb3/Manifest | 3 ++- dev-python/bsddb3/bsddb3-6.2.7.ebuild | 11 +++++++---- dev-python/bsddb3/files/bsddb3-6.2.7-py39.patch | 19 +++++++++++++++++++ 3 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 dev-python/bsddb3/files/bsddb3-6.2.7-py39.patch (limited to 'dev-python/bsddb3') diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest index db1499cd8753..ffc6553cbac1 100644 --- a/dev-python/bsddb3/Manifest +++ b/dev-python/bsddb3/Manifest @@ -1,5 +1,6 @@ +AUX bsddb3-6.2.7-py39.patch 898 BLAKE2B 5d4c6cf6f4cdd1e65aec5d959f31cbe47a37cf4df803512b28dd4692961ef0184642abeb3d8eeac68f074c50d639d1944393785eb0ca30f5aedbdb9e0adc4de2 SHA512 584e65fef1dd7ccc8c75404fc73780db9845e7a73796dcce80e4506f0d7c51ff7234d9d2d48c8ea873e4f304d7abaf3f6fe2662ccf847c094b7e54b567969cce DIST bsddb3-6.2.4.tar.gz 242397 BLAKE2B b6b9c6d4d3231bce400ae46a5df85abddd83bfd3e4e52d0192c2c91faab51af14946c9a8682f55ff8251fd0d1f7a00ba834d7a39c1574b4adcfe2ea396cf684d SHA512 15bb714242b05649a7c40ccd153979e596340ef039c89549b215fc5438a12fedb44150195063d2783c6c06ede3552506e31e8013b6b0431d27dd7e14975c08b0 DIST bsddb3-6.2.7.tar.gz 437325 BLAKE2B ed7931a32766338c5674cc017a8528d30acf9397443f270bf93974c9ed7ae4abdc6b704d85d48f68e0c4b6d85c4ad71edf891e342e5f9b9a597453140adde742 SHA512 edd85fb697142ac152a10a299899c52b637a3b1e3d28d913c61f9de91ef292fc2055daeb18fca62242284b4189a61d5bf318aca6e2966849879043a46db000e0 EBUILD bsddb3-6.2.4.ebuild 1967 BLAKE2B e503da80c3ddb7e91c6e6628281a7099423773722e93bd8bd953d482635734048f17e9c4987d3fbea31ca42738b1b2188b71ad98c66a6e5bf5019e80cbd3e491 SHA512 57734e1c684ff30730c5b0d996e21d66d8283df43b03dc12b515c6aee203b133116986ec7045766a6e33e9d72287c7d1b8e7792642b7c652002beeb7fe54ac64 -EBUILD bsddb3-6.2.7.ebuild 1969 BLAKE2B 9e379c989e50e21b2aa85a74b08f7735483add3669400801ad80a426ac6b8576cd3c0cc880a2694ba5634e638b7358cd8f1817fbf7b7c7ea2150f97bb6a6b0ed SHA512 95bee542ecb3634790aa99f6e3ac2d460466264224d1bd242b58c6a8da1967521b0f5ac48a21a14bf41b00c7fb54d3a0214eff93e5ebcadd53ed2b5ec4703b2f +EBUILD bsddb3-6.2.7.ebuild 1971 BLAKE2B fe4ebed73c2686c541e2f5dfc52c2d5e1ece020674d6ba85fd55584f3c012ed681783daad45293ff17674665bdf8d1661d28ac1109413a499aa383983485f6ef SHA512 e9b35e4d38a8a93f191dce9dde584542f412f28db9619ec2eb8908e63076d7007b170ecfc68e02025ec427dea691545d027e87aed60a253918ad5dfaf95d585f 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 index 2636c7c14f52..d217d17a5f11 100644 --- a/dev-python/bsddb3/bsddb3-6.2.7.ebuild +++ b/dev-python/bsddb3/bsddb3-6.2.7.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{6,7,8} ) +PYTHON_COMPAT=( python2_7 python3_{6..9} ) PYTHON_REQ_USE="threads(+)" DISTUTILS_USE_SETUPTOOLS=no @@ -27,11 +27,14 @@ RDEPEND=" sys-libs/db:4.8 sys-libs/db:4.7 )" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" +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 diff --git a/dev-python/bsddb3/files/bsddb3-6.2.7-py39.patch b/dev-python/bsddb3/files/bsddb3-6.2.7-py39.patch new file mode 100644 index 000000000000..77d4626912af --- /dev/null +++ b/dev-python/bsddb3/files/bsddb3-6.2.7-py39.patch @@ -0,0 +1,19 @@ +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) -- cgit v1.2.3