From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Skk07-0000ti-Mf for garchives@archives.gentoo.org; Fri, 29 Jun 2012 22:49:19 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF282E07E4; Fri, 29 Jun 2012 22:48:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8F1A9E0829 for ; Fri, 29 Jun 2012 22:48:26 +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 BFC6F1B402A for ; Fri, 29 Jun 2012 22:48:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 2C017E544A for ; Fri, 29 Jun 2012 22:48:23 +0000 (UTC) From: "André Erdmann" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "André Erdmann" Message-ID: <1341009745.2228865f328434a781ab91c2e8a81daac5ff8e94.dywi@gentoo> Subject: [gentoo-commits] proj/R_overlay:master commit in: /, simple-deprules.d/ X-VCS-Repository: proj/R_overlay X-VCS-Files: R-overlay.conf simple-deprules.conf simple-deprules.d/R simple-deprules.d/other simple-deprules.d/selfdeps X-VCS-Directories: / simple-deprules.d/ X-VCS-Committer: dywi X-VCS-Committer-Name: André Erdmann X-VCS-Revision: 2228865f328434a781ab91c2e8a81daac5ff8e94 X-VCS-Branch: master Date: Fri, 29 Jun 2012 22:48:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: becebc2b-a192-4091-93e4-f78ca006069e X-Archives-Hash: b81bc7ff385e060b64d8884c874ffd69 commit: 2228865f328434a781ab91c2e8a81daac5ff8e94 Author: Andr=C3=A9 Erdmann mailerd de> AuthorDate: Fri Jun 29 22:42:25 2012 +0000 Commit: Andr=C3=A9 Erdmann mailerd de> CommitDate: Fri Jun 29 22:42:25 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/R_overlay.git= ;a=3Dcommit;h=3D2228865f config files update * simple-deprules.conf explains the usage of such files * rules are in simple-deprules.d/ now * added rule files to R-overlay.conf modified: R-overlay.conf modified: simple-deprules.conf new file: simple-deprules.d/R new file: simple-deprules.d/other new file: simple-deprules.d/selfdeps --- R-overlay.conf | 6 ++- simple-deprules.conf | 150 +++++++++++++++++++++++++++++++++++++-= ------ simple-deprules.d/R | 8 +++ simple-deprules.d/other | 1 + simple-deprules.d/selfdeps | 8 +++ 5 files changed, 148 insertions(+), 25 deletions(-) diff --git a/R-overlay.conf b/R-overlay.conf index b6eb8d9..7c06d9f 100644 --- a/R-overlay.conf +++ b/R-overlay.conf @@ -8,7 +8,11 @@ LOG_FILE_UNRESOLVABLE =3D log/dep_unresolvable.log =20 # SIMPLE_RULES_FILE lists the rule files for dependency resolution # SIMPLE_RULES_FILE ::=3D "[ ]" -SIMPLE_RULES_FILE =3D "simple-deprules.conf" +SIMPLE_RULES_FILE =3D " +simple-deprules.d/R +simple-deprules.d/selfdeps +simple-deprules.d/other +" =20 OVERLAY_NAME =3D ROverlay OVERLAY_DIR =3D overlay-root diff --git a/simple-deprules.conf b/simple-deprules.conf index d0d7321..b8fc3b4 100644 --- a/simple-deprules.conf +++ b/simple-deprules.conf @@ -1,24 +1,62 @@ +#! NOPARSE +# # simple dependency rules file -# you can specify single and multiline rules here +# +# This file has been replaced by the dep rule files in simple-deprules.d= /, +# but explains the syntax. +# +# =3D=3D=3D Syntax =3D=3D=3D +# +# You can specify single and multiline rules here, +# the basic syntax is " ". +# +# +# There are two types of dependency string matching: +# standard : a dep string has to match exactly +# "R(>=3D2.15)" !=3D "R" =3D> UNRESOLVABLE +# +# fuzzy : the resolver will try to find a match using string +# interpolation/metrics +# "R(>=3D2.15)" ~ "R" =3D> ">=3Ddev-lang/R-2.15" +# "R(!=3D2.15)" ~ "R" =3D> "(!dev-lang/R-2.15 dev-lang/R)" +# "R(>=3D2.15)" % "R" =3D> (% is fuzzy ignore) +# # # a single line entry looks like -## :: +## (1) :: (standard simple dep) +## (2) ~ :: (fuzzy simple dep) +## (3) (standard selfdep) +## (4) ~ (fuzzy selfdep) +## (5) ! :: (standard ignored dep) +## (6) % :: (fuzzy ignored dep) +# +# Dependency strings are case-insensitive. +# +# (3) and (4) are shortcuts for [~]/ :: , +# e.g. "fftw" matches "fftw" and resolves to "sci-R/fftw". +# This is useful 'cause you don't have to use a hardcoded overlay categ= ory +# here. +# (5) and (6) are ways to define deps that should be ignored +# (=3Dresolved to nothing). They're identical to (1)/(2), but use ! / %= as +# portage package. +# # # a multiline entry looks like -## { +## [~] { ## ## ## ... ## ## } # -# ignored dependency strings can be written with '!' as portage package,= e.g. -## ! :: dev-lang/R +# selfdeps cannot be declared in a multiline rule # # The precedence order of the rules in this file is ## single line ignore > single line > multi line ignore > multi line +#### this has to be fixed in the dep rule reader # -# Note that you cannot write comments in a multiline rule, writing +# Note: +# * you cannot write comments in a multiline rule, writing ## dev-lang/R { ## # the following dep should resolve to R ## R(>=3D 2.15.0) @@ -26,32 +64,96 @@ # means that both strings '# the following dep should resolve to R' and # 'R(>=3D 2.15.0)' resolve to 'dev-lang/R'! # +# * compound portage dependency statements (man 5 ebuild) are supported, +# but only in standard simple deps, e.g. +## || ( dev-lang/R-2.14.0 ) :: R (!=3D 2.14.0) +# +# =20 -# the entries in this file are used to test ebuild creation of seewave_1= .6.3.tar.gz. +# =3D=3D=3D Examples =3D=3D=3D =20 -# provided by eclass -! { - R(>=3D 2.15.0) -} +# =3D=3D single line entries =3D=3D =20 -# used to test rule priorities ->=3Ddev-lang/R-2.15.0 { - R(>=3D 2.15.0) -} +# =3D standard simple dep =3D +# this rule matches 'R (>=3D 2.15.0)' and resolves it as 'dev-lang/R-2.1= 5.0' +dev-lang/R-2.15.0 :: R (>=3D 2.15.0) + +# =3D fuzzy simple dep =3D + +# this rule matches +## (a) R +## (b) R ( ) +## (c) R [ ] +## (d) R { } +## (e) R +# variant (a) is whitespace sensitive (>=3D 1 whitespace char between R = and +# the version modifier/version), the others ignore all whitespace chars. +# variant (e) is the standard simple rule behaviour. +# +# the dep string is then resolved as dev-lang/R- +# +# version modifier is optional and can be one out of {>=3D, <=3D, >, <, = !=3D, =3D, ! }, +# where ! / !=3D are being resolved a 'specific version is forbidden'. +# '>=3D' is assumed as version modifier if it is left out and a specific= version +# is required. +# +# examples matches: +# (a) r 2.13 -> >=3Ddev-lang/R-2.13 +# (b) R(>=3D 2.14) -> >=3Ddev-lang/R-2.14 +# (c) R [<2.10] -> ( !=3Ddev-lang/R-2.12 dev-lang/R ) +# (e) R -> dev-lang/R +# +~dev-lang/R :: R =20 -# for R_SUGGESTS -sci-R/sound :: sound +# =3D standard selfdep =3D +# resolves "tuneR","tuner",.. as "sci-R/tuneR" +tuneR =20 -sci-libs/fftw :: FFTW +# =3D fuzzy selfdep =3D +# * see fuzzy simple dep +# example match: resolves "zoo 1.10" as ">=3Dsci-R/zoo-1.10" +~zoo =20 -media-libs/flac :: FLAC +# =3D standard ignored dep =3D +# ignores "R" +! :: R =20 +# =3D fuzzy ignored dep =3D +# ignores everything that fuzzy-matches R (see fuzzy simple dep) +% :: R =20 -! :: rgl -! :: rpanel +# =3D=3D multi line entries =3D=3D =20 +# =3D simple multiline rule =3D +# matches "R (>=3D 2.15)", "R" and resolves them as dev-lang/R +dev-lang/R { + R (>=3D 2.15) + R +} + +# =3D fuzzy multiline rule =3D +~dev-lang/R { + R + the R programming language +} + +# =3D ignored dep multiline rule =3D +# equals ! :: see README ! { - tcltk - tuneR - audio + see README } + +# =3D fuzzy ignored dep multiline rule =3D +# equals % :: R +% { + R +} + +# =3D=3D=3D Extra =3D=3D=3D + +# There's a special keyword that tells the rule reader to stop parsing, +# see line #1. It has to be exactly '#! NOPARSE' or '#! BREAK', with no +# additional content at the end of the line. +#! NOPARSE +#! BREAK diff --git a/simple-deprules.d/R b/simple-deprules.d/R new file mode 100644 index 0000000..0bdba02 --- /dev/null +++ b/simple-deprules.d/R @@ -0,0 +1,8 @@ +# R versions available in portage: +# 2.10.1, 2.14.1, 2.14.2, 2.15.0, 2.15.1 + +# R is always compiled with '--enabled-R-shlib'; from: 'Rserve_0.6.8' +! :: R must be compiled with --enable-R-shlib if the server is to be bui= lt + +# using fuzzy dep matches +~dev-lang/R :: R diff --git a/simple-deprules.d/other b/simple-deprules.d/other new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/simple-deprules.d/other @@ -0,0 +1 @@ + diff --git a/simple-deprules.d/selfdeps b/simple-deprules.d/selfdeps new file mode 100644 index 0000000..d3306ad --- /dev/null +++ b/simple-deprules.d/selfdeps @@ -0,0 +1,8 @@ +~fftw +~sound +~audio +~rgl +~rpanel +~tuneR +~flac +~tcltk