Gentoo Archives: gentoo-dev

From: David Seifert <soap@g.o>
To: gentoo-dev@l.g.o
Cc: David Seifert <soap@g.o>
Subject: [gentoo-dev] [PATCH 22/41] postgres.eclass: drop EAPI 5, 6 support
Date: Sun, 25 Dec 2022 22:21:40
Message-Id: 20221225221552.8023-22-soap@gentoo.org
In Reply to: [gentoo-dev] [PATCH 01/41] ada.eclass: drop EAPI 6 support by David Seifert
1 Signed-off-by: David Seifert <soap@g.o>
2 ---
3 eclass/postgres.eclass | 18 +++++++++++-------
4 1 file changed, 11 insertions(+), 7 deletions(-)
5
6 diff --git a/eclass/postgres.eclass b/eclass/postgres.eclass
7 index 8e204e2ade8..e94ab56a40a 100644
8 --- a/eclass/postgres.eclass
9 +++ b/eclass/postgres.eclass
10 @@ -1,14 +1,12 @@
11 # Copyright 1999-2022 Gentoo Authors
12 # Distributed under the terms of the GNU General Public License v2
13
14 -EXPORT_FUNCTIONS pkg_setup
15 -
16 # @ECLASS: postgres.eclass
17 # @MAINTAINER:
18 # PostgreSQL <pgsql-bugs@g.o>
19 # @AUTHOR:
20 # Aaron W. Swenson <titanofold@g.o>
21 -# @SUPPORTED_EAPIS: 5 6 7
22 +# @SUPPORTED_EAPIS: 7
23 # @BLURB: An eclass for PostgreSQL-related packages
24 # @DESCRIPTION:
25 # This eclass provides common utility functions that many
26 @@ -16,12 +14,14 @@ EXPORT_FUNCTIONS pkg_setup
27 # currently selected PostgreSQL slot is within a range, adding a system
28 # user to the postgres system group, and generating dependencies.
29
30 -
31 -case ${EAPI:-0} in
32 - 5|6|7) ;;
33 - *) die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" ;;
34 +case ${EAPI} in
35 + 7) ;;
36 + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
37 esac
38
39 +if [[ ! ${_POSTGRES_ECLASS} ]]; then
40 +_POSTGRES_ECLASS=1
41 +
42 # @ECLASS_VARIABLE: _POSTGRES_ALL_VERSIONS
43 # @INTERNAL
44 # @DESCRIPTION:
45 @@ -159,3 +159,7 @@ postgres_pkg_setup() {
46
47 elog "PostgreSQL Target: ${best_slot}"
48 }
49 +
50 +fi
51 +
52 +EXPORT_FUNCTIONS pkg_setup
53 --
54 2.39.0