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: gentoo#17126 Package-Manager: Portage-3.0.2, Repoman-2.3.23 Signed-off-by: David Seifert <[email protected]>
hanetzer · Aug 15, 2020 · 8e31cbf · 8e31cbf
1 parent 21bdedd
commit 8e31cbf
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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() {