diff options
Diffstat (limited to 'eclass')
83 files changed, 487 insertions, 409 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex b01670bb62d7..c8545635a15a 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/acct-group.eclass b/eclass/acct-group.eclass index 47e2d278f73e..6e67e072e34b 100644 --- a/eclass/acct-group.eclass +++ b/eclass/acct-group.eclass @@ -61,7 +61,7 @@ readonly ACCT_GROUP_NAME # @REQUIRED # @DESCRIPTION: # Preferred GID for the new group. This variable is obligatory, and its -# value must be unique across all group packages. This can be overriden +# value must be unique across all group packages. This can be overridden # in make.conf through ACCT_GROUP_<UPPERCASE_USERNAME>_ID variable. # # Overlays should set this to -1 to dynamically allocate GID. Using -1 @@ -72,13 +72,13 @@ readonly ACCT_GROUP_NAME # If set to a non-null value, the eclass will require the group to have # specified GID. If the group already exists with another GID, or # the GID is taken by another group, the install will fail. -: ${ACCT_GROUP_ENFORCE_ID:=} +: "${ACCT_GROUP_ENFORCE_ID:=}" # << Boilerplate ebuild variables >> -: ${DESCRIPTION:="System group: ${ACCT_GROUP_NAME}"} -: ${SLOT:=0} -: ${KEYWORDS:=alpha amd64 arm arm64 hppa ia64 ~loong m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris} +: "${DESCRIPTION:="System group: ${ACCT_GROUP_NAME}"}" +: "${SLOT:=0}" +: "${KEYWORDS:=alpha amd64 arm arm64 hppa ia64 ~loong m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris}" S=${WORKDIR} diff --git a/eclass/acct-user.eclass b/eclass/acct-user.eclass index 145fdb41aaf8..cf9b3191660b 100644 --- a/eclass/acct-user.eclass +++ b/eclass/acct-user.eclass @@ -69,7 +69,7 @@ readonly ACCT_USER_NAME # @REQUIRED # @DESCRIPTION: # Preferred UID for the new user. This variable is obligatory, and its -# value must be unique across all user packages. This can be overriden +# value must be unique across all user packages. This can be overridden # in make.conf through ACCT_USER_<UPPERCASE_USERNAME>_ID variable. # # Overlays should set this to -1 to dynamically allocate UID. Using -1 @@ -80,14 +80,14 @@ readonly ACCT_USER_NAME # If set to a non-null value, the eclass will require the user to have # specified UID. If the user already exists with another UID, or # the UID is taken by another user, the install will fail. -: ${ACCT_USER_ENFORCE_ID:=} +: "${ACCT_USER_ENFORCE_ID:=}" # @ECLASS_VARIABLE: ACCT_USER_NO_MODIFY # @DEFAULT_UNSET # @DESCRIPTION: # If set to a non-null value, the eclass will not make any changes # to an already existing user. -: ${ACCT_USER_NO_MODIFY:=} +: "${ACCT_USER_NO_MODIFY:=}" # @ECLASS_VARIABLE: ACCT_USER_COMMENT # @DEFAULT_UNSET @@ -99,33 +99,33 @@ readonly ACCT_USER_NAME # @ECLASS_VARIABLE: ACCT_USER_SHELL # @DESCRIPTION: # The shell to use for the user. If not specified, a 'nologin' variant -# for the system is used. This can be overriden in make.conf through +# for the system is used. This can be overridden in make.conf through # ACCT_USER_<UPPERCASE_USERNAME>_SHELL variable. -: ${ACCT_USER_SHELL:=/sbin/nologin} +: "${ACCT_USER_SHELL:=/sbin/nologin}" # @ECLASS_VARIABLE: ACCT_USER_HOME # @DESCRIPTION: # The home directory for the user. If not specified, /dev/null is used. # The directory will be created with appropriate permissions if it does # not exist. When updating, existing home directory will not be moved. -# This can be overriden in make.conf through +# This can be overridden in make.conf through # ACCT_USER_<UPPERCASE_USERNAME>_HOME variable. -: ${ACCT_USER_HOME:=/dev/null} +: "${ACCT_USER_HOME:=/dev/null}" # @ECLASS_VARIABLE: ACCT_USER_HOME_OWNER # @DEFAULT_UNSET # @DESCRIPTION: # The ownership to use for the home directory, in chown ([user][:group]) # syntax. Defaults to the newly created user, and its primary group. -# This can be overriden in make.conf through +# This can be overridden in make.conf through # ACCT_USER_<UPPERCASE_USERNAME>_HOME_OWNER variable. # @ECLASS_VARIABLE: ACCT_USER_HOME_PERMS # @DESCRIPTION: # The permissions to use for the home directory, in chmod (octal -# or verbose) form. This can be overriden in make.conf through +# or verbose) form. This can be overridden in make.conf through # ACCT_USER_<UPPERCASE_USERNAME>_HOME_PERMS variable. -: ${ACCT_USER_HOME_PERMS:=0755} +: "${ACCT_USER_HOME_PERMS:=0755}" # @ECLASS_VARIABLE: ACCT_USER_GROUPS # @REQUIRED @@ -134,7 +134,7 @@ readonly ACCT_USER_NAME # array. The first group specified is the user's primary group, while # the remaining groups (if any) become supplementary groups. # -# This can be overriden in make.conf through +# This can be overridden in make.conf through # ACCT_USER_<UPPERCASE_USERNAME>_GROUPS variable, or appended to # via ACCT_USER_<UPPERCASE_USERNAME>_GROUPS_ADD. Please note that # due to technical limitations, the override variables are not arrays @@ -142,9 +142,9 @@ readonly ACCT_USER_NAME # << Boilerplate ebuild variables >> -: ${DESCRIPTION:="System user: ${ACCT_USER_NAME}"} -: ${SLOT:=0} -: ${KEYWORDS:=alpha amd64 arm arm64 hppa ia64 ~loong m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris} +: "${DESCRIPTION:="System user: ${ACCT_USER_NAME}"}" +: "${SLOT:=0}" +: "${KEYWORDS:=alpha amd64 arm arm64 hppa ia64 ~loong m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris}" S=${WORKDIR} @@ -269,7 +269,7 @@ acct-user_src_install() { debug-print-function ${FUNCNAME} "${@}" # Replace reserved characters in comment - : ${ACCT_USER_COMMENT:=${DESCRIPTION//[:,=]/;}} + : "${ACCT_USER_COMMENT:=${DESCRIPTION//[:,=]/;}}" # serialize for override support local ACCT_USER_GROUPS=${ACCT_USER_GROUPS[*]} diff --git a/eclass/ada.eclass b/eclass/ada.eclass index 198cd01477aa..a5cb9b297ee5 100644 --- a/eclass/ada.eclass +++ b/eclass/ada.eclass @@ -108,7 +108,7 @@ readonly _ADA_ALL_IMPLS # # Returns 0 if the implementation is valid and supported. If it is # unsupported, returns 1 -- and the caller should ignore the entry. -# If it is invalid, dies with an appopriate error messages. +# If it is invalid, dies with an appropriate error message. _ada_impl_supported() { debug-print-function ${FUNCNAME} "${@}" diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 3a9119856abc..91046b9f82f3 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -39,19 +39,19 @@ inherit gnuconfig libtool # @PRE_INHERIT # @DESCRIPTION: # The major version of autoconf your package needs -: ${WANT_AUTOCONF:=latest} +: "${WANT_AUTOCONF:=latest}" # @ECLASS_VARIABLE: WANT_AUTOMAKE # @PRE_INHERIT # @DESCRIPTION: # The major version of automake your package needs -: ${WANT_AUTOMAKE:=latest} +: "${WANT_AUTOMAKE:=latest}" # @ECLASS_VARIABLE: WANT_LIBTOOL # @PRE_INHERIT # @DESCRIPTION: # Do you want libtool? Valid values here are "latest" and "none". -: ${WANT_LIBTOOL:=latest} +: "${WANT_LIBTOOL:=latest}" # @ECLASS_VARIABLE: _LATEST_AUTOMAKE # @INTERNAL @@ -125,7 +125,7 @@ RDEPEND="" # Set to 'no' to disable automatically adding to DEPEND. This lets # ebuilds form conditional depends by using ${AUTOTOOLS_DEPEND} in # their own DEPEND string. -: ${AUTOTOOLS_AUTO_DEPEND:=yes} +: "${AUTOTOOLS_AUTO_DEPEND:=yes}" if [[ ${AUTOTOOLS_AUTO_DEPEND} != "no" ]] ; then case ${EAPI} in 6) DEPEND=${AUTOTOOLS_DEPEND} ;; @@ -141,14 +141,14 @@ unset _automake_atom _autoconf_atom # @DESCRIPTION: # Additional options to pass to automake during # eautoreconf call. -: ${AM_OPTS:=} +: "${AM_OPTS:=}" # @ECLASS_VARIABLE: AT_NOEAUTOHEADER # @DEFAULT_UNSET # @DESCRIPTION: # Don't run eautoheader command if set to 'yes'; only used to work around # packages that don't want their headers being modified. -: ${AT_NOEAUTOHEADER:=} +: "${AT_NOEAUTOHEADER:=}" # @ECLASS_VARIABLE: AT_NOEAUTOMAKE # @DEFAULT_UNSET @@ -156,7 +156,7 @@ unset _automake_atom _autoconf_atom # Don't run eautomake command if set to 'yes'; only used to workaround # broken packages. Generally you should, instead, fix the package to # not call AM_INIT_AUTOMAKE if it doesn't actually use automake. -: ${AT_NOEAUTOMAKE:=} +: "${AT_NOEAUTOMAKE:=}" # @ECLASS_VARIABLE: AT_NOELIBTOOLIZE # @DEFAULT_UNSET @@ -164,13 +164,13 @@ unset _automake_atom _autoconf_atom # Don't run elibtoolize command if set to 'yes', # useful when elibtoolize needs to be ran with # particular options -: ${AT_NOELIBTOOLIZE:=} +: "${AT_NOELIBTOOLIZE:=}" # @ECLASS_VARIABLE: AT_M4DIR # @DEFAULT_UNSET # @DESCRIPTION: # Additional director(y|ies) aclocal should search -: ${AT_M4DIR:=} +: "${AT_M4DIR:=}" # @ECLASS_VARIABLE: AT_SYS_M4DIR # @DEFAULT_UNSET @@ -179,7 +179,7 @@ unset _automake_atom _autoconf_atom # For system integrators, a list of additional aclocal search paths. # This variable gets eval-ed, so you can use variables in the definition # that may not be valid until eautoreconf & friends are run. -: ${AT_SYS_M4DIR:=} +: "${AT_SYS_M4DIR:=}" # @FUNCTION: eautoreconf # @DESCRIPTION: @@ -325,7 +325,7 @@ eaclocal_amflags() { # @FUNCTION: eaclocal # @DESCRIPTION: # These functions runs the autotools using autotools_run_tool with the -# specified parametes. The name of the tool run is the same of the function +# specified parameters. The name of the tool run is the same of the function # without e prefix. # They also force installing the support files for safety. # Respects AT_M4DIR for additional directories to search for macros. diff --git a/eclass/bzr.eclass b/eclass/bzr.eclass index 552990e3a581..d522326773e1 100644 --- a/eclass/bzr.eclass +++ b/eclass/bzr.eclass @@ -32,42 +32,42 @@ BDEPEND="dev-vcs/breezy" # @USER_VARIABLE # @DESCRIPTION: # The directory to store all fetched Bazaar live sources. -: ${EBZR_STORE_DIR:=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/bzr-src} +: "${EBZR_STORE_DIR:=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/bzr-src}" # @ECLASS_VARIABLE: EBZR_UNPACK_DIR # @DESCRIPTION: # The working directory where the sources are copied to. -: ${EBZR_UNPACK_DIR:=${WORKDIR}/${P}} +: "${EBZR_UNPACK_DIR:=${WORKDIR}/${P}}" # @ECLASS_VARIABLE: EBZR_INIT_REPO_CMD # @DESCRIPTION: # The Bazaar command to initialise a shared repository. -: ${EBZR_INIT_REPO_CMD:="brz init-shared-repository --no-trees"} +: "${EBZR_INIT_REPO_CMD:="brz init-shared-repository --no-trees"}" # @ECLASS_VARIABLE: EBZR_FETCH_CMD # @DESCRIPTION: # The Bazaar command to fetch the sources. -: ${EBZR_FETCH_CMD:="brz branch --no-tree"} +: "${EBZR_FETCH_CMD:="brz branch --no-tree"}" # @ECLASS_VARIABLE: EBZR_UPDATE_CMD # @DESCRIPTION: # The Bazaar command to update the sources. -: ${EBZR_UPDATE_CMD:="brz pull --overwrite-tags"} +: "${EBZR_UPDATE_CMD:="brz pull --overwrite-tags"}" # @ECLASS_VARIABLE: EBZR_EXPORT_CMD # @DESCRIPTION: # The Bazaar command to export a branch. -: ${EBZR_EXPORT_CMD:="brz export"} +: "${EBZR_EXPORT_CMD:="brz export"}" # @ECLASS_VARIABLE: EBZR_CHECKOUT_CMD # @DESCRIPTION: # The Bazaar command to checkout a branch. -: ${EBZR_CHECKOUT_CMD:="brz checkout --lightweight -q"} +: "${EBZR_CHECKOUT_CMD:="brz checkout --lightweight -q"}" # @ECLASS_VARIABLE: EBZR_REVNO_CMD # @DESCRIPTION: # The Bazaar command to list a revision number of the branch. -: ${EBZR_REVNO_CMD:="brz revno"} +: "${EBZR_REVNO_CMD:="brz revno"}" # @ECLASS_VARIABLE: EBZR_OPTIONS # @DEFAULT_UNSET @@ -88,7 +88,7 @@ BDEPEND="dev-vcs/breezy" # If EBZR_BRANCH is set (see below), then a shared repository will be # created in that directory, and the branch will be located in # ${EBZR_STORE_DIR}/${EBZR_PROJECT}/${EBZR_BRANCH}. -: ${EBZR_PROJECT:=${PN}} +: "${EBZR_PROJECT:=${PN}}" # @ECLASS_VARIABLE: EBZR_BRANCH # @DEFAULT_UNSET @@ -116,7 +116,7 @@ BDEPEND="dev-vcs/breezy" # Set this variable to a non-empty value to disable automatic updating # of a bzr source tree. This is intended to be set outside the ebuild # by users. -: ${EBZR_OFFLINE=${EVCS_OFFLINE}} +: "${EBZR_OFFLINE=${EVCS_OFFLINE}}" # @ECLASS_VARIABLE: EVCS_UMASK # @USER_VARIABLE diff --git a/eclass/cargo.eclass b/eclass/cargo.eclass index e3f36fc6ad9b..48af961943d8 100644 --- a/eclass/cargo.eclass +++ b/eclass/cargo.eclass @@ -245,7 +245,7 @@ cargo_gen_config() { [source.crates-io] replace-with = "gentoo" - local-registry = "/nonexistant" + local-registry = "/nonexistent" [net] offline = true @@ -352,7 +352,7 @@ cargo_live_src_unpack() { mkdir -p "${ECARGO_HOME}" || die local distdir=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}} - : ${ECARGO_REGISTRY_DIR:=${distdir}/cargo-registry} + : "${ECARGO_REGISTRY_DIR:=${distdir}/cargo-registry}" local offline="${ECARGO_OFFLINE:-${EVCS_OFFLINE}}" diff --git a/eclass/cdrom.eclass b/eclass/cdrom.eclass index 81539e8560ce..4e56db951196 100644 --- a/eclass/cdrom.eclass +++ b/eclass/cdrom.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: cdrom.eclass @@ -200,7 +200,7 @@ cdrom_load_next_cd() { while true ; do local i cdset - : CD_ROOT_${CDROM_CURRENT_CD} + : "CD_ROOT_${CDROM_CURRENT_CD}" export CDROM_ROOT=${CD_ROOT:-${!_}} local var="CDROM_CHECK_${CDROM_CURRENT_CD}" IFS=: read -r -a cdset -d "" <<< "${!var}" diff --git a/eclass/cmake-multilib.eclass b/eclass/cmake-multilib.eclass index c8fad94ac0a9..826f0ffcd967 100644 --- a/eclass/cmake-multilib.eclass +++ b/eclass/cmake-multilib.eclass @@ -24,7 +24,7 @@ # @DEPRECATED: none # @DESCRIPTION: # Only "cmake" is supported. -: ${CMAKE_ECLASS:=cmake} +: "${CMAKE_ECLASS:=cmake}" case ${EAPI} in 7|8) diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index 03f2517c5b56..24787f1c2a49 100644 --- a/eclass/cmake.eclass +++ b/eclass/cmake.eclass @@ -35,15 +35,15 @@ inherit flag-o-matic multiprocessing ninja-utils toolchain-funcs xdg-utils # For in-source build it's fixed to ${CMAKE_USE_DIR}. # For out-of-source build it can be overridden, by default it uses # ${CMAKE_USE_DIR}_build (in EAPI-7: ${WORKDIR}/${P}_build). -[[ ${EAPI} == 7 ]] && : ${BUILD_DIR:=${WORKDIR}/${P}_build} +[[ ${EAPI} == 7 ]] && : "${BUILD_DIR:=${WORKDIR}/${P}_build}" # EAPI-8: set inside _cmake_check_build_dir # @ECLASS_VARIABLE: CMAKE_BINARY # @DESCRIPTION: # Eclass can use different cmake binary than the one provided in by system. -: ${CMAKE_BINARY:=cmake} +: "${CMAKE_BINARY:=cmake}" -[[ ${EAPI} == 7 ]] && : ${CMAKE_BUILD_TYPE:=Gentoo} +[[ ${EAPI} == 7 ]] && : "${CMAKE_BUILD_TYPE:=Gentoo}" # @ECLASS_VARIABLE: CMAKE_BUILD_TYPE # @DESCRIPTION: # Set to override default CMAKE_BUILD_TYPE. Only useful for packages @@ -55,7 +55,7 @@ inherit flag-o-matic multiprocessing ninja-utils toolchain-funcs xdg-utils # build type to achieve desirable results. # # In EAPI 7, the default was non-standard build type of Gentoo. -: ${CMAKE_BUILD_TYPE:=RelWithDebInfo} +: "${CMAKE_BUILD_TYPE:=RelWithDebInfo}" # @ECLASS_VARIABLE: CMAKE_IN_SOURCE_BUILD # @DEFAULT_UNSET @@ -69,7 +69,7 @@ inherit flag-o-matic multiprocessing ninja-utils toolchain-funcs xdg-utils # Specify a makefile generator to be used by cmake. # At this point only "emake" and "ninja" are supported. # The default is set to "ninja". -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} +: "${CMAKE_MAKEFILE_GENERATOR:=ninja}" # @ECLASS_VARIABLE: CMAKE_REMOVE_MODULES_LIST # @PRE_INHERIT @@ -100,14 +100,14 @@ fi # @USER_VARIABLE # @DESCRIPTION: # Set to OFF to disable verbose messages during compilation -: ${CMAKE_VERBOSE:=ON} +: "${CMAKE_VERBOSE:=ON}" # @ECLASS_VARIABLE: CMAKE_WARN_UNUSED_CLI # @DESCRIPTION: # Warn about variables that are declared on the command line # but not used. Might give false-positives. # "no" to disable (default) or anything else to enable. -: ${CMAKE_WARN_UNUSED_CLI:=yes} +: "${CMAKE_WARN_UNUSED_CLI:=yes}" # @ECLASS_VARIABLE: CMAKE_EXTRA_CACHE_FILE # @USER_VARIABLE @@ -284,15 +284,15 @@ cmake-utils_useno() { _cmake_banned_func "" "$@" ; } # Determine using IN or OUT source build _cmake_check_build_dir() { if [[ ${EAPI} == 7 ]]; then - : ${CMAKE_USE_DIR:=${S}} + : "${CMAKE_USE_DIR:=${S}}" else - : ${CMAKE_USE_DIR:=${PWD}} + : "${CMAKE_USE_DIR:=${PWD}}" fi if [[ -n ${CMAKE_IN_SOURCE_BUILD} ]]; then # we build in source dir BUILD_DIR="${CMAKE_USE_DIR}" else - : ${BUILD_DIR:=${CMAKE_USE_DIR}_build} + : "${BUILD_DIR:=${CMAKE_USE_DIR}_build}" fi einfo "Source directory (CMAKE_USE_DIR): \"${CMAKE_USE_DIR}\"" @@ -526,6 +526,7 @@ cmake_src_configure() { set(CMAKE_USER_MAKE_RULES_OVERRIDE "${build_rules}" CACHE FILEPATH "Gentoo override rules") set(CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "") set(BUILD_SHARED_LIBS ON CACHE BOOL "") + set(Python3_FIND_UNVERSIONED_NAMES FIRST CACHE STRING "") _EOF_ if [[ -n ${_ECM_ECLASS} ]]; then diff --git a/eclass/cuda.eclass b/eclass/cuda.eclass index d885e77d0616..5f3f0c3af37d 100644 --- a/eclass/cuda.eclass +++ b/eclass/cuda.eclass @@ -28,12 +28,12 @@ inherit flag-o-matic toolchain-funcs # @DESCRIPTION: # nvcc compiler flags (see nvcc --help), which should be used like # CFLAGS for c compiler -: ${NVCCFLAGS:=-O2} +: "${NVCCFLAGS:=-O2}" # @ECLASS_VARIABLE: CUDA_VERBOSE # @DESCRIPTION: # Being verbose during compilation to see underlying commands -: ${CUDA_VERBOSE:=true} +: "${CUDA_VERBOSE:=true}" # @FUNCTION: cuda_gccdir # @USAGE: [-f] diff --git a/eclass/cvs.eclass b/eclass/cvs.eclass index 5ba2197f5174..dbacc2c09cfe 100644 --- a/eclass/cvs.eclass +++ b/eclass/cvs.eclass @@ -37,13 +37,13 @@ _CVS_ECLASS=1 # @DESCRIPTION: # Set the default compression level. Has no effect when ECVS_CVS_COMMAND # is defined by ebuild/user. -: ${ECVS_CVS_COMPRESS:=-z1} +: "${ECVS_CVS_COMPRESS:=-z1}" # @ECLASS_VARIABLE: ECVS_CVS_OPTIONS # @DESCRIPTION: # Additional options to the cvs commands. Has no effect when ECVS_CVS_COMMAND # is defined by ebuild/user. -: ${ECVS_CVS_OPTIONS:=-q -f} +: "${ECVS_CVS_OPTIONS:=-q -f}" # @ECLASS_VARIABLE: ECVS_CVS_COMMAND # @DESCRIPTION: @@ -53,13 +53,13 @@ _CVS_ECLASS=1 # on the cvs connection. The default of "cvs -q -f -z4" means to be # quiet, to disregard the ~/.cvsrc config file and to use maximum # compression. -: ${ECVS_CVS_COMMAND:=cvs ${ECVS_CVS_OPTIONS} ${ECVS_CVS_COMPRESS}} +: "${ECVS_CVS_COMMAND:=cvs ${ECVS_CVS_OPTIONS} ${ECVS_CVS_COMPRESS}}" # @ECLASS_VARIABLE: ECVS_UP_OPTS # @DESCRIPTION: # CVS options given after the cvs update command. Don't remove "-dP" or things # won't work. -: ${ECVS_UP_OPTS:=-dP} +: "${ECVS_UP_OPTS:=-dP}" # @ECLASS_VARIABLE: ECVS_CO_OPTS # @DEFAULT_UNSET @@ -72,7 +72,7 @@ _CVS_ECLASS=1 # Set this variable to a non-empty value to disable the automatic updating of # a CVS source tree. This is intended to be set outside the cvs source # tree by users. -: ${ECVS_OFFLINE:=${EVCS_OFFLINE}} +: "${ECVS_OFFLINE:=${EVCS_OFFLINE}}" # @ECLASS_VARIABLE: ECVS_LOCAL # @DEFAULT_UNSET @@ -97,7 +97,7 @@ _CVS_ECLASS=1 # @ECLASS_VARIABLE: ECVS_TOP_DIR # @DESCRIPTION: # The directory under which CVS modules are checked out. -: ${ECVS_TOP_DIR:="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/cvs-src"} +: "${ECVS_TOP_DIR:="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/cvs-src"}" # @ECLASS_VARIABLE: ECVS_SERVER # @DESCRIPTION: @@ -110,7 +110,7 @@ _CVS_ECLASS=1 # # Set this to "offline" to disable fetching (i.e. to assume the module # is already checked out in ECVS_TOP_DIR). -: ${ECVS_SERVER:="offline"} +: "${ECVS_SERVER:="offline"}" # @ECLASS_VARIABLE: ECVS_MODULE # @REQUIRED @@ -152,12 +152,12 @@ _CVS_ECLASS=1 # e.g. # "cvs -danoncvs@savannah.gnu.org:/cvsroot/backbone co System" # ( from gnustep-apps/textedit ) -: ${ECVS_AUTH:="pserver"} +: "${ECVS_AUTH:="pserver"}" # @ECLASS_VARIABLE: ECVS_USER # @DESCRIPTION: # Username to use for authentication on the remote server. -: ${ECVS_USER:="anonymous"} +: "${ECVS_USER:="anonymous"}" # @ECLASS_VARIABLE: ECVS_PASS # @DEFAULT_UNSET @@ -423,7 +423,7 @@ EOF # Make sure DISPLAY is set (SSH will not use SSH_ASKPASS # if DISPLAY is not set) - : ${DISPLAY:="DISPLAY"} + : "${DISPLAY:="DISPLAY"}" export DISPLAY # Create a dummy executable to echo ${ECVS_PASS} diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 78f53658285e..b5d475c4123b 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -445,7 +445,7 @@ unset -f _distutils_set_globals # This helper is meant for the most common case, that is a single Sphinx # subdirectory with standard layout, building and installing HTML docs # behind USE=doc. It assumes it's the only consumer of the three -# aforementioned functions. If you need to use a custom implemention, +# aforementioned functions. If you need to use a custom implementation, # you can't use it. # # If your package uses additional Sphinx plugins, they should be passed diff --git a/eclass/docs.eclass b/eclass/docs.eclass index 810b56460f3f..da598226bfc0 100644 --- a/eclass/docs.eclass +++ b/eclass/docs.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: docs.eclass @@ -210,7 +210,7 @@ python_append_deps() { sphinx_deps() { debug-print-function ${FUNCNAME} - : ${DOCS_AUTODOC:=1} + : "${DOCS_AUTODOC:=1}" deps="dev-python/sphinx[\${PYTHON_USEDEP}] ${DOCS_DEPEND}" @@ -235,8 +235,8 @@ sphinx_compile() { debug-print-function ${FUNCNAME} use doc || return - : ${DOCS_DIR:="${S}"} - : ${DOCS_OUTDIR:="${S}/_build/html/sphinx"} + : "${DOCS_DIR:="${S}"}" + : "${DOCS_OUTDIR:="${S}/_build/html/sphinx"}" [[ ${DOCS_INITIALIZE_GIT} ]] && initialize_git_repo @@ -274,7 +274,7 @@ sphinx_compile() { mkdocs_deps() { debug-print-function ${FUNCNAME} - : ${DOCS_AUTODOC:=0} + : "${DOCS_AUTODOC:=0}" deps="dev-python/mkdocs[\${PYTHON_USEDEP}] ${DOCS_DEPEND}" @@ -298,8 +298,8 @@ mkdocs_compile() { debug-print-function ${FUNCNAME} use doc || return - : ${DOCS_DIR:="${S}"} - : ${DOCS_OUTDIR:="${S}/_build/html/mkdocs"} + : "${DOCS_DIR:="${S}"}" + : "${DOCS_OUTDIR:="${S}/_build/html/mkdocs"}" [[ ${DOCS_INITIALIZE_GIT} ]] && initialize_git_repo @@ -342,9 +342,9 @@ doxygen_compile() { use doc || return # This is the default name of the config file, upstream can change it. - : ${DOCS_CONFIG_NAME:="Doxyfile"} - : ${DOCS_DIR:="${S}"} - : ${DOCS_OUTDIR:="${S}/_build/html/doxygen"} + : "${DOCS_CONFIG_NAME:="Doxyfile"}" + : "${DOCS_DIR:="${S}"}" + : "${DOCS_OUTDIR:="${S}/_build/html/doxygen"}" [[ ${DOCS_INITIALIZE_GIT} ]] && initialize_git_repo diff --git a/eclass/dune.eclass b/eclass/dune.eclass index 655a41be84d6..f0faea007c9f 100644 --- a/eclass/dune.eclass +++ b/eclass/dune.eclass @@ -27,7 +27,7 @@ _DUNE_ECLASS=1 # @DESCRIPTION: # Sets the actual Dune package name, if different from Gentoo package name. # Set before inheriting the eclass. -: ${DUNE_PKG_NAME:=${PN}} +: "${DUNE_PKG_NAME:=${PN}}" inherit edo multiprocessing diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 9fca1647778c..1e620e5ec204 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -34,7 +34,7 @@ _ECM_ECLASS=1 # For proper description see virtualx.eclass manpage. # Here we redefine default value to be manual, if your package needs virtualx # for tests you should proceed with setting VIRTUALX_REQUIRED=test. -: ${VIRTUALX_REQUIRED:=manual} +: "${VIRTUALX_REQUIRED:=manual}" inherit cmake flag-o-matic toolchain-funcs virtualx @@ -46,9 +46,9 @@ inherit cmake flag-o-matic toolchain-funcs virtualx # kde-frameworks/oxygen-icons and run the xdg.eclass routines for pkg_preinst, # pkg_postinst and pkg_postrm. If set to "true", do nothing. if [[ ${CATEGORY} = kde-frameworks ]] ; then - : ${ECM_NONGUI:=true} + : "${ECM_NONGUI:=true}" fi -: ${ECM_NONGUI:=false} +: "${ECM_NONGUI:=false}" if [[ ${ECM_NONGUI} = false ]] ; then inherit xdg @@ -58,25 +58,25 @@ fi # @DESCRIPTION: # Assume the package is using KDEInstallDirs macro and switch # KDE_INSTALL_USE_QT_SYS_PATHS to ON. If set to "false", do nothing. -: ${ECM_KDEINSTALLDIRS:=true} +: "${ECM_KDEINSTALLDIRS:=true}" # @ECLASS_VARIABLE: ECM_DEBUG # @DESCRIPTION: # Add "debug" to IUSE. If !debug, add -DQT_NO_DEBUG to CPPFLAGS. If set to # "false", do nothing. -: ${ECM_DEBUG:=true} +: "${ECM_DEBUG:=true}" # @ECLASS_VARIABLE: ECM_DESIGNERPLUGIN # @DESCRIPTION: # If set to "true", add "designer" to IUSE to toggle build of designer plugins # and add the necessary BDEPEND. If set to "false", do nothing. -: ${ECM_DESIGNERPLUGIN:=false} +: "${ECM_DESIGNERPLUGIN:=false}" # @ECLASS_VARIABLE: ECM_EXAMPLES # @DESCRIPTION: # By default unconditionally ignore a top-level examples subdirectory. # If set to "true", add "examples" to IUSE to toggle adding that subdirectory. -: ${ECM_EXAMPLES:=false} +: "${ECM_EXAMPLES:=false}" # @ECLASS_VARIABLE: ECM_HANDBOOK # @DESCRIPTION: @@ -90,20 +90,20 @@ fi # when !handbook. In case package requires KF5KDELibs4Support, see next: # If set to "forceoptional", remove a KF5DocTools dependency from the root # CMakeLists.txt in addition to the above. -: ${ECM_HANDBOOK:=false} +: "${ECM_HANDBOOK:=false}" # @ECLASS_VARIABLE: ECM_HANDBOOK_DIR # @DESCRIPTION: # Specifies the directory containing the docbook file(s) relative to ${S} to # be processed by KF5DocTools (kdoctools_install). -: ${ECM_HANDBOOK_DIR:=doc} +: "${ECM_HANDBOOK_DIR:=doc}" # @ECLASS_VARIABLE: ECM_PO_DIRS # @DESCRIPTION: # Specifies directories of l10n files relative to ${S} to be processed by # KF5I18n (ki18n_install). If IUSE nls exists and is disabled then disable # build of these directories in CMakeLists.txt. -: ${ECM_PO_DIRS:="po poqm"} +: "${ECM_PO_DIRS:="po poqm"}" # @ECLASS_VARIABLE: ECM_QTHELP # @DEFAULT_UNSET @@ -113,9 +113,9 @@ fi # -DBUILD_QCH=ON generate and install Qt compressed help files when USE=doc. # If set to "false", do nothing. if [[ ${CATEGORY} = kde-frameworks ]]; then - : ${ECM_QTHELP:=true} + : "${ECM_QTHELP:=true}" fi -: ${ECM_QTHELP:=false} +: "${ECM_QTHELP:=false}" # @ECLASS_VARIABLE: ECM_TEST # @DEFAULT_UNSET @@ -135,9 +135,9 @@ fi # meant as a short-term fix and creates ${T}/${P}-tests-optional.patch to # refine and submit upstream. if [[ ${CATEGORY} = kde-frameworks ]]; then - : ${ECM_TEST:=true} + : "${ECM_TEST:=true}" fi -: ${ECM_TEST:=false} +: "${ECM_TEST:=false}" # @ECLASS_VARIABLE: KFMIN # @DEFAULT_UNSET @@ -147,15 +147,15 @@ fi # changed unless we also bump EAPI, which usually implies (rev-)bumping. # Version will also be used to differentiate between KF5/Qt5 and KF6/Qt6. if [[ ${CATEGORY} = kde-frameworks ]]; then - : ${KFMIN:=$(ver_cut 1-2)} + : "${KFMIN:=$(ver_cut 1-2)}" fi -: ${KFMIN:=5.82.0} +: "${KFMIN:=5.82.0}" # @ECLASS_VARIABLE: KFSLOT # @INTERNAL # @DESCRIPTION: # KDE Frameworks and Qt slot dependency, implied by KFMIN version. -: ${KFSLOT:=5} +: "${KFSLOT:=5}" case ${ECM_NONGUI} in true) ;; diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass index 2715c26c91a8..004db173f0cd 100644 --- a/eclass/elisp-common.eclass +++ b/eclass/elisp-common.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: elisp-common.eclass @@ -206,7 +206,7 @@ BYTECOMPFLAGS="-L ." # @ECLASS_VARIABLE: NEED_EMACS # @DESCRIPTION: # The minimum Emacs version required for the package. -: ${NEED_EMACS:=23.1} +: "${NEED_EMACS:=25.3}" # @ECLASS_VARIABLE: _ELISP_EMACS_VERSION # @INTERNAL diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass index 9d157c23d5b1..192f27384967 100644 --- a/eclass/elisp.eclass +++ b/eclass/elisp.eclass @@ -125,7 +125,7 @@ elisp_src_prepare() { # @FUNCTION: elisp_src_configure # @DESCRIPTION: -# Do nothing, because Emacs packages seldomly bring a full build system. +# Do nothing, because Emacs packages seldom bring a full build system. elisp_src_configure() { :; } diff --git a/eclass/epatch.eclass b/eclass/epatch.eclass index 07f802583fc7..c42aef8e80d1 100644 --- a/eclass/epatch.eclass +++ b/eclass/epatch.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: epatch.eclass @@ -190,7 +190,7 @@ epatch() { local patchname=${x##*/} # Apply single patches, or forced sets of patches, or - # patches with ARCH dependant names. + # patches with ARCH dependent names. # ???_arch_foo.patch # Else, skip this input altogether local a=${patchname#*_} # strip the ???_ @@ -272,7 +272,7 @@ epatch() { fi # Check for absolute paths in patches. If sandbox is disabled, - # people could (accidently) patch files in the root filesystem. + # people could (accidentally) patch files in the root filesystem. # Or trigger other unpleasantries #237667. So disallow -p0 on # such patches. local abs_paths=$(grep -E -n '^[-+]{3} /' "${PATCH_TARGET}" | awk '$2 != "/dev/null" { print }') diff --git a/eclass/fortran-2.eclass b/eclass/fortran-2.eclass index 72b3d2d1857b..855dcba59a39 100644 --- a/eclass/fortran-2.eclass +++ b/eclass/fortran-2.eclass @@ -40,7 +40,7 @@ inherit toolchain-funcs # @DESCRIPTION: # Set to "1" in order to automatically have the eclass abort if the fortran # compiler lacks openmp support. -: ${FORTRAN_NEED_OPENMP:=0} +: "${FORTRAN_NEED_OPENMP:=0}" # @ECLASS_VARIABLE: FORTRAN_STANDARD # @DESCRIPTION: @@ -48,7 +48,7 @@ inherit toolchain-funcs # Generally not needed as default is sufficient. # # Valid settings are any combination of: 77 90 95 2003 -: ${FORTRAN_STANDARD:=77} +: "${FORTRAN_STANDARD:=77}" # @ECLASS_VARIABLE: FORTRAN_NEEDED # @DESCRIPTION: @@ -61,7 +61,7 @@ inherit toolchain-funcs # DEPEND="lapack? ( virtual/fortran )" # # If unset, we always depend on virtual/fortran. -: ${FORTRAN_NEEDED:=always} +: "${FORTRAN_NEEDED:=always}" for _f_use in ${FORTRAN_NEEDED}; do case ${_f_use} in @@ -107,7 +107,7 @@ fortran_int64_abi_fflags() { elif [[ ${_FC} == ifort ]]; then echo "-integer-size 64" else - die "Compiler flag for 64bit interger for ${_FC} unknown" + die "Compiler flag for 64bit integer for ${_FC} unknown" fi } @@ -221,9 +221,9 @@ _fortran_test_function() { local dialect - : ${F77:=$(tc-getFC)} + : "${F77:=$(tc-getFC)}" - : ${FORTRAN_STANDARD:=77} + : "${FORTRAN_STANDARD:=77}" for dialect in ${FORTRAN_STANDARD}; do case ${dialect} in 77) _fortran_compile_test "$(tc-getF77)" || \ diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass index 5c7dc29627cb..e9fdf2ac3a42 100644 --- a/eclass/git-r3.eclass +++ b/eclass/git-r3.eclass @@ -62,7 +62,7 @@ fi # unavailable calls like 'git describe' will not reference prior tags. # No purging of old references is done. This mode is intended mostly for # embedded systems with limited disk space. -: ${EGIT_CLONE_TYPE:=single} +: "${EGIT_CLONE_TYPE:=single}" # @ECLASS_VARIABLE: EGIT_MIN_CLONE_TYPE # @DESCRIPTION: @@ -79,7 +79,7 @@ fi # or a similar remote is used that does not support shallow clones # and fetching tags along with commits. Please use sparingly, and to fix # fatal errors rather than 'non-pretty versions'. -: ${EGIT_MIN_CLONE_TYPE:=shallow} +: "${EGIT_MIN_CLONE_TYPE:=shallow}" # @ECLASS_VARIABLE: EGIT3_STORE_DIR # @USER_VARIABLE @@ -115,7 +115,7 @@ fi # read the manpage for git-clone(1). # # URIs should be using https:// whenever possible. http:// and git:// -# URIs are completely unsecured and their use (even if only as +# URIs are completely insecure and their use (even if only as # a fallback) renders the ebuild completely vulnerable to MITM attacks. # # Can be a whitespace-separated list or an array. @@ -317,7 +317,7 @@ _git-r3_set_gitdir() { repo_name=${repo_name//\//_} local distdir=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}} - : ${EGIT3_STORE_DIR:=${distdir}/git3-src} + : "${EGIT3_STORE_DIR:=${distdir}/git3-src}" GIT_DIR=${EGIT3_STORE_DIR}/${repo_name} @@ -533,7 +533,7 @@ git-r3_fetch() { local r for r in "${repos[@]}"; do if [[ ${r} == git:* || ${r} == http:* ]]; then - ewarn "git-r3: ${r%%:*} protocol is completely unsecure and may render the ebuild" + ewarn "git-r3: ${r%%:*} protocol is completely insecure and may render the ebuild" ewarn "easily susceptible to MITM attacks (even if used only as fallback). Please" ewarn "use https instead." ewarn "[URI: ${r}]" @@ -769,7 +769,7 @@ git-r3_fetch() { [[ ${success} ]] || die "Unable to fetch from any of EGIT_REPO_URI" # submodules can reference commits in any branch - # always use the 'mirror' mode to accomodate that, bug #503332 + # always use the 'mirror' mode to accommodate that, bug #503332 local EGIT_CLONE_TYPE=mirror # recursively fetch submodules diff --git a/eclass/gnome.org.eclass b/eclass/gnome.org.eclass index 05025f5f58fa..99b0090fda7c 100644 --- a/eclass/gnome.org.eclass +++ b/eclass/gnome.org.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: gnome.org.eclass @@ -29,7 +29,7 @@ _GNOME_ORG_ECLASS=1 # Most projects hosted on gnome.org mirrors provide tarballs as tar.bz2 or # tar.xz. This eclass defaults to xz. This is because the GNOME mirrors are # moving to only have xz tarballs for new releases. -: ${GNOME_TARBALL_SUFFIX:="xz"} +: "${GNOME_TARBALL_SUFFIX:="xz"}" # Even though xz-utils are in @system, they must still be added to BDEPEND; see # https://archives.gentoo.org/gentoo-dev/msg_a0d4833eb314d1be5d5802a3b710e0a4.xml @@ -45,16 +45,16 @@ fi # @DESCRIPTION: # Name of the module as hosted on gnome.org mirrors. # Leave unset if package name matches module name. -: ${GNOME_ORG_MODULE:=$PN} +: "${GNOME_ORG_MODULE:=$PN}" # @ECLASS_VARIABLE: GNOME_ORG_PVP # @INTERNAL # @DESCRIPTION: # Components of the version number that correspond to a 6 month release. if ver_test -ge 40.0; then - : ${GNOME_ORG_PVP:=$(ver_cut 1)} + : "${GNOME_ORG_PVP:=$(ver_cut 1)}" else - : ${GNOME_ORG_PVP:=$(ver_cut 1-2)} + : "${GNOME_ORG_PVP:=$(ver_cut 1-2)}" fi SRC_URI="mirror://gnome/sources/${GNOME_ORG_MODULE}/${GNOME_ORG_PVP}/${GNOME_ORG_MODULE}-${PV}.tar.${GNOME_TARBALL_SUFFIX}" diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass index 4bbbdc82dae7..3a92a43e306a 100644 --- a/eclass/gnome2-utils.eclass +++ b/eclass/gnome2-utils.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: gnome2-utils.eclass @@ -29,29 +29,29 @@ esac # @INTERNAL # @DESCRIPTION: # Path to gconftool-2 -: ${GCONFTOOL_BIN:="/usr/bin/gconftool-2"} +: "${GCONFTOOL_BIN:="/usr/bin/gconftool-2"}" # @ECLASS_VARIABLE: SCROLLKEEPER_DIR # @INTERNAL # @DESCRIPTION: # Directory where scrollkeeper-update should do its work -: ${SCROLLKEEPER_DIR:="/var/lib/scrollkeeper"} +: "${SCROLLKEEPER_DIR:="/var/lib/scrollkeeper"}" # @ECLASS_VARIABLE: SCROLLKEEPER_UPDATE_BIN # @INTERNAL # @DESCRIPTION: # Path to scrollkeeper-update -: ${SCROLLKEEPER_UPDATE_BIN:="/usr/bin/scrollkeeper-update"} +: "${SCROLLKEEPER_UPDATE_BIN:="/usr/bin/scrollkeeper-update"}" # @ECLASS_VARIABLE: GLIB_COMPILE_RESOURCES # @DESCRIPTION: # Path to glib-compile-resources -: ${GLIB_COMPILE_RESOURCES:="/usr/bin/glib-compile-resources"} +: "${GLIB_COMPILE_RESOURCES:="/usr/bin/glib-compile-resources"}" # @ECLASS_VARIABLE: GLIB_COMPILE_SCHEMAS # @DESCRIPTION: # Path to glib-compile-schemas -: ${GLIB_COMPILE_SCHEMAS:="/usr/bin/glib-compile-schemas"} +: "${GLIB_COMPILE_SCHEMAS:="/usr/bin/glib-compile-schemas"}" # @ECLASS_VARIABLE: GNOME2_ECLASS_SCHEMAS # @INTERNAL @@ -86,7 +86,7 @@ esac # @FUNCTION: gnome2_environment_reset # @DESCRIPTION: -# Reset various variables inherited from root's evironment to a reasonable +# Reset various variables inherited from root's environment to a reasonable # default for ebuilds to help avoid access violations and test failures. gnome2_environment_reset() { xdg_environment_reset diff --git a/eclass/gnustep-base.eclass b/eclass/gnustep-base.eclass index f967a527282a..49bcc09caa93 100644 --- a/eclass/gnustep-base.eclass +++ b/eclass/gnustep-base.eclass @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: gnustep-base.eclass # @MAINTAINER: # GNUstep Herd <gnustep@gentoo.org> # @SUPPORTED_EAPIS: 6 7 8 -# @BLURB: Internal handling of GNUstep pacakges +# @BLURB: Internal handling of GNUstep packages # @DESCRIPTION: # Inner gnustep eclass, should only be inherited directly by gnustep-base # packages diff --git a/eclass/golang-vcs.eclass b/eclass/golang-vcs.eclass index 7eb60e5f2453..6f60b6dd3ae0 100644 --- a/eclass/golang-vcs.eclass +++ b/eclass/golang-vcs.eclass @@ -67,7 +67,7 @@ _golang-vcs_env_setup() { debug-print-function ${FUNCNAME} "$@" local distdir=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}} - : ${EGO_STORE_DIR:=${distdir}/go-src} + : "${EGO_STORE_DIR:=${distdir}/go-src}" [[ -n ${EVCS_UMASK} ]] && eumask_push $EVCS_UMASK diff --git a/eclass/gstreamer-meson.eclass b/eclass/gstreamer-meson.eclass index aa54d05fdb85..a4fb4b1a2028 100644 --- a/eclass/gstreamer-meson.eclass +++ b/eclass/gstreamer-meson.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: gstreamer-meson.eclass @@ -41,7 +41,7 @@ esac # @DESCRIPTION: # Defines the plugins to be built. # May be set by an ebuild and contain more than one identifier, space -# separated (only src_configure can handle mutiple plugins at this time). +# separated (only src_configure can handle multiple plugins at this time). # @ECLASS_VARIABLE: GST_PLUGINS_NOAUTO # @DESCRIPTION: @@ -143,7 +143,7 @@ gstreamer_system_library() { # Actual build directories of the plugins. # Most often the same as the configure switch name. # FIXME: Change into a bash array -: ${GST_PLUGINS_BUILD_DIR:=${PN/gst-plugins-/}} +: "${GST_PLUGINS_BUILD_DIR:=${PN/gst-plugins-/}}" # @ECLASS_VARIABLE: GST_TARBALL_SUFFIX # @DESCRIPTION: @@ -151,7 +151,7 @@ gstreamer_system_library() { # tarballs as tar.bz2 or tar.xz. This eclass defaults to xz. This is # because the gstreamer mirrors are moving to only have xz tarballs for # new releases. -: ${GST_TARBALL_SUFFIX:="xz"} +: "${GST_TARBALL_SUFFIX:="xz"}" # Even though xz-utils are in @system, they must still be added to BDEPEND; see # https://archives.gentoo.org/gentoo-dev/msg_a0d4833eb314d1be5d5802a3b710e0a4.xml @@ -163,13 +163,13 @@ fi # @DESCRIPTION: # Name of the module as hosted on gstreamer.freedesktop.org mirrors. # Leave unset if package name matches module name. -: ${GST_ORG_MODULE:=${PN}} +: "${GST_ORG_MODULE:=${PN}}" # @ECLASS_VARIABLE: GST_ORG_PVP # @INTERNAL # @DESCRIPTION: # Major and minor numbers of the version number. -: ${GST_ORG_PVP:=$(ver_cut 1-2)} +: "${GST_ORG_PVP:=$(ver_cut 1-2)}" DESCRIPTION="${BUILD_GST_PLUGINS} plugin for gstreamer" diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index 12251a268b45..82f423a199c4 100644 --- a/eclass/haskell-cabal.eclass +++ b/eclass/haskell-cabal.eclass @@ -26,11 +26,11 @@ # nocabaldep -- don't add dependency on cabal. # only used for packages that _must_ not pull the dependency # on cabal, but still use this eclass (e.g. haskell-updater). -# ghcdeps -- constraint dependency on package to ghc onces +# ghcdeps -- constraint dependency on package to ghc once # only used for packages that use libghc internally and _must_ # not pull upper versions # test-suite -- add support for cabal test-suites (introduced in Cabal-1.8) -# rebuild-after-doc-workaround -- enable doctest test failue workaround. +# rebuild-after-doc-workaround -- enable doctest test failure workaround. # Symptom: when `./setup haddock` is run in a `build-type: Custom` # package it might cause cause the test-suite to fail with # errors like: @@ -58,14 +58,14 @@ inherit ghc-package multilib toolchain-funcs # User-specified additional parameters passed to 'setup configure'. # example: /etc/portage/make.conf: # CABAL_EXTRA_CONFIGURE_FLAGS="--enable-shared --enable-executable-dynamic" -: ${CABAL_EXTRA_CONFIGURE_FLAGS:=} +: "${CABAL_EXTRA_CONFIGURE_FLAGS:=}" # @ECLASS_VARIABLE: CABAL_EXTRA_BUILD_FLAGS # @USER_VARIABLE # @DESCRIPTION: # User-specified additional parameters passed to 'setup build'. # example: /etc/portage/make.conf: CABAL_EXTRA_BUILD_FLAGS=-v -: ${CABAL_EXTRA_BUILD_FLAGS:=} +: "${CABAL_EXTRA_BUILD_FLAGS:=}" # @ECLASS_VARIABLE: GHC_BOOTSTRAP_FLAGS # @USER_VARIABLE @@ -74,7 +74,7 @@ inherit ghc-package multilib toolchain-funcs # _only_ 'setup' binary bootstrap. # example: /etc/portage/make.conf: GHC_BOOTSTRAP_FLAGS=-dynamic to make # linking 'setup' faster. -: ${GHC_BOOTSTRAP_FLAGS:=} +: "${GHC_BOOTSTRAP_FLAGS:=}" # @ECLASS_VARIABLE: CABAL_EXTRA_HADDOCK_FLAGS # @USER_VARIABLE @@ -82,7 +82,7 @@ inherit ghc-package multilib toolchain-funcs # User-specified additional parameters passed to 'setup haddock'. # example: /etc/portage/make.conf: # CABAL_EXTRA_HADDOCK_FLAGS="--haddock-options=--latex --haddock-options=--pretty-html" -: ${CABAL_EXTRA_HADDOCK_FLAGS:=} +: "${CABAL_EXTRA_HADDOCK_FLAGS:=}" # @ECLASS_VARIABLE: CABAL_EXTRA_HOOGLE_FLAGS # @USER_VARIABLE @@ -90,7 +90,7 @@ inherit ghc-package multilib toolchain-funcs # User-specified additional parameters passed to 'setup haddock --hoogle'. # example: /etc/portage/make.conf: # CABAL_EXTRA_HOOGLE_FLAGS="--haddock-options=--show-all" -: ${CABAL_EXTRA_HOOGLE_FLAGS:=} +: "${CABAL_EXTRA_HOOGLE_FLAGS:=}" # @ECLASS_VARIABLE: CABAL_EXTRA_HSCOLOUR_FLAGS # @USER_VARIABLE @@ -98,7 +98,7 @@ inherit ghc-package multilib toolchain-funcs # User-specified additional parameters passed to 'setup hscolour'. # example: /etc/portage/make.conf: # CABAL_EXTRA_HSCOLOUR_FLAGS="--executables --tests" -: ${CABAL_EXTRA_HSCOLOUR_FLAGS:=} +: "${CABAL_EXTRA_HSCOLOUR_FLAGS:=}" # @ECLASS_VARIABLE: CABAL_EXTRA_TEST_FLAGS @@ -107,13 +107,13 @@ inherit ghc-package multilib toolchain-funcs # User-specified additional parameters passed to 'setup test'. # example: /etc/portage/make.conf: # CABAL_EXTRA_TEST_FLAGS="-v3 --show-details=streaming" -: ${CABAL_EXTRA_TEST_FLAGS:=} +: "${CABAL_EXTRA_TEST_FLAGS:=}" # @ECLASS_VARIABLE: CABAL_DEBUG_LOOSENING # @DESCRIPTION: # Show debug output for 'cabal_chdeps' function if set. # Needs working 'diff'. -: ${CABAL_DEBUG_LOOSENING:=} +: "${CABAL_DEBUG_LOOSENING:=}" # @ECLASS_VARIABLE: CABAL_REPORT_OTHER_BROKEN_PACKAGES # @DESCRIPTION: @@ -121,14 +121,14 @@ inherit ghc-package multilib toolchain-funcs # It should be normally enabled unless you know you are about # to try to compile a lot of broken packages. Default value: 'yes' # Set to anything else to disable. -: ${CABAL_REPORT_OTHER_BROKEN_PACKAGES:=yes} +: "${CABAL_REPORT_OTHER_BROKEN_PACKAGES:=yes}" # @ECLASS_VARIABLE: CABAL_HACKAGE_REVISION # @PRE_INHERIT # @DESCRIPTION: # Set the upstream revision number from Hackage. This will automatically # add the upstream cabal revision to SRC_URI and apply it in src_prepare. -: ${CABAL_HACKAGE_REVISION:=0} +: "${CABAL_HACKAGE_REVISION:=0}" # @ECLASS_VARIABLE: CABAL_PN # @PRE_INHERIT @@ -136,7 +136,7 @@ inherit ghc-package multilib toolchain-funcs # Set the name of the package as it is recorded in the Hackage database. This # is mostly used when packages use CamelCase names upstream, but we want them # to be lowercase in portage. -: ${CABAL_PN:=${PN}} +: "${CABAL_PN:=${PN}}" # @ECLASS_VARIABLE: CABAL_PV # @PRE_INHERIT @@ -144,7 +144,7 @@ inherit ghc-package multilib toolchain-funcs # Set the version of the package as it is recorded in the Hackage database. # This can be useful if we use a different versioning scheme in Portage than # the one from upstream -: ${CABAL_PV:=${PV}} +: "${CABAL_PV:=${PV}}" # @ECLASS_VARIABLE: CABAL_P # @OUTPUT_VARIABLE @@ -158,7 +158,7 @@ S="${WORKDIR}/${CABAL_P}" # @DESCRIPTION: # The location of the .cabal file for the Haskell package. This defaults to # "${S}/${CABAL_PN}.cabal". -: ${CABAL_FILE:="${S}/${CABAL_PN}.cabal"} +: "${CABAL_FILE:="${S}/${CABAL_PN}.cabal"}" # @ECLASS_VARIABLE: CABAL_DISTFILE # @OUTPUT_VARIABLE @@ -179,14 +179,14 @@ fi # 'base >= 4.2 && < 4.6' 'base >= 4.2 && < 4.7' # 'containers ==0.4.*' 'containers >= 0.4 && < 0.6' # ) -: ${CABAL_CHDEPS:=} +: "${CABAL_CHDEPS:=}" # @ECLASS_VARIABLE: CABAL_LIVE_VERSION # @PRE_INHERIT # @DEFAULT_UNSET # @DESCRIPTION: # Set this to any value to prevent SRC_URI from being set automatically. -: ${CABAL_LIVE_VERSION:=} +: "${CABAL_LIVE_VERSION:=}" # @ECLASS_VARIABLE: GHC_BOOTSTRAP_PACKAGES # @DEFAULT_UNSET @@ -196,7 +196,7 @@ fi # GHC_BOOTSTRAP_PACKAGES=( # cabal-doctest # ) -: ${GHC_BOOTSTRAP_PACKAGES:=} +: "${GHC_BOOTSTRAP_PACKAGES:=}" # 'dev-haskell/cabal' passes those options with ./configure-based # configuration, but most packages don't need/don't accept it: @@ -266,7 +266,7 @@ BDEPEND="${BDEPEND} app-text/dos2unix" # returns the version of cabal currently in use. # Rarely it's handy to pin cabal version from outside. -: ${_CABAL_VERSION_CACHE:=""} +: "${_CABAL_VERSION_CACHE:=""}" cabal-version() { if [[ -z "${_CABAL_VERSION_CACHE}" ]]; then if [[ "${CABAL_BOOTSTRAP}" ]]; then @@ -516,7 +516,7 @@ cabal-configure() { cabalconf+=(--verbose) # We build shared version of our Cabal where ghc ships it's shared - # version of it. We will link ./setup as dynamic binary againt Cabal later. + # version of it. We will link ./setup as dynamic binary against Cabal later. [[ ${CATEGORY}/${PN} == "dev-haskell/cabal" ]] && \ $(ghc-supports-shared-libraries) && \ cabalconf+=(--enable-shared) @@ -882,8 +882,8 @@ cabal_chdeps() { # @FUNCTION: cabal-constraint # @DESCRIPTION: -# Allowes to set contraint to the libraries that are -# used by specified package +# Allows to set constraints to the libraries that are used by the +# specified package. cabal-constraint() { while read p v ; do echo "--constraint \"$p == $v\"" diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index 61a90f3f3196..3b4a71a402ed 100644 --- a/eclass/java-ant-2.eclass +++ b/eclass/java-ant-2.eclass @@ -275,7 +275,7 @@ java-ant_bsfix_files() { for dir in ${JAVA_ANT_JAVADOC_INPUT_DIRS};do if [[ ! -d ${dir} ]]; then - eerror "This dir: ${dir} doesnt' exists" + eerror "Directory ${dir} doesn't exist" die "You must specify directories for javadoc input/output dirs." fi done diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass index c8a4e6b5abae..3a5c846a18e6 100644 --- a/eclass/java-pkg-2.eclass +++ b/eclass/java-pkg-2.eclass @@ -73,7 +73,7 @@ java-pkg-2_src_prepare() { # EANT_BUILD_TARGET - the ant target/targets to execute (default: jar) # EANT_DOC_TARGET - the target to build extra docs under the doc use flag # (default: javadoc; declare empty to disable completely) -# EANT_GENTOO_CLASSPATH - @see eant documention in java-utils-2.eclass +# EANT_GENTOO_CLASSPATH - @see eant documentation in java-utils-2.eclass # EANT_EXTRA_ARGS - extra arguments to pass to eant # EANT_ANT_TASKS - modifies the ANT_TASKS variable in the eant environment # @CODE diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass index a1589b025617..929ce68c6c07 100644 --- a/eclass/java-pkg-simple.eclass +++ b/eclass/java-pkg-simple.eclass @@ -116,7 +116,7 @@ fi # @ECLASS_VARIABLE: JAVA_ENCODING # @DESCRIPTION: # The character encoding used in the source files. -: ${JAVA_ENCODING:=UTF-8} +: "${JAVA_ENCODING:=UTF-8}" # @ECLASS_VARIABLE: JAVAC_ARGS # @DEFAULT_UNSET @@ -148,7 +148,7 @@ fi # @ECLASS_VARIABLE: JAVA_JAR_FILENAME # @DESCRIPTION: # The name of the jar file to create and install. -: ${JAVA_JAR_FILENAME:=${PN}.jar} +: "${JAVA_JAR_FILENAME:=${PN}.jar}" # @ECLASS_VARIABLE: JAVA_BINJAR_FILENAME # @DEFAULT_UNSET @@ -161,7 +161,7 @@ fi # If ${JAVA_MAIN_CLASS} is set, we will create a launcher to # execute the jar, and ${JAVA_LAUNCHER_FILENAME} will be the # name of the script. -: ${JAVA_LAUNCHER_FILENAME:=${PN}-${SLOT}} +: "${JAVA_LAUNCHER_FILENAME:=${PN}-${SLOT}}" # @ECLASS_VARIABLE: JAVA_TESTING_FRAMEWORKS # @DEFAULT_UNSET diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index c1f42408e462..463d364caee9 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -37,7 +37,7 @@ has test ${JAVA_PKG_IUSE} && RESTRICT+=" !test? ( test )" # @VARIABLE: JAVA_PKG_E_DEPEND # @INTERNAL # @DESCRIPTION: -# This is a convience variable to be used from the other java eclasses. This is +# This is a convenience variable to be used from the other java eclasses. This is # the version of java-config we want to use. Usually the latest stable version # so that ebuilds can use new features without depending on specific versions. JAVA_PKG_E_DEPEND=">=dev-java/java-config-2.2.0-r3" @@ -783,7 +783,7 @@ java-pkg_dosrc() { # @FUNCTION: java-pkg_dolauncher # @USAGE: <filename> [options] # @DESCRIPTION: -# Make a wrapper script to lauch/start this package +# Make a wrapper script to launch/start this package # If necessary, the wrapper will switch to the appropriate VM. # # Can be called without parameters if the package installs only one jar @@ -953,7 +953,7 @@ java-pkg_recordjavadoc() # Example: get a specific jar from xerces slot 2 # java-pkg_jar-from xerces-2 xml-apis.jar # -# Example: get a specific jar from xerces slot 2, and name it diffrently +# Example: get a specific jar from xerces slot 2, and name it differently # java-pkg_jar-from xerces-2 xml-apis.jar xml.jar # # Example: get junit.jar which is needed only for building @@ -1364,7 +1364,7 @@ java-pkg_register-optional-dependency() { # @DESCRIPTION: # Register an arbitrary environment variable into package.env. The gjl launcher # for this package or any package depending on this will export it into -# environement before executing java command. +# environment before executing java command. # Must only be called in src_install phase. JAVA_PKG_EXTRA_ENV="${T}/java-pkg-extra-env" JAVA_PKG_EXTRA_ENV_VARS="" @@ -2640,7 +2640,7 @@ java-pkg_get-vm-version() { # @RETURN: VM handle of an available JDK # @DESCRIPTION: # Selects a build vm from a list of vm handles. First checks for the system-vm -# beeing usable, then steps through the listed handles till a suitable vm is +# being usable, then steps through the listed handles till a suitable vm is # found. # java-pkg_build-vm-from-handle() { diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass index 01bbcf697fb4..336a486c3883 100644 --- a/eclass/java-vm-2.eclass +++ b/eclass/java-vm-2.eclass @@ -344,7 +344,7 @@ java-vm_sandbox-predict() { [[ -z "${1}" ]] && die "${FUNCNAME} takes at least one argument" local path path_arr=("$@") - # subshell this to prevent IFS bleeding out dependant on bash version. + # subshell this to prevent IFS bleeding out dependent on bash version. # could use local, which *should* work, but that requires a lot of testing. path=$(IFS=":"; echo "${path_arr[*]}") dodir /etc/sandbox.d diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass index 629c57d9a082..88040026ecae 100644 --- a/eclass/kde.org.eclass +++ b/eclass/kde.org.eclass @@ -84,7 +84,7 @@ readonly KDE_ORG_CATEGORIES # @DESCRIPTION: # If unset, default value is mapped from ${CATEGORY} to corresponding upstream # category on invent.kde.org, with "kde" as fallback value. -: ${KDE_ORG_CATEGORY:=${KDE_ORG_CATEGORIES[${CATEGORY}]:-kde}} +: "${KDE_ORG_CATEGORY:=${KDE_ORG_CATEGORIES[${CATEGORY}]:-kde}}" # @ECLASS_VARIABLE: KDE_ORG_COMMIT # @PRE_INHERIT @@ -99,12 +99,12 @@ readonly KDE_ORG_CATEGORIES # @DESCRIPTION: # If unset, default value is set to ${PN}. # Name of the package as hosted on kde.org mirrors. -: ${KDE_ORG_NAME:=$PN} +: "${KDE_ORG_NAME:=$PN}" # @ECLASS_VARIABLE: KDE_ORG_SCHEDULE_URI # @DESCRIPTION: # Known schedule URI of package or release group. -: ${KDE_ORG_SCHEDULE_URI:="https://community.kde.org/Schedules"} +: "${KDE_ORG_SCHEDULE_URI:="https://community.kde.org/Schedules"}" # @ECLASS_VARIABLE: KDE_SELINUX_MODULE # @PRE_INHERIT @@ -112,7 +112,7 @@ readonly KDE_ORG_CATEGORIES # If set to "none", do nothing. # For any other value, add selinux to IUSE, and depending on that useflag # add a dependency on sec-policy/selinux-${KDE_SELINUX_MODULE} to (R)DEPEND. -: ${KDE_SELINUX_MODULE:=none} +: "${KDE_SELINUX_MODULE:=none}" case ${KDE_SELINUX_MODULE} in none) ;; diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass index 3c78aa5a8445..b44aea393c8a 100644 --- a/eclass/kernel-2.eclass +++ b/eclass/kernel-2.eclass @@ -26,7 +26,7 @@ # @DEFAULT_UNSET # @DESCRIPTION: # Used as a comparison kernel version, which is used when -# PV doesnt reflect the genuine kernel version. +# PV doesn't reflect the genuine kernel version. # This gets set to the portage style versioning. ie: # CKV=2.6.11_rc4 @@ -87,7 +87,7 @@ # @ECLASS_VARIABLE: K_EXTRAEINFO # @DEFAULT_UNSET # @DESCRIPTION: -# this is a new-line seperated list of einfo displays in +# this is a new-line separated list of einfo displays in # postinst and can be used to carry additional postinst # messages @@ -171,7 +171,7 @@ # @ECLASS_VARIABLE: K_SYMLINK # @DEFAULT_UNSET # @DESCRIPTION: -# if this is set, then forcably create symlink anyway +# if this is set, then forcibly create symlink anyway # @ECLASS_VARIABLE: K_USEPV # @DEFAULT_UNSET @@ -251,7 +251,7 @@ # @ECLASS_VARIABLE: UNIPATCH_EXCLUDE # @DEFAULT_UNSET # @DESCRIPTION: -# An addition var to support exlusion based completely +# An addition var to support exclusion based completely # on "<passedstring>*" and not "<passedno#>_*" # this should _NOT_ be used from the ebuild as this is # reserved for end users passing excludes from the cli @@ -299,13 +299,13 @@ if [[ ${CTARGET} == ${CHOST} && ${CATEGORY/cross-} != ${CATEGORY} ]]; then fi HOMEPAGE="https://www.kernel.org/ https://wiki.gentoo.org/wiki/Kernel ${HOMEPAGE}" -: ${LICENSE:="GPL-2"} +: "${LICENSE:="GPL-2"}" # No need to run scanelf/strip on kernel sources/headers (bug #134453). RESTRICT="binchecks strip" # set LINUX_HOSTCFLAGS if not already set -: ${LINUX_HOSTCFLAGS:="-Wall -Wstrict-prototypes -Os -fomit-frame-pointer -I${S}/include"} +: "${LINUX_HOSTCFLAGS:="-Wall -Wstrict-prototypes -Os -fomit-frame-pointer -I${S}/include"}" # @FUNCTION: debug-print-kernel2-variables @@ -393,7 +393,7 @@ detect_version() { [[ -n ${KV_FULL} ]] && return 0 # CKV is used as a comparison kernel version, which is used when - # PV doesnt reflect the genuine kernel version. + # PV doesn't reflect the genuine kernel version. # this gets set to the portage style versioning. ie: # CKV=2.6.11_rc4 CKV=${CKV:-${PV}} @@ -487,7 +487,7 @@ detect_version() { RELEASE=${RELEASE/_beta} RELEASE=${RELEASE/_rc/-rc} RELEASE=${RELEASE/_pre/-pre} - # We cannot trivally call kernel_is here, because it calls us to detect the + # We cannot trivially call kernel_is here, because it calls us to detect the # version #kernel_is ge 2 6 && RELEASE=${RELEASE/-pre/-git} (( KV_MAJOR * 1000 + ${KV_MINOR:-0} >= 2006 )) && RELEASE=${RELEASE/-pre/-git} @@ -928,7 +928,7 @@ postinst_sources() { # use deblob && \ # K_SECURITY_UNSUPPORTED=deblob - # if we are to forcably symlink, delete it if it already exists first. + # if we are to forcibly symlink, delete it if it already exists first. if [[ ${K_SYMLINK} -gt 0 ]]; then if [[ -e ${EROOT}/usr/src/linux && ! -L ${EROOT}/usr/src/linux ]] ; then die "${EROOT}/usr/src/linux exists and is not a symlink" @@ -1024,7 +1024,7 @@ setup_headers() { # Universal function that will apply patches to source unipatch() { - local i x y z extention PIPE_CMD UNIPATCH_DROP KPATCH_DIR PATCH_DEPTH ELINE + local i x y z extension PIPE_CMD UNIPATCH_DROP KPATCH_DIR PATCH_DEPTH ELINE local STRICT_COUNT PATCH_LEVEL myLC_ALL myLANG # set to a standard locale to ensure sorts are ordered properly. @@ -1070,10 +1070,10 @@ unipatch() { [[ ${i} == *:* ]] && elog ">>> Strict patch levels not currently supported for tarballed patchsets" else - extention=${i/*./} - extention=${extention/:*/} + extension=${i/*./} + extension=${extension/:*/} PIPE_CMD="" - case ${extention} in + case ${extension} in xz) PIPE_CMD="xz -T$(makeopts_jobs) -dc";; lzma) PIPE_CMD="lzma -dc";; bz2) PIPE_CMD="bzip2 -dc";; @@ -1087,7 +1087,7 @@ unipatch() { PATCH_LEVEL=${i/*([^:])?(:)} i=${i/:*/} x=${i/*\//} - x=${x/\.${extention}/} + x=${x/\.${extension}/} if [[ -n ${PIPE_CMD} ]]; then if [[ ! -r ${i} ]]; then @@ -1342,7 +1342,7 @@ getfilevar() { # @USAGE: # @DESCRIPTION: # This function sets ARCH_URI and ARCH_PATCH -# with the neccessary info for the arch sepecific compatibility +# with the necessary info for the arch specific compatibility # patchsets. detect_arch() { @@ -1499,7 +1499,7 @@ kernel-2_pkg_preinst() { # @FUNCTION: kernel-2_src_install # @USAGE: # @DESCRIPTION: -# Install headers or sources dependant on ETYPE +# Install headers or sources dependent on ETYPE kernel-2_src_install() { install_universal diff --git a/eclass/libretro-core.eclass b/eclass/libretro-core.eclass index 55d7e9f11513..906526e32436 100644 --- a/eclass/libretro-core.eclass +++ b/eclass/libretro-core.eclass @@ -1,4 +1,4 @@ -# Copyright 2018-2022 Gentoo Authors +# Copyright 2018-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: libretro-core.eclass @@ -69,17 +69,17 @@ fi # @DESCRIPTION: # Contains the real repo name of the core formatted as "repouser/reponame". # Needs to be set before inherit. Otherwise defaults to "libretro/${PN}" -: ${LIBRETRO_REPO_NAME:="libretro/libretro-${LIBRETRO_CORE_NAME}"} +: "${LIBRETRO_REPO_NAME:="libretro/libretro-${LIBRETRO_CORE_NAME}"}" -: ${HOMEPAGE:="https://github.com/${LIBRETRO_REPO_NAME}"} +: "${HOMEPAGE:="https://github.com/${LIBRETRO_REPO_NAME}"}" if [[ ${PV} == *9999 ]]; then - : ${EGIT_REPO_URI:="https://github.com/${LIBRETRO_REPO_NAME}.git"} + : "${EGIT_REPO_URI:="https://github.com/${LIBRETRO_REPO_NAME}.git"}" inherit git-r3 else [[ -z "${LIBRETRO_COMMIT_SHA}" ]] && die "LIBRETRO_COMMIT_SHA must be set before inherit." S="${WORKDIR}/${LIBRETRO_REPO_NAME##*/}-${LIBRETRO_COMMIT_SHA}" - : ${SRC_URI:="https://github.com/${LIBRETRO_REPO_NAME}/archive/${LIBRETRO_COMMIT_SHA}.tar.gz -> ${P}.tar.gz"} + : "${SRC_URI:="https://github.com/${LIBRETRO_REPO_NAME}/archive/${LIBRETRO_COMMIT_SHA}.tar.gz -> ${P}.tar.gz"}" fi inherit flag-o-matic toolchain-funcs diff --git a/eclass/linux-info.eclass b/eclass/linux-info.eclass index ce04a0dc66a7..d20afb308c19 100644 --- a/eclass/linux-info.eclass +++ b/eclass/linux-info.eclass @@ -45,7 +45,7 @@ _LINUX_INFO_ECLASS=1 # @DESCRIPTION: # Do not error out in check_extra_config if CONFIG settings are not met. # This is a user flag and should under _no circumstances_ be set in the ebuild. -: ${CHECKCONFIG_DONOTHING:=""} +: "${CHECKCONFIG_DONOTHING:=""}" # @ECLASS_VARIABLE: KERNEL_DIR # @DESCRIPTION: @@ -85,8 +85,8 @@ KERNEL_DIR="${KERNEL_DIR:-${ROOT%/}/usr/src/linux}" # e.g.: ERROR_MTRR="MTRR exists in the .config but shouldn't!!" # # CONFIG_CHECK="CFG" with ERROR_<CFG>="Error Message" will die -# CONFIG_CHECK="~CFG" with ERROR_<CFG>="Error Message" calls eerror without dieing -# CONFIG_CHECK="~CFG" with WARNING_<CFG>="Warning Message" calls ewarn without dieing +# CONFIG_CHECK="~CFG" with ERROR_<CFG>="Error Message" calls eerror without dying +# CONFIG_CHECK="~CFG" with WARNING_<CFG>="Warning Message" calls ewarn without dying # @ECLASS_VARIABLE: KBUILD_OUTPUT @@ -105,7 +105,7 @@ KERNEL_DIR="${KERNEL_DIR:-${ROOT%/}/usr/src/linux}" # the following names, in order: GNUmakefile, makefile and Makefile. Set this variable to the # proper Makefile name or the eclass will search in this order for it. # See https://www.gnu.org/software/make/manual/make.html -: ${KERNEL_MAKEFILE:=""} +: "${KERNEL_MAKEFILE:=""}" # @ECLASS_VARIABLE: KV_FULL # @OUTPUT_VARIABLE @@ -156,7 +156,7 @@ KERNEL_DIR="${KERNEL_DIR:-${ROOT%/}/usr/src/linux}" # Do not check for kernel sources or a running kernel version. # Main use-case is for chroots. # This is a user flag and should under _no circumstances_ be set in the ebuild. -: ${SKIP_KERNEL_CHECK:=""} +: "${SKIP_KERNEL_CHECK:=""}" # And to ensure all the weirdness with crosscompile inherit toolchain-funcs @@ -290,7 +290,7 @@ _LINUX_CONFIG_EXISTS_DONE= # @FUNCTION: linux_config_qa_check # @INTERNAL # @DESCRIPTION: -# Helper funciton which returns an error before the function argument is run if no config exists +# Helper function which returns an error before the function argument is run if no config exists linux_config_qa_check() { local f="$1" @@ -679,7 +679,7 @@ get_running_version() { KV_MINOR=$(ver_cut 2 ${kv_full}) KV_PATCH=$(ver_cut 3 ${kv_full}) KV_EXTRA="${KV_FULL#${KV_MAJOR}.${KV_MINOR}${KV_PATCH:+.${KV_PATCH}}}" - : ${KV_PATCH:=0} + : "${KV_PATCH:=0}" return 0 } diff --git a/eclass/linux-mod.eclass b/eclass/linux-mod.eclass index 98b22dcb9fc6..0098dbcfc2ce 100644 --- a/eclass/linux-mod.eclass +++ b/eclass/linux-mod.eclass @@ -38,7 +38,7 @@ # @DESCRIPTION: # A string containing the directory of the target kernel sources. The default value is # "/usr/src/linux" -: ${KERNEL_DIR:=/usr/src/linux} +: "${KERNEL_DIR:=/usr/src/linux}" # @ECLASS_VARIABLE: ECONF_PARAMS # @DEFAULT_UNSET @@ -54,7 +54,7 @@ # @ECLASS_VARIABLE: BUILD_TARGETS # @DESCRIPTION: # It's a string with the build targets to pass to make. The default value is "clean module" -: ${BUILD_TARGETS:=clean module} +: "${BUILD_TARGETS:=clean module}" # @ECLASS_VARIABLE: MODULE_NAMES # @DEFAULT_UNSET @@ -177,7 +177,7 @@ RDEPEND=" ) ${MODULES_OPTIONAL_USE:+)}" DEPEND="${RDEPEND} - ${MODULES_OPTIONAL_USE}${MODULES_OPTIONAL_USE:+? (} + ${MODULES_OPTIONAL_USE}${MODULES_OPTIONAL_USE:+? (} kernel_linux? ( virtual/linux-sources virtual/libelf ) ${MODULES_OPTIONAL_USE:+)}" @@ -340,7 +340,7 @@ get-KERNEL_CC() { # @USAGE: /path/to/the/modulename_without_extension # @RETURN: A file in /etc/modprobe.d # @DESCRIPTION: -# This function will generate and install the neccessary modprobe.d file from the +# This function will generate and install the necessary modprobe.d file from the # information contained in the modules exported parms. # (see the variables MODULESD_<modulename>_ENABLED, MODULESD_<modulename>_EXAMPLES, # MODULESD_<modulename>_ALIASES, MODULESD_<modulename>_ADDITION and MODULESD_<modulename>_DOCS). @@ -679,7 +679,7 @@ linux-mod_src_install() { insinto "${INSTALL_MOD_PATH}"/lib/modules/${KV_FULL}/${libdir} # check here for CONFIG_MODULE_COMPRESS_<compression option> (NONE, GZIP, XZ, ZSTD) - # and similarily compress the module being built if != NONE. + # and similarly compress the module being built if != NONE. if linux_chkconfig_present MODULE_COMPRESS_XZ; then xz -T$(makeopts_jobs) --memlimit-compress=50% -q ${modulename}.${KV_OBJ} || die "Compressing ${modulename}.${KV_OBJ} with xz failed" @@ -728,7 +728,7 @@ linux-mod_pkg_postinst() { # @FUNCTION: linux-mod_pkg_postrm # @DESCRIPTION: -# It removes the package from the /var/lib/module-rebuild/moduledb database but it doens't +# It removes the package from the /var/lib/module-rebuild/moduledb database but it doesn't # call /sbin/depmod because the modules are still installed. linux-mod_pkg_postrm() { debug-print-function ${FUNCNAME} $* diff --git a/eclass/mate-desktop.org.eclass b/eclass/mate-desktop.org.eclass index 875e4615773c..0dd77aa19a3e 100644 --- a/eclass/mate-desktop.org.eclass +++ b/eclass/mate-desktop.org.eclass @@ -29,25 +29,25 @@ fi # @DESCRIPTION: # All projects hosted on mate-desktop.org provide tarballs as tar.xz. # Undefined in live ebuilds. -[[ ${PV} != 9999 ]] && : ${MATE_TARBALL_SUFFIX:="xz"} +[[ ${PV} != 9999 ]] && : "${MATE_TARBALL_SUFFIX:="xz"}" # @ECLASS_VARIABLE: MATE_DESKTOP_ORG_PN # @DESCRIPTION: # Name of the package as hosted on mate-desktop.org. # Leave unset if package name matches PN. -: ${MATE_DESKTOP_ORG_PN:=${PN}} +: "${MATE_DESKTOP_ORG_PN:=${PN}}" # @ECLASS_VARIABLE: MATE_DESKTOP_ORG_PV # @DESCRIPTION: # Package version string as listed on mate-desktop.org. # Leave unset if package version string matches PV. -: ${MATE_DESKTOP_ORG_PV:=${PV}} +: "${MATE_DESKTOP_ORG_PV:=${PV}}" # @ECLASS_VARIABLE: MATE_BRANCH # @DESCRIPTION: # Major and minor numbers of the version number, unless live. # If live ebuild, will be set to '9999'. -: ${MATE_BRANCH:=$(ver_cut 1-2)} +: "${MATE_BRANCH:=$(ver_cut 1-2)}" # Set SRC_URI or EGIT_REPO_URI based on whether live if [[ ${PV} == 9999 ]]; then diff --git a/eclass/mate.eclass b/eclass/mate.eclass index 388cdf2f827d..e8290c69e25a 100644 --- a/eclass/mate.eclass +++ b/eclass/mate.eclass @@ -12,7 +12,7 @@ # @BLURB: Provides phases for MATE based packages. # @DESCRIPTION: # Exports portage base functions used by ebuilds written for packages using the -# MATE framework. Occassionally acts as a wrapper to gnome2 due to the +# MATE framework. Occasionally acts as a wrapper to gnome2 due to the # fact that MATE is a GNOME fork. For additional functions, see gnome2-utils.eclass. case ${EAPI} in @@ -48,7 +48,7 @@ DEPEND=">=mate-base/mate-common-${MATE_BRANCH}" # python-r1 eclass mate_py_cond_func_wrap() { if [[ ! ${_PYTHON_R1_ECLASS} ]]; then - die "This function requires the inheritence of the python-r1 eclass" + die "This function requires the inheritance of the python-r1 eclass" fi if use python; then python_foreach_impl run_in_build_dir "$@" @@ -63,7 +63,7 @@ mate_py_cond_func_wrap() { # - true: will always run eautoreconf # - false: will default to automatic detect # - If it is not set, it will default to false -: ${MATE_FORCE_AUTORECONF:="false"} +: "${MATE_FORCE_AUTORECONF:="false"}" # @FUNCTION: ematedocize # @DESCRIPTION: diff --git a/eclass/mercurial.eclass b/eclass/mercurial.eclass index 776ed2d9a1f0..27fb525bcbd6 100644 --- a/eclass/mercurial.eclass +++ b/eclass/mercurial.eclass @@ -45,7 +45,7 @@ BDEPEND="dev-vcs/mercurial" # # EHG_REVISION is passed as a value for --updaterev parameter, so it can be more # than just a revision, please consult `hg help revisions' for more details. -: ${EHG_REVISION:="default"} +: "${EHG_REVISION:="default"}" # @ECLASS_VARIABLE: EHG_STORE_DIR # @USER_VARIABLE @@ -70,7 +70,7 @@ BDEPEND="dev-vcs/mercurial" # @ECLASS_VARIABLE: EHG_QUIET # @DESCRIPTION: # Suppress some extra noise from mercurial, set it to 'ON' to be quiet. -: ${EHG_QUIET:="OFF"} +: "${EHG_QUIET:="OFF"}" [[ "${EHG_QUIET}" == "ON" ]] && EHG_QUIET_CMD_OPT="--quiet" # @ECLASS_VARIABLE: EHG_CONFIG diff --git a/eclass/meson.eclass b/eclass/meson.eclass index 881e24700053..4dfa08ba5553 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -58,7 +58,7 @@ BDEPEND=">=dev-util/meson-0.62.2 # @ECLASS_VARIABLE: EMESON_BUILDTYPE # @DESCRIPTION: # The buildtype value to pass to meson setup. -: ${EMESON_BUILDTYPE=plain} +: "${EMESON_BUILDTYPE=plain}" # @ECLASS_VARIABLE: EMESON_SOURCE # @DEFAULT_UNSET @@ -289,21 +289,21 @@ meson_src_configure() { local BUILD_PKG_CONFIG_PATH=${BUILD_PKG_CONFIG_PATH} if tc-is-cross-compiler; then - : ${BUILD_CFLAGS:=-O1 -pipe} - : ${BUILD_CXXFLAGS:=-O1 -pipe} - : ${BUILD_FCFLAGS:=-O1 -pipe} - : ${BUILD_OBJCFLAGS:=-O1 -pipe} - : ${BUILD_OBJCXXFLAGS:=-O1 -pipe} + : "${BUILD_CFLAGS:=-O1 -pipe}" + : "${BUILD_CXXFLAGS:=-O1 -pipe}" + : "${BUILD_FCFLAGS:=-O1 -pipe}" + : "${BUILD_OBJCFLAGS:=-O1 -pipe}" + : "${BUILD_OBJCXXFLAGS:=-O1 -pipe}" else - : ${BUILD_CFLAGS:=${CFLAGS}} - : ${BUILD_CPPFLAGS:=${CPPFLAGS}} - : ${BUILD_CXXFLAGS:=${CXXFLAGS}} - : ${BUILD_FCFLAGS:=${FCFLAGS}} - : ${BUILD_LDFLAGS:=${LDFLAGS}} - : ${BUILD_OBJCFLAGS:=${OBJCFLAGS}} - : ${BUILD_OBJCXXFLAGS:=${OBJCXXFLAGS}} - : ${BUILD_PKG_CONFIG_LIBDIR:=${PKG_CONFIG_LIBDIR}} - : ${BUILD_PKG_CONFIG_PATH:=${PKG_CONFIG_PATH}} + : "${BUILD_CFLAGS:=${CFLAGS}}" + : "${BUILD_CPPFLAGS:=${CPPFLAGS}}" + : "${BUILD_CXXFLAGS:=${CXXFLAGS}}" + : "${BUILD_FCFLAGS:=${FCFLAGS}}" + : "${BUILD_LDFLAGS:=${LDFLAGS}}" + : "${BUILD_OBJCFLAGS:=${OBJCFLAGS}}" + : "${BUILD_OBJCXXFLAGS:=${OBJCXXFLAGS}}" + : "${BUILD_PKG_CONFIG_LIBDIR:=${PKG_CONFIG_LIBDIR}}" + : "${BUILD_PKG_CONFIG_PATH:=${PKG_CONFIG_PATH}}" fi local mesonargs=( diff --git a/eclass/mozcoreconf-v6.eclass b/eclass/mozcoreconf-v6.eclass index ecf1c1f6720a..90d9d9b25b0c 100644 --- a/eclass/mozcoreconf-v6.eclass +++ b/eclass/mozcoreconf-v6.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: mozcoreconf-v6.eclass @@ -82,7 +82,7 @@ moz_pkgsetup() { export HOST_CXX="$(tc-getBUILD_CXX)" tc-export CC CXX LD PKG_CONFIG AR RANLIB - # Ensure that we have a sane build enviroment + # Ensure that we have a sane build environment export MOZILLA_CLIENT=1 export BUILD_OPT=1 export NO_STATIC_LIB=1 diff --git a/eclass/mozextension.eclass b/eclass/mozextension.eclass index 692aa816d8ed..52fe26280e6e 100644 --- a/eclass/mozextension.eclass +++ b/eclass/mozextension.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: mozextension.eclass @@ -21,7 +21,7 @@ _MOZEXTENSION_ECLASS=1 # to be overridden from the default app-global extensions path. # Default is empty, which installs to predetermined hard-coded # paths specified in the eclass. -: ${MOZEXTENSION_TARGET:=""} +: "${MOZEXTENSION_TARGET:=""}" BDEPEND="app-arch/unzip" diff --git a/eclass/mozlinguas-v2.eclass b/eclass/mozlinguas-v2.eclass index 063430e1cb74..81e00275a8f6 100644 --- a/eclass/mozlinguas-v2.eclass +++ b/eclass/mozlinguas-v2.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: mozlinguas-v2.eclass @@ -30,59 +30,59 @@ inherit mozextension # Array containing the list of language pack xpis available for # this release. The list can be updated with scripts/get_langs.sh from the # mozilla overlay. -: ${MOZ_LANGS:=()} +: "${MOZ_LANGS:=()}" # @ECLASS_VARIABLE: MOZ_PV # @DEFAULT_UNSET # @DESCRIPTION: # Ebuild package version converted to equivalent upstream version. # Defaults to ${PV}, and should be overridden for alphas, betas, and RCs -: ${MOZ_PV:="${PV}"} +: "${MOZ_PV:="${PV}"}" # @ECLASS_VARIABLE: MOZ_PN # @DEFAULT_UNSET # @DESCRIPTION: # Ebuild package name converted to equivalent upstream name. # Defaults to ${PN}, and should be overridden for binary ebuilds. -: ${MOZ_PN:="${PN}"} +: "${MOZ_PN:="${PN}"}" # @ECLASS_VARIABLE: MOZ_P # @DEFAULT_UNSET # @DESCRIPTION: # Ebuild package name + version converted to upstream equivalent. # Defaults to ${MOZ_PN}-${MOZ_PV} -: ${MOZ_P:="${MOZ_PN}-${MOZ_PV}"} +: "${MOZ_P:="${MOZ_PN}-${MOZ_PV}"}" # @ECLASS_VARIABLE: MOZ_FTP_URI # @DEFAULT_UNSET # @DESCRIPTION: # The ftp URI prefix for the release tarballs and language packs. -: ${MOZ_FTP_URI:=""} +: "${MOZ_FTP_URI:=""}" # @ECLASS_VARIABLE: MOZ_HTTP_URI # @PRE_INHERIT # @DESCRIPTION: # The http URI prefix for the release tarballs and language packs. -: ${MOZ_HTTP_URI:=""} +: "${MOZ_HTTP_URI:=""}" # @ECLASS_VARIABLE: MOZ_LANGPACK_HTTP_URI # @PRE_INHERIT # @DESCRIPTION: # An alternative http URI if it differs from official mozilla URI. # Defaults to whatever MOZ_HTTP_URI was set to. -: ${MOZ_LANGPACK_HTTP_URI:=${MOZ_HTTP_URI}} +: "${MOZ_LANGPACK_HTTP_URI:=${MOZ_HTTP_URI}}" # @ECLASS_VARIABLE: MOZ_LANGPACK_PREFIX # @DESCRIPTION: # The relative path till the lang code in the langpack file URI. # Defaults to ${MOZ_PV}/linux-i686/xpi/ -: ${MOZ_LANGPACK_PREFIX:="${MOZ_PV}/linux-i686/xpi/"} +: "${MOZ_LANGPACK_PREFIX:="${MOZ_PV}/linux-i686/xpi/"}" # @ECLASS_VARIABLE: MOZ_LANGPACK_SUFFIX # @DESCRIPTION: # The suffix after the lang code in the langpack file URI. # Defaults to '.xpi' -: ${MOZ_LANGPACK_SUFFIX:=".xpi"} +: "${MOZ_LANGPACK_SUFFIX:=".xpi"}" # @ECLASS_VARIABLE: MOZ_LANGPACK_UNOFFICIAL # @DESCRIPTION: @@ -92,7 +92,7 @@ inherit mozextension # unofficially by others (ie the Gentoo mozilla team). When # this var is set, the distfile will have a .unofficial.xpi # suffix. -: ${MOZ_LANGPACK_UNOFFICIAL:=""} +: "${MOZ_LANGPACK_UNOFFICIAL:=""}" # @ECLASS_VARIABLE: MOZ_GENERATE_LANGPACKS # @PRE_INHERIT @@ -103,13 +103,13 @@ inherit mozextension # being downloaded and installed from upstream pre-built # extensions. Primarily it supports pre-release builds. # Defaults to empty. -: ${MOZ_GENERATE_LANGPACKS:=""} +: "${MOZ_GENERATE_LANGPACKS:=""}" # @ECLASS_VARIABLE: MOZ_L10N_SOURCEDIR # @DESCRIPTION: # The path that l10n sources can be found at, once unpacked. # Defaults to ${WORKDIR}/l10n-sources -: ${MOZ_L10N_SOURCEDIR:="${WORKDIR}/l10n-sources"} +: "${MOZ_L10N_SOURCEDIR:="${WORKDIR}/l10n-sources"}" # @ECLASS_VARIABLE: MOZ_L10N_URI_PREFIX # @PRE_INHERIT @@ -120,21 +120,21 @@ inherit mozextension # SRC_URI when MOZ_GENERATE_LANGPACKS is set. If empty, nothing will # be added to SRC_URI. # Defaults to empty. -: ${MOZ_L10N_URI_PREFIX:=""} +: "${MOZ_L10N_URI_PREFIX:=""}" # @ECLASS_VARIABLE: MOZ_L10N_URI_SUFFIX # @DEFAULT_UNSET # @DESCRIPTION: # The suffix of l10n source distfiles. # Defaults to '.tar.xz' -: ${MOZ_L10N_URI_SUFFIX:=".tar.xz"} +: "${MOZ_L10N_URI_SUFFIX:=".tar.xz"}" # @ECLASS_VARIABLE: MOZ_FORCE_UPSTREAM_L10N # @DEFAULT_UNSET # @DESCRIPTION: # Set this to use upstream langpaks even if the package normally # shouldn't (ie it is an alpha or beta package) -: ${MOZ_FORCE_UPSTREAM_L10N:=""} +: "${MOZ_FORCE_UPSTREAM_L10N:=""}" # @ECLASS_VARIABLE: MOZ_TOO_REGIONALIZED_FOR_L10N # @INTERNAL @@ -146,7 +146,7 @@ MOZ_TOO_REGIONALIZED_FOR_L10N=( fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO nn-NO pa-IN # @DESCRIPTION: # Install langpacks as .xpi file instead of unpacked directory. # Leave unset to install unpacked -: ${MOZ_INSTALL_L10N_XPIFILE:=""} +: "${MOZ_INSTALL_L10N_XPIFILE:=""}" # Add l10n_* to IUSE according to available language packs # No language packs for alphas and betas diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass index e3c0d78a6e43..4a6e4160d5cb 100644 --- a/eclass/multilib.eclass +++ b/eclass/multilib.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: multilib.eclass @@ -47,7 +47,7 @@ has_multilib_profile() { # ex: # CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32 # -# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)" +# Note that the preferred method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)" # This will hopefully be added to portage soon... # # If <ABI> is not specified, ${ABI} is used. @@ -288,8 +288,8 @@ multilib_env() { # - https://bugs.gentoo.org/675954 # - https://gcc.gnu.org/PR90077 # - https://github.com/gentoo/musl/issues/245 - : ${MULTILIB_ABIS=default} - : ${DEFAULT_ABI=default} + : "${MULTILIB_ABIS=default}" + : "${DEFAULT_ABI=default}" export MULTILIB_ABIS DEFAULT_ABI return fi @@ -311,8 +311,8 @@ multilib_env() { export CTARGET_arm64=${CHOST_arm64} export LIBDIR_arm64="lib64" - : ${MULTILIB_ABIS=arm64} - : ${DEFAULT_ABI=arm64} + : "${MULTILIB_ABIS=arm64}" + : "${DEFAULT_ABI=arm64}" ;; x86_64*) export CFLAGS_x86=${CFLAGS_x86--m32} @@ -337,12 +337,12 @@ multilib_env() { case ${CTARGET} in *-gnux32) - : ${MULTILIB_ABIS=x32 amd64 x86} - : ${DEFAULT_ABI=x32} + : "${MULTILIB_ABIS=x32 amd64 x86}" + : "${DEFAULT_ABI=x32}" ;; *) - : ${MULTILIB_ABIS=amd64 x86} - : ${DEFAULT_ABI=amd64} + : "${MULTILIB_ABIS=amd64 x86}" + : "${DEFAULT_ABI=amd64}" ;; esac ;; @@ -352,8 +352,8 @@ multilib_env() { export CTARGET_lp64d=${CTARGET} export LIBDIR_lp64d=${LIBDIR_lp64d-lib64} - : ${MULTILIB_ABIS=lp64d} - : ${DEFAULT_ABI=lp64d} + : "${MULTILIB_ABIS=lp64d}" + : "${DEFAULT_ABI=lp64d}" ;; mips64*|mipsisa64*) export CFLAGS_o32=${CFLAGS_o32--mabi=32} @@ -372,8 +372,8 @@ multilib_env() { export CTARGET_n64=${CHOST_n64} export LIBDIR_n64="lib64" - : ${MULTILIB_ABIS=n64 n32 o32} - : ${DEFAULT_ABI=n32} + : "${MULTILIB_ABIS=n64 n32 o32}" + : "${DEFAULT_ABI=n32}" ;; powerpc64*) export CFLAGS_ppc=${CFLAGS_ppc--m32} @@ -386,12 +386,12 @@ multilib_env() { export CTARGET_ppc64=${CHOST_ppc64} export LIBDIR_ppc64="lib64" - : ${MULTILIB_ABIS=ppc64 ppc} - : ${DEFAULT_ABI=ppc64} + : "${MULTILIB_ABIS=ppc64 ppc}" + : "${DEFAULT_ABI=ppc64}" ;; riscv64*) - : ${MULTILIB_ABIS=lp64d lp64 ilp32d ilp32} - : ${DEFAULT_ABI=lp64d} + : "${MULTILIB_ABIS=lp64d lp64 ilp32d ilp32}" + : "${DEFAULT_ABI=lp64d}" # the default abi is set to the 1-level libdir default @@ -422,8 +422,8 @@ multilib_env() { export LIBDIR_ilp32=${LIBDIR_ilp32-lib32/ilp32} ;; riscv32*) - : ${MULTILIB_ABIS=ilp32d ilp32} - : ${DEFAULT_ABI=ilp32d} + : "${MULTILIB_ABIS=ilp32d ilp32}" + : "${DEFAULT_ABI=ilp32d}" # the default abi is set to the 1-level libdir default @@ -454,8 +454,8 @@ multilib_env() { export CTARGET_s390x=${CHOST_s390x} export LIBDIR_s390x="lib64" - : ${MULTILIB_ABIS=s390x s390} - : ${DEFAULT_ABI=s390x} + : "${MULTILIB_ABIS=s390x s390}" + : "${DEFAULT_ABI=s390x}" ;; sparc64*) export CFLAGS_sparc32=${CFLAGS_sparc32--m32} @@ -468,12 +468,12 @@ multilib_env() { export CTARGET_sparc64=${CHOST_sparc64} export LIBDIR_sparc64="lib64" - : ${MULTILIB_ABIS=sparc64 sparc32} - : ${DEFAULT_ABI=sparc64} + : "${MULTILIB_ABIS=sparc64 sparc32}" + : "${DEFAULT_ABI=sparc64}" ;; *) - : ${MULTILIB_ABIS=default} - : ${DEFAULT_ABI=default} + : "${MULTILIB_ABIS=default}" + : "${DEFAULT_ABI=default}" ;; esac diff --git a/eclass/ninja-utils.eclass b/eclass/ninja-utils.eclass index 4577e26fa57c..e6d8c9e6c0a9 100644 --- a/eclass/ninja-utils.eclass +++ b/eclass/ninja-utils.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: ninja-utils.eclass @@ -34,12 +34,12 @@ _NINJA_UTILS_ECLASS=1 # but other values can be set where NINJA_DEPEND will then be set # to a blank variable. # The default is set to "ninja". -: ${NINJA:=ninja} +: "${NINJA:=ninja}" # @ECLASS_VARIABLE: NINJA_DEPEND # @OUTPUT_VARIABLE # @DESCRIPTION: -# Contains a set of build-time depenendencies based on the NINJA setting. +# Contains a set of build-time dependencies based on the NINJA setting. # @ECLASS_VARIABLE: NINJAOPTS # @DEFAULT_UNSET diff --git a/eclass/office-ext-r1.eclass b/eclass/office-ext-r1.eclass index abc0cabaa310..7e4d894483fe 100644 --- a/eclass/office-ext-r1.eclass +++ b/eclass/office-ext-r1.eclass @@ -29,7 +29,7 @@ _OFFICE_EXT_R1_ECLASS=1 # OFFICE_REQ_USE="java,jemalloc(-)?" # @CODE if [[ ${OFFICE_REQ_USE} ]]; then - # Append the brackets for the depend bellow + # Append the brackets for the depend below OFFICE_REQ_USE="[${OFFICE_REQ_USE}]" fi @@ -68,7 +68,7 @@ fi # @CODE # OFFICE_EXTENSIONS_LOCATION="${S}/unpacked/" # @CODE -: ${OFFICE_EXTENSIONS_LOCATION:=${DISTDIR}} +: "${OFFICE_EXTENSIONS_LOCATION:=${DISTDIR}}" IUSE="" RDEPEND="" diff --git a/eclass/opam.eclass b/eclass/opam.eclass index 197c3256f015..49e3c426b062 100644 --- a/eclass/opam.eclass +++ b/eclass/opam.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: opam.eclass @@ -25,7 +25,7 @@ QA_FLAGS_IGNORED='.*' # @PRE_INHERIT # @DESCRIPTION: # Override dependency for OPAM_INSTALLER -: ${OPAM_INSTALLER_DEP:="dev-ml/opam-installer"} +: "${OPAM_INSTALLER_DEP:="dev-ml/opam-installer"}" RDEPEND=">=dev-lang/ocaml-4:=" BDEPEND="${OPAM_INSTALLER_DEP} dev-lang/ocaml" @@ -34,7 +34,7 @@ DEPEND="${RDEPEND}" # @ECLASS_VARIABLE: OPAM_INSTALLER # @DESCRIPTION: # Eclass can use different opam-installer binary than the one provided in by system. -: ${OPAM_INSTALLER:=opam-installer} +: "${OPAM_INSTALLER:=opam-installer}" # @FUNCTION: opam-install # @USAGE: <list of packages> diff --git a/eclass/pam.eclass b/eclass/pam.eclass index bfd165f9c1fe..22b59ad65e43 100644 --- a/eclass/pam.eclass +++ b/eclass/pam.eclass @@ -143,7 +143,7 @@ dopammod() { # Install pam module file <old name> as <new name> in the pam # modules' dir for current implementation newpammod() { - [[ $# -ne 2 ]] && die "newpammod requires two arguements" + [[ $# -ne 2 ]] && die "newpammod requires two arguments" if has pam ${IUSE} && ! use pam; then return 0; @@ -159,7 +159,7 @@ newpammod() { # This function creates a pamd file which mimics system-auth file # for the given levels in the /etc/pam.d directory. pamd_mimic_system() { - [[ $# -lt 2 ]] && die "pamd_mimic_system requires at least two argments" + [[ $# -lt 2 ]] && die "pamd_mimic_system requires at least two arguments" pamd_mimic system-auth "$@" } @@ -169,7 +169,7 @@ pamd_mimic_system() { # This function creates a pamd file which mimics the given stack # for the given levels in the /etc/pam.d directory. pamd_mimic() { - [[ $# -lt 3 ]] && die "pamd_mimic requires at least three argments" + [[ $# -lt 3 ]] && die "pamd_mimic requires at least three arguments" if has pam ${IUSE} && ! use pam; then return 0; diff --git a/eclass/php-ext-source-r3.eclass b/eclass/php-ext-source-r3.eclass index 7179ab756f6b..e463d3282e83 100644 --- a/eclass/php-ext-source-r3.eclass +++ b/eclass/php-ext-source-r3.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: php-ext-source-r3.eclass @@ -81,7 +81,7 @@ esac # @CODE # PHP_INI_NAME="40-foo" # @CODE -: ${PHP_INI_NAME:=${PHP_EXT_NAME}} +: "${PHP_INI_NAME:=${PHP_EXT_NAME}}" # @ECLASS_VARIABLE: PHP_EXT_NEEDED_USE # @PRE_INHERIT diff --git a/eclass/php-pear-r2.eclass b/eclass/php-pear-r2.eclass index 29bcf1e6fce8..9882c7dcc700 100644 --- a/eclass/php-pear-r2.eclass +++ b/eclass/php-pear-r2.eclass @@ -29,12 +29,12 @@ RDEPEND=">=dev-php/pear-1.8.1" # @DESCRIPTION: # Set this if the PEAR package name differs from ${PN/PEAR-/} # (generally shouldn't be the case). -: ${PHP_PEAR_PKG_NAME:=${PN/PEAR-/}} +: "${PHP_PEAR_PKG_NAME:=${PN/PEAR-/}}" # @ECLASS_VARIABLE: PEAR_PV # @DESCRIPTION: # Set in ebuild if the ${PV} breaks SRC_URI for alpha/beta/rc versions -: ${PEAR_PV:=${PV}} +: "${PEAR_PV:=${PV}}" # @ECLASS_VARIABLE: PEAR-P # @INTERNAL @@ -46,7 +46,7 @@ PEAR_P="${PHP_PEAR_PKG_NAME}-${PEAR_PV}" # @DESCRIPTION: # Set in ebuild to the domain name of the channel if not pear.php.net # When the domain is not pear.php.net, setting the SRC_URI is required -: ${PHP_PEAR_DOMAIN:=pear.php.net} +: "${PHP_PEAR_DOMAIN:=pear.php.net}" # @ECLASS_VARIABLE: PHP_PEAR_CHANNEL # @DEFAULT_UNSET @@ -60,7 +60,7 @@ if [[ "${PHP_PEAR_DOMAIN}" == "pear.php.net" ]] ; then SRC_URI="https://pear.php.net/get/${PEAR_P}.tgz" fi -: ${HOMEPAGE:=https://${PHP_PEAR_DOMAIN}/package/${PHP_PEAR_PKG_NAME}} +: "${HOMEPAGE:=https://${PHP_PEAR_DOMAIN}/package/${PHP_PEAR_PKG_NAME}}" S="${WORKDIR}/${PEAR_P}" diff --git a/eclass/plasma-mobile.kde.org.eclass b/eclass/plasma-mobile.kde.org.eclass index 1e2c5b6eb4fe..9fd54100d24e 100644 --- a/eclass/plasma-mobile.kde.org.eclass +++ b/eclass/plasma-mobile.kde.org.eclass @@ -29,7 +29,7 @@ _PLASMA_MOBILE_KDE_ORG_ECLASS=1 # @PRE_INHERIT # @DESCRIPTION: # For proper description see kde.org.eclass manpage. -: ${KDE_ORG_CATEGORY:=plasma-mobile} +: "${KDE_ORG_CATEGORY:=plasma-mobile}" inherit kde.org diff --git a/eclass/portability.eclass b/eclass/portability.eclass index f4137bc2c2ed..f31e3fee6ca3 100644 --- a/eclass/portability.eclass +++ b/eclass/portability.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: portability.eclass @@ -139,11 +139,11 @@ get_mounts() { fi # OK, pray we have a -p option that outputs mounts in fstab format - # using tabs as the seperator. + # using tabs as the separator. # Then pray that there are no tabs in the either. # Currently only FreeBSD supports this and the other BSDs will # have to be patched. - # Athough the BSD's may support /proc, they do NOT put \040 in place + # Although the BSDs may support /proc, they do NOT put \040 in place # of the spaces and we should not force a /proc either. local IFS=$'\t' LC_ALL=C mount -p | while read node point fs foo ; do diff --git a/eclass/pypi.eclass b/eclass/pypi.eclass index 53505de8e67e..13dd56fa4fec 100644 --- a/eclass/pypi.eclass +++ b/eclass/pypi.eclass @@ -53,7 +53,7 @@ _PYPI_ECLASS=1 # @ECLASS_VARIABLE: PYPI_PN # @PRE_INHERIT # @DESCRIPTION: -# The PyPI project name. This should be overriden scarcely, generally +# The PyPI project name. This should be overridden scarcely, generally # when upstream project name does not conform to Gentoo naming rules, # e.g. when it contains dots or uppercase letters. # @@ -61,7 +61,7 @@ _PYPI_ECLASS=1 # @CODE # PYPI_PN=${PN/-/.} # @CODE -: ${PYPI_PN:=${PN}} +: "${PYPI_PN:=${PN}}" # @FUNCTION: pypi_normalize_name # @USAGE: <name> diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass index 149bfa0c25f3..d527eb5f79d5 100644 --- a/eclass/qmail.eclass +++ b/eclass/qmail.eclass @@ -32,7 +32,7 @@ QMAIL_SPP_S="${WORKDIR}"/qmail-spp-${QMAIL_SPP_PV} # @FUNCTION: is_prime # @USAGE: <number> # @DESCRIPTION: -# Checks wether a number is a valid prime number for queue split +# Checks whether a number is a valid prime number for queue split is_prime() { local number=${1} i diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index ae74c2e0540b..25499b0c2e07 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -51,7 +51,7 @@ readonly QT5_BUILD_TYPE # @DESCRIPTION: # The upstream name of the module this package belongs to. Used for # SRC_URI and EGIT_REPO_URI. Must be set before inheriting the eclass. -: ${QT5_MODULE:=${PN}} +: "${QT5_MODULE:=${PN}}" # @ECLASS_VARIABLE: QT5_PV # @DESCRIPTION: @@ -100,7 +100,7 @@ readonly QT5_PV # For proper description see virtualx.eclass man page. # Here we redefine default value to be manual, if your package needs virtualx # for tests you should proceed with setting VIRTUALX_REQUIRED=test. -: ${VIRTUALX_REQUIRED:=manual} +: "${VIRTUALX_REQUIRED:=manual}" inherit estack flag-o-matic toolchain-funcs virtualx @@ -140,7 +140,7 @@ fi # @OUTPUT_VARIABLE # @DESCRIPTION: # Build directory for out-of-source builds. -: ${QT5_BUILD_DIR:=${S}_build} +: "${QT5_BUILD_DIR:=${S}_build}" LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3" diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass index 79c06f341ede..91f076ad1948 100644 --- a/eclass/qt6-build.eclass +++ b/eclass/qt6-build.eclass @@ -26,14 +26,14 @@ _QT6_BUILD_ECLASS=1 # @DESCRIPTION: # The upstream name of the module this package belongs to. Used for # SRC_URI and EGIT_REPO_URI. Must be set before inheriting the eclass. -: ${QT6_MODULE:=${PN}} +: "${QT6_MODULE:=${PN}}" # @ECLASS_VARIABLE: VIRTUALX_REQUIRED # @DESCRIPTION: # For proper description see virtualx.eclass man page. # Here we redefine default value to be manual, if your package needs virtualx # for tests you should proceed with setting VIRTUALX_REQUIRED=test. -: ${VIRTUALX_REQUIRED:=manual} +: "${VIRTUALX_REQUIRED:=manual}" inherit cmake virtualx @@ -82,7 +82,7 @@ EGIT_REPO_URI=( # @OUTPUT_VARIABLE # @DESCRIPTION: # Build directory for out-of-source builds. -: ${QT6_BUILD_DIR:=${S}_build} +: "${QT6_BUILD_DIR:=${S}_build}" IUSE="debug test" @@ -142,9 +142,9 @@ qt_feature() { # @DESCRIPTION: # Symlink a given binary from QT6_BINDIR to QT6_PREFIX/bin, with optional suffix qt6_symlink_binary_to_path() { - [[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument" + [[ $# -ge 1 ]] || die "${FUNCNAME}() requires at least one argument" - dosym -r "${QT6_BINDIR}"/${1} /usr/bin/${1}${2} + dosym -r "${QT6_BINDIR}"/${1} /usr/bin/${1}${2} } ###### Internal functions ###### diff --git a/eclass/readme.gentoo-r1.eclass b/eclass/readme.gentoo-r1.eclass index baf4b57bef76..202ba31f4f70 100644 --- a/eclass/readme.gentoo-r1.eclass +++ b/eclass/readme.gentoo-r1.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: readme.gentoo-r1.eclass @@ -45,7 +45,7 @@ esac # @ECLASS_VARIABLE: README_GENTOO_SUFFIX # @DESCRIPTION: # If you want to specify a suffix for README.gentoo file please export it. -: ${README_GENTOO_SUFFIX:=""} +: "${README_GENTOO_SUFFIX:=""}" # @FUNCTION: readme.gentoo_create_doc # @DESCRIPTION: diff --git a/eclass/rebar.eclass b/eclass/rebar.eclass index 4c4c90fbcc11..c1a3aca67b54 100644 --- a/eclass/rebar.eclass +++ b/eclass/rebar.eclass @@ -13,7 +13,7 @@ # dev-util/rebar. # # rebar is a tool which tries to resolve dependencies itself which is by -# cloning remote git repositories. Dependant projects are usually expected to +# cloning remote git repositories. Dependent projects are usually expected to # be in sub-directory 'deps' rather than looking at system Erlang lib # directory. Projects relying on rebar usually don't have 'install' make # targets. The eclass workarounds some of these problems. It handles @@ -111,7 +111,7 @@ erebar() { # @FUNCTION: rebar_fix_include_path # @USAGE: <project_name> [<rebar_config>] # @DESCRIPTION: -# Fix path in rebar.config to 'include' directory of dependant project/package, +# Fix path in rebar.config to 'include' directory of dependent project/package, # so it points to installation in system Erlang lib rather than relative 'deps' # directory. # diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass index 9ef5e1f098d1..b3262dc5cdb4 100644 --- a/eclass/ruby-fakegem.eclass +++ b/eclass/ruby-fakegem.eclass @@ -44,6 +44,7 @@ RUBY_FAKEGEM_TASK_DOC="${RUBY_FAKEGEM_TASK_DOC-rdoc}" # - rspec3 (calls ruby-ng_rspec, adds dev-ruby/rspec:3 to the dependencies) # - cucumber (calls ruby-ng_cucumber, adds dev-util/cucumber to the # dependencies) +# - sus (calls ruby-ng_sus, adds dev-ruby/sus to the dependencies) # - none RUBY_FAKEGEM_RECIPE_TEST="${RUBY_FAKEGEM_RECIPE_TEST-rake}" @@ -193,7 +194,15 @@ case ${RUBY_FAKEGEM_RECIPE_TEST} in RESTRICT+=" !test? ( test )" ruby_add_bdepend "test? ( dev-util/cucumber )" ;; + sus) + IUSE+=" test" + RESTRICT+=" !test? ( test )" + ruby_add_bdepend "test? ( dev-ruby/sus )" + ;; + none) + ;; *) + eqawarn "Unknown test recipe '${RUBY_FAKEGEM_RECIPE_TEST}' specified, using 'none'" RUBY_FAKEGEM_RECIPE_TEST="none" ;; esac @@ -448,7 +457,7 @@ each_ruby_configure() { # @FUNCTION: all_fakegem_compile # @DESCRIPTION: # Build documentation for the package if indicated by the doc USE flag -# and if there is a documetation task defined. +# and if there is a documentation task defined. all_fakegem_compile() { debug-print-function ${FUNCNAME} "${@}" @@ -563,6 +572,9 @@ each_fakegem_test() { cucumber) ruby-ng_cucumber ;; + sus) + ruby-ng_sus + ;; none) ewarn "each_fakegem_test called, but \${RUBY_FAKEGEM_RECIPE_TEST} is 'none'" ;; diff --git a/eclass/ruby-ng-gnome2.eclass b/eclass/ruby-ng-gnome2.eclass index 7abf84f6034b..e6636811aacc 100644 --- a/eclass/ruby-ng-gnome2.eclass +++ b/eclass/ruby-ng-gnome2.eclass @@ -30,7 +30,7 @@ RUBY_FAKEGEM_TASK_DOC="" # @DESCRIPTION: # If set to 'yes', the test is run with virtx. Set before inheriting this # eclass. -: ${RUBY_GNOME2_NEED_VIRTX:="no"} +: "${RUBY_GNOME2_NEED_VIRTX:="no"}" inherit ruby-fakegem if [[ ${RUBY_GNOME2_NEED_VIRTX} == yes ]]; then diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass index f85a933f81d9..c273a431c5b1 100644 --- a/eclass/ruby-ng.eclass +++ b/eclass/ruby-ng.eclass @@ -757,6 +757,31 @@ ruby-ng_cucumber() { CUCUMBER_PUBLISH_QUIET=true ${RUBY} -S cucumber ${cucumber_params} "$@" || die -n "cucumber failed" } +# @FUNCTION: ruby-ng_sus +# @DESCRIPTION: +# This is simply a wrapper around the sus-parallel command (executed by $RUBY}) +# which also respects TEST_VERBOSE and NOCOLOR environment variables. +ruby-ng_sus() { + debug-print-function ${FUNCNAME} "${@}" + + if [[ "${DEPEND}${BDEPEND}" != *"dev-ruby/sus"* ]]; then + ewarn "Missing test dependency dev-ruby/sus" + fi + + local sus_params= + + # sus has a --verbose argument but it does not seem to impact the output (yet?) + case ${TEST_VERBOSE} in + 1|yes|true) + sus_params+=" --verbose" + ;; + *) + ;; + esac + + ${RUBY} -S sus-parallel ${sus_params} "$@" || die -n "sus failed" +} + # @FUNCTION: ruby-ng_testrb-2 # @DESCRIPTION: # This is simply a replacement for the testrb command that load the test diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass index 0bbdf46df1f4..df48d3fae264 100644 --- a/eclass/rust-toolchain.eclass +++ b/eclass/rust-toolchain.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: rust-toolchain.eclass @@ -23,7 +23,7 @@ inherit multilib-build # This variable specifies the base URL used by the # rust_arch_uri and rust_all_arch_uris functions when # generating the URI output list. -: ${RUST_TOOLCHAIN_BASEURL:=https://static.rust-lang.org/dist/} +: "${RUST_TOOLCHAIN_BASEURL:=https://static.rust-lang.org/dist/}" # @FUNCTION: rust_abi # @USAGE: [CHOST-value] diff --git a/eclass/selinux-policy-2.eclass b/eclass/selinux-policy-2.eclass index 84e95678a67b..ad760673cab1 100644 --- a/eclass/selinux-policy-2.eclass +++ b/eclass/selinux-policy-2.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 for installing SELinux policy, and optionally @@ -30,21 +30,21 @@ _SELINUX_POLICY_2_ECLASS=1 # @DESCRIPTION: # This variable contains the (upstream) module name for the SELinux module. # This name is only the module name, not the category! -: ${MODS:="_illegal"} +: "${MODS:="_illegal"}" # @ECLASS_VARIABLE: BASEPOL # @DESCRIPTION: # This variable contains the version string of the selinux-base-policy package # that this module build depends on. It is used to patch with the appropriate # patch bundle(s) that are part of selinux-base-policy. -: ${BASEPOL:=${PVR}} +: "${BASEPOL:=${PVR}}" # @ECLASS_VARIABLE: POLICY_PATCH # @DESCRIPTION: # This variable contains the additional patch(es) that need to be applied on top # of the patchset already contained within the BASEPOL variable. The variable # can be both a simple string (space-separated) or a bash array. -: ${POLICY_PATCH:=""} +: "${POLICY_PATCH:=""}" # @ECLASS_VARIABLE: POLICY_FILES # @DESCRIPTION: @@ -53,7 +53,7 @@ _SELINUX_POLICY_2_ECLASS=1 # Generally, users would want to include at least a .te and .fc file, but .if # files are supported as well. The variable can be both a simple string # (space-separated) or a bash array. -: ${POLICY_FILES:=""} +: "${POLICY_FILES:=""}" # @ECLASS_VARIABLE: POLICY_TYPES # @DESCRIPTION: @@ -62,7 +62,7 @@ _SELINUX_POLICY_2_ECLASS=1 # This variable is the same POLICY_TYPES variable that we tell SELinux # users to set in make.conf. Therefore, it is not the module that should # override it, but the user. -: ${POLICY_TYPES:="targeted strict mcs mls"} +: "${POLICY_TYPES:="targeted strict mcs mls"}" # @ECLASS_VARIABLE: SELINUX_GIT_REPO # @DESCRIPTION: @@ -71,7 +71,7 @@ _SELINUX_POLICY_2_ECLASS=1 # using a single variable, rather than having to set the packagename_LIVE_REPO # variable for each and every SELinux policy module package they want to install. # The default value is Gentoo's hardened-refpolicy repository. -: ${SELINUX_GIT_REPO:="https://anongit.gentoo.org/git/proj/hardened-refpolicy.git"}; +: "${SELINUX_GIT_REPO:="https://anongit.gentoo.org/git/proj/hardened-refpolicy.git"}" # @ECLASS_VARIABLE: SELINUX_GIT_BRANCH # @DESCRIPTION: @@ -80,7 +80,7 @@ _SELINUX_POLICY_2_ECLASS=1 # SELinux policy packages, rather than having to override them one by one with the # packagename_LIVE_BRANCH variable. # The default value is the 'master' branch. -: ${SELINUX_GIT_BRANCH:="master"}; +: "${SELINUX_GIT_BRANCH:="master"}" case ${BASEPOL} in 9999) inherit git-r3 @@ -166,7 +166,7 @@ selinux-policy-2_src_prepare() { # Copy additional files to the 3rd_party/ location if [[ "$(declare -p POLICY_FILES 2>/dev/null 2>&1)" == "declare -a"* ]] || [[ -n ${POLICY_FILES} ]]; then - add_interfaces=1; + add_interfaces=1; cd "${S}/refpolicy/policy/modules" for POLFILE in ${POLICY_FILES[@]}; do @@ -174,7 +174,7 @@ selinux-policy-2_src_prepare() { done fi - # Apply the additional patches refered to by the module ebuild. + # Apply the additional patches referred to by the module ebuild. # But first some magic to differentiate between bash arrays and strings if [[ "$(declare -p POLICY_PATCH 2>/dev/null 2>&1)" == "declare -a"* ]]; then [[ -n ${POLICY_PATCH[*]} ]] && eapply -d "${S}/refpolicy/policy/modules" -- "${POLICY_PATCH[@]}" @@ -303,7 +303,7 @@ selinux-policy-2_pkg_postinst() { ewarn "If it is the last SELinux module package being installed however," ewarn "then it is advised to look at the error above and take appropriate" ewarn "action since the new SELinux policies are not loaded until the" - ewarn "command finished succesfully." + ewarn "command finished successfully." ewarn "" ewarn "To reload, run the following command from within /usr/share/selinux/${i}:" ewarn " semodule ${COMMAND_base} -i \$(ls *.pp | grep -v base.pp)" @@ -311,10 +311,10 @@ selinux-policy-2_pkg_postinst() { ewarn " semodule ${COMMAND_base} -i \$(ls *.pp | grep -v base.pp | grep -v unconfined.pp)" ewarn "depending on if you need the unconfined domain loaded as well or not." else - einfo "SELinux modules reloaded succesfully." + einfo "SELinux modules reloaded successfully." fi else - einfo "SELinux modules loaded succesfully." + einfo "SELinux modules loaded successfully." fi COMMAND=""; done @@ -360,7 +360,7 @@ selinux-policy-2_pkg_postrm() { if [[ $? -ne 0 ]]; then ewarn "SELinux module unload failed."; else - einfo "SELinux modules unloaded succesfully." + einfo "SELinux modules unloaded successfully." fi done fi diff --git a/eclass/ssl-cert.eclass b/eclass/ssl-cert.eclass index 83fbcf6143d1..0453f0fbf665 100644 --- a/eclass/ssl-cert.eclass +++ b/eclass/ssl-cert.eclass @@ -26,19 +26,19 @@ _SSL_CERT_ECLASS=1 # @PRE_INHERIT # @DESCRIPTION: # Set to non zero if ssl-cert is mandatory for ebuild. -: ${SSL_CERT_MANDATORY:=0} +: "${SSL_CERT_MANDATORY:=0}" # @ECLASS_VARIABLE: SSL_CERT_USE # @PRE_INHERIT # @DESCRIPTION: # Use flag to append dependency to. -: ${SSL_CERT_USE:=ssl} +: "${SSL_CERT_USE:=ssl}" # @ECLASS_VARIABLE: SSL_DEPS_SKIP # @PRE_INHERIT # @DESCRIPTION: # Set to non zero to skip adding to DEPEND and IUSE. -: ${SSL_DEPS_SKIP:=0} +: "${SSL_DEPS_SKIP:=0}" if [[ "${SSL_DEPS_SKIP}" == "0" ]]; then if [[ "${SSL_CERT_MANDATORY}" == "0" ]]; then diff --git a/eclass/stardict.eclass b/eclass/stardict.eclass index 1ca6d10d6d78..080c01f92470 100644 --- a/eclass/stardict.eclass +++ b/eclass/stardict.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: stardict.eclass @@ -33,16 +33,16 @@ RESTRICT="strip" # @DEFAULT_UNSET # @DESCRIPTION: # Suffix used for dictionaries. -: ${DICT_SUFFIX:=${PN#stardict-[[:lower:]]*-}} +: "${DICT_SUFFIX:=${PN#stardict-[[:lower:]]*-}}" # @ECLASS_VARIABLE: DICT_P # @PRE_INHERIT # @DEFAULT_UNSET # @DESCRIPTION: # The filestem used for downloading dictionaries from SourceForge. -: ${DICT_P:=stardict-${DICT_PREFIX}${DICT_SUFFIX}-${PV}} +: "${DICT_P:=stardict-${DICT_PREFIX}${DICT_SUFFIX}-${PV}}" -: ${DESCRIPTION:="Another Stardict Dictionary"} +: "${DESCRIPTION:="Another Stardict Dictionary"}" if [[ -n ${FROM_LANG} && -n ${TO_LANG} ]]; then DESCRIPTION="Stardict Dictionary ${FROM_LANG} to ${TO_LANG}" fi diff --git a/eclass/subversion.eclass b/eclass/subversion.eclass index 48ee15105adc..7a787a438ad0 100644 --- a/eclass/subversion.eclass +++ b/eclass/subversion.eclass @@ -145,7 +145,7 @@ ESVN_UMASK="${ESVN_UMASK:-${EVCS_UMASK}}" # @DESCRIPTION: # Set the minimum number of hours between svn up'ing in any given svn module. This is particularly # useful for split KDE ebuilds where we want to ensure that all submodules are compiled for the same -# revision. It should also be kept user overrideable. +# revision. It should also be kept user overridable. ESVN_UP_FREQ="${ESVN_UP_FREQ:=}" # @ECLASS_VARIABLE: ESCM_LOGDIR diff --git a/eclass/texlive-module.eclass b/eclass/texlive-module.eclass index 0c8a7c756517..fea4003c37a8 100644 --- a/eclass/texlive-module.eclass +++ b/eclass/texlive-module.eclass @@ -56,7 +56,7 @@ # @DEFAULT_UNSET # @DESCRIPTION: # A space separated list of links to add for BINSCRIPTS. -# The systax is: foo:bar to create a symlink bar -> foo. +# The syntax is: foo:bar to create a symlink bar -> foo. # @ECLASS_VARIABLE: TL_PV # @INTERNAL @@ -321,7 +321,7 @@ texlive-module_src_compile() { BuildLanguageDat) einfo "Language file $parameter already generated.";; *) - die "No rule to proccess ${command}. Please file a bug." + die "No rule to process ${command}. Please file a bug." esac done diff --git a/eclass/toolchain-autoconf.eclass b/eclass/toolchain-autoconf.eclass index 2ba27638468e..ed8d5ff1412a 100644 --- a/eclass/toolchain-autoconf.eclass +++ b/eclass/toolchain-autoconf.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: toolchain-autoconf.eclass @@ -18,6 +18,20 @@ esac if [[ -z ${_TOOLCHAIN_AUTOCONF_ECLASS} ]]; then _TOOLCHAIN_AUTOCONF_ECLASS=1 +# @ECLASS_VARIABLE: TC_AUTOCONF_BREAK_INFOS +# @DESCRIPTION: +# Enables slotting logic on the installed info pages. This includes +# mangling the pages in order to include a version number. Empty by +# default, and only exists for old ebuild revisions to use. Do not set +# in new ebuilds. Set to a non-empty value to enable. +# @DEPRECATED: none +: "${TC_AUTOCONF_BREAK_INFOS:=}" + +# @ECLASS_VARIABLE: TC_AUTOCONF_INFOPATH +# @DESCRIPTION: +# Where to install info files if not slotting. +TC_AUTOCONF_INFOPATH="${EPREFIX}/usr/share/autoconf-${PV}/info" + toolchain-autoconf_src_prepare() { find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} + || die default @@ -26,7 +40,15 @@ toolchain-autoconf_src_prepare() { toolchain-autoconf_src_configure() { # Disable Emacs in the build system since it is in a separate package. export EMACS=no - econf --program-suffix="-${PV}" || die + local myconf=( + --program-suffix="-${PV}" + ) + if [[ -z "${TC_AUTOCONF_BREAK_INFOS}" && "${SLOT}" != 0 ]]; then + myconf+=( + --infodir="${TC_AUTOCONF_INFOPATH}" + ) + fi + econf "${myconf[@]}" || die # econf updates config.{sub,guess} which forces the manpages # to be regenerated which we dont want to do #146621 touch man/*.1 @@ -65,7 +87,25 @@ slot_info_pages() { toolchain-autoconf_src_install() { default - slot_info_pages + if [[ -n "${TC_AUTOCONF_BREAK_INFOS}" ]]; then + slot_info_pages + else + rm -f dir || die + + local major="$(ver_cut 1)" + local minor="$(ver_cut 2)" + local idx="$((99999-(major*1000+minor)))" + newenvd - "06autoconf${idx}" <<-EOF + INFOPATH="${TC_AUTOCONF_INFOPATH}" + EOF + + pushd "${D}/${TC_AUTOCONF_INFOPATH}" >/dev/null || die + for f in *.info*; do + # Install convenience aliases for versioned Autoconf pages. + ln -s "$f" "${f/./-${PV}.}" || die + done + popd >/dev/null || die + fi } fi diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass index 805a3b0dfe61..63db0cfa5e0e 100644 --- a/eclass/toolchain-funcs.eclass +++ b/eclass/toolchain-funcs.eclass @@ -355,16 +355,16 @@ tc-export_build_env() { # Some build envs will initialize vars like: # : ${BUILD_LDFLAGS:-${LDFLAGS}} # So make sure all variables are non-empty. #526734 - : ${BUILD_CFLAGS:=-O1 -pipe} - : ${BUILD_CXXFLAGS:=-O1 -pipe} - : ${BUILD_CPPFLAGS:= } - : ${BUILD_LDFLAGS:= } + : "${BUILD_CFLAGS:=-O1 -pipe}" + : "${BUILD_CXXFLAGS:=-O1 -pipe}" + : "${BUILD_CPPFLAGS:= }" + : "${BUILD_LDFLAGS:= }" else # https://bugs.gentoo.org/654424 - : ${BUILD_CFLAGS:=${CFLAGS}} - : ${BUILD_CXXFLAGS:=${CXXFLAGS}} - : ${BUILD_CPPFLAGS:=${CPPFLAGS}} - : ${BUILD_LDFLAGS:=${LDFLAGS}} + : "${BUILD_CFLAGS:=${CFLAGS}}" + : "${BUILD_CXXFLAGS:=${CXXFLAGS}}" + : "${BUILD_CPPFLAGS:=${CPPFLAGS}}" + : "${BUILD_LDFLAGS:=${LDFLAGS}}" fi export BUILD_{C,CXX,CPP,LD}FLAGS @@ -654,7 +654,7 @@ tc-has-tls() { -l) ;; -*) die "Usage: tc-has-tls [-c|-l] [toolchain prefix]";; esac - : ${flags:=-fPIC -shared -Wl,-z,defs} + : "${flags:=-fPIC -shared -Wl,-z,defs}" [[ $1 == -* ]] && shift $(tc-getCC "$@") ${flags} "${base}.c" -o "${base}" >&/dev/null local ret=$? diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 81f2f7328fe4..6a04366bcc1e 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -53,9 +53,9 @@ if [[ ${CTARGET} = ${CHOST} ]] ; then export CTARGET=${CATEGORY#cross-} fi fi -: ${TARGET_ABI:=${ABI}} -: ${TARGET_MULTILIB_ABIS:=${MULTILIB_ABIS}} -: ${TARGET_DEFAULT_ABI:=${DEFAULT_ABI}} +: "${TARGET_ABI:=${ABI}}" +: "${TARGET_MULTILIB_ABIS:=${MULTILIB_ABIS}}" +: "${TARGET_DEFAULT_ABI:=${DEFAULT_ABI}}" is_crosscompile() { [[ ${CHOST} != ${CTARGET} ]] @@ -400,17 +400,17 @@ PDEPEND=">=sys-devel/gcc-config-2.3" # Used to override compression used for for patchsets. # Default is xz for EAPI 8+ and bz2 for older EAPIs. if [[ ${EAPI} == 8 ]] ; then - : ${TOOLCHAIN_PATCH_SUFFIX:=xz} + : "${TOOLCHAIN_PATCH_SUFFIX:=xz}" else # Older EAPIs - : ${TOOLCHAIN_PATCH_SUFFIX:=bz2} + : "${TOOLCHAIN_PATCH_SUFFIX:=bz2}" fi # @ECLASS_VARIABLE: TOOLCHAIN_SET_S # @DESCRIPTION: # Used to override value of S for snapshots and such. Mainly useful # if needing to set GCC_TARBALL_SRC_URI. -: ${TOOLCHAIN_SET_S:=yes} +: "${TOOLCHAIN_SET_S:=yes}" # Set the source directory depending on whether we're using # a live git tree, snapshot, or release tarball. @@ -1311,7 +1311,7 @@ toolchain_src_configure() { [[ ${arm_arch} == armv7? ]] && arm_arch=${arm_arch/7/7-} # See if this is a valid --with-arch flag if (srcdir=${S}/gcc target=${CTARGET} with_arch=${arm_arch}; - . "${srcdir}"/config.gcc) &>/dev/null + . "${srcdir}"/config.gcc) &>/dev/null then confgcc+=( --with-arch=${arm_arch} ) fi @@ -1349,7 +1349,7 @@ toolchain_src_configure() { ;; amd64) - # drop the older/ABI checks once this get's merged into some + # drop the older/ABI checks once this gets merged into some # version of gcc upstream if tc_version_is_at_least 4.8 && has x32 $(get_all_abis TARGET) ; then confgcc+=( --with-abi=$(gcc-abi-map ${TARGET_DEFAULT_ABI}) ) @@ -1964,7 +1964,7 @@ gcc_do_make() { LIBPATH="${LIBPATH}" \ BOOT_CFLAGS="${BOOT_CFLAGS}" popd > /dev/null || die - fi + fi einfo "Compiling ${PN} (${GCC_MAKE_TARGET})..." @@ -2419,7 +2419,7 @@ create_gcc_env_entry() { local gcc_envd_file="${ED}${gcc_envd_base}" if [[ -z $1 ]] ; then # I'm leaving the following commented out to remind me that it - # was an insanely -bad- idea. Stuff broke. GCC_SPECS isnt unset + # was an insanely -bad- idea. Stuff broke. GCC_SPECS isn't unset # on chroot or in non-toolchain.eclass gcc ebuilds! #gcc_specs_file="${LIBPATH}/specs" gcc_specs_file="" @@ -2593,14 +2593,14 @@ do_gcc_config() { ewarn "The currently selected specs-specific gcc config," ewarn "${current_specs}, doesn't exist anymore. This is usually" ewarn "due to enabling/disabling hardened or switching to a version" - ewarn "of gcc that doesnt create multiple specs files. The default" + ewarn "of gcc that doesn't create multiple specs files. The default" ewarn "config will be used, and the previous preference forgotten." use_specs="" fi target="${CTARGET}-${GCC_CONFIG_VER}${use_specs}" else - # The curent target is invalid. Attempt to switch to a valid one. + # The current target is invalid. Attempt to switch to a valid one. # Blindly pick the latest version. bug #529608 # TODO: Should update gcc-config to accept `-l ${CTARGET}` rather than # doing a partial grep like this. @@ -2653,7 +2653,7 @@ should_we_gcc_config() { #---->> support and misc functions <<---- # This is to make sure we don't accidentally try to enable support for a -# language that doesnt exist. GCC 3.4 supports f77, while 4.0 supports f95, etc. +# language that doesn't exist. GCC 3.4 supports f77, while 4.0 supports f95, etc. # # Also add a hook so special ebuilds (kgcc64) can control which languages # exactly get enabled diff --git a/eclass/unpacker.eclass b/eclass/unpacker.eclass index 2a0dcf45d76a..650de4bd3f75 100644 --- a/eclass/unpacker.eclass +++ b/eclass/unpacker.eclass @@ -137,7 +137,7 @@ unpack_pdv() { istar=0 fi - #for some reason gzip dies with this ... dd cant provide buffer fast enough ? + # For some reason gzip dies with this ... dd can't provide buffer fast enough ? #dd if=${src} ibs=${metaskip} count=1 \ # | dd ibs=${tailskip} skip=1 \ # | gzip -dc \ @@ -239,7 +239,7 @@ unpack_makeself() { case ${exe} in tail) exe=( tail -n +${skip} "${src}" );; dd) exe=( dd ibs=${skip} skip=1 if="${src}" );; - *) die "makeself cant handle exe '${exe}'" + *) die "makeself can't handle exe '${exe}'" esac # lets grab the first few bytes of the file to figure out what kind of archive it is @@ -421,7 +421,7 @@ _unpacker_get_decompressor() { type -P lbzip2 || type -P pbzip2 || type -P bzip2 )} local bzuncmd=${PORTAGE_BUNZIP2_COMMAND:-${bzcmd} -d} - : ${UNPACKER_BZ2:=${bzuncmd}} + : "${UNPACKER_BZ2:=${bzuncmd}}" echo "${UNPACKER_BZ2} -c" ;; *.z|*.gz|*.tgz) @@ -444,7 +444,7 @@ _unpacker_get_decompressor() { done } - : ${UNPACKER_LZIP:=$(find_lz_unpacker)} + : "${UNPACKER_LZIP:=$(find_lz_unpacker)}" echo "${UNPACKER_LZIP} -dc" ;; *.zst) echo "zstd -dc" ;; diff --git a/eclass/vala.eclass b/eclass/vala.eclass index 20bf00ebd8bc..11f8e52f92dd 100644 --- a/eclass/vala.eclass +++ b/eclass/vala.eclass @@ -167,7 +167,7 @@ vala_setup() { fi done done - : ${PKG_CONFIG_PATH:="${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig"} + : "${PKG_CONFIG_PATH:="${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig"}" export PKG_CONFIG_PATH="${T}/pkgconfig:${PKG_CONFIG_PATH}" } diff --git a/eclass/vdr-plugin-2.eclass b/eclass/vdr-plugin-2.eclass index a56b1d41c882..25df4f124434 100644 --- a/eclass/vdr-plugin-2.eclass +++ b/eclass/vdr-plugin-2.eclass @@ -403,7 +403,7 @@ vdr-plugin-2_pkg_setup() { VDR_RC_DIR="/usr/share/vdr/rcscript" - # Pathes to includes + # Paths to includes VDR_INCLUDE_DIR="/usr/include/vdr" DVB_INCLUDE_DIR="/usr/include" diff --git a/eclass/verify-sig.eclass b/eclass/verify-sig.eclass index 5e757cdd6038..6472e995e827 100644 --- a/eclass/verify-sig.eclass +++ b/eclass/verify-sig.eclass @@ -57,7 +57,7 @@ IUSE="verify-sig" # # - openpgp -- verify PGP signatures using app-crypt/gnupg (the default) # - signify -- verify signatures with Ed25519 public key using app-crypt/signify -: ${VERIFY_SIG_METHOD:=openpgp} +: "${VERIFY_SIG_METHOD:=openpgp}" case ${VERIFY_SIG_METHOD} in openpgp) @@ -102,7 +102,7 @@ esac # connection. # # Supported for OpenPGP only. -: ${VERIFY_SIG_OPENPGP_KEY_REFRESH:=no} +: "${VERIFY_SIG_OPENPGP_KEY_REFRESH:=no}" # @FUNCTION: verify-sig_verify_detached # @USAGE: <file> <sig-file> [<key-file>] diff --git a/eclass/vim-plugin.eclass b/eclass/vim-plugin.eclass index 81e1e54f638d..ee4f1b6e0f81 100644 --- a/eclass/vim-plugin.eclass +++ b/eclass/vim-plugin.eclass @@ -27,7 +27,7 @@ inherit vim-doc # @ECLASS_VARIABLE: VIM_PLUGIN_VIM_VERSION # @DESCRIPTION: # Minimum Vim version the plugin supports. -: ${VIM_PLUGIN_VIM_VERSION:=7.3} +: "${VIM_PLUGIN_VIM_VERSION:=7.3}" DEPEND="|| ( >=app-editors/vim-${VIM_PLUGIN_VIM_VERSION} >=app-editors/gvim-${VIM_PLUGIN_VIM_VERSION} )" diff --git a/eclass/vim-spell.eclass b/eclass/vim-spell.eclass index 38db4ccda13f..1a241d2ba0d1 100644 --- a/eclass/vim-spell.eclass +++ b/eclass/vim-spell.eclass @@ -79,30 +79,30 @@ SLOT="0" # This variable defines the language for the spell package being # installed. # The default value is "English". -: ${VIM_SPELL_LANGUAGE:="English"} +: "${VIM_SPELL_LANGUAGE:="English"}" # @ECLASS_VARIABLE: VIM_SPELL_LOCALE # @INTERNAL # @DESCRIPTION: # This variable defines the locale for the current ebuild. # The default value is ${PN} stripped of the "vim-spell-" string. -: ${VIM_SPELL_LOCALE:="${PN/vim-spell-/}"} +: "${VIM_SPELL_LOCALE:="${PN/vim-spell-/}"}" # @ECLASS_VARIABLE: VIM_SPELL_DIRECTORY # @INTERNAL # @DESCRIPTION: # This variable defines the path to Vim spell files. -: ${VIM_SPELL_DIRECTORY:="${EPREFIX}/usr/share/vim/vimfiles/spell/"} +: "${VIM_SPELL_DIRECTORY:="${EPREFIX}/usr/share/vim/vimfiles/spell/"}" # @ECLASS_VARIABLE: DESCRIPTION # @DESCRIPTION: # This variable defines the DESCRIPTION for Vim spell ebuilds. -: ${DESCRIPTION:="vim spell files: ${VIM_SPELL_LANGUAGE} (${VIM_SPELL_LOCALE})"} +: "${DESCRIPTION:="vim spell files: ${VIM_SPELL_LANGUAGE} (${VIM_SPELL_LOCALE})"}" # @ECLASS_VARIABLE: HOMEPAGE # @DESCRIPTION: # This variable defines the HOMEPAGE for Vim spell ebuilds. -: ${HOMEPAGE:="https://www.vim.org"} +: "${HOMEPAGE:="https://www.vim.org"}" # @FUNCTION: vim-spell_src_install # @DESCRIPTION: diff --git a/eclass/virtualx.eclass b/eclass/virtualx.eclass index 2513f4e16256..6e77cd662bdd 100644 --- a/eclass/virtualx.eclass +++ b/eclass/virtualx.eclass @@ -22,11 +22,11 @@ _VIRTUALX_ECLASS=1 # @DESCRIPTION: # Variable specifying the dependency on xorg-server and xhost. # Possible special values are "always" and "manual", which specify -# the dependency to be set unconditionaly or not at all. +# the dependency to be set unconditionally or not at all. # Any other value is taken as useflag desired to be in control of # the dependency (eg. VIRTUALX_REQUIRED="kde" will add the dependency # into "kde? ( )" and add kde into IUSE. -: ${VIRTUALX_REQUIRED:=test} +: "${VIRTUALX_REQUIRED:=test}" # @ECLASS_VARIABLE: VIRTUALX_DEPEND # @OUTPUT_VARIABLE diff --git a/eclass/waf-utils.eclass b/eclass/waf-utils.eclass index 1be02bbea3cb..e2a23e66b9cc 100644 --- a/eclass/waf-utils.eclass +++ b/eclass/waf-utils.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: waf-utils.eclass @@ -30,7 +30,7 @@ inherit multilib toolchain-funcs multiprocessing # @DESCRIPTION: # Set to OFF to disable verbose messages during compilation # this is _not_ meant to be set in ebuilds -: ${WAF_VERBOSE:=ON} +: "${WAF_VERBOSE:=ON}" # @ECLASS_VARIABLE: WAF_BINARY # @DESCRIPTION: @@ -67,7 +67,7 @@ waf-utils_src_configure() { fi if [[ ${PYTHON_REQ_USE} != *threads* ]]; then - eerror "Waf requires threading support in Python. To accomodate this requirement," + eerror "Waf requires threading support in Python. To accommodate this requirement," eerror "please add 'threads(+)' to PYTHON_REQ_USE variable (above inherit line)." eerror "For more information and examples, please see:" eerror " https://wiki.gentoo.org/wiki/Project:Python/waf-utils_integration" @@ -77,7 +77,7 @@ waf-utils_src_configure() { [[ ${fail} ]] && die "Invalid use of waf-utils.eclass" - : ${WAF_BINARY:="${S}/waf"} + : "${WAF_BINARY:="${S}/waf"}" local conf_args=() diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass index 9fb646613426..8bd8e2aef03e 100644 --- a/eclass/webapp.eclass +++ b/eclass/webapp.eclass @@ -389,7 +389,7 @@ webapp_pkg_setup() { # webapp_src_install() within the same shell process touch "${T}/${SETUP_CHECK_FILE}" - # special case - some ebuilds *do* need to overwride the SLOT + # special case - some ebuilds *do* need to override the SLOT if [[ "${SLOT}+" != "${PVR}+" && "${WEBAPP_MANUAL_SLOT}" != "yes" ]]; then die "Set WEBAPP_MANUAL_SLOT=\"yes\" if you need to SLOT manually" fi diff --git a/eclass/xdg-utils.eclass b/eclass/xdg-utils.eclass index 9a58add23d36..34535a129e33 100644 --- a/eclass/xdg-utils.eclass +++ b/eclass/xdg-utils.eclass @@ -1,4 +1,4 @@ -# Copyright 2004-2022 Gentoo Authors +# Copyright 2004-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: xdg-utils.eclass @@ -26,13 +26,13 @@ esac # @INTERNAL # @DESCRIPTION: # Directory where .desktop files database is stored -: ${DESKTOP_DATABASE_DIR="/usr/share/applications"} +: "${DESKTOP_DATABASE_DIR="/usr/share/applications"}" # @ECLASS_VARIABLE: MIMEINFO_DATABASE_DIR # @INTERNAL # @DESCRIPTION: # Directory where .desktop files database is stored -: ${MIMEINFO_DATABASE_DIR:="/usr/share/mime"} +: "${MIMEINFO_DATABASE_DIR:="/usr/share/mime"}" # @FUNCTION: xdg_environment_reset # @DESCRIPTION: diff --git a/eclass/xemacs-packages.eclass b/eclass/xemacs-packages.eclass index 648f5146f47e..ca60e0c3b3b7 100644 --- a/eclass/xemacs-packages.eclass +++ b/eclass/xemacs-packages.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: xemacs-packages.eclass @@ -35,13 +35,13 @@ _XEMACS_PACKAGES_ECLASS=1 RDEPEND="app-editors/xemacs" S="${WORKDIR}" -: ${HOMEPAGE:="http://xemacs.org/"} -: ${LICENSE:="GPL-2+"} +: "${HOMEPAGE:="http://xemacs.org/"}" +: "${LICENSE:="GPL-2+"}" if [[ -n ${XEMACS_EXPERIMENTAL} ]]; then - : ${SRC_URI:="http://ftp.xemacs.org/pub/xemacs/beta/experimental/packages/${P}-pkg.tar.gz"} + : "${SRC_URI:="http://ftp.xemacs.org/pub/xemacs/beta/experimental/packages/${P}-pkg.tar.gz"}" else - : ${SRC_URI:="http://ftp.xemacs.org/pub/xemacs/packages/${P}-pkg.tar.gz"} + : "${SRC_URI:="http://ftp.xemacs.org/pub/xemacs/packages/${P}-pkg.tar.gz"}" fi xemacs-packages_src_unpack() { :; } diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass index a68341591edd..2faccebba16c 100644 --- a/eclass/xorg-3.eclass +++ b/eclass/xorg-3.eclass @@ -33,7 +33,7 @@ _XORG_3_ECLASS=1 GIT_ECLASS="" if [[ ${PV} == *9999* ]]; then GIT_ECLASS="git-r3" - : ${XORG_EAUTORECONF:="yes"} + : "${XORG_EAUTORECONF:="yes"}" fi # If we're a font package, but not the font.alias one @@ -55,7 +55,7 @@ fi # @DESCRIPTION: # If set to 'yes', the multilib support for package will be enabled. Set # before inheriting this eclass. -: ${XORG_MULTILIB:="no"} +: "${XORG_MULTILIB:="no"}" # we need to inherit autotools first to get the deps inherit autotools libtool multilib toolchain-funcs flag-o-matic \ @@ -69,14 +69,14 @@ unset FONT_ECLASS GIT_ECLASS # @DESCRIPTION: # If set to 'yes' and configure.ac exists, eautoreconf will run. Set # before inheriting this eclass. -: ${XORG_EAUTORECONF:="no"} +: "${XORG_EAUTORECONF:="no"}" # @ECLASS_VARIABLE: XORG_BASE_INDIVIDUAL_URI # @PRE_INHERIT # @DESCRIPTION: # Set up SRC_URI for individual modular releases. If set to an empty # string, no SRC_URI will be provided by the eclass. -: ${XORG_BASE_INDIVIDUAL_URI="https://www.x.org/releases/individual"} +: "${XORG_BASE_INDIVIDUAL_URI="https://www.x.org/releases/individual"}" # @ECLASS_VARIABLE: XORG_MODULE # @PRE_INHERIT @@ -84,7 +84,7 @@ unset FONT_ECLASS GIT_ECLASS # The subdirectory to download source from. Possible settings are app, # doc, data, util, driver, font, lib, proto, xserver. Set above the # inherit to override the default autoconfigured module. -: ${XORG_MODULE:="auto"} +: "${XORG_MODULE:="auto"}" if [[ ${XORG_MODULE} == auto ]]; then case "${CATEGORY}/${P}" in app-doc/*) XORG_MODULE=doc/ ;; @@ -104,7 +104,7 @@ fi # @DESCRIPTION: # For git checkout the git repository might differ from package name. # This variable can be used for proper directory specification -: ${XORG_PACKAGE_NAME:=${PN}} +: "${XORG_PACKAGE_NAME:=${PN}}" HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}" @@ -113,20 +113,20 @@ HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/${XORG_MOD # @DESCRIPTION: # Most X11 projects provide tarballs as tar.bz2 or tar.xz. This eclass defaults # to bz2. -: ${XORG_TARBALL_SUFFIX:="bz2"} +: "${XORG_TARBALL_SUFFIX:="bz2"}" if [[ ${PV} == *9999* ]]; then - : ${EGIT_REPO_URI:="https://gitlab.freedesktop.org/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}.git"} + : "${EGIT_REPO_URI:="https://gitlab.freedesktop.org/xorg/${XORG_MODULE}${XORG_PACKAGE_NAME}.git"}" elif [[ -n ${XORG_BASE_INDIVIDUAL_URI} ]]; then SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${P}.tar.${XORG_TARBALL_SUFFIX}" fi -: ${SLOT:=0} +: "${SLOT:=0}" # Set the license for the package. This can be overridden by setting # LICENSE after the inherit. Nearly all FreeDesktop-hosted X packages # are under the MIT license. (This is what Red Hat does in their rpms) -: ${LICENSE:=MIT} +: "${LICENSE:=MIT}" # Set up autotools shared dependencies # Remember that all versions here MUST be stable @@ -181,7 +181,7 @@ BDEPEND+=" virtual/pkgconfig" # are required for. Default value is "no" # # Eg. XORG_DRI="opengl" will pull all dri dependent deps for opengl useflag -: ${XORG_DRI:="no"} +: "${XORG_DRI:="no"}" DRI_COMMON_DEPEND=" x11-base/xorg-server[-minimal] @@ -215,7 +215,7 @@ fi # are required for. Default value is "no" # # Eg. XORG_DOC="manual" will pull all doc dependent deps for manual useflag -: ${XORG_DOC:="no"} +: "${XORG_DOC:="no"}" DOC_DEPEND=" doc? ( |