gentoo resync : 11.01.2018

7 files changed, 27 insertions, 46 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 821c87fe0678..62942713087b 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 8ff8136c352d..14dfa34efae5 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Mart Raudsepp <leio@gentoo.org> (10 Jan 2018)
+# Failing tests, with extra deps that aren't keyworded due to that
+>=gnome-base/gnome-settings-daemon-3.24 test
+
 # Pacho Ramos <pacho@gentoo.org> (04 Jan 2018)
 # sys-apps/raidutils is going to be removed (#638634)
 net-analyzer/nagios-plugin-check_raid i2o
diff --git a/profiles/default/linux/hppa/package.use.mask b/profiles/default/linux/hppa/package.use.mask
index 99c32a380222..4a7eb551b986 100644
--- a/profiles/default/linux/hppa/package.use.mask
+++ b/profiles/default/linux/hppa/package.use.mask
@@ -19,13 +19,12 @@ dev-qt/qtcore pch
 dev-qt/qtdbus pch
 dev-qt/qtdemo pch
 dev-qt/qtgui pch
-dev-qt/qthelp pch 
+dev-qt/qthelp pch
 dev-qt/qtopengl pch
 dev-qt/qtscript pch
 dev-qt/qtsql pch
 dev-qt/qtsvg pch
 dev-qt/qttest pch
-dev-qt/qtwebkit pch
 dev-qt/qtxmlpatterns pch
 
 # DON'T TOUCH THIS FILE. Instead, file a bug and assign it to <hppa@gentoo.org>.
diff --git a/profiles/package.mask b/profiles/package.mask
index 406c054d87d2..29618600d3f0 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,9 +29,26 @@
 
 #--- END OF EXAMPLES ---
 
+# Kent Fredric <kentnl@gentoo.org> (10 Jan 2018)
+# Dead upstream, Broken since 2009.
+# Bug #644146. Removal in 30 days
+dev-perl/SVN-Simple
+
+# Michał Górny <mgorny@gentoo.org> (10 Jan 2018)
+# The Fuzzer library is now installed as part of core LLVM. That's
+# sys-devel/llvm in LLVM 5, and sys-libs/compiler-rt-sanitizers
+# in LLVM 6 and newer. The separate ebuild was never approved by LLVM
+# maintainers or actually maintained, and is obsolete for a long time.
+# Removal in 30 days.
+dev-libs/libFuzzer
+
 # Richard Freeman <rich0@gentoo.org> (09 Jan 2018)
 # Bug 644048 - temp QA mask until it can get sorted out
->=sys-apps/attr-2.4.48
+~sys-apps/attr-2.4.48
+# Lars Wendler <polynomial-c@gentoo.org> (10 Jan 2018)
+# Mask followup bugfixes for =sys-apps/attr-2.4.48 as well until proper
+# testing has been conducted.
+=sys-apps/acl-2.2.52-r2
 
 # Andreas Sturmlechner <asturm@gentoo.org> (09 Jan 2018)
 # Dead upstream, depends on dead Qt4.
@@ -598,37 +615,6 @@ dev-python/pygui
 # not done yet.
 net-libs/polarssl
 
-# Andreas Sturmlechner <asturm@gentoo.org> (12 Dec 2017)
-# Depends on dead kdelibs4/qt4, unmaintained upstream. No port to
-# KF5 released. If you depend on this package, please help test the
-# KF5-based cirkuit-0.4.3_p201710115 snapshot.
-# Bug #640884. Masked for removal in 30 days.
-sci-electronics/cirkuit
-
-# Andreas Sturmlechner <asturm@gentoo.org> (12 Dec 2017)
-# Depends on dead kdelibs4/qt4, unmaintained upstream. No port to
-# KF5 released.
-# Possible alternatives are media-sound/cantata (an awesome mpd client),
-# media-sound/clementine and media-sound/tomahawk (the latter also declared
-# unmaintained upstream).
-# Bug #635468. Masked for removal in 30 days.
-media-sound/amarok
-kde-apps/kdebase-kioslaves
-kde-apps/phonon-kde
-x11-libs/qtscriptgenerator
-
-# Andreas Sturmlechner <asturm@gentoo.org> (12 Dec 2017)
-# Depends on dead media-sound/amarok:4, dead upstream,
-# last release in 2006. Bug #635468. Masked for removal in 30 days.
-media-sound/vdramgw
-
-# Andreas Sturmlechner <asturm@gentoo.org> (12 Dec 2017)
-# Depends on dead kdelibs4/qt4, no port to KF5 released yet.
-# If you depend on this package, help test KF5-based simon-9999
-# to decide on a possible snapshot. Bugs #640846, 639960, 635816.
-# Masked for removal in 30 days.
-app-accessibility/simon:0
-
 # Patrice Clement <monsieurp@gentoo.org> (12 Dec 2017)
 # Masked due to a hard dependency on an ancient versions of dev-libs/msgpack
 # (<0.6) that have been punted from the tree.
@@ -839,10 +825,10 @@ dev-lang/spidermonkey:52
 >=media-gfx/shotwell-0.27
 
 # Nicolas Bock <nicolasbock@gentoo.org> (31 Oct 2017)
-# There are multiple unresolved upstream issues with jabref-bin-4.0 (#636036).
+# There are multiple unresolved upstream issues with >=jabref-bin-4.0 (#636036).
 # If you still would like to use this version, please report any issues to
 # upstream.
-=app-text/jabref-bin-4.0
+>=app-text/jabref-bin-4.0
 
 # Nicolas Bock <nicolasbock@gentoo.org> (6 Dec 2017)
 # Development has ceased, the last commit to the upstream repository was
diff --git a/profiles/releases/17.0/package.use.mask b/profiles/releases/17.0/package.use.mask
index 88172149732b..c8c7de097254 100644
--- a/profiles/releases/17.0/package.use.mask
+++ b/profiles/releases/17.0/package.use.mask
@@ -8,7 +8,6 @@ sys-devel/gcc -pie
 # Andreas K. Hüttel <dilfridge@gentoo.org> (7 June 2017)
 # Qt-4 will never work with >=icu-59, see bug 618638 and bug 618640
 dev-qt/qtcore:4 icu
-dev-qt/qtwebkit:4 icu
 
 # Ian Stakenvicius <axs@gentoo.org> (27 Sep 2017)
 # Remove system-icu masks (see base/package.use.mask)
diff --git a/profiles/updates/2Q-2015 b/profiles/updates/2Q-2015
index af04b9c7f131..018eedc39bb6 100644
--- a/profiles/updates/2Q-2015
+++ b/profiles/updates/2Q-2015
@@ -52,7 +52,6 @@ move kde-base/kde-l10n kde-apps/kde4-l10n
 move kde-base/kdeaccessibility-meta kde-apps/kdeaccessibility-meta
 move kde-base/kdeadmin-meta kde-apps/kdeadmin-meta
 move kde-base/kdebase-data kde-apps/kdebase-data
-move kde-base/kdebase-kioslaves kde-apps/kdebase-kioslaves
 move kde-base/kdebase-meta kde-apps/kdebase-meta
 move kde-base/kde-dev-scripts kde-apps/kde-dev-scripts
 move kde-base/kde-dev-utils kde-apps/kde-dev-utils
@@ -147,7 +146,6 @@ move kde-base/okular kde-apps/okular
 move kde-base/oxygen-icons kde-frameworks/oxygen-icons
 move kde-base/palapeli kde-apps/palapeli
 move kde-base/parley kde-apps/parley
-move kde-base/phonon-kde kde-apps/phonon-kde
 move kde-base/picmi kde-apps/picmi
 move kde-base/poxml kde-apps/poxml
 move kde-base/print-manager kde-apps/print-manager
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index f1157512de6a..3a42b782f05d 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3425,7 +3425,6 @@ kde-apps/kate:addons - Build and install additional plugins
 kde-apps/kde-apps-meta:pim - Pull in KDE PIM suite
 kde-apps/kde-apps-meta:sdk - Pull in developer-specific meta-packages
 kde-apps/kdeadmin-meta:cron - Installs KDE application for virtual/cron configuration
-kde-apps/kdebase-kioslaves:sftp - Enable SFTP protocol support using net-libs/libssh
 kde-apps/kdegraphics-mobipocket:thumbnail - Enables thumbnail generation
 kde-apps/kdemultimedia-meta:cdrom - Include packages for optical discs
 kde-apps/kdenlive:freesound - Enable freesound.org credentials support via dev-qt/qtwebkit to download files
@@ -4440,12 +4439,6 @@ media-sound/alsa-utils:bat - install basic audio tester (BAT) util
 media-sound/alsa-utils:libsamplerate - install utils that use libsamplerate (e.g. alsaloop)
 media-sound/alsa-utils:ncurses - install utils that use ncurses (e.g. alsamixer)
 media-sound/alsaplayer:id3tag - Enables ID3 tagging with id3tag library
-media-sound/amarok:embedded - Use libmysqld, MySQL embedded server library. Try disabling this if you encounter -PIC related in amarok, it will make amarok rely only on standalone MySQL server.
-media-sound/amarok:lastfm - Enable Last.fm streaming services support through media-libs/liblastfm
-media-sound/amarok:mp3tunes - Enable mp3tunes integration
-media-sound/amarok:mtp - Enable support for libMTP (Plays4Sure) devices access through libmtp
-media-sound/amarok:ofa - Use media-libs/libofa to compute MusicDNS acoustic fingerprints (used by MusicBrainz)
-media-sound/amarok:utils - Build the utils - old media-sound/amarok-utils
 media-sound/amsynth:dssi - Enable support for DSSI Soft Synth Interface
 media-sound/aqualung:ifp - Enable support for iRiver iFP portable audio players
 media-sound/aqualung:lua - Enable support for programmable title formatting with dev-lang/lua
@@ -6225,6 +6218,7 @@ net-misc/batman-adv:dat - B.A.T.M.A.N. distributed arp table
 net-misc/batman-adv:mcast - B.A.T.M.A.N. multicast optimizations
 net-misc/batman-adv:nc - B.A.T.M.A.N. network coding
 net-misc/bfgminer:adl - Enable support for controlling fans and overclocking on AMD cards with AMD Display Library
+net-misc/bfgminer:alchemist - Enable support for mining with AlcheMist
 net-misc/bfgminer:antminer - Enable support for mining with AntMiner U1 sticks
 net-misc/bfgminer:avalon - Enable support for mining with Avalon 1 ASIC modules
 net-misc/bfgminer:avalonmm - Enable support for mining with Avalon 2/3 ASIC modules
@@ -6234,6 +6228,7 @@ net-misc/bfgminer:bifury - Enable support for mining with Bi*fury USB sticks
 net-misc/bfgminer:bigpic - Enable support for mining with Big Picture Mining USB sticks (Red/BlueFury, BF1, etc)
 net-misc/bfgminer:bitforce - Enable support for mining with ButterFly Labs BitFORCE ASICs and/or FPGAs
 net-misc/bfgminer:bitfury - Enable support for mining with 55nm Bitfury-based devices
+net-misc/bfgminer:bitmain - Enable support for mining with Bitmain Antminer S* series
 net-misc/bfgminer:cointerra - Enable support for mining with CoinTerra TerraMiner.
 net-misc/bfgminer:cpumining - Enable support for mining with CPUs
 net-misc/bfgminer:drillbit - Enable support for mining with Drillbit boards