[gentoo-commits] proj/layman:master commit in: doc/

[gentoo-commits] proj/layman:master commit in: doc/

[Sebastian Pipping]

commit:     1d1a3a78111f6204f60649119d53856f27da8ae3
Author:     Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Tue Feb  8 03:30:06 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Feb  8 03:36:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=1d1a3a78

Makefile: Extract version from layman/version.py (was hardcoded before)

---
 doc/Makefile |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index 93d8180..b5dbaf3 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -17,6 +17,8 @@ HTML_PAGES = layman.8.html
 
 TMPFILE=./layman.man
 
+PACKAGE_VERSION = `fgrep "VERSION = " ../layman/version.py | sed 's|^VERSION = '"'"'\(.\+\)'"'"'$$|\1|'`
+
 all: man html
 
 html: $(HTML_PAGES)
@@ -27,10 +29,10 @@ clean:
 	rm -f $(MAN_PAGES)
 	rm -f $(HTML_PAGES)
 
-%.html: %.txt
+%.html: %.txt ../layman/version.py
 	@echo HTML $@
-	a2x --conf-file=asciidoc.conf  --attribute="laymanversion=1.4.1" --format=xhtml "$<"
+	a2x --conf-file=asciidoc.conf  --attribute="laymanversion=$(PACKAGE_VERSION)" --format=xhtml "$<"
 
-%: %.txt
+%: %.txt ../layman/version.py
 	@echo MAN $@
-	a2x --conf-file=asciidoc.conf  --attribute="laymanversion=1.4.1" --format=manpage "$<"
+	a2x --conf-file=asciidoc.conf  --attribute="laymanversion=$(PACKAGE_VERSION)" --format=manpage "$<"

[gentoo-commits] proj/layman:master commit in: doc/

[Brian Dolbec]

commit:     f7f4c8eba9212c9474800bbd8ea5da104005f45c
Author:     dol-sen <brian.dolbec <AT> gmail <DOT> com>
AuthorDate: Fri Jul 22 02:40:58 2011 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri Jul 22 02:40:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=f7f4c8eb

update manpage

---
 doc/layman.8.txt |   58 ++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/doc/layman.8.txt b/doc/layman.8.txt
index 94fa650..a8e57e1 100644
--- a/doc/layman.8.txt
+++ b/doc/layman.8.txt
@@ -204,6 +204,26 @@ nocheck::
     Set to "yes" if *layman* should stop worrying about overlays
     with missing a contact address or the description.
 
+*New*
+Per repository type Add, Sync options.
+
+bzr_addopts :
+bzr_syncopts :
+...
+    These are command options to include in the commands sent to perform
+    the desired action.
+
+Per repository type Post Sync, Add hooks.
+
+bzr_postsync :
+cvs_postsync :
+darcs_postsync :
+git_postsync :
+...
+    These are commands that are run after each add, sync operation if they
+    are defined.
+
+
 
 HANDLING OVERLAYS
 -----------------
@@ -233,6 +253,9 @@ will merge the contents of all lists.
 
 *layman* also allows you to define local files in this list.
 Just make sure you prepend these path names in standard URL notation with 'file://'.
+*New* is the ability to just add an overlay definition to /etc/layman/overlays/
+ some-overlay.xml and it will be automatically available for actions such as
+  add, delete, info...  (see below for file format details)
 
 If you need to use a proxy for access to the Internet, you can use
 the corresponding variable in the *layman* configuration file.
@@ -328,8 +351,10 @@ on 'http://gpo.zugaina.org/'.
 OVERLAY TYPES
 ~~~~~~~~~~~~~
 Currently *layman* supports overlays that are exported via *rsync*,
-*subversion*, *bzr*, *darcs*, *git*, *mercurial* or provided as tar
-packages.
+*CVS*, *subversion*, *bzr*, *darcs*, *git*, *mercurial* or provided as *tar*
+packages.  It also supports the generated overlay type *g-common* installed
+with the g-cran package (at time of this writing, only available in the science
+ overlay).
 
 
 OVERLAY LISTS
@@ -347,18 +372,18 @@ Example 1. An example overlays.xml file
 <!DOCTYPE repositories SYSTEM "/dtd/repositories.dtd">
 <repositories xmlns="" version="1.0">
 <repo quality="experimental" status="official">
-	<name>gnome</name>
-	<description>experimental gnome ebuilds</description>
-	<homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=summary</homepage>
-	<owner type="project">
-		<email>gnome@gentoo.org</email>
-		<name>GNOME herd</name>
-	</owner>
-	<source type="git">git://git.overlays.gentoo.org/proj/gnome.git</source>
-	<source type="git">http://git.overlays.gentoo.org/gitroot/proj/gnome.git</source>
-	<source type="git">git+ssh://git@git.overlays.gentoo.org/proj/gnome.git</source>
-	<feed>http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=atom</feed>
-	<feed>http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=rss</feed>
+    <name>gnome</name>
+    <description>experimental gnome ebuilds</description>
+    <homepage>http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=summary</homepage>
+    <owner type="project">
+        <email>gnome@gentoo.org</email>
+        <name>GNOME herd</name>
+    </owner>
+    <source type="git">git://git.overlays.gentoo.org/proj/gnome.git</source>
+    <source type="git">http://git.overlays.gentoo.org/gitroot/proj/gnome.git</source>
+    <source type="git">git+ssh://git@git.overlays.gentoo.org/proj/gnome.git</source>
+    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=atom</feed>
+    <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=rss</feed>
 </repo>
 </repositories>
 -------------------------------------------
@@ -368,7 +393,9 @@ ADDING AN OVERLAY LOCALLY
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 Simply create an overlay list in the format described above and run
 *layman* with the -o switch. You need to prepend local file URLs
-with 'file://'.
+with 'file://'.  *New* is the ability to just add an overlay definition like
+ the above to /etc/layman/overlays/ some-overlay.xml and it will be
+ automatically available for actions such as add, delete, info...
 
 
 ADDING AN OVERLAY GLOBALLY
@@ -426,6 +453,7 @@ AUTHORS
 -------
 - Gunnar Wrobel <wrobel@gentoo.org>
 - Sebastian Pipping <sping@gentoo.org>
+- Brian Dolbec <brian.dolbec@gmail.com>
 
 
 REPORTING BUGS

[gentoo-commits] proj/layman:master commit in: doc/

[Brian Dolbec]

commit:     cea2072fcc0fa1bfb05fd0146e643f3db16d113e
Author:     dol-sen <brian.dolbec <AT> gmail <DOT> com>
AuthorDate: Sat Aug 13 15:00:20 2011 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sat Aug 13 15:00:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=cea2072f

fix wrong variable name in the layman.cfg explanations.

---
 doc/layman.8.txt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/layman.8.txt b/doc/layman.8.txt
index a8e57e1..00977b7 100644
--- a/doc/layman.8.txt
+++ b/doc/layman.8.txt
@@ -172,7 +172,7 @@ cache::
     *layman* will store the downloaded global list of overlays here.
     The default is '%(storage)s/cache.xml'.
 
-overlays::
+local_list::
     *layman* will store the list of installed overlays here.
     The default is '%(storage)s/overlays.xml'.
 
@@ -394,7 +394,7 @@ ADDING AN OVERLAY LOCALLY
 Simply create an overlay list in the format described above and run
 *layman* with the -o switch. You need to prepend local file URLs
 with 'file://'.  *New* is the ability to just add an overlay definition like
- the above to /etc/layman/overlays/ some-overlay.xml and it will be
+ the above to /etc/layman/overlays/some-overlay.xml and it will be
  automatically available for actions such as add, delete, info...
 
 

[gentoo-commits] proj/layman:master commit in: doc/

[Brian Dolbec]

commit:     22364beaf81bec677c72cc58a385a57be07565a0
Author:     dol-sen <brian.dolbec <AT> gmail <DOT> com>
AuthorDate: Sun Sep 18 00:44:59 2011 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sun Sep 18 00:44:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=22364bea

man page updates, formatting changes.

---
 doc/layman.8.txt |   43 +++++++++++++++++++++++++------------------
 1 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/doc/layman.8.txt b/doc/layman.8.txt
index 00977b7..0558b67 100644
--- a/doc/layman.8.txt
+++ b/doc/layman.8.txt
@@ -137,12 +137,12 @@ List of other available *layman* options.
 *-N*, *--nocolor*::
     Remove color codes from the *layman* output.
 
-*-Q*'LEVEL', *--quietness*='LEVEL'::
+*-Q* 'LEVEL', *--quietness*='LEVEL'::
     Makes *layman* less verbose. Choose a value between 0 and 4
     with 0 being completely quiet. Once you set this below 3,
     the same warning as given for *--quiet* applies.
 
-*-p*'LEVEL', *--priority*='LEVEL'::
+*-p* 'LEVEL', *--priority*='LEVEL'::
     Use this option in combination with the *--add*. It will modify
     the priority of the added overlay and thus influence the order
     of entries in the make.conf file. The lower the priority,
@@ -172,9 +172,9 @@ cache::
     *layman* will store the downloaded global list of overlays here.
     The default is '%(storage)s/cache.xml'.
 
-local_list::
+installed::
     *layman* will store the list of installed overlays here.
-    The default is '%(storage)s/overlays.xml'.
+    The default is '%(storage)s/installed.xml'.
 
 make.conf::
     This is the *portage* configuration file that *layman* will
@@ -187,8 +187,12 @@ make.conf::
     external file that only contains the setting for
     *PORTDIR_OVERLAY*. This file is then sourced at the end of
     '/etc/make.conf'. This is the reason why *layman* suggests running
-    `echo 'source /var/lib/layman/make.conf' >> /etc/make.conf`
-    after it has been installed.
+    the following *after* it has been installed.
+
+    echo 'source /var/lib/layman/make.conf' >> /etc/make.conf
+
+
+
 
 overlays::
     Specifies the URL for the remote list of all available overlays.
@@ -204,22 +208,23 @@ nocheck::
     Set to "yes" if *layman* should stop worrying about overlays
     with missing a contact address or the description.
 
-*New*
-Per repository type Add, Sync options.
+*NEW* Per repository type Add, Sync options.
 
-bzr_addopts :
-bzr_syncopts :
-...
+bzr_addopts::
+bzr_syncopts::
+cvs_addopts::
+cvs_syncopts::
+...::
     These are command options to include in the commands sent to perform
     the desired action.
 
-Per repository type Post Sync, Add hooks.
+*NEW* Per repository type Post Add, Sync hooks.
 
-bzr_postsync :
-cvs_postsync :
-darcs_postsync :
-git_postsync :
-...
+bzr_postsync::
+cvs_postsync::
+darcs_postsync::
+git_postsync::
+...::
     These are commands that are run after each add, sync operation if they
     are defined.
 
@@ -342,7 +347,9 @@ SEARCHING EBUILDS IN OVERLAYS
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 You can search through the ebuilds available in the overlays on
 'http://overlays.gentoo.org/' by using *eix*. Emerge the package and
-run `update-eix-remote update`.
+run:
+
+    update-eix-remote update
 
 Alternatively, you can browse overlays that you have not installed
 on 'http://gpo.zugaina.org/'.

[gentoo-commits] proj/layman:master commit in: doc/

[Brian Dolbec]

commit:     ae3d902f050ecd64bac1eab0a499e1bed8a20907
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 18 00:12:08 2012 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Thu Oct 18 00:12:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=ae3d902f

missesd one make.conf.

---
 doc/layman.8.txt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/layman.8.txt b/doc/layman.8.txt
index 758c14f..57705af 100644
--- a/doc/layman.8.txt
+++ b/doc/layman.8.txt
@@ -275,8 +275,8 @@ There exists only one such cache file and it will be overwritten
 every time you run *layman*.
 
 
-HANDLING /ETC/MAKE.CONF
-~~~~~~~~~~~~~~~~~~~~~~~
+HANDLING /ETC/PORTAGE/MAKE.CONF
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Since *layman* is designed to automatically handle the inclusion of
 overlays into your system it needs to be able to modify the
 *PORTDIR_OVERLAY* variable in your '/etc/portage/make.conf' file.

[gentoo-commits] proj/layman:master commit in: doc/

[Brian Dolbec]

commit:     c19187f5d7e8b5226e3b9f1903f6677c87f87383
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 20 20:54:34 2012 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sat Oct 20 20:54:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=c19187f5

add /var/lib/layman/make.conf to Files: . Set myself as Author so the html/man page shows a current/valid email (current maintainer, developer) rather than Gunnar's...

---
 doc/layman.8.txt |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/doc/layman.8.txt b/doc/layman.8.txt
index 57705af..3dd0475 100644
--- a/doc/layman.8.txt
+++ b/doc/layman.8.txt
@@ -2,7 +2,7 @@ LAYMAN(8)
 =========
 :man source:   layman {laymanversion}
 :man manual:   layman {laymanversion}
-Gunnar Wrobel <wrobel@gentoo.org>
+Brian Dolbec <dolsen@gentoo.org>
 
 
 NAME
@@ -454,11 +454,14 @@ FILES
 -----
 '/etc/layman/layman.cfg'::
     Configuration file, holding the defaults for *layman*
+'/var/lib/layman/make.conf'::
+    Configuration file that layman modifies to
+    register the installed overlay(s) with the package manager
 
 
 AUTHORS
 -------
-- Gunnar Wrobel <wrobel@gentoo.org>
+- Gunnar Wrobel <wrobel@gentoo.org> (original, retired)
 - Sebastian Pipping <sping@gentoo.org>
 - Brian Dolbec <brian.dolbec@gmail.com>
 

[gentoo-commits] proj/layman:master commit in: doc/

[Brian Dolbec]

commit:     1466f259968a1aefaf2892c25409f511e0a33617
Author:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  5 06:24:59 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Thu Jun 12 21:11:50 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=1466f259

layman.8.txt: Adds changes to reflect new features in layman

---
 doc/layman.8.txt | 142 +++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 96 insertions(+), 46 deletions(-)

diff --git a/doc/layman.8.txt b/doc/layman.8.txt
index 3dd0475..fa75fac 100644
--- a/doc/layman.8.txt
+++ b/doc/layman.8.txt
@@ -16,23 +16,25 @@ SYNOPSIS
 
 *layman* (*-d*|*--delete*) (*ALL*|'OVERLAY')
 
-*layman* (*-s*|*--sync*) (*ALL*|'OVERLAY')
+*layman* (*-f*|*--fetch*)
 
 *layman* (*-i*|*--info*) (*ALL*|'OVERLAY')
 
-*layman* (*-S*|*--sync-all*)
-
 *layman* (*-L*|*--list*)
 
 *layman* (*-l*|*--list-local*)
 
-*layman* (*-f*|*--fetch*)
+*layman* (*-r*|*--readd*) (*ALL*|'OVERLAY')
+
+*layman* (*-s*|*--sync*) (*ALL*|'OVERLAY')
+
+*layman* (*-S*|*--sync-all*)
 
 
 DESCRIPTION
 -----------
-*layman* is a script that allows you to add, remove and update
-Gentoo overlays from a variety of sources.
+*layman* is a script that allows you to add, remove, re-add, and 
+update Gentoo overlays from a variety of sources.
 
 WARNING
 ~~~~~~~
@@ -57,12 +59,6 @@ ACTIONS
 ~~~~~~~
 List of possible *layman* actions.
 
-*-f*, *--fetch*::
-    Fetches the remote list of overlays. You will usually NOT need
-to explicitly specify this option. The fetch operation will be
-performed automatically once you run the sync, sync-all, or list action.
-You can prevent this automatic fetching using the *--nofetch* option.
-
 *-a* 'OVERLAY', *--add*='OVERLAY'::
     Add the given overlay from the cached remote list to your
     locally installed overlays. Specify "ALL" to add all overlays
@@ -70,32 +66,63 @@ You can prevent this automatic fetching using the *--nofetch* option.
 
 *-d* 'OVERLAY', *--delete*='OVERLAY'::
     Remove the given overlay from your locally installed overlays.
-    Specify "ALL" to remove all overlays
+    Specify "ALL" to remove all overlays.
 
-*-s* 'OVERLAY', *--sync*='OVERLAY'::
-    Update the specified overlay. Use "ALL" as parameter to
-    synchronize all overlays
+*-f*, *--fetch*::
+    Fetches the remote list of overlays. You will usually NOT need
+    to explicitly specify this option. The fetch operation will be
+    performed automatically once you run the sync, sync-all, or list action.
+    You can prevent this automatic fetching using the *--nofetch* option.
 
 *-i* 'OVERLAY', *--info*='OVERLAY'::
     Display all available information about the specified overlay.
 
-*-S*, *--sync-all*::
-    Update all overlays. Shortcut for *-s ALL*.
-
 *-L*, *--list*::
     List the contents of the remote list.
 
 *-l*, *--list-local*::
     List the locally installed overlays.
 
+*-n*, *--nofetch*::
+    Prevents *layman* from automatically fetching the remote lists
+    of overlays. The default behavior for *layman* is to update all
+    remote lists if you run the sync, list or fetch operation.
+
+*-p* 'LEVEL', *--priority*='LEVEL'::
+    Use this option in combination with the *--add*.
+-   make.conf::
+    It will modify the priority of the added overlay and thus influence
+    the order of entries in the make.conf file. The lower the priority,
+    the earlier in the list the entry will be mentioned in the make.conf.
+-   repos.conf::
+    It will modify the priority in the repos.conf file, and thus influence
+    the portage overlay priority. Read *man portage* for more details on
+    overlay priority.
+    Use a value between 0 and 100. The default value is 50.
+
+*-r* 'OVERLAY', *--readd*='OVERLAY'::
+    Remove and re-add the given overlay from the cached
+    remote list to your locally installed overlays. Specify "ALL" to
+    re-add all local overlays.
 
-OTHER OPTIONS
+*-s* 'OVERLAY', *--sync*='OVERLAY'::
+    Update the specified overlay. Use "ALL" as parameter to
+    synchronize all overlays.
+
+*-S*, *--sync-all*::
+    Update all overlays. Shortcut for *-s ALL*.
+
+
+PATH OPTIONS
 ~~~~~~~~~~~~~
-List of other available *layman* options.
+List of available *layman* path options.
 
 *-c* 'PATH', *--config*='PATH'::
     Path to an alternative configuration file.
 
+*-C* 'PATH', *--configdir*='PATH'::
+    Directory path for all layman configuration information.
+
 *-o* 'URL', *--overlays*='URL'::
     Specifies the location of additional overlay lists. You can use
     this flag several times and the specified URLs will get temporarily
@@ -105,10 +132,19 @@ List of other available *layman* options.
     *layman* run - edit your config file to add a URL permanently.
     So this is useful for testing purposes.
 
-*-n*, *--nofetch*::
-    Prevents *layman* from automatically fetching the remote lists
-    of overlays. The default behavior for *layman* is to update all
-    remote lists if you run the sync, list or fetch operation.
+*-O* 'PATH', *--overlay_defs* 'PATH'::
+    Path to additional overlay.xml files.
+
+
+OUTPUT OPTIONS:
+~~~~~~~~~~~~~~~
+List of *layman* output options.
+
+*--debug-level* 'DEBUG_LEVEL'::
+    Outputs *layman* debugging information. The lower the debug level,
+    the less debugging information you'll get. Use a value between 0
+    and 10. 0 means no debugging information, 10 selects all debugging
+    messages. The default debug level is 4.
 
 *-k*, *--nocheck*::
 -   When listing remote overlays (using *-L* or *--list*) *layman*
@@ -121,6 +157,8 @@ List of other available *layman* options.
     to reject overlays that do not provide a description or a contact
     attribute.
 
+*-N*, *--nocolor*::
+    Remove color codes from the *layman* output.
 
 *-q*, *--quiet*::
     Makes *layman* completely quiet. In quiet mode child processes
@@ -130,24 +168,18 @@ List of other available *layman* options.
     For example this might happen if your overlay resides in Subversion
     and the SSL certificate of the server needs manual acceptance.
 
-*-v*, *--verbose*::
-    Makes *layman* more verbose and you will receive a description of
-    the overlays you can download.
-
-*-N*, *--nocolor*::
-    Remove color codes from the *layman* output.
-
 *-Q* 'LEVEL', *--quietness*='LEVEL'::
     Makes *layman* less verbose. Choose a value between 0 and 4
     with 0 being completely quiet. Once you set this below 3,
     the same warning as given for *--quiet* applies.
 
-*-p* 'LEVEL', *--priority*='LEVEL'::
-    Use this option in combination with the *--add*. It will modify
-    the priority of the added overlay and thus influence the order
-    of entries in the make.conf file. The lower the priority,
-    the earlier in the list the entry will be mentioned. Use a value
-    between 0 and 100. The default value is 50.
+*-v*, *--verbose*::
+    Makes *layman* more verbose and you will receive a description of
+    the overlays you can download.
+
+*-W* 'WIDTH', *--width* 'WIDTH'::
+    Sets the screen width. This setting is usually not required as layman
+    is capable of detecting the available number of columns automatically.
 
 
 CONFIGURATION
@@ -208,7 +240,8 @@ nocheck::
     Set to "yes" if *layman* should stop worrying about overlays
     with missing a contact address or the description.
 
-*NEW* Per repository type Add, Sync options.
+
+Per repository type Add, Sync options.
 
 bzr_addopts::
 bzr_syncopts::
@@ -218,7 +251,7 @@ cvs_syncopts::
     These are command options to include in the commands sent to perform
     the desired action.
 
-*NEW* Per repository type Post Add, Sync hooks.
+Per repository type Post Add, Sync hooks.
 
 bzr_postsync::
 cvs_postsync::
@@ -228,7 +261,25 @@ git_postsync::
     These are commands that are run after each add, sync operation if they
     are defined.
 
-
+*NEW*Repo Configuration options::
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+*layman* now accepts multiple repository config file options. One being the
+already standard make.conf option and the other being the repos.conf files
+that can be placed in /etc/portage/repos.conf/. The below configuration options
+allow you to alter particular things regarding the repository configuration::
+
+-  conf_type::
+        Specifies the repo configuration type you wish to use. This can
+        be *repos.conf*, *make.conf*, or both separated by a comma. The
+        default value is *make.conf*.
+-  require_repoconfig::
+        Defines whether a configuration file is needed for the package
+        manager or other multi-repository consumer application.
+-  repos_conf::
+        Specifies the path to the config file for all repos.conf
+        configuration. The default location is
+        '/etc/portage/repos.conf/layman.conf'.
 
 HANDLING OVERLAYS
 -----------------
@@ -258,9 +309,8 @@ will merge the contents of all lists.
 
 *layman* also allows you to define local files in this list.
 Just make sure you prepend these path names in standard URL notation with 'file://'.
-*New* is the ability to just add an overlay definition to /etc/layman/overlays/
- some-overlay.xml and it will be automatically available for actions such as
-  add, delete, info...  (see below for file format details)
+*layman* also gives you the ability to just add an overlay definition to '/etc/layman/overlays/some-overlay.xml' and it will be automatically available for actions such as 
+add, delete, info...  (see below for file format details)
 
 If you need to use a proxy for access to the Internet, you can use
 the corresponding variable in the *layman* configuration file.
@@ -464,7 +514,7 @@ AUTHORS
 - Gunnar Wrobel <wrobel@gentoo.org> (original, retired)
 - Sebastian Pipping <sping@gentoo.org>
 - Brian Dolbec <brian.dolbec@gmail.com>
-
+- Devan Franchini <twitch153@gentoo.org>
 
 REPORTING BUGS
 --------------
@@ -473,4 +523,4 @@ Please report bugs you might find at 'http://bugs.gentoo.org/'.  Thank you!
 
 SEE ALSO
 --------
-make.conf(5), eix(1)
+make.conf(5), eix(1), portage(5)

[gentoo-commits] proj/layman:master commit in: doc/

[Brian Dolbec]

commit:     e921ebf73897d8e5f2f653a39484636c3c4a7c41
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  8 17:16:13 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sun Feb  8 17:16:13 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=e921ebf7

doc/layman.8.txt: last minute updates for plugin name, url updates, repos.conf default

A few small wording improvements.
Whitespace cleanup

---
 doc/layman.8.txt | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/doc/layman.8.txt b/doc/layman.8.txt
index f9bfafa..ed9f6d0 100644
--- a/doc/layman.8.txt
+++ b/doc/layman.8.txt
@@ -37,7 +37,7 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-*layman* is a script that allows you to add, remove, re-add, 
+*layman* is a script that allows you to add, remove, re-add,
 update, disable, and then re-enable Gentoo overlays from a variety
 of sources.
 
@@ -238,7 +238,7 @@ make.conf::
 
 overlays::
     Specifies the URL for the remote list of all available overlays.
-    The default is 'http://www.gentoo.org/proj/en/overlays/repositories.xml'.
+    The default is 'https://api.gentoo.org/overlays/repositories.xml'.
     You can specify several URLs here (one per line). The contents will
     get merged to a single list of overlays. This allows to add a personal
     collection of overlays that are not present in the global list.
@@ -268,7 +268,7 @@ bzr_syncopts::
 cvs_addopts::
 cvs_syncopts::
 ...::
-    These are command options to include in the commands sent to perform
+    These are a space separated list of command options to include in the commands sent to perform
     the desired action.
 
 Per repository type Post Add, Sync hooks.
@@ -278,7 +278,7 @@ cvs_postsync::
 darcs_postsync::
 git_postsync::
 ...::
-    These are commands that are run after each add, sync operation if they
+    These are a space separated list of commands that are run after each add, sync operation if they
     are defined.
 
 *NEW*Repo Configuration options
@@ -292,7 +292,7 @@ allow you to alter particular things regarding the repository configuration::
 -  conf_type::
         Specifies the repo configuration type you wish to use. This can
         be *repos.conf*, *make.conf*, or both separated by a comma. The
-        default value is *make.conf*.
+        default value is *repos.conf*.
 -  require_repoconfig::
         Defines whether a configuration file is needed for the package
         manager or other multi-repository consumer application.
@@ -317,7 +317,7 @@ OVERLAY LISTS
 any configuration files. In order for this to be possible the script
 needs an external list of possible overlay sources. There is a
 centralized list available at
-'http://www.gentoo.org/proj/en/overlays/repositories.xml'
+'https://api.gentoo.org/overlays/repositories.xml'
 but nothing will prevent you from using or publishing your own
 list of overlays. The location of the remote lists can also be
 modified using the *--overlays* option when running *layman*.
@@ -333,7 +333,7 @@ will merge the contents of all lists.
 
 *layman* also allows you to define local files in this list.
 Just make sure you prepend these path names in standard URL notation with 'file://'.
-*layman* also gives you the ability to just add an overlay definition to '/etc/layman/overlays/some-overlay.xml' and it will be automatically available for actions such as 
+*layman* also gives you the ability to just add an overlay definition to '/etc/layman/overlays/some-overlay.xml' and it will be automatically available for actions such as
 add, delete, info...  (see below for file format details)
 
 If you need to use a proxy for access to the Internet, you can use
@@ -411,7 +411,7 @@ ebuilds of that overlay you can simply do so with the
 
 LIST OVERLAYS
 ~~~~~~~~~~~~~
-*layman* provides the *--list* and *--list-local* options to print
+*layman* provides the *-L*, *--list* and *-l*, *--list-local* options to print
 a list of available respectively installed overlays.
 
 Listing will prepend all fully supported overlays with a green
@@ -504,7 +504,7 @@ Users can specify a branch for an overlay, given one actually exists.
 This logic is applicable to CVS overlays as well and the branch variable
 is comparable to specifying a subpath for a CVS repository.
 
-VCS types where the use of "branch" is supported is as follows:: 
+VCS types where the use of "branch" is supported is as follows::
 -  CVS
 -  Squashfs
 -  Tar
@@ -527,7 +527,7 @@ with 'file://'.  *New* is the ability to just add an overlay definition like
 ADDING AN OVERLAY GLOBALLY
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 The global list of overlays used by *layman* lies at
-'http://www.gentoo.org/proj/en/overlays/repositories.xml'.
+'https://api.gentoo.org/overlays/repositories.xml'.
 
 All Gentoo developers have access to this location via CVS and
 can modify the list of overlays.

[gentoo-commits] proj/layman:master commit in: doc/

[Devan Franchini]

commit:     c026339af5fa6506714bf7533171bdd41478bedb
Author:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 27 23:39:42 2015 +0000
Commit:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Fri Mar 27 23:41:24 2015 +0000
URL:        https://gitweb.gentoo.org/proj/layman.git/commit/?id=c026339a

layman.8.txt: Adds details regarding protocol filtering

 doc/layman.8.txt | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/doc/layman.8.txt b/doc/layman.8.txt
index ed9f6d0..fcbe86f 100644
--- a/doc/layman.8.txt
+++ b/doc/layman.8.txt
@@ -149,8 +149,8 @@ List of available *layman* path options.
     Path to additional overlay.xml files.
 
 
-OUTPUT OPTIONS:
-~~~~~~~~~~~~~~~
+OUTPUT OPTIONS
+~~~~~~~~~~~~~~
 List of *layman* output options.
 
 *--debug-level* 'DEBUG_LEVEL'::
@@ -195,6 +195,12 @@ List of *layman* output options.
     is capable of detecting the available number of columns automatically.
 
 
+ADDITIONAL OPTIONS
+~~~~~~~~~~~~~~~~~~
+*--protocol_filter*::
+    Sets the protocol filter that determines which protocols will be used
+    when adding overlays or updating their source URLs.
+
 CONFIGURATION
 -------------
 *layman* reads configuration parameters from the file
@@ -281,8 +287,8 @@ git_postsync::
     These are a space separated list of commands that are run after each add, sync operation if they
     are defined.
 
-*NEW*Repo Configuration options
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+REPO CONFIGURATION OPTIONS
+~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 *layman* now accepts multiple repository config file options. One being the
 already standard make.conf option and the other being the repos.conf files
@@ -341,6 +347,23 @@ the corresponding variable in the *layman* configuration file.
 *layman* will also respect the *http_proxy* environment variable in case you set it.
 
 
+FILTERING PROTOCOL URLS
+~~~~~~~~~~~~~~~~~~~~~~~
+When adding an overlay or updating its source URL you can specify which
+protocols you wish to use. Examples of this include http://, git://, and
+https://.
+
+To filter these protocols on a system-wide level you may alter the
+protocol_filter variable in your *layman* configuration file.
+
+Otherwise, you may specify which protocols you would prefer to be filtered out
+on a per-run basis using the *--protocol_filter* flag.
+
+Using this filtering will ensure that no other protocols other than the ones
+specified will be used. Meaning that if an overlay does not support any of
+the specified protocols, it will not install.
+
+
 LOCAL CACHE
 ~~~~~~~~~~~
 *layman* stores a local copy of the fetched remote list.

[gentoo-commits] proj/layman:master commit in: doc/

[Devan Franchini]

commit:     77c3677fc112d1eba8a16de485d93d0ae0db37ef
Author:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 28 00:02:30 2015 +0000
Commit:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 00:02:30 2015 +0000
URL:        https://gitweb.gentoo.org/proj/layman.git/commit/?id=77c3677f

layman.8.txt: Adds more details on how --protocol_filter flag should be used

 doc/layman.8.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/layman.8.txt b/doc/layman.8.txt
index fcbe86f..cb391f1 100644
--- a/doc/layman.8.txt
+++ b/doc/layman.8.txt
@@ -197,7 +197,7 @@ List of *layman* output options.
 
 ADDITIONAL OPTIONS
 ~~~~~~~~~~~~~~~~~~
-*--protocol_filter*::
+*--protocol_filter* 'PROTOCOL'::
     Sets the protocol filter that determines which protocols will be used
     when adding overlays or updating their source URLs.