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 4F8D4138334 for ; Sat, 3 Aug 2019 19:37:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 54B1BE0878; Sat, 3 Aug 2019 19:37:16 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 3914AE0878 for ; Sat, 3 Aug 2019 19:37:16 +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 D60A73493EF for ; Sat, 3 Aug 2019 19:37:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E51874D for ; Sat, 3 Aug 2019 19:37:12 +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: <1564861027.c3296879a6038ae5e821c1ca21c87a10a80b7eb1.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-9999.ebuild X-VCS-Directories: sys-apps/man-db/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: c3296879a6038ae5e821c1ca21c87a10a80b7eb1 X-VCS-Branch: master Date: Sat, 3 Aug 2019 19:37:12 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5d596f3c-c892-4315-97ce-b118d04bae78 X-Archives-Hash: 27ea77489dc6940589863a8b5b1134da commit: c3296879a6038ae5e821c1ca21c87a10a80b7eb1 Author: Lars Wendler gentoo org> AuthorDate: Sat Aug 3 19:35:47 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sat Aug 3 19:37:07 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3296879 sys-apps/man-db: Synced live ebuild Package-Manager: Portage-2.3.70, Repoman-2.3.16 Signed-off-by: Lars Wendler gentoo.org> sys-apps/man-db/man-db-9999.ebuild | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/sys-apps/man-db/man-db-9999.ebuild b/sys-apps/man-db/man-db-9999.ebuild index 0bcb6f92ce6..4d2bfc884fe 100644 --- a/sys-apps/man-db/man-db-9999.ebuild +++ b/sys-apps/man-db/man-db-9999.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit user eapi7-ver systemd +inherit systemd DESCRIPTION="a man replacement that utilizes berkdb instead of flat files" HOMEPAGE="http://www.nongnu.org/man-db/" @@ -29,8 +29,8 @@ CDEPEND=" seccomp? ( sys-libs/libseccomp ) zlib? ( sys-libs/zlib ) " -DEPEND=" - ${CDEPEND} +DEPEND="${CDEPEND}" +BDEPEND=" app-arch/xz-utils virtual/pkgconfig nls? ( @@ -40,15 +40,13 @@ DEPEND=" " RDEPEND=" ${CDEPEND} + acct-group/man + acct-user/man selinux? ( sec-policy/selinux-mandb ) " PDEPEND="manpager? ( app-text/manpager )" pkg_setup() { - # Create user now as Makefile in src_install does setuid/chown - enewgroup man 15 - enewuser man 13 -1 /usr/share/man man - if (use gdbm && use berkdb) || (use !gdbm && use !berkdb) ; then #496150 ewarn "Defaulting to USE=gdbm due to ambiguous berkdb/gdbm USE flag settings" fi @@ -92,7 +90,7 @@ src_install() { } pkg_preinst() { - local cachedir="${EROOT}var/cache/man" + local cachedir="${EROOT}/var/cache/man" # If the system was already exploited, and the attacker is hiding in the # cachedir of the old man-db, let's wipe them out. # see bug #602588 comment 18