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-apps/man-db/
Date: Thu, 04 Jan 2018 10:25:58
Message-Id: 1515061548.adb0b12fd83f3ddbbe5e50fdc12d9f429214bf67.polynomial-c@gentoo
1 commit: adb0b12fd83f3ddbbe5e50fdc12d9f429214bf67
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 4 10:25:48 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 4 10:25:48 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adb0b12f
7
8 sys-apps/man-db: Added sub-slot dep for sys-libs/gdbm
9
10 Also reworked econf call a bit.
11
12 Package-Manager: Portage-2.3.19, Repoman-2.3.6
13
14 sys-apps/man-db/man-db-2.7.6.1-r2.ebuild | 24 +++++++++++++-----------
15 1 file changed, 13 insertions(+), 11 deletions(-)
16
17 diff --git a/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild b/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild
18 index 783e32df0f9..b9db3fb1151 100644
19 --- a/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild
20 +++ b/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2017 Gentoo Foundation
23 +# Copyright 1999-2018 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI=5
27 @@ -16,8 +16,8 @@ IUSE="berkdb +gdbm +manpager nls selinux static-libs zlib"
28
29 CDEPEND=">=dev-libs/libpipeline-1.4.0
30 berkdb? ( sys-libs/db:= )
31 - gdbm? ( sys-libs/gdbm )
32 - !berkdb? ( !gdbm? ( sys-libs/gdbm ) )
33 + gdbm? ( sys-libs/gdbm:= )
34 + !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) )
35 sys-apps/groff
36 zlib? ( sys-libs/zlib )
37 !sys-apps/man"
38 @@ -45,15 +45,17 @@ pkg_setup() {
39
40 src_configure() {
41 export ac_cv_lib_z_gzopen=$(usex zlib)
42 - econf \
43 - --docdir='$(datarootdir)'/doc/${PF} \
44 - --with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \
45 - --enable-setuid \
46 - --enable-cache-owner=man \
47 - --with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x" \
48 - $(use_enable nls) \
49 - $(use_enable static-libs static) \
50 + local myeconfargs=(
51 + --docdir='$(datarootdir)'/doc/${PF}
52 + --with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
53 + --enable-setuid
54 + --enable-cache-owner=man
55 + --with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o 1x 2x 3x 4x 5x 6x 7x 8x"
56 + $(use_enable nls)
57 + $(use_enable static-libs static)
58 --with-db=$(usex gdbm gdbm $(usex berkdb db gdbm))
59 + )
60 + econf "${myeconfargs[@]}"
61
62 # Disable color output from groff so that the manpager can add it. #184604
63 sed -i \