gentoo resync : 03.12.2017

7 files changed, 36 insertions, 22 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 85515d34bde8..ea14b7597eb6 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index ee4f220250d9..2bf7d3769e73 100644
--- a/profiles/arch/amd64/use.stable.mask
+++ b/profiles/arch/amd64/use.stable.mask
@@ -4,11 +4,6 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
-# Mike Gilbert <floppym@gentoo.org> (28 Oct 2017)
-# Mask python targets until dev-lang/python is stable.
-python_single_target_python3_6
-python_targets_python3_6
-
 # Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
 # Not yet stable.
 elogind
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 300c1bab2f1e..46cb1d2d0b5a 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -89,7 +89,6 @@ net-misc/networkmanager teamd
 
 # Michael Palimaka <kensington@gentoo.org> (28 Oct 2015)
 # KDE is not stable on arm
-media-video/vlc kde
 virtual/notification-daemon kde
 
 # Pacho Ramos <pacho@gentoo.org> (03 Oct 2015)
diff --git a/profiles/arch/powerpc/package.use.stable.mask b/profiles/arch/powerpc/package.use.stable.mask
index 5db46a83b2e7..899922c8d8fa 100644
--- a/profiles/arch/powerpc/package.use.stable.mask
+++ b/profiles/arch/powerpc/package.use.stable.mask
@@ -47,10 +47,8 @@ media-video/vlc opencv
 # Michael Palimaka <kensington@gentoo.org> (25 May 2016)
 # Dependencies not stable
 app-arch/p7zip kde
-app-i18n/uim kde
 dev-vcs/subversion kwallet
 games-arcade/jumpnbump kde
-media-video/vlc kde
 net-irc/quassel kde
 net-libs/libproxy kde
 sys-auth/polkit kde
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 4de688019de1..53f2a4be72cb 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -103,10 +103,8 @@ kde-apps/marble	gps
 
 # Samuli Suominen <ssuominen@gentoo.org> (21 Jun 2010)
 # These need stable kdelibs-4.
-app-i18n/uim kde
 app-arch/p7zip kde
 dev-vcs/subversion kwallet
-media-video/vlc kde
 net-libs/libproxy kde
 
 # Kacper Kowalik <xarthisius@gentoo.org> (30 May 2010)
diff --git a/profiles/package.mask b/profiles/package.mask
index 4d111697c26f..11593fcd0fb1 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,10 +29,25 @@
 
 #--- END OF EXAMPLES ---
 
-# Ulrich Müller <ulm@gentoo.org> (01 Dec 2017)
-# Major breakage (network access in upstream configure), bug #639438.
-dev-db/qt5-sqlcipher
-=net-im/openmittsu-0.9.9.48
+# Andreas Sturmlechner <asturm@gentoo.org> (03 Dec 2017)
+# Dead upstream, depends on dead qt4.
+# Masked for removal in 30 days. Bug #639254
+x11-misc/qtnotifydaemon
+
+# Andreas Sturmlechner <asturm@gentoo.org> (03 Dec 2017)
+# Dead upstream, depends on dead qt4.
+# Masked for removal in 30 days. Bug #637098
+app-office/qchartdiary
+
+# Andreas Sturmlechner <asturm@gentoo.org> (03 Dec 2017)
+# Dead upstream, depends on dead qt4.
+# Masked for removal in 30 days. Bug #638688
+x11-plugins/qled
+
+# Michael Palimaka <kensington@gentoo.org> (02 Dec 2017)
+# Depends on dead Qt 4. Dead upstream.
+# Masked for removal in 30 days. Bug #639252.
+dev-vcs/qsvn
 
 # Alexey Shvetsov <alexxy@gentoo.org> (01 Dec 2017)
 # Mask beta gromacs version
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 3267e766ac7a..c9eb9c14b840 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1278,15 +1278,17 @@ dev-ada/gnatmem:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/gnatmem:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/gprbuild:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/gprbuild:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
-dev-ada/gprbuild:shared - Build shared library
-dev-ada/gprbuild:static - Build static library
-dev-ada/gprbuild:static-pic - Build static library with pic code
 dev-ada/gtkada:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/gtkada:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/gtkada:shared - Build gtkada as shared library
 dev-ada/gtkada:static - Build gtkada as static library
 dev-ada/libadalang:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/libadalang:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
+dev-ada/libgpr:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
+dev-ada/libgpr:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
+dev-ada/libgpr:shared - Build shared library
+dev-ada/libgpr:static - Build static library
+dev-ada/libgpr:static-pic - Build static library with pic code
 dev-ada/xmlada:gnat_2016 - Compile with dev-lang/gnat-gpl-2016
 dev-ada/xmlada:gnat_2017 - Compile with dev-lang/gnat-gpl-2017
 dev-ada/xmlada:shared - Build shared library
@@ -2899,6 +2901,7 @@ dev-util/geany-plugins:gtkspell - Use gtkspell for dictionary support in GeanyVC
 dev-util/geany-plugins:keyrecord - Enable the keyrecord plugin
 dev-util/geany-plugins:multiterm - Enable the multiterm plugin
 dev-util/geany-plugins:overview - Enable overview plugin
+dev-util/geany-plugins:pretty-printer - Enable pretty-printer plugin
 dev-util/geany-plugins:scope - Enable the scope plugin which is a graphical GDB front-end
 dev-util/geany-plugins:soup - Enable updatechecker and geniuspaste plugins which require net-libs/libsoup
 dev-util/global:vim - Integrate the GNU GLOBAL source code tag system with Vim
@@ -3653,14 +3656,16 @@ mail-client/evolution:ldap - Enable support for fetching contacts from an LDAP o
 mail-client/evolution:spamassassin - Build mail-filter/spamassassin plugin
 mail-client/evolution:weather - Enable optional weather calendar support
 mail-client/mail-notification:sylpheed - Enable support for MH mailboxes used by mail-client/sylpheed
-mail-client/mutt:gpg - Enable support for app-crypt/gpgme
-mail-client/mutt:hcache - Enable header cache
+mail-client/mutt:berkdb - Enable sys-libs/db database backend for header caching
+mail-client/mutt:gdbm - Enable sys-libs/gdbm database backend for header caching
+mail-client/mutt:gpg - Enable support for app-crypt/gpgme to sign/verify and encrypt/decrypt OpenPGP messages
+mail-client/mutt:hcache - Enable header cache, one database backend needs to be enabled
 mail-client/mutt:lmdb - Enable dev-db/lmdb database backend for header caching
 mail-client/mutt:notmuch - Enable support for net-mail/notmuch
-mail-client/mutt:pop - Enable support for POP3
+mail-client/mutt:pop - Enable support for POP3 mailboxes
 mail-client/mutt:sidebar - Enable the sidebar feature
-mail-client/mutt:smime - Enable support for S/MIME
-mail-client/mutt:smtp - Enable support for smtp
+mail-client/mutt:smime - Enable support for S/MIME mailparts
+mail-client/mutt:smtp - Enable support for direct SMTP delivery
 mail-client/mutt:tokyocabinet - Enable dev-db/tokyocabinet database backend for header caching
 mail-client/nail:kerberos - If network is enabled, this adds support for GSSAPI login on IMAP through virtual/krb5.
 mail-client/nail:net - Enable support for network protocols (POP, IMAP and SMTP). If you only need to send mail with the local Transport Agent, disabling this will get you support for only /usr/sbin/sendmail call.
@@ -3668,11 +3673,14 @@ mail-client/nail:ssl - If network is enabled, this adds support for S/MIME and S
 mail-client/neomutt:berkdb - Enable BDB (Berkley DB) backend for header caching
 mail-client/neomutt:gdbm - Enable GDBM (GNU dbm) backend for header caching
 mail-client/neomutt:gpg - Enable support for app-crypt/gpgme
+mail-client/neomutt:gpgme - Build gpgme backend to support S/MIME, PGP/MIME and traditional/inline PGP
 mail-client/neomutt:kyotocabinet - Enable Kyoto Cabinet database backend for header caching
 mail-client/neomutt:lmdb - Enable LMDB (Lightning Memory-Mapped Database) backend for header caching
 mail-client/neomutt:notmuch - Enable support for net-mail/notmuch
+mail-client/neomutt:pgp_classic - Build classic_pgp backend to support PGP/MIME and traditional/inline PGP
 mail-client/neomutt:qdbm - Enable QDBM (Quicker Database Manager) database backend for header caching
 mail-client/neomutt:smime - Enable support for smime
+mail-client/neomutt:smime_classic - Build classic_smime backend to support S/MIME
 mail-client/neomutt:tokyocabinet - Enable Tokyo Cabinet database backend for header caching
 mail-client/roundcube:enigma - Add dependencies to support server-side GnuPG signing and/or encryption through the enigma plugin
 mail-client/roundcube:ldap - Add dependencies to support connecting to an LDAP address book server
@@ -7523,6 +7531,7 @@ sys-apps/flashrom:wiki - Enable wiki informations, like supported devices etc.
 sys-apps/fwupd:colorhug - Enable ColorHug support through x11-misc/colord package.
 sys-apps/fwupd:dell - Enable Dell-specific support.
 sys-apps/fwupd:elf - Enable libelf support through dev-libs/libelf package.
+sys-apps/fwupd:gpg - Enable GPG support.
 sys-apps/fwupd:man - Build and install man pages
 sys-apps/fwupd:uefi - Enable UEFI support
 sys-apps/fwupd:uefi_labels - Enable UEFI labels support