Mailing List Archive

[PATCH 2/2] eclass/myspell-r2.eclass: add EAPI 8 support
This change adds EAPI 8 support.
No further changed required.

Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
---
eclass/myspell-r2.eclass | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/eclass/myspell-r2.eclass b/eclass/myspell-r2.eclass
index e4d9ae69af3..6141be8d66a 100644
--- a/eclass/myspell-r2.eclass
+++ b/eclass/myspell-r2.eclass
@@ -6,7 +6,7 @@
# Conrad Kostecki <conikost@gentoo.org>
# @AUTHOR:
# Tomáš Chvátal <scarabeus@gentoo.org>
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 5 6 7 8
# @BLURB: An eclass to streamline the construction of ebuilds for new Myspell dictionaries.
# @DESCRIPTION:
# The myspell-r2 eclass is designed to streamline the construction of ebuilds for
@@ -34,7 +34,7 @@ case ${EAPI:-0} in
[0-4])
die "${ECLASS} is banned in EAPI ${EAPI:-0}"
;;
- [5-7])
+ [5-8])
;;
*)
die "Unknown EAPI ${EAPI:-0}"
@@ -46,7 +46,7 @@ EXPORT_FUNCTIONS src_unpack src_install
# Basically no extra deps needed.
# Unzip is required for .oxt libreoffice extensions
# which are just fancy zip files.
-if [[ ${EAPI:-0} == 7 ]]; then
+if [[ ${EAPI:-0} -ge 7 ]]; then
BDEPEND="app-arch/unzip"
else
DEPEND="app-arch/unzip"
@@ -128,6 +128,7 @@ myspell-r2_src_install() {
rm -rf LICENCE*
rm -rf license*
rm -rf licence*
+
# Readme and so on
for x in *.txt README*; do
if [[ -f ${x} ]]; then
--
2.31.1
Re: [PATCH 2/2] eclass/myspell-r2.eclass: add EAPI 8 support [ In reply to ]
>>>>> On Thu, 24 Jun 2021, Conrad Kostecki wrote:

> -if [[ ${EAPI:-0} == 7 ]]; then
> +if [[ ${EAPI:-0} -ge 7 ]]; then

EAPI is a string, not a number. I'd suggest using a string comparison,
e.g.:

if [[ ${EAPI} != [56] ]]; then

(Negative logic, so there won't be any need to update it again for the
next EAPI.)