From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 280EB158020 for ; Sun, 25 Dec 2022 22:21:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 729B6E0AC2; Sun, 25 Dec 2022 22:16:34 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E2E90E0ABE for ; Sun, 25 Dec 2022 22:16:33 +0000 (UTC) From: David Seifert To: gentoo-dev@lists.gentoo.org Cc: David Seifert Subject: [gentoo-dev] [PATCH 23/41] postgres-multi.eclass: drop EAPI 5, 6 support Date: Sun, 25 Dec 2022 23:15:34 +0100 Message-Id: <20221225221552.8023-23-soap@gentoo.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221225221552.8023-1-soap@gentoo.org> References: <20221225221552.8023-1-soap@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: fdaf6035-4ee0-4d7c-bc84-35b18da29c11 X-Archives-Hash: e679e8cf459f9762fbc484f627472805 Signed-off-by: David Seifert --- 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 # @AUTHOR: # Aaron W. Swenson -# @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