Fixup distutils-r1 conversion, and fix build with newer multilib-enabled sys-apps/db.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 35 insertions, 38 deletions

diff --git a/dev-python/bsddb3/ChangeLog b/dev-python/bsddb3/ChangeLog
index 5a1a7143235b..f5ec805c3c9c 100644
--- a/dev-python/bsddb3/ChangeLog
+++ b/dev-python/bsddb3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/bsddb3
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/ChangeLog,v 1.101 2014/04/01 11:23:14 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/ChangeLog,v 1.102 2014/05/19 00:43:33 floppym Exp $
+
+  19 May 2014; Mike Gilbert <floppym@gentoo.org> bsddb3-6.0.1.ebuild:
+  Fixup distutils-r1 conversion, and fix build with newer multilib-enabled sys-
+  apps/db.
 
   01 Apr 2014; Ian Delaney <idella4@gentoo.org>+files/py3tests.patch,
   bsddb3-6.0.0.ebuild:
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index ba3ddfec0e52..e98d17f1123c 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -12,13 +12,13 @@ EBUILD bsddb3-5.2.0.ebuild 1684 SHA256 649130f02f887efde7c23daf7798c067cccaa812b
 EBUILD bsddb3-5.3.0-r1.ebuild 1928 SHA256 93d755b486528c4e79096affb1732e73c12b060f950a671d6f39594e67d7421c SHA512 c9efb870ccc143b3b4e957e7b7e5de25ede04f9321194be3dace2935f2cf2fe69f614387a707ed6b5bd36cbbd19f2ebf35d695ca20f66bbf2823fa067eb38019 WHIRLPOOL 4c9f994cf7778177b203d812f43f7ab074b4957bf3f312903dc38eff532729ae396c3a213b30dc307a37ea46b7c0518e6d7fe48d651c269f5a7c2e1844fe86e4
 EBUILD bsddb3-5.3.0.ebuild 1797 SHA256 c22a9969c59694758268c49e7616611cce850ae865d41932716f270d637b3491 SHA512 bf438260898fd7e7d3605af5980beb93c4d1e132e738df5abc1afd496da00877d585e98f68a5da7c016a70c7888da544b6602a1003ba561b23f8a3f20e4974ab WHIRLPOOL e3b4e7f0da87ae85f7398753d927a1f2c9188650ff61f503a7f928c09f07feaf756db8540b1193b5104f3e819df6352ebae4580f329d95283bf77c790227fdf9
 EBUILD bsddb3-6.0.0.ebuild 2071 SHA256 9e1a887f9d57e8669e556c9bcd082144d6b10f2120bf73148287803bb02e9ee6 SHA512 7d6fcc8436dfcf57ea0cc7c00c0d63abda29af293a4916bd305b3747fac618106701d91110ce24dc9f98a34ed85e4e68971fd5ab57a783f0311fad4b855f62d7 WHIRLPOOL e4f5b2796ac37e72fb1a12cc07c2fb47bafbaf50974443898777c63637f70358ebc77133dd86f3131c5e3b62d087e2380df7cccc734f22700566efa614731daa
-EBUILD bsddb3-6.0.1.ebuild 1993 SHA256 2898739efcc76c0be80da22f75297866ca9380ecf33f64ad9cd4472a52f36d9c SHA512 355ea8b3edce086c2fa735ed62c923394f25bad32f4f90a4787456182ea062c23ea636e2a3cbd1c7b5e3fc3573e7a72acd4b8b8afa14d6138f277c455fd385ac WHIRLPOOL a07e297fb1d995d7e4adcaa0b87d0e4901c068390a2120ebedeca5a52b0c579dc37dc20de24f9f3a13116c1567b45ace00f9cfa83aa24005489547b38f8d39f0
-MISC ChangeLog 12742 SHA256 1f97e93a80282a527dbafc18862c521051431fb467d180f7d9d3933c04fabb1b SHA512 5c33ed04c5a47a38cd045bbc569266dda03e9abd2d63275fd7d63cd49d59da73570ce0fa260141b908ad02ad34b14077a951dba53755c9ea055828ed6bd99bfa WHIRLPOOL 27929e29ccc3846a9753491fde999a1bead7a99ca3feb89a377232e3c248640d653f7ff38e33432c0ef343fc7dc835a8ebdf812cf130e200d1b6eb8f851fc975
+EBUILD bsddb3-6.0.1.ebuild 1716 SHA256 70e75522dabf62faf4268524a423d7b57e3e4db2b131be2d8b891cdaf25ff1aa SHA512 f376b607194d10400bb3d87755af12df6e345903edc7690581f84295c9c302a780b41e6c79cb0f026d6067b22efec20cbd99a956e1ba927aab87c29338439b96 WHIRLPOOL 123d0937cddcdbe499f1de0c05aa522acf6fb3426afe6dc0d64c9161373c50dd42358a98636fe88a74da9e3f942bfdc1c6cf19e724e82ddb95a578f440f7e713
+MISC ChangeLog 12904 SHA256 0342f3fd59d2a9bb1048d9b94b7b2268491ebf3534255ab39dffac8951bdcf14 SHA512 08deb036bedf1c2e328a0a281e9173d626e7561febfbc6da63e06bc9c9a5f07a7c50151e8008ddae436f5e4c4282cb1e9dfdb97ba3693c77d25bbc7b62cf1f8d WHIRLPOOL c956f723b3423f63bd0bc2fca154561109d5f8b53834b469214114b0f295fcc1fea1ef77316e6b3ce3dfe1d977ca7afa26830471cedcabffa005e8a733f6ff0c
 MISC metadata.xml 229 SHA256 deca31172b77151b3139dfaed2c167a0b52849981f10c7fc8c8ebf8bffdbd1da SHA512 be71168c3d6afae44ec7b2ba090d518feee71b53aeb4291be18a68f71b2d12bc97a600a565066a86194da5f8e448850007f1ac10a9d0b4ae705cbae4f21a5854 WHIRLPOOL c6441aea3df06cffbc9fe3facc2eb5e2b7c880ea9b73ef5e3e84ef49e2a7f5aecd51dcb127dcb2c27c7ddef88eeea473ea971536c923b6f7ba81b05ca5227a87
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlM6n/UACgkQso7CE7gHKw3qCgCg03PQrniHYhsV368Dpe+6ULec
-cs4AoKLnN7dcqdrRb3IQqXfFHFHWiyji
-=O2s/
+iF4EAREIAAYFAlN5U7YACgkQC77qH+pIQ6QJdgD+Oxr0HFp+vTBTo/fUlfrxzlih
+sTV0uIFtos6BW6wLdu8BAMM0ZGOjldaXaWBJcEjM65WxC5z0UsYNoTjrnQdOBUf8
+=PdwE
 -----END PGP SIGNATURE-----
diff --git a/dev-python/bsddb3/bsddb3-6.0.1.ebuild b/dev-python/bsddb3/bsddb3-6.0.1.ebuild
index f503723b4b0a..0033095010ce 100644
--- a/dev-python/bsddb3/bsddb3-6.0.1.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-6.0.1.ebuild,v 1.2 2014/04/01 11:17:49 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-6.0.1.ebuild,v 1.3 2014/05/19 00:43:33 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -16,50 +16,43 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
-RDEPEND=">=sys-libs/db-4.8.30"
+RDEPEND=">=sys-libs/db-4.8.30
+	<sys-libs/db-6.1"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
-# PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
 DISTUTILS_IN_SOURCE_BUILD=1
-PATCHES=( "${FILESDIR}"/py3tests.patch )
 
-src_configure() {
-	local DB_VER
-	if has_version sys-libs/db:5.1; then
-		DB_VER="5.1"
-	elif has_version sys-libs/db:5.0; then
-		DB_VER="5.0"
-	else
-		DB_VER="4.8"
-	fi
-	sed -e "s/dblib = 'db'/dblib = '$(db_libname ${DB_VER})'/" -i setup2.py setup3.py || die "sed failed"
+src_prepare() {
+	# This list should be kept in sync with setup.py.
+	for DB_VER in 6.0 5.3 5.2 5.1 5.0 4.8; do
+		has_version "sys-libs/db:${DB_VER}" && break
+	done
+
+	# 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_compile() {
-	distutils-r1_src_compile \
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	fi
+	distutils-r1_python_compile \
 		--berkeley-db="${EPREFIX}/usr" \
 		--berkeley-db-incdir="${EPREFIX}$(db_includedir ${DB_VER})" \
 		--berkeley-db-libdir="${EPREFIX}/usr/$(get_libdir)"
 }
 
 python_test() {
-	# py3 tests misfire in the source om running test_all.py
-	local test
-	pushd "${BUILD_DIR}"/../ > /dev/null
-	if [[ "${EPYTHON}" == python2* ]]; then
-		einfo "all 500 tests are run silently and may take a number of minutes to complete"
-		"${PYTHON}" build/lib/bsddb3/tests/test_all.py || die  "tests failed under ${EPYTHON}"
-	elif python_is_python3; then
-		mv Lib3/bsddb/test/test_all.py . || die
-		for test in Lib3/bsddb/test/test_*
-		do
-			"${PYTHON}" $test || die "tet $test failed under ${EPYTHON}"
-			einfo "test $test passed OK";einfo ""
-		done
-	fi
-	popd  > /dev/null
+	"${PYTHON}" test.py -v || die "Testing failed with ${EPYTHON}"
 }
 
 python_install_all() {