commit: a7c23e549e15582d04a53f4ab7e3ed2a60b0070b
Author: Mike Frysinger <vapier <AT> chromium <DOT> org>
AuthorDate: Thu Mar 29 02:33:34 2018 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 02:33:57 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7c23e54
eclass: misc spelling fixes
eclass/ant-tasks.eclass | 6 +++---
eclass/cmake-utils.eclass | 2 +-
eclass/distutils-r1.eclass | 4 ++--
eclass/git-2.eclass | 16 ++++++++--------
eclass/git-r3.eclass | 6 +++---
eclass/kde4-base.eclass | 2 +-
eclass/kde5.eclass | 2 +-
eclass/obs-download.eclass | 2 +-
eclass/office-ext-r1.eclass | 2 +-
eclass/qt5-build.eclass | 2 +-
10 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass
index cebd8f69d5d..e008e6eaea8 100644
--- a/eclass/ant-tasks.eclass
+++ b/eclass/ant-tasks.eclass
@@ -23,13 +23,13 @@ EXPORT_FUNCTIONS src_unpack src_compile src_install
# @ECLASS-VARIABLE: ANT_TASK_JDKVER
# @DESCRIPTION:
# Affects the >=virtual/jdk version set in DEPEND string. Defaults to 1.5, can
-# be overriden from ebuild BEFORE inheriting this eclass.
+# be overridden from ebuild BEFORE inheriting this eclass.
ANT_TASK_JDKVER=${ANT_TASK_JDKVER-1.5}
# @ECLASS-VARIABLE: ANT_TASK_JREVER
# @DESCRIPTION:
# Affects the >=virtual/jre version set in DEPEND string. Defaults to 1.5, can
-# be overriden from ebuild BEFORE inheriting this eclass.
+# be overridden from ebuild BEFORE inheriting this eclass.
ANT_TASK_JREVER=${ANT_TASK_JREVER-1.5}
# @ECLASS-VARIABLE: ANT_TASK_NAME
@@ -84,7 +84,7 @@ fi
# source/workdir name
MY_P="apache-ant-${MY_PV}"
-# Default values for standard ebuild variables, can be overriden from ebuild.
+# Default values for standard ebuild variables, can be overridden from ebuild.
DESCRIPTION="Apache Ant's optional tasks depending on ${ANT_TASK_DEPNAME}"
HOMEPAGE="http://ant.apache.org/";
SRC_URI="${UPSTREAM_PREFIX}/${MY_P}-src.tar.bz2
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index f6952ec09ef..3302f27608b 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -653,7 +653,7 @@ cmake-utils_src_configure() {
fi
# Common configure parameters (overridable)
- # NOTE CMAKE_BUILD_TYPE can be only overriden via CMAKE_BUILD_TYPE
eclass variable
+ # NOTE CMAKE_BUILD_TYPE can be only overridden via CMAKE_BUILD_TYPE
eclass variable
# No -DCMAKE_BUILD_TYPE=xxx definitions will be in effect.
local cmakeargs=(
${warn_unused_cli}
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 167af95eaed..dd0c429d50f 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -236,7 +236,7 @@ fi
# 1. ${mydistutilsargs[@]}
# 2. additional arguments passed to the esetup.py function.
#
-# Please note that setup.py will respect defaults (unless overriden
+# Please note that setup.py will respect defaults (unless overridden
# via command-line options) from setup.cfg that is created
# in distutils-r1_python_compile and in distutils-r1_python_install.
#
@@ -390,7 +390,7 @@ _distutils-r1_create_setup_cfg() {
#
# note: due to some packages (wxpython) relying on separate
# platlib & purelib dirs, we do not set --build-lib (which
- # can not be overriden with --build-*lib)
+ # can not be overridden with --build-*lib)
build-platlib = %(build-base)s/lib
build-purelib = %(build-base)s/lib
diff --git a/eclass/git-2.eclass b/eclass/git-2.eclass
index 66e2fa2d0f0..63568c15577 100644
--- a/eclass/git-2.eclass
+++ b/eclass/git-2.eclass
@@ -6,7 +6,7 @@
# [email protected]
# @BLURB: Eclass for fetching and unpacking git repositories.
# @DESCRIPTION:
-# Eclass for easing maitenance of live ebuilds using git as remote repository.
+# Eclass for easing maintenance of live ebuilds using git as remote repository.
# Eclass support working with git submodules and branching.
#
# This eclass is DEPRECATED. Please use git-r3 instead.
@@ -15,7 +15,7 @@ if [[ ${EAPI} == 6 ]]; then
die "${ECLASS}.eclass is banned in EAPI ${EAPI}"
fi
-# This eclass support all EAPIs
+# This eclass support all EAPIs.
EXPORT_FUNCTIONS src_unpack
DEPEND="dev-vcs/git"
@@ -47,7 +47,7 @@ DEPEND="dev-vcs/git"
# @ECLASS-VARIABLE: EGIT_MASTER
# @DESCRIPTION:
# Variable for specifying master branch.
-# Usefull when upstream don't have master branch or name it differently.
+# Useful when upstream don't have master branch or name it differently.
#
# EGIT_MASTER="master"
@@ -62,7 +62,7 @@ DEPEND="dev-vcs/git"
# @ECLASS-VARIABLE: EGIT_DIR
# @DESCRIPTION:
# Directory where we want to store the git data.
-# This variable should not be overriden.
+# This variable should not be overridden.
#
# EGIT_DIR="${EGIT_STORE_DIR}/${EGIT_PROJECT}"
@@ -73,7 +73,7 @@ DEPEND="dev-vcs/git"
# URI for the repository
# e.g. http://foo, git://bar
#
-# It can be overriden via env using packagename_LIVE_REPO
+# It can be overridden via env using packagename_LIVE_REPO
# variable.
#
# Support multiple values:
@@ -88,7 +88,7 @@ DEPEND="dev-vcs/git"
# @ECLASS-VARIABLE: EGIT_BRANCH
# @DESCRIPTION:
# Variable containing branch name we want to check out.
-# It can be overriden via env using packagename_LIVE_BRANCH
+# It can be overridden via env using packagename_LIVE_BRANCH
# variable.
#
# EGIT_BRANCH="${EGIT_MASTER}"
@@ -96,7 +96,7 @@ DEPEND="dev-vcs/git"
# @ECLASS-VARIABLE: EGIT_COMMIT
# @DESCRIPTION:
# Variable containing commit hash/tag we want to check out.
-# It can be overriden via env using packagename_LIVE_COMMIT
+# It can be overridden via env using packagename_LIVE_COMMIT
# variable.
#
# EGIT_COMMIT="${EGIT_BRANCH}"
@@ -125,7 +125,7 @@ DEPEND="dev-vcs/git"
# @DEFAULT_UNSET
# @DESCRIPTION:
# If non-empty this variable bans unpacking of ${A} content into the srcdir.
-# Default behaviour is to unpack ${A} content.
+# Default behavior is to unpack ${A} content.
# @FUNCTION: git-2_init_variables
# @INTERNAL
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
index 55a987b7954..75a589d0168 100644
--- a/eclass/git-r3.eclass
+++ b/eclass/git-r3.eclass
@@ -145,7 +145,7 @@ fi
# The branch name to check out. If unset, the upstream default (HEAD)
# will be used.
#
-# It can be overriden via env using ${PN}_LIVE_BRANCH variable.
+# It can be overridden via env using ${PN}_LIVE_BRANCH variable.
# @ECLASS-VARIABLE: EGIT_COMMIT
# @DEFAULT_UNSET
@@ -155,7 +155,7 @@ fi
# not on HEAD branch, EGIT_BRANCH needs to be set to a branch on which
# the commit is available.
#
-# It can be overriden via env using ${PN}_LIVE_COMMIT variable.
+# It can be overridden via env using ${PN}_LIVE_COMMIT variable.
# @ECLASS-VARIABLE: EGIT_COMMIT_DATE
# @DEFAULT_UNSET
@@ -171,7 +171,7 @@ fi
# will be considered alike a single commit with date corresponding
# to the merge commit date.
#
-# It can be overriden via env using ${PN}_LIVE_COMMIT_DATE variable.
+# It can be overridden via env using ${PN}_LIVE_COMMIT_DATE variable.
# @ECLASS-VARIABLE: EGIT_CHECKOUT_DIR
# @DESCRIPTION:
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 781c2bda067..a3cc79b7ac9 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -158,7 +158,7 @@ CPPUNIT_REQUIRED="${CPPUNIT_REQUIRED:-never}"
# @DESCRIPTION:
# Is kde required? Possible values are 'always', 'optional' and 'never'.
# This variable must be set before inheriting any eclasses. Defaults to
'always'
-# If set to 'always' or 'optional', KDE_MINIMAL may be overriden as well.
+# If set to 'always' or 'optional', KDE_MINIMAL may be overridden as well.
# Note that for kde-base packages this variable is fixed to 'always'.
KDE_REQUIRED="${KDE_REQUIRED:-always}"
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 346838570a4..72a59703a9a 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -19,7 +19,7 @@
# of this eclass's API.
#
# This eclass's phase functions are not intended to be mixed and matched, so if
-# any phase functions are overriden the version here should also be called.
+# any phase functions are overridden the version here should also be called.
if [[ -z ${_KDE5_ECLASS} ]]; then
_KDE5_ECLASS=1
diff --git a/eclass/obs-download.eclass b/eclass/obs-download.eclass
index 7c824869ae6..e40cdd2876f 100644
--- a/eclass/obs-download.eclass
+++ b/eclass/obs-download.eclass
@@ -27,7 +27,7 @@
# @DEFAULT_UNSET
# @DESCRIPTION:
# In which obs project pakage is.
-# This variable does not have to be set and is overriden, if
+# This variable does not have to be set and is overridden, if
# OPENSUSE_RELEASE is provided.
# @ECLASS-VARIABLE: OBS_PACKAGE
diff --git a/eclass/office-ext-r1.eclass b/eclass/office-ext-r1.eclass
index bdd9ffd9166..1ff864656b6 100644
--- a/eclass/office-ext-r1.eclass
+++ b/eclass/office-ext-r1.eclass
@@ -8,7 +8,7 @@
# Tomáš Chvátal <[email protected]>
# @BLURB: Eclass for installing libreoffice/openoffice extensions
# @DESCRIPTION:
-# Eclass for easing maitenance of libreoffice/openoffice extensions.
+# Eclass for easing maintenance of libreoffice/openoffice extensions.
case "${EAPI:-0}" in
5|6) OEXT_EXPORTED_FUNCTIONS="src_unpack src_install pkg_postinst
pkg_prerm" ;;
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 2517d3992dd..defbcad2e6b 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -945,7 +945,7 @@ qt5_regenerate_global_configs() {
done
# check all items from the original qtcore qmodule.pri,
- # and add them to the appropriate list if not overriden
+ # and add them to the appropriate list if not overridden
# elsewhere
for x in ${qprivateconfig_orig_enabled}; do
if ! has "${x}" ${new_qprivateconfig_enabled}
${new_qprivateconfig_disabled}; then
