From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1147015-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 23511138350
for <garchives@archives.gentoo.org>; Tue, 18 Feb 2020 15:09:35 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 4E5D0E08B0;
Tue, 18 Feb 2020 15:09:34 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 255A2E08B0
for <gentoo-commits@lists.gentoo.org>; Tue, 18 Feb 2020 15:09:34 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 230F134ECFA
for <gentoo-commits@lists.gentoo.org>; Tue, 18 Feb 2020 15:09:33 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 548769C
for <gentoo-commits@lists.gentoo.org>; Tue, 18 Feb 2020 15:09:31 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1582038342.02a6c2a31a74d492d4df38947341dea6636a5a82.ulm@gentoo>
Subject: [gentoo-commits] proj/devmanual:master commit in: general-concepts/use-flags/, general-concepts/mirrors/, ...
X-VCS-Repository: proj/devmanual
X-VCS-Files: appendices/devbook-guide/text.xml archs/amd64/text.xml devbook.xsl ebuild-writing/functions/src_install/text.xml ebuild-writing/functions/src_test/text.xml ebuild-writing/using-eclasses/text.xml general-concepts/autotools/text.xml general-concepts/dependencies/text.xml general-concepts/mirrors/text.xml general-concepts/portage-cache/text.xml general-concepts/use-flags/text.xml general-concepts/virtuals/text.xml quickstart/text.xml tools-reference/find/text.xml tools-reference/sed/text.xml xsl/lang.highlight.c.xsl xsl/lang.highlight.ebuild.xsl
X-VCS-Directories: general-concepts/use-flags/ general-concepts/mirrors/ general-concepts/virtuals/ general-concepts/portage-cache/ tools-reference/find/ archs/amd64/ tools-reference/sed/ general-concepts/autotools/ general-concepts/dependencies/ / appendices/devbook-guide/ ebuild-writing/functions/src_test/ xsl/ quickstart/ ebuild-writing/functions/src_install/ ebuild-writing/using-eclasses/
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: 02a6c2a31a74d492d4df38947341dea6636a5a82
X-VCS-Branch: master
Date: Tue, 18 Feb 2020 15:09:31 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 9bac83d9-4a0a-4e39-8488-152b7d6fff5f
X-Archives-Hash: 8869d766b3ff4d1ef6aa26587bd9dab0
commit: 02a6c2a31a74d492d4df38947341dea6636a5a82
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 18 15:05:42 2020 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 18 15:05:42 2020 +0000
URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=02a6c2a3
Replace ">" by ">" throughout.
Most instances are already being escaped, so convert the few remaining
ones for consistency throughout the document.
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
appendices/devbook-guide/text.xml | 4 ++--
archs/amd64/text.xml | 22 +++++++++++-----------
devbook.xsl | 2 +-
ebuild-writing/functions/src_install/text.xml | 2 +-
ebuild-writing/functions/src_test/text.xml | 4 ++--
ebuild-writing/using-eclasses/text.xml | 2 +-
general-concepts/autotools/text.xml | 2 +-
general-concepts/dependencies/text.xml | 14 +++++++-------
general-concepts/mirrors/text.xml | 2 +-
general-concepts/portage-cache/text.xml | 2 +-
general-concepts/use-flags/text.xml | 4 ++--
general-concepts/virtuals/text.xml | 2 +-
quickstart/text.xml | 8 ++++----
tools-reference/find/text.xml | 2 +-
tools-reference/sed/text.xml | 6 +++---
xsl/lang.highlight.c.xsl | 2 +-
xsl/lang.highlight.ebuild.xsl | 2 +-
17 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/appendices/devbook-guide/text.xml b/appendices/devbook-guide/text.xml
index 72e51e9..1a3d538 100644
--- a/appendices/devbook-guide/text.xml
+++ b/appendices/devbook-guide/text.xml
@@ -334,14 +334,14 @@ EAPI=7
DESCRIPTION="MicroGnuEmacs, a port from the BSDs"
HOMEPAGE="https://homepage.boetes.org/software/mg/"
-SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ppc ~ppc64 sparc x86"
RDEPEND="sys-libs/ncurses:0=
- >=dev-libs/libbsd-0.7.0"
+ >=dev-libs/libbsd-0.7.0"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
diff --git a/archs/amd64/text.xml b/archs/amd64/text.xml
index 73264df..057d92c 100644
--- a/archs/amd64/text.xml
+++ b/archs/amd64/text.xml
@@ -183,13 +183,13 @@ configurations.
2004.3
</ti>
<ti>
- *l->emul*
+ *l->emul*
</ti>
<ti>
d64
</ti>
<ti>
- *l->lib*
+ *l->lib*
</ti>
</tr>
<tr>
@@ -197,10 +197,10 @@ configurations.
2004.3/lib64
</ti>
<ti>
- *l->emul*
+ *l->emul*
</ti>
<ti>
- *l->64*
+ *l->64*
</ti>
<ti>
d64
@@ -208,13 +208,13 @@ configurations.
</tr>
<tr>
<ti>
- >=2005.0
+ >=2005.0
</ti>
<ti>
d32
</ti>
<ti>
- *l->64*
+ *l->64*
</ti>
<ti>
d64
@@ -222,13 +222,13 @@ configurations.
</tr>
<tr>
<ti>
- >=2005.0/no-multilib
+ >=2005.0/no-multilib
</ti>
<ti>
d32
</ti>
<ti>
- *l->64*
+ *l->64*
</ti>
<ti>
d64
@@ -236,7 +236,7 @@ configurations.
</tr>
<tr>
<ti>
- >=2005.0/no-symlink
+ >=2005.0/no-symlink
</ti>
<ti>
d32
@@ -250,7 +250,7 @@ configurations.
</tr>
<tr>
<ti>
- >=2005.0/no-symlink/no-lib32
+ >=2005.0/no-symlink/no-lib32
</ti>
<ti>
inexistant
@@ -278,7 +278,7 @@ configurations.
Directory containing XXbit objects
</dd>
<dt>
- l->foo
+ l->foo
</dt>
<dd>
Link to foo
diff --git a/devbook.xsl b/devbook.xsl
index 7a8af1b..0fd8766 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -413,7 +413,7 @@
</xsl:call-template>
</xsl:variable>
<xsl:variable name="extraction_counter" select="count(exslt:node-set($extraction_counter_node)//*[@value != 0]) + count(document(concat($path, @href, 'text.xml'))//*[name()=$extraction])"/>
- <xsl:if test="string($extraction) = '' or $extraction_counter > 0">
+ <xsl:if test="string($extraction) = '' or $extraction_counter > 0">
<li>
<a class="reference" href="{concat($path_rel, @href, 'index.html')}"><xsl:value-of select="document(concat($path, @href, 'text.xml'))/guide/chapter[1]/title"/></a>
<xsl:if test="$extraction != ''">
diff --git a/ebuild-writing/functions/src_install/text.xml b/ebuild-writing/functions/src_install/text.xml
index 010638b..1dd1bac 100644
--- a/ebuild-writing/functions/src_install/text.xml
+++ b/ebuild-writing/functions/src_install/text.xml
@@ -41,7 +41,7 @@ src_install() {
emake DESTDIR="${D}" install
fi
- if ! declare -p DOCS >/dev/null 2>&1 ; then
+ if ! declare -p DOCS >/dev/null 2>&1 ; then
local d
for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
FAQ CREDITS CHANGELOG ; do
diff --git a/ebuild-writing/functions/src_test/text.xml b/ebuild-writing/functions/src_test/text.xml
index 135eb39..c278aa0 100644
--- a/ebuild-writing/functions/src_test/text.xml
+++ b/ebuild-writing/functions/src_test/text.xml
@@ -34,9 +34,9 @@
<p>The default test phase in EAPI 6 is equivalent to the following:</p>
<codesample lang="ebuild">
src_test() {
- if emake check -n &> /dev/null; then
+ if emake check -n &> /dev/null; then
emake check
- elif emake test -n &> /dev/null; then
+ elif emake test -n &> /dev/null; then
emake test
fi
}
diff --git a/ebuild-writing/using-eclasses/text.xml b/ebuild-writing/using-eclasses/text.xml
index b957ca2..a1b7f08 100644
--- a/ebuild-writing/using-eclasses/text.xml
+++ b/ebuild-writing/using-eclasses/text.xml
@@ -48,7 +48,7 @@ SLOT="0"
KEYWORDS="alpha ~amd64 ~x86 ~x86-fbsd"
RDEPEND="sys-libs/ncurses:0=
- >=sys-libs/readline:0="
+ >=sys-libs/readline:0="
DEPEND="${RDEPEND}"
src_prepare() {
diff --git a/general-concepts/autotools/text.xml b/general-concepts/autotools/text.xml
index c6a9aa8..b7170ba 100644
--- a/general-concepts/autotools/text.xml
+++ b/general-concepts/autotools/text.xml
@@ -479,7 +479,7 @@ man_MANS = glep31check.1
EXTRA_DIST = glep31check.in
%.1 : %.in
- @regex_cmd@ -e "s,\@VERSION\@,$(VERSION),g" $? > $@
+ @regex_cmd@ -e "s,\@VERSION\@,$(VERSION),g" $? > $@
</codesample>
<p>
diff --git a/general-concepts/dependencies/text.xml b/general-concepts/dependencies/text.xml
index ff198fb..1a1d970 100644
--- a/general-concepts/dependencies/text.xml
+++ b/general-concepts/dependencies/text.xml
@@ -171,7 +171,7 @@ should be specified. A simple example:
</p>
<codesample lang="ebuild">
-DEPEND=">=dev-libs/openssl-0.9.7d"
+DEPEND=">=dev-libs/openssl-0.9.7d"
</codesample>
<p>
@@ -193,11 +193,11 @@ Available version specifiers are:
<th>Meaning</th>
</tr>
<tr>
- <ti><c>>=app-misc/foo-1.23</c></ti>
+ <ti><c>>=app-misc/foo-1.23</c></ti>
<ti>Version 1.23 or later is required.</ti>
</tr>
<tr>
- <ti><c>>app-misc/foo-1.23</c></ti>
+ <ti><c>>app-misc/foo-1.23</c></ti>
<ti>A version strictly later than 1.23 is required.</ti>
</tr>
<tr>
@@ -366,7 +366,7 @@ To depend on a specific version or version-range within a SLOT we use:
<codesample lang="ebuild">
DEPEND="qt3? ( ~x11-libs/qt-3.3.8:3 )
- gtk? ( >=x11-libs/gtk+-2.24.9:2 )
+ gtk? ( >=x11-libs/gtk+-2.24.9:2 )
</codesample>
</body>
@@ -453,12 +453,12 @@ DEPEND="!build? (
x11-libs/libXtst
x11-proto/xproto
x11-proto/xextproto
- >=x11-libs/gtk+-2.2
+ >=x11-libs/gtk+-2.2
x11-libs/pango
)
- >=media-libs/libart_lgpl-2.1
+ >=media-libs/libart_lgpl-2.1
)
- >=sys-libs/ncurses-5.2-r2
+ >=sys-libs/ncurses-5.2-r2
nls? ( sys-devel/gettext )
)"
</codesample>
diff --git a/general-concepts/mirrors/text.xml b/general-concepts/mirrors/text.xml
index 0d67e6a..61b8618 100644
--- a/general-concepts/mirrors/text.xml
+++ b/general-concepts/mirrors/text.xml
@@ -59,7 +59,7 @@ is necessary, please use <c>SRC_URI</c> arrow to rename the file. For example:
<codesample lang="ebuild">
# upstream updated the distfile in place, so suffix it with _YYYYMMDD
-SRC_URI="https://example.com/badupstream/${P}.tar.gz -> ${P}_20191016.tar.gz"
+SRC_URI="https://example.com/badupstream/${P}.tar.gz -> ${P}_20191016.tar.gz"
</codesample>
<p>
diff --git a/general-concepts/portage-cache/text.xml b/general-concepts/portage-cache/text.xml
index 13dcfae..ba9c0fa 100644
--- a/general-concepts/portage-cache/text.xml
+++ b/general-concepts/portage-cache/text.xml
@@ -19,7 +19,7 @@ So, the following will not work:
# DO NOT DO THIS!
if ! has_version "x11-libs/gtk+" ; then
DEPEND="${DEPEND}
- gtk? ( >=x11-libs/gtk+-2 )
+ gtk? ( >=x11-libs/gtk+-2 )
!gtk? ( =x11-libs/gtk+-1.2* )"
fi
</codesample>
diff --git a/general-concepts/use-flags/text.xml b/general-concepts/use-flags/text.xml
index 295bb8f..c591aaa 100644
--- a/general-concepts/use-flags/text.xml
+++ b/general-concepts/use-flags/text.xml
@@ -140,7 +140,7 @@ handle this by doing something like:
</p>
<codesample lang="ebuild">
-RDEPEND="x86? ( fakemedia? ( >=media-libs/fakemedia-1.1 ) )"
+RDEPEND="x86? ( fakemedia? ( >=media-libs/fakemedia-1.1 ) )"
</codesample>
<p>
@@ -175,7 +175,7 @@ and wouldn't break anything:
</p>
<codesample lang="ebuild">
-RDEPEND="fakemedia? ( >=media-libs/fakemedia-1-1 )"
+RDEPEND="fakemedia? ( >=media-libs/fakemedia-1-1 )"
</codesample>
<p>
diff --git a/general-concepts/virtuals/text.xml b/general-concepts/virtuals/text.xml
index bcea98d..b9889aa 100644
--- a/general-concepts/virtuals/text.xml
+++ b/general-concepts/virtuals/text.xml
@@ -30,7 +30,7 @@ DESCRIPTION="Virtual for C++ tr1 <type_traits>"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x86-fbsd"
-RDEPEND="|| ( >=sys-devel/gcc-4.1 dev-libs/boost )"
+RDEPEND="|| ( >=sys-devel/gcc-4.1 dev-libs/boost )"
</codesample>
<p>
diff --git a/quickstart/text.xml b/quickstart/text.xml
index 1655f8d..4cab04a 100644
--- a/quickstart/text.xml
+++ b/quickstart/text.xml
@@ -373,17 +373,17 @@ KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
IUSE="crypt imlib ipv6 ldap nls pda ssl xface"
RDEPEND="=x11-libs/gtk+-2*
- crypt? ( >=app-crypt/gpgme-0.4.5 )
+ crypt? ( >=app-crypt/gpgme-0.4.5 )
imlib? ( media-libs/imlib2 )
- ldap? ( >=net-nds/openldap-2.0.11 )
+ ldap? ( >=net-nds/openldap-2.0.11 )
pda? ( app-pda/jpilot )
ssl? ( dev-libs/openssl )
- xface? ( >=media-libs/compface-1.4 )
+ xface? ( >=media-libs/compface-1.4 )
app-misc/mime-types
x11-misc/shared-mime-info"
DEPEND="${RDEPEND}
dev-util/pkgconfig
- nls? ( >=sys-devel/gettext-0.12.1 )"
+ nls? ( >=sys-devel/gettext-0.12.1 )"
src_prepare() {
eapply "${FILESDIR}"/${PN}-namespace.diff \
diff --git a/tools-reference/find/text.xml b/tools-reference/find/text.xml
index 1746a72..e5942b2 100644
--- a/tools-reference/find/text.xml
+++ b/tools-reference/find/text.xml
@@ -124,7 +124,7 @@ Useful rules include:
</table>
<note>
-EAPI>=5 assumes GNU find, so it is safe to use GNU extensions in
+EAPI>=5 assumes GNU find, so it is safe to use GNU extensions in
ebuild context for those EAPIs.
</note>
diff --git a/tools-reference/sed/text.xml b/tools-reference/sed/text.xml
index fc0e78e..46e0a2e 100644
--- a/tools-reference/sed/text.xml
+++ b/tools-reference/sed/text.xml
@@ -50,7 +50,7 @@ from the plugin files and convert it to Vim help format.
# problems for us during the unmerge. Fortunately, sed can fix this
# for us. First, we extract the documentation:
sed -e '1,/^" HelpExtractorDoc:$/d' \
- "${S}"/plugin/ZoomWin.vim > ${S}/doc/ZoomWin.txt \
+ "${S}"/plugin/ZoomWin.vim > ${S}/doc/ZoomWin.txt \
|| die "help extraction failed"
# Then we remove the help extraction code from the plugin file:
sed -i -e '/^" HelpExtractor:$/,$d' "${S}"/plugin/ZoomWin.vim \
@@ -65,7 +65,7 @@ constructs are specific to <c>GNU sed 4</c> <d/> on non-GNU userland archs, the
guaranteed to be installed as part of <c>@system</c>. This was not
always the case,
which is why some packages, particularly those which use <c>sed -i</c>, have
-<c>DEPEND</c> s upon <c>>=sys-apps/sed-4</c>.
+<c>DEPEND</c> s upon <c>>=sys-apps/sed-4</c>.
</p>
</body>
@@ -82,7 +82,7 @@ sed [ option flags ] \
-e 'first command' \
-e 'second command' \
-e 'and so on' \
- input-file > output-file \
+ input-file > output-file \
|| die "Oops, sed didn't work!"
</codesample>
diff --git a/xsl/lang.highlight.c.xsl b/xsl/lang.highlight.c.xsl
index 730182c..089de50 100644
--- a/xsl/lang.highlight.c.xsl
+++ b/xsl/lang.highlight.c.xsl
@@ -59,7 +59,7 @@
</span>
</xsl:when>
- <xsl:when test="$commentOpen != $commentClosed and position() > $commentOpen">
+ <xsl:when test="$commentOpen != $commentClosed and position() > $commentOpen">
<span class="Comment"><xsl:value-of select="."/></span>
</xsl:when>
diff --git a/xsl/lang.highlight.ebuild.xsl b/xsl/lang.highlight.ebuild.xsl
index 9f90fb1..bbf9c64 100644
--- a/xsl/lang.highlight.ebuild.xsl
+++ b/xsl/lang.highlight.ebuild.xsl
@@ -390,7 +390,7 @@
<!-- See if we should be processing comments by now; we need to test for
two possible cases: * commentSeeker != 0 (so we have a comment), or,
* the first token is a "#" -->
- <xsl:when test="($commentSeeker != 0 and position() > $commentSeeker) or substring(../*[position()=1], 1, 1) = $lang.highlight.ebuild.commentChar or
+ <xsl:when test="($commentSeeker != 0 and position() > $commentSeeker) or substring(../*[position()=1], 1, 1) = $lang.highlight.ebuild.commentChar or
. = $lang.highlight.ebuild.commentChar">
<span class="Comment"><xsl:value-of select="."/></span>
</xsl:when>