floppym 14/08/03 17:40:12 Modified: bsddb3-6.1.0.ebuild ChangeLog Log: Introduce bindist use flag to control dependency on db-6.x. Bug 494490. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Revision Changes Path 1.2 dev-python/bsddb3/bsddb3-6.1.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/bsddb3/bsddb3-6.1.0.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/bsddb3/bsddb3-6.1.0.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/bsddb3/bsddb3-6.1.0.ebuild?r1=1.1&r2=1.2 Index: bsddb3-6.1.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-6.1.0.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bsddb3-6.1.0.ebuild 27 Jul 2014 00:37:27 -0000 1.1 +++ bsddb3-6.1.0.ebuild 3 Aug 2014 17:40:12 -0000 1.2 @@ -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.1.0.ebuild,v 1.1 2014/07/27 00:37:27 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-6.1.0.ebuild,v 1.2 2014/08/03 17:40:12 floppym Exp $ EAPI=5 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) @@ -14,10 +14,30 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="doc" +IUSE="bindist doc" -RDEPEND=">=sys-libs/db-4.8.30 - <sys-libs/db-6.1" +RDEPEND=" + bindist? ( + || ( + sys-libs/db:5.3= + sys-libs/db:5.2= + sys-libs/db:5.1= + sys-libs/db:5.0= + sys-libs/db:4.8= + ) + ) + !bindist? ( + || ( + sys-libs/db:6.1= + sys-libs/db:6.0= + sys-libs/db:5.3= + sys-libs/db:5.2= + sys-libs/db:5.1= + sys-libs/db:5.0= + sys-libs/db:4.8= + ) + ) +" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}]" @@ -25,7 +45,9 @@ 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 + local db_bindist + use bindist || db_bindist="6.1 6.0" + for DB_VER in ${db_bindist} 5.3 5.2 5.1 5.0 4.8; do has_version "sys-libs/db:${DB_VER}" && break done @@ -44,8 +66,9 @@ src_configure() { # These are needed for both build and install. export BERKELEYDB_DIR="${EPREFIX}/usr" - export BERKELEYDB_INCDIR="${EPREFIX}$(db_includedir)" + export BERKELEYDB_INCDIR="${EPREFIX}$(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() { 1.108 dev-python/bsddb3/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/bsddb3/ChangeLog?rev=1.108&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/bsddb3/ChangeLog?rev=1.108&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/bsddb3/ChangeLog?r1=1.107&r2=1.108 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/bsddb3/ChangeLog,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- ChangeLog 28 Jul 2014 13:43:16 -0000 1.107 +++ ChangeLog 3 Aug 2014 17:40:12 -0000 1.108 @@ -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.107 2014/07/28 13:43:16 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/ChangeLog,v 1.108 2014/08/03 17:40:12 floppym Exp $ + + 03 Aug 2014; Mike Gilbert <[email protected]> bsddb3-6.1.0.ebuild: + Introduce bindist use flag to control dependency on db-6.x. Bug 494490. 28 Jul 2014; Agostino Sarubbo <[email protected]> bsddb3-6.0.1.ebuild: Stable for ppc, wrt bug #512012
