nightmorph    10/02/13 20:54:08

  Modified:             hb-working-portage.xml
  Log:
  Some updates for the Portage handbook: one from IRC (thanks integer) on the 
kde-meta package, and the rest from me for outdated packages and new output.

Revision  Changes    Path
1.73                 xml/htdocs/doc/en/handbook/hb-working-portage.xml

file : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-working-portage.xml?rev=1.73&view=markup
plain: 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-working-portage.xml?rev=1.73&content-type=text/plain
diff : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/handbook/hb-working-portage.xml?r1=1.72&r2=1.73

Index: hb-working-portage.xml
===================================================================
RCS file: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-working-portage.xml,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- hb-working-portage.xml      24 Dec 2008 07:07:48 -0000      1.72
+++ hb-working-portage.xml      13 Feb 2010 20:54:07 -0000      1.73
@@ -4,7 +4,7 @@
 <!-- The content of this document is licensed under the CC-BY-SA license -->
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 
-<!-- $Header: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-working-portage.xml,v 1.72 
2008/12/24 07:07:48 nightmorph Exp $ -->
+<!-- $Header: 
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-working-portage.xml,v 1.73 
2010/02/13 20:54:07 nightmorph Exp $ -->
 
 <sections>
 
@@ -13,8 +13,8 @@
 maintain the software on his system.
 </abstract>
 
-<version>1.65</version>
-<date>2008-12-23</date>
+<version>1.66</version>
+<date>2010-02-13</date>
 
 <section>
 <title>Welcome to Portage</title>
@@ -327,7 +327,7 @@
 
 <p>
 Some packages in the Portage tree don't have any real content but are used to
-install a collection of packages. For instance, the <c>kde</c> package will
+install a collection of packages. For instance, the <c>kde-meta</c> package 
will
 install a complete KDE environment on your system by pulling in various
 KDE-related packages as dependencies.
 </p>
@@ -448,6 +448,12 @@
 </p>
 
 <p>
+While recent versions of Portage are smart enough to work around minor 
blockages
+without user intervention, occasionally you will need to fix it yourself, as
+explained below.
+</p>
+
+<p>
 To fix a blockage, you can choose to not install the package or unmerge the
 conflicting package first. In the given example, you can opt not to install
 <c>postfix</c> or to remove <c>ssmtp</c> first.
@@ -455,7 +461,7 @@
 
 <p>
 You may also see blocking packages with specific atoms, such as
-<b>&lt;</b>media-video/mplayer-bin-1.0_rc1-r2. In this case, updating to a more
+<b>&lt;</b>media-video/mplayer-1.0_rc1-r2. In this case, updating to a more
 recent version of the blocking package would remove the block.
 </p>
 
@@ -549,11 +555,27 @@
 <body>
 
 <pre caption="Portage warning about ambiguous ebuild names">
-!!! The short ebuild name "aterm" is ambiguous.  Please specify
-!!! one of the following fully-qualified ebuild names instead:
+[ Results for search key : listen ]
+[ Applications found : 2 ]
+
+*  dev-tinyos/listen [ Masked ]
+      Latest version available: 1.1.15
+      Latest version installed: [ Not Installed ]
+      Size of files: 10,032 kB
+      Homepage:      http://www.tinyos.net/
+      Description:   Raw listen for TinyOS
+      License:       BSD
+
+*  media-sound/listen [ Masked ]
+      Latest version available: 0.6.3
+      Latest version installed: [ Not Installed ]
+      Size of files: 859 kB
+      Homepage:      http://www.listen-project.org
+      Description:   A Music player and management for GNOME
+      License:       GPL-2
 
-    dev-libs/aterm
-    x11-terms/aterm
+!!! The short ebuild name "listen" is ambiguous. Please specify
+!!! one of the above fully-qualified ebuild names instead.
 </pre>
 
 <p>




Reply via email to