[gentoo-commits] repo/gentoo:master commit in: eclass/

[Ulrich Müller]

commit:     3fb6bec9a4790b05ba628e927d28932b0c86168e
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 27 16:36:17 2016 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 29 07:02:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fb6bec9

latex-package.eclass: Support EAPI 6.

In EAPI 6, don't inherit base.eclass and don't define
latex-package_has_tetex_3().

 eclass/latex-package.eclass | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/eclass/latex-package.eclass b/eclass/latex-package.eclass
index 01815ce..b32943b 100644
--- a/eclass/latex-package.eclass
+++ b/eclass/latex-package.eclass
@@ -51,9 +51,13 @@
 # you must either grab each file individually, or find a place to mirror an
 # archive of them.  (iBiblio)
 #
-# It inherits base.
+# It inherits base in EAPI 5 and earlier.
 
-inherit base
+case ${EAPI:-0} in
+	0|1|2|3|4|5) inherit base ;;
+	6) ;;
+	*) die "Unknown EAPI ${EAPI} for ${ECLASS}" ;;
+esac
 
 RDEPEND="virtual/latex-base"
 DEPEND="${RDEPEND}
@@ -69,7 +73,10 @@ SUPPLIER="misc"
 
 # Kept for backwards compatibility
 latex-package_has_tetex_3() {
-	return 0
+	case ${EAPI:-0} in
+		0|1|2|3|4|5) return 0 ;;
+		*) die "${FUNCNAME} no longer supported in EAPI ${EAPI}" ;;
+	esac
 }
 
 # @FUNCTION: latex-package_src_doinstall