Merge updates from master

10 files changed, 18 insertions, 18 deletions

diff --git a/app-admin/rsyslog/rsyslog-8.2008.0.ebuild b/app-admin/rsyslog/rsyslog-8.2008.0.ebuild
index 32bb3a17bceb..106618ed65f3 100644
--- a/app-admin/rsyslog/rsyslog-8.2008.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2008.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -174,12 +174,12 @@ src_configure() {
 		$(use_enable test testbench)
 		$(use_enable test libfaketime)
 		$(use_enable test extended-tests)
-		# Input Plugins without depedencies
+		# Input Plugins without dependencies
 		--enable-imdiag
 		--enable-imfile
 		--enable-impstats
 		--enable-imptcp
-		# Message Modificiation Plugins without depedencies
+		# Message Modificiation Plugins without dependencies
 		--enable-mmanon
 		--enable-mmaudit
 		--enable-mmcount
diff --git a/app-admin/rsyslog/rsyslog-8.2010.0.ebuild b/app-admin/rsyslog/rsyslog-8.2010.0.ebuild
index 5b5c70c31e51..5302087c872d 100644
--- a/app-admin/rsyslog/rsyslog-8.2010.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2010.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -183,14 +183,14 @@ src_configure() {
 		$(use_enable test testbench)
 		$(use_enable test libfaketime)
 		$(use_enable test extended-tests)
-		# Input Plugins without depedencies
+		# Input Plugins without dependencies
 		--enable-imbatchreport
 		--enable-imdiag
 		--enable-imfile
 		--enable-improg
 		--enable-impstats
 		--enable-imptcp
-		# Message Modificiation Plugins without depedencies
+		# Message Modificiation Plugins without dependencies
 		--enable-mmanon
 		--enable-mmaudit
 		--enable-mmcount
diff --git a/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild
index 52cb79ec9ae0..cd133449943a 100644
--- a/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2012.0-r1.ebuild
@@ -183,14 +183,14 @@ src_configure() {
 		$(use_enable test testbench)
 		$(use_enable test libfaketime)
 		$(use_enable test extended-tests)
-		# Input Plugins without depedencies
+		# Input Plugins without dependencies
 		--enable-imbatchreport
 		--enable-imdiag
 		--enable-imfile
 		--enable-improg
 		--enable-impstats
 		--enable-imptcp
-		# Message Modificiation Plugins without depedencies
+		# Message Modificiation Plugins without dependencies
 		--enable-mmanon
 		--enable-mmaudit
 		--enable-mmcount
diff --git a/app-admin/rsyslog/rsyslog-8.2012.0.ebuild b/app-admin/rsyslog/rsyslog-8.2012.0.ebuild
index 5b5c70c31e51..5302087c872d 100644
--- a/app-admin/rsyslog/rsyslog-8.2012.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2012.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -183,14 +183,14 @@ src_configure() {
 		$(use_enable test testbench)
 		$(use_enable test libfaketime)
 		$(use_enable test extended-tests)
-		# Input Plugins without depedencies
+		# Input Plugins without dependencies
 		--enable-imbatchreport
 		--enable-imdiag
 		--enable-imfile
 		--enable-improg
 		--enable-impstats
 		--enable-imptcp
-		# Message Modificiation Plugins without depedencies
+		# Message Modificiation Plugins without dependencies
 		--enable-mmanon
 		--enable-mmaudit
 		--enable-mmcount
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 780becc3ace9..ca2ed98c8e8c 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -88,7 +88,7 @@ esac
 # - rdepend -- add it to BDEPEND+RDEPEND (when using entry_points)
 # - pyproject.toml -- use pyproject2setuptools to install a project
 #                     using pyproject.toml (flit, poetry...)
-# - manual -- do not add the depedency and suppress the checks
+# - manual -- do not add the dependency and suppress the checks
 #             (assumes you will take care of doing it correctly)
 #
 # This variable is effective only if DISTUTILS_OPTIONAL is disabled.
diff --git a/net-misc/iputils/iputils-20190709-r1.ebuild b/net-misc/iputils/iputils-20190709-r1.ebuild
index 1ea0909f0b64..45ccb52a468b 100644
--- a/net-misc/iputils/iputils-20190709-r1.ebuild
+++ b/net-misc/iputils/iputils-20190709-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # For released versions, we precompile the man/html pages and store
 # them in a tarball on our mirrors.  This avoids ugly issues while
-# building stages, and reduces depedencies.
+# building stages, and reduces dependencies.
 # To regenerate man/html pages emerge iputils-99999999[doc] with
 # EGIT_COMMIT set to release tag and tar ${S}/doc folder.
 
diff --git a/net-misc/iputils/iputils-20200821-r2.ebuild b/net-misc/iputils/iputils-20200821-r2.ebuild
index fa217aca4c76..393c3b812973 100644
--- a/net-misc/iputils/iputils-20200821-r2.ebuild
+++ b/net-misc/iputils/iputils-20200821-r2.ebuild
@@ -3,7 +3,7 @@
 
 # For released versions, we precompile the man/html pages and store
 # them in a tarball on our mirrors.  This avoids ugly issues while
-# building stages, and reduces depedencies.
+# building stages, and reduces dependencies.
 # To regenerate man/html pages emerge iputils-99999999[doc] with
 # EGIT_COMMIT set to release tag, all USE flags enabled and
 # tar ${S}/doc folder.
diff --git a/net-misc/iputils/iputils-20210202.ebuild b/net-misc/iputils/iputils-20210202.ebuild
index 61132b5fea46..5d5e0b6aa022 100644
--- a/net-misc/iputils/iputils-20210202.ebuild
+++ b/net-misc/iputils/iputils-20210202.ebuild
@@ -3,7 +3,7 @@
 
 # For released versions, we precompile the man/html pages and store
 # them in a tarball on our mirrors.  This avoids ugly issues while
-# building stages, and reduces depedencies.
+# building stages, and reduces dependencies.
 # To regenerate man/html pages emerge iputils-99999999[doc] with
 # EGIT_COMMIT set to release tag, all USE flags enabled and
 # tar ${S}/doc folder.
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index 61132b5fea46..5d5e0b6aa022 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -3,7 +3,7 @@
 
 # For released versions, we precompile the man/html pages and store
 # them in a tarball on our mirrors.  This avoids ugly issues while
-# building stages, and reduces depedencies.
+# building stages, and reduces dependencies.
 # To regenerate man/html pages emerge iputils-99999999[doc] with
 # EGIT_COMMIT set to release tag, all USE flags enabled and
 # tar ${S}/doc folder.
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 70e3e03944a0..87a63e1c8b48 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -385,7 +385,7 @@ dev-java/icedtea -shenandoah
 app-portage/g-sorcery bson
 
 # Thomas Deutschmann <whissi@gentoo.org> (2017-03-01)
-# Unkeyworded depedencies
+# Unkeyworded dependencies
 app-admin/rsyslog mongodb
 
 # Michael Weber <xmw@gentoo.org> (2017-03-01)