From: David Seifert <soap@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: David Seifert <soap@gentoo.org>
Subject: [gentoo-dev] [PATCH v2 1/5] multilib-minimal.eclass: remove EAPI 5
Date: Tue, 11 Jan 2022 23:24:09 +0100 [thread overview]
Message-ID: <20220111222413.5291-1-soap@gentoo.org> (raw)
Signed-off-by: David Seifert <soap@gentoo.org>
---
eclass/multilib-minimal.eclass | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/eclass/multilib-minimal.eclass b/eclass/multilib-minimal.eclass
index 9a1efe2cc46..97c8d618c42 100644
--- a/eclass/multilib-minimal.eclass
+++ b/eclass/multilib-minimal.eclass
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: multilib-minimal.eclass
# @MAINTAINER:
# Michał Górny <mgorny@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7 8
+# @SUPPORTED_EAPIS: 6 7 8
# @PROVIDES: multilib-build
# @BLURB: wrapper for multilib builds providing convenient multilib_src_* functions
# @DESCRIPTION:
@@ -23,18 +23,15 @@
#
# If you need generic install rules, use multilib_src_install_all function.
-
-case ${EAPI} in
- 5|6|7|8) ;;
+case ${EAPI:-0} in
+ 6|7|8) ;;
*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
esac
-
-[[ ${EAPI} == 5 ]] && inherit eutils
inherit multilib-build
-EXPORT_FUNCTIONS src_configure src_compile src_test src_install
-
+if [[ ! ${_MULTILIB_MINIMAL_ECLASS} ]]; then
+_MULTILIB_MINIMAL_ECLASS=1
multilib-minimal_src_configure() {
debug-print-function ${FUNCNAME} "$@"
@@ -123,3 +120,7 @@ multilib-minimal_src_install() {
einstalldocs
fi
}
+
+fi
+
+EXPORT_FUNCTIONS src_configure src_compile src_test src_install
--
2.34.1
next reply other threads:[~2022-01-11 22:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-11 22:24 David Seifert [this message]
2022-01-11 22:24 ` [gentoo-dev] [PATCH v2 2/5] multilib-build.eclass: remove EAPI 5 David Seifert
2022-01-11 22:24 ` [gentoo-dev] [PATCH v2 3/5] multibuild.eclass: remove dead userland_BSD David Seifert
2022-01-11 22:24 ` [gentoo-dev] [PATCH v2 4/5] multibuild.eclass: inline cp_args David Seifert
2022-01-11 22:24 ` [gentoo-dev] [PATCH v2 5/5] multibuild.eclass: remove EAPI 4 and 5 David Seifert
2022-01-12 8:23 ` [gentoo-dev] [PATCH v2 1/5] multilib-minimal.eclass: remove EAPI 5 Ulrich Mueller
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=20220111222413.5291-1-soap@gentoo.org \
--to=soap@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