[gentoo-commits] proj/portage:prefix commit in: /

["Fabian Groffen" <grobian@gentoo.org>]

commit:     2e0635e2668a82203530442feaeeaab5cf9abf46
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 24 17:29:10 2013 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Sep 24 17:29:10 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2e0635e2

Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
	README


 README                                 | 53 +++++++++++++++++++++++++++++++++-
 man/emerge.1                           |  4 +++
 mkrelease.sh                           |  2 +-
 pym/_emerge/main.py                    |  1 +
 pym/_emerge/resolver/slot_collision.py |  7 ++++-
 pym/portage/repository/config.py       | 13 +++++++--
 6 files changed, 74 insertions(+), 6 deletions(-)

diff --cc README
index 50d66d0,6b102e5..669fbf8
--- a/README
+++ b/README
@@@ -1,6 -1,48 +1,57 @@@
 +This is the prefix branch of portage, a branch that deals with portage
 +setup as packagemanager for a given offset in the filesystem running
 +with user privileges.
 +
- If you are not looking for something Gentoo/Alt:Prefix like, then this
++If you are not looking for something Gentoo Prefix like, then this
 +is not the right place.
++
++
++=======
+ About Portage
+ =============
+ 
+ Portage is a package management system based on ports collections. The
+ Package Manager Specification Project (PMS) standardises and documents the
+ behaviour of Portage so that the Portage tree can be used by other package
+ managers.
+ 
+ 
+ Dependencies
+ ============
+ 
+ Python and Bash should be the only hard dependencies. Python 2.6 is the
+ minimum supported version.
+ 
+ 
+ Licensing and Legalese
+ =======================
+ 
+ Portage is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ version 2 as published by the Free Software Foundation.
+ 
+ Portage is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU General Public License
+ along with Portage; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ 
+ 
+ More information
+ ================
+ 
+ -DEVELOPING contains some code guidelines.
+ -LICENSE contains the GNU General Public License version 2.
+ -NEWS contains new features/major bug fixes for each version.
+ -RELEASE NOTES contains mainly upgrade information for each version.
+ -TEST-NOTES contains Portage unit test information.
+ 
+ 
+ Links
+ =====
+ Gentoo project page: <http://www.gentoo.org/proj/en/portage/>
+ PMS: <https://dev.gentoo.org/~ulm/pms/head/pms.html>
+ PMS git repository: <http://git.overlays.gentoo.org/gitweb/?p=proj/pms.git>