Merge updates from master

25 files changed, 279 insertions, 189 deletions

diff --git a/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild b/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild
index 21c876b7995e..3694ce4b6ad6 100644
--- a/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild
+++ b/app-vim/vim-tmux/vim-tmux-3.0.0.ebuild
@@ -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
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="vim plugin: tmux support for vim"
 HOMEPAGE="https://github.com/tmux-plugins/vim-tmux"
 SRC_URI="https://github.com/tmux-plugins/${PN}/archive/v${PV}.zip -> ${P}.zip"
 LICENSE="vim.org"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 
 # Bug 603526.
 # Remove this line once this version is marked stable
diff --git a/dev-cpp/gsl/Manifest b/dev-cpp/gsl/Manifest
deleted file mode 100644
index 5840dfcbf028..000000000000
--- a/dev-cpp/gsl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gsl-0_pre20180108.tar.gz 57335 BLAKE2B 7221828d433dfe13e500b57b1da5b828aadc95b0c210327dd25713ce7f5b0629a7067cd8ed2ef30e11c8b8a58fa424b1edc3d374440770ee814c4c3e372038d6 SHA512 7684c8ae7ad9d0624d2f1e3531b942e7a98960f60698e4c212998ddc2ac4651fccfe5fea66d1a22133b9cba4567ba4253b022f8826f069d2e2633b3074d4f640
diff --git a/dev-cpp/ms-gsl/Manifest b/dev-cpp/ms-gsl/Manifest
new file mode 100644
index 000000000000..de636c280488
--- /dev/null
+++ b/dev-cpp/ms-gsl/Manifest
@@ -0,0 +1 @@
+DIST ms-gsl-0_pre20180108.tar.gz 57335 BLAKE2B 7221828d433dfe13e500b57b1da5b828aadc95b0c210327dd25713ce7f5b0629a7067cd8ed2ef30e11c8b8a58fa424b1edc3d374440770ee814c4c3e372038d6 SHA512 7684c8ae7ad9d0624d2f1e3531b942e7a98960f60698e4c212998ddc2ac4651fccfe5fea66d1a22133b9cba4567ba4253b022f8826f069d2e2633b3074d4f640
diff --git a/dev-cpp/gsl/files/gsl-0_pre20180108-use_system_catch-636828.patch b/dev-cpp/ms-gsl/files/gsl-0_pre20180108-use_system_catch-636828.patch
index 12d92605dda8..12d92605dda8 100644
--- a/dev-cpp/gsl/files/gsl-0_pre20180108-use_system_catch-636828.patch
+++ b/dev-cpp/ms-gsl/files/gsl-0_pre20180108-use_system_catch-636828.patch
diff --git a/dev-cpp/gsl/metadata.xml b/dev-cpp/ms-gsl/metadata.xml
index b1f7b8de77fb..7b3ec3f962e5 100644
--- a/dev-cpp/gsl/metadata.xml
+++ b/dev-cpp/ms-gsl/metadata.xml
@@ -9,7 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription>Microsoft's implmentation of the Guideline Support Library.</longdescription>
+	<longdescription>Microsoft's implmentation of the Guidelines Support Library.</longdescription>
 	<upstream>
 		<remote-id type="github">Microsoft/GSL</remote-id>
 	</upstream>
diff --git a/dev-cpp/gsl/gsl-0_pre20180108.ebuild b/dev-cpp/ms-gsl/ms-gsl-0_pre20180108.ebuild
index 95ee05e9cd36..1bfdc9e3c5a0 100644
--- a/dev-cpp/gsl/gsl-0_pre20180108.ebuild
+++ b/dev-cpp/ms-gsl/ms-gsl-0_pre20180108.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils vcs-snapshot
 
 DESCRIPTION="Guideline Support Library implementation by Microsoft"
 HOMEPAGE="https://github.com/Microsoft/GSL"
-SRC_URI="https://github.com/Microsoft/${PN}/tarball/9d65e74400976b3509833f49b16d401600c7317d -> ${P}.tar.gz"
+SRC_URI="https://github.com/Microsoft/gsl/tarball/9d65e74400976b3509833f49b16d401600c7317d -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/dev-php/composer/Manifest b/dev-php/composer/Manifest
index 2c4e869c73b4..243286d223fd 100644
--- a/dev-php/composer/Manifest
+++ b/dev-php/composer/Manifest
@@ -1 +1,2 @@
 DIST composer-1.5.5.tar.gz 1102418 BLAKE2B b8a29ab7473e439d0ff71ba5eb21a63a1c10a3f805c076c3af4f0fd46f5fe7a216085e999d3dd23ca78d769661d1bbfdf04ecf3c353428f6326735ddc564945a SHA512 c1021d1fb5ef992ea16023b982aa8ccdfddf7bce5da0945847ed28c555e795e7d23d4f0892e98d745784ab702e332217ea240ae6297bb18638b5161b6d7c84f0
+DIST composer-1.6.2.tar.gz 395403 BLAKE2B 8669bd7945d01fe0418abfce70574f6f305f03508adcd51147f08e5312a6c8238dcce7144e96c92bc2f7dfb8eacba28d8156f9960239f1a3ff98230a96ccd21e SHA512 0569c6876bfb30bdec1731718fa5d21d34fa7ecd0d1fd99fe02caf73cb2631145ff7604a374c4b14dc91d5d8e8acf3ab0c52f0f7c6c11b63130a21db516c1391
diff --git a/dev-php/composer/composer-1.6.2.ebuild b/dev-php/composer/composer-1.6.2.ebuild
new file mode 100644
index 000000000000..34f3d958c3da
--- /dev/null
+++ b/dev-php/composer/composer-1.6.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Dependency Manager for PHP"
+HOMEPAGE="https://github.com/composer/composer"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/php:*[curl]
+	>=dev-php/ca-bundle-1.0.0
+	>=dev-php/cli-prompt-1.0.0
+	>=dev-php/psr-log-1.0.2
+	dev-php/fedora-autoloader
+	>=dev-php/json-schema-3.0.0
+	>=dev-php/jsonlint-1.4.0
+	>=dev-php/phar-utils-1.0.0
+	>=dev-php/semver-1.0.0
+	>=dev-php/spdx-licenses-1.2.0
+	>=dev-php/symfony-console-2.7.9
+	>=dev-php/symfony-filesystem-2.7.20
+	>=dev-php/symfony-finder-2.7.20
+	>=dev-php/symfony-process-2.8.12"
+
+src_install() {
+	insinto "/usr/share/${PN}"
+
+	# Composer expects the LICENSE file to be there, and the
+	# easiest thing to do is to give it what it wants.
+	doins -r src res LICENSE
+
+	insinto "/usr/share/${PN}/vendor"
+	doins "${FILESDIR}"/autoload.php
+
+	exeinto "/usr/share/${PN}/bin"
+	doexe "bin/${PN}"
+	dosym "/usr/share/${PN}/bin/${PN}" "/usr/bin/${PN}"
+
+	dodoc CHANGELOG.md README.md doc/*.md
+	dodoc -r doc/articles doc/faqs
+}
diff --git a/dev-php/spdx-licenses/Manifest b/dev-php/spdx-licenses/Manifest
index 9d41032a4049..2b44e60087c1 100644
--- a/dev-php/spdx-licenses/Manifest
+++ b/dev-php/spdx-licenses/Manifest
@@ -1 +1,2 @@
 DIST spdx-licenses-1.0.0.tar.gz 8244 BLAKE2B 57ef1ccb7f4165293c8daca0fe3e04322658a06a10e82b10ee0603974572c51fd005de7a530fce280d8ab3fa78fe18ac3bd64babdf2565eacb1c61a3f3df9ce4 SHA512 1ef19555f252c5e03fe3b0376442f47bd50d894effa04bca58e7644e18fcc2a905239086d1aaf31277ce5928a7f9743e123c767e197c0fa063c015ad14851a14
+DIST spdx-licenses-1.2.0.tar.gz 10974 BLAKE2B 52cba9837202b1ae598b6d3b36f4ef67ec27988fa5911f2dfff92d39515d0401f5636922a3d205413489d21fd1dfacbf68f72c907503807317c7c9e51392e016 SHA512 fdb63dd29a099afbc116b30d1deec3d2b46be998a55fd741126f1bc393c5037a9a7477e55f7e030585d826be7d72db26be5ce0b5bb57dd536137cc45890ea9c9
diff --git a/dev-php/spdx-licenses/spdx-licenses-1.2.0.ebuild b/dev-php/spdx-licenses/spdx-licenses-1.2.0.ebuild
new file mode 100644
index 000000000000..c23832e1773c
--- /dev/null
+++ b/dev-php/spdx-licenses/spdx-licenses-1.2.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Tools for working with and validating SPDX licenses"
+HOMEPAGE="https://github.com/composer/spdx-licenses"
+SRC_URI="https://github.com/composer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/php:*
+	dev-php/fedora-autoloader"
+
+src_install() {
+	insinto "/usr/share/php/Composer/Spdx"
+	doins -r src/. res "${FILESDIR}"/autoload.php
+	dodoc README.md
+}
diff --git a/dev-util/vint/Manifest b/dev-util/vint/Manifest
index 2d291a29f5d7..bc55af4f183c 100644
--- a/dev-util/vint/Manifest
+++ b/dev-util/vint/Manifest
@@ -1,2 +1,2 @@
 DIST vint-0.3.13.tar.gz 91599 BLAKE2B 7cc9a6aca8cbd259d3ff79659c38e3d51b5f0ba75a7485872fd922543d75867fcc1689b0f7f8915e3195905b47bb0a467d9646bcb29082e9c04a1557e19b3717 SHA512 ef0b811df0250899e23e30ee4b240cf8b54e510231353ca86202661fd5f0826b9faeacc9268849e51bd6a1c71c1514498dec04a7a4ed79f00a5098811525e3d4
-DIST vint-0.3.17.tar.gz 95358 BLAKE2B 102840bc2311148af5c20499c65417459d1abcdcaae0b95bd0bbb3e1569f98f0f0abb30ccae653aff844750efa340fc38a0f8905ee70b3aec8fdc5a8fcc0a6f6 SHA512 c3df61d47b4adf68ecfb8903ea0c030acbba3e72ce95514ef25823a5321181ebbf783c1a76613de9927acefb088edd890a0a776b40888cca62b2063e436820e6
+DIST vint-0.3.18.tar.gz 95865 BLAKE2B 0f7e61b720aa0998091b9b40118b199392fbf1aeace8801d683e8249179cd3d792e15b42df6d34c567c4df1830629a80e6043e87092f37dc46a0e57c6a56cf53 SHA512 1d3e04527a8f5ffae29395010a88258c1771aff2798143eff6572400eaf96323cad04353a7fcee68d9407afde5808446f515fd3d7e8e62de4bef28edf214ebdd
diff --git a/dev-util/vint/vint-0.3.17.ebuild b/dev-util/vint/vint-0.3.18.ebuild
index e24dcd2fab20..00895d88442f 100644
--- a/dev-util/vint/vint-0.3.17.ebuild
+++ b/dev-util/vint/vint-0.3.18.ebuild
@@ -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
 
 EAPI=6
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index e1d646be24ce..67c88e238a93 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,4 +1,4 @@
-DIST openimageio-1.3.5.tar.gz 13472488 BLAKE2B 2bd6985b338cc6ec4951d372c613aa79b10571b4a0f901f16ce34ecc9c03394aaa25de42b9e1a2e29f4c6f3a68694ee54788e766a2aaa6b5b782a6fd94cf5d22 SHA512 15c4a53ab4d139839da9e9b4bbbf8ad6e00da98e73e0373cec136ce8f54b0ceae0daa2b1680c8ddab49e1680825a08be7778a9f1b7a13dd30e020b8a8c517b95
 DIST openimageio-1.6.13.tar.gz 24846132 BLAKE2B a72b7756257d4ffd1567efd73c24bf65fc2bffff82c96c18a77211e918323e65e1c99076e272b3b77115ca30910ea4cfced222892b062e339d8e4e85bd2221f7 SHA512 8cd490b6d6a3c0b542c4bcab709897c5f35ce6844ce7465e0158ac52a1b108603ccc76439f7f2e46af2ec08be4293bda6a76ec68a959026af70a444cbbdc21d6
 DIST openimageio-1.6.18.tar.gz 24881550 BLAKE2B debd5624cf91a087cb73b88047767fe1915a5c52bf27bf3fb60b14abb572e980ea039d2626818c6b99cc5d596892aec0693226cabdc74cc2620f8221d7358f89 SHA512 b94429b77263e00c33fa79fcae1b444eab01937f6dc77168b31249204de9a31c17765a8b41bec2f7d53c3d03512ba151001607bd719cb1861a3f0231a1865d51
 DIST openimageio-1.7.17.tar.gz 27164765 BLAKE2B 8245c2573577ad681753db0cad16dfd806e869ff1f443997bcf39d9a6474c585c749e9ff26bce5f23b9d42ef035bf8ce519374261a21ca0e3c4e7e13809f1a6b SHA512 c5ee9173d3acc24a5045e6ac97657d4bf0c5ac1d3250497db51b8bd9e27e2fc48979eba3598635eb6053b87748f8827be2d2831d425459a41c893e6cb43bce94
+DIST openimageio-1.8.7.tar.gz 27658771 BLAKE2B 4fe680eacbcca8b6ac6f9f94ef68e4d8a118b5ad58bb7f7091f2800c6b8fa1ad0c2c125c76ca025e956e92c04dbf5e6e0cecb48e1f29feffd804b97abcd61678 SHA512 d31e2790798959572f02de26111805b4bb5a26f73252d2f222f749e867354ca93e292738c04a36769f08c35d9b26605d1fdf66d96b2de5928d8e726bb819e963
diff --git a/media-libs/openimageio/files/openimageio-1.3.5-openexr-2.x.patch b/media-libs/openimageio/files/openimageio-1.3.5-openexr-2.x.patch
deleted file mode 100644
index 0668f0466a9a..000000000000
--- a/media-libs/openimageio/files/openimageio-1.3.5-openexr-2.x.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-There is no IlmBaseConfig.h in OpenEXR 2.x
-
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_mutexattr_init'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_mutexattr_settype'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_mutexattr_destroy'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_lock'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_unlock'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_destroy'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_init'
-../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_detach'
-
---- src/cmake/modules/FindIlmBase.cmake
-+++ src/cmake/modules/FindIlmBase.cmake
-@@ -176,17 +176,11 @@
- set (ILMBASE_CACHED_STATE ${ILMBASE_CURRENT_STATE}
-   CACHE INTERNAL "State last seen by FindIlmBase.cmake" FORCE)
- 
--# Link with pthreads if required
--if (NOT WIN32 AND EXISTS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h)
--  file (STRINGS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h
--    ILMBASE_HAVE_PTHREAD
--    REGEX "^[ \\t]*#define[ \\t]+HAVE_PTHREAD[ \\t]1[ \\t]*\$"
--  )
--  if (ILMBASE_HAVE_PTHREAD)
--    find_package (Threads)
--    if (CMAKE_USE_PTHREADS_INIT)
--      set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT})
--    endif ()
-+# Always link to pthreads for OpenEXR 2.x
-+if (NOT WIN32)
-+  find_package (Threads)
-+  if (CMAKE_USE_PTHREADS_INIT)
-+    set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT})
-   endif ()
- endif ()
- 
diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml
index 935e4012defd..27cefe35ec56 100644
--- a/media-libs/openimageio/metadata.xml
+++ b/media-libs/openimageio/metadata.xml
@@ -20,7 +20,6 @@
 		<flag name="ptex" restrict="&gt;=media-libs/openimageio-1.6.18">
 			Use <pkg>media-libs/ptex</pkg>
 		</flag>
-		<flag name="tbb">Use <pkg>dev-cpp/tbb</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">OpenImageIO/oiio</remote-id>
diff --git a/media-libs/openimageio/openimageio-1.3.5.ebuild b/media-libs/openimageio/openimageio-1.3.5.ebuild
deleted file mode 100644
index db5c150d4757..000000000000
--- a/media-libs/openimageio/openimageio-1.3.5.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils multilib python-single-r1 vcs-snapshot
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="gif jpeg2k colorio opencv opengl python qt4 ssl tbb +truetype"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="test" #431412
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/pugixml:=
-	media-libs/glew:=
-	media-libs/ilmbase:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.2.1:=
-	media-libs/openexr:=
-	media-libs/tiff:0=
-	sci-libs/hdf5
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	gif? ( media-libs/giflib )
-	jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
-	colorio? ( >=media-libs/opencolorio-1.0.7:= )
-	opencv? (
-		>=media-libs/opencv-2.3:=
-		python? ( >=media-libs/opencv-2.4.8[python,${PYTHON_USEDEP}] )
-	)
-	opengl? (
-		virtual/glu
-		virtual/opengl
-		)
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtopengl:4
-		)
-	ssl? ( dev-libs/openssl:0 )
-	tbb? ( dev-cpp/tbb )
-	truetype? ( media-libs/freetype:2= )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}/src
-PATCHES=( "${FILESDIR}"/${P}-openexr-2.x.patch )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# remove bundled code to make it build
-	# https://github.com/OpenImageIO/oiio/issues/403
-	rm */pugixml* || die
-
-	# fix man page building
-	# https://github.com/OpenImageIO/oiio/issues/404
-	use qt4 || sed -i -e '/list.*APPEND.*cli_tools.*iv/d' doc/CMakeLists.txt
-
-	use python && python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-		-DBUILDSTATIC=OFF
-		-DLINKSTATIC=OFF
-		$(use python && echo -DPYLIB_INSTALL_DIR="$(python_get_sitedir)")
-		-DUSE_EXTERNAL_PUGIXML=ON
-		-DUSE_FIELD3D=OFF # missing in Portage
-		-DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
-		-DSTOP_ON_WARNING=OFF
-		$(cmake-utils_use_use truetype freetype)
-		$(cmake-utils_use_use colorio OCIO)
-		$(cmake-utils_use_use opencv)
-		$(cmake-utils_use_use opengl)
-		$(cmake-utils_use_use jpeg2k OPENJPEG)
-		$(cmake-utils_use_use python)
-		$(cmake-utils_use_use qt4 QT)
-		$(cmake-utils_use_use tbb)
-		$(cmake-utils_use_use ssl OPENSSL)
-		$(cmake-utils_use_use gif)
-		)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	rm -rf "${ED}"/usr/share/doc
-	dodoc ../{CHANGES,CREDITS,README*} # doc/CLA-{CORPORATE,INDIVIDUAL}
-	docinto pdf
-	dodoc doc/*.pdf
-}
diff --git a/media-libs/openimageio/openimageio-1.6.13.ebuild b/media-libs/openimageio/openimageio-1.6.13.ebuild
index d1f065679aee..f7a101f8a20c 100644
--- a/media-libs/openimageio/openimageio-1.6.13.ebuild
+++ b/media-libs/openimageio/openimageio-1.6.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~ppc64 x86"
-IUSE="colorio ffmpeg gif jpeg2k opencv opengl python qt4 raw ssl +truetype"
+IUSE="colorio ffmpeg gif jpeg2k opencv opengl python raw ssl +truetype"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RESTRICT="test" #431412
@@ -45,12 +45,6 @@ RDEPEND="
 		${PYTHON_DEPS}
 		dev-libs/boost:=[python,${PYTHON_USEDEP}]
 	)
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtopengl:4
-		media-libs/glew:=
-	)
 	raw? ( media-libs/libraw:= )
 	ssl? ( dev-libs/openssl:0 )
 	truetype? ( media-libs/freetype:2= )"
@@ -91,7 +85,7 @@ src_configure() {
 		-DUSE_OPENSSL=$(usex ssl)
 		-DUSE_PYTHON=$(usex python)
 		-DUSE_LIBRAW=$(usex raw)
-		-DUSE_QT=$(usex qt4)
+		-DUSE_QT=OFF # Deprecated
 	)
 
 	if [[ ${EPYTHON} == python3* ]]; then
diff --git a/media-libs/openimageio/openimageio-1.6.18.ebuild b/media-libs/openimageio/openimageio-1.6.18.ebuild
index 874a927f7b8d..7f5f2086dbf8 100644
--- a/media-libs/openimageio/openimageio-1.6.18.ebuild
+++ b/media-libs/openimageio/openimageio-1.6.18.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~ppc64 ~x86"
 X86_CPU_FEATURES=( sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 )
 CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
 
-IUSE="colorio doc ffmpeg field3d gif jpeg2k opencv opengl ptex python qt4 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
+IUSE="colorio doc ffmpeg field3d gif jpeg2k opencv opengl ptex python raw ssl +truetype ${CPU_FEATURES[@]%:*}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RESTRICT="test" #431412
@@ -30,7 +30,7 @@ RDEPEND="dev-libs/boost:=
 	media-libs/openexr:=
 	media-libs/tiff:0=
 	sys-libs/zlib:=
-	virtual/jpeg:=
+	virtual/jpeg:0
 	colorio? ( media-libs/opencolorio:0= )
 	ffmpeg? ( media-video/ffmpeg:0= )
 	field3d? ( media-libs/Field3D )
@@ -46,12 +46,6 @@ RDEPEND="dev-libs/boost:=
 		${PYTHON_DEPS}
 		dev-libs/boost:=[python,${PYTHON_USEDEP}]
 	)
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtopengl:4
-		media-libs/glew:=
-	)
 	raw? ( media-libs/libraw:0= )
 	ssl? ( dev-libs/openssl:0= )
 	truetype? ( media-libs/freetype:2= )"
@@ -101,8 +95,8 @@ src_configure() {
 		-DUSE_OPENSSL=$(usex ssl)
 		-DUSE_PTEX=$(usex ptex)
 		-DUSE_PYTHON=$(usex python)
-		-DUSE_QT=$(usex qt4)
-		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+		-DUSE_QT=OFF # Deprecated
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
 	)
 
 	cmake-utils_src_configure
diff --git a/media-libs/openimageio/openimageio-1.7.17.ebuild b/media-libs/openimageio/openimageio-1.7.17.ebuild
index 20a3d9542038..163f0a64e763 100644
--- a/media-libs/openimageio/openimageio-1.7.17.ebuild
+++ b/media-libs/openimageio/openimageio-1.7.17.ebuild
@@ -20,7 +20,7 @@ X86_CPU_FEATURES=(
 )
 CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
 
-IUSE="colorio doc ffmpeg field3d gif jpeg2k opencv opengl ptex python qt4 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
+IUSE="colorio doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python raw ssl +truetype ${CPU_FEATURES[@]%:*}"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RESTRICT="test" #431412
@@ -33,7 +33,7 @@ RDEPEND=">=dev-libs/boost-1.62:=
 	>=media-libs/openexr-2.2.0-r2:=
 	media-libs/tiff:0=
 	sys-libs/zlib:=
-	virtual/jpeg:=
+	virtual/jpeg:0
 	colorio? ( media-libs/opencolorio:= )
 	ffmpeg? ( media-video/ffmpeg:= )
 	field3d? ( media-libs/Field3D:= )
@@ -49,14 +49,11 @@ RDEPEND=">=dev-libs/boost-1.62:=
 		${PYTHON_DEPS}
 		dev-libs/boost:=[python,${PYTHON_USEDEP}]
 	)
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtopengl:4
-		media-libs/glew:=
-	)
 	raw? ( media-libs/libraw:= )
-	ssl? ( dev-libs/openssl:0= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
 	truetype? ( media-libs/freetype:2= )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[latex] )"
@@ -105,8 +102,8 @@ src_configure() {
 		-DUSE_OPENSSL=$(usex ssl)
 		-DUSE_PTEX=$(usex ptex)
 		-DUSE_PYTHON=$(usex python)
-		-DUSE_QT=$(usex qt4)
-		-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+		-DUSE_QT=OFF # Deprecated
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
 	)
 
 	cmake-utils_src_configure
diff --git a/media-libs/openimageio/openimageio-1.8.7.ebuild b/media-libs/openimageio/openimageio-1.8.7.ebuild
new file mode 100644
index 000000000000..1c69cf3c6d6a
--- /dev/null
+++ b/media-libs/openimageio/openimageio-1.8.7.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit cmake-utils vcs-snapshot python-single-r1
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+X86_CPU_FEATURES=(
+	sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="colorio doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="test" #431412
+
+RDEPEND=">=dev-libs/boost-1.62:=
+	dev-libs/pugixml:=
+	>=media-libs/ilmbase-2.2.0-r1:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	>=media-libs/openexr-2.2.0-r2:=
+	media-libs/tiff:0=
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	colorio? ( media-libs/opencolorio:= )
+	ffmpeg? ( media-video/ffmpeg:= )
+	field3d? ( media-libs/Field3D:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
+	opencv? ( media-libs/opencv:= )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+		media-libs/glew:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost:=[python,${PYTHON_USEDEP}]
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raw? ( media-libs/libraw:= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	truetype? ( media-libs/freetype:2= )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen[latex] )"
+
+DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	# Build with SIMD support
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DINSTALL_DOCS=$(usex doc)
+		-DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_CPP14=ON
+		-DUSE_EXTERNAL_PUGIXML=ON
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_FIELD3D=$(usex field3d)
+		-DUSE_FREETYPE=$(usex truetype)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_JPEGTURBO=ON
+		-DUSE_LIBRAW=$(usex raw)
+		-DUSE_NUKE=NO # Missing in Gentoo
+		-DUSE_NUKE=OFF
+		-DUSE_OCIO=$(usex colorio)
+		-DUSE_OPENCV=$(usex opencv)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENSSL=$(usex ssl)
+		-DUSE_PTEX=$(usex ptex)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/net-dns/bind-tools/bind-tools-9.11.1_p3.ebuild b/net-dns/bind-tools/bind-tools-9.11.1_p3.ebuild
index 95f347c1a18c..c89e19f2d774 100644
--- a/net-dns/bind-tools/bind-tools-9.11.1_p3.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.11.1_p3.ebuild
@@ -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
 
 EAPI="5"
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.isc.org/isc/bind9/${MY_PV}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd"
 IUSE="doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
diff --git a/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild b/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild
index 8c8ea13547c0..e4e5f08ddc16 100644
--- a/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.11.2_p1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.isc.org/downloads/file/${MY_P}/?version=tar-gz -> ${MY_PN}-
 
 LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd"
 IUSE="doc gost gssapi idn ipv6 libressl readline seccomp ssl urandom xml"
 # no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
 
diff --git a/profiles/updates/1Q-2018 b/profiles/updates/1Q-2018
index 88f667f04977..c834346105b0 100644
--- a/profiles/updates/1Q-2018
+++ b/profiles/updates/1Q-2018
@@ -1,2 +1,3 @@
 move app-portage/kuroo4 app-portage/kuroo
 slotmove app-portage/kuroo 4 0
+move dev-cpp/gsl dev-cpp/ms-gsl
diff --git a/sci-mathematics/gimps/Manifest b/sci-mathematics/gimps/Manifest
index 61c15251cb46..38024671cd62 100644
--- a/sci-mathematics/gimps/Manifest
+++ b/sci-mathematics/gimps/Manifest
@@ -2,3 +2,5 @@ DIST p95v2810.linux32.tar.gz 4610763 BLAKE2B a6c811235644cdc4d359406504051965b58
 DIST p95v2810.linux64.tar.gz 5707219 BLAKE2B 1ad26aa2fba4d7f4727bcd2dfe010d2b5b780e7516f7794111f7d5a782bb5d00080de3e87b98f110ca15a61c128ee18472c2655aaa68cb5498eb5bda11a06a4d SHA512 c4fd692df3018e5e73ba6095de5ed394f36d5c89dd81c2c7f2c74a4ce3184b22176dc13b8b59e4f42c1781e911107dc12224cfcddef882535931319ec93120f1
 DIST p95v294b5.linux32.tar.gz 5455113 BLAKE2B a615ff15a77eaeebd6a1324f59e6b780d88785952d2517c5ed088f16be74e33e75e98d971eefdce10d17ad0237672cde8111e7b3205d93a4b81bbb949f0d662c SHA512 e8a0061c363333a7c36eb24ef72e9293903404563d04cdcad6432e63d25d8b85e1f0c8e8a46d9795a204830a01031024f82362bcedec4fcec954899e4d6e7127
 DIST p95v294b5.linux64.tar.gz 6244650 BLAKE2B c81623f70c66ec9443c1f4858851525b9064bcfd948bb831f63774e6a09ee2e86eb2e295db4d849ac40e55f1d5166a470e248b5eac0a4b2a4322b7041f1032a9 SHA512 e315ea226649df2135895a1206e5845fd05587ad190b676228e5e1cfca04a11b698f1a7d5b8e7c96b0cd174ce3dbeb6000240b67a3f0f90572f3bf15166020e5
+DIST p95v294b7.linux32.tar.gz 5455201 BLAKE2B 2d542c06fb490f6619884be3cd510fb77e130184d2b7d3bb44fd375fcd7c95e38ef4cf80ed01079c9f395d6e8a526930a07357f20e14277beba4e232f4e2ca27 SHA512 21ee6a8f0a4482bdb22d80093b24a8b9d7e091577628dc797ad01d3a0ab98e946814c70a6313e2624fffa6658454707f88d24608e107048fc6361d15aa5a7fbe
+DIST p95v294b7.linux64.tar.gz 6244730 BLAKE2B ca5d0aad96e9bd5fb1bcb232435a26b7d8c2b9d869a6dc638d883fb892013df7a823abb0dae4545c2191b5f39b9cd29ee83400f452fbe63255f2dca899ad6bce SHA512 0579ea9ca1977884c8c50f8c8655b0fef1d5e2b456adca23d6d93542734727f265dc8f784c27fc9510c89afeec7386d4a9a9e9b5d691a97fed8189bef5577b3d
diff --git a/sci-mathematics/gimps/gimps-29.4.7.ebuild b/sci-mathematics/gimps/gimps-29.4.7.ebuild
new file mode 100644
index 000000000000..09dcabd77d11
--- /dev/null
+++ b/sci-mathematics/gimps/gimps-29.4.7.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pax-utils systemd readme.gentoo-r1 versionator
+
+DESCRIPTION="The Great Internet Mersenne Prime Search"
+HOMEPAGE="http://mersenne.org/"
+
+# The author has finally caved in to the pressure of putting the build
+# number in the package name. Some dark magic necessary to get to the
+# package name
+
+MY_PV=$(replace_version_separator 2 'b' )
+
+SRC_URI="
+	amd64? ( ftp://mersenne.org/gimps/p95v${MY_PV/./}.linux64.tar.gz )
+	x86? ( ftp://mersenne.org/gimps/p95v${MY_PV/./}.linux32.tar.gz )"
+
+SLOT="0"
+LICENSE="GIMPS"
+KEYWORDS="-* ~amd64 ~x86"
+
+# Since there are no statically linked binaries for this version of mprime,
+# and no static binaries for amd64 in general, we use the dynamically linked
+# ones and try to cover the .so deps with the packages listed in RDEPEND.
+# libgmp.so.10.3.2 is bundled within the .tar.gz, but we use the system one.
+
+DEPEND=""
+RDEPEND="net-misc/curl
+	>=dev-libs/gmp-6.1.2"
+
+S="${WORKDIR}"
+I="/opt/gimps"
+
+QA_PREBUILT="opt/gimps/mprime"
+
+DOCS=( license.txt readme.txt stress.txt whatsnew.txt undoc.txt )
+
+src_install() {
+	dodir ${I} /var/lib/gimps
+	pax-mark m mprime
+	cp mprime "${D}/${I}" || die
+	fperms a-w "${I}/mprime"
+	fowners root:0 "${I}"
+	fowners root:0 "${I}/mprime"
+
+	einstalldocs
+
+	readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/${PN}-28.9-init.d" gimps
+	newconfd "${FILESDIR}/${PN}-25.6-conf.d" gimps
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	echo
+	einfo "GIMPS data files were not removed."
+	einfo "Remove them manually from /var/lib/gimps/"
+	echo
+}