| 1 |
commit: 8e31cbf758673271ca84f5c65f004ca2236ada23 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 15 20:31:49 2020 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 15 20:31:49 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e31cbf7 |
| 7 |
|
| 8 |
sys-libs/ldb: Require python at build-time unconditionally |
| 9 |
|
| 10 |
* waf requires setting up a valid python interpreter |
| 11 |
before calling waf-utils_src_configure. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/733188 |
| 14 |
Closes: https://bugs.gentoo.org/737238 |
| 15 |
Closes: https://github.com/gentoo/gentoo/pull/17126 |
| 16 |
Package-Manager: Portage-3.0.2, Repoman-2.3.23 |
| 17 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 18 |
|
| 19 |
sys-libs/ldb/ldb-2.0.12-r1.ebuild | 8 +++++--- |
| 20 |
sys-libs/ldb/ldb-2.1.4-r1.ebuild | 8 +++++--- |
| 21 |
sys-libs/ldb/ldb-2.2.0-r1.ebuild | 8 +++++--- |
| 22 |
3 files changed, 15 insertions(+), 9 deletions(-) |
| 23 |
|
| 24 |
diff --git a/sys-libs/ldb/ldb-2.0.12-r1.ebuild b/sys-libs/ldb/ldb-2.0.12-r1.ebuild |
| 25 |
index 22e302e558d..e436f29893c 100644 |
| 26 |
--- a/sys-libs/ldb/ldb-2.0.12-r1.ebuild |
| 27 |
+++ b/sys-libs/ldb/ldb-2.0.12-r1.ebuild |
| 28 |
@@ -32,12 +32,13 @@ RDEPEND=" |
| 29 |
|
| 30 |
DEPEND="dev-libs/libxslt |
| 31 |
doc? ( app-doc/doxygen ) |
| 32 |
- python? ( ${PYTHON_DEPS} ) |
| 33 |
virtual/pkgconfig |
| 34 |
+ ${PYTHON_DEPS} |
| 35 |
${RDEPEND} |
| 36 |
" |
| 37 |
|
| 38 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) |
| 39 |
+REQUIRED_USE=" |
| 40 |
+ ${PYTHON_REQUIRED_USE} |
| 41 |
test? ( python )" |
| 42 |
|
| 43 |
WAF_BINARY="${S}/buildtools/bin/waf" |
| 44 |
@@ -53,7 +54,8 @@ pkg_setup() { |
| 45 |
# Package fails to build with distcc |
| 46 |
export DISTCC_DISABLE=1 |
| 47 |
|
| 48 |
- use python && python-single-r1_pkg_setup |
| 49 |
+ # waf requires a python interpreter |
| 50 |
+ python-single-r1_pkg_setup |
| 51 |
} |
| 52 |
|
| 53 |
src_prepare() { |
| 54 |
|
| 55 |
diff --git a/sys-libs/ldb/ldb-2.1.4-r1.ebuild b/sys-libs/ldb/ldb-2.1.4-r1.ebuild |
| 56 |
index 91e258a2a01..ac64906fee1 100644 |
| 57 |
--- a/sys-libs/ldb/ldb-2.1.4-r1.ebuild |
| 58 |
+++ b/sys-libs/ldb/ldb-2.1.4-r1.ebuild |
| 59 |
@@ -32,12 +32,13 @@ RDEPEND=" |
| 60 |
|
| 61 |
DEPEND="dev-libs/libxslt |
| 62 |
doc? ( app-doc/doxygen ) |
| 63 |
- python? ( ${PYTHON_DEPS} ) |
| 64 |
virtual/pkgconfig |
| 65 |
+ ${PYTHON_DEPS} |
| 66 |
${RDEPEND} |
| 67 |
" |
| 68 |
|
| 69 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) |
| 70 |
+REQUIRED_USE=" |
| 71 |
+ ${PYTHON_REQUIRED_USE} |
| 72 |
test? ( python )" |
| 73 |
|
| 74 |
WAF_BINARY="${S}/buildtools/bin/waf" |
| 75 |
@@ -53,7 +54,8 @@ pkg_setup() { |
| 76 |
# Package fails to build with distcc |
| 77 |
export DISTCC_DISABLE=1 |
| 78 |
|
| 79 |
- use python && python-single-r1_pkg_setup |
| 80 |
+ # waf requires a python interpreter |
| 81 |
+ python-single-r1_pkg_setup |
| 82 |
} |
| 83 |
|
| 84 |
src_prepare() { |
| 85 |
|
| 86 |
diff --git a/sys-libs/ldb/ldb-2.2.0-r1.ebuild b/sys-libs/ldb/ldb-2.2.0-r1.ebuild |
| 87 |
index 91e258a2a01..ac64906fee1 100644 |
| 88 |
--- a/sys-libs/ldb/ldb-2.2.0-r1.ebuild |
| 89 |
+++ b/sys-libs/ldb/ldb-2.2.0-r1.ebuild |
| 90 |
@@ -32,12 +32,13 @@ RDEPEND=" |
| 91 |
|
| 92 |
DEPEND="dev-libs/libxslt |
| 93 |
doc? ( app-doc/doxygen ) |
| 94 |
- python? ( ${PYTHON_DEPS} ) |
| 95 |
virtual/pkgconfig |
| 96 |
+ ${PYTHON_DEPS} |
| 97 |
${RDEPEND} |
| 98 |
" |
| 99 |
|
| 100 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) |
| 101 |
+REQUIRED_USE=" |
| 102 |
+ ${PYTHON_REQUIRED_USE} |
| 103 |
test? ( python )" |
| 104 |
|
| 105 |
WAF_BINARY="${S}/buildtools/bin/waf" |
| 106 |
@@ -53,7 +54,8 @@ pkg_setup() { |
| 107 |
# Package fails to build with distcc |
| 108 |
export DISTCC_DISABLE=1 |
| 109 |
|
| 110 |
- use python && python-single-r1_pkg_setup |
| 111 |
+ # waf requires a python interpreter |
| 112 |
+ python-single-r1_pkg_setup |
| 113 |
} |
| 114 |
|
| 115 |
src_prepare() { |
Archives