gentoo resync : 24.03.2018

3 files changed, 10 insertions, 5 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 7888a9471201..3585cc0b2b74 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/license_groups b/profiles/license_groups
index 4e85847f2ace..1d0d77dbe449 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -71,7 +71,7 @@ BINARY-REDISTRIBUTABLE @FREE bh-luxi Broadcom Dina intel-ucode ipw2100-fw ipw220
 
 # License agreements that try to take away your rights. These are more
 # restrictive than "all-rights-reserved" or require explicit approval.
-EULA Adaptec-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 CYANA DOOM3 ETQW FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs spin-commercial spin-educational StarUML-EULA TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant yangcli-pro zi-labone
+EULA Adaptec-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 CYANA DOOM3 ETQW FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs spin-commercial spin-educational StarUML-EULA TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant yangcli-pro zi-labone
 
 # Local Variables:
 # mode: conf-space
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index ec9c1fcce7a4..dfea20209ec7 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -874,6 +874,8 @@ app-misc/byobu:screen - Use app-misc/screen as the default backend
 app-misc/ca-certificates:cacert - Include root certificates from CAcert (http://www.cacert.org/) and Software in the Public Interest (http://www.spi-inc.org/)
 app-misc/ca-certificates:insecure_certs - Install certificates which are known to be untrustworthy.
 app-misc/carbon-c-relay:lz4 - add support for LZ4 compressed transport
+app-misc/carbon-c-relay:oniguruma - use dev-libs/oniguruma as regex implementation
+app-misc/carbon-c-relay:pcre2 - use dev-libs/libpcre2 as regex implementation
 app-misc/ddccontrol:pci - enable direct PCI memory access (the setuid ddcpci util)
 app-misc/ddcutil:drm - Use x11-libs/libdrm for more verbose diagnostics.
 app-misc/ddcutil:usb-monitor - Adds support for monitors attached via USB.
@@ -954,6 +956,8 @@ app-misc/screen:multiuser - Enable multiuser support (by setting correct permiss
 app-misc/screen:nethack - Express error messages in nethack style
 app-misc/screen:utmp - Include utmp support
 app-misc/screenfetch:X - Use the media-gfx/scrot package to take screenshots
+app-misc/skim:tmux - Install sk-tmux script to run skim in a tmux pane
+app-misc/skim:vim - Install vim plugin for skim
 app-misc/sphinx:id64 - use 64-bit document and word IDs
 app-misc/sphinx:re2 - use the dev-libs/re2 regular expression library
 app-misc/sphinx:stemmer - Enable language stemming support
@@ -2601,10 +2605,11 @@ dev-python/pyudev:pyside - Install PySide bindings
 dev-python/pyudev:qt4 - Install PyQt4 bindings
 dev-python/pyudev:qt5 - Install PyQt5 bindings
 dev-python/pyyaml:libyaml - enable support for C implementation using libyaml
-dev-python/pyzor:gevent - Enable support for the gevent based handler
-dev-python/pyzor:mysql - Enables mysql support
-dev-python/pyzor:pyzord - enable support for pyzord
-dev-python/pyzor:redis - Enables redis support
+dev-python/pyzor:gdbm - Enables the Gdbm back-end database engine for pyzord
+dev-python/pyzor:gevent - Use dev-python/gevent to enable asynchronous operation
+dev-python/pyzor:mysql - Enables the MySQL back-end database engine for pyzord through dev-python/mysql-python. Only works with python-2.x!
+dev-python/pyzor:pyzord - Enable the pyzord server daemon
+dev-python/pyzor:redis - Enables the redis back-end database engine for pyzord through dev-python/redis-py
 dev-python/rarfile:compressed - Enables the module to support compressed v3 archives by calling the app-arch/unrar.
 dev-python/rdflib:redland - enable support for Redland triplestore
 dev-python/restkit:cli - Install the restcli command line interface/tool, based on dev-python/ipython