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 CD3BA1382C5 for ; Wed, 28 Mar 2018 06:52:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9D25EE087A; Wed, 28 Mar 2018 06:52:51 +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 75C71E087A for ; Wed, 28 Mar 2018 06:52:51 +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 B49C1335C99 for ; Wed, 28 Mar 2018 06:52:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3C5DD267 for ; Wed, 28 Mar 2018 06:52:47 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1522216715.9618f5501e3db3f29a16bfb92d4b104453258eae.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/misc-functions.sh bin/phase-functions.sh X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 9618f5501e3db3f29a16bfb92d4b104453258eae X-VCS-Branch: master Date: Wed, 28 Mar 2018 06:52:47 +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: 1d185ee4-646c-4225-9a4d-75131f0f4ba6 X-Archives-Hash: 02991c1bf5f2be8bdecdc6b0b3f4b224 commit: 9618f5501e3db3f29a16bfb92d4b104453258eae Author: Zac Medico gentoo org> AuthorDate: Sat Mar 24 21:31:39 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Mar 28 05:58:35 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9618f550 {,PKG_}INSTALL_MASK: record value in vardb Also, skip preinst_mask phase when INSTALL_MASK is empty. bin/misc-functions.sh | 8 -------- bin/phase-functions.sh | 12 +++++++++++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index df8361036..ee65450f2 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -381,14 +381,6 @@ preinst_mask() { # in there in case any tools were built with -pg in CFLAGS. cd "${T}" - # remove man pages, info pages, docs if requested - local f - for f in man info doc; do - if has no${f} $FEATURES; then - INSTALL_MASK="${INSTALL_MASK} /usr/share/${f}" - fi - done - install_mask "${ED}" "${INSTALL_MASK}" # remove share dir if unnessesary diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh index 3aae3ef56..bdae68f79 100644 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@ -660,13 +660,23 @@ __dyn_install() { cd "${PORTAGE_BUILDDIR}"/build-info set -f local f x + + # remove man pages, info pages, docs if requested + for f in man info doc; do + if has no${f} ${FEATURES} && \ + ! has "/usr/share/${f}" ${INSTALL_MASK}; then + INSTALL_MASK+=" /usr/share/${f}" + fi + done + IFS=$' \t\n\r' for f in CATEGORY DEFINED_PHASES FEATURES INHERITED IUSE \ PF PKGUSE SLOT KEYWORDS HOMEPAGE DESCRIPTION \ ASFLAGS CBUILD CC CFLAGS CHOST CTARGET CXX \ CXXFLAGS EXTRA_ECONF EXTRA_EINSTALL EXTRA_MAKE \ LDFLAGS LIBCFLAGS LIBCXXFLAGS QA_CONFIGURE_OPTIONS \ - QA_DESKTOP_FILE QA_PREBUILT PROVIDES_EXCLUDE REQUIRES_EXCLUDE ; do + QA_DESKTOP_FILE QA_PREBUILT PROVIDES_EXCLUDE REQUIRES_EXCLUDE \ + INSTALL_MASK PKG_INSTALL_MASK; do x=$(echo -n ${!f}) [[ -n $x ]] && echo "$x" > $f