From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-776595-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 99011138A87
	for <garchives@archives.gentoo.org>; Tue, 24 Feb 2015 00:38:37 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 1660DE081E;
	Tue, 24 Feb 2015 00:38:37 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 99BFBE081E
	for <gentoo-commits@lists.gentoo.org>; Tue, 24 Feb 2015 00:38:36 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 647C0340960
	for <gentoo-commits@lists.gentoo.org>; Tue, 24 Feb 2015 00:38:35 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 0CF2F12698
	for <gentoo-commits@lists.gentoo.org>; Tue, 24 Feb 2015 00:38:34 +0000 (UTC)
From: "Zac Medico" <zmedico@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, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <1424738268.86a675d7c9979f245499dd8d2253557933b6a3fe.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: man/
X-VCS-Repository: proj/portage
X-VCS-Files: man/portage.5
X-VCS-Directories: man/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: 86a675d7c9979f245499dd8d2253557933b6a3fe
X-VCS-Branch: master
Date: Tue, 24 Feb 2015 00:38:34 +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-Archives-Salt: 6f7a3068-332e-4253-8bb6-0e6fffa29ee4
X-Archives-Hash: 6d7ebdc3b554ba6a5669484f51b19a4d

commit:     86a675d7c9979f245499dd8d2253557933b6a3fe
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 24 00:13:41 2015 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Feb 24 00:37:48 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=86a675d7

man/portage.5: document sets.conf (bug 541188)

This documents /etc/portage/sets.conf, /usr/portage/sets.conf, and
/usr/share/portage/config/sets. It refers to "Package Set Configuration"
section of the html documentation for more information.

X-Gentoo-Bug: 541188
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=541188
Acked-by: Brian Dolbec <dolsen <AT> gentoo.org>

---
 man/portage.5 | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/man/portage.5 b/man/portage.5
index ed5140d..3a64206 100644
--- a/man/portage.5
+++ b/man/portage.5
@@ -1,4 +1,4 @@
-.TH "PORTAGE" "5" "Jan 2015" "Portage VERSION" "Portage"
+.TH "PORTAGE" "5" "Feb 2015" "Portage VERSION" "Portage"
 .SH NAME
 portage \- the heart of Gentoo
 .SH "DESCRIPTION"
@@ -65,6 +65,7 @@ package.use
 postsync.d
 repo.postsync.d
 repos.conf
+sets.conf
 .fi
 .TP
 .BR /etc/portage/env/
@@ -76,6 +77,11 @@ site-specific overrides of \fB/etc/portage/make.profile/\fR
 .BR /etc/portage/sets/
 user\-defined package sets
 .TP
+.BR /usr/portage/
+.nf
+sets.conf
+.fi
+.TP
 .BR /usr/portage/metadata/
 .nf
 layout.conf
@@ -112,6 +118,7 @@ use.stable.force
 .nf
 make.globals
 repos.conf
+sets
 .fi
 .TP
 .BR /var/cache/edb/
@@ -1066,6 +1073,30 @@ sync\-uri = git://git.overlays.gentoo.org/proj/voip.git
 auto\-sync = yes
 .fi
 .RE
+.TP
+.BR sets.conf
+A package set configuration file. Settings here override settings from
+\fB/usr/portage/sets.conf\fR and \fB/usr/share/portage/config/sets\fR.
+The format is described extensively in the
+\fIPackage Set Configuration\fR section of the html documentation which
+is installed with portage when the "doc" USE flag is enabled.
+
+.I Example:
+.nf
+[world]
+class = portage.sets.base.DummyPackageSet
+packages = @profile @selected @system
+
+[usersets]
+class = portage.sets.files.StaticFileSet
+multiset = true
+directory =  %(PORTAGE_CONFIGROOT)setc/portage/sets
+world-candidate = True
+
+[module-rebuild]
+class = portage.sets.dbapi.OwnerSet
+files = /lib/modules
+.fi
 .RE
 .TP
 .BR /etc/portage/env/
@@ -1106,6 +1137,15 @@ Also see \fB/var/lib/portage/world_sets\fR and the \fBemerge\fR(1)
 \fB\-\-list\-sets\fR option.
 .RE
 .TP
+.BR /usr/portage/
+.RS
+.TP
+.BR sets.conf
+A package set configuration file. Also see \fB/etc/portage/sets.conf\fR
+which overrides these settings, and
+\fB/usr/share/portage/config/sets\fR which contains default settings.
+.RE
+.TP
 .BR /usr/portage/metadata/
 .RS
 .TP
@@ -1470,6 +1510,13 @@ The default configuration of repositories for Portage.  This comes from
 the portage package itself.  Settings in \fB/etc/portage/repos.conf\fR
 override values set here. The format is described extensively in section
 for \fB/etc/portage/repos.conf\fR.
+.TP
+.BR sets
+A directory containing package set configuration files. Also see
+\fB/etc/portage/sets.conf\fR and \fB/usr/portage/sets.conf\fR, both of
+which override values set here. Default set configurations are installed
+in \fB/usr/share/portage/config/sets/portage.conf\fR.
+.RE
 .RE
 .TP
 .BR /var/cache/edb/