From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1445567-garchives=archives.gentoo.org@lists.gentoo.org> 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 C647A158094 for <garchives@archives.gentoo.org>; Mon, 10 Oct 2022 19:49:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B425CE0909; Mon, 10 Oct 2022 19:49:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 99D97E0909 for <gentoo-commits@lists.gentoo.org>; Mon, 10 Oct 2022 19:49:26 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 97EB7340A12 for <gentoo-commits@lists.gentoo.org>; Mon, 10 Oct 2022 19:49:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D40375F7 for <gentoo-commits@lists.gentoo.org>; Mon, 10 Oct 2022 19:49:23 +0000 (UTC) From: "Sam James" <sam@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, "Sam James" <sam@gentoo.org> Message-ID: <1665431354.44c41c039af26607809ca1991d0538e9716eaa19.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: man/ X-VCS-Repository: proj/portage X-VCS-Files: man/emerge.1 X-VCS-Directories: man/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 44c41c039af26607809ca1991d0538e9716eaa19 X-VCS-Branch: master Date: Mon, 10 Oct 2022 19:49:23 +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: b71317d8-7cb7-44ef-9241-7cc1a7a6e9c3 X-Archives-Hash: 246c7b933d3952660bc351a3658914a7 commit: 44c41c039af26607809ca1991d0538e9716eaa19 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Oct 4 12:31:04 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Oct 10 19:49:14 2022 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=44c41c03 man: emerge.1: mention gpkg Signed-off-by: Sam James <sam <AT> gentoo.org> man/emerge.1 | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/man/emerge.1 b/man/emerge.1 index 4eaf073e2..f70ae9f23 100644 --- a/man/emerge.1 +++ b/man/emerge.1 @@ -4,8 +4,8 @@ emerge \- Command\-line interface to the Portage system .SH "SYNOPSIS" .TP .BR emerge -[\fIoptions\fR] [\fIaction\fR] [\fIebuild\fR | \fItbz2file\fR | \fIfile\fR | -\fI@set\fR | \fIatom\fR] ... +[\fIoptions\fR] [\fIaction\fR] [\fIebuild\fR | \fItbz2 file\fR | \fIgpkg file\fR | +\fIfile\fR | \fI@set\fR | \fIatom\fR] ... .TP .BR emerge \fB\-\-sync\fR [\fIrepo\fR | \fIalias\fR] ... @@ -30,8 +30,8 @@ distribution. .SH "EBUILDS, TBZ2S, SETS AND ATOMS" \fBemerge\fR primarily installs packages. You can specify packages to install in five possible ways: an \fIatom\fR, -a \fIset\fR, an installed \fIfile\fR, an \fIebuild\fR, or -a \fItbz2file\fR. +a \fIset\fR, an installed \fIfile\fR, an \fIebuild\fR, a +a \fItbz2\fR file, or a \fIgpkg\fR file. .LP .TP .BR ebuild @@ -47,11 +47,17 @@ The \fIebuild\fR may also be an actual filename, such as \fBWARNING:\fR The implementation of \fBemerge /path/to/ebuild\fR is broken and so this syntax shouldn't be used. .TP -.BR tbz2file -A \fItbz2file\fR must be a valid .tbz2 created with \fBebuild +.BR "tbz2 file" +A \fItbz2\fR file must be a valid .tbz2 created with \fBebuild <package>\-<version>.ebuild package\fR or \fBemerge \-\-buildpkg [category/]<package>\fR or \fBquickpkg [category/]<package>\fR. .TP +.BR "gpkg file" +A \fIgpkg\fR file must be a valid .gpkg created with \fBebuild +<package>\-<version>.ebuild package\fR or \fBemerge \-\-buildpkg +[category/]<package>\fR or \fBquickpkg [category/]<package>\fR +with \fBBINPKG_FORMAT="gpkg"\fR. +.TP .BR file A \fIfile\fR must be a file or directory that has been installed by one or more packages. If an absolute path is not used, then it must begin with @@ -99,9 +105,9 @@ specific \fBSLOT\fR by appending a colon and a \fBSLOT\fR. Example: If no action is specified, the action is to merge in the specified packages, satisfying any dependencies that they may have. The arguments can be \fIatoms\fR, \fIsets\fR, installed \fIfiles\fR, -\fIebuilds\fR, or \fItbz2s\fR. +\fIebuilds\fR, \fItbz2s\fR, or \fIgpkgs\fR. \fBNote that you need to use the \-\-usepkg -option if you want to install a tbz2\fR. The packages are added +option if you want to install a tbz2 or a gpkg.\fR The packages are added to the \fBworld\fR file at the end, so that they are considered for later updating. .TP @@ -457,10 +463,10 @@ naturally oppose eachother. Tells emerge to build binary packages for all ebuilds processed in addition to actually merging the packages. Useful for maintainers or if you administrate multiple Gentoo Linux systems (build once, -emerge tbz2s everywhere) as well as disaster recovery. The package +emerge tbz2s or gpkgs everywhere) as well as disaster recovery. The package will be created in the \fBPKGDIR\fR directory (see \fBmake.conf\fR(5)). An alternative for already\-merged -packages is to use \fBquickpkg\fR(1) which creates a tbz2 from the +packages is to use \fBquickpkg\fR(1) which creates a tbz2 or gpkg from the live filesystem. .TP .BR \-\-buildpkg\-exclude " ATOMS"