gentoo resync : 02.12.2017

5 files changed, 23 insertions, 0 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 305d6cd1010d..85515d34bde8 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 79512457ff4d..4d111697c26f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,15 @@
 
 #--- 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
+
+# Alexey Shvetsov <alexxy@gentoo.org> (01 Dec 2017)
+# Mask beta gromacs version
+=sci-chemistry/gromacs-2018_beta*
+
 # Andreas Sturmlechner <asturm@gentoo.org> (01 Dec 2017)
 # Dead upstream, depends on dead kdelibs4/qt4.
 # Masked for removal in 30 days. Bug #634138
diff --git a/profiles/releases/17.0/package.mask b/profiles/releases/17.0/package.mask
index f3498a551b4d..dae3af845f76 100644
--- a/profiles/releases/17.0/package.mask
+++ b/profiles/releases/17.0/package.mask
@@ -16,6 +16,7 @@ app-text/pdftk
 dev-java/ecj-gcj
 dev-java/gcj-jdk
 <dev-util/nvidia-cuda-toolkit-9
+<dev-util/nvidia-cuda-sdk-9
 
 # Andreas K. Huettel <dilfridge@gentoo.org> (1 Dec 2017)
 # The following packages require pdftk and are therefore
diff --git a/profiles/releases/17.0/package.use.mask b/profiles/releases/17.0/package.use.mask
index d95b5b9f3a60..6c372bfc6497 100644
--- a/profiles/releases/17.0/package.use.mask
+++ b/profiles/releases/17.0/package.use.mask
@@ -1,6 +1,12 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas K. Huettel <dilfridge@gentoo.org> (1 Dec 2017)
+# This version of blender uses only old cuda which is
+# masked in the 17.0 profiles.
+# The opensubdiv USE requires cuda making it an impossible combination
+=media-gfx/blender-2.78a-r1 cuda opensubdiv
+
 # Andreas K. Hüttel <dilfridge@gentoo.org> (27 May 2017)
 # Unmask default-PIE on 17.0 profiles.
 sys-devel/gcc -pie
@@ -15,3 +21,8 @@ dev-qt/qtwebkit:4 icu
 # that prevent the >=icu-59 dependency
 >=www-client/chromium-62.0.3202.9 -system-icu
 >=www-client/firefox-56.0 -system-icu
+
+# Andreas K. Hüttel <dilfridge@gentoo.org> (1 Dec 2017)
+# The following need pdftk, which is masked now
+app-text/getxbook pdf
+dev-util/diffoscope pdf
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 26390ee773d4..3267e766ac7a 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -457,6 +457,7 @@ app-emulation/bochs:avx - Enable support for emulating Advanced Vector Extension
 app-emulation/bochs:debugger - Enable debugger (slows down emulation)
 app-emulation/bochs:gdb - Enable support for the remote GDB stub
 app-emulation/bochs:x86-64 - Enable support for emulation of 64-bit CPUs
+app-emulation/containerd:btrfs - Support for BTRFS snapshot driver
 app-emulation/crossover-bin:capi - Enable ISDN support via CAPI
 app-emulation/docker:apparmor - Enable AppArmor support.
 app-emulation/docker:aufs - Enables dependencies for the "aufs" graph driver, including necessary kernel flags.
@@ -7027,6 +7028,7 @@ sci-chemistry/gromacs:hwloc - Enable HWLoc lib support
 sci-chemistry/gromacs:make-symlinks - Create symbolic links for pre-5.0 binary names
 sci-chemistry/gromacs:mkl - Use sci-libs/mkl for fft, blas, lapack routines
 sci-chemistry/gromacs:offensive - Enable gromacs partly offensive quotes
+sci-chemistry/gromacs:opencl - Enable opencl non-bonded kernels
 sci-chemistry/gromacs:single-precision - Single precision version of gromacs (default)
 sci-chemistry/gromacs:tng - Enable new trajectory format - tng
 sci-chemistry/gsim:emf - Support for .emf export