[patch] text.xml.diff

text.xml.diff (text/plain), 1.16 KB, created by Julian Ospald on 2012-03-09 22:40:40 UTC

--- text.xml
+++ text.xml
@@ -208,7 +208,7 @@
 
 <p>
 Sometimes two packages cannot be installed in parallel. This is handled by
-blockers. A blocker is specified as follows:
+blockers. A softblocker is specified as follows:
 </p>
 
 <codesample lang="ebuild">
@@ -216,7 +216,19 @@
 </codesample>
 
 <p>
-Note that blockers are usually <e>runtime</e> rather than buildtime.
+Portage will try to resolve this conflict automatically if possible. 
+Sometimes we need to use a hardblocker to ensure correct emerge order. 
+Those cannot be resolved by Portage and must be taken care of by the user.
+A hardblocker is specified as follows:
+</p>
+
+<codesample lang="ebuild">
+RDEPEND="!!app-misc/foo"
+</codesample>
+
+<p>
+Hardblockers always take precedence over softblockers and need at least EAPI="2".
+Also note that blockers are usually <e>runtime</e> rather than buildtime.
 </p>
 
 <p>
@@ -267,6 +279,15 @@
     gtk? ( x11-libs/gtk+:2 )
 </codesample>
 
+<p>
+To depend on a specific version or version-range within a SLOT we use:
+</p>
+
+<codesample lang="ebuild">
+DEPEND="qt3? ( ~x11-libs/qt-3.3.8:3 )
+    gtk? ( >=x11-libs/gtk+-2.24.9:2 )
+</codesample>
+
 </body>
 </section>