From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E0B3C158089 for ; Sat, 16 Sep 2023 05:48:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 30BF12BC018; Sat, 16 Sep 2023 05:48:03 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E511E2BC018 for ; Sat, 16 Sep 2023 05:48:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CF123335D2F for ; Sat, 16 Sep 2023 05:48:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7E52011BA for ; Sat, 16 Sep 2023 05:48:00 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1694843277.3b1e0733abf2fdc634a64f4e118b987aec33c6fc.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: man/ X-VCS-Repository: proj/portage X-VCS-Files: man/ebuild.5 man/emerge.1 man/make.conf.5 man/portage.5 X-VCS-Directories: man/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3b1e0733abf2fdc634a64f4e118b987aec33c6fc X-VCS-Branch: master Date: Sat, 16 Sep 2023 05:48:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3189638f-be88-4eac-8687-cbca6e101012 X-Archives-Hash: 68e43dfc819d2dc10d87d22d61755d79 commit: 3b1e0733abf2fdc634a64f4e118b987aec33c6fc Author: Mike Gilbert gentoo org> AuthorDate: Fri Sep 15 17:41:16 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat Sep 16 05:47:57 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=3b1e0733 man: use groff escape sequence for tilde characters groff replaces normal tilde (~) with a weird "modifier" on output. Use the escape sequence from groff_char(7) to avoid this. Signed-off-by: Mike Gilbert gentoo.org> Closes: https://github.com/gentoo/portage/pull/1094 Signed-off-by: Sam James gentoo.org> man/ebuild.5 | 18 +++++++++--------- man/emerge.1 | 6 +++--- man/make.conf.5 | 6 +++--- man/portage.5 | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/man/ebuild.5 b/man/ebuild.5 index d4187a8a47..9dd14d8afb 100644 --- a/man/ebuild.5 +++ b/man/ebuild.5 @@ -62,20 +62,20 @@ operators: \fI<\fRmedia\-libs/libgd\-1.6 .fi .TP -.B Extended Atom Prefixes [!~] and Postfixes [*] +.B Extended Atom Prefixes [!\(ti] and Postfixes [*] Now to get even fancier, we provide the ability to define blocking packages and version range matching. Also note that these extended prefixes/postfixes may be combined in any way with the atom classes defined above. .RS .TP -.I ~ +.I \(ti means match any revision of the base version specified. So in the example below, we would match versions '1.0.2a', '1.0.2a\-r1', '1.0.2a\-r2', etc... \fBExample\fR: .nf - \fI~\fRnet\-libs/libnet\-1.0.2a + \fI\(ti\fRnet\-libs/libnet\-1.0.2a .fi .TP .I ! @@ -120,7 +120,7 @@ Beginning with \fBEAPI 1\fR, any atom can be constrained to match a specific \fBExamples\fR: .nf x11\-libs/qt:3 - \fI~\fRx11\-libs/qt-3.3.8:3 + \fI\(ti\fRx11\-libs/qt-3.3.8:3 \fI>=\fRx11\-libs/qt-3.3.8:3 \fI=\fRx11\-libs/qt-3.3*:3 .fi @@ -572,7 +572,7 @@ file name, should be separated by whitespace. Should contain a list of URIs for the sources main sites and other further package dependent information. .TP -.B KEYWORDS\fR = \fI[\-~][x86,ppc,sparc,mips,alpha,arm,hppa,...] +.B KEYWORDS\fR = \fI[\-\(ti][x86,ppc,sparc,mips,alpha,arm,hppa,...] .P KEYWORDS works in conjunction with ACCEPT_KEYWORDS (see \fBmake.conf\fR(5)) @@ -590,9 +590,9 @@ Any ebuild that then has "amd64" in KEYWORDS will be unmasked by default. On an "unstable" -amd64 system, ACCEPT_KEYWORDS will be set to "amd64 ~amd64", with the +amd64 system, ACCEPT_KEYWORDS will be set to "amd64 \(tiamd64", with the tilde denoting "unstable." Then, if an ebuild has \fIeither\fR -"amd64" or "~amd64" in KEYWORDS, it will be keyword unmasked by default on +"amd64" or "\(tiamd64" in KEYWORDS, it will be keyword unmasked by default on that system. Similarly, if an ebuild is known to not be compatible with a particular architecture, the "\-" prefix ( i.e. "\-amd64") setting can be specified to mask it only on that arch. @@ -612,7 +612,7 @@ This would be done by specifying "\-ppc", for example. This will ensure that it is explicitly keyword\-masked for that architecture. .IP \(bu When submitting an ebuild to Gentoo Linux, it is the project policy to only -have "~arch" set in KEYWORDS +have "\(tiarch" set in KEYWORDS for the architecture for which it has been successfully tested, and no more. As the ebuild receives more testing, Gentoo arch teams will gradually expand the KEYWORDS settings to "bump" the package to unstable, and possibly stable. @@ -1605,7 +1605,7 @@ SRC_URI="ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.gz" LICENSE="GPL\-2" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="\(tiamd64" BDEPEND="nls? ( sys-devel/gettext )" diff --git a/man/emerge.1 b/man/emerge.1 index c9f4e45421..ed3cf929fe 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -1290,10 +1290,10 @@ Symbol Mask Type # package.mask * missing keyword -~ unstable keyword +\(ti unstable keyword .TE -\fBNOTE:\fR The unstable keyword symbol (~) will not be shown in cases +\fBNOTE:\fR The unstable keyword symbol (\(ti) will not be shown in cases in which the corresponding unstable keywords have been accepted globally via \fBACCEPT_KEYWORDS\fR. .TP @@ -1370,7 +1370,7 @@ The \fBKEYWORDS\fR variable in an \fBebuild\fR file is also used for masking a package still in testing. There are architecture\-specific keywords for each package that let \fBportage\fR know which systems are compatible with the package. Packages which compile on an architecture, but have not been -proven to be "stable", are masked with a tilde (\fB~\fR) in front of the +proven to be "stable", are masked with a tilde (\fB\(ti\fR) in front of the architecture name. \fBemerge\fR examines the \fBACCEPT_KEYWORDS\fR environment variable to allow or disallow the emerging of a package masked by \fBKEYWORDS\fR. To inform \fBemerge\fR that it should build these 'testing' diff --git a/man/make.conf.5 b/man/make.conf.5 index 2a28d2b6f7..8f6c444ba1 100644 --- a/man/make.conf.5 +++ b/man/make.conf.5 @@ -51,9 +51,9 @@ Defaults to the value of $CHOST. .TP \fBACCEPT_KEYWORDS\fR = \fI[space delimited list of KEYWORDS]\fR Enable testing of ebuilds that have not yet been deemed 'stable'. Users -of the 'x86' architecture would set this to '~x86' while ppc users would -set this to '~ppc'. This is an incremental variable. Only define a -~arch. +of the 'x86' architecture would set this to '\(tix86' while ppc users would +set this to '\(tippc'. This is an incremental variable. Only define a +\(tiarch. .br Defaults to the value of $ARCH. .TP diff --git a/man/portage.5 b/man/portage.5 index 1c0ce22bdb..91c3ffdb45 100644 --- a/man/portage.5 +++ b/man/portage.5 @@ -607,7 +607,7 @@ Files in this directory, including make.conf, repos.conf, sets.conf, and any file with a name that begins with "package." can also be directories. If it is a directory, then all the files in that directory, excluding files -that begin with '.' or end with '~', will be sorted in lexical order by file +that begin with '.' or end with '\(ti', will be sorted in lexical order by file name and summed together as if they were a single file. .I Example: @@ -761,9 +761,9 @@ modifies effective KEYWORDS (rather than ACCEPT_KEYWORDS). .I Example: # always use unstable libgd -media\-libs/libgd ~x86 +media\-libs/libgd \(tix86 # only use stable mplayer -media\-video/mplayer \-~x86 +media\-video/mplayer \-\(tix86 # always use unstable netcat net-analyzer/netcat .fi @@ -775,7 +775,7 @@ three special tokens: .nf \fB*\fR package is visible if it is stable on any architecture -\fB~*\fR package is visible if it is in testing on any architecture +\fB\(ti*\fR package is visible if it is in testing on any architecture \fB**\fR package is always visible (KEYWORDS are ignored completely) .fi @@ -1683,7 +1683,7 @@ given package should vary depending on which profile the user has selected. # add stable keyword to libgd media\-libs/libgd x86 # remove stable keyword from mplayer and add unstable keyword -media\-video/mplayer \-x86 ~x86 +media\-video/mplayer \-x86 \(tix86 # remove all keywords from netcat net-analyzer/netcat -* .fi