[gentoo-commits] proj/R_overlay:gsoc13/next commit in: config/

[gentoo-commits] proj/R_overlay:gsoc13/next commit in: config/

[André Erdmann]

commit:     9462b6268f8bc4b1d8bd50a59ef2b8df55dd562a
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jul 10 08:24:15 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jul 10 08:24:15 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=9462b626

config/: license map file, update field-def

The license map file is neither complete nor 100% correct, but it roughly works.

Added/Enabled '[License]' in description_fields.conf so that the description
reader parses this field.

---
 config/description_fields.conf |  30 ++++---
 config/license.map             | 194 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 214 insertions(+), 10 deletions(-)

diff --git a/config/description_fields.conf b/config/description_fields.conf
index 0705798..b0d355d 100644
--- a/config/description_fields.conf
+++ b/config/description_fields.conf
@@ -25,7 +25,7 @@
 #                            whitelist and adds <some value> to this list.
 #
 #  allowed_values = <some values>
-#                        -- same as allowed_value but witj multiple values
+#                        -- same as allowed_value but with multiple values
 #
 #  alias_withcase = <aliases>,
 #  alias = <aliases>
@@ -55,6 +55,11 @@
 #  isWhitespaceList
 #         -- declares that the field's value is a list
 #             separated by whitespace. Has no effect if 'isList' is set.
+#
+#  isLicense
+#         -- use hardcoded 'License' field parsing
+#             configuration for this flag is done in the main config file
+#
 #  mandatory
 #         -- declares that this field has to have an value that evaluates
 #             to True (value is set and not empty).
@@ -71,6 +76,12 @@
 #
 # ----------------------------------------------------------------------------
 
+## Useful docs:
+##
+## http://cran.r-project.org/doc/manuals/R-exts.html#The-DESCRIPTION-file
+##
+## http://en.wikipedia.org/wiki/Commonly_misspelled_words
+##  has some links to other sites as well
 
 [Description]
 joinValues
@@ -85,10 +96,11 @@ joinValues
 ignore
 
 [License]
-isList
+alias_nocase = License, Licence, Lisence
+
+# use hardcoded field handling
+isLicense
 
-# not used
-ignore
 
 [Version]
 joinValues
@@ -122,6 +134,10 @@ isList
 alias_nocase = OS_TYPE
 allowed_values = unix
 
+[Homepage]
+alias_nocase = Homepage, URL, Webpage
+ignore
+
 [Author]
 ignore
 
@@ -146,12 +162,6 @@ ignore
 [Type]
 ignore
 
-[URL]
-ignore
-
-[Webpage]
-ignore
-
 [ZipData]
 ignore
 

diff --git a/config/license.map b/config/license.map
new file mode 100644
index 0000000..bcaf168
--- /dev/null
+++ b/config/license.map
@@ -0,0 +1,194 @@
+# freedist, as-is, ...?
+! {
+   unlimited
+}
+
+# freestyle text
+! {
+   foo
+   freeforresearchpurpose.
+   whatlicenseisitunder?
+}
+
+
+AGPL-3 :: agpl
+
+AGPL-3 {
+   agpl3
+   agpl>3
+}
+
+Apache-2.0 {
+   apachelicense2.0
+}
+
+Artistic {
+   artistic-1.0
+}
+
+Artistic-2 {
+   artistic-2.0
+   artistic2.0#modifyasdesired
+   artisticlicense2.0
+   theartisticlicense2.0
+}
+
+Boost-1.0 {
+   bsl
+   bsl-1.0
+}
+
+BSD {
+   freebsd
+}
+
+CC0-1.0 {
+   cc0
+}
+
+CC-BY-SA-3.0 {
+   ccby-sa3.0us
+}
+CC-BY-SA-2.0 {
+   ccbysa2.0
+}
+
+|| ( CC-BY-SA-3.0 CC-BY-NC-SA-3.0 ) {
+   ccbysa3.0us|ccbyncsa3.0
+}
+
+CeCILL-C :: cecill
+CeCILL-2 :: cecill2
+
+# ?
+CPL-0.5 {
+   cpl
+   commonpubliclicense1.0
+}
+
+EPL-1.0 {
+   epl
+}
+
+EUPL-1.1 {
+   eupl
+}
+
+GPL-2 {
+   gnugeneralpubliclicense2
+   gpl2
+   gpl2.0
+}
+
+GPL-2 :: gpl2forrpackage;researchonlylicenseforemdl1
+
+GPL-2+ {
+   gpl>2
+   gpl>2.0
+   gpl>2.15.1
+   gpl2.1ornewer
+   gpl2orlater
+   gpl2orlater.
+   gpl2ornewer
+   gpl2ornewercopying.
+   gpl2ornewer.thetermsofthislicenseareinafilecalledcopyingwhichisprovidedwithr.
+}
+
+|| ( GPL-2 Artistic-2 ) {
+   gpl2|artistic2.0
+}
+
+|| ( GPL-2+ BSD ) {
+   gpl>2|bsd
+   gpl>2|freebsd
+}
+
+GPL-3 {
+   gpl3
+   gpl3.0
+}
+
+GPL-3+ {
+   gpl>3
+   gpl>3.0
+}
+
+# gpl licenses without version:
+GPL-3+ {
+   gnugeneralpubliclicense
+   gnugeneralpubliclicensegpl
+   gnugpl
+   gpl
+   gpl.
+}
+
+|| ( GPL-3+ BSD ) {
+   gpl|bsd
+}
+
+|| ( GPL-3+ LGPL-3+ ) {
+   gpl|lgpl
+}
+
+|| ( GPL-2 GPL-3 ) {
+   gpl2|gpl3
+}
+
+LGPL-2 {
+   lgpl2
+}
+
+LGPL-2+ {
+   lgpl>2
+   lgpl>2.0
+   lgpl2ornewer
+}
+
+LGPL-2.1 {
+   lgpl2.1
+}
+
+LGPL-2.1+ {
+   lgpl>2.1
+}
+
+LGPL-3 {
+   lgpl3
+}
+
+LGPL-3+ {
+   lgpl>3
+}
+
+LGPL-3+ {
+   lgpl
+}
+
+MIT {
+   mitlicense
+}
+
+# x11 is MIT?
+MIT :: x11
+
+|| ( MIT GPL-2 ) {
+   mit|gpl2
+}
+
+MPL-1.1 {
+   mozillapubliclicense1.1
+   mpl1.1
+}
+
+MPL-2.0 {
+   mozillapubliclicense
+   mpl2.0
+}
+
+public-domain {
+   publicdomain
+}
+
+ZLIB {
+   zliblicense
+}

[gentoo-commits] proj/R_overlay:gsoc13/next commit in: config/

[André Erdmann]

commit:     5c268a97c1f99fe43a6edbd933fca9551eaee0e7
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Wed Jul 10 14:03:19 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Wed Jul 10 14:03:19 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=5c268a97

config/repo.list: disable CRAN-Archive

---
 config/repo.list | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/repo.list b/config/repo.list
index 0d52013..4d8f25d 100644
--- a/config/repo.list
+++ b/config/repo.list
@@ -4,12 +4,12 @@ rsync_uri        = cran.r-project.org::CRAN/src/contrib
 src_uri          = http://cran.r-project.org/src/contrib
 extra_rsync_opts = --exclude=/PACKAGES --exclude=/PACKAGES.gz --progress
 
-[CRAN-Archive]
-type             = rsync
-rsync_uri        = cran.r-project.org::CRAN/src/contrib/Archive
-src_uri          = http://cran.r-project.org/src/contrib/Archive
-extra_rsync_opts = --exclude=/PACKAGES --exclude=/PACKAGES.gz --progress
-recursive = yes
+#[CRAN-Archive]
+#type             = rsync
+#rsync_uri        = cran.r-project.org::CRAN/src/contrib/Archive
+#src_uri          = http://cran.r-project.org/src/contrib/Archive
+#extra_rsync_opts = --exclude=/PACKAGES --exclude=/PACKAGES.gz --progress
+#recursive = yes
 
 [BIOC-2.10/bioc]
 type             = rsync

[gentoo-commits] proj/R_overlay:gsoc13/next commit in: config/

[André Erdmann]

commit:     759e51525d4f8840031492f9f538d4b91ddb678f
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Fri Jul 12 13:56:31 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Fri Jul 12 13:56:31 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=759e5152

update R-overlay.conf.install

---
 config/R-overlay.conf.install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/R-overlay.conf.install b/config/R-overlay.conf.install
index 9f4fb53..5285bc7 100644
--- a/config/R-overlay.conf.install
+++ b/config/R-overlay.conf.install
@@ -13,7 +13,7 @@ OVERLAY_DIR="~/roverlay/overlay"
 
 # this is the directory where hard/symbolic links to all package files
 #  will be created (during Manifest file creation)
-DISTDIR="~/roverlay/distdir"
+DISTDIR="~/roverlay/mirror"
 
 LOG_FILE="~/roverlay/log/roverlay.log"
 

[gentoo-commits] proj/R_overlay:gsoc13/next commit in: config/

[André Erdmann]

commit:     8b2eaf23dace19a99848fdde00b95901c4658f2f
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Jul 23 07:50:05 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Jul 23 07:50:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=8b2eaf23

update config/package_rules

Removed the doc section from this file and added a few examples.

---
 config/package_rules | 191 ++++++---------------------------------------------
 1 file changed, 21 insertions(+), 170 deletions(-)

diff --git a/config/package_rules b/config/package_rules
index 560d4d0..ee56bf2 100644
--- a/config/package_rules
+++ b/config/package_rules
@@ -1,190 +1,41 @@
-# roverlay package rules reference
+# package rules file
 #
-# !!! draft / todo
+#  This file lists a few examples.
+#  Refer to "Package Rules" in the usage guide (doc/rst/usage.rst or
+#  doc/html/usage.html).
 #
-# (Concrete examples: scroll down)
 #
-#
-# ========================
-# Package Rule File Syntax
-# ========================
-#
-# Each rule consists of a match- and an action block
-#
-# The basic syntax is <<<
+# set KEYWORDS to "-x86 amd64" for all packages from CRAN that have "x86_64"
+# or "amd64" in their name
 #
 # MATCH:
-#    <match statement 1>
-#    <match statement 2>
-#    ...
-#    <match statement n>
+#    repo == CRAN
+#    or
+#    * package ~ x86_64
+#    * package ~ amd64
 # ACTION:
-#    <action statement 1>
-#    <action statement 2>
-#    ...
-#    <action statement n>
+#    keywords "-x86 amd64"
 # END;
 #
-# >>>
-#
-# As usual, leading whitespace is optional and will be ignored.
-#
-# ------------
-# Match blocks
-# ------------
-#
-# A match block consists of one or more conditions ("match statements")
-# under which a rule applies its actions to a package.
-# It can also contain nested blocks representing a boolean function
-# (AND, OR, NOR, XOR1; syntax: see below)
-# Such "boolean blocks" will _not_ be optimized, so (as usual) be careful
-# with adding unnecessary blocks.
-# The top-level logic for a match block is AND.
-#
-# << copy-paste from roverlay/packagerules/abstract/acceptors.py >>
-# Note:
-#  There's no Acceptor_NOT class.
-#  How would you define a multi-input function "not :: [Acceptor] -> Bool"?
-#  In most cases, you want "none of the listed Acceptors should match",
-#  which is exactly the definition of Acceptor_NOR.
-# << end c-p >>
-#
-# Match statement syntax
-# ----------------------
-#
-# Nested match statements / boolean blocks:
-#
-# <boolean function>
-# * <match statement 1>
-# * <match statement 2>
-# * ...
-# * <match statement n>
-#
-# The leading asterisk chars '*' are important and indicate the match depth.
-# For a match depth > 1 they have to be combined into a single string, e.g.
-# "**" for a match depth of 2.
-# As an alternative to the asterisk char, dash chars '-' can also be used
-# (they're interchangeable).
-#
-# A less abstract example that realizes
-#
-#  f :: (<match statement>^4) -> <match statement>
-#  f (a,b,c,d) := XOR1 ( c, OR ( a, b, AND ( c, d ) ), NOR ( a, d ), b )
-#
-# is <<<
-#
-# xor1
-# * c
-# * or
-# ** a
-# ** b
-# ** and
-# *** c
-# *** d
-# ** nor
-# *** a
-# *** d
-# * b
-#
-# >>>
 #
-# boolean expressions: keywords
-#
-# +======+===============+
-# | func | keywords      |
-# +======+===============+
-# | AND  | and, all, &&  |
-# +------+---------------+
-# | OR   | or,  ||       |
-# +------+---------------+
-# | XOR1 | xor1, xor, ^^ |
-# +------+---------------+
-# | NOR  | nor, none     |
-# +------+---------------+
-#
-# * these keywords are case sensitive
-#
-#
-# "normal" match statements:
-#
-#  A normal match statement consists of a keyword, an operator (optional) and
-#  a value ("argv for the keyword").
-#
-# +===============+=============+====================================+
-# | operator name | operator(s) | description                        |
-# +===============+=============+====================================+
-# | exact-string  | == =        | exact string match                 |
-# +---------------+-------------+------------------------------------+
-# | nocase-string | ,= =,       | case-insensitive string match      |
-# +---------------+-------------+------------------------------------+
-# | exact-regex   | ~= =~       | exact regex match (^<expression>$) |
-# +---------------+-------------+------------------------------------+
-# | regex         | ~~ ~        | partial regex match                |
-# +---------------+-------------+------------------------------------+
-#
-#
-# +==============+==================+================================+
-# | keyword      | default operator | description                    |
-# +==============+==================+================================+
-# | repo         | nocase-string    | alias to repo_name             |
-# +--------------+------------------+--------------------------------+
-# | repo_name    | nocase-string    | name of the repo, e.g. 'CRAN'  |
-# +--------------+------------------+--------------------------------+
-# | package      | implicit         | package name + version         |
-# +--------------+------------------+--------------------------------+
-# | package_name | implicit         | the package name (package file |
-# |              |                  | name without version and file  |
-# |              |                  | extension)                     |
-# +--------------+------------------+--------------------------------+
-# | name         | implicit         | alias to package_name          |
-# +--------------+------------------+--------------------------------+
-#
-# implicit operator: exact-regex if any wildcard char ('?','*') in string
-#                     else exact-string (wildcards will be replaced when
-#                     using the implicit op.)
-#
-#
-# -------------
-# Action blocks
-# -------------
-#
-# action keywords
-# +================+============+==========================+
-# | keyword        | has value? | description              |
-# +================+============+==========================+
-# | ignore         | no         | ignore package           |
-# +----------------+------------+--------------------------+
-# | do-not-process | no         | ignore package           |
-# +----------------+------------+--------------------------+
-# | keywords       | yes        | set per-package KEYWORDS |
-# +----------------+------------+--------------------------+
-#
-# TODO;
-#
-#
-# ========
-# Examples
-# ========
-#
-# ignore all packages starting with R <<<
+# move packages from CRAN and its archive to the sci-CRAN category
+# and prefix their source files with "cran_"
 #
 # MATCH:
-#    package_name R*
+#   or
+#   * repo CRAN
+#   * repo CRAN-Archive
 # ACTION:
-#    ignore
+#    set category sci-CRAN
+#    rename destfile s/^/cran_/
 # END;
 #
-# >>>
 #
-# set KEYWORDS to "-x86 amd64" for all packages from CRAN that have "x86_64"
-# or "amd64" in their name
+# move packages from the bioc repos (BIOC/*) to the sci-BIOC category
 #
 # MATCH:
-#    repo == CRAN
-#    or
-#    * package ~ x86_64
-#    * package ~ amd64
+#    repo ~ ^BIOC
 # ACTION:
-#    keywords "-x86 amd64"
+#    set category sci-BIOC
 # END;
 #

[gentoo-commits] proj/R_overlay:master commit in: config/

[André Erdmann]

commit:     8b2eaf23dace19a99848fdde00b95901c4658f2f
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Tue Jul 23 07:50:05 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Jul 23 07:50:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=8b2eaf23

update config/package_rules

Removed the doc section from this file and added a few examples.

---
 config/package_rules | 191 ++++++---------------------------------------------
 1 file changed, 21 insertions(+), 170 deletions(-)

diff --git a/config/package_rules b/config/package_rules
index 560d4d0..ee56bf2 100644
--- a/config/package_rules
+++ b/config/package_rules
@@ -1,190 +1,41 @@
-# roverlay package rules reference
+# package rules file
 #
-# !!! draft / todo
+#  This file lists a few examples.
+#  Refer to "Package Rules" in the usage guide (doc/rst/usage.rst or
+#  doc/html/usage.html).
 #
-# (Concrete examples: scroll down)
 #
-#
-# ========================
-# Package Rule File Syntax
-# ========================
-#
-# Each rule consists of a match- and an action block
-#
-# The basic syntax is <<<
+# set KEYWORDS to "-x86 amd64" for all packages from CRAN that have "x86_64"
+# or "amd64" in their name
 #
 # MATCH:
-#    <match statement 1>
-#    <match statement 2>
-#    ...
-#    <match statement n>
+#    repo == CRAN
+#    or
+#    * package ~ x86_64
+#    * package ~ amd64
 # ACTION:
-#    <action statement 1>
-#    <action statement 2>
-#    ...
-#    <action statement n>
+#    keywords "-x86 amd64"
 # END;
 #
-# >>>
-#
-# As usual, leading whitespace is optional and will be ignored.
-#
-# ------------
-# Match blocks
-# ------------
-#
-# A match block consists of one or more conditions ("match statements")
-# under which a rule applies its actions to a package.
-# It can also contain nested blocks representing a boolean function
-# (AND, OR, NOR, XOR1; syntax: see below)
-# Such "boolean blocks" will _not_ be optimized, so (as usual) be careful
-# with adding unnecessary blocks.
-# The top-level logic for a match block is AND.
-#
-# << copy-paste from roverlay/packagerules/abstract/acceptors.py >>
-# Note:
-#  There's no Acceptor_NOT class.
-#  How would you define a multi-input function "not :: [Acceptor] -> Bool"?
-#  In most cases, you want "none of the listed Acceptors should match",
-#  which is exactly the definition of Acceptor_NOR.
-# << end c-p >>
-#
-# Match statement syntax
-# ----------------------
-#
-# Nested match statements / boolean blocks:
-#
-# <boolean function>
-# * <match statement 1>
-# * <match statement 2>
-# * ...
-# * <match statement n>
-#
-# The leading asterisk chars '*' are important and indicate the match depth.
-# For a match depth > 1 they have to be combined into a single string, e.g.
-# "**" for a match depth of 2.
-# As an alternative to the asterisk char, dash chars '-' can also be used
-# (they're interchangeable).
-#
-# A less abstract example that realizes
-#
-#  f :: (<match statement>^4) -> <match statement>
-#  f (a,b,c,d) := XOR1 ( c, OR ( a, b, AND ( c, d ) ), NOR ( a, d ), b )
-#
-# is <<<
-#
-# xor1
-# * c
-# * or
-# ** a
-# ** b
-# ** and
-# *** c
-# *** d
-# ** nor
-# *** a
-# *** d
-# * b
-#
-# >>>
 #
-# boolean expressions: keywords
-#
-# +======+===============+
-# | func | keywords      |
-# +======+===============+
-# | AND  | and, all, &&  |
-# +------+---------------+
-# | OR   | or,  ||       |
-# +------+---------------+
-# | XOR1 | xor1, xor, ^^ |
-# +------+---------------+
-# | NOR  | nor, none     |
-# +------+---------------+
-#
-# * these keywords are case sensitive
-#
-#
-# "normal" match statements:
-#
-#  A normal match statement consists of a keyword, an operator (optional) and
-#  a value ("argv for the keyword").
-#
-# +===============+=============+====================================+
-# | operator name | operator(s) | description                        |
-# +===============+=============+====================================+
-# | exact-string  | == =        | exact string match                 |
-# +---------------+-------------+------------------------------------+
-# | nocase-string | ,= =,       | case-insensitive string match      |
-# +---------------+-------------+------------------------------------+
-# | exact-regex   | ~= =~       | exact regex match (^<expression>$) |
-# +---------------+-------------+------------------------------------+
-# | regex         | ~~ ~        | partial regex match                |
-# +---------------+-------------+------------------------------------+
-#
-#
-# +==============+==================+================================+
-# | keyword      | default operator | description                    |
-# +==============+==================+================================+
-# | repo         | nocase-string    | alias to repo_name             |
-# +--------------+------------------+--------------------------------+
-# | repo_name    | nocase-string    | name of the repo, e.g. 'CRAN'  |
-# +--------------+------------------+--------------------------------+
-# | package      | implicit         | package name + version         |
-# +--------------+------------------+--------------------------------+
-# | package_name | implicit         | the package name (package file |
-# |              |                  | name without version and file  |
-# |              |                  | extension)                     |
-# +--------------+------------------+--------------------------------+
-# | name         | implicit         | alias to package_name          |
-# +--------------+------------------+--------------------------------+
-#
-# implicit operator: exact-regex if any wildcard char ('?','*') in string
-#                     else exact-string (wildcards will be replaced when
-#                     using the implicit op.)
-#
-#
-# -------------
-# Action blocks
-# -------------
-#
-# action keywords
-# +================+============+==========================+
-# | keyword        | has value? | description              |
-# +================+============+==========================+
-# | ignore         | no         | ignore package           |
-# +----------------+------------+--------------------------+
-# | do-not-process | no         | ignore package           |
-# +----------------+------------+--------------------------+
-# | keywords       | yes        | set per-package KEYWORDS |
-# +----------------+------------+--------------------------+
-#
-# TODO;
-#
-#
-# ========
-# Examples
-# ========
-#
-# ignore all packages starting with R <<<
+# move packages from CRAN and its archive to the sci-CRAN category
+# and prefix their source files with "cran_"
 #
 # MATCH:
-#    package_name R*
+#   or
+#   * repo CRAN
+#   * repo CRAN-Archive
 # ACTION:
-#    ignore
+#    set category sci-CRAN
+#    rename destfile s/^/cran_/
 # END;
 #
-# >>>
 #
-# set KEYWORDS to "-x86 amd64" for all packages from CRAN that have "x86_64"
-# or "amd64" in their name
+# move packages from the bioc repos (BIOC/*) to the sci-BIOC category
 #
 # MATCH:
-#    repo == CRAN
-#    or
-#    * package ~ x86_64
-#    * package ~ amd64
+#    repo ~ ^BIOC
 # ACTION:
-#    keywords "-x86 amd64"
+#    set category sci-BIOC
 # END;
 #