From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6BB471381F3 for ; Wed, 3 Jul 2013 10:05:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF533E0993; Wed, 3 Jul 2013 10:05:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 33C59E09A4 for ; Wed, 3 Jul 2013 10:05:37 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0B1A433E870 for ; Wed, 3 Jul 2013 10:05:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DAD20E546C for ; Wed, 3 Jul 2013 10:05:31 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1372845469.1e797b7bcafc6b364190961ef74b63febe10b9e9.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: doc/rst/ X-VCS-Repository: proj/R_overlay X-VCS-Files: doc/rst/usage.rst X-VCS-Directories: doc/rst/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 1e797b7bcafc6b364190961ef74b63febe10b9e9 X-VCS-Branch: master Date: Wed, 3 Jul 2013 10:05:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f15f9c36-a5f3-4b71-9304-08a31aaf92d7 X-Archives-Hash: 5167eff0d418d5d361d9fb4361bb7c51 Message-ID: <20130703100531.h4PWbOD7qPN34UUIhgGdozb2CXpu1kK6j-y-Rsg8TyY@z> commit: 1e797b7bcafc6b364190961ef74b63febe10b9e9 Author: André Erdmann mailerd de> AuthorDate: Wed Jul 3 09:57:49 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Wed Jul 3 09:57:49 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=1e797b7b doc/rst: SLOT handling --- doc/rst/usage.rst | 53 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/doc/rst/usage.rst b/doc/rst/usage.rst index f3e2e18..54ed6d3 100644 --- a/doc/rst/usage.rst +++ b/doc/rst/usage.rst @@ -1242,11 +1242,15 @@ Example 4 - *ignore* simple rule Example 5 - fuzzy slot rule A rule that matches many dependencies on sci-libs/fftw and resolves them - as slotted depencency: + as slotted depencency. The ``s=`` option controls which parts of the + version (from the dependency string) are relevant for calculating the + slot. The following example resolves "fftw 2.1", "fftw 2.1.2" and + "fftw 2.1.3" as "sci-libs/fftw:2.1", "fftw 3.0" as "sci-libs/fftw:3.0" + and so on: .. code-block:: text - ~sci-libs/fftw: :: fftw + ~sci-libs/fftw:s=0..1 :: fftw Example 6 - slot-restricted fuzzy slot rule Similar to example 5, but this rule does not resolve anything unless the @@ -1254,11 +1258,17 @@ Example 6 - slot-restricted fuzzy slot rule .. code-block:: text - ~sci-libs/fftw:2.1,3.0: :: fftw + ~sci-libs/fftw:s=0..1:restrict=2.1,3.0: :: fftw - .. caution:: +Example 7 - slot-restricted fuzzy slot rule with *immediate* value + Example 6 is not quite correct, as sci-libs/fftw currently uses slot 3.0 + for various versions from the 3.x range. The following rule resolves + "fftw 3.0", ..., "fftw 3.3" as "sci-libs/fftw:3.0": + + .. code-block:: text + + ~sci-libs/fftw:s=i3.0:restrict=3.0,3.1,3.2,3.3 :: fftw - TODO! (only integers accepted) Please see the default rule files for more extensive examples that cover other aspects like limiting a rule to certain dependency types. @@ -1361,30 +1371,29 @@ Rule Options dependencies. Fuzzy Slot Rules - <> - Fuzzy Slot rules are a subtype of *default* fuzzy rules. Appending a colon - character ``:`` to the *dependency string* of a fuzzy rules + character ``:`` to the *dependency string* of a fuzzy rule (as *rule option*) turns it into a slot rule. - Fuzzy slot rules accept even more options: - - * accepted slot values can be restricted (integer range or list) - * *version,slot-relative* matches can be enabled (example, <>: ``>=${CATEGORY}/${PN}-${PV}:${SLOT}${SLOT_SUFFIX-}``) - * a *slot suffix* can be specified (e.g. for using *Atom Slot Operators*) - - .. code-block:: text + Fuzzy slot rules accept even more options, each of them separated by one + colong char ``:``: - fuzzy slot options := [:]:{+}[] - flag := v - slot restrict := | - restrict range := []..[] - restrict list := {,} + * slot mode: - # slot suffix can be any string that starts with '/', '=' or '*' - # number is a natural number (0..N) + * ``default``: calculate a slot value (``/:``) + * ``with_version`` or ``+v``: include version, too (``=/-:``) + * ``open``: non-versioned slot (``/:*`` or ``/:=``) + * accepted *calculated* slot values can be restricted with + ``restrict=`` + * relevant slot parts can be set with ``slotparts=`` or + ``s=`` + * relevant subslot parts can be set with ``subslotparts=`` or + ``/`` + * slot operator can be set to ``*`` or ``=`` + ```` can be an index (integer) range + ``[:=0]..[:=]`` or a fixed value ``i``. .. Note::