commit:     0ed1f156db5c6219cbf644f7eff6e0491574e7f4
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Mon Mar 31 17:59:58 2014 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Tue Apr  1 16:36:36 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=0ed1f156

update generated files

---
 R-overlay.conf                                     |   3 +-
 R-overlay.conf => R-overlay.conf.others            |  19 +-
 config/R-overlay.conf.install                      |   3 +-
 ....conf.install => R-overlay.conf.install.others} |  19 +-
 files/licenses                                     | 753 +++++++++++++++++++++
 5 files changed, 783 insertions(+), 14 deletions(-)

diff --git a/R-overlay.conf b/R-overlay.conf
index 29d7b33..e75b0a8 100644
--- a/R-overlay.conf
+++ b/R-overlay.conf
@@ -90,6 +90,7 @@ LICENSE_MAP="config/license.map"
 OVERLAY_ECLASS="files/eclass/R-packages.eclass"
 
 # default category for created ebuilds
+#  (usually overridden by package rules)
 #  Defaults to "sci-R".
 #OVERLAY_CATEGORY="sci-R"
 
@@ -112,7 +113,7 @@ DISTDIR_STRATEGY="hardlink symlink"
 #  usually not needed
 #DISTDIR_VERIFY="no"
 
-# distmap compression format (none, bzip2 or gzip)
+# distmap compression format (default, none, bz2, bzip2, gz, gzip, xz)
 #  Defaults to "bzip2".
 #DISTMAP_COMPRESSION="bzip2"
 

diff --git a/R-overlay.conf b/R-overlay.conf.others
similarity index 87%
copy from R-overlay.conf
copy to R-overlay.conf.others
index 29d7b33..fc7ad69 100644
--- a/R-overlay.conf
+++ b/R-overlay.conf.others
@@ -20,9 +20,10 @@ LOG_FILE="workdir/log/roverlay.log"
 # directory for cache data
 CACHEDIR="workdir/cache"
 
-# portage directory
-#  used to scan for valid licenses
-PORTDIR="/usr/portage"
+# name of/path to the ebuild executable
+#  optional, but required for importing hand-written ebuilds and
+#  MANIFEST_IMPLEMENTATION=ebuild (see below)
+#EBUILD_PROG="/usr/bin/ebuild"
 
 
 # --- Logging Configuration (optional) ---
@@ -90,6 +91,7 @@ LICENSE_MAP="config/license.map"
 OVERLAY_ECLASS="files/eclass/R-packages.eclass"
 
 # default category for created ebuilds
+#  (usually overridden by package rules)
 #  Defaults to "sci-R".
 #OVERLAY_CATEGORY="sci-R"
 
@@ -112,7 +114,7 @@ DISTDIR_STRATEGY="hardlink symlink"
 #  usually not needed
 #DISTDIR_VERIFY="no"
 
-# distmap compression format (none, bzip2 or gzip)
+# distmap compression format (default, none, bz2, bzip2, gz, gzip, xz)
 #  Defaults to "bzip2".
 #DISTMAP_COMPRESSION="bzip2"
 
@@ -122,11 +124,15 @@ DISTDIR_STRATEGY="hardlink symlink"
 
 # try to read licenses from PORTDIR/licenses
 #  Defaults to "yes".
-#USE_PORTAGE_LICENSES="no"
+USE_PORTAGE_LICENSES="no"
+
+# file that lists all known licenses (one per line)
+#  Defaults to "<CACHEDIR>/licenses".
+LICENSES_FILE="files/licenses"
 
 # create a licenses file after reading portage licenses
 #  Defaults to "yes".
-#CREATE_LICENSES_FILE="no"
+CREATE_LICENSES_FILE="no"
 
 # forbid/allow syncing with remotes
 #  Defaults to "no".
@@ -135,5 +141,6 @@ DISTDIR_STRATEGY="hardlink symlink"
 # Manifest file creation
 #  Available choices are 'next' (internal, fast)
 #  and 'ebuild' (using ebuild(1), slow, but failsafe).
+#  *** 'ebuild' needs a valid EBUILD_PROG ***
 #  Defaults to "next".
 #MANIFEST_IMPLEMENTATION="ebuild"

diff --git a/config/R-overlay.conf.install b/config/R-overlay.conf.install
index 7e84d3f..fc4256d 100644
--- a/config/R-overlay.conf.install
+++ b/config/R-overlay.conf.install
@@ -87,6 +87,7 @@ LICENSE_MAP="/etc/roverlay/license.map"
 OVERLAY_ECLASS="/usr/share/roverlay/eclass/R-packages.eclass"
 
 # default category for created ebuilds
+#  (usually overridden by package rules)
 #  Defaults to "sci-R".
 #OVERLAY_CATEGORY="sci-R"
 
@@ -104,7 +105,7 @@ DISTDIR_STRATEGY="hardlink symlink"
 #  usually not needed
 #DISTDIR_VERIFY="no"
 
-# distmap compression format (none, bzip2 or gzip)
+# distmap compression format (default, none, bz2, bzip2, gz, gzip, xz)
 #  Defaults to "bzip2".
 #DISTMAP_COMPRESSION="bzip2"
 

diff --git a/config/R-overlay.conf.install 
b/config/R-overlay.conf.install.others
similarity index 86%
copy from config/R-overlay.conf.install
copy to config/R-overlay.conf.install.others
index 7e84d3f..e66cc34 100644
--- a/config/R-overlay.conf.install
+++ b/config/R-overlay.conf.install.others
@@ -20,9 +20,10 @@ LOG_FILE="~/roverlay/log/roverlay.log"
 # directory for cache data
 CACHEDIR="~/roverlay/cache"
 
-# portage directory
-#  used to scan for valid licenses
-PORTDIR="/usr/portage"
+# name of/path to the ebuild executable
+#  optional, but required for importing hand-written ebuilds and
+#  MANIFEST_IMPLEMENTATION=ebuild (see below)
+#EBUILD_PROG="/usr/bin/ebuild"
 
 
 # --- Logging Configuration (optional) ---
@@ -87,6 +88,7 @@ LICENSE_MAP="/etc/roverlay/license.map"
 OVERLAY_ECLASS="/usr/share/roverlay/eclass/R-packages.eclass"
 
 # default category for created ebuilds
+#  (usually overridden by package rules)
 #  Defaults to "sci-R".
 #OVERLAY_CATEGORY="sci-R"
 
@@ -104,7 +106,7 @@ DISTDIR_STRATEGY="hardlink symlink"
 #  usually not needed
 #DISTDIR_VERIFY="no"
 
-# distmap compression format (none, bzip2 or gzip)
+# distmap compression format (default, none, bz2, bzip2, gz, gzip, xz)
 #  Defaults to "bzip2".
 #DISTMAP_COMPRESSION="bzip2"
 
@@ -114,11 +116,15 @@ DISTDIR_STRATEGY="hardlink symlink"
 
 # try to read licenses from PORTDIR/licenses
 #  Defaults to "yes".
-#USE_PORTAGE_LICENSES="no"
+USE_PORTAGE_LICENSES="no"
+
+# file that lists all known licenses (one per line)
+#  Defaults to "<CACHEDIR>/licenses".
+LICENSES_FILE="/usr/share/roverlay/licenses"
 
 # create a licenses file after reading portage licenses
 #  Defaults to "yes".
-#CREATE_LICENSES_FILE="no"
+CREATE_LICENSES_FILE="no"
 
 # forbid/allow syncing with remotes
 #  Defaults to "no".
@@ -127,5 +133,6 @@ DISTDIR_STRATEGY="hardlink symlink"
 # Manifest file creation
 #  Available choices are 'next' (internal, fast)
 #  and 'ebuild' (using ebuild(1), slow, but failsafe).
+#  *** 'ebuild' needs a valid EBUILD_PROG ***
 #  Defaults to "next".
 #MANIFEST_IMPLEMENTATION="ebuild"

diff --git a/files/licenses b/files/licenses
new file mode 100644
index 0000000..bd8fd1d
--- /dev/null
+++ b/files/licenses
@@ -0,0 +1,753 @@
+2dboy-EULA
+3proxy
+3ware
+7plus
+9base
+9wm
+abyss
+ACE
+ACML
+aczoom
+Adaptec-EULA
+Adobe
+AdobeFlash-10.3
+AdobeFlash-11.x
+AdobePS
+adom
+AFL-2.1
+AFL-3.0
+AgereSystems-WinModem
+AGPL-3
+AGREP
+Aladdin
+Alasir
+Allegro
+all-rights-reserved
+ALMWorks-1.2
+alternate
+Amazon
+AMD
+AMD-ADL
+amd-ucode
+amiwm
+AMPAS
+android
+AOL
+Apache-1.1
+Apache-2.0
+ApE
+APL-1.0
+Apple
+APSL-2
+aquafont
+arb
+ARIADNE
+arj
+Arkkra
+ARM-FAST-MODEL
+Arphic
+ArpWarp
+Artistic
+Artistic-2
+ArxFatalisDemo
+ArxFatalis-EULA-GOG
+ArxFatalis-EULA-JoWooD
+as-is
+ASRP
+astrolog
+atheros-hal
+Atmel
+ATOK
+AVASYS
+AVM-dtrace
+AVM-FC
+AvP
+AZARA
+Babylon
+BAEKMUK
+bakoma
+bass
+battalion
+baudline
+BCS
+bea.ri.jsr173
+BEER-WARE
+bertini
+bestcrypt
+BigelowHolmes
+bioapi
+BitstreamCyberbit
+BitstreamVera
+BitTorrent
+BL
+blackshades
+blat
+Blitz-Artistic
+bluez-firmware
+boehm-gc
+bonnie
+Boost-1.0
+Broadcom
+BSD
+BSD-1
+BSD-2
+BSD-4
+BSD-with-attribution
+buddy
+bufexplorer.vim
+BUILDLIC
+bungie-marathon
+BZIP2
+C3
+cadsoft
+canfep
+Canon-UFR-II
+CAOSL
+CAPS
+CAPYBARA-EULA
+CARA
+CAVER
+CC0-1.0
+CC-BY-2.0
+CC-BY-2.5
+CC-BY-3.0
+CC-BY-NC-3.0
+CC-BY-NC-ND-1.0
+CC-BY-NC-ND-2.0
+CC-BY-NC-ND-2.5
+CC-BY-NC-ND-3.0
+CC-BY-NC-SA-2.5
+CC-BY-NC-SA-3.0
+CC-BY-ND-2.5
+CC-BY-ND-3.0
+CC-BY-SA-2.0
+CC-BY-SA-2.5
+CC-BY-SA-3.0
+CC-BY-SA-4.0
+ccp4
+CC-PD
+CCPN
+CC-SA-1.0
+CC-Sampling-Plus-1.0
+cctbx-2.0
+CDDL
+CDDL-Schily
+CDF
+CeCILL-2
+CeCILL-C
+Cenon
+CFS
+charm
+circlemud
+Clarified-Artistic
+Clear-BSD
+CLONK-trademark
+clustalw
+CMake
+cmigemo
+CNRI
+CNRI-QUIXOTE-2.4
+cns
+codehaus-classworlds
+codehaus-groovy
+colt
+Conexant
+cos
+CPAL-1.0
+CPL-0.5
+CPL-1.0
+CPOL
+CRACKLIB
+crafty
+CRAYON-PHYSICS
+creduce
+CROSSOVER
+CROSSOVER-2
+Crypt-IDEA
+cryptopp
+CUDPP
+CYANA
+czyborra
+D1X
+DCC
+Dell
+DES
+descent2-data
+dgen-sdl
+Digium
+Dina
+distributed.net
+DMD
+docbook
+dom4j
+DOOM3
+drascula
+dropbox
+DSL
+DUKE3D
+DUMB-0.9.2
+dvibook
+EAPL
+ECL-2.0
+ECWPL
+eGenixPublic-1.1
+egressor
+ElementTree
+Elm
+Emacs
+Epinions
+EPL-1.0
+EPSON
+ErlPL-1.1
+eschalon-book-1-demo
+eternal_lands
+ETQW
+EUPL-1.1
+exljbris-free
+Exolab
+FAH-EULA-2009
+FAH-special-permission
+fairuse
+fasta
+FastCGI
+FDL-1.1
+FDL-1.1+
+FDL-1.2
+FDL-1.2+
+FDL-1.3
+FDL-1.3+
+feh
+FESTIVAL
+FFSL
+finchtv
+FIPL-1.0
+Flashpix
+FLEX
+flexmock
+FLTK
+fmdrv
+fmod
+fmod-3.75
+FoilTeX
+fping
+FraunhoferFDK
+FreeArt
+freedist
+freemarker
+free-noncomm
+freetts
+frozenbyte-eula
+FTDI
+FTL
+FVWM
+galaxyhack
+GameFront
+Gameplay-Group-EULA
+gamess
+GBuffy
+gcc-runtime-library-exception-3.1
+gd
+GDLS
+geant4
+GIMPS
+glimpse
+Glulxe
+glut
+gmap
+GMGPL
+gnuplot
+google-chrome
+googleearth
+Google-TOS
+GPL-1
+GPL-1+
+GPL-2
+GPL-2+
+GPL-2-with-exceptions
+GPL-2-with-font-exception
+GPL-2-with-linking-exception
+GPL-2-with-MySQL-FLOSS-exception
+GPL-3
+GPL-3+
+GPL-3-with-font-exception
+grass-ipafonts
+gsm
+gSOAP
+guild
+gwnum
+hashcat
+Hauppauge-Firmware
+HIDAPI
+HKSCS-2001
+HP-JDKJRE6
+HPL
+HPND
+hp-proliant-essentials
+hrp_art
+HSL
+htmlc
+HTML-Tidy
+Hugo
+Hulu-EULA
+hylafaxplus
+HyperSpec
+iASL
+IBM
+IBM-J1.5
+IBM-J1.6
+IBPP-1.1
+icaclient
+icu
+IDPL
+IJG
+Ikanos
+imagemagick
+Inform
+informix-jdbc
+Info-ZIP
+inmon-sflow
+inner-net
+intel-psb
+Intel-SDP
+intel-ucode
+Interbase-1.0
+Introversion
+ipadic
+IPAfont
+ipw2100-fw
+ipw2200-fw
+ipw3945
+ipx-utils
+ISC
+ISOC-rfc
+Ispell
+ITS4
+IUPAC-InChi
+ixp4xx
+jardinains
+JasPer2.0
+JDOM
+jfontain
+jlex
+JNIC
+JOVE
+JPython
+julius
+Kermit
+keynote
+kicad-doc
+kinterbasdb
+knights-demo
+kvirc
+kyocera-mita-ppds
+lablgtk-examples
+LambdaMOO
+LaTeX-Calendar
+lcc
+LDP-1
+LDP-1a
+Legends
+levee
+LGPL-2
+LGPL-2+
+LGPL-2.1
+LGPL-2.1+
+LGPL-2.1-with-linking-exception
+LGPL-2-with-linking-exception
+LGPL-3
+LGPL-3+
+LGPL-3-with-linking-exception
+LGrind-Jacobson
+lha
+libgcc
+LIBGLOSS
+libmng
+libodialog
+libpng
+libstdc++
+libtiff
+LICENSE-BITSTREAM
+Livestation-EULA
+LLGPL-2.1
+LogMeIn
+LOKI-EULA
+lotus-notes
+LPPL-1.2
+LPPL-1.3
+LPPL-1.3b
+LPPL-1.3c
+LRCTF
+LSI
+LSI-tw_cli
+lsof
+lure
+mac
+MagentaMgOpen
+MagickWand
+Mail-Sender
+Mail-Sendmail
+MakeIndex
+MakeMKV-EULA
+mammoth
+man-pages
+man-pages-posix
+man-pages-posix-2013
+mapm
+mapm-4.9.5
+MARBLEBLAST
+marginalhacks
+Markwardt
+matplotlib
+maui
+MaxMind2
+MBROLA
+mekanix
+meme
+Memonix
+Mendeley-EULA
+metapackage
+MicroChip-PK2
+MILO
+mindterm
+Mini-XML
+minpack
+MIT
+MIT_Plus
+MIT-with-advertising
+mm
+mmix
+mod_fastcgi
+MOLDEN
+molmol
+molscript
+MolSoft
+mongrel
+Moria
+MOTIF
+Mozart
+mpeg2enc
+MPEG-4
+mpg123-el
+mpich
+mpich2
+MPL-1.0
+MPL-1.1
+MPL-2.0
+mplus-fonts
+mserv
+MSjdbcEULA40
+MSMS
+Ms-PL
+MSttfEULA
+MTA-0.5
+myspell-en_CA-KevinAtkinson
+myspell-ru_RU-ALexanderLebedev
+namd
+nap
+nauty
+NCSA-HDF
+Nero-AAC-EULA
+Nero-EULA-US
+Nessus-EULA
+netcat
+nethack
+netlogo
+netperf
+NEWLIB
+newrelic
+newton
+ngrep
+Nokia-Qt-LGPL-Exception-1.1
+nomachine
+NOSA
+noweb
+NPL-1.1
+NTED_FONT
+NVIDIA-CUDA
+NVIDIA-r1
+NVIDIA-r2
+NWN-EULA
+OAL-1.0.1
+oasis
+OASIS-Open
+ODbL-1.0
+ODESK
+OFL
+OFL-1.1
+OGL-1.0a
+Old-MIT
+olivia
+openafs-krb5-a
+Open-CASCADE-Technology-Public-License-6.5
+Open-CASCADE-Technology-Public-License-6.6
+Opendylan
+openknights
+OPENLDAP
+openpbs
+openspml
+openssl
+Openwall
+OPERA-12
+OPL
+Oracle-BCLA-JavaSE
+oracle-java-documentation
+oracle-java-documentation-7
+oracle-java-documentation-8
+oracle-jdbc
+OSGi-Specification-2.0
+OSIRIS
+OSL-1.1
+OSL-2.0
+OSL-2.1
+OTN
+otter
+PAPERS-PLEASE
+paraview
+PCRE
+PDB
+PEL
+penguzzle
+PENUMBRA-COLLECTION
+perforce
+PerlDL
+phaser
+phaser-com
+photopc
+PHP-2.02
+PHP-3
+PHP-3.01
+phrack
+phrap
+PIZZA-WARE
+pkcrack
+PLAN9
+pmd
+pngcrush
+pngnq
+POMPOM
+postal2
+poster
+POSTGRESQL
+povlegal-3.6
+Primate-Plunge
+Princeton
+procheck
+PSF-2
+PSF-2.2
+PSF-2.3
+PSF-2.4
+psipred
+PSTT
+psutils
+public-domain
+PUEL
+pymol
+PYTHON
+Q2EULA
+Q3AEULA
+Q3AEULA-20000111
+qeradiant
+qlogic-fibre-channel-firmware
+qmail-nelson
+qpage
+QPL
+QPL-1.0
+qpopper
+quake1-demodata
+quake1-textures
+quake2-demodata
+QUAKE4
+queen
+Qu-Prolog
+qwt
+Racer
+radeon-ucode
+Rain-Slick
+RAR
+RASLIC
+raspberrypi-videocore-bin
+rc
+regexp-UofT
+repoze
+Resounding
+richardson
+ringtonetools
+rosetta
+RSA
+RTCW
+RTCW-ETEULA
+RU-BSD
+Ruby
+Ruby-BSD
+rwpng
+scanlogd
+SCM-MICRO
+selfhtml
+Sendmail
+Sendmail-Open-Source
+SFI-SCLA
+SGI-B-2.0
+SGMLUG
+shmux
+shorten
+shoutcast
+shrimp
+SIFT
+SILK-patent-license
+simpserver-test
+sip
+SIR-TECH
+SixXS
+SJ-Labs
+skype-4.0.0.7-copyright
+skype-4.0.0.7-third-party_attributions.txt
+skype-eula
+Sleepycat
+SMAIL
+SmartLabs
+Snd
+Snes9x
+SNIA
+SNIPS
+SNNS-4.2
+SOFA
+solve
+SOPLA-2.3
+SOPLA-3.0
+sparky
+SpeedTouch-USB-Firmware
+Spice-1.1
+spideroak
+spin-commercial
+spin-educational
+Spotify
+Spread-1.0
+SSLeay
+staden
+Stanford
+stardock-images
+STRIDE
+Stuffit
+Subversion
+sun-bcla-j2ee-deployment
+sun-bcla-j2me
+sun-bcla-jai
+sun-bcla-java-vm
+sun-bcla-jimi
+sun-bcla-jmf
+sun-bcla-jmi
+sun-bcla-jms
+sun-bcla-jsapi
+sun-bcla-jsr223
+sun-bcla-jta
+sun-bcla-jvmstat
+sun-concurrent-util
+sun-csl
+sun-iiop
+sun-j2sl
+sun-j2sl-6
+sun-jdl
+sun-jlfgr
+sun-jrl
+sun-jsr67
+sun-jsr93
+SURF
+sus3-copyright
+sus4-copyright
+SVFL
+swiss-prot
+sword-sparvg2004
+szip
+tablelist
+TADS2
+TADS3
+tanuki-community
+tarsnap
+tcltk
+tcp_wrappers_license
+teamspeak3
+TeamViewer
+TermReadKey
+TeX
+Texinfo-manual
+TeX-other-free
+THINKTANKS
+Time-modules
+Tinker
+tkMOO
+tm-align
+torque-2.5
+totd
+truecrypt-3.0
+tsm
+ttf2pt1
+UbuntuFontLicense-1.0
+UCAR-Unidata
+unafold
+unicode
+Unicode_Fonts_for_Ancient_Scripts
+Unlicense
+unRAR
+UoI-NCSA
+UPEK-SDK-EULA
+urbanterror-4.1-maps
+urbanterror-4.2-maps
+URI
+URT
+ut2003
+ut2003-demo
+ValveSDK
+ValveServer
+ventrilo
+VGBA
+vienna-rna
+VIGRA
+vim
+vim.org
+vlgothic
+vmd
+vmware
+Volano
+VOSTROM
+W3C
+W3C-document
+w3m
+warsow
+Watcom-1.0
+WebMO
+Werken-1.1.1.1
+Whitehead-MIT
+worldofpadman
+WRI-EULA
+WTFPL-2
+wxWinFDL-3
+wxWinLL-3
+wxWinLL-3.1
+x2x
+XAnim
+xbatt
+xbattle
+xboing
+XC
+XCIN
+xc-radley
+Xdebug
+xearth
+XEphem
+xgraph
+Ximian-logos
+XMAME
+xmlformat
+xref.lisp
+xrick
+xtrs
+xv
+xvt
+yahoo-patent-license-1.2
+YaTeX
+zchaff
+ZLIB
+zoo
+zpaq
+ZPL
+ZSH

Reply via email to