gentoo resync : 25.03.2018

9 files changed, 18 insertions, 17 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 3585cc0b2b74..17aa31d8e1cb 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index 4ca9e2de3dad..c49832e6640c 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -61,6 +61,7 @@ games-action/shadowgrounds-survivor-bin
 games-action/solar2
 games-action/spacetripper-demo
 games-action/swordandsworcery
+games-action/trine-enchanted-edition
 games-action/trine2
 games-arcade/aquaria
 games-arcade/barbarian-bin
diff --git a/profiles/default/linux/musl/package.mask b/profiles/default/linux/musl/package.mask
index 303f8b5b4ca2..313dfc4b59a8 100644
--- a/profiles/default/linux/musl/package.mask
+++ b/profiles/default/linux/musl/package.mask
@@ -35,7 +35,8 @@ games-action/shadowgrounds-survivor-bin
 games-action/solar2
 games-action/spacetripper-demo
 games-action/swordandsworcery
-games-action/trine-bin
+games-action/trine
+games-action/trine-enchanted-edition
 games-action/trine2
 games-arcade/aquaria
 games-arcade/barbarian-bin
diff --git a/profiles/default/linux/uclibc/package.mask b/profiles/default/linux/uclibc/package.mask
index f5208eadab27..b94a8ca92688 100644
--- a/profiles/default/linux/uclibc/package.mask
+++ b/profiles/default/linux/uclibc/package.mask
@@ -24,7 +24,7 @@ games-action/descent3
 games-action/descent3-demo
 games-action/shadowgrounds-bin
 games-action/shadowgrounds-survivor-bin
-games-action/trine-bin
+games-action/trine
 games-arcade/marbleblastgold-demo
 games-fps/enemy-territory
 games-fps/enemy-territory-etpro
@@ -79,6 +79,7 @@ games-action/hotline-miami
 games-action/intrusion2
 games-action/solar2
 games-action/swordandsworcery
+games-action/trine-enchanted-edition
 games-action/trine2
 games-arcade/dynamitejack
 games-arcade/thinktanks-demo
diff --git a/profiles/hardened/linux/amd64/no-multilib/package.mask b/profiles/hardened/linux/amd64/no-multilib/package.mask
index cd820bb9b97a..b820b2630d26 100644
--- a/profiles/hardened/linux/amd64/no-multilib/package.mask
+++ b/profiles/hardened/linux/amd64/no-multilib/package.mask
@@ -8,6 +8,7 @@ dev-lang/rebol-bin
 
 games-action/brutal-legend
 games-action/hotline-miami
+games-action/trine-enchanted-edition
 games-action/trine2
 games-action/swordandsworcery
 games-action/beathazardultra
diff --git a/profiles/license_groups b/profiles/license_groups
index 1d0d77dbe449..48ed48742c58 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 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
+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 supermicro TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant yangcli-pro zi-labone
 
 # Local Variables:
 # mode: conf-space
diff --git a/profiles/package.mask b/profiles/package.mask
index 2ef68d9c2bca..6c867eb29198 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Mike Gilbert <floppym@gentoo.org> (24 Mar 2018)
+# Dev channel releases are only for people who are developers or want more
+# experimental features and accept a more unstable release.
+>=www-client/chromium-67
+
 # Aaron W. Swenson <titanofold@gentoo.org> (22 Mar 2018)
 # EOL. No longer receives bug or security fixes. Recommended to update
 # to latest available.
@@ -547,11 +552,6 @@ media-gfx/photivo
 # Masked for removal in 30 days. Bug 644404
 net-fs/smbtatools
 
-# Mike Gilbert <floppym@gentoo.org> (04 Mar 2018)
-# Dev channel releases are only for people who are developers or want more
-# experimental features and accept a more unstable release.
->=www-client/chromium-66
-
 # Andreas Sturmlechner <asturm@gentoo.org> (04 Mar 2018)
 # Dead upstream, depends on deprecated Qt4. media-sound/cantata
 # is an actively developed alternative based on Qt5.
@@ -683,12 +683,6 @@ dev-php/ZendFramework
 # Masked for removal in 30 days. Bug #629184.
 media-sound/moodbar
 
-# Mart Raudsepp <leio@gentoo.org> (22 Feb 2018)
-# This package was renamed to dev-libs/libgnome-games-support without
-# a pkgmove; everything in tree uses it now instead of libgames-support.
-# Masked for removal in 30 days. Bug #648468.
-dev-libs/libgames-support
-
 # Ulrich Müller <ulm@gentoo.org> (21 Feb 2018)
 # Homepage is dead. Apparently the last release was in 2012
 # and it does not work with Emacs 25 and later.
diff --git a/profiles/updates/1Q-2018 b/profiles/updates/1Q-2018
index 9ef13e4e9496..fa4dd25f87d7 100644
--- a/profiles/updates/1Q-2018
+++ b/profiles/updates/1Q-2018
@@ -6,3 +6,4 @@ move app-admin/restart_services app-admin/restart-services
 move dev-libs/purpose kde-frameworks/purpose
 move kde-misc/plasma-applet-redshift-control kde-misc/plasma-redshift-control
 move x11-proto/xorgproto x11-base/xorg-proto
+move games-action/trine-bin games-action/trine
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index dfea20209ec7..68d146e96b47 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -909,6 +909,7 @@ app-misc/gourmet:print - Enable pretty Python printing
 app-misc/gourmet:spell - Enable support for the spell check plugin
 app-misc/gourmet:web - Enable support for the web import plugin
 app-misc/gramps:geo - Enable rendering of geographical data using sci-geosciences/osm-gps-map
+app-misc/gramps:rcs - Adds support for family tree archives via dev-vcs/rcs
 app-misc/gramps:reports - All external software that is needed for graphical reports will be installed
 app-misc/graphlcd-base:g15 - Add support for app-misc/g15daemon driver (e.g. Logitech G15 Keybord)
 app-misc/irtrans-irserver:mono - Enable mono support
@@ -1027,7 +1028,6 @@ app-office/calligra:spacenav - Enable support for the 3Dconnexion spacenav input
 app-office/glabels:barcode - Enable barcode support through external libraries.
 app-office/gnucash:aqbanking - Connect to some internet banks via AqBanking
 app-office/gnucash:chipcard - Enable support for chipcard reading and processing.
-app-office/gnucash:hbci - Enable HBCI support, for connecting to some internet banks
 app-office/gnucash:quotes - Enable Online Stock Quote retrieval
 app-office/gnucash:register2 - Use the new register (Experimental)
 app-office/gnumeric:libgda - Enable database support through gnome-extra/libgda.
@@ -1238,7 +1238,6 @@ app-text/texlive:jadetex - Add support for app-text/jadetex (for processing tex
 app-text/texlive:luatex - Add extra support for luatex
 app-text/texlive:metapost - Add support for metapost: A tool for creating graphics in scalable PostScript
 app-text/texlive:music - Add support for music typesetting (dev-texlive/texlive-music)
-app-text/texlive:omega - Add omega packages (dev-texlive/texlive-omega)
 app-text/texlive:pdfannotextractor - Add dev-tex/pdfannotextractor support, for extracting annotations from PDF files
 app-text/texlive:pstricks - Add pstricks packages (dev-texlive/texlive-pstricks)
 app-text/texlive:publishers - Add support for publishers (dev-texlive/texlive-publishers)
@@ -3086,6 +3085,8 @@ games-action/supertuxkart:fribidi - Support for right-to-left languages
 games-action/supertuxkart:recorder - Enable recording with media-libs/libopenglrecorder
 games-action/supertuxkart:wiimote - Support for wiimote input devices
 games-action/swordandsworcery:bundled-libs - Use the upstream provided bundled libraries.
+games-action/trine:launcher - Install GTK+ launcher
+games-action/trine-enchanted-edition:launcher - Install GTK+ launcher
 games-action/trine2:bundled-libs - Use bundled libraries.
 games-action/trine2:launcher - Install gtk+ launcher
 games-arcade/bomns:editor - enables building the level editor
@@ -4007,8 +4008,10 @@ media-gfx/fbida:X - Install the Motif based image viewer "ida"
 media-gfx/fbida:fbcon - Install the framebuffer image viewer "fbi"
 media-gfx/fbida:ghostscript - Install the framebuffer ghostscript viewer "fbgs"
 media-gfx/fbida:webp - Enable support for the WebP image format
+media-gfx/fim:bmp - Enable BMP file support
 media-gfx/fim:dia - Enable DIA file support via app-office/dia
 media-gfx/fim:imagemagick - Use convert from media-gfx/imagemagick as fallback file opener
+media-gfx/fim:pcx - Enable PCX file support
 media-gfx/fim:xfig - Enable FIG file support via media-gfx/xfig
 media-gfx/fontforge:truetype-debugger - Enable truetype debugger in fontforge
 media-gfx/fotowall:webcam - Enable webcam support
@@ -8938,7 +8941,6 @@ xfce-extra/xfce4-pulseaudio-plugin:wnck - Enable experimental support for raisin
 xfce-extra/xfce4-soundmenu-plugin:glyr - Enable music metadata searchengine support using media-libs/glyr
 xfce-extra/xfce4-soundmenu-plugin:keybinder - Enable shortcut support using dev-libs/keybinder
 xfce-extra/xfce4-soundmenu-plugin:lastfm - Enable last.fm support using media-libs/libclastfm
-xfce-extra/xfce4-taskmanager:gksu - Build against x11-libs/libgksu to provide "Run as root" option in the application's menu
 xfce-extra/xfce4-taskmanager:gtk3 - Use GTK+3 instead of GTK+2
 xfce-extra/xfswitch-plugin:gdm - Compatibility with gnome-base/gdm only
 xfce-extra/xfswitch-plugin:lightdm - Compatibility with x11-misc/lightdm only