Merge updates from master

22 files changed, 52 insertions, 52 deletions

diff --git a/media-libs/oyranos/oyranos-0.9.5-r1.ebuild b/media-libs/oyranos/oyranos-0.9.5-r1.ebuild
index 844ed97b5bc9..78081bb62d2b 100644
--- a/media-libs/oyranos/oyranos-0.9.5-r1.ebuild
+++ b/media-libs/oyranos/oyranos-0.9.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,10 +18,7 @@ IUSE="X cairo cups doc exif fltk jpeg qt4 qt5 raw test tiff"
 #OY_LINGUAS="cs;de;eo;eu;fr;ru" #TODO
 
 COMMON_DEPEND="
-	|| (
-		=app-admin/elektra-0.7*:0=[${MULTILIB_USEDEP}]
-		>=app-admin/elektra-0.8.4:0=[${MULTILIB_USEDEP}]
-	)
+	>=app-admin/elektra-0.8.4:0=[${MULTILIB_USEDEP}]
 	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
 	>=dev-libs/yajl-2.0.4-r1[${MULTILIB_USEDEP}]
 	>=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}]
diff --git a/media-libs/oyranos/oyranos-0.9.5.ebuild b/media-libs/oyranos/oyranos-0.9.5.ebuild
index 183f150f970d..c1124a7de034 100644
--- a/media-libs/oyranos/oyranos-0.9.5.ebuild
+++ b/media-libs/oyranos/oyranos-0.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,10 +16,7 @@ SLOT="0"
 IUSE="X cairo cups doc exif fltk qt4 raw test"
 
 RDEPEND="
-	|| (
-		=app-admin/elektra-0.7*:0=[${MULTILIB_USEDEP}]
-		>=app-admin/elektra-0.8.4:0=[${MULTILIB_USEDEP}]
-	)
+	>=app-admin/elektra-0.8.4:0[${MULTILIB_USEDEP}]
 	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
 	>=dev-libs/yajl-2.0.4-r1[${MULTILIB_USEDEP}]
 	media-libs/icc-profiles-basiccolor-printing2009
diff --git a/media-libs/oyranos/oyranos-9999.ebuild b/media-libs/oyranos/oyranos-9999.ebuild
index b5780cfd4fd6..54c4b495b78c 100644
--- a/media-libs/oyranos/oyranos-9999.ebuild
+++ b/media-libs/oyranos/oyranos-9999.ebuild
@@ -18,10 +18,7 @@ IUSE="X cairo cups doc exif fltk jpeg qt4 qt5 raw scanner test tiff"
 #OY_LINGUAS="cs;de;eo;eu;fr;ru" #TODO
 
 COMMON_DEPEND="
-	|| (
-		=app-admin/elektra-0.7*:0[${MULTILIB_USEDEP}]
-		>=app-admin/elektra-0.8.4:0[${MULTILIB_USEDEP}]
-	)
+	>=app-admin/elektra-0.8.4:0[${MULTILIB_USEDEP}]
 	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
 	>=dev-libs/yajl-2.0.4-r1[${MULTILIB_USEDEP}]
 	>=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}]
diff --git a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
index 0d16682d8803..032fd3c6438c 100644
--- a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
@@ -49,7 +49,7 @@ RDEPEND="${NLS_RDEPEND}
 	flac? ( media-libs/flac )
 	fusion? ( media-libs/FusionSound )
 	gtk? ( x11-libs/gdk-pixbuf:2 )
-	imagemagick? ( || ( media-gfx/imagemagick:= media-gfx/graphicsmagick ) )
+	imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
 	jpeg? ( virtual/jpeg:0 )
 	libcaca? ( media-libs/libcaca )
diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index 79fdaae3de48..dc6926a4267d 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -49,7 +49,7 @@ RDEPEND="${NLS_RDEPEND}
 	flac? ( media-libs/flac )
 	fusion? ( media-libs/FusionSound )
 	gtk? ( x11-libs/gdk-pixbuf:2 )
-	imagemagick? ( || ( media-gfx/imagemagick:= media-gfx/graphicsmagick ) )
+	imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
 	jpeg? ( virtual/jpeg:0 )
 	libcaca? ( media-libs/libcaca )
diff --git a/net-irc/quassel/quassel-9999.ebuild b/net-irc/quassel/quassel-9999.ebuild
index ddd1feab0585..1638c24369dd 100644
--- a/net-irc/quassel/quassel-9999.ebuild
+++ b/net-irc/quassel/quassel-9999.ebuild
@@ -54,6 +54,7 @@ GUI_RDEPEND="
 			kde-frameworks/sonnet:5
 		)
 		phonon? ( media-libs/phonon[qt5] )
+		!phonon? ( dev-qt/qtmultimedia:5 )
 		snorenotify? ( >=x11-libs/snorenotify-0.7.0 )
 		webkit? ( dev-qt/qtwebkit:5 )
 	)
@@ -104,7 +105,7 @@ REQUIRED_USE="
 	ayatana? ( || ( X monolithic ) )
 	crypt? ( || ( server monolithic ) )
 	dbus? ( || ( X monolithic ) )
-	kde? ( || ( X monolithic ) phonon )
+	kde? ( || ( X monolithic ) )
 	phonon? ( || ( X monolithic ) )
 	postgres? ( || ( server monolithic ) )
 	qt5? ( !ayatana )
@@ -135,6 +136,7 @@ src_configure() {
 		-DWANT_MONO=$(usex monolithic)
 		$(cmake-utils_use_find_package phonon Phonon)
 		$(cmake-utils_use_find_package phonon Phonon4Qt5)
+		$(cmake-utils_use_find_package !phonon Qt5Multimedia)
 		-DUSE_QT5=$(usex qt5)
 		-DWANT_CORE=$(usex server)
 		$(cmake-utils_use_find_package snorenotify LibsnoreQt5)
diff --git a/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild b/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
index 64818de5367e..02ab3b708ccc 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
 	sys-apps/util-linux
 	>=sys-devel/clang-3.5.0
 	sys-libs/zlib
-	|| ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+	>=virtual/jre-1.7:=
 	x11-libs/pango
 	!dedicated? (
 		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
@@ -85,7 +85,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-java/ant-core
-	|| ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+	>=virtual/jdk-1.7:=
 	virtual/pkgconfig"
 #	test? ( dev-java/junit:4 )
 
diff --git a/sci-mathematics/rstudio/rstudio-0.99.482.ebuild b/sci-mathematics/rstudio/rstudio-0.99.482.ebuild
index 64818de5367e..02ab3b708ccc 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.482.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.482.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
 	sys-apps/util-linux
 	>=sys-devel/clang-3.5.0
 	sys-libs/zlib
-	|| ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+	>=virtual/jre-1.7:=
 	x11-libs/pango
 	!dedicated? (
 		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
@@ -85,7 +85,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-java/ant-core
-	|| ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+	>=virtual/jdk-1.7:=
 	virtual/pkgconfig"
 #	test? ( dev-java/junit:4 )
 
diff --git a/sci-mathematics/rstudio/rstudio-0.99.483.ebuild b/sci-mathematics/rstudio/rstudio-0.99.483.ebuild
index 64818de5367e..02ab3b708ccc 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.483.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.483.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
 	sys-apps/util-linux
 	>=sys-devel/clang-3.5.0
 	sys-libs/zlib
-	|| ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+	>=virtual/jre-1.7:=
 	x11-libs/pango
 	!dedicated? (
 		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
@@ -85,7 +85,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-java/ant-core
-	|| ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+	>=virtual/jdk-1.7:=
 	virtual/pkgconfig"
 #	test? ( dev-java/junit:4 )
 
diff --git a/sci-mathematics/rstudio/rstudio-0.99.484.ebuild b/sci-mathematics/rstudio/rstudio-0.99.484.ebuild
index 64818de5367e..02ab3b708ccc 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.484.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.484.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
 	sys-apps/util-linux
 	>=sys-devel/clang-3.5.0
 	sys-libs/zlib
-	|| ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+	>=virtual/jre-1.7:=
 	x11-libs/pango
 	!dedicated? (
 		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
@@ -85,7 +85,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-java/ant-core
-	|| ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+	>=virtual/jdk-1.7:=
 	virtual/pkgconfig"
 #	test? ( dev-java/junit:4 )
 
diff --git a/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild b/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild
index 764c9da06e46..dda4c9618206 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
 	sys-apps/util-linux
 	>=sys-devel/clang-3.5.0
 	sys-libs/zlib
-	|| ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+	>=virtual/jre-1.7:=
 	x11-libs/pango
 	!dedicated? (
 		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
@@ -85,7 +85,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-java/ant-core
-	|| ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+	>=virtual/jdk-1.7:=
 	virtual/pkgconfig"
 #	test? ( dev-java/junit:4 )
 
diff --git a/sci-mathematics/rstudio/rstudio-0.99.491.ebuild b/sci-mathematics/rstudio/rstudio-0.99.491.ebuild
index 764c9da06e46..dda4c9618206 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.491.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.491.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
 	sys-apps/util-linux
 	>=sys-devel/clang-3.5.0
 	sys-libs/zlib
-	|| ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+	>=virtual/jre-1.7:=
 	x11-libs/pango
 	!dedicated? (
 		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
@@ -85,7 +85,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-java/ant-core
-	|| ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+	>=virtual/jdk-1.7:=
 	virtual/pkgconfig"
 #	test? ( dev-java/junit:4 )
 
diff --git a/sci-mathematics/rstudio/rstudio-0.99.879.ebuild b/sci-mathematics/rstudio/rstudio-0.99.879.ebuild
index 35a886baa234..996a3eb204d6 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.879.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.879.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
 	sys-apps/util-linux
 	>=sys-devel/clang-3.5.0
 	sys-libs/zlib
-	|| ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+	>=virtual/jre-1.7:=
 	x11-libs/pango
 	!dedicated? (
 		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
@@ -85,7 +85,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-java/ant-core
-	|| ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+	>=virtual/jdk-1.7:=
 	virtual/pkgconfig"
 #	test? ( dev-java/junit:4 )
 
diff --git a/sys-apps/chname/chname-1.0-r1.ebuild b/sys-apps/chname/chname-1.0-r2.ebuild
index 659e5b2e81eb..e0b70ba2cc97 100644
--- a/sys-apps/chname/chname-1.0-r1.ebuild
+++ b/sys-apps/chname/chname-1.0-r2.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+EAPI=6
+
 inherit toolchain-funcs
 
 DESCRIPTION="Run a command with a new system hostname"
@@ -10,19 +12,19 @@ SRC_URI="https://chname.googlecode.com/files/chname-1.0.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=sys-kernel/linux-headers-2.6.16"
 RDEPEND=""
 
 src_compile() {
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS} ${LDFLAGS}" chname || die
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS} ${LDFLAGS}" "${PN}"
 }
 
 src_install() {
-	dobin chname
-	doman chname.1
+	dobin "${PN}"
+	doman "${PN}.1"
 }
 
 pkg_postinst() {
diff --git a/sys-apps/rename/rename-1.3-r1.ebuild b/sys-apps/rename/rename-1.3-r1.ebuild
index 0e3e57632631..b87e18cc65ad 100644
--- a/sys-apps/rename/rename-1.3-r1.ebuild
+++ b/sys-apps/rename/rename-1.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=5
 
 inherit toolchain-funcs eutils
 
@@ -15,14 +15,18 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
+PATCHES=(
+	"${FILESDIR}"/${P}-rename.patch
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-gcc44.patch
+)
+
 src_prepare() {
 	sed -i \
 		-e '/^CFLAGS/s:-O3:@CFLAGS@:' \
 		-e '/strip /s:.*::' \
 		Makefile.in || die
-	epatch "${FILESDIR}"/${P}-rename.patch
-	epatch "${FILESDIR}"/${P}-build.patch
-	epatch "${FILESDIR}"/${P}-gcc44.patch
+	epatch "${PATCHES[@]}"
 	tc-export CC
 }
 
diff --git a/sys-apps/stroke/stroke-0.1.3.ebuild b/sys-apps/stroke/stroke-0.1.3-r1.ebuild
index 532e24b8e9c5..0d3041ab85ea 100644
--- a/sys-apps/stroke/stroke-0.1.3.ebuild
+++ b/sys-apps/stroke/stroke-0.1.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-inherit base
+EAPI=6
 
 DESCRIPTION="A powerful tool to change file timestamps (including ctimes)"
 HOMEPAGE="http://stroke.sourceforge.net/"
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index d13f4982bfee..129b3f51c204 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -2,5 +2,5 @@ DIST chromium-50.0.2661.102.tar.xz 531505652 SHA256 12135ef890c2bd13b653a06e2a44
 DIST chromium-51.0.2704.63.tar.xz 448628724 SHA256 b243e46e0ebaf8f60d1c37a0d99f1fdd80e1597667be4776a1862bb004e4eee9 SHA512 d85b6adcf2be5082ec8dc51f62849b3a2d84104d225188b7c5441cd3f9bb1e639b8d9b8cfb069b4a42d2f44128111649982fd20ca99b4f4ed5208c2c2c1a9560 WHIRLPOOL 0b3047c1c38386dbc20ef8fd6992e3c1cfc4e92986f5cbbd3e640671763ff5023427d0d8b5a6a6f6604aaeea4e2fa57e4b3f88d8e47e20684e5c774e8407c8fb
 DIST chromium-52.0.2743.19.tar.xz 457854724 SHA256 e4149f479bea32142214b07b14912a011278917077e97819fb17fa83540eac16 SHA512 d29638959b8f36e70ce60bffc65b58878e5d607959062847b625d9d6acccfba14e96fbc0cd757b28283dd90bbc1ab336f8da65d4564df26bd86e260aa92cfd7c WHIRLPOOL f48864c796f6a98731de5253daf3d281d6613ada18528358dba9c1de9e86cc14a42f6bd60a5c05c3ddfb826a6eb371c1e5353b9b8e206b24d379225bb439fdbd
 DIST chromium-52.0.2743.33.tar.xz 458015816 SHA256 3201db69bb1dde8b51c1f55f86a7f9374df4d15d8577eb7d2cfcd8544f26be2a SHA512 1e736a9d4c2db5ec285bf9fc73d5a67740a34cfa44f760a2939329513b825e2935a8443c7203883a712a13844c29694cc20a09ac3e901bb9436e0b4c1b74e437 WHIRLPOOL e5a428cb2ed6b57fcffca7efb97634507a1ddba2e625bd271c5dc37619f917716469c7fccb3062a1850268078aef9ee9bd41d55408cc07eba7bb3c49b3f3e97e
-DIST chromium-53.0.2756.0.tar.xz 457232644 SHA256 fc5e54267a857277a08653c95ea6a04c012ac92a5f2c2848b7715536e902c107 SHA512 a93dd06100b846eb3222cc9e7b1841798de02fee2eb70807ed68bc7c2da5422e5259f31d5a3741dbc18c9ed34f3d9cd389b078554fc38cf13183d147266e3efd WHIRLPOOL f9ac5cb89c93b5221c8a036751a2fda35ca5bfaed0d1a7c5e142bfea590a35421109e2ee8965e7fb63eecf6fedae373812dcaeafe95e8acba60630246c9482f7
 DIST chromium-53.0.2763.0.tar.xz 458102064 SHA256 5eeba399dee66367d011dc7732a7d695736693a6652ba7ab9cb6aa8c22562168 SHA512 b1715889e4d5fef6a44123457a613587abc5bc437abb7e02a39e98d83f74bd52eeeb7a0369766957ee90e1c3274ea28fffc411e4f589371813571631a4f9ac0e WHIRLPOOL 929a5db51d389faaf5a04916dba77cdc5932a0c14079c807d984c7ce96fe1225c54279e5d1e03950f9ff9f146744e69f67c4a5e945ad940c9a6d209746658a87
+DIST chromium-53.0.2767.4.tar.xz 460237732 SHA256 12e15075a2aa7c29ac81d2d67861d474ed9ea2dcfc368e982637b533db52ecdf SHA512 95e8166144ec9091165f9b699bc71c3fa9c1a80adf526f0fcf53a8b93566c0deeb34169e4208bf7d877dc332d8d53f53781ee406986e84808d5102b30b545584 WHIRLPOOL 4b3c7ccf97ffb65e700576c2fdbc55476cac2ece4477906de28f2aaec4f89c243aad4227f8218691deab3e74ee23ea87ca11a60a88f77ecc10bc2a0ecd6b98cd
diff --git a/www-client/chromium/chromium-53.0.2756.0.ebuild b/www-client/chromium/chromium-53.0.2767.4.ebuild
index 8744ec325b9f..4a2bebc09c7f 100644
--- a/www-client/chromium/chromium-53.0.2756.0.ebuild
+++ b/www-client/chromium/chromium-53.0.2767.4.ebuild
@@ -156,7 +156,7 @@ For other desktop environments, try one of the following:
 "
 
 pkg_pretend() {
-	if [[ $(tc-getCC)$ == *gcc* ]] && \
+	if [[ $(tc-getCC) == *gcc* ]] && \
 		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
 		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
 	fi
@@ -188,7 +188,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-system-ffmpeg-r2.patch"
-	epatch "${FILESDIR}/${PN}-system-jinja-r10.patch"
+	epatch "${FILESDIR}/${PN}-system-jinja-r11.patch"
 	epatch "${FILESDIR}/${PN}-widevine-r1.patch"
 	epatch "${FILESDIR}/${PN}-last-commit-position-r0.patch"
 	epatch "${FILESDIR}/${PN}-system-zlib-r0.patch"
@@ -231,6 +231,7 @@ src_prepare() {
 		'third_party/WebKit' \
 		'third_party/analytics' \
 		'third_party/angle' \
+		'third_party/angle/src/common/third_party/numerics' \
 		'third_party/angle/src/third_party/compiler' \
 		'third_party/angle/src/third_party/libXNVCtrl' \
 		'third_party/angle/src/third_party/murmurhash' \
diff --git a/www-servers/ocsigenserver/ocsigenserver-2.7.ebuild b/www-servers/ocsigenserver/ocsigenserver-2.7.ebuild
index e9144bbb508b..1a5a3cb90b98 100644
--- a/www-servers/ocsigenserver/ocsigenserver-2.7.ebuild
+++ b/www-servers/ocsigenserver/ocsigenserver-2.7.ebuild
@@ -26,7 +26,7 @@ DEPEND=">=dev-ml/lwt-2.5.0:=[react,ssl]
 		>=dev-ml/tyxml-3.3:=[camlp4(+)]
 		>=dev-lang/ocaml-3.12:=[ocamlopt?]
 		dev-ml/ocaml-ipaddr:=
-		dbm? ( || ( dev-ml/camldbm:= >=dev-lang/ocaml-3.12[gdbm] ) )
+		dbm? ( || ( dev-ml/camldbm >=dev-lang/ocaml-3.12[gdbm] ) )
 		sqlite? ( dev-ml/ocaml-sqlite3:= )"
 RDEPEND="${DEPEND}"
 
diff --git a/www-servers/varnish/varnish-3.0.7.ebuild b/www-servers/varnish/varnish-3.0.7.ebuild
index b43cc84491f6..4c52071b5c33 100644
--- a/www-servers/varnish/varnish-3.0.7.ebuild
+++ b/www-servers/varnish/varnish-3.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ KEYWORDS="amd64 ~mips x86"
 IUSE="doc jemalloc jit static-libs +tools"
 
 CDEPEND="
-	|| ( dev-libs/libedit sys-libs/readline:= )
+	|| ( dev-libs/libedit sys-libs/readline )
 	dev-libs/libpcre[jit?]
 	jemalloc? ( dev-libs/jemalloc )
 	tools? ( sys-libs/ncurses:= )"
diff --git a/www-servers/varnish/varnish-4.0.3.ebuild b/www-servers/varnish/varnish-4.0.3.ebuild
index 96a8262946f1..917f7145b0ea 100644
--- a/www-servers/varnish/varnish-4.0.3.ebuild
+++ b/www-servers/varnish/varnish-4.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -18,7 +18,7 @@ KEYWORDS="amd64 ~mips x86"
 IUSE="jemalloc jit static-libs"
 
 CDEPEND="
-	|| ( dev-libs/libedit sys-libs/readline:= )
+	|| ( dev-libs/libedit sys-libs/readline )
 	dev-libs/libpcre[jit?]
 	jemalloc? ( dev-libs/jemalloc )
 	sys-libs/ncurses:="
diff --git a/www-servers/varnish/varnish-4.1.2.ebuild b/www-servers/varnish/varnish-4.1.2.ebuild
index 31fefbf5eb32..289ef329d6b0 100644
--- a/www-servers/varnish/varnish-4.1.2.ebuild
+++ b/www-servers/varnish/varnish-4.1.2.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~mips ~x86"
 IUSE="jemalloc jit static-libs"
 
 CDEPEND="
-	|| ( dev-libs/libedit sys-libs/readline:= )
+	|| ( dev-libs/libedit sys-libs/readline )
 	dev-libs/libpcre[jit?]
 	jemalloc? ( dev-libs/jemalloc )
 	sys-libs/ncurses:="