From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A5F5A138359 for ; Sat, 15 Aug 2020 20:32:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6B2FE0824; Sat, 15 Aug 2020 20:32:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BCF30E0824 for ; Sat, 15 Aug 2020 20:32:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9E81734EF4F for ; Sat, 15 Aug 2020 20:32:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C5C92EE for ; Sat, 15 Aug 2020 20:32:09 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1597523509.8e31cbf758673271ca84f5c65f004ca2236ada23.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/ldb/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/ldb/ldb-2.0.12-r1.ebuild sys-libs/ldb/ldb-2.1.4-r1.ebuild sys-libs/ldb/ldb-2.2.0-r1.ebuild X-VCS-Directories: sys-libs/ldb/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 8e31cbf758673271ca84f5c65f004ca2236ada23 X-VCS-Branch: master Date: Sat, 15 Aug 2020 20:32:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2560fa8f-7248-41a3-99f1-cfccc411ffa8 X-Archives-Hash: a33d16690b7f98e3995009f1aec74969 commit: 8e31cbf758673271ca84f5c65f004ca2236ada23 Author: David Seifert gentoo org> AuthorDate: Sat Aug 15 20:31:49 2020 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Aug 15 20:31:49 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e31cbf7 sys-libs/ldb: Require python at build-time unconditionally * waf requires setting up a valid python interpreter before calling waf-utils_src_configure. Closes: https://bugs.gentoo.org/733188 Closes: https://bugs.gentoo.org/737238 Closes: https://github.com/gentoo/gentoo/pull/17126 Package-Manager: Portage-3.0.2, Repoman-2.3.23 Signed-off-by: David Seifert gentoo.org> sys-libs/ldb/ldb-2.0.12-r1.ebuild | 8 +++++--- sys-libs/ldb/ldb-2.1.4-r1.ebuild | 8 +++++--- sys-libs/ldb/ldb-2.2.0-r1.ebuild | 8 +++++--- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/sys-libs/ldb/ldb-2.0.12-r1.ebuild b/sys-libs/ldb/ldb-2.0.12-r1.ebuild index 22e302e558d..e436f29893c 100644 --- a/sys-libs/ldb/ldb-2.0.12-r1.ebuild +++ b/sys-libs/ldb/ldb-2.0.12-r1.ebuild @@ -32,12 +32,13 @@ RDEPEND=" DEPEND="dev-libs/libxslt doc? ( app-doc/doxygen ) - python? ( ${PYTHON_DEPS} ) virtual/pkgconfig + ${PYTHON_DEPS} ${RDEPEND} " -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} test? ( python )" WAF_BINARY="${S}/buildtools/bin/waf" @@ -53,7 +54,8 @@ pkg_setup() { # Package fails to build with distcc export DISTCC_DISABLE=1 - use python && python-single-r1_pkg_setup + # waf requires a python interpreter + python-single-r1_pkg_setup } src_prepare() { diff --git a/sys-libs/ldb/ldb-2.1.4-r1.ebuild b/sys-libs/ldb/ldb-2.1.4-r1.ebuild index 91e258a2a01..ac64906fee1 100644 --- a/sys-libs/ldb/ldb-2.1.4-r1.ebuild +++ b/sys-libs/ldb/ldb-2.1.4-r1.ebuild @@ -32,12 +32,13 @@ RDEPEND=" DEPEND="dev-libs/libxslt doc? ( app-doc/doxygen ) - python? ( ${PYTHON_DEPS} ) virtual/pkgconfig + ${PYTHON_DEPS} ${RDEPEND} " -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} test? ( python )" WAF_BINARY="${S}/buildtools/bin/waf" @@ -53,7 +54,8 @@ pkg_setup() { # Package fails to build with distcc export DISTCC_DISABLE=1 - use python && python-single-r1_pkg_setup + # waf requires a python interpreter + python-single-r1_pkg_setup } src_prepare() { diff --git a/sys-libs/ldb/ldb-2.2.0-r1.ebuild b/sys-libs/ldb/ldb-2.2.0-r1.ebuild index 91e258a2a01..ac64906fee1 100644 --- a/sys-libs/ldb/ldb-2.2.0-r1.ebuild +++ b/sys-libs/ldb/ldb-2.2.0-r1.ebuild @@ -32,12 +32,13 @@ RDEPEND=" DEPEND="dev-libs/libxslt doc? ( app-doc/doxygen ) - python? ( ${PYTHON_DEPS} ) virtual/pkgconfig + ${PYTHON_DEPS} ${RDEPEND} " -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} test? ( python )" WAF_BINARY="${S}/buildtools/bin/waf" @@ -53,7 +54,8 @@ pkg_setup() { # Package fails to build with distcc export DISTCC_DISABLE=1 - use python && python-single-r1_pkg_setup + # waf requires a python interpreter + python-single-r1_pkg_setup } src_prepare() {