From: Andreas Sturmlechner <asturm@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Subject: [gentoo-dev] [PATCH] optfeature.eclass: Introduce optfeature header
Date: Sat, 03 Apr 2021 12:17:40 +0200 [thread overview]
Message-ID: <4434463.vXUDI8C0e8@tuxbrain> (raw)
[-- Attachment #1: Type: text/plain, Size: 1811 bytes --]
Before this change, optfeature() will print a list of optional dependencies,
or nothing if deps are installed. Ebuilds commonly print their own elog
ahead of optfeature, which then may not be followed up by any list at all.
This change adds a default header text, which may be changed by the ebuild,
that is only printed if optfeature is about to list at least one dependency.
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
eclass/optfeature.eclass | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/eclass/optfeature.eclass b/eclass/optfeature.eclass
index e13fc3eba81..46f8012b2c3 100644
--- a/eclass/optfeature.eclass
+++ b/eclass/optfeature.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: optfeature.eclass
@@ -14,6 +14,18 @@ esac
if [[ -z ${_OPTFEATURE_ECLASS} ]]; then
_OPTFEATURE_ECLASS=1
+# @ECLASS-VARIABLE: OPTFEATURE_HEADER
+# @DESCRIPTION:
+# Overridable default header printed ahead of the first optfeature output.
+# Will remain silent if all optional dependencies are present.
+: ${OPTFEATURE_HEADER:="Install additional packages for optional runtime features:"}
+
+# @ECLASS-VARIABLE: _OPTFEATURE_DOHEADER
+# @INTERNAL
+# @DESCRIPTION:
+# If true, print header ahead of the first optfeature output.
+_OPTFEATURE_DOHEADER=true
+
# @FUNCTION: optfeature
# @USAGE: <short description> <package atom to match> [other atoms]
# @DESCRIPTION:
@@ -51,6 +63,10 @@ optfeature() {
fi
done
if [[ ${flag} -eq 0 ]]; then
+ if [[ ${_OPTFEATURE_DOHEADER} == true ]]; then
+ elog ${OPTFEATURE_HEADER}
+ _OPTFEATURE_DOHEADER=false
+ fi
for i; do
read -r -d '' -a arr <<<"${i}"
msg=" "
--
2.31.1
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 618 bytes --]
reply other threads:[~2021-04-03 10:17 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4434463.vXUDI8C0e8@tuxbrain \
--to=asturm@gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox