Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/ldb/
Date: Sat, 15 Aug 2020 09:18:01
Message-Id: 1597483069.42d6e353d6ff73e7c910cbc271e73ed9a3c2cff4.polynomial-c@gentoo
1 commit: 42d6e353d6ff73e7c910cbc271e73ed9a3c2cff4
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 15 09:10:20 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 15 09:17:49 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42d6e353
7
8 sys-libs/ldb: Revbumps to improve python handling
9
10 also disable distcc as it breaks build
11
12 Closes: https://bugs.gentoo.org/726454
13 Closes: https://bugs.gentoo.org/733188
14 Package-Manager: Portage-3.0.2, Repoman-2.3.23
15 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
16
17 sys-libs/ldb/{ldb-2.0.12.ebuild => ldb-2.0.12-r1.ebuild} | 9 +++++++--
18 sys-libs/ldb/{ldb-2.1.4.ebuild => ldb-2.1.4-r1.ebuild} | 9 +++++++--
19 sys-libs/ldb/{ldb-2.2.0.ebuild => ldb-2.2.0-r1.ebuild} | 9 +++++++--
20 3 files changed, 21 insertions(+), 6 deletions(-)
21
22 diff --git a/sys-libs/ldb/ldb-2.0.12.ebuild b/sys-libs/ldb/ldb-2.0.12-r1.ebuild
23 similarity index 93%
24 rename from sys-libs/ldb/ldb-2.0.12.ebuild
25 rename to sys-libs/ldb/ldb-2.0.12-r1.ebuild
26 index ef525af0a11..22e302e558d 100644
27 --- a/sys-libs/ldb/ldb-2.0.12.ebuild
28 +++ b/sys-libs/ldb/ldb-2.0.12-r1.ebuild
29 @@ -32,8 +32,8 @@ RDEPEND="
30
31 DEPEND="dev-libs/libxslt
32 doc? ( app-doc/doxygen )
33 + python? ( ${PYTHON_DEPS} )
34 virtual/pkgconfig
35 - ${PYTHON_DEPS}
36 ${RDEPEND}
37 "
38
39 @@ -50,7 +50,10 @@ PATCHES=(
40 )
41
42 pkg_setup() {
43 - python-single-r1_pkg_setup
44 + # Package fails to build with distcc
45 + export DISTCC_DISABLE=1
46 +
47 + use python && python-single-r1_pkg_setup
48 }
49
50 src_prepare() {
51 @@ -97,6 +100,8 @@ multilib_src_install() {
52 docinto html
53 dodoc -r apidocs/html/*
54 fi
55 +
56 + use python && python_optimize #726454
57 }
58
59 pkg_postinst() {
60
61 diff --git a/sys-libs/ldb/ldb-2.1.4.ebuild b/sys-libs/ldb/ldb-2.1.4-r1.ebuild
62 similarity index 93%
63 rename from sys-libs/ldb/ldb-2.1.4.ebuild
64 rename to sys-libs/ldb/ldb-2.1.4-r1.ebuild
65 index e1deb520305..91e258a2a01 100644
66 --- a/sys-libs/ldb/ldb-2.1.4.ebuild
67 +++ b/sys-libs/ldb/ldb-2.1.4-r1.ebuild
68 @@ -32,8 +32,8 @@ RDEPEND="
69
70 DEPEND="dev-libs/libxslt
71 doc? ( app-doc/doxygen )
72 + python? ( ${PYTHON_DEPS} )
73 virtual/pkgconfig
74 - ${PYTHON_DEPS}
75 ${RDEPEND}
76 "
77
78 @@ -50,7 +50,10 @@ PATCHES=(
79 )
80
81 pkg_setup() {
82 - python-single-r1_pkg_setup
83 + # Package fails to build with distcc
84 + export DISTCC_DISABLE=1
85 +
86 + use python && python-single-r1_pkg_setup
87 }
88
89 src_prepare() {
90 @@ -97,6 +100,8 @@ multilib_src_install() {
91 docinto html
92 dodoc -r apidocs/html/*
93 fi
94 +
95 + use python && python_optimize #726454
96 }
97
98 pkg_postinst() {
99
100 diff --git a/sys-libs/ldb/ldb-2.2.0.ebuild b/sys-libs/ldb/ldb-2.2.0-r1.ebuild
101 similarity index 93%
102 rename from sys-libs/ldb/ldb-2.2.0.ebuild
103 rename to sys-libs/ldb/ldb-2.2.0-r1.ebuild
104 index e1deb520305..91e258a2a01 100644
105 --- a/sys-libs/ldb/ldb-2.2.0.ebuild
106 +++ b/sys-libs/ldb/ldb-2.2.0-r1.ebuild
107 @@ -32,8 +32,8 @@ RDEPEND="
108
109 DEPEND="dev-libs/libxslt
110 doc? ( app-doc/doxygen )
111 + python? ( ${PYTHON_DEPS} )
112 virtual/pkgconfig
113 - ${PYTHON_DEPS}
114 ${RDEPEND}
115 "
116
117 @@ -50,7 +50,10 @@ PATCHES=(
118 )
119
120 pkg_setup() {
121 - python-single-r1_pkg_setup
122 + # Package fails to build with distcc
123 + export DISTCC_DISABLE=1
124 +
125 + use python && python-single-r1_pkg_setup
126 }
127
128 src_prepare() {
129 @@ -97,6 +100,8 @@ multilib_src_install() {
130 docinto html
131 dodoc -r apidocs/html/*
132 fi
133 +
134 + use python && python_optimize #726454
135 }
136
137 pkg_postinst() {