[patch] portage-2.2_rc33-spell.patch

portage-2.2_rc33-spell.patch (text/plain), 10.89 KB, created by Jeroen Roovers (RETIRED) on 2009-06-17 12:13:04 UTC

diff -ur portage-2.2_rc33.orig/bin/misc-functions.sh portage-2.2_rc33/bin/misc-functions.sh
--- portage-2.2_rc33.orig/bin/misc-functions.sh	2009-06-17 13:40:09.000000000 +0200
+++ portage-2.2_rc33/bin/misc-functions.sh	2009-06-17 13:57:23.000000000 +0200
@@ -68,7 +68,7 @@
 			unset PORTAGE_QUIET
 		fi
 
-		# Make sure we disallow insecure RUNPATH/RPATH's
+		# Make sure we disallow insecure RUNPATH/RPATHs
 		# Don't want paths that point to the tree where the package was built
 		# (older, broken libtools would do this).  Also check for null paths
 		# because the loader will search $PWD when it finds null paths.
@@ -80,7 +80,7 @@
 		)
 		if [[ -n ${f}${x} ]] ; then
 			vecho -ne '\a\n'
-			eqawarn "QA Notice: The following files contain insecure RUNPATH's"
+			eqawarn "QA Notice: The following files contain insecure RUNPATHs"
 			eqawarn " Please file a bug about this at http://bugs.gentoo.org/"
 			eqawarn " with the maintaining herd of the package."
 			eqawarn "${f}${f:+${x:+\n}}${x}"
@@ -93,7 +93,7 @@
 			fi
 		fi
 
-		# TEXTREL's are baaaaaaaad
+		# TEXTRELs are baaaaaaaad
 		# Allow devs to mark things as ignorable ... e.g. things that are
 		# binary-only and upstream isn't cooperating (nvidia-glx) ... we
 		# allow ebuild authors to set QA_TEXTRELS_arch and QA_TEXTRELS ...
diff -ur portage-2.2_rc33.orig/cnf/make.conf.amd64.diff portage-2.2_rc33/cnf/make.conf.amd64.diff
--- portage-2.2_rc33.orig/cnf/make.conf.amd64.diff	2006-06-10 23:40:40.000000000 +0200
+++ portage-2.2_rc33/cnf/make.conf.amd64.diff	2009-06-17 13:59:42.000000000 +0200
@@ -37,7 +37,7 @@
 +# 
 +# CRITICAL WARNINGS: ****************************************************** #
 +# K6 markings are deceptive. Avoid setting -march for them. See Bug #24379. #
-+# Pentium-M CPU's should not enable sse2 until at least gcc-3.4. Bug 50616. #
++# Pentium-M CPUs should not enable sse2 until at least gcc-3.4. Bug 50616. #
 +# GCC 3.3 doesnt support an amd64 specific -march setting, use 3.4.         #
 +# ************************************************************************* #
  #
diff -ur portage-2.2_rc33.orig/cnf/make.conf.amd64-fbsd.diff portage-2.2_rc33/cnf/make.conf.amd64-fbsd.diff
--- portage-2.2_rc33.orig/cnf/make.conf.amd64-fbsd.diff	2009-06-17 13:40:09.000000000 +0200
+++ portage-2.2_rc33/cnf/make.conf.amd64-fbsd.diff	2009-06-17 13:59:14.000000000 +0200
@@ -37,7 +37,7 @@
 +# 
 +# CRITICAL WARNINGS: ****************************************************** #
 +# K6 markings are deceptive. Avoid setting -march for them. See Bug #24379. #
-+# Pentium-M CPU's should not enable sse2 until at least gcc-3.4. Bug 50616. #
++# Pentium-M CPUs should not enable sse2 until at least gcc-3.4. Bug 50616. #
 +# GCC 3.3 doesnt support an amd64 specific -march setting, use 3.4.         #
 +# ************************************************************************* #
  #
diff -ur portage-2.2_rc33.orig/cnf/make.conf.x86.diff portage-2.2_rc33/cnf/make.conf.x86.diff
--- portage-2.2_rc33.orig/cnf/make.conf.x86.diff	2007-08-12 20:18:35.000000000 +0200
+++ portage-2.2_rc33/cnf/make.conf.x86.diff	2009-06-17 13:59:23.000000000 +0200
@@ -73,7 +73,7 @@
 +#
 +# CRITICAL WARNINGS: ****************************************************** #
 +# K6 markings are deceptive. Avoid setting -march for them. See Bug #24379. #
-+# Pentium-M CPU's should not enable sse2 until at least gcc-3.4. Bug 50616. #
++# Pentium-M CPUs should not enable sse2 until at least gcc-3.4. Bug 50616. #
 +# ************************************************************************* #
 +#
 +# NOTE: the -On optimization levels are set with the letter O, not -0 (zero).
diff -ur portage-2.2_rc33.orig/cnf/make.conf.x86-fbsd.diff portage-2.2_rc33/cnf/make.conf.x86-fbsd.diff
--- portage-2.2_rc33.orig/cnf/make.conf.x86-fbsd.diff	2008-08-01 04:22:06.000000000 +0200
+++ portage-2.2_rc33/cnf/make.conf.x86-fbsd.diff	2009-06-17 13:59:35.000000000 +0200
@@ -43,7 +43,7 @@
 +#
 +# CRITICAL WARNINGS: ****************************************************** #
 +# K6 markings are deceptive. Avoid setting -march for them. See Bug #24379. #
-+# Pentium-M CPU's should not enable sse2 until at least gcc-3.4. Bug 50616. #
++# Pentium-M CPUs should not enable sse2 until at least gcc-3.4. Bug 50616. #
 +# ************************************************************************* #
  #
 +# Decent examples:
diff -ur portage-2.2_rc33.orig/doc/qa.docbook portage-2.2_rc33/doc/qa.docbook
--- portage-2.2_rc33.orig/doc/qa.docbook	2007-12-15 22:04:02.000000000 +0100
+++ portage-2.2_rc33/doc/qa.docbook	2009-06-17 13:59:07.000000000 +0200
@@ -17,7 +17,7 @@
   <title>Scanelf: Insecure RUNPATHs</title>
   <para>
    <programlisting>
-    QA Notice: The following files contain insecure RUNPATH's
+    QA Notice: The following files contain insecure RUNPATHs
    </programlisting>
   </para>
   <para>
diff -ur portage-2.2_rc33.orig/man/ebuild.5 portage-2.2_rc33/man/ebuild.5
--- portage-2.2_rc33.orig/man/ebuild.5	2009-06-17 13:40:09.000000000 +0200
+++ portage-2.2_rc33/man/ebuild.5	2009-06-17 13:58:59.000000000 +0200
@@ -140,8 +140,8 @@
 the EAPI to which this package conforms.
 .TP
 \fBSRC_URI\fR = \fI"http://happy.com/little/${P}.tar.gz"\fR
-Contains a list of URI's for the required source files.  It can contain
-multiple URI's for a single source file.  The list is processed in order
+Contains a list of URIs for the required source files.  It can contain
+multiple URIs for a single source file.  The list is processed in order
 if the file was not found on any of the \fIGENTOO_MIRRORS\fR.
 Beginning with \fBEAPI 2\fR, the output file name of a given URI may be
 customized with a "->" operator on the right hand side, followed by the
@@ -149,7 +149,7 @@
 file name, should be separated by whitespace.
 .TP
 \fBHOMEPAGE\fR = \fI"http://happy.com/"\fR
-Should contain a list of URL's for the sources main sites and other further
+Should contain a list of URIs for the sources main sites and other further
 package dependent information.
 .TP
 \fBKEYWORDS\fR = \fI[\-~][x86,ppc,sparc,mips,alpha,arm,hppa]\fR
@@ -421,7 +421,7 @@
 files in \fBSRC_URI\fR will not be downloaded from the \fBGENTOO_MIRRORS\fR.
 .TP
 .I primaryuri
-fetch from URL's in \fBSRC_URI\fR before \fBGENTOO_MIRRORS\fR.
+fetch from URIs in \fBSRC_URI\fR before \fBGENTOO_MIRRORS\fR.
 .TP
 .I strip
 final binaries/libraries will not be stripped of debug symbols.
diff -ur portage-2.2_rc33.orig/man/make.conf.5 portage-2.2_rc33/man/make.conf.5
--- portage-2.2_rc33.orig/man/make.conf.5	2009-06-17 13:40:10.000000000 +0200
+++ portage-2.2_rc33/man/make.conf.5	2009-06-17 14:01:42.000000000 +0200
@@ -388,7 +388,7 @@
 written to place the fetched file at \\${DISTDIR}/\\${FILE}.
 Also see \fBRESUMECOMMAND\fR.
 .TP
-\fBGENTOO_MIRRORS\fR = \fI[URLs]\fR
+\fBGENTOO_MIRRORS\fR = \fI[URIs]\fR
 Insert your space\-seperated list of local mirrors here.  These
 locations are used to download files before the ones listed in
 the \fIebuild scripts\fR. Merging 'mirrorselect' can help.  Entries in this
diff -ur portage-2.2_rc33.orig/man/portage.5 portage-2.2_rc33/man/portage.5
--- portage-2.2_rc33.orig/man/portage.5	2009-06-17 13:40:10.000000000 +0200
+++ portage-2.2_rc33/man/portage.5	2009-06-17 14:02:30.000000000 +0200
@@ -415,7 +415,7 @@
 Contains variables customizing colors. See \fBcolor.map\fR(5).
 .TP
 .BR mirrors
-Whenever portage encounters a mirror:// style URL it will look up the actual 
+Whenever portage encounters a mirror:// style URI it will look up the actual 
 hosts here.  If the mirror set is not found here, it will check the global 
 mirrors file at /usr/portage/profiles/thirdpartymirrors.  You may also set a 
 special mirror type called "local".  This list of mirrors will be checked 
@@ -719,7 +719,7 @@
 hyphen.
 .TP
 .BR thirdpartymirrors
-Controls the mapping of mirror:// style URLs to actual lists of 
+Controls the mapping of mirror:// style URIs to actual lists of 
 mirrors.  Keeps us from overloading a single server.
 
 .I Format:
diff -ur portage-2.2_rc33.orig/pym/portage/dbapi/porttree.py portage-2.2_rc33/pym/portage/dbapi/porttree.py
--- portage-2.2_rc33.orig/pym/portage/dbapi/porttree.py	2009-06-17 13:40:10.000000000 +0200
+++ portage-2.2_rc33/pym/portage/dbapi/porttree.py	2009-06-17 13:58:33.000000000 +0200
@@ -390,7 +390,7 @@
 	def getRepositories(self):
 		"""
 		This function is required for GLEP 42 compliance; it will return a list of
-		repository ID's
+		repository IDs
 		TreeMap = {id: path}
 		"""
 		return [k for k in self.treemap if k]
diff -ur portage-2.2_rc33.orig/pym/portage/getbinpkg.py portage-2.2_rc33/pym/portage/getbinpkg.py
--- portage-2.2_rc33.orig/pym/portage/getbinpkg.py	2009-06-17 13:40:10.000000000 +0200
+++ portage-2.2_rc33/pym/portage/getbinpkg.py	2009-06-17 14:10:13.000000000 +0200
@@ -83,7 +83,7 @@
 
 	parts = baseurl.split("://",1)
 	if len(parts) != 2:
-		raise ValueError("Provided URL does not " + \
+		raise ValueError("Provided URI does not " + \
 			"contain protocol identifier. '%s'" % baseurl)
 	protocol,url_parts = parts
 	del parts
@@ -291,7 +291,7 @@
 
 def dir_get_list(baseurl,conn=None):
 	"""(baseurl[,connection]) -- Takes a base url to connect to and read from.
-	URL should be in the for <proto>://<site>[:port]<path>
+	URI should be in the form <proto>://<site>[:port]<path>
 	Connection is used for persistent connection instances."""
 
 	if not conn:
@@ -339,7 +339,7 @@
 
 def file_get_metadata(baseurl,conn=None, chunk_size=3000):
 	"""(baseurl[,connection]) -- Takes a base url to connect to and read from.
-	URL should be in the for <proto>://<site>[:port]<path>
+	URI should be in the form <proto>://<site>[:port]<path>
 	Connection is used for persistent connection instances."""
 
 	if not conn:
@@ -390,7 +390,7 @@
 
 def file_get(baseurl,dest,conn=None,fcmd=None):
 	"""(baseurl,dest,fcmd=) -- Takes a base url to connect to and read from.
-	URL should be in the for <proto>://[user[:pass]@]<site>[:port]<path>"""
+	URI should be in the form <proto>://[user[:pass]@]<site>[:port]<path>"""
 
 	if not fcmd:
 		return file_get_lib(baseurl,dest,conn)
@@ -418,7 +418,7 @@
 
 def file_get_lib(baseurl,dest,conn=None):
 	"""(baseurl[,connection]) -- Takes a base url to connect to and read from.
-	URL should be in the for <proto>://<site>[:port]<path>
+	URI should be in the form <proto>://<site>[:port]<path>
 	Connection is used for persistent connection instances."""
 
 	if not conn:
diff -ur portage-2.2_rc33.orig/pym/portage/__init__.py portage-2.2_rc33/pym/portage/__init__.py
--- portage-2.2_rc33.orig/pym/portage/__init__.py	2009-06-17 13:40:10.000000000 +0200
+++ portage-2.2_rc33/pym/portage/__init__.py	2009-06-17 13:58:21.000000000 +0200
@@ -5789,7 +5789,7 @@
 	@type dbkey: Dict or String
 	@param use_cache: Enables the cache
 	@type use_cache: Boolean
-	@param fetchall: Used to wrap fetch(), fetches all URI's (even ones invalid due to USE conditionals)
+	@param fetchall: Used to wrap fetch(), fetches all URIs (even ones invalid due to USE conditionals)
 	@type fetchall: Boolean
 	@param tree: Which tree to use ('vartree','porttree','bintree', etc..), defaults to 'porttree'
 	@type tree: String