summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-11-16 16:01:22 +0000
committerMichał Górny <mgorny@gentoo.org>2014-11-16 16:01:22 +0000
commit0791555096b5e15723c68c2f0ade9383b3569e8f (patch)
tree6854d9d48d69b092c6ba455f677a31f93c10bdec /dev-util
parentVersion bump couchdb-python to 1.0 (fixes bug 528668) (diff)
downloadgentoo-2-0791555096b5e15723c68c2f0ade9383b3569e8f.tar.gz
gentoo-2-0791555096b5e15723c68c2f0ade9383b3569e8f.tar.bz2
gentoo-2-0791555096b5e15723c68c2f0ade9383b3569e8f.zip
Support using tests without enabling Python linking, bug #529480.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/boost-build/ChangeLog6
-rw-r--r--dev-util/boost-build/boost-build-1.55.0-r1.ebuild11
-rw-r--r--dev-util/boost-build/boost-build-1.56.0.ebuild11
3 files changed, 19 insertions, 9 deletions
diff --git a/dev-util/boost-build/ChangeLog b/dev-util/boost-build/ChangeLog
index d46bf16a40ce..ca9aff5c7a4f 100644
--- a/dev-util/boost-build/ChangeLog
+++ b/dev-util/boost-build/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/boost-build
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.132 2014/11/16 15:40:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/ChangeLog,v 1.133 2014/11/16 16:01:22 mgorny Exp $
+
+ 16 Nov 2014; Michał Górny <mgorny@gentoo.org> boost-build-1.55.0-r1.ebuild,
+ boost-build-1.56.0.ebuild:
+ Support using tests without enabling Python linking, bug #529480.
*boost-build-1.55.0-r1 (16 Nov 2014)
diff --git a/dev-util/boost-build/boost-build-1.55.0-r1.ebuild b/dev-util/boost-build/boost-build-1.55.0-r1.ebuild
index 7a30d5086902..35368eb1be3c 100644
--- a/dev-util/boost-build/boost-build-1.55.0-r1.ebuild
+++ b/dev-util/boost-build/boost-build-1.55.0-r1.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-util/boost-build/boost-build-1.55.0-r1.ebuild,v 1.1 2014/11/16 15:40:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.55.0-r1.ebuild,v 1.2 2014/11/16 16:01:22 mgorny Exp $
EAPI="5"
@@ -22,15 +22,18 @@ RDEPEND="python? ( ${PYTHON_DEPS} )
!<dev-libs/boost-1.34.0
!<=dev-util/boost-build-1.35.0-r1"
DEPEND="${RDEPEND}
- test? ( sys-apps/diffutils )"
+ test? ( sys-apps/diffutils
+ ${PYTHON_DEPS} )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- test? ( python )"
+ test? ( ${PYTHON_REQUIRED_USE} )"
S="${WORKDIR}/boost_${MY_PV}/tools/build/v2"
pkg_setup() {
- use python && python-single-r1_pkg_setup
+ if use python || use test; then
+ python-single-r1_pkg_setup
+ fi
}
src_unpack() {
diff --git a/dev-util/boost-build/boost-build-1.56.0.ebuild b/dev-util/boost-build/boost-build-1.56.0.ebuild
index e4616214c3bf..e0513e5675ea 100644
--- a/dev-util/boost-build/boost-build-1.56.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.56.0.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-util/boost-build/boost-build-1.56.0.ebuild,v 1.2 2014/11/16 15:40:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/boost-build/boost-build-1.56.0.ebuild,v 1.3 2014/11/16 16:01:22 mgorny Exp $
EAPI="5"
@@ -22,15 +22,18 @@ RDEPEND="python? ( ${PYTHON_DEPS} )
!<dev-libs/boost-1.34.0
!<=dev-util/boost-build-1.35.0-r1"
DEPEND="${RDEPEND}
- test? ( sys-apps/diffutils )"
+ test? ( sys-apps/diffutils
+ ${PYTHON_DEPS} )"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
- test? ( python )"
+ test? ( ${PYTHON_REQUIRED_USE} )"
S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
pkg_setup() {
- use python && python-single-r1_pkg_setup
+ if use python || use test; then
+ python-single-r1_pkg_setup
+ fi
}
src_unpack() {