gentoo resync : 20.12.2017

6 files changed, 12 insertions, 27 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index d0e17b36c07f..9aa174a49c11 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 2444dc59df1f..4b916202419d 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -493,10 +493,6 @@ dev-libs/elfutils threads
 # with upstream if there is something that can be done to fix the issue.
 media-libs/cogl gstreamer
 
-# Andrey Grozin <grozin@gentoo.org> (12 Nov 2013)
-# berkdb support works only for sys-libs/db-6.0 which is masked
-sci-physics/reduze berkdb
-
 # Michał Górny <mgorny@gentoo.org> (10 Nov 2013)
 # (on behalf of python@)
 # USE=sandbox is not done properly in Gentoo and results in crippled
diff --git a/profiles/features/hardened/amd64/make.defaults b/profiles/features/hardened/amd64/make.defaults
index 10d89c63ebf8..1d58d93d3152 100644
--- a/profiles/features/hardened/amd64/make.defaults
+++ b/profiles/features/hardened/amd64/make.defaults
@@ -1,5 +1,5 @@
 # Copyright 1999-2012 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
-USE="justify -pic"
+USE="-pic"
 
diff --git a/profiles/hardened/linux/amd64/make.defaults b/profiles/hardened/linux/amd64/make.defaults
index acb6734fd7e6..730679308126 100644
--- a/profiles/hardened/linux/amd64/make.defaults
+++ b/profiles/hardened/linux/amd64/make.defaults
@@ -1,7 +1,7 @@
 # Copyright 1999-2012 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
-USE="justify -pic"
+USE="-pic"
 
 CFLAGS="-O2 -pipe"
 CXXFLAGS="${CFLAGS}"
diff --git a/profiles/package.mask b/profiles/package.mask
index 76a1f3b609cf..9fff45e25134 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,9 +29,16 @@
 
 #--- END OF EXAMPLES ---
 
-# Andreas Sturmlechner <asturm@gentoo.org> (18 Dec 2017)
-# Masked for testing. Bug 621818
-=net-misc/teamviewer-13.0.5693
+# Patrice Clement <monsieurp@gentoo.org> (19 Dec 2017)
+# A slightly better syntax file for PAM configuration files is shipped with Vim
+# since version 8.0. The one we package is old and out of date.
+# Masked for removal in 30 days. See bug 578278.
+app-vim/pam-syntax
+
+# Andreas Sturmlechner <asturm@gentoo.org> (19 Dec 2017)
+# Dead upstream, depends on dead qt3support/qt4.
+# Bug #639246. Masked for removal in 30 days.
+app-i18n/kimera
 
 # James Le Cuirot <chewi@gentoo.org> (17 Dec 2017)
 # Java 9 is not yet fully supported on Gentoo. Packages cannot depend
@@ -400,20 +407,10 @@ sci-mathematics/qtoctave
 dev-qt/qtwebkit:4
 
 # Andreas Sturmlechner <asturm@gentoo.org> (16 Nov 2017)
-# Depends on dead Qt4WebKit. Masked for removal in 30 days. Bug #620826
-<app-misc/anki-2.1
-
-# Andreas Sturmlechner <asturm@gentoo.org> (16 Nov 2017)
 # Depends on dead Qt4WebKit. Masked for removal in 30 days. Bug #620702
 <media-gfx/freecad-0.17
 =media-gfx/freecad-9999
 
-# Andreas Sturmlechner <asturm@gentoo.org> (16 Nov 2017)
-# Depends on dead Qt4WebKit. Masked for removal in 30 days. Bug #620736
-=net-misc/teamviewer-10*
-=net-misc/teamviewer-11*
-=net-misc/teamviewer-12*
-
 # Anthony G. Basile <blueness@gentoo.org> (13 Nov 2017)
 # Masked for removal in 30 days. Deprecated in favor of net-misc/nyx.
 net-misc/arm
@@ -758,12 +755,6 @@ net-wireless/cpyrit-cuda
 # and wxGTK-3.0.3 bump in tree
 >=net-ftp/filezilla-3.25.2-r1
 
-# Zac Medico <zmedico@gentoo.org> (01 May 2017)
-# Possible API incompatibilities, bug #617174.
-# http://aiohttp.readthedocs.io/en/latest/migration.html
->=dev-python/aiohttp-2
->=dev-python/yarl-0.10
-
 # Rick Farina <zerochaos@gentoo.org> (17 Apr 2017)
 # Masking old versions because upstream changed versioning
 # Please keep this mask for 1 year to ease upgrades for users
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 2a8fbe9fff4a..cb190f158c97 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -4507,7 +4507,6 @@ media-sound/cantata:cdio - Use dev-libs/libcdio-paranoia for CD support (instead
 media-sound/cantata:http-server - Enable internal HTTP server to play non-MPD files
 media-sound/cantata:replaygain - Enable ReplayGain support, for relative volume adjustments
 media-sound/cantata:streaming - Enable playback of MPD HTTP streams using LibVLC (media-video/vlc)
-media-sound/clementine:amazoncloud - Enable Amazon cloud drive support
 media-sound/clementine:box - Enable filesharing via Box.com
 media-sound/clementine:dropbox - Enable Dropbox support
 media-sound/clementine:googledrive - Enable Google Drive support
@@ -4516,7 +4515,6 @@ media-sound/clementine:moodbar - Enable moodbar support
 media-sound/clementine:projectm - Build with ProjectM visualization
 media-sound/clementine:seafile - Enable support for seafile: a file sync service
 media-sound/clementine:skydrive - Enable Skydrive support
-media-sound/clementine:vkontakte - Enable vk.com support
 media-sound/clementine:wiimote - Enable support for Wii remote
 media-sound/cmus:cdio - use libcdio for CD support
 media-sound/cmus:cue - enable CUE sheet parsing