From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C85731382C5 for ; Thu, 4 Jan 2018 10:25:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1039BE0827; Thu, 4 Jan 2018 10:25:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DD8D7E0827 for ; Thu, 4 Jan 2018 10:25:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8C598335C0C for ; Thu, 4 Jan 2018 10:25:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2663D17B for ; Thu, 4 Jan 2018 10:25:54 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1515061548.adb0b12fd83f3ddbbe5e50fdc12d9f429214bf67.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/man-db/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/man-db/man-db-2.7.6.1-r2.ebuild X-VCS-Directories: sys-apps/man-db/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: adb0b12fd83f3ddbbe5e50fdc12d9f429214bf67 X-VCS-Branch: master Date: Thu, 4 Jan 2018 10:25:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 795b1f45-26d0-43cd-919c-4f660d91d4b7 X-Archives-Hash: 2e8130b3ee4ec0edb4139f698ccd68c5 commit: adb0b12fd83f3ddbbe5e50fdc12d9f429214bf67 Author: Lars Wendler gentoo org> AuthorDate: Thu Jan 4 10:25:48 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Jan 4 10:25:48 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adb0b12f sys-apps/man-db: Added sub-slot dep for sys-libs/gdbm Also reworked econf call a bit. Package-Manager: Portage-2.3.19, Repoman-2.3.6 sys-apps/man-db/man-db-2.7.6.1-r2.ebuild | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) 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 index 783e32df0f9..b9db3fb1151 100644 --- 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -16,8 +16,8 @@ IUSE="berkdb +gdbm +manpager nls selinux static-libs zlib" CDEPEND=">=dev-libs/libpipeline-1.4.0 berkdb? ( sys-libs/db:= ) - gdbm? ( sys-libs/gdbm ) - !berkdb? ( !gdbm? ( sys-libs/gdbm ) ) + gdbm? ( sys-libs/gdbm:= ) + !berkdb? ( !gdbm? ( sys-libs/gdbm:= ) ) sys-apps/groff zlib? ( sys-libs/zlib ) !sys-apps/man" @@ -45,15 +45,17 @@ pkg_setup() { src_configure() { export ac_cv_lib_z_gzopen=$(usex zlib) - econf \ - --docdir='$(datarootdir)'/doc/${PF} \ - --with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d \ - --enable-setuid \ - --enable-cache-owner=man \ - --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" \ - $(use_enable nls) \ - $(use_enable static-libs static) \ + local myeconfargs=( + --docdir='$(datarootdir)'/doc/${PF} + --with-systemdtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d + --enable-setuid + --enable-cache-owner=man + --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" + $(use_enable nls) + $(use_enable static-libs static) --with-db=$(usex gdbm gdbm $(usex berkdb db gdbm)) + ) + econf "${myeconfargs[@]}" # Disable color output from groff so that the manpager can add it. #184604 sed -i \