public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/layman:master commit in: /, layman/, etc/, doc/
@ 2014-08-19  1:49 Devan Franchini
  2014-08-15 22:33 ` Devan Franchini
  0 siblings, 1 reply; 2+ messages in thread
From: Devan Franchini @ 2014-08-19  1:49 UTC (permalink / raw
  To: gentoo-commits

commit:     6869ccd81a45fc99bd6c60f5550e9a14530a65ef
Author:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  8 19:44:51 2014 +0000
Commit:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Fri Aug 15 22:25:41 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/layman.git;a=commit;h=6869ccd8

Reflects current changes to layman

version.py: Updates version to 2.2.0-git.
CHANGES: Lists changes made for newest release.
layman.8.txt: Updates man pages.
layman.cfg: Adds new config options for newest release.

---
 CHANGES           | 31 +++++++++++++++++++++
 doc/layman.8.txt  | 81 ++++++++++++++++++++++++++++++++++++++-----------------
 etc/layman.cfg    | 13 +++++++++
 layman/version.py |  2 +-
 4 files changed, 102 insertions(+), 25 deletions(-)

diff --git a/CHANGES b/CHANGES
index 867f878..ee2a7ac 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,37 @@
 CHANGES
 -------
 
+Version 2.2.0 - Release 2014-08-13
+==================================
+ - man page updates
+ - Portage sync plug-in to sync layman overlays via portage
+ - layman-overlay-maker utility to create overlay definitions
+ - Multiple description field support
+ - reloading config function to get local overlay definitions
+ - output attribute to OptionConfig
+ - branch and layman-type info to repos.conf configs
+ - sync-type checking for repos.conf configs
+ - New --storage cli option to specify where you want an overlay installed
+ - fixes bug when overlay isn't in the remote list
+ - New --disable and --enable cli option to globally disable a locally
+   installed overlay
+ - Centeralizes archive overlay type code
+ - Changes clean_tar config option to clean_archive
+ - fixes hard-coded defaults and EPREFIXIFIES repos_conf config option
+ - fixes format string in _verify_overlay_type function
+ - renames --setup_help cli option to --setup-help
+ - adds support for multiple cli option args
+ - adds interactive session for unofficial overlay installations
+ - migrates docstring tests to external test-suite
+ - adds layman-mounter utility handle overlay mounting
+ - adds squashfs overlay support
+ - adds squashfs overlay external tests
+ - adds modular plug-in system
+ - makes overlay types modular plug-ins
+ - makes repo config types modular plug-ins
+ - removes g-common overlay support
+
+
 Version 2.1.0 - Released 2014-07-23
 ===================================
  - man page updates

diff --git a/doc/layman.8.txt b/doc/layman.8.txt
index 64e2c44..f9bfafa 100644
--- a/doc/layman.8.txt
+++ b/doc/layman.8.txt
@@ -16,6 +16,10 @@ SYNOPSIS
 
 *layman* (*-d*|*--delete*) (*ALL*|'OVERLAY')
 
+*layman* (*-D*|*--disable*) (*ALL*|'OVERLAY')
+
+*layman* (*-E*|*--enable*) (*ALL*|'OVERLAY')
+
 *layman* (*-f*|*--fetch*)
 
 *layman* (*-i*|*--info*) (*ALL*|'OVERLAY')
@@ -33,8 +37,9 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-*layman* is a script that allows you to add, remove, re-add, and 
-update Gentoo overlays from a variety of sources.
+*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.
 
 WARNING
 ~~~~~~~
@@ -68,6 +73,14 @@ List of possible *layman* actions.
     Remove the given overlay from your locally installed overlays.
     Specify "ALL" to remove all overlays.
 
+*-D* 'OVERLAY', *--disable*='OVERLAY'::
+    Disable the given overlay from portage. Specify "ALL" to disable
+    all installed overlays.
+
+*-E* 'OVERLAY', *--enable*='OVERLAY'::
+    Re-enable a previously disabled overlay. Specify "ALL" to enable
+    all installed overlays.
+
 *-f*, *--fetch*::
     Fetches the remote list of overlays. You will usually NOT need
     to explicitly specify this option. The fetch operation will be
@@ -223,9 +236,6 @@ make.conf::
 
     echo 'source /var/lib/layman/make.conf' >> /etc/portage/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'.
@@ -240,12 +250,16 @@ nocheck::
     Set to "yes" if *layman* should stop worrying about overlays
     with missing a contact address or the description.
 
-clean_tar::
-    Set to "yes" if *layman* will delete tar files downloaded
-    when installing tar overlays. This option is only applicable
-    to remote tar overlays. *layman* will leave the reponsibility
-    of deleting local tar files up to the user.
-    By default, *layman* will delete downloaded tar files.
+clean_archive::
+    Set to "yes" if *layman* will delete archive files downloaded
+    when installing archive type overlays. This option is only
+    applicable to remote archive overlays. *layman* will leave the
+    reponsibility of deleting local archive files up to the user.
+    By default, *layman* will delete downloaded archive files.
+
+check_official::
+    Set to "no" if you don't want layman to prompt you for consent
+    during the installation of an unofficial overlay.
 
 Per repository type Add, Sync options.
 
@@ -267,8 +281,8 @@ git_postsync::
     These are commands that are run after each add, sync operation if they
     are defined.
 
-*NEW*Repo Configuration options::
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+*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
@@ -286,6 +300,10 @@ allow you to alter particular things regarding the repository configuration::
         Specifies the path to the config file for all repos.conf
         configuration. The default location is
         '/etc/portage/repos.conf/layman.conf'.
+-  auto_sync::
+        "yes" or "no" value that defines whether or not you want your
+        layman overlays automatically synced by the portage sync plug-in
+        (requires repos.conf support).
 
 HANDLING OVERLAYS
 -----------------
@@ -379,6 +397,17 @@ leaving any traces behind.
 In order to update all overlays managed by *layman* you can run
 the script with the *--sync ALL* option or the *--sync-all* flag.
 
+*NEW* DISABLING, AND RE-ENABLING OVERLAYS
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+portage will find installed overlays via your repo config files,
+whether it be make.conf or repos.conf. If you wish to hide the
+overlay from portage so that the ebuilds will not be accessible
+then you can do so with the *--disable* 'OVERLAY' option. This
+will then disable the overlay in your repo configurations.
+
+To re-enable them again so that portage can again access the
+ebuilds of that overlay you can simply do so with the
+*--enable* 'OVERLAY' option.
 
 LIST OVERLAYS
 ~~~~~~~~~~~~~
@@ -414,10 +443,11 @@ on 'http://gpo.zugaina.org/'.
 OVERLAY TYPES
 ~~~~~~~~~~~~~
 Currently *layman* supports overlays that are exported via *rsync*,
-*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).
+*CVS*, *subversion*, *bzr*, *darcs*, *git*, *mercurial*, *tar*
+packages, or *squashfs* images that will be mounted read-only.
+It also supports the generated overlay type *g-sorcery* installed with
+the g-cran package (at time of this writing, only available in the science
+overlay).
 
 
 OVERLAY LISTS
@@ -464,8 +494,7 @@ Example 2. An example overlays.xml file with a branch
     <owner type="project">
        <email>hardened@gentoo.org</email>
     </owner>
-    <source type="git">git://git.overlays.gentoo.org/proj/hardened-dev.git</source>
-    <branch>uclibc</branch>
+    <source type="git" branch="uclibc">git://git.overlays.gentoo.org/proj/hardened-dev.git</source>
     <feed>http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=atom</feed>
 </repo>
 </repositories>
@@ -477,12 +506,14 @@ is comparable to specifying a subpath for a CVS repository.
 
 VCS types where the use of "branch" is supported is as follows:: 
 -  CVS
+-  Squashfs
 -  Tar
 -  Git
 -  Mercurial
-However, for CVS and Tar overlays, the branch will be treated as a subpath.
-If you use the branch variable with any other overlay types aside from the ones
-listed, it will be ignored.
+However, for CVS, Squashfs, and Tar overlays, the branch will be treated as a
+subpath. If you use the branch variable with any other overlay types aside from
+the ones listed, it will be ignored.
+
 
 ADDING AN OVERLAY LOCALLY
 ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -532,7 +563,7 @@ This updates all overlays
 PERFORMING SEVERAL ACTIONS AT THE SAME TIME
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -------------------------------------------
-layman -f -a wrobel -a webapps-experimental
+layman -f -a wrobel webapps-experimental
 -------------------------------------------
 
 This fetches the remote list and immediately adds two overlays
@@ -545,7 +576,9 @@ FILES
 '/var/lib/layman/make.conf'::
     Configuration file that layman modifies to
     register the installed overlay(s) with the package manager
-
+'/etc/portage/repos.conf/layman.conf'::
+    Configuration file that layman modifies to
+    register the installed overlay(s) with the package manager
 
 AUTHORS
 -------

diff --git a/etc/layman.cfg b/etc/layman.cfg
index 6b94c68..efd990c 100644
--- a/etc/layman.cfg
+++ b/etc/layman.cfg
@@ -15,6 +15,11 @@ cache     : %(storage)s/cache
 
 installed: %(storage)s/installed.xml
 
+#-----------------------------------------------------------
+# Prompt the user if they are installing unofficial overlays
+
+check_official : Yes
+
 # This has been renamed from the following
 # old name  : value use it for updating to new one above
 # local_list: %(storage)s/overlays.xml
@@ -45,6 +50,14 @@ make_conf : %(storage)s/make.conf
 repos_conf : /etc/portage/repos.conf/layman.conf
 
 #-----------------------------------------------------------
+# Defines whether or not auto_sync will be set to "yes" or
+# "no" in your repos.conf config. Ultimately deciding whether
+# or not the portage sync plug-in will automatically sync your
+# layman overlays.
+
+auto_sync : No
+
+#-----------------------------------------------------------
 # Repository config types used by layman 
 # (repos.conf, make.conf)
 

diff --git a/layman/version.py b/layman/version.py
index 5b2952f..9ea3b8e 100644
--- a/layman/version.py
+++ b/layman/version.py
@@ -24,7 +24,7 @@ from __future__ import unicode_literals
 __version__ = "$Id: version.py 309 2007-04-09 16:23:38Z wrobel $"
 
 
-VERSION = '2.1.0-git'
+VERSION = '2.2.0-git'
 
 if __name__ == '__main__':
     print(VERSION)


^ permalink raw reply related	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-08-19  2:26 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-19  1:49 [gentoo-commits] proj/layman:master commit in: /, layman/, etc/, doc/ Devan Franchini
2014-08-15 22:33 ` Devan Franchini

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox