* [gentoo-commits] proj/R_overlay:master commit in: config/simple-deprules.d/, /, simple-deprules.d/, config/
@ 2012-08-20 10:39 André Erdmann
0 siblings, 0 replies; only message in thread
From: André Erdmann @ 2012-08-20 10:39 UTC (permalink / raw
To: gentoo-commits
commit: b05227c48f44fd1fa507dd7843516ab14c444c69
Author: André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Aug 20 09:23:57 2012 +0000
Commit: André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Mon Aug 20 09:28:37 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=b05227c4
move config files to config/
---
R-overlay.conf | 44 +++---
.../R-overlay.conf.install | 0
.../{R-overlay.conf => R-overlay.conf.reference} | 0
config/repo.list | 151 ++++++--------------
config/{repo.list => repo.list.reference} | 0
repo_letter_r.list => config/repo_letter_r.list | 0
...eprules.conf => simple-deprules.conf.reference} | 0
{simple-deprules.d => config/simple-deprules.d}/R | 0
.../simple-deprules.d}/app | 0
.../simple-deprules.d}/app-text | 0
.../simple-deprules.d}/compound_deps | 0
.../simple-deprules.d}/dev | 0
.../simple-deprules.d}/dev-libs | 0
.../simple-deprules.d}/dot_remap | 0
.../simple-deprules.d}/gnome | 0
.../simple-deprules.d}/ignored_text | 0
.../simple-deprules.d}/media | 0
.../simple-deprules.d}/media-libs | 0
.../simple-deprules.d}/missing | 0
.../simple-deprules.d}/net | 0
.../simple-deprules.d}/nvidia | 0
.../simple-deprules.d}/perl | 0
.../simple-deprules.d}/sci | 0
.../simple-deprules.d}/sci-libs | 0
.../simple-deprules.d}/selfdeps | 0
.../simple-deprules.d}/sys | 0
.../simple-deprules.d}/system.set | 0
.../simple-deprules.d}/unknown | 0
.../simple-deprules.d}/x11 | 0
repo.list | 46 ------
roverlay-9999.ebuild | 12 +-
31 files changed, 74 insertions(+), 179 deletions(-)
diff --git a/R-overlay.conf b/R-overlay.conf
index e37c220..b9567c2 100644
--- a/R-overlay.conf
+++ b/R-overlay.conf
@@ -1,5 +1,13 @@
-#LOG_LEVEL = 5
-#LOG_CONSOLE = y
+# R overlay -- config file for testing/running without installation
+
+DISTFILES = distfiles-root
+OVERLAY_DIR = overlay-root
+ECLASS = eclass/R-packages.eclass
+
+# write description data from R packages to a directory
+DESCRIPTION_DIR = desc-files
+
+# = logging =
LOG_LEVEL = INFO
@@ -14,31 +22,23 @@ LOG_FILE_ROTATE = yes
# number of backup log files to keep
LOG_FILE_ROTATE_COUNT = 5
-#LOG_FILE_RESOLVED = log/dep_resolved.log
+# log unresolvable dependencies into an extra file
LOG_FILE_UNRESOLVABLE = log/dep_unresolvable.log
+# = misc =
+
+# bandwidth limit for rsync (in kilobytes per second)
+# RSYNC_BWLIMIT = 12000
+
+# = extra config files =
+
# SIMPLE_RULES_FILE lists the rule files for dependency resolution
# SIMPLE_RULES_FILE ::= "<file>[ <file>]"
-#SIMPLE_RULES_FILE = "
-#simple-deprules.d/R
-#simple-deprules.d/selfdeps
-#simple-deprules.d/other
-#"
-SIMPLE_RULES_FILE = "simple-deprules.d"
-
-OVERLAY_NAME = ROverlay
-OVERLAY_DIR = overlay-root
-OVERLAY_CATEGORY = sci-R
-ECLASS = eclass/R-packages.eclass
-
-# setting a bandwidth limit for rsync (in kilobytes per second)
-# RSYNC_BWLIMIT = 12000
+SIMPLE_RULES_FILE = "config/simple-deprules.d"
# the repo config file, this can also be a whitespace-separated list of files
# REPO_CONFIG ::= "<file>[ <file>]"
-REPO_CONFIG = repo.list
+REPO_CONFIG = config/repo.list
-DISTFILES = distfiles-root
-
-DESCRIPTION_DIR = desc-files
-FIELD_DEFINITION = description_fields.conf
+# the field definition file that controls how R packages are read
+FIELD_DEFINITION = config/description_fields.conf
diff --git a/R-overlay.conf.install b/config/R-overlay.conf.install
similarity index 100%
rename from R-overlay.conf.install
rename to config/R-overlay.conf.install
diff --git a/config/R-overlay.conf b/config/R-overlay.conf.reference
similarity index 100%
rename from config/R-overlay.conf
rename to config/R-overlay.conf.reference
diff --git a/config/repo.list b/config/repo.list
index 378c03e..0d52013 100644
--- a/config/repo.list
+++ b/config/repo.list
@@ -1,105 +1,46 @@
-# repo.list
-# This file explains how to write repo config files.
-
-# !! out of date, see man/roverlay-repo.5
-
-# This file is parsed used ConfigParser syntax (known from .ini files).
-
-# A repo entry describes
-# * where to find R packages that will be used for overlay creation,
-# and optionally where and how to get the R packages (using repo types)
-# * how ebuilds can download the R packages (=> SRC_URI)
-
-# Each repository is introduced with [<section name>] and has to declare
-# some options.
-#
-# general options are:
-#
-# * required:
-#
-# src_uri -- this is used to determine the SRC_URI in ebuilds
-# (SRC_URI=<src_uri>/<package file name>)
-# FIXME note: check that subdirs are handled correctly
-#
-# * optional:
-#
-# name -- name of the repository
-# optional, defaults to <section name>
-# type -- the type of this repo, see below
-# optional, defaults to rsync
-# directory -- the local package directory,
-# optional, defaults to <DISTFILES ROOT (from config)>/<name>
-#
-# (base_uri -- don't use, to be removed)
-#
-#
-# There are two types of repos, "rsync" and "local" ones:
-#
-# * Local repo;
-# A Local repo represents a directory with R packages in it.
-# It will never be modified (i.e. synced) and has no special options.
-#
-# * Rsync repo:
-# An Rsync repo uses a local directory to sync with a remote.
-# Its directory will be modified whenever syncing (using the rsync program).
-# Behaves like a local repo if syncing is disabled.
-#
-# default rsync options (always passed to rsync):
-# --links, --safe-links, --times, --compress, --dirs, --prune-empty-dirs,
-# --force, --delete, --human-readable, --stats, --chmod=ugo=r,u+w,Dugo+x
-#
-# This type has special options:
-#
-# rsync_uri -- required, rsync uri
-# recursive -- optional, passes '--recursive' to rsync
-# if this option is set to 'yes'
-# extra_rsync_opts -- optional options to pass to rsync, this
-# can be used to exclude/include files,
-# show progress while syncing etc.
-# Note: options cannot contain whitespace! (#FIXME note: this could be allowed if useful)
-#
-#
-
-
-# == Repo entry examples ==
-
-# a local directory with packages in /var/www/R_packages
-#
-#[local_packages]
-#type = local
-#src_uri = http://localhost/R_packages
-#directory = /var/www/R_packages
-
-
-# a local directory with packages manually downloaded from CRAN
-# * directory will be automatically set to <DISTROOT>/CRAN/selected
-#
-#[CRAN/selected]
-#type = local
-#src_uri = http://cran.r-project.org/src/contrib
-
-# CRAN rsync repo
-# * type will be set to rsync
-# * directory will be set to <DISTROOT>/CRAN/all
-# * rsync progress will be shown during transfer
-# * not recursive, the package archive and R release won't be fetched
-# * this needs about 2.5G disk space
-#
-#[CRAN/all]
-#src_uri = http://cran.r-project.org/src/contrib
-#rsync_uri = cran.r-project.org::CRAN/src/contrib
-#extra_rsync_opts = --progress
-
-# CRAN rsync repo (selective transfer)
-# * type is explicitly set to rsync
-# * only packages starting with "r" or "R" will be fetched
-# * directory will be set to <DISTROOT>/CRAN/only_letter_R
-# * rsync progress will be shown during transfer
-# * not recursive
-# * this needs about 300M disk space
-#
-#[CRAN/only_letter_R]
-#type = rsync
-#src_uri = http://cran.r-project.org/src/contrib
-#rsync_uri = cran.r-project.org::CRAN/src/contrib
-#extra_rsync_opts = --include=r* --include=R* --exclude=* --progress
+[CRAN]
+type = rsync
+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
+
+[BIOC-2.10/bioc]
+type = rsync
+rsync_uri = bioconductor.org::2.10/bioc/src/contrib
+src_uri = http://bioconductor.org/packages/2.10/bioc/src/contrib/
+extra_rsync_opts = --exclude=/PACKAGES --exclude=/PACKAGES.gz --progress
+
+[BIOC-2.10/annotation]
+type = rsync
+rsync_uri = bioconductor.org::2.10/data/annotation/src/contrib
+src_uri = http://bioconductor.org/packages/2.10/data/annotation/src/contrib
+extra_rsync_opts = --progress --exclude=/PACKAGES --exclude=/PACKAGES.gz
+
+[BIOC-2.10/experiment]
+type = rsync
+rsync_uri = bioconductor.org::2.10/data/experiment/src/contrib
+src_uri = http://bioconductor.org/packages/2.10/data/experiment/src/contrib
+extra_rsync_opts = --progress --exclude=/PACKAGES --exclude=/PACKAGES.gz
+
+[R-Forge]
+type = rsync
+rsync_uri = download.r-forge.r-project.org::R-Forge/src/contrib
+src_uri = http://download.r-forge.r-project.org/src/contrib
+extra_rsync_opts = --progress --exclude=/PACKAGES --exclude=/PACKAGES.gz
+
+[omegahat]
+type = websync_repo
+src_uri = http://www.omegahat.org/R/src/contrib
+# !! RKML has wrong md5 sum in PACKAGES
+digest = md5
+
+#[http-packages]
+#type = websync_pkglist
+#pkglist = config/pkglist_http
diff --git a/config/repo.list b/config/repo.list.reference
similarity index 100%
copy from config/repo.list
copy to config/repo.list.reference
diff --git a/repo_letter_r.list b/config/repo_letter_r.list
similarity index 100%
rename from repo_letter_r.list
rename to config/repo_letter_r.list
diff --git a/config/simple-deprules.conf b/config/simple-deprules.conf.reference
similarity index 100%
rename from config/simple-deprules.conf
rename to config/simple-deprules.conf.reference
diff --git a/simple-deprules.d/R b/config/simple-deprules.d/R
similarity index 100%
rename from simple-deprules.d/R
rename to config/simple-deprules.d/R
diff --git a/simple-deprules.d/app b/config/simple-deprules.d/app
similarity index 100%
rename from simple-deprules.d/app
rename to config/simple-deprules.d/app
diff --git a/simple-deprules.d/app-text b/config/simple-deprules.d/app-text
similarity index 100%
rename from simple-deprules.d/app-text
rename to config/simple-deprules.d/app-text
diff --git a/simple-deprules.d/compound_deps b/config/simple-deprules.d/compound_deps
similarity index 100%
rename from simple-deprules.d/compound_deps
rename to config/simple-deprules.d/compound_deps
diff --git a/simple-deprules.d/dev b/config/simple-deprules.d/dev
similarity index 100%
rename from simple-deprules.d/dev
rename to config/simple-deprules.d/dev
diff --git a/simple-deprules.d/dev-libs b/config/simple-deprules.d/dev-libs
similarity index 100%
rename from simple-deprules.d/dev-libs
rename to config/simple-deprules.d/dev-libs
diff --git a/simple-deprules.d/dot_remap b/config/simple-deprules.d/dot_remap
similarity index 100%
rename from simple-deprules.d/dot_remap
rename to config/simple-deprules.d/dot_remap
diff --git a/simple-deprules.d/gnome b/config/simple-deprules.d/gnome
similarity index 100%
rename from simple-deprules.d/gnome
rename to config/simple-deprules.d/gnome
diff --git a/simple-deprules.d/ignored_text b/config/simple-deprules.d/ignored_text
similarity index 100%
rename from simple-deprules.d/ignored_text
rename to config/simple-deprules.d/ignored_text
diff --git a/simple-deprules.d/media b/config/simple-deprules.d/media
similarity index 100%
rename from simple-deprules.d/media
rename to config/simple-deprules.d/media
diff --git a/simple-deprules.d/media-libs b/config/simple-deprules.d/media-libs
similarity index 100%
rename from simple-deprules.d/media-libs
rename to config/simple-deprules.d/media-libs
diff --git a/simple-deprules.d/missing b/config/simple-deprules.d/missing
similarity index 100%
rename from simple-deprules.d/missing
rename to config/simple-deprules.d/missing
diff --git a/simple-deprules.d/net b/config/simple-deprules.d/net
similarity index 100%
rename from simple-deprules.d/net
rename to config/simple-deprules.d/net
diff --git a/simple-deprules.d/nvidia b/config/simple-deprules.d/nvidia
similarity index 100%
rename from simple-deprules.d/nvidia
rename to config/simple-deprules.d/nvidia
diff --git a/simple-deprules.d/perl b/config/simple-deprules.d/perl
similarity index 100%
rename from simple-deprules.d/perl
rename to config/simple-deprules.d/perl
diff --git a/simple-deprules.d/sci b/config/simple-deprules.d/sci
similarity index 100%
rename from simple-deprules.d/sci
rename to config/simple-deprules.d/sci
diff --git a/simple-deprules.d/sci-libs b/config/simple-deprules.d/sci-libs
similarity index 100%
rename from simple-deprules.d/sci-libs
rename to config/simple-deprules.d/sci-libs
diff --git a/simple-deprules.d/selfdeps b/config/simple-deprules.d/selfdeps
similarity index 100%
rename from simple-deprules.d/selfdeps
rename to config/simple-deprules.d/selfdeps
diff --git a/simple-deprules.d/sys b/config/simple-deprules.d/sys
similarity index 100%
rename from simple-deprules.d/sys
rename to config/simple-deprules.d/sys
diff --git a/simple-deprules.d/system.set b/config/simple-deprules.d/system.set
similarity index 100%
rename from simple-deprules.d/system.set
rename to config/simple-deprules.d/system.set
diff --git a/simple-deprules.d/unknown b/config/simple-deprules.d/unknown
similarity index 100%
rename from simple-deprules.d/unknown
rename to config/simple-deprules.d/unknown
diff --git a/simple-deprules.d/x11 b/config/simple-deprules.d/x11
similarity index 100%
rename from simple-deprules.d/x11
rename to config/simple-deprules.d/x11
diff --git a/repo.list b/repo.list
deleted file mode 100644
index 0d52013..0000000
--- a/repo.list
+++ /dev/null
@@ -1,46 +0,0 @@
-[CRAN]
-type = rsync
-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
-
-[BIOC-2.10/bioc]
-type = rsync
-rsync_uri = bioconductor.org::2.10/bioc/src/contrib
-src_uri = http://bioconductor.org/packages/2.10/bioc/src/contrib/
-extra_rsync_opts = --exclude=/PACKAGES --exclude=/PACKAGES.gz --progress
-
-[BIOC-2.10/annotation]
-type = rsync
-rsync_uri = bioconductor.org::2.10/data/annotation/src/contrib
-src_uri = http://bioconductor.org/packages/2.10/data/annotation/src/contrib
-extra_rsync_opts = --progress --exclude=/PACKAGES --exclude=/PACKAGES.gz
-
-[BIOC-2.10/experiment]
-type = rsync
-rsync_uri = bioconductor.org::2.10/data/experiment/src/contrib
-src_uri = http://bioconductor.org/packages/2.10/data/experiment/src/contrib
-extra_rsync_opts = --progress --exclude=/PACKAGES --exclude=/PACKAGES.gz
-
-[R-Forge]
-type = rsync
-rsync_uri = download.r-forge.r-project.org::R-Forge/src/contrib
-src_uri = http://download.r-forge.r-project.org/src/contrib
-extra_rsync_opts = --progress --exclude=/PACKAGES --exclude=/PACKAGES.gz
-
-[omegahat]
-type = websync_repo
-src_uri = http://www.omegahat.org/R/src/contrib
-# !! RKML has wrong md5 sum in PACKAGES
-digest = md5
-
-#[http-packages]
-#type = websync_pkglist
-#pkglist = config/pkglist_http
diff --git a/roverlay-9999.ebuild b/roverlay-9999.ebuild
index 357665b..4c94647 100644
--- a/roverlay-9999.ebuild
+++ b/roverlay-9999.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Automatically generated overlay of R packages (SoC2012)"
HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=summary"
SRC_URI=""
-LICENSE="GPL"
+LICENSE="GPL-2"
SLOT="0"
IUSE="bzip2"
@@ -30,7 +30,7 @@ _CONFDIR=/etc/${PN}
python_prepare_all() {
if use bzip2; then
einfo "USE=bzip2: Compressing dependency rule files"
- bzip2 simple-deprules.d/* || die "Cannot compress dependency rules!"
+ bzip2 config/simple-deprules.d/* || die "Cannot compress dependency rules!"
fi
sed -f misc/sed_expression_roverlay_installed roverlay.py -i || \
die "sed expression, roverlay.py"
@@ -41,10 +41,10 @@ python_install_all() {
newbin roverlay.py roverlay
insinto "${_CONFDIR}"
- doins config/description_fields.conf repo.list
- doins -r simple-deprules.d/
- newins R-overlay.conf.install R-overlay.conf
+ doins config/description_fields.conf config/repo.list
+ doins -r config/simple-deprules.d/
+ newins config/R-overlay.conf.install R-overlay.conf
- doman doc/man/*.*
+ doman doc/man/roverlay.1
dohtml doc/html/*
}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-08-20 10:39 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-20 10:39 [gentoo-commits] proj/R_overlay:master commit in: config/simple-deprules.d/, /, simple-deprules.d/, config/ André Erdmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox