floppym 14/05/19 04:38:50 Modified: bsddb3-6.0.1.ebuild ChangeLog Log: Set BERKELEYDB envvars instead of passing them as arguments to setup.py. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Revision Changes Path 1.4 dev-python/bsddb3/bsddb3-6.0.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/bsddb3/bsddb3-6.0.1.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/bsddb3/bsddb3-6.0.1.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/bsddb3/bsddb3-6.0.1.ebuild?r1=1.3&r2=1.4 Index: bsddb3-6.0.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-6.0.1.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bsddb3-6.0.1.ebuild 19 May 2014 00:43:33 -0000 1.3 +++ bsddb3-6.0.1.ebuild 19 May 2014 04:38:50 -0000 1.4 @@ -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.3 2014/05/19 00:43:33 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-6.0.1.ebuild,v 1.4 2014/05/19 04:38:50 floppym Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) @@ -41,14 +41,18 @@ distutils-r1_src_prepare } +src_configure() { + # These are needed for both build and install. + export BERKELEYDB_DIR="${EPREFIX}/usr" + export BERKELEYDB_INCDIR="${EPREFIX}$(db_includedir)" + export BERKELEYDB_LIBDIR="${EPREFIX}/usr/$(get_libdir)" +} + 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)" + distutils-r1_python_compile } python_test() { 1.103 dev-python/bsddb3/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/bsddb3/ChangeLog?rev=1.103&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/bsddb3/ChangeLog?rev=1.103&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/bsddb3/ChangeLog?r1=1.102&r2=1.103 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/bsddb3/ChangeLog,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- ChangeLog 19 May 2014 00:43:33 -0000 1.102 +++ ChangeLog 19 May 2014 04:38:50 -0000 1.103 @@ -1,6 +1,9 @@ # 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.102 2014/05/19 00:43:33 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/ChangeLog,v 1.103 2014/05/19 04:38:50 floppym Exp $ + + 19 May 2014; Mike Gilbert <[email protected]> bsddb3-6.0.1.ebuild: + Set BERKELEYDB envvars instead of passing them as arguments to setup.py. 19 May 2014; Mike Gilbert <[email protected]> bsddb3-6.0.1.ebuild: Fixup distutils-r1 conversion, and fix build with newer multilib-enabled sys-
