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

[Sam James]

commit:     1f99a6cd272529e80bc22fefe3bfe4bebbfdfb96
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 21 05:39:54 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 21 05:39:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f99a6cd

findlib.eclass: Revert "add EAPI guard"

This reverts commit 371c510d5bfbce3a1580374352f2667f71c2ab57.
Reverting for cleaner history, will restore.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/cdrom.eclass   |  6 ------
 eclass/findlib.eclass | 11 -----------
 2 files changed, 17 deletions(-)

diff --git a/eclass/cdrom.eclass b/eclass/cdrom.eclass
index 9dca3f63bc1..623a19867d4 100644
--- a/eclass/cdrom.eclass
+++ b/eclass/cdrom.eclass
@@ -4,7 +4,6 @@
 # @ECLASS: cdrom.eclass
 # @MAINTAINER:
 # games@g.o
-# @SUPPORTED_EAPIS: 6 7
 # @BLURB: Functions for CD-ROM handling
 # @DESCRIPTION:
 # Acquire CD(s) for those lovely CD-based emerges.  Yes, this violates
@@ -15,11 +14,6 @@
 # eclass will require RESTRICT="bindist" but the point still stands.
 # The functions are generally called in src_unpack.
 
-case ${EAPI:-0} in
-	[67]) ;;
-	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
-esac
-
 if [[ -z ${_CDROM_ECLASS} ]]; then
 _CDROM_ECLASS=1
 

diff --git a/eclass/findlib.eclass b/eclass/findlib.eclass
index e8b6e73c97a..d117c0b2bfd 100644
--- a/eclass/findlib.eclass
+++ b/eclass/findlib.eclass
@@ -6,19 +6,10 @@
 # ML <ml@g.o>
 # @AUTHOR:
 # Original author: Matthieu Sozeau <mattam@g.o> (retired)
-# @SUPPORTED_EAPIS: 6 7
 # @BLURB: ocamlfind (a.k.a. findlib) eclass
 # @DESCRIPTION:
 # ocamlfind (a.k.a. findlib) eclass
 
-case ${EAPI:-0} in
-	[67]) ;;
-	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
-esac
-
-if [[ -z ${_FINDLIB_ECLASS} ]] ; then
-_FINDLIB_ECLASS=1
-
 # Do not complain about CFLAGS etc since ML projects do not use them.
 QA_FLAGS_IGNORED='.*'
 
@@ -69,5 +60,3 @@ findlib_src_install() {
 	findlib_src_preinst
 	make DESTDIR="${D}" "$@" install || die "make failed"
 }
-
-fi