gentoo resync : 15.01.2020

3 files changed, 3 insertions, 80 deletions

diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index 2965862ab1c8..4e64e2c19159 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1,5 +1,3 @@
-DIST bsddb3-6.1.1.tar.gz 450571 BLAKE2B fae21052d3422e6e837f21a0e5f65aac063cb4c03b4c833e8b74fdd7da929972f81c3eaf5e869ce0990c1d55454d9f5964c3d526a44c047124d12da2afd78361 SHA512 f5e95edf2d18f04f4a306450a67ad675902b102cde9fdebd870727c2649ba7dd759206708c9225af871e0811e17812ef46c90ea6854eb3209ba36c86900ffb01
 DIST bsddb3-6.2.4.tar.gz 242397 BLAKE2B b6b9c6d4d3231bce400ae46a5df85abddd83bfd3e4e52d0192c2c91faab51af14946c9a8682f55ff8251fd0d1f7a00ba834d7a39c1574b4adcfe2ea396cf684d SHA512 15bb714242b05649a7c40ccd153979e596340ef039c89549b215fc5438a12fedb44150195063d2783c6c06ede3552506e31e8013b6b0431d27dd7e14975c08b0
-EBUILD bsddb3-6.1.1.ebuild 1940 BLAKE2B cdaa1ed8bdb037f43efdd6e40f2f2c4bbd412ac48420164fd431b637dbaea03df4aecf0a5623595846d50fef7cfb3d291125f7d25ef6552734d087d1bf12df1e SHA512 085ba98fe0374aa5349a7812b935476a150c2e92fc2cf5c8d0ddb4e8ad430d99b0a78d639e42bb1b46aaa1f1ead234f964ff41307994d43c7c10256e8e225ac3
-EBUILD bsddb3-6.2.4.ebuild 1939 BLAKE2B 8f787fb2c77b737117424cdfee3786934d6eccdbe89200d6bdd59939a84cbd37d3a90cf74b06b75bb6542a7181b60cd98bc376f5b26964919fd1e0c1913d6f63 SHA512 8f9278aae23784d90ae23d7ff4ad3289df730a231666bdc41f0cd6a28c8654ab0c71e46e024cd0f2d56b754da6e4dddef64cb1b16d32ce9ca230069b4cf6d762
+EBUILD bsddb3-6.2.4.ebuild 1937 BLAKE2B 10e7fb47b31423214a3c11e6461d1b71c01d1e942b9d707a1981f2f6961c4487816b2322a16699cb6b9ec008b9e426067a74ee0eeebbd11108a90279107d201f SHA512 e8d2a467756ccc39e56603acc3be3500c61fd175b06f3150aa73975faf3d544d618e63b0b94f22bd856815747a3845b2b21f3b4f8488c9a383705ab6045171f6
 MISC metadata.xml 309 BLAKE2B 2a491c74fd8f64d284bbe32aea28da5790bb54ba0105fd61f477f725bb00fa729e976c20d35cfdead53483fef8d711ea0d9000cc2dd9663ec498b02e9e082083 SHA512 edf575ec4a06047d837caffa6c8c8a35d53c5236d806e6d2b4804943617000d8f745f1b94fecfe2af117be823821669e6b7e9aea2a427aa2d97b1eb6ec11eb20
diff --git a/dev-python/bsddb3/bsddb3-6.1.1.ebuild b/dev-python/bsddb3/bsddb3-6.1.1.ebuild
deleted file mode 100644
index 2fabdb1ad52a..000000000000
--- a/dev-python/bsddb3/bsddb3-6.1.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_5 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit db-use distutils-r1 multilib
-
-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 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-	>=sys-libs/db-4.7:=
-	<sys-libs/db-6.2:=
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	# This list should be kept in sync with setup.py.
-	if [[ -z ${DB_VER} ]]; then
-		for DB_VER in 6.1 6.0 5.3 5.2 5.1 5.0 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_src_prepare
-}
-
-src_configure() {
-	# 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_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	if python_is_python3; then
-		PYTHONPATH=Lib3 "${PYTHON}" test3.py -v || die "Testing failed with ${EPYTHON}"
-	else
-		PYTHONPATH=Lib "${PYTHON}" test.py -v || die "Testing failed with ${EPYTHON}"
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/bsddb3/bsddb3-6.2.4.ebuild b/dev-python/bsddb3/bsddb3-6.2.4.ebuild
index 0b0b57a9b3d1..009dea51735f 100644
--- a/dev-python/bsddb3/bsddb3-6.2.4.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit db-use distutils-r1