| 1 |
commit: a7c23e549e15582d04a53f4ab7e3ed2a60b0070b |
| 2 |
Author: Mike Frysinger <vapier <AT> chromium <DOT> org> |
| 3 |
AuthorDate: Thu Mar 29 02:33:34 2018 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 29 02:33:57 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7c23e54 |
| 7 |
|
| 8 |
eclass: misc spelling fixes |
| 9 |
|
| 10 |
eclass/ant-tasks.eclass | 6 +++--- |
| 11 |
eclass/cmake-utils.eclass | 2 +- |
| 12 |
eclass/distutils-r1.eclass | 4 ++-- |
| 13 |
eclass/git-2.eclass | 16 ++++++++-------- |
| 14 |
eclass/git-r3.eclass | 6 +++--- |
| 15 |
eclass/kde4-base.eclass | 2 +- |
| 16 |
eclass/kde5.eclass | 2 +- |
| 17 |
eclass/obs-download.eclass | 2 +- |
| 18 |
eclass/office-ext-r1.eclass | 2 +- |
| 19 |
eclass/qt5-build.eclass | 2 +- |
| 20 |
10 files changed, 22 insertions(+), 22 deletions(-) |
| 21 |
|
| 22 |
diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass |
| 23 |
index cebd8f69d5d..e008e6eaea8 100644 |
| 24 |
--- a/eclass/ant-tasks.eclass |
| 25 |
+++ b/eclass/ant-tasks.eclass |
| 26 |
@@ -23,13 +23,13 @@ EXPORT_FUNCTIONS src_unpack src_compile src_install |
| 27 |
# @ECLASS-VARIABLE: ANT_TASK_JDKVER |
| 28 |
# @DESCRIPTION: |
| 29 |
# Affects the >=virtual/jdk version set in DEPEND string. Defaults to 1.5, can |
| 30 |
-# be overriden from ebuild BEFORE inheriting this eclass. |
| 31 |
+# be overridden from ebuild BEFORE inheriting this eclass. |
| 32 |
ANT_TASK_JDKVER=${ANT_TASK_JDKVER-1.5} |
| 33 |
|
| 34 |
# @ECLASS-VARIABLE: ANT_TASK_JREVER |
| 35 |
# @DESCRIPTION: |
| 36 |
# Affects the >=virtual/jre version set in DEPEND string. Defaults to 1.5, can |
| 37 |
-# be overriden from ebuild BEFORE inheriting this eclass. |
| 38 |
+# be overridden from ebuild BEFORE inheriting this eclass. |
| 39 |
ANT_TASK_JREVER=${ANT_TASK_JREVER-1.5} |
| 40 |
|
| 41 |
# @ECLASS-VARIABLE: ANT_TASK_NAME |
| 42 |
@@ -84,7 +84,7 @@ fi |
| 43 |
# source/workdir name |
| 44 |
MY_P="apache-ant-${MY_PV}" |
| 45 |
|
| 46 |
-# Default values for standard ebuild variables, can be overriden from ebuild. |
| 47 |
+# Default values for standard ebuild variables, can be overridden from ebuild. |
| 48 |
DESCRIPTION="Apache Ant's optional tasks depending on ${ANT_TASK_DEPNAME}" |
| 49 |
HOMEPAGE="http://ant.apache.org/" |
| 50 |
SRC_URI="${UPSTREAM_PREFIX}/${MY_P}-src.tar.bz2 |
| 51 |
|
| 52 |
diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass |
| 53 |
index f6952ec09ef..3302f27608b 100644 |
| 54 |
--- a/eclass/cmake-utils.eclass |
| 55 |
+++ b/eclass/cmake-utils.eclass |
| 56 |
@@ -653,7 +653,7 @@ cmake-utils_src_configure() { |
| 57 |
fi |
| 58 |
|
| 59 |
# Common configure parameters (overridable) |
| 60 |
- # NOTE CMAKE_BUILD_TYPE can be only overriden via CMAKE_BUILD_TYPE eclass variable |
| 61 |
+ # NOTE CMAKE_BUILD_TYPE can be only overridden via CMAKE_BUILD_TYPE eclass variable |
| 62 |
# No -DCMAKE_BUILD_TYPE=xxx definitions will be in effect. |
| 63 |
local cmakeargs=( |
| 64 |
${warn_unused_cli} |
| 65 |
|
| 66 |
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass |
| 67 |
index 167af95eaed..dd0c429d50f 100644 |
| 68 |
--- a/eclass/distutils-r1.eclass |
| 69 |
+++ b/eclass/distutils-r1.eclass |
| 70 |
@@ -236,7 +236,7 @@ fi |
| 71 |
# 1. ${mydistutilsargs[@]} |
| 72 |
# 2. additional arguments passed to the esetup.py function. |
| 73 |
# |
| 74 |
-# Please note that setup.py will respect defaults (unless overriden |
| 75 |
+# Please note that setup.py will respect defaults (unless overridden |
| 76 |
# via command-line options) from setup.cfg that is created |
| 77 |
# in distutils-r1_python_compile and in distutils-r1_python_install. |
| 78 |
# |
| 79 |
@@ -390,7 +390,7 @@ _distutils-r1_create_setup_cfg() { |
| 80 |
# |
| 81 |
# note: due to some packages (wxpython) relying on separate |
| 82 |
# platlib & purelib dirs, we do not set --build-lib (which |
| 83 |
- # can not be overriden with --build-*lib) |
| 84 |
+ # can not be overridden with --build-*lib) |
| 85 |
build-platlib = %(build-base)s/lib |
| 86 |
build-purelib = %(build-base)s/lib |
| 87 |
|
| 88 |
|
| 89 |
diff --git a/eclass/git-2.eclass b/eclass/git-2.eclass |
| 90 |
index 66e2fa2d0f0..63568c15577 100644 |
| 91 |
--- a/eclass/git-2.eclass |
| 92 |
+++ b/eclass/git-2.eclass |
| 93 |
@@ -6,7 +6,7 @@ |
| 94 |
# maintainer-needed@g.o |
| 95 |
# @BLURB: Eclass for fetching and unpacking git repositories. |
| 96 |
# @DESCRIPTION: |
| 97 |
-# Eclass for easing maitenance of live ebuilds using git as remote repository. |
| 98 |
+# Eclass for easing maintenance of live ebuilds using git as remote repository. |
| 99 |
# Eclass support working with git submodules and branching. |
| 100 |
# |
| 101 |
# This eclass is DEPRECATED. Please use git-r3 instead. |
| 102 |
@@ -15,7 +15,7 @@ if [[ ${EAPI} == 6 ]]; then |
| 103 |
die "${ECLASS}.eclass is banned in EAPI ${EAPI}" |
| 104 |
fi |
| 105 |
|
| 106 |
-# This eclass support all EAPIs |
| 107 |
+# This eclass support all EAPIs. |
| 108 |
EXPORT_FUNCTIONS src_unpack |
| 109 |
|
| 110 |
DEPEND="dev-vcs/git" |
| 111 |
@@ -47,7 +47,7 @@ DEPEND="dev-vcs/git" |
| 112 |
# @ECLASS-VARIABLE: EGIT_MASTER |
| 113 |
# @DESCRIPTION: |
| 114 |
# Variable for specifying master branch. |
| 115 |
-# Usefull when upstream don't have master branch or name it differently. |
| 116 |
+# Useful when upstream don't have master branch or name it differently. |
| 117 |
# |
| 118 |
# EGIT_MASTER="master" |
| 119 |
|
| 120 |
@@ -62,7 +62,7 @@ DEPEND="dev-vcs/git" |
| 121 |
# @ECLASS-VARIABLE: EGIT_DIR |
| 122 |
# @DESCRIPTION: |
| 123 |
# Directory where we want to store the git data. |
| 124 |
-# This variable should not be overriden. |
| 125 |
+# This variable should not be overridden. |
| 126 |
# |
| 127 |
# EGIT_DIR="${EGIT_STORE_DIR}/${EGIT_PROJECT}" |
| 128 |
|
| 129 |
@@ -73,7 +73,7 @@ DEPEND="dev-vcs/git" |
| 130 |
# URI for the repository |
| 131 |
# e.g. http://foo, git://bar |
| 132 |
# |
| 133 |
-# It can be overriden via env using packagename_LIVE_REPO |
| 134 |
+# It can be overridden via env using packagename_LIVE_REPO |
| 135 |
# variable. |
| 136 |
# |
| 137 |
# Support multiple values: |
| 138 |
@@ -88,7 +88,7 @@ DEPEND="dev-vcs/git" |
| 139 |
# @ECLASS-VARIABLE: EGIT_BRANCH |
| 140 |
# @DESCRIPTION: |
| 141 |
# Variable containing branch name we want to check out. |
| 142 |
-# It can be overriden via env using packagename_LIVE_BRANCH |
| 143 |
+# It can be overridden via env using packagename_LIVE_BRANCH |
| 144 |
# variable. |
| 145 |
# |
| 146 |
# EGIT_BRANCH="${EGIT_MASTER}" |
| 147 |
@@ -96,7 +96,7 @@ DEPEND="dev-vcs/git" |
| 148 |
# @ECLASS-VARIABLE: EGIT_COMMIT |
| 149 |
# @DESCRIPTION: |
| 150 |
# Variable containing commit hash/tag we want to check out. |
| 151 |
-# It can be overriden via env using packagename_LIVE_COMMIT |
| 152 |
+# It can be overridden via env using packagename_LIVE_COMMIT |
| 153 |
# variable. |
| 154 |
# |
| 155 |
# EGIT_COMMIT="${EGIT_BRANCH}" |
| 156 |
@@ -125,7 +125,7 @@ DEPEND="dev-vcs/git" |
| 157 |
# @DEFAULT_UNSET |
| 158 |
# @DESCRIPTION: |
| 159 |
# If non-empty this variable bans unpacking of ${A} content into the srcdir. |
| 160 |
-# Default behaviour is to unpack ${A} content. |
| 161 |
+# Default behavior is to unpack ${A} content. |
| 162 |
|
| 163 |
# @FUNCTION: git-2_init_variables |
| 164 |
# @INTERNAL |
| 165 |
|
| 166 |
diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass |
| 167 |
index 55a987b7954..75a589d0168 100644 |
| 168 |
--- a/eclass/git-r3.eclass |
| 169 |
+++ b/eclass/git-r3.eclass |
| 170 |
@@ -145,7 +145,7 @@ fi |
| 171 |
# The branch name to check out. If unset, the upstream default (HEAD) |
| 172 |
# will be used. |
| 173 |
# |
| 174 |
-# It can be overriden via env using ${PN}_LIVE_BRANCH variable. |
| 175 |
+# It can be overridden via env using ${PN}_LIVE_BRANCH variable. |
| 176 |
|
| 177 |
# @ECLASS-VARIABLE: EGIT_COMMIT |
| 178 |
# @DEFAULT_UNSET |
| 179 |
@@ -155,7 +155,7 @@ fi |
| 180 |
# not on HEAD branch, EGIT_BRANCH needs to be set to a branch on which |
| 181 |
# the commit is available. |
| 182 |
# |
| 183 |
-# It can be overriden via env using ${PN}_LIVE_COMMIT variable. |
| 184 |
+# It can be overridden via env using ${PN}_LIVE_COMMIT variable. |
| 185 |
|
| 186 |
# @ECLASS-VARIABLE: EGIT_COMMIT_DATE |
| 187 |
# @DEFAULT_UNSET |
| 188 |
@@ -171,7 +171,7 @@ fi |
| 189 |
# will be considered alike a single commit with date corresponding |
| 190 |
# to the merge commit date. |
| 191 |
# |
| 192 |
-# It can be overriden via env using ${PN}_LIVE_COMMIT_DATE variable. |
| 193 |
+# It can be overridden via env using ${PN}_LIVE_COMMIT_DATE variable. |
| 194 |
|
| 195 |
# @ECLASS-VARIABLE: EGIT_CHECKOUT_DIR |
| 196 |
# @DESCRIPTION: |
| 197 |
|
| 198 |
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass |
| 199 |
index 781c2bda067..a3cc79b7ac9 100644 |
| 200 |
--- a/eclass/kde4-base.eclass |
| 201 |
+++ b/eclass/kde4-base.eclass |
| 202 |
@@ -158,7 +158,7 @@ CPPUNIT_REQUIRED="${CPPUNIT_REQUIRED:-never}" |
| 203 |
# @DESCRIPTION: |
| 204 |
# Is kde required? Possible values are 'always', 'optional' and 'never'. |
| 205 |
# This variable must be set before inheriting any eclasses. Defaults to 'always' |
| 206 |
-# If set to 'always' or 'optional', KDE_MINIMAL may be overriden as well. |
| 207 |
+# If set to 'always' or 'optional', KDE_MINIMAL may be overridden as well. |
| 208 |
# Note that for kde-base packages this variable is fixed to 'always'. |
| 209 |
KDE_REQUIRED="${KDE_REQUIRED:-always}" |
| 210 |
|
| 211 |
|
| 212 |
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass |
| 213 |
index 346838570a4..72a59703a9a 100644 |
| 214 |
--- a/eclass/kde5.eclass |
| 215 |
+++ b/eclass/kde5.eclass |
| 216 |
@@ -19,7 +19,7 @@ |
| 217 |
# of this eclass's API. |
| 218 |
# |
| 219 |
# This eclass's phase functions are not intended to be mixed and matched, so if |
| 220 |
-# any phase functions are overriden the version here should also be called. |
| 221 |
+# any phase functions are overridden the version here should also be called. |
| 222 |
|
| 223 |
if [[ -z ${_KDE5_ECLASS} ]]; then |
| 224 |
_KDE5_ECLASS=1 |
| 225 |
|
| 226 |
diff --git a/eclass/obs-download.eclass b/eclass/obs-download.eclass |
| 227 |
index 7c824869ae6..e40cdd2876f 100644 |
| 228 |
--- a/eclass/obs-download.eclass |
| 229 |
+++ b/eclass/obs-download.eclass |
| 230 |
@@ -27,7 +27,7 @@ |
| 231 |
# @DEFAULT_UNSET |
| 232 |
# @DESCRIPTION: |
| 233 |
# In which obs project pakage is. |
| 234 |
-# This variable does not have to be set and is overriden, if |
| 235 |
+# This variable does not have to be set and is overridden, if |
| 236 |
# OPENSUSE_RELEASE is provided. |
| 237 |
|
| 238 |
# @ECLASS-VARIABLE: OBS_PACKAGE |
| 239 |
|
| 240 |
diff --git a/eclass/office-ext-r1.eclass b/eclass/office-ext-r1.eclass |
| 241 |
index bdd9ffd9166..1ff864656b6 100644 |
| 242 |
--- a/eclass/office-ext-r1.eclass |
| 243 |
+++ b/eclass/office-ext-r1.eclass |
| 244 |
@@ -8,7 +8,7 @@ |
| 245 |
# Tomáš Chvátal <scarabeus@g.o> |
| 246 |
# @BLURB: Eclass for installing libreoffice/openoffice extensions |
| 247 |
# @DESCRIPTION: |
| 248 |
-# Eclass for easing maitenance of libreoffice/openoffice extensions. |
| 249 |
+# Eclass for easing maintenance of libreoffice/openoffice extensions. |
| 250 |
|
| 251 |
case "${EAPI:-0}" in |
| 252 |
5|6) OEXT_EXPORTED_FUNCTIONS="src_unpack src_install pkg_postinst pkg_prerm" ;; |
| 253 |
|
| 254 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
| 255 |
index 2517d3992dd..defbcad2e6b 100644 |
| 256 |
--- a/eclass/qt5-build.eclass |
| 257 |
+++ b/eclass/qt5-build.eclass |
| 258 |
@@ -945,7 +945,7 @@ qt5_regenerate_global_configs() { |
| 259 |
done |
| 260 |
|
| 261 |
# check all items from the original qtcore qmodule.pri, |
| 262 |
- # and add them to the appropriate list if not overriden |
| 263 |
+ # and add them to the appropriate list if not overridden |
| 264 |
# elsewhere |
| 265 |
for x in ${qprivateconfig_orig_enabled}; do |
| 266 |
if ! has "${x}" ${new_qprivateconfig_enabled} ${new_qprivateconfig_disabled}; then |
Archives