diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 37497 -> 37500 bytes | |||
| -rw-r--r-- | eclass/go-module.eclass | 9 | ||||
| -rw-r--r-- | eclass/postgres.eclass | 21 |
3 files changed, 23 insertions, 7 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex c4e8707955e1..19001813b75d 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/go-module.eclass b/eclass/go-module.eclass index 5cffbb1084d9..f97b69f591c8 100644 --- a/eclass/go-module.eclass +++ b/eclass/go-module.eclass @@ -343,10 +343,11 @@ go-module_setup_proxy() { # @FUNCTION: go-module_src_unpack # @DESCRIPTION: -# If EGO_SUM is set, unpack the base tarball(s) and set up the -# local go proxy. Also warn that this usage is deprecated. -# - Otherwise, if EGO_VENDOR is set, bail out. -# - Otherwise do a normal unpack. +# Sets up GOFLAGS for the system and then unpacks based on the following rules: +# 1. If EGO_SUM is set, unpack the base tarball(s) and set up the +# local go proxy. This mode is deprecated. +# 2. Otherwise, if EGO_VENDOR is set, bail out, as this functionality was removed. +# 3. Otherwise, call 'ego mod verify' and then do a normal unpack. go-module_src_unpack() { if use amd64 || use arm || use arm64 || ( use ppc64 && [[ $(tc-endian) == "little" ]] ) || use s390 || use x86; then diff --git a/eclass/postgres.eclass b/eclass/postgres.eclass index e94ab56a40ae..95ed168d40a1 100644 --- a/eclass/postgres.eclass +++ b/eclass/postgres.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: postgres.eclass @@ -6,7 +6,7 @@ # PostgreSQL <pgsql-bugs@gentoo.org> # @AUTHOR: # Aaron W. Swenson <titanofold@gentoo.org> -# @SUPPORTED_EAPIS: 7 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: An eclass for PostgreSQL-related packages # @DESCRIPTION: # This eclass provides common utility functions that many @@ -15,7 +15,7 @@ # user to the postgres system group, and generating dependencies. case ${EAPI} in - 7) ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -65,6 +65,17 @@ declare -p POSTGRES_USEDEP &>/dev/null && POSTGRES_DEP+="[${POSTGRES_USEDEP}]" # required if the package must build against one of the PostgreSQL slots # declared in POSTGRES_COMPAT. +# @ECLASS_VARIABLE: PG_SLOT +# @DEFAULT_UNSET +# @DESCRIPTION: +# PG_SLOT is the chosen PostgreSQL slot that is used for the build. + +# @ECLASS_VARIABLE: PG_CONFIG +# @DEFAULT_UNSET +# @DESCRIPTION: +# PG_CONFIG is the path to pg_config for the chosen PostgreSQL slot. +# For example, PG_CONFIG="pg_config15" + # @ECLASS_VARIABLE: _POSTGRES_COMPAT # @INTERNAL # @DESCRIPTION: @@ -150,6 +161,10 @@ postgres_pkg_setup() { export PG_SLOT=${best_slot} export PG_CONFIG=$(type -P pg_config${best_slot//./}) + if [[ -z ${PG_CONFIG} ]] ; then + die "Could not find pg_config for ${PG_SLOT}. Is dev-db/postgresql:${PG_SLOT} installed?" + fi + local pg_pkg_config_path="$(${PG_CONFIG} --libdir)/pkgconfig" if [[ -n "${PKG_CONFIG_PATH}" ]]; then export PKG_CONFIG_PATH="${pg_pkg_config_path}:${PKG_CONFIG_PATH}" |