eclass/texlive-module.eclass: Improve eapi 6 & 7 support

diff --git a/eclass/texlive-module.eclass b/eclass/texlive-module.eclass
index 9dd2303635d4d213fd33ca05d41285192aa0b58e..6cc5cf808f55024a1a67bf38d8158c081a91857f 100644 (file)
--- a/eclass/texlive-module.eclass
+++ b/eclass/texlive-module.eclass
@@ -64,13 +64,15 @@
 # @DESCRIPTION:
 # Array variable specifying any patches to be applied.
 
-inherit texlive-common eutils
-
 case "${EAPI:-0}" in
        0|1|2)
                die "EAPI='${EAPI}' is not supported anymore"
                ;;
+       3|4|5)
+               inherit texlive-common eutils
+               ;;
        *)
+               inherit texlive-common
                ;;
 esac
 
@@ -82,8 +84,19 @@ IUSE="source"
 
 # Starting from TeX Live 2009, upstream provides .tar.xz modules.
 PKGEXT=tar.xz
-DEPEND="${COMMON_DEPEND}
-       app-arch/xz-utils"
+case "${EAPI:-0}" in
+       0|1|2|3|4|5|6)
+               DEPEND="${COMMON_DEPEND}
+                       app-arch/xz-utils"
+               ;;
+       *)
+               # We do not need anything from SYSROOT:
+               #   Everything is built from the texlive install in /
+               #   Generated files are noarch
+               BDEPEND="${COMMON_DEPEND}
+                       app-arch/xz-utils"
+               ;;
+esac
 
 for i in ${TEXLIVE_MODULE_CONTENTS}; do
        SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.${PKGEXT}"
@@ -147,8 +160,15 @@ texlive-module_src_unpack() {
 # Apply patches from the PATCHES array and user patches, if any.
 
 texlive-module_src_prepare() {
-       [[ ${#PATCHES[@]} -gt 0 ]] && epatch "${PATCHES[@]}"
-       epatch_user
+       case "${EAPI:-0}" in
+               0|1|2|3|4|5)
+                       [[ ${#PATCHES[@]} -gt 0 ]] && epatch "${PATCHES[@]}"
+                       epatch_user
+                       ;;
+               *)
+                       die "texlive-module_src_prepare is not to be used in EAPI ${EAPI}"
+                       ;;
+       esac
 }
 
 # @FUNCTION: texlive-module_add_format
@@ -396,5 +416,12 @@ texlive-module_pkg_postrm() {
        etexmf-update
 }
 
-EXPORT_FUNCTIONS src_unpack src_prepare src_compile src_install \
-       pkg_postinst pkg_postrm
+case "${EAPI:-0}" in
+       0|1|2|3|4|5)
+               EXPORT_FUNCTIONS src_unpack src_prepare src_compile src_install \
+                       pkg_postinst pkg_postrm
+               ;;
+       *)
+               EXPORT_FUNCTIONS src_unpack src_compile src_install pkg_postinst pkg_postrm
+               ;;
+esac