gentoo resync : 20.03.2022

3 files changed, 2 insertions, 66 deletions

diff --git a/dev-python/berkeleydb/Manifest b/dev-python/berkeleydb/Manifest
index 6005bafe1aaf..f8caa90697a2 100644
--- a/dev-python/berkeleydb/Manifest
+++ b/dev-python/berkeleydb/Manifest
@@ -1,5 +1,3 @@
-DIST berkeleydb-18.1.4.tar.xz 137160 BLAKE2B c93e7707bf12199c8161112accfedc3b0180b8f6edcf5c928c03f373528bb9ccb23219865344d9ed29d30b0133a2161ba0325257b6f7a2d22a58e8d9b1f82ce2 SHA512 bac2848e82ba5fdd3ca8fbf3a02d04faf270132f4b9fe93096ea57ab99fcc7eba02ff8a9638ea8e028d8bd4f16eebbefb65f33ea67e95c0a14cced05d04b23b8
 DIST berkeleydb-18.1.5.tar.xz 138488 BLAKE2B 1131509f30316469cfed30abdbd672ab73ef7dfc957e16935d04066b4a2efeb3c777ae4f70f821a29f4d8b8b51d649998735eb412639cc52997c9ee4a98c51db SHA512 c7a51e96cf32b74188b0cb4ed1d8b87436b30dc4929ba22180677ffb5eacd455a67eb5a231c814fc46ccc4c6a5da2f41876a343228969eab988bb0766d40a751
-EBUILD berkeleydb-18.1.4.ebuild 1755 BLAKE2B cb7214bfc8c8d1099e060809277f8497bb1e8179ff8f9063717d4d95954b3d2674df215cd686caf7ee973c1e776ed09c2b95b02c9618f926ff20cb81baa4bbef SHA512 311e4275b07e4313a3bccb3c9ee4063090aa297aace4ec6343c46c337f12eb1bc3e48996cfa87478a0c222792b8998d5471c33edd6a590193e80f9e76a32ba3c
-EBUILD berkeleydb-18.1.5.ebuild 1762 BLAKE2B db1f7ef0fd9a2f79704c5ba1ea930dd36153dcc776d1692b0d18ec8c8c02444da2e4c7e93fa2301c0fe755f91bfbcd2b8ac9945c333682d6353d73afd1175ea0 SHA512 f88e952f8d80ae7d26c0e623fe9a90cae54f20d44271ca3b5052bb5314048b5311e599e9f3b637cde21943246438f4ca97de5e554730ccad575611f08e31ded3
+EBUILD berkeleydb-18.1.5.ebuild 1755 BLAKE2B cb7214bfc8c8d1099e060809277f8497bb1e8179ff8f9063717d4d95954b3d2674df215cd686caf7ee973c1e776ed09c2b95b02c9618f926ff20cb81baa4bbef SHA512 311e4275b07e4313a3bccb3c9ee4063090aa297aace4ec6343c46c337f12eb1bc3e48996cfa87478a0c222792b8998d5471c33edd6a590193e80f9e76a32ba3c
 MISC metadata.xml 324 BLAKE2B 0741c4e1875fa2e306979097f6cc2fe13e9dda41f6aa49e54322289776387f97f399caa9ce79778dfeb8f4841a1b0cb3674e5748f556fbd5b116e97277a9a8ad SHA512 8eeeebb33f5cddbf7c841809d61f363f44757960ad5c71c84f1afa45c77d7e7c2ac5af226bfb0bd0348f4fb9167d2e9627b43b76951ca1abbdf514264feb9a56
diff --git a/dev-python/berkeleydb/berkeleydb-18.1.4.ebuild b/dev-python/berkeleydb/berkeleydb-18.1.4.ebuild
deleted file mode 100644
index 9c8e6b6acd04..000000000000
--- a/dev-python/berkeleydb/berkeleydb-18.1.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit db-use distutils-r1
-
-# Tests aren't included in PyPi tarballs, so just manually clone from upstream
-# at https://hg.jcea.es/pybsddb/ and prepare out tarball
-
-DESCRIPTION="Python bindings for Oracle Berkeley DB"
-HOMEPAGE="https://www.jcea.es/programacion/pybsddb.htm https://pypi.org/project/berkeleydb/"
-SRC_URI="https://dev.gentoo.org/~arthurzam/distfiles/dev-python/${PN}/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	|| (
-		sys-libs/db:6.2
-		sys-libs/db:5.3
-		sys-libs/db:4.8
-	)"
-DEPEND="${RDEPEND}"
-
-python_prepare_all() {
-	# This list should be kept in sync with setup3.py.
-	if [[ -z ${DB_VER} ]]; then
-		for DB_VER in 6.2 5.3 4.8; 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 setup3.py || die
-
-	# rename to bypass name conflict with builtin test module
-	mv test.py test3.py || die
-
-	# Adjust test3.py to look in build/lib.
-	sed -e "s/'lib.%s' % PLAT_SPEC/'lib'/" -i 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() {
-	"${EPYTHON}" test3.py -vv || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/berkeleydb/berkeleydb-18.1.5.ebuild b/dev-python/berkeleydb/berkeleydb-18.1.5.ebuild
index 1117442721e8..9c8e6b6acd04 100644
--- a/dev-python/berkeleydb/berkeleydb-18.1.5.ebuild
+++ b/dev-python/berkeleydb/berkeleydb-18.1.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://dev.gentoo.org/~arthurzam/distfiles/dev-python/${PN}/${P}.tar.x
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	|| (