gentoo resync : 04.12.2017

8 files changed, 47 insertions, 19 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index ea14b7597eb6..996d4a22ac2a 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index a17fb4b3d133..4583a6859f62 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -50,7 +50,7 @@ openexr
 gimp
 
 # No hardware to test by the team
-dvb
+hdhomerun
 ios
 ipod
 
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index d769855edd54..585577535da5 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -86,6 +86,7 @@ dev-vcs/subversion kwallet
 games-arcade/jumpnbump kde
 kde-apps/katepart handbook
 kde-frameworks/kdelibs handbook policykit
+net-irc/quassel kde
 net-libs/libproxy kde
 sys-auth/polkit kde
 sys-block/gparted kde
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index f9284d17fab6..524ae4fe94db 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -117,8 +117,3 @@ media-libs/coin simage
 #nixnut <nixnut@gentoo.org> (24 jan 2009)
 #don't want zemberek for enchant for ppc32
 app-text/enchant zemberek
-
-# Chí-Thanh Christopher Nguyễn (11 Jul 2016)
-# Requires unkeyworded kde-frameworks packages
-net-irc/quassel qt5
-
diff --git a/profiles/package.mask b/profiles/package.mask
index 11593fcd0fb1..f015ed7c839e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,23 @@
 #--- END OF EXAMPLES ---
 
 # Andreas Sturmlechner <asturm@gentoo.org> (03 Dec 2017)
+# Dead upstreams, depending on dead qt3support/qt4.
+# Masked for removal in 30 days. Bug #631788
+games-board/capicity
+games-board/kcheckers
+games-board/qgo
+games-board/holdingnuts
+games-board/qcheckers
+games-emulation/virtualjaguar
+games-emulation/dboxfe
+games-kids/cubetest
+games-kids/crayon-physics
+games-misc/ggencoder
+games-misc/qlife
+games-puzzle/bubble-chains
+games-puzzle/jag
+
+# 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
diff --git a/profiles/targets/desktop/make.defaults b/profiles/targets/desktop/make.defaults
index f082bb9b8a5a..9546f24ac8fd 100644
--- a/profiles/targets/desktop/make.defaults
+++ b/profiles/targets/desktop/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr consolekit cups dbus dri dts dvd dvdr emboss encode exif fam firefox flac gif glamor gpm gtk jpeg lcms ldap libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt3support qt4 qt5 sdl spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb wxwidgets X xcb x264 xml xv xvid"
+USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr consolekit cups dbus dri dts dvd dvdr emboss encode exif fam firefox flac gif glamor gpm gtk jpeg lcms ldap libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt3support qt5 sdl spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb wxwidgets X xcb x264 xml xv xvid"
diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use
index 6deb7a1f0a44..5d4dbf769ea9 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -1,6 +1,18 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas Sturmlechner <asturm@gentoo.org> (03 Dec 2017)
+# Integration for Qt4-based applications
+kde-plasma/plasma-desktop qt4
+
+# Andreas Sturmlechner <asturm@gentoo.org> (03 Dec 2017)
+# Required by kde-frameworks/kdelibs
+app-crypt/qca qt4
+dev-libs/libdbusmenu-qt qt4
+media-libs/phonon qt4
+media-libs/phonon-vlc qt4
+sys-auth/polkit-qt qt4
+
 # Andreas Sturmlechner <asturm@gentoo.org> (30 Nov 2017)
 # Not required, but makes life easier with Qt; bug #457934
 app-arch/unzip natspec
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index c9eb9c14b840..c9bd4da9e88e 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -166,6 +166,7 @@ app-admin/sudo:openssl - Use SHA2 from dev-libs/openssl instead of sudo's intern
 app-admin/sudo:sendmail - Allow sudo to send emails with sendmail
 app-admin/sysklogd:logrotate - use app-admin/logrotate for rotating logs rather than custom cron scripts
 app-admin/syslog-ng:amqp - Enable support for AMQP destinations
+app-admin/syslog-ng:http - Enable support for HTTP destinations
 app-admin/syslog-ng:json - Enable support for JSON template formatting via dev-libs/json-c
 app-admin/syslog-ng:mongodb - Enable support for mongodb destinations
 app-admin/syslog-ng:pacct - Enable support for reading Process Accounting files (EXPERIMENTAL, Linux only)
@@ -3524,7 +3525,6 @@ kde-apps/step:qalculate - Enable the libqalculate library for unit conversion
 kde-frameworks/frameworkintegration:appstream - Enable AppStream software metadata support
 kde-frameworks/kconfigwidgets:man - Build and install man pages
 kde-frameworks/kded:man - Build and install man pages
-kde-frameworks/kdelibs:opengl - Enable OpenGL support for Plasma (GLApplet)
 kde-frameworks/kdelibs:qt3support - Enable kde3support/qt3support for very old applications
 kde-frameworks/kdesignerplugin:designer - Build KF5 widgets plugin for QtDesigner
 kde-frameworks/kdesignerplugin:webkit - Build kdewebkit plugin for QtDesigner
@@ -3671,6 +3671,7 @@ mail-client/nail:kerberos - If network is enabled, this adds support for GSSAPI
 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.
 mail-client/nail:ssl - If network is enabled, this adds support for S/MIME and SSL/TLS-powered protocols through dev-libs/openssl.
 mail-client/neomutt:berkdb - Enable BDB (Berkley DB) backend for header caching
+mail-client/neomutt:crypt - Add support for encryption -- using mcrypt or gpg where applicable
 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
@@ -4843,6 +4844,7 @@ media-tv/xmltv:uk_bleb - Britain tv listing grabber
 media-tv/xmltv:uk_rt - Britain alternative tv listing grabber
 media-tv/xmltv:uk_tvguide - UK and Ireland tv listing grabber using TV Guide website
 media-tv/xmltv:za - South Africa tv listing grabber
+media-tv/xmltv:zz_sdjson - Grabber for schedulesDirect.org SD-JSON service (many countries)
 media-video/aegisub:uchardet - Enable charset discovery via app-i18n/uchardet
 media-video/aravis:X - Build the GTK+-based video viewer for aravis. This requires GStreamer and a few plugins but technically not the GST plugin for aravis.
 media-video/aravis:gstreamer - Build the GStreamer plugin for aravis, but not the video viewer.
@@ -5878,17 +5880,18 @@ net-irc/unrealircd:showlistmodes - Display channel modes in /LIST (only configur
 net-irc/unrealircd:shunnotices - Enable notifying a user when un-shunned
 net-irc/unrealircd:topicisnuhost - Enable displaying nick!user@host as topic setter
 net-irc/unrealircd:usermod - Enable /set* and /chg* commands
-net-irc/weechat:alias - Enable plugin for alias control.
-net-irc/weechat:buflist - Enable buflist plugin.
-net-irc/weechat:charset - Enable encoding conversions.
-net-irc/weechat:exec - Enable exec plugin.
-net-irc/weechat:fifo - Enable FIFO support (sh pipes).
-net-irc/weechat:irc - Enable IRC protocol support.
-net-irc/weechat:logger - Enable support for logging.
+net-irc/weechat:alias - Enable plugin for alias control
+net-irc/weechat:buflist - Enable buflist plugin
+net-irc/weechat:charset - Enable encoding conversions
+net-irc/weechat:exec - Enable exec plugin
+net-irc/weechat:fifo - Enable FIFO support (sh pipes)
+net-irc/weechat:fset - Enable fast set plugin
+net-irc/weechat:irc - Enable IRC protocol support
+net-irc/weechat:logger - Enable support for logging
 net-irc/weechat:relay - Enable relay plugin (experimental)
-net-irc/weechat:scripts - Build infrastructure for scripting.
-net-irc/weechat:trigger - Enable trigger plugin.
-net-irc/weechat:xfer - Enable xfer plugin support.
+net-irc/weechat:scripts - Build infrastructure for scripting
+net-irc/weechat:trigger - Enable trigger plugin
+net-irc/weechat:xfer - Enable xfer plugin support
 net-irc/znc:daemon - Allow znc to run as a system-wide service. Installs an init script and creates a znc user:group.
 net-irc/znc:zlib - Enable mod_deflate-like gzip support for znc's web interface using sys-libs/zlib.
 net-libs/aqbanking:chipcard - Enable support for DDV/RSA-chipcards