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 865E81381F3 for ; Wed, 3 Jul 2013 10:05:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 19137E097A; Wed, 3 Jul 2013 10:05:34 +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 6724AE087F for ; Wed, 3 Jul 2013 10:05:33 +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 461C033E793 for ; Wed, 3 Jul 2013 10:05:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D4634E5462 for ; Wed, 3 Jul 2013 10:05:30 +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: <1372439792.22b1e80c37192d3049f95293cedd03b30ca2c7d2.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: 22b1e80c37192d3049f95293cedd03b30ca2c7d2 X-VCS-Branch: master Date: Wed, 3 Jul 2013 10:05:30 +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: 7a915e1a-77e8-4230-afee-08dc87d21d0c X-Archives-Hash: 9cc5d98a6d17554d489869e76b1db2a2 commit: 22b1e80c37192d3049f95293cedd03b30ca2c7d2 Author: André Erdmann mailerd de> AuthorDate: Fri Jun 28 17:16:32 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Fri Jun 28 17:16:32 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=22b1e80c doc/rst: SLOT handling (incomplete) Draft for documentation about fuzzy slot rules. (No doc/html commit will be created since documentation is todo.) --- doc/rst/usage.rst | 69 +++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 62 insertions(+), 7 deletions(-) diff --git a/doc/rst/usage.rst b/doc/rst/usage.rst index 2daedce..f3e2e18 100644 --- a/doc/rst/usage.rst +++ b/doc/rst/usage.rst @@ -1160,7 +1160,8 @@ Simple Rules Fuzzy Rules Fuzzy Rules are **extended Simple Rules**. If the basic lookup as described above fails for a *dependency string*, - they will *try* to resolve it as a **version-relative match**. + they will *try* to resolve it as a **version-relative**, + **slot-relative** or **version,slot-relative match**. To do this, the *dependency string* will be split into components like *dependency name*, *dependency version* and useless comments, which are @@ -1177,7 +1178,7 @@ Fuzzy Rules * "R 2.12" as ">=dev-lang/R-2.12" * "The R PROGRAMMING LANGUAGE [<2.14] from http://www.r-project.org/" as "= 2.14)", "R [<2.10]", "r{ !2.12 }", and "R", and + "r 2.12", "R(>= 2.14)", "R [<2.10]", "r{ !=2.12 }", and "R", and resolves them as '>=dev-lang/R-2.12', '>=dev-lang/R-2.14', '] :: + [][] :: Multi line rules resolve several *dependency strings*. @@ -1324,7 +1343,7 @@ Multi line rules Syntax: .. code-block:: text - [] { + [][] { [] ... @@ -1336,6 +1355,42 @@ Multi line rules zero or more *dependency strings*. An empty rule makes little sense, though. +Rule Options + Certain rule types accept options that control the rule's behavior. + For example, *default* fuzzy rules can be set up to yield slotted + 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 + (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 options := [:]:{+}[] + flag := v + slot restrict := | + restrict range := []..[] + restrict list := {,} + + # slot suffix can be any string that starts with '/', '=' or '*' + # number is a natural number (0..N) + + + + .. Note:: + + Fuzzy Slot rules cannot resolve "not " statements, e.g. + "R ( != 2.14 )". + Comments start with **#**. There are a few exceptions to that, the *#deptype* and *#! NOPARSE* keywords. Comments inside rule blocks are not allowed and @@ -1380,7 +1435,7 @@ Rule Stubs Syntax: .. code:: text - [] + [][] =============== 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 755EA1381F3 for ; Fri, 28 Jun 2013 17:18:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 42010E094C; Fri, 28 Jun 2013 17:18:17 +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 A0801E094C for ; Fri, 28 Jun 2013 17:18:16 +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 3DD5633E7EF for ; Fri, 28 Jun 2013 17:18:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DF95AE545E for ; Fri, 28 Jun 2013 17:18:13 +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: <1372439792.22b1e80c37192d3049f95293cedd03b30ca2c7d2.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:gsoc13/next 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: 22b1e80c37192d3049f95293cedd03b30ca2c7d2 X-VCS-Branch: gsoc13/next Date: Fri, 28 Jun 2013 17:18:13 +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: 23524cf2-8414-492f-a86b-e75af692da4c X-Archives-Hash: b230e623b664e5e2c6228e782315f361 Message-ID: <20130628171813.HbZhZjjgJpDex18Z-xsG_yeze3HxCAEG1debxBb8M70@z> commit: 22b1e80c37192d3049f95293cedd03b30ca2c7d2 Author: André Erdmann mailerd de> AuthorDate: Fri Jun 28 17:16:32 2013 +0000 Commit: André Erdmann mailerd de> CommitDate: Fri Jun 28 17:16:32 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=22b1e80c doc/rst: SLOT handling (incomplete) Draft for documentation about fuzzy slot rules. (No doc/html commit will be created since documentation is todo.) --- doc/rst/usage.rst | 69 +++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 62 insertions(+), 7 deletions(-) diff --git a/doc/rst/usage.rst b/doc/rst/usage.rst index 2daedce..f3e2e18 100644 --- a/doc/rst/usage.rst +++ b/doc/rst/usage.rst @@ -1160,7 +1160,8 @@ Simple Rules Fuzzy Rules Fuzzy Rules are **extended Simple Rules**. If the basic lookup as described above fails for a *dependency string*, - they will *try* to resolve it as a **version-relative match**. + they will *try* to resolve it as a **version-relative**, + **slot-relative** or **version,slot-relative match**. To do this, the *dependency string* will be split into components like *dependency name*, *dependency version* and useless comments, which are @@ -1177,7 +1178,7 @@ Fuzzy Rules * "R 2.12" as ">=dev-lang/R-2.12" * "The R PROGRAMMING LANGUAGE [<2.14] from http://www.r-project.org/" as "= 2.14)", "R [<2.10]", "r{ !2.12 }", and "R", and + "r 2.12", "R(>= 2.14)", "R [<2.10]", "r{ !=2.12 }", and "R", and resolves them as '>=dev-lang/R-2.12', '>=dev-lang/R-2.14', '] :: + [][] :: Multi line rules resolve several *dependency strings*. @@ -1324,7 +1343,7 @@ Multi line rules Syntax: .. code-block:: text - [] { + [][] { [] ... @@ -1336,6 +1355,42 @@ Multi line rules zero or more *dependency strings*. An empty rule makes little sense, though. +Rule Options + Certain rule types accept options that control the rule's behavior. + For example, *default* fuzzy rules can be set up to yield slotted + 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 + (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 options := [:]:{+}[] + flag := v + slot restrict := | + restrict range := []..[] + restrict list := {,} + + # slot suffix can be any string that starts with '/', '=' or '*' + # number is a natural number (0..N) + + + + .. Note:: + + Fuzzy Slot rules cannot resolve "not " statements, e.g. + "R ( != 2.14 )". + Comments start with **#**. There are a few exceptions to that, the *#deptype* and *#! NOPARSE* keywords. Comments inside rule blocks are not allowed and @@ -1380,7 +1435,7 @@ Rule Stubs Syntax: .. code:: text - [] + [][] ===============