diff options
author | Mike Gilbert <floppym@gentoo.org> | 2014-11-11 22:28:47 +0000 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2014-11-11 22:28:47 +0000 |
commit | 7665b1c5afb698a47167a4da5d767649e83cf595 (patch) | |
tree | 5c800c6b9d00fe3fda079aa4d3990d8d87fe78d1 /sys-libs | |
parent | Call python_optimize in src_install, and backport python changes to nmap-6.25... (diff) | |
download | gentoo-2-7665b1c5afb698a47167a4da5d767649e83cf595.tar.gz gentoo-2-7665b1c5afb698a47167a4da5d767649e83cf595.tar.bz2 gentoo-2-7665b1c5afb698a47167a4da5d767649e83cf595.zip |
Depend on python unconditionally at build time, bug 475370. Patch by Nikoli.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'sys-libs')
-rw-r--r-- | sys-libs/tdb/ChangeLog | 6 | ||||
-rw-r--r-- | sys-libs/tdb/tdb-1.3.0-r1.ebuild | 8 | ||||
-rw-r--r-- | sys-libs/tdb/tdb-1.3.1.ebuild | 8 |
3 files changed, 15 insertions, 7 deletions
diff --git a/sys-libs/tdb/ChangeLog b/sys-libs/tdb/ChangeLog index 792a61f1e71b..f01826d61aa3 100644 --- a/sys-libs/tdb/ChangeLog +++ b/sys-libs/tdb/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/tdb # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/ChangeLog,v 1.76 2014/10/11 12:04:11 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/ChangeLog,v 1.77 2014/11/11 22:28:47 floppym Exp $ + + 11 Nov 2014; Mike Gilbert <floppym@gentoo.org> tdb-1.3.0-r1.ebuild, + tdb-1.3.1.ebuild: + Depend on python unconditionally at build time, bug 475370. Patch by Nikoli. 11 Oct 2014; Markus Meier <maekke@gentoo.org> tdb-1.3.0-r1.ebuild: arm stable, bug #512012 diff --git a/sys-libs/tdb/tdb-1.3.0-r1.ebuild b/sys-libs/tdb/tdb-1.3.0-r1.ebuild index 19be6d336fdd..cf0207a7cd7c 100644 --- a/sys-libs/tdb/tdb-1.3.0-r1.ebuild +++ b/sys-libs/tdb/tdb-1.3.0-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.3.0-r1.ebuild,v 1.12 2014/10/11 12:04:11 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.3.0-r1.ebuild,v 1.13 2014/11/11 22:28:47 floppym Exp $ EAPI=5 -PYTHON_COMPAT=( python{2_6,2_7} ) +PYTHON_COMPAT=( python2_7 ) inherit waf-utils multilib-minimal python-single-r1 eutils @@ -17,17 +17,19 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" IUSE="python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="python? ( ${PYTHON_DEPS} )" DEPEND=" ${RDEPEND} + ${PYTHON_DEPS} app-text/docbook-xml-dtd:4.2" WAF_BINARY="${S}/buildtools/bin/waf" src_prepare() { epatch "${FILESDIR}/add_missing_stdbool_h_include.patch" + python_fix_shebang . multilib_copy_sources } diff --git a/sys-libs/tdb/tdb-1.3.1.ebuild b/sys-libs/tdb/tdb-1.3.1.ebuild index cd8054bf7c52..9295779e5dc0 100644 --- a/sys-libs/tdb/tdb-1.3.1.ebuild +++ b/sys-libs/tdb/tdb-1.3.1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.3.1.ebuild,v 1.1 2014/09/18 19:09:02 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/tdb/tdb-1.3.1.ebuild,v 1.2 2014/11/11 22:28:47 floppym Exp $ EAPI=5 -PYTHON_COMPAT=( python{2_6,2_7} ) +PYTHON_COMPAT=( python2_7 ) inherit waf-utils multilib-minimal python-single-r1 eutils @@ -17,17 +17,19 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" IUSE="python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND="python? ( ${PYTHON_DEPS} )" DEPEND=" ${RDEPEND} + ${PYTHON_DEPS} app-text/docbook-xml-dtd:4.2" WAF_BINARY="${S}/buildtools/bin/waf" src_prepare() { epatch "${FILESDIR}/add_missing_stdbool_h_include.patch" + python_fix_shebang . multilib_copy_sources } |