[gentoo-dev] [PATCH 23/41] postgres-multi.eclass: drop EAPI 5, 6 support

[David Seifert]

Signed-off-by: David Seifert <soap@g.o>
---
 eclass/postgres-multi.eclass | 38 ++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/eclass/postgres-multi.eclass b/eclass/postgres-multi.eclass
index 9dcf22e64a1..d93df851cd2 100644
--- a/eclass/postgres-multi.eclass
+++ b/eclass/postgres-multi.eclass
@@ -1,16 +1,12 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-inherit multibuild postgres
-EXPORT_FUNCTIONS pkg_setup src_prepare src_compile src_install src_test
-
-
 # @ECLASS: postgres-multi.eclass
 # @MAINTAINER:
 # PostgreSQL <pgsql-bugs@g.o>
 # @AUTHOR:
 # Aaron W. Swenson <titanofold@g.o>
-# @SUPPORTED_EAPIS: 5 6 7
+# @SUPPORTED_EAPIS: 7
 # @PROVIDES: multibuild postgres
 # @BLURB: An eclass to build PostgreSQL-related packages against multiple slots
 # @DESCRIPTION:
@@ -18,12 +14,15 @@ EXPORT_FUNCTIONS pkg_setup src_prepare src_compile src_install src_test
 # build and install for one or more PostgreSQL slots as specified by
 # POSTGRES_TARGETS use flags.
 
-
-case ${EAPI:-0} in
-	5|6|7) ;;
-	*) die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
+case ${EAPI} in
+	7) ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
+if [[ ! ${_POSTGRES_MULTI_ECLASS} ]]; then
+_POSTGRES_MULTI_ECLASS=1
+
+inherit multibuild postgres
 
 # @ECLASS_VARIABLE: POSTGRES_COMPAT
 # @PRE_INHERIT
@@ -147,10 +146,7 @@ postgres-multi_src_prepare() {
 		fi
 	done
 
-	case ${EAPI:-0} in
-		0|1|2|3|4|5) epatch_user ;;
-		6|7) eapply_user ;;
-	esac
+	eapply_user
 
 	local MULTIBUILD_VARIANT
 	local MULTIBUILD_VARIANTS=("${_POSTGRES_INTERSECT_SLOTS[@]}")
@@ -164,6 +160,13 @@ postgres-multi_src_compile() {
 	postgres-multi_foreach emake
 }
 
+# @FUNCTION: postgres-multi_src_test
+# @DESCRIPTION:
+# Runs `emake installcheck' in each build directory.
+postgres-multi_src_test() {
+	postgres-multi_foreach emake installcheck
+}
+
 # @FUNCTION: postgres-multi_src_install
 # @DESCRIPTION:
 # Runs `emake install DESTDIR="${D}"' in each build directory.
@@ -171,9 +174,6 @@ postgres-multi_src_install() {
 	postgres-multi_foreach emake install DESTDIR="${D}"
 }
 
-# @FUNCTION: postgres-multi_src_test
-# @DESCRIPTION:
-# Runs `emake installcheck' in each build directory.
-postgres-multi_src_test() {
-	postgres-multi_foreach emake installcheck
-}
+fi
+
+EXPORT_FUNCTIONS pkg_setup src_prepare src_compile src_install src_test
-- 
2.39.0