From 8ece3a840b18eda8a9ade86c93765b7dc154ba2a Mon Sep 17 00:00:00 2001
From: "Anna (cybertailor) Vyalkova" <cyber+gentoo@sysrq.in>
Date: Wed, 13 Jul 2022 05:57:29 +0500
Subject: [PATCH] R-packages.eclass: EAPI 8 support

Add inherit guard.

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
---
 eclass/R-packages.eclass | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/eclass/R-packages.eclass b/eclass/R-packages.eclass
index 32bbce52d4..d399da9b0e 100644
--- a/eclass/R-packages.eclass
+++ b/eclass/R-packages.eclass
@@ -3,24 +3,24 @@
 
 # @ECLASS: R-packages.eclass
 # @AUTHOR:
-# André Erdmann <dywi@mailerd.de>
-# Denis Dupeyron <calchan@gentoo.org>
-# Benda Xu <heroxbd@gentoo.org>
 # Alessandro Barbieri <lssndrbarbieri@gmail.com>
+# André Erdmann <dywi@mailerd.de>
+# Benda Xu <heroxbd@gentoo.org>
+# Denis Dupeyron <calchan@gentoo.org>
 # Robert Greener <me@r0bert.dev>
 # @BLURB: eclass to build R packages
 # @MAINTAINER:
 # Alessandro Barbieri <lssndrbarbieri@gmail.com>
-# @SUPPORTED_EAPIS: 7
-
-inherit edo eutils optfeature toolchain-funcs
+# @SUPPORTED_EAPIS: 7 8
 
 case ${EAPI} in
-	7) ;;
+	7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI} unsupported."
 esac
 
-EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_postinst
+if [ ! ${_R_PACKAGES_ECLASS} ]; then
+
+inherit edo eutils optfeature toolchain-funcs
 
 # @ECLASS_VARIABLE: SUGGESTED_PACKAGES
 # @DEPRECATED: none
@@ -161,3 +161,8 @@ R-packages_pkg_postinst() {
 		optfeature "having the upstream suggested package" "${p}"
 	done
 }
+
+_R_PACKAGES_ECLASS=1
+fi
+
+EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install pkg_postinst