commit:     42d6e353d6ff73e7c910cbc271e73ed9a3c2cff4
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 15 09:10:20 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Aug 15 09:17:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42d6e353

sys-libs/ldb: Revbumps to improve python handling

also disable distcc as it breaks build

Closes: https://bugs.gentoo.org/726454
Closes: https://bugs.gentoo.org/733188
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-libs/ldb/{ldb-2.0.12.ebuild => ldb-2.0.12-r1.ebuild} | 9 +++++++--
 sys-libs/ldb/{ldb-2.1.4.ebuild => ldb-2.1.4-r1.ebuild}   | 9 +++++++--
 sys-libs/ldb/{ldb-2.2.0.ebuild => ldb-2.2.0-r1.ebuild}   | 9 +++++++--
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/sys-libs/ldb/ldb-2.0.12.ebuild b/sys-libs/ldb/ldb-2.0.12-r1.ebuild
similarity index 93%
rename from sys-libs/ldb/ldb-2.0.12.ebuild
rename to sys-libs/ldb/ldb-2.0.12-r1.ebuild
index ef525af0a11..22e302e558d 100644
--- a/sys-libs/ldb/ldb-2.0.12.ebuild
+++ b/sys-libs/ldb/ldb-2.0.12-r1.ebuild
@@ -32,8 +32,8 @@ RDEPEND="
 
 DEPEND="dev-libs/libxslt
        doc? ( app-doc/doxygen )
+       python? ( ${PYTHON_DEPS} )
        virtual/pkgconfig
-       ${PYTHON_DEPS}
        ${RDEPEND}
 "
 
@@ -50,7 +50,10 @@ PATCHES=(
 )
 
 pkg_setup() {
-       python-single-r1_pkg_setup
+       # Package fails to build with distcc
+       export DISTCC_DISABLE=1
+
+       use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -97,6 +100,8 @@ multilib_src_install() {
                docinto html
                dodoc -r apidocs/html/*
        fi
+
+       use python && python_optimize #726454
 }
 
 pkg_postinst() {

diff --git a/sys-libs/ldb/ldb-2.1.4.ebuild b/sys-libs/ldb/ldb-2.1.4-r1.ebuild
similarity index 93%
rename from sys-libs/ldb/ldb-2.1.4.ebuild
rename to sys-libs/ldb/ldb-2.1.4-r1.ebuild
index e1deb520305..91e258a2a01 100644
--- a/sys-libs/ldb/ldb-2.1.4.ebuild
+++ b/sys-libs/ldb/ldb-2.1.4-r1.ebuild
@@ -32,8 +32,8 @@ RDEPEND="
 
 DEPEND="dev-libs/libxslt
        doc? ( app-doc/doxygen )
+       python? ( ${PYTHON_DEPS} )
        virtual/pkgconfig
-       ${PYTHON_DEPS}
        ${RDEPEND}
 "
 
@@ -50,7 +50,10 @@ PATCHES=(
 )
 
 pkg_setup() {
-       python-single-r1_pkg_setup
+       # Package fails to build with distcc
+       export DISTCC_DISABLE=1
+
+       use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -97,6 +100,8 @@ multilib_src_install() {
                docinto html
                dodoc -r apidocs/html/*
        fi
+
+       use python && python_optimize #726454
 }
 
 pkg_postinst() {

diff --git a/sys-libs/ldb/ldb-2.2.0.ebuild b/sys-libs/ldb/ldb-2.2.0-r1.ebuild
similarity index 93%
rename from sys-libs/ldb/ldb-2.2.0.ebuild
rename to sys-libs/ldb/ldb-2.2.0-r1.ebuild
index e1deb520305..91e258a2a01 100644
--- a/sys-libs/ldb/ldb-2.2.0.ebuild
+++ b/sys-libs/ldb/ldb-2.2.0-r1.ebuild
@@ -32,8 +32,8 @@ RDEPEND="
 
 DEPEND="dev-libs/libxslt
        doc? ( app-doc/doxygen )
+       python? ( ${PYTHON_DEPS} )
        virtual/pkgconfig
-       ${PYTHON_DEPS}
        ${RDEPEND}
 "
 
@@ -50,7 +50,10 @@ PATCHES=(
 )
 
 pkg_setup() {
-       python-single-r1_pkg_setup
+       # Package fails to build with distcc
+       export DISTCC_DISABLE=1
+
+       use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -97,6 +100,8 @@ multilib_src_install() {
                docinto html
                dodoc -r apidocs/html/*
        fi
+
+       use python && python_optimize #726454
 }
 
 pkg_postinst() {

Reply via email to