| 1 |
On Mon, 2021-03-08 at 14:38 -0500, Mike Gilbert wrote: |
| 2 |
> This allows the automatic dependency on virtual/tmpfiles to be |
| 3 |
> disabled. |
| 4 |
> |
| 5 |
> Bug: https://bugs.gentoo.org/774855 |
| 6 |
> Signed-off-by: Mike Gilbert <floppym@g.o> |
| 7 |
> --- |
| 8 |
> eclass/tmpfiles.eclass | 10 +++++++++- |
| 9 |
> 1 file changed, 9 insertions(+), 1 deletion(-) |
| 10 |
> |
| 11 |
> diff --git a/eclass/tmpfiles.eclass b/eclass/tmpfiles.eclass |
| 12 |
> index 360c5e3b816f..632343821648 100644 |
| 13 |
> --- a/eclass/tmpfiles.eclass |
| 14 |
> +++ b/eclass/tmpfiles.eclass |
| 15 |
> @@ -60,7 +60,15 @@ case "${EAPI}" in |
| 16 |
> *) die "API is undefined for EAPI ${EAPI}" ;; |
| 17 |
> esac |
| 18 |
> |
| 19 |
> -RDEPEND="virtual/tmpfiles" |
| 20 |
> +# @ECLASS-VARIABLE: TMPFILES_OPTIONAL |
| 21 |
> +# @DEFAULT_UNSET |
| 22 |
> +# @DESCRIPTION: |
| 23 |
> +# When not empty, disables the dependency on virtual/tmpfiles. |
| 24 |
> +# Ebuilds that call tmpfiles_process conditionally should declare a |
| 25 |
> +# conditional dependency themselves. |
| 26 |
> +if [[ -z ${TMPFILES_OPTIONAL} ]]; then |
| 27 |
> + RDEPEND="virtual/tmpfiles" |
| 28 |
> +fi |
| 29 |
> |
| 30 |
> # @FUNCTION: dotmpfiles |
| 31 |
> # @USAGE: <tmpfiles.d_file> ... |
| 32 |
|
| 33 |
ACK, and please merge ASAP. |
Archives