[gentoo-dev] Last rites: dev-python/typish
# Michał Górny (2022-05-16) # This was only added for dev-python/nptyping, and nptyping-2.0.0 # no longer uses it. No activity since Aug 2021. # Removal on 2022-06-15. Bug #837299. dev-python/typish -- Best regards, Michał Górny
Re: [gentoo-dev] [PATCH v2] linux-info.eclass: Documentation updates
Updates based on Ulm's review. Thanks for the review.
Signed-off-by: Mike Pagano
---
eclass/linux-info.eclass | 35 ++-
1 file changed, 30 insertions(+), 5 deletions(-)
diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index d2003874d..7e130062a 100644
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@@ -169,10 +169,9 @@ set_arch_to_portage() {
# Set the env ARCH to match what the package manager expects.
set_arch_to_pkgmgr() { export ARCH=$(tc-arch); }
-# qeinfo "Message"
-# ---
-# qeinfo is a quiet einfo call when EBUILD_PHASE
-# should not have visible output.
+# @FUNCTION: qout
+# @DESCRIPTION:
+# qout is a quiet call when EBUILD_PHASE should not
have visible output.
qout() {
local outputmsg type
type=${1}
@@ -186,8 +185,21 @@ qout() {
[ -n "${outputmsg}" ] && ${type} "${outputmsg}"
}
+# @FUNCTION: qeinfo
+# @DESCRIPTION:
+# qeinfo is a quiet einfo call when EBUILD_PHASE should not have visible
output.
qeinfo() { qout einfo "${@}" ; }
+
+# @FUNCTION: qewarn
+# @DESCRIPTION:
+# qewarn is a quiet ewarn call when EBUILD_PHASE
+# should not have visible output.
qewarn() { qout ewarn "${@}" ; }
+
+# @FUNCTION: qeerror
+# @DESCRIPTION:
+# qeerror is a quiet error call when EBUILD_PHASE
+# should not have visible output.
qeerror() { qout eerror "${@}" ; }
# File Functions
@@ -269,6 +281,10 @@ getfilevar_noexec() {
# config is available at all.
_LINUX_CONFIG_EXISTS_DONE=
+# @FUNCTION: linux_config_qa_check
+# @INTERNAL
+# @DESCRIPTION:
+# Helper funciton which returns an error before the function argument is run
if no config exists
linux_config_qa_check() {
local f="$1"
if [ -z "${_LINUX_CONFIG_EXISTS_DONE}" ]; then
@@ -438,6 +454,9 @@ kernel_is() {
"${1:-${KV_MAJOR:-0}}.${2:-${KV_MINOR:-0}}.${3:-${KV_PATCH:-0}}"
}
+# @FUNCTION: get_makefile_extract_function
+# @INTERNAL
+# @DESCRIPTION:
# Check if the Makefile is valid for direct parsing.
# Check status results:
# - PASS, use 'getfilevar' to extract values
@@ -453,7 +472,10 @@ get_makefile_extract_function() {
echo "${mkfunc}"
}
-# internal variable, so we know to only print the warning once
+# @ECLASS_VARIABLE: get_version_warning_done
+# @INTERNAL
+# @DESCRIPTION:
+# Internal variable, so we know to only print the warning once.
get_version_warning_done=
# @FUNCTION: get_version
@@ -870,6 +892,9 @@ check_extra_config() {
export LINUX_CONFIG_EXISTS_DONE="${old_LINUX_CONFIG_EXISTS_DONE}"
}
+# @FUNCTION: check_zlibinflate
+# @DESCRIPTION:
+# Function to make sure a ZLIB_INFLATE configuration has the required symbols.
check_zlibinflate() {
if ! use kernel_linux; then
die "${FUNCNAME}() called on non-Linux system, please fix the
ebuild"
--
2.35.1
OpenPGP_0x92A6DBEC81F2B137.asc
Description: OpenPGP public key
OpenPGP_signature
Description: OpenPGP digital signature
[gentoo-dev] [PATCH 1/2] qmail.eclass: drop obsolete install hooks
The last user went away with mail-mta/qmail-ldap.
Signed-off-by: Rolf Eike Beer
---
eclass/qmail.eclass | 24
1 file changed, 24 deletions(-)
diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass
index 471f2fe7ce5..9b2c5a8c7fb 100644
--- a/eclass/qmail.eclass
+++ b/eclass/qmail.eclass
@@ -169,9 +169,6 @@ qmail_base_install() {
doexe qmail-queue
)
-
- declare -F qmail_base_install_hook >/dev/null && \
- qmail_base_install_hook
}
qmail_config_install() {
@@ -182,9 +179,6 @@ qmail_config_install() {
einfo "Installing configuration sanity checker and launcher"
insinto "${QMAIL_HOME}"/bin
doins "${GENQMAIL_S}"/control/qmail-config-system
-
- declare -F qmail_config_install_hook >/dev/null && \
- qmail_config_install_hook
}
qmail_man_install() {
@@ -200,9 +194,6 @@ qmail_man_install() {
else
dodoc CHANGES.md FAQ.md SECURITY.md THOUGHTS.md UPGRADE.md
fi
-
- declare -F qmail_man_install_hook >/dev/null && \
- qmail_man_install_hook
}
qmail_sendmail_install() {
@@ -211,9 +202,6 @@ qmail_sendmail_install() {
dosym "${QMAIL_HOME}"/bin/sendmail /usr/sbin/sendmail
dosym "${QMAIL_HOME}"/bin/sendmail /usr/lib/sendmail
-
- declare -F qmail_sendmail_install_hook >/dev/null && \
- qmail_sendmail_install_hook
}
qmail_maildir_install() {
@@ -245,9 +233,6 @@ qmail_maildir_install() {
done
)
-
- declare -F qmail_maildir_install_hook >/dev/null && \
- qmail_maildir_install_hook
}
qmail_tcprules_install() {
@@ -280,9 +265,6 @@ qmail_supervise_install() {
qmail_supervise_install_one qmail-pop3d
use ssl && qmail_supervise_install_one qmail-pop3sd
fi
-
- declare -F qmail_supervise_install_hook >/dev/null && \
- qmail_supervise_install_hook
}
qmail_spp_install() {
@@ -295,9 +277,6 @@ qmail_spp_install() {
for i in authlog mfdnscheck ifauthnext tarpit; do
dospp "${GENQMAIL_S}"/spp/${i}
done
-
- declare -F qmail_spp_install_hook >/dev/null && \
- qmail_spp_install_hook
}
qmail_ssl_install() {
@@ -317,9 +296,6 @@ qmail_ssl_install() {
doexe "${GENQMAIL_S}"/ssl/qmail-genrsacert.sh
keepdir "${QMAIL_HOME}"/control/tlshosts
-
- declare -F qmail_ssl_install_hook >/dev/null && \
- qmail_ssl_install_hook
}
qmail_src_install() {
--
2.35.3
signature.asc
Description: This is a digitally signed message part.
[gentoo-dev] [PATCH 2/2] qmail.eclass: remove usage of egrep
This does not use extended regular expressions in any way. While at it change
the way these matches are done: it's irrelevant if the entire expression is in
the file, if there is any rule for the given IP address then do not add the
new
expression.
Signed-off-by: Rolf Eike Beer
---
eclass/qmail.eclass | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass
index 9b2c5a8c7fb..ed53bca56fa 100644
--- a/eclass/qmail.eclass
+++ b/eclass/qmail.eclass
@@ -409,7 +409,7 @@ qmail_config_fast() {
}
qmail_tcprules_config() {
- local localips ip tcpstring line proto f
+ local localips ip tcpstring proto f
einfo "Accepting relaying by default from all ips configured on
this machine."
@@ -425,10 +425,9 @@ qmail_tcprules_config() {
tcpstring=':allow,RELAYCLIENT="",RBLSMTPD=""'
for ip in ${localips}; do
- line="${ip}${tcpstring}"
for proto in smtp qmtp qmqp; do
f="${EROOT}${TCPRULES_DIR}/tcp.qmail-$
{proto}"
- egrep -qs "${line}" "${f}" || echo "${line}"
>> "${f}"
+ grep -qs "^${ip}:" "${f}" || echo "${ip}$
{tcpstring}" >> "${f}"
done
done
}
--
2.35.3
signature.asc
Description: This is a digitally signed message part.
Re: [gentoo-dev] [PATCH] linux-info.eclass: Documentation updates
> On Mon, 16 May 2022, Thomas Bracht Laumann Jespersen wrote: >> +# @FUNCTION: qout >> +# @DESCRIPTION: >> +# qout is a quiet call when EBUILD_PHASE >> # should not have visible output. > The devmanual says that @USAGE is also required for eclass functions > [0]. This is applicable in a few cases, I'm just highlighting one > here. @USAGE is required if the function accepts any arguments. This is similar to @RETURN, and is clear from the examples in [0]. For example, jmake_src_compile at the bottom of the page doesn't have a @USAGE line. > OTOH lots of eclass functions have left out @USAGE, and the tooling > around html/man page generation also appears to treat it as optional. Which is correct AFAICS. > So it could be that the devmanual is wrong here. > [0]: https://devmanual.gentoo.org/eclass-writing/index.html#eclass-functions signature.asc Description: PGP signature
Re: [gentoo-dev] [PATCH] linux-info.eclass: Documentation updates
> On 14 May 2022, at 23:59, Mike Pagano wrote: > > Document functions which did not have any > documentation or was not formatted to gentoo > specifications > > Signed-off-by: Mike Pagano > --- > eclass/linux-info.eclass | 38 ++ > 1 file changed, 34 insertions(+), 4 deletions(-) > [snip] Just wanted to say thanks for putting the work in on eclassdocs and the other bits you've been doing with the eclasses recently. Cheers! signature.asc Description: Message signed with OpenPGP
Re: [gentoo-dev] [PATCH v2] linux-info.eclass: Documentation updates
On 5/16/22 08:19, Mike Pagano wrote:
Updates based on Ulm's review. Thanks for the review.
Signed-off-by: Mike Pagano
---
eclass/linux-info.eclass | 35 ++-
1 file changed, 30 insertions(+), 5 deletions(-)
diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass
index d2003874d..7e130062a 100644
--- a/eclass/linux-info.eclass
+++ b/eclass/linux-info.eclass
@@ -169,10 +169,9 @@ set_arch_to_portage() {
# Set the env ARCH to match what the package manager expects.
set_arch_to_pkgmgr() { export ARCH=$(tc-arch); }
-# qeinfo "Message"
-# ---
-# qeinfo is a quiet einfo call when EBUILD_PHASE
-# should not have visible output.
+# @FUNCTION: qout
+# @DESCRIPTION:
+# qout is a quiet call when EBUILD_PHASE should not
have visible output.
qout() {
local outputmsg type
type=${1}
@@ -186,8 +185,21 @@ qout() {
[ -n "${outputmsg}" ] && ${type} "${outputmsg}"
}
+# @FUNCTION: qeinfo
+# @DESCRIPTION:
+# qeinfo is a quiet einfo call when EBUILD_PHASE should not have visible
output.
qeinfo() { qout einfo "${@}" ; }
+
+# @FUNCTION: qewarn
+# @DESCRIPTION:
+# qewarn is a quiet ewarn call when EBUILD_PHASE
+# should not have visible output.
qewarn() { qout ewarn "${@}" ; }
+
+# @FUNCTION: qeerror
+# @DESCRIPTION:
+# qeerror is a quiet error call when EBUILD_PHASE
+# should not have visible output.
qeerror() { qout eerror "${@}" ; }
# File Functions
@@ -269,6 +281,10 @@ getfilevar_noexec() {
# config is available at all.
_LINUX_CONFIG_EXISTS_DONE=
+# @FUNCTION: linux_config_qa_check
+# @INTERNAL
+# @DESCRIPTION:
+# Helper funciton which returns an error before the function argument is run
if no config exists
linux_config_qa_check() {
local f="$1"
if [ -z "${_LINUX_CONFIG_EXISTS_DONE}" ]; then
@@ -438,6 +454,9 @@ kernel_is() {
"${1:-${KV_MAJOR:-0}}.${2:-${KV_MINOR:-0}}.${3:-${KV_PATCH:-0}}"
}
+# @FUNCTION: get_makefile_extract_function
+# @INTERNAL
+# @DESCRIPTION:
# Check if the Makefile is valid for direct parsing.
# Check status results:
# - PASS, use 'getfilevar' to extract values
@@ -453,7 +472,10 @@ get_makefile_extract_function() {
echo "${mkfunc}"
}
-# internal variable, so we know to only print the warning once
+# @ECLASS_VARIABLE: get_version_warning_done
+# @INTERNAL
+# @DESCRIPTION:
+# Internal variable, so we know to only print the warning once.
get_version_warning_done=
# @FUNCTION: get_version
@@ -870,6 +892,9 @@ check_extra_config() {
export LINUX_CONFIG_EXISTS_DONE="${old_LINUX_CONFIG_EXISTS_DONE}"
}
+# @FUNCTION: check_zlibinflate
+# @DESCRIPTION:
+# Function to make sure a ZLIB_INFLATE configuration has the required symbols.
check_zlibinflate() {
if ! use kernel_linux; then
die "${FUNCNAME}() called on non-Linux system, please fix the
ebuild"
committed
Re: [gentoo-dev] [PATCH] linux-info.eclass: Documentation updates
On 5/16/22 18:57, Sam James wrote: On 14 May 2022, at 23:59, Mike Pagano wrote: Document functions which did not have any documentation or was not formatted to gentoo specifications Signed-off-by: Mike Pagano --- eclass/linux-info.eclass | 38 ++ 1 file changed, 34 insertions(+), 4 deletions(-) [snip] Just wanted to say thanks for putting the work in on eclassdocs and the other bits you've been doing with the eclasses recently. Cheers! Thanks, Sam. You are the perfect representation of how collaboration in Gentoo can be great.
