gentoo resync : 01.01.2018

4 files changed, 9 insertions, 25 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index f30990df8fcb..e576348b88a0 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 533c373b04cd..a8b22f912121 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -262,9 +262,11 @@ net-voip/ekiga
 # Alice Ferrazzi <alicef@gentoo.org> (27 Dec 2017)
 # Masked for removal in 30 days.
 # This kernel doesn't boot on hardened profiles.
-# (bug #642268)
+# vanilla-sources also dosen't make prepare
+# (bug #642268) (bug #642664)
 =sys-kernel/gentoo-sources-4.14.9
 =sys-kernel/gentoo-sources-4.14.10
+=sys-kernel/vanilla-sources-4.14.10
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (27 Dec 2017)
 # Ancient. EAPI=3. (Nearly) no consumers. Needs to go.
@@ -437,7 +439,7 @@ sci-electronics/cirkuit
 # 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:4
+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
@@ -603,19 +605,6 @@ x11-drivers/xf86-input-pentouch
 # Masked for removal on 2017-12-30
 dev-tex/notoccite
 
-# Bernard Cafarelli <voyageur@gentoo.org> (24 Nov 2017)
-# Upstream removed tarball, no separate release in 3 years
-# Merged in net-misc/owncloud-client since
-# Masked for removal in 30 days. Bug #501228
-net-misc/ocsync
-sys-auth/pam-csync
-
-# Bernard Cafarelli <voyageur@gentoo.org> (24 Nov 2017)
-# Dead upstream, source not available anymore
-# Last open-source update in 2011
-# Masked for removal in 30 days. Bug #638670
-www-apps/eyeos
-
 # Matt Turner <mattst88@gentoo.org> (23 Nov 2017)
 # The modesetting driver is part of the xorg-server package since version 1.17.
 # The separate xf86-video-modesetting package is no longer needed.
diff --git a/profiles/targets/desktop/plasma/make.defaults b/profiles/targets/desktop/plasma/make.defaults
index 11d2a79da9e8..d819ea1da36a 100644
--- a/profiles/targets/desktop/plasma/make.defaults
+++ b/profiles/targets/desktop/plasma/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-USE="activities consolekit declarative dri kde kipi kwallet phonon plasma policykit qml semantic-desktop widgets xcomposite xinerama"
+USE="activities consolekit declarative dri kde kipi kwallet phonon plasma policykit qml semantic-desktop widgets xcomposite"
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 26e3eb1737b7..7066dfc3bd53 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1459,19 +1459,12 @@ dev-db/unixODBC:minimal - Disable bundled drivers and extra libraries (most user
 dev-db/unixODBC:odbcmanual - Administrator, Internal Structure, Programmer and User documentation
 dev-embedded/avrdude:ftdi - Enable support for USB FTDI chips via dev-embedded/libftdi
 dev-embedded/libftdi:tools - build ftdi_eeprom helper tool
-dev-embedded/openocd:blaster - Enable support for Altera USE-Blaster
 dev-embedded/openocd:cmsis-dap - Support for CMSIS-DAP compliant adapters
 dev-embedded/openocd:dummy - Build the dummy port driver
-dev-embedded/openocd:ftd2xx - Enable support for USB FTDI chips via dev-embedded/libftd2xx
 dev-embedded/openocd:ftdi - Enable support for USB FTDI chips via dev-embedded/libftdi
 dev-embedded/openocd:jlink - Build the SEGGER J-Link driver
-dev-embedded/openocd:minidriver - Build the dummy minidriver
 dev-embedded/openocd:parport - Enable support for parport JTAG devices
-dev-embedded/openocd:presto - Enable support for AXIS PRESTO devices
-dev-embedded/openocd:segger - Enable support for the Segger J-Link JTAG
-dev-embedded/openocd:stlink - Enable building support for the ST-Link JTAG Programmer
 dev-embedded/openocd:verbose-io - Verbose IO and comm JTAG and USB messages
-dev-embedded/openocd:versaloon - Enable building support for the Versallon-lInk JTAG
 dev-embedded/sdcc:boehm-gc - Enable Hans Boehm's garbage collector dev-libs/boehm-gc
 dev-embedded/sdcc:device-lib - Enable built of devices libraries
 dev-embedded/sdcc:ds390 - Add support for Dallas DS390
@@ -3136,6 +3129,8 @@ games-emulation/fceux:logo - Enable the ability to add a logo screen when creati
 games-emulation/generator:sdlaudio - Enable SDL Audio
 games-emulation/higan:icarus - Build icarus library manager
 games-emulation/higan:udev - Enable udev based input
+games-emulation/m64py:7z - Ensure support for .7z archives.
+games-emulation/m64py:rar - Ensure support for .rar archives.
 games-emulation/mednafen:debugger - Build with internal debugger
 games-emulation/mednafen:pax_kernel - Triggers a paxmarking of the binary
 games-emulation/mupen64plus:audio-sdl - Enable SDL audio plugin.
@@ -4570,6 +4565,7 @@ media-sound/gogglesmm:opus - Enable support for opus codec
 media-sound/herrie:http - Enable http streaming
 media-sound/herrie:xspf - Enable support for reading and saving XSPF playlists
 media-sound/hydrogen:archive - Use libarchive instead of libtar
+media-sound/hydrogen:portmidi - Add portmidi support
 media-sound/jack-audio-connection-kit:coreaudio - Build the CoreAudio driver on Mac OS X systems
 media-sound/jack-audio-connection-kit:cpudetection - Enables runtime cpudetection
 media-sound/jack-audio-connection-kit:pam - Add basic realtime configuration via sys-auth/realtime-base
@@ -6512,7 +6508,6 @@ net-misc/nextcloud-client:shibboleth - Build support for Shibboleth single sign-
 net-misc/ntp:openntpd - Allow ntp to be installed alongside openntpd
 net-misc/ntp:parse-clocks - Add support for PARSE clocks
 net-misc/ntp:samba - Provide support for Samba's signing daemon (needed for Active Directory domain controllers)
-net-misc/ocsync:sftp - Enable sftp transfer support via net-libs/libssh
 net-misc/ofono:atmodem - ETSI AT modem support.
 net-misc/ofono:bluetooth - Enable Bluetooth modem support using net-wireless/bluez.
 net-misc/ofono:cdmamodem - Enable CDMA modem support.