gentoo resync : 12.11.2017

15 files changed, 311 insertions, 285 deletions

diff --git a/dev-util/cppunit/Manifest b/dev-util/cppunit/Manifest
index ead16d7b342b..63df01488d04 100644
--- a/dev-util/cppunit/Manifest
+++ b/dev-util/cppunit/Manifest
@@ -3,7 +3,7 @@ DIST cppunit-1.13.2.tar.gz 953596 SHA256 3f47d246e3346f2ba4d7c9e882db3ad9ebd3fcb
 DIST cppunit-1.14.0.tar.gz 959716 SHA256 3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780 SHA512 4ea1da423c6f7ab37e4144689f593396829ce74d43872d6b10709c1ad5fbda4ee945842f7e9803592520ef81ac713e95a3fe130295bf048cd32a605d1959882e WHIRLPOOL c6f0c1a26c683b6cd4449943a5eaa7154242a85980d21614ac56e78d20d9a05cbf92e1b49db236b7d97dee0ede16ca53c21f1e7f70152352a9caed865c54313f
 EBUILD cppunit-1.13.1.ebuild 1519 SHA256 fd15d454a73ba150e88e9ee8d8d432214a48a2ac6b4df5fa11808fc6b4f43717 SHA512 828a553548f581e0de5c161e1c113943a87b4ce7a53389e6d0bdee808ac4acf75acef2c393a41cf142aaeccef1732f618a99500a91dc400a9c00f43f2b1362b5 WHIRLPOOL 137dc4199c0fc2f1a5efed21dd643234de57b8f05ee4742277d149d32cd303609accede0f0af94e7b01fcd7ef4eeb18774b443e778aebeb8387b3eb329c0fcc2
 EBUILD cppunit-1.13.2-r2.ebuild 1727 SHA256 c1d99e176b77e6bd9f9b6da9281d611c653d3ee22a933f1368f729900e861858 SHA512 1bff7dfb467e8cbd8b3ab440cfd0755cc7ca99824acfc729f579a3eb528947acb9cffcd7d9429853e3b8974cc5c9614da9edb5f7dd7826c7b8f09769d2036780 WHIRLPOOL 6c311619bf54174de92ca4f7ed7d532b17f324ed9ba6f69353a1472557db967c5a1bb027dbb63ba85787b7ec3ecddafe078380577579021966c25fd51039f26a
-EBUILD cppunit-1.14.0.ebuild 1736 SHA256 4d44acb337f4df508f8447f853a71a5e27b3d315e1c8f92873dd8907c8d5c2d5 SHA512 38b35d01aa20d7e1c28832403a002b174ba44b656b5ba0f400972907b10bef5e94cc88292dd442aa2c59881e46fb0b8c98bad5d8cbaec93b29a3b7b38cfd6afb WHIRLPOOL 9437e1936132f512d04ecaa993c5a480ff3889b9371286deef6fcd377f7738632b879bdbe869770cfc601a59bdad85f6da1fad14d19b111ff7f559e9b2320762
+EBUILD cppunit-1.14.0.ebuild 1731 SHA256 1e69a63a4474979d3584f47b4c1892c7b39b0cba61ac10b658931545397ba8e6 SHA512 6a5bec291e0d9513ee273e70b68eed99d2267fa9a2d2c5ed510c39e00c703b58eb795b8cac56502601943a43a09749829225def4e3dc8ce7b37b2ad2fdced0d5 WHIRLPOOL 37ab3d14a9234a4e7e08cf76f89d90937ef98ddc7c3fe4c75d0cb415949a59020ddc02398bdd4593b6829d1510ced99cf87e2d2462916f8eadb7a4b105c2725c
 EBUILD cppunit-9999.ebuild 1736 SHA256 4d44acb337f4df508f8447f853a71a5e27b3d315e1c8f92873dd8907c8d5c2d5 SHA512 38b35d01aa20d7e1c28832403a002b174ba44b656b5ba0f400972907b10bef5e94cc88292dd442aa2c59881e46fb0b8c98bad5d8cbaec93b29a3b7b38cfd6afb WHIRLPOOL 9437e1936132f512d04ecaa993c5a480ff3889b9371286deef6fcd377f7738632b879bdbe869770cfc601a59bdad85f6da1fad14d19b111ff7f559e9b2320762
 MISC ChangeLog 3378 SHA256 16187aebce2bf25d1f7e330bf9b5c9733d1b283b8cb09a8fa0fae6737347c230 SHA512 d4521d7ddeccdf101eade5fa99a0328f6f46c53c22ca25f409f6117e7ab7d3c7851d95683e9ba56126bdd3123e004402d0af78a82247b5676f6bf2be730668b7 WHIRLPOOL bfc13262aeae6cd386be199b42031ce7e927f9ede918432c1c0efaee21659f26fe260c9201f7abfd7d2735645e99b1fcfc1d5e154e2cac179f9c5431a2e4b63e
 MISC ChangeLog-2015 13184 SHA256 e138720616849a354c0bac4f3d57861464d4655fc31a0b12e036cda7ce81598d SHA512 d9f733500be94d8cf4a650fcf4112fab8cd10cf7ac0f10d2d75de03cbd9eff4527d7ef6d3831574a08d97b492508a4f47a1e7e642d8a62fd68364df06e74b7de WHIRLPOOL 408375ce59fd7c2a693b396a831aa2bf3198221803785b9183f1ba28944c3e08731379d807cd4a910f09f045d4fc77120fdc55414b32946ff3d5f741c499584b
diff --git a/dev-util/cppunit/cppunit-1.14.0.ebuild b/dev-util/cppunit/cppunit-1.14.0.ebuild
index 6df8af21bf91..8dadd88dfba4 100644
--- a/dev-util/cppunit/cppunit-1.14.0.ebuild
+++ b/dev-util/cppunit/cppunit-1.14.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} = 9999 ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples static-libs"
 
 RDEPEND=""
diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index b9276b95de91..12dc7e1c3b51 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1,10 +1,10 @@
 AUX mdds-1.2.3-buildsystem.patch 901 SHA256 45d6419de44de5d978513c013619342f39fae2a493dec0275799915f166a6848 SHA512 bc48b893c0b3d98aa45d7642bbd9bd10ee0f183bcd3da848a0abe4f33547b693e171a327439aba9b76f0683cc15eeb0410be7ed6f834d28483b8f82f8c13678f WHIRLPOOL 067adeafaa0128e26686fab279ae5ae053aca839b6001e9da852e4d9f59ddc126a4ee9fab17761a92085095fafe8f09d44d4784c4e30b9cec318dbef776ad442
 DIST mdds-1.2.2.tar.bz2 286185 SHA256 141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d SHA512 552cb1b65c03cd18eb679c95821e47c1151e1b3015043de4b3a7bc14d27734772fa4d80fd90ab48998d0bc75385a3d29c4dd7ce826cf84b012685573c623bf01 WHIRLPOOL f0b24a886ad6b275267603b73a95c3b83ce14808f90daa0e680babec966a52de19349ac0991d76b9279818897f783d1768ece74f5f1be1157fa8bff94e5e8a5a
 DIST mdds-1.2.3.tar.bz2 287079 SHA256 402fec18256f95b89517d54d85f00bce1faa6e517cb3d7c98a720fddd063354f SHA512 e5935fd99a53df124532cfc8e46349b2ef9ca79f5f184ca2da941c9a77e66ee40e11478e520bf9cb62e1bcea4b69deab5088265e1b89fda04417130aab227c3d WHIRLPOOL 88e154f3e1141d09736a8a9d5b4adf3612cea95a82773f59053d8e83f7fec3a0c292f5453df92627f31ac7e12b2f702dc281c959e7f219de91f2a1acc15cc7b4
-DIST mdds-1.3.0.tar.bz2 287367 SHA256 00aa92a28af9f1168a8e5c38e46f311abb65ef5b113ef56078ff104b94211460 SHA512 9d2c3a69686ce3101fbdeeeb2d1e54ee62bbb26db9e67517d22d5dd13bcb2c3797c813195f81f7f970fe0be4509f55338b69730596f387f364ecbfee0bedf427 WHIRLPOOL 0019a406e81af9a2b7c0eb7a0361eb5c95eed77a4bf701eb834cf515328d5385d20603396d122405061e4dafb7e225a6140819dd21929cef778f96d6f2728e01
-EBUILD mdds-1.2.2.ebuild 956 SHA256 71bbf7a3044057a9659792fb76ae89abac0491e421133a5f651f00edd0f769fa SHA512 3ece29d620b194a208738fda783cdbfa84e743172a893b2f7e9d99f21ca2192cc5fb93db80356b76b1d77d1b9e0fac848fa13d3781cb48cf0ef28cc284e82085 WHIRLPOOL e4b099bbf125bd4c60735626f30f89a92666ebbb64231f9faf9a3654e9f31f3705c6f0080a8819f84d8c7fa3eac181a4a5a72e7f47780800f75fc0a8e108d031
-EBUILD mdds-1.2.3.ebuild 955 SHA256 d02e55cfde032d0107fa24b9878adcb03a537440d421986c6605aacfd710640a SHA512 32e8df21c390a68c2353907b3c72b06ea92f329e36b3b798451576af2c42b025a66baf8eeddc5aed2a5f0bd45440683b4e3bf0bf0373739275189d57fe9bf08d WHIRLPOOL b2bb5ad9ecd79d9c983b2db7112b86e584e2807a7c6f62951be512461d77110e8f54b03537926bf12b01a5fcff726e9d6a5c44a408da12ae9f304b2c34ada453
-EBUILD mdds-1.3.0.ebuild 972 SHA256 68e349e871da01b9e2437f0ddeeadd31c8dfa836058ae5830c7e6a87f6b01e35 SHA512 b06eabb95a6d2225ce9eb1147007d3e3de57774c2850991e383f293652c82199a2b1c16a84d4b7a8cc0965b85da8ee0d75c8edc244dec1b3ce68b3e9a8dd9232 WHIRLPOOL 2fd3bab98500ff22a7526ac495115efc723447ce0cc7b27701bbec33e9f49e7b6cf21e84da275cea3eb294eca1a8df252da4bd13120ce00a04055184521c37d7
+DIST mdds-1.3.1.tar.bz2 287612 SHA256 dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1 SHA512 c7ed422c8e0bfb00debd43a12638efc6706d25f9aee0b7cfc15dc711693c4d555e262ae47ff00797c9601c12c0a7eced0f753b263b5f61623470f842814970a8 WHIRLPOOL 3ac7d8b74ee05e68816c4437f7bc25bd306a07cf6f570340c8ce96ff3ec7c232fa3403aa27af49af835f0dd760c4c68cd1c3a5cd27611282ec8ce96260a6bb20
+EBUILD mdds-1.2.2.ebuild 948 SHA256 3c793ed1764b5a3d7f12fbe6337643c5352ccbbdc882bc182289c342ce898e05 SHA512 e37c00f142a0e5ce4cd2f8a17595a7ae8a74419cca21ae63a10ae119c334dc6484c811a417e9625cfbebbf8542822dbefab7f0f96d4f6bdcce1ea66df671606d WHIRLPOOL d2f941c1da66753fbb90ff6fc01a16a2fd7567cc382fab2ce556be5320eeda1aad9e68b8db1a05557431d2ca588f49820775096be724718fd2edaac960182f82
+EBUILD mdds-1.2.3.ebuild 946 SHA256 088c99d452b9ba01fc994fd374d76eaeec10a419f2b7f2a339fd2c7974531a2c SHA512 02d0a067c13e87fd928e9337e3c30360bdaafe5f85afae4acdf72b14a6dfd2355b4d4e59fd89bdf513ce5388f1c43fffd14e9133ce06e5e89e999731fb88fca0 WHIRLPOOL 0b1eb53926f544e959ae59e2a2653c4c2be72c26e4fc99abc5d1543ec9ed6674599e1a98ddf14567fe50689d2fc7686d493e2dcebe403b55eeae6ccc7e93f79f
+EBUILD mdds-1.3.1.ebuild 949 SHA256 5d3e27b5716fae1bb428d905193530ab5ccb0fcd8f7876b6bb4f9d7836f85fc0 SHA512 fbdce865186281d17dce6a783854c49d76073756154eb1044b369eb0287600aff4cc725610687dc06d4da1f63b332b284d2e2f51618de472497f5c200505cf10 WHIRLPOOL 82ee6ced8e55166edd41e9ebc9cac16234566ee5cfb25d121d9c6eeca2e29b0c0f2414a9798ca976f46ffc80642dec1e89b9b07377f7f4d3a198ead8e06a8cab
 EBUILD mdds-9999.ebuild 963 SHA256 98530847dfc71ae3f52eab06fd4da033365dedf07d6cac6896d30a125e638380 SHA512 30fc4b8185294db0dc04c3194259961976a48f7ef13944015f5f85b68076bd959f4674513366ec5c8b138c53cd43ed46d8d213701c7dea36bf87d26532cb7569 WHIRLPOOL d5bb4c82c2764aec3035bd8213154a8951b400b46fb580287344fc9bb82a9f2fd40a093a1315d4d8945fcd0d23067665a0994b1a2b1e472635e76af08b01b5d9
 MISC ChangeLog 5315 SHA256 18859341ad9a408d2415201cd065026e65a493f6ebfabd61342a0d245da0fec0 SHA512 aff33b0c0ccd6a9b46f447b90f6891ccddae3f6aa7ea6e3aff635209b297bc82f65ec467247752b006ed6cc33194fc8e591a677b36c45379c5b1f9517b92e747 WHIRLPOOL 221b76a29b10eca5c6fc2ff78ccb1ebba66122930bcd2490ed5360470dd4d32aabb35fe2f913a068af564490b02cf1c0f690c840f4acc508ae8af482a7a24994
 MISC ChangeLog-2015 7826 SHA256 38af778836aa2d7f64ff9f0eaaa15e347bea2b56d5985408847d0fd399dbfe2b SHA512 9a5c77c0720a948edb1171dd60a3612e949f3854c1d26085cda0418bab9138073e465999a425c70b94772523c022fa11fbbe7fce9b222332d1829355a3461fec WHIRLPOOL 0414bab637aed04c46538d1d6a12ad60fe04216bb83c7b795e78f8bb6cb6487efe0b21bd763ebb4e4016c01ada0669b53256989737a7679dce9d69bfcd03ff74
diff --git a/dev-util/mdds/mdds-1.2.2.ebuild b/dev-util/mdds/mdds-1.2.2.ebuild
index 87734073a01b..a734248ea263 100644
--- a/dev-util/mdds/mdds-1.2.2.ebuild
+++ b/dev-util/mdds/mdds-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,22 +10,17 @@ inherit toolchain-funcs ${GITECLASS}
 
 DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
 HOMEPAGE="https://gitlab.com/mdds/mdds"
-[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/${PN}/src/${P}.tar.bz2"
+[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="1/${PV%.*}"
-IUSE="doc valgrind"
+IUSE="valgrind"
 
 [[ ${PV} == 9999 ]] || \
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-libs/boost:="
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		dev-python/sphinx
-	)
-"
+DEPEND="${RDEPEND}"
 
 DOCS=() # buildsystem installs docs
 
@@ -35,8 +30,9 @@ src_prepare(){
 }
 
 src_configure() {
+	# docs require dev-python/breathe etc., bug #602026
 	econf \
-		$(use_enable doc docs) \
+		--disable-docs \
 		$(use_enable valgrind memory_tests)
 }
 
diff --git a/dev-util/mdds/mdds-1.2.3.ebuild b/dev-util/mdds/mdds-1.2.3.ebuild
index 7106902e2181..2ae614607b6f 100644
--- a/dev-util/mdds/mdds-1.2.3.ebuild
+++ b/dev-util/mdds/mdds-1.2.3.ebuild
@@ -10,22 +10,17 @@ inherit autotools toolchain-funcs ${GITECLASS}
 
 DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
 HOMEPAGE="https://gitlab.com/mdds/mdds"
-[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/${PN}/src/${P}.tar.bz2"
+[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="1/${PV%.*}"
-IUSE="doc valgrind"
+IUSE="valgrind"
 
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-libs/boost:="
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		dev-python/sphinx
-	)
-"
+DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" )
 
@@ -35,8 +30,9 @@ src_prepare(){
 }
 
 src_configure() {
+	# docs require dev-python/breathe etc., bug #602026
 	econf \
-		$(use_enable doc docs) \
+		--disable-docs \
 		$(use_enable valgrind memory_tests)
 }
 
diff --git a/dev-util/mdds/mdds-1.3.0.ebuild b/dev-util/mdds/mdds-1.3.1.ebuild
index 5fc4896612b0..ac7784206be7 100644
--- a/dev-util/mdds/mdds-1.3.0.ebuild
+++ b/dev-util/mdds/mdds-1.3.1.ebuild
@@ -14,19 +14,13 @@ HOMEPAGE="https://gitlab.com/mdds/mdds"
 
 LICENSE="MIT"
 SLOT="1/1.2"
-IUSE="doc valgrind"
+IUSE="valgrind"
 
 [[ ${PV} == 9999 ]] || \
-KEYWORDS=""
-# KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-libs/boost:="
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		dev-python/sphinx
-	)
-"
+DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}/${PN}-1.2.3-buildsystem.patch" )
 
@@ -36,8 +30,9 @@ src_prepare(){
 }
 
 src_configure() {
+	# docs require dev-python/breathe etc., bug #602026
 	econf \
-		$(use_enable doc docs) \
+		--disable-docs \
 		$(use_enable valgrind memory_tests)
 }
 
diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest
index 1a04479f39d0..b62174246428 100644
--- a/dev-util/nvidia-cuda-sdk/Manifest
+++ b/dev-util/nvidia-cuda-sdk/Manifest
@@ -3,10 +3,12 @@ DIST cuda_6.5.19_linux_64.run 982446238 SHA256 5279bc159b72b7445d8aae5f289d24bb4
 DIST cuda_7.5.18_linux.run 1195424633 SHA256 08411d536741075131a1858a68615b8b73c51988e616e83b835e4632eea75eec SHA512 97459dfd124060200f1c43f763e5bce0bea53e35ed4bef72bee6c8ba1c04ecffb8695af11755443513316f91fdb5cb4d35662f7b87bca7e3de85d562d4e49363 WHIRLPOOL 59d186f5e9176db25e5991e8088417ac778953c3ed2f0dcef034968f7ea695c5d4cfea81759ac0f7f1290c3842d9d0339b5b74d2d90ec8b333135aa1b986ca10
 DIST cuda_8.0.44_linux.run 1457082926 SHA256 64dc4ab867261a0d690735c46d7cc9fc60d989da0d69dc04d1714e409cacbdf0 SHA512 1bf9d8e6b853c2a971b8d908a043adc5b11ec7033faed04a773c42680882753f98bc33b46f6b301c24c0f780f74bc237dce5766fc857f1a905e6c1f200728d86 WHIRLPOOL e90fa2088cd70aef2794c1ce2db126d6186bc3c44d14c1cf7cb4a66f889cbb4799485d1d71ab045e2dfaed9bfabcea224ca04b7f97e9bce061ac9fbd31c62fdd
 DIST cuda_8.0.61_375.26_linux.run 1465528129 SHA256 9ceca9c2397f841024e03410bfd6eabfd72b384256fbed1c1e4834b5b0ce9dc4 SHA512 d22303719a9feff64f95bf6a966f1caa2bf0cf8c955e475ce08ce54faa5e098d336c2db223ef0185c1f23b9c52b7d2f81a63515485219cfc016d72bda979248b WHIRLPOOL 650a0e8bc9ad2d0637cd4a82a057bf77e613559d1080a86009f594c73adb8879de62b26dac9d8e3f572806556bf878505382479e596d4ce91929ab94b882489a
+DIST cuda_9.0.176_384.81_linux.run 1643293725 SHA256 96863423feaa50b5c1c5e1b9ec537ef7ba77576a3986652351ae43e66bcd080c SHA512 00e24638c02d049c575732dee5237db21f7c451b606f37cf95e44e89d47d0cb055255e9f70dc013298c9e0d224147f239488558904556b68572e3f31935489a9 WHIRLPOOL 714b4dea7cae742a97898bd9377e821a4448504119589e10bcdabce1f7f82a87a9f30f6e9291041f0d038eab70326893772859ee09891d62632afefac2e9240a
 EBUILD nvidia-cuda-sdk-6.5.19.ebuild 3992 SHA256 9ba333c19ea35b959c0b47883293948922222996fd3f7518b39d6ecf38d4c2f1 SHA512 367460c2bc89549774ead4cde22c875ed3df9f8002fdd6666289649c6749295389204a11cd0cd6ab201cb2eed1e43d1cda45aea42b9864c9a7fb5ba813aaa04e WHIRLPOOL a6d471060a563bc2e0c7472af84921fc50674d39889ae45d0cacba53e6655b799036fdd05b6cbfa6e410446ae72557c6d24c5a68b848b10366dd96075a82c858
 EBUILD nvidia-cuda-sdk-7.5.18.ebuild 3568 SHA256 59c7fdef2fc7f32917af8b41ead94049b9fd56dfe1011596d10b8719ffaf87f7 SHA512 199004e748db588de447c71ac2bddb08fdfbbc099a335ecbcd7e57978cc3cbb9cfdd6a87765c6b315cfac067248c133eeff1a98fc2e9d331a138ccb5266a1f7e WHIRLPOOL 2cb71ade48b0b8a2089a55d9798a431ef63ab3ef9b23684da1bda821d666814374fce06f2c8885ce719f1c2aed4f45dc732b89e1d18e87c8237235053d6da646
 EBUILD nvidia-cuda-sdk-8.0.44-r1.ebuild 3757 SHA256 5a141cb188f96e47755a50d896f183cf7026da8a9d06f650d6205abd950c4f79 SHA512 b2270c56dc77e85db6963c01965afb4a85b7acf3790630d955adf0d64d2ca09203c9423285684c99432037c8378dd5856c5ccf4b91a0b364f54c282765c149d9 WHIRLPOOL 47db788b6825dad04a809b100d2d7775ae7110ccd6e5a8ba27f7f6882dcef5f9e9f1970dc50577532c04c09f03864ffaca26378639a6b47f5e366c21c6e8439f
 EBUILD nvidia-cuda-sdk-8.0.61.ebuild 3803 SHA256 8c2e415f4c88eef97c94b503ca61fa0fcfdc1de2ee7f8453be85f2342f420ec4 SHA512 91ed589b1841b6069e24ea8fd12fc55d73c7bca0b33cd6b7b37746fbd3c896ce8224a5622b7750720595d1f36a7daecc3661612148f58e6e6e79028b2a0333fa WHIRLPOOL f5eddd4d4b8990429f3bd55d6250150fff4a8b0687b4f3556b98c73fa8b4d963632e1cdf86352ef34e7a6d3b2108597e5e1965c3a7c1a6b1682fc3e46c1a9144
+EBUILD nvidia-cuda-sdk-9.0.176.ebuild 3803 SHA256 3a8325d17601908fa9c05c01686bd35f69799f172f8ac99565aede5585429216 SHA512 22d346ee211e410d74b110d62252e1299f4eb77a51295e329fd757a73010732d9d32c1c68f51b3b6e81af1e34207b3a74419e8df9a20e20632ca681ecc98cbf4 WHIRLPOOL 5a9dd83f8f1053af75649790c05252b0450eaa860fb2022fbe7563256fddfee84138beb34b2dceb9084d3d5e4026aa02fa5e0467cf1bc3ff2eaf027d956d6f8b
 MISC ChangeLog 4632 SHA256 302ee13070c9599a7df8923f6bb29cb4841e66c11f1c7adb9da7451f70bb8df1 SHA512 d06821356c8c68c23fdfd14e6d5ffb2263373713db1f8675340049fb1280966e942a8ca6c40ed0cd15a416229d8fff45365a2a2e9f2fb64b30f17303de10fb3e WHIRLPOOL 92907fc9e73251b860e7ee8517c3e35123acc4812e1e13f0e1e8e607bca3f5ac75a0b706610c0ae07daf5d6a5d306b833aff5a5fcacb2cdd6c41c8c4138ca8ae
 MISC ChangeLog-2015 11675 SHA256 db9efe400d5ff1168c942206146c5b6e2d847578d6638b48c8e52d6da2efd1ec SHA512 95089cb719e9817b82e8d36649f0b59ad82ba5df135c0914af45cb7bf246a1523c4746eb7015910fa92e3ddf6368b0e31c5b19d780a90f8bae0fb305849bed24 WHIRLPOOL 0638a4984df55307fb3d008ae05bed7966eebd0814f8eefe113e59f185df0a13e271732cb14e864af5b3b707e718ad805ae3c1a681b6d445934f9f1e5f028924
 MISC metadata.xml 394 SHA256 62e27e2f2871962baa5f68b39db9fa811cf0a60cd43f71513747f1c348c6b947 SHA512 f20a681825a67b16424264661572ef279bade1ff346f846c5fd7e802f6d0c012653f462580ad48a03d333735cfd7525a62efd389c9f42dd6181d51adf0455767 WHIRLPOOL cb72b223e6d133d0eb13a422d5b6b0c76638341d6f44fafee5343c2fe5d62a0a013e8c687e0888033f69aa6bfdbe3c5d81a7d77746b9dea0f87812c84f95481d
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.0.176.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.0.176.ebuild
new file mode 100644
index 000000000000..3353dabc3008
--- /dev/null
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-9.0.176.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cuda eutils flag-o-matic portability toolchain-funcs unpacker versionator
+
+MYD=$(get_version_component_range 1-2)
+DRIVER_PV="384.81"
+
+DESCRIPTION="NVIDIA CUDA Software Development Kit"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod2/local_installers/cuda_${PV}_${DRIVER_PV}_linux-run -> cuda_${PV}_${DRIVER_PV}_linux.run"
+
+LICENSE="CUDPP"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="+cuda debug +doc +examples opencl mpi"
+
+RDEPEND="
+	~dev-util/nvidia-cuda-toolkit-${PV}
+	media-libs/freeglut
+	examples? (
+		media-libs/freeimage
+		media-libs/glew:0=
+		>=x11-drivers/nvidia-drivers-384.81[uvm]
+		mpi? ( virtual/mpi )
+		)"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+S=${WORKDIR}/samples
+
+QA_EXECSTACK=(
+	opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint
+	opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort
+	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimplePrint
+	opt/cuda/sdk/bin/x86_64/linux/release/cdpSimpleQuicksort
+	)
+
+src_unpack() {
+	# We first need to unpack the cuda_${PV}_linux.run file
+	# which includes the cuda-samples*run file.
+	unpacker
+	unpacker run_files/cuda-samples*run
+}
+
+pkg_setup() {
+	if use cuda || use opencl; then
+		cuda_pkg_setup
+	fi
+}
+
+src_prepare() {
+	export RAWLDFLAGS="$(raw-ldflags)"
+#	epatch "${FILESDIR}"/${P}-asneeded.patch
+
+	local file
+	while IFS="" read -d $'\0' -r file; do
+		sed \
+			-e 's:-O[23]::g' \
+			-e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \
+			-e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \
+			-e "/CC/s:gcc:$(tc-getCC):g" \
+			-e "/GCC/s:g++:$(tc-getCXX):g" \
+			-e "/NVCC /s|\(:=\).*|:= ${EPREFIX}/opt/cuda/bin/nvcc|g" \
+			-e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \
+			-e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \
+			-e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \
+			-e 's:-Wimplicit::g' \
+			-e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
+			-e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
+			-e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$($(tc-getPKG_CONFIG) --libs glew)|g" \
+			-i "${file}" || die
+			# -e "/ALL_LDFLAGS/s|:=|:= ${RAWLDFLAGS} |g" \
+	done < <(find . -type f -name 'Makefile' -print0)
+
+	rm -rf common/inc/GL || die
+	find . -type f -name '*.a' -delete || die
+
+	eapply_user
+}
+
+src_compile() {
+	use examples || return
+	local myopts=("verbose=1")
+	use debug && myopts+=("dbg=1")
+	export FAKEROOTKEY=1 # Workaround sandbox issue in #462602
+	emake \
+		cuda-install="${EPREFIX}/opt/cuda" \
+		CUDA_PATH="${EPREFIX}/opt/cuda/" \
+		MPI_GCC=10 \
+		"${myopts[@]}"
+}
+
+src_test() {
+	addwrite /dev/nvidiactl
+	addwrite /dev/nvidia0
+
+	local i
+	for i in {0..9}*/*; do
+		emake -C "${i}" run
+	done
+}
+
+src_install() {
+	local f t crap=( *.txt Samples.htm* )
+
+	if use doc; then
+		ebegin "Installing docs ..."
+			while IFS="" read -d $'\0' -r f; do
+				treecopy "${f}" "${ED%/}"/usr/share/doc/${PF}/
+			done < <(find -type f \( -name 'readme.txt' -o -name '*.pdf' \) -print0)
+
+			while IFS="" read -d $'\0' -r f; do
+				docompress -x "${f#${ED%/}}"
+			done < <(find "${ED%/}"/usr/share/doc/${PF}/ -type f -name 'readme.txt' -print0)
+		eend
+	fi
+
+	ebegin "Cleaning before installation..."
+		for f in "${crap[@]}"; do
+			rm -f "${f}" || die
+		done
+		find -type f \( -name '*.o' -o -name '*.pdf' -o -name 'readme.txt' \) -delete || die
+	eend
+
+	ebegin "Moving files..."
+		while IFS="" read -d $'\0' -r f; do
+			t="$(dirname ${f})"
+			if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then
+				continue
+			fi
+			if [[ -x ${f} ]]; then
+				exeinto /opt/cuda/sdk/"${t}"
+				doexe "${f}"
+			else
+				insinto /opt/cuda/sdk/"${t}"
+				doins "${f}"
+			fi
+		done < <(find . -type f -print0)
+	eend
+}
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index be6113697a85..695b62b6c89f 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -6,11 +6,13 @@ DIST cuda_6.5.19_linux_64.run 982446238 SHA256 5279bc159b72b7445d8aae5f289d24bb4
 DIST cuda_7.5.18_linux.run 1195424633 SHA256 08411d536741075131a1858a68615b8b73c51988e616e83b835e4632eea75eec SHA512 97459dfd124060200f1c43f763e5bce0bea53e35ed4bef72bee6c8ba1c04ecffb8695af11755443513316f91fdb5cb4d35662f7b87bca7e3de85d562d4e49363 WHIRLPOOL 59d186f5e9176db25e5991e8088417ac778953c3ed2f0dcef034968f7ea695c5d4cfea81759ac0f7f1290c3842d9d0339b5b74d2d90ec8b333135aa1b986ca10
 DIST cuda_8.0.44_linux.run 1457082926 SHA256 64dc4ab867261a0d690735c46d7cc9fc60d989da0d69dc04d1714e409cacbdf0 SHA512 1bf9d8e6b853c2a971b8d908a043adc5b11ec7033faed04a773c42680882753f98bc33b46f6b301c24c0f780f74bc237dce5766fc857f1a905e6c1f200728d86 WHIRLPOOL e90fa2088cd70aef2794c1ce2db126d6186bc3c44d14c1cf7cb4a66f889cbb4799485d1d71ab045e2dfaed9bfabcea224ca04b7f97e9bce061ac9fbd31c62fdd
 DIST cuda_8.0.61_375.26_linux.run 1465528129 SHA256 9ceca9c2397f841024e03410bfd6eabfd72b384256fbed1c1e4834b5b0ce9dc4 SHA512 d22303719a9feff64f95bf6a966f1caa2bf0cf8c955e475ce08ce54faa5e098d336c2db223ef0185c1f23b9c52b7d2f81a63515485219cfc016d72bda979248b WHIRLPOOL 650a0e8bc9ad2d0637cd4a82a057bf77e613559d1080a86009f594c73adb8879de62b26dac9d8e3f572806556bf878505382479e596d4ce91929ab94b882489a
+DIST cuda_9.0.176_384.81_linux.run 1643293725 SHA256 96863423feaa50b5c1c5e1b9ec537ef7ba77576a3986652351ae43e66bcd080c SHA512 00e24638c02d049c575732dee5237db21f7c451b606f37cf95e44e89d47d0cb055255e9f70dc013298c9e0d224147f239488558904556b68572e3f31935489a9 WHIRLPOOL 714b4dea7cae742a97898bd9377e821a4448504119589e10bcdabce1f7f82a87a9f30f6e9291041f0d038eab70326893772859ee09891d62632afefac2e9240a
 EBUILD nvidia-cuda-toolkit-6.5.14.ebuild 3818 SHA256 5ef92981e2536f257dc3eb3ca2b531730cc0ee061d4f9e2b7e9f2e13c1a5c187 SHA512 7f73c4e321234f6a19166e6e28719f6c98cecb809f9878ee1182b812e18fcc6f8c29fb2ebd0ed520847f38bfddd6a0bc60fae6b711b75f563ab39a9b322468b2 WHIRLPOOL 31798f88e715e8df1c1731a5173ac5149cd85a46a24f8b6f510dd69ea6f50aade2b3b05dd9ea400e0b6861f59a428f152bf8e6f4bff2f61bb1e95c85de5c02e2
 EBUILD nvidia-cuda-toolkit-6.5.19-r1.ebuild 3844 SHA256 adf2c05e47abb31f1dccbdf44b272b0b1000aa07d6a2109ac0443613f2a03599 SHA512 f40103348972041a9d6c09a8c129b68603ce0fafa29df1fdf6b13014bb97156a44881161d4668beef8af9b77adea9df8034c88d6413a6ac2ad709285f785df79 WHIRLPOOL 6ffa251bfd438e632b8b366cf9df8a209228feb90fa4a9ec1c7f52a48b38326e4c129a02a23c217f77a14c0ae1c5ecf5d8fc99b1407673d23af916874d45df51
 EBUILD nvidia-cuda-toolkit-7.5.18-r2.ebuild 3355 SHA256 6afc12a4389f1cb18a99f677f5697402e80c8e95a3cea089ea71628918644e12 SHA512 4e8070e399766796b1589329db4de04fc0fda0cbd1dc8ec1984b8550f1bc10d490fed7b085066f4419d5cbdf98ea2ae8202b29a9d360fe3b2a3be6e20bc802be WHIRLPOOL 3607a7b7413124e3fc2264e8df5e03c18846dde7910dcccbf41ed9b0e870f0cedbb499acefe7dc1c792d99d92b7e33f3ffdafea0ebf5998b4d0428e480424222
 EBUILD nvidia-cuda-toolkit-8.0.44.ebuild 3311 SHA256 29ce5f153ad4c2b191c993cc8afc236d9bf006a8ba31cbcf5fe6e427ff3bbbdd SHA512 807ac67b141dd390d78ec4e764dc939e993aa3b23c6469dde9e29c62a0ac7bbbd3be4d2425e3a1a9863a813c88c5fe0da37f07d1bb2fc91c0593cab99f8e8a8b WHIRLPOOL d3bc0c46bab61ef38ad51fd66ee65530c2406dd8101fbf8f7e6801a0e882c341014f3580a3482fb9b73280d5c820d2392920e9496b1aa687e1bd6d58426b7570
 EBUILD nvidia-cuda-toolkit-8.0.61.ebuild 3361 SHA256 5d9bcc8c5559be822b2a411db8fe2269eb5f084ece76b2f17ae20327fd4b2269 SHA512 b98d5b85eb4405ba749061b7d228f3e86057592283a36f189eda2f1d859b2e1e55c9c6c1444e9521ac699ab8bb7b6f87a8e2457a5fe5ca85cc13043e59cdeb33 WHIRLPOOL 0dd971e681be1792b2780ff225c66c56287df0c27205c6c22cb42d3a3bde53d10d5bf8f74562252f0c2e45e61c909969f3faf2a9f77835423eabc948ab2e3f03
+EBUILD nvidia-cuda-toolkit-9.0.176.ebuild 3368 SHA256 5194f841f51fe5ddc1a26502205c368eec2e940eb108371062c562ac53380077 SHA512 826568f1349be2a7278c3c3392cca88e3ffcc958ce196d6c32daa1f3c060a9f62cb28aa8eebdffe92fe221716b2316b639a370877a74acd13dcf39f99ad4b7a5 WHIRLPOOL c910e67ea8eebda71228214decdb42d2172a55eb886a858d3958922f557d720662444203327d7f1ba98a48453a256c1bc1920921cbe442cb45aa9eb179ad3cf2
 MISC ChangeLog 5772 SHA256 2cd55aa9b5068c1bac89fcc24e17e76a2de1c7b33f15ac166be95c66e6a70acd SHA512 114307f8659f3eb6775f23abcadd1a4acd36dcaa4b2e7885e340514103f6c33f4f892f0604810bdc03c81de713b06baf8cd3bf3ef3aebbade1e5c8e4f386e53a WHIRLPOOL 44cc0558a5680392a17a5e05869783b505d6a2bdccefd8f9ef1569f580732414ce66727e32f733de5df71e9c0eb5f3079b910d07d143e7fde7eaef8ad6052e2e
 MISC ChangeLog-2015 2264 SHA256 8cdb76f9a24d4661310a9c9cf79d3a01e42e76c37c8ec5d2938f68da34c49360 SHA512 08c47c4e1533fa261b5c24c32905b8ad77de631ad0c348a508303182fe7afd4d4e011ceef2b395260a3cf261d239a3ba3e19853284cf59521e2c3dbb6994758d WHIRLPOOL 16d1f8807f81357840bccbede120769e850493ac61123b6ab516d6c668b553ddd4d81d61eb9b1a681e01c669cbaf374c1904c2d6d166480cd84e6884dbab7b7b
 MISC metadata.xml 486 SHA256 a7ff0497884c72152b187e808c63ff01109eb7cde39edf77f43c82cdca0d7b3c SHA512 14746574456248d684dc30574c868f4f14ae270c86b6642e7c4aa3ea0918fe7b6cc685323e376d32c8f97879e3fb23a35c4f95185fb44f7b845035b9fcdcc2ac WHIRLPOOL 3205c2685cc3ba2822d5b8208218a19582733ae81811d466936255aaf58c982e6bb4c805fe9468337573b4985f0a845918af82f9f7f0bca9bc8ae0cb090510dd
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.0.176.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.0.176.ebuild
new file mode 100644
index 000000000000..11c4204639e7
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-9.0.176.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit check-reqs cuda toolchain-funcs unpacker versionator
+
+MYD=$(get_version_component_range 1-2)
+DRIVER_PV="384.81"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux-run -> cuda_${PV}_${DRIVER_PV}_linux.run"
+SLOT="0/${PV}"
+LICENSE="NVIDIA-CUDA"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger doc eclipse profiler"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	>=sys-devel/gcc-4.7[cxx]
+	<sys-devel/gcc-6[cxx]
+	>=x11-drivers/nvidia-drivers-384.81[X,uvm]
+	debugger? (
+		sys-libs/libtermcap-compat
+		sys-libs/ncurses:5/5[tinfo]
+		)
+	eclipse? ( >=virtual/jre-1.6 )
+	profiler? ( >=virtual/jre-1.6 )"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/cuda/*"
+
+CHECKREQS_DISK_BUILD="3500M"
+
+pkg_setup() {
+	# We don't like to run cuda_pkg_setup as it depends on us
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpacker
+	unpacker run_files/cuda-linux*.run
+}
+
+src_prepare() {
+	local cuda_supported_gcc
+
+	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	default
+}
+
+src_install() {
+	local i remove=( doc jre run_files install-linux.pl cuda-installer.pl )
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}${cudadir}"
+
+	if use doc; then
+		DOCS+=( doc/pdf/. )
+		HTML_DOCS+=( doc/html/. )
+	fi
+	einstalldocs
+
+	mv doc/man/man3/{,cuda-}deprecated.3 || die
+	doman doc/man/man*/*
+
+	use debugger || remove+=( bin/cuda-gdb extras/Debugger extras/cuda-gdb-${PV}.src.tar.gz )
+
+	if use profiler; then
+		# hack found in install-linux.pl
+		for i in nvvp nsight; do
+			cat > bin/${i} <<- EOF || die
+				#!/usr/bin/env sh
+				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
+					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
+					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
+			EOF
+			chmod a+x bin/${i} || die
+		done
+	else
+		use eclipse || remove+=( libnvvp libnsight )
+		remove+=( extras/CUPTI )
+	fi
+
+	for i in "${remove[@]}"; do
+		ebegin "Cleaning ${i}..."
+		rm -rf "${i}" || die
+		eend
+	done
+
+	dodir ${cudadir}
+	mv * "${ED%/}${cudadir}" || die
+
+	cat > "${T}"/99cuda <<- EOF || die
+		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
+	EOF
+	doenvd "${T}"/99cuda
+
+	use profiler && \
+		make_wrapper nvprof "${ecudadir}/bin/nvprof" "." "${ecudadir}/lib64:${ecudadir}/lib"
+
+	dobin "${T}"/cuda-config
+}
+
+pkg_postinst_check() {
+	local a b
+	a="$(version_sort $(cuda-config -s))"; a=( $a )
+	# greatest supported version
+	b="${a[${#a[@]}-1]}"
+
+	# if gcc and if not gcc-version is at least greatest supported
+	if tc-is-gcc && \
+		! version_is_at_least gcc-version ${b}; then
+			ewarn ""
+			ewarn "gcc >= ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			ewarn ""
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+}
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index 1e21699a66a9..3b3c79261410 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,10 +1,5 @@
-AUX sysdig-0.17.0-curlbuild.h.patch 2068 SHA256 50405aff08d8ecb7c9e2252fbc90e6082a3d3ea04874a8cff6718e167eeb53ae SHA512 4c51377dcdc52b1c7a14f8dd7310f8922541af19ce9167ed060a5a9fa0174a6f8156f59b336746fa27599c976124751d44bf990ee99e457fdf85bb19a92c59e9 WHIRLPOOL ce085f16cb9f46ae7791633ee1b94c21f54cab964c8f82b9bee3e5d9a3c0929dfac8e8f7f3fbccd50c67c4fb8ae1127004e070d53153fe4ad889d85a13064165
-DIST sysdig-0.17.0.tar.gz 718719 SHA256 f009acc32f2b15fcb0d2267bde6f6de9b3445179003c979ba61a8836abdb78f9 SHA512 476e130151d1a8e9e782f074c45448becbef10397c0040e33febaf89c73f22c1716ebeeb2683f489a74c83f5d67174c9f21bb05d4327f35fb03ca1b9822889bc WHIRLPOOL a8f3e0aa45e00d9e6b02e0c26f3ec2f91cbf4d9a6caf955684617e2a1e7c9c0b92c0bdda3b2c254129008ea42bd2386710ef391714e13631e0e7d62fe9226ed0
-DIST sysdig-0.18.0.tar.gz 739774 SHA256 9caab6b4ef4a6d9f9ded8f79b1fcbe34a918c61b6f3b5a15d803f0f25e73497a SHA512 51649bc965d54b0e4b6c17d3b8f6a9c1710300b371c556193f04f25c71acbc96da1bfb6c636f8afdd8544de39d7bb1db0bd8ecc39d18d6f1f238d9e7819f0265 WHIRLPOOL de150a7254428edf88fbe34226ebb1bc96270fbb942d70cc483cef7c04e7a31e43e8efd070b44d78991bdeabc88bfd90370f0cfa7fcb71b41b72c4fd005f4e8c
 DIST sysdig-0.19.1.tar.gz 742149 SHA256 480d5d8fd7e7373c08008c30bd8e2c7595d5c45d710bf07bd15a522021b560f6 SHA512 a3947ecd2019af75d787d956b3931dc1aac593279256a92fc02ff0d7e0a85f23786ab821da9bf3ec55430e4da56f70c8583d1b5d24782b426f7deb6f1fca69eb WHIRLPOOL 387aa58c56821b52c39229e8923486192c763c270c9c4d392dea6bef29c3b68d3a0d0aa229270736125ab18fd2fb2129499f77553897912be100a1b1b2a7a49d
-EBUILD sysdig-0.17.0-r1.ebuild 1963 SHA256 6c2351c631ac1907652e1e4974f80e462679c9b1bf7f1015ba8f2af1b2859998 SHA512 1becee0e3fa18c80fe075ed2819e36425ad168cd3755c145d2a0fbb30c29c8861e701d8079891619b12b19b4a06b0c6280c6b599ed188fb8239bfa94a7bba90c WHIRLPOOL b923cd3355a9cc328aa9dbfea183563cc1fe2c8633e875f781d0b6d961e9237c92a4bf56e57bf965eefd2ca68fdd206c6454a216902fb3ba4c88ccf628e54a6e
-EBUILD sysdig-0.18.0.ebuild 1821 SHA256 aa51602feb7debe16adda13a705a074639cfff03cb703c2f41a0a7da8f8138f0 SHA512 0dae4db4f1178ea0ddec2b22edd036fd63c9625642e06b154fe052da5a53257e825bf7b560bdee57015062d9534d2c2985e7c738f9baa328b4df5e1df13769e0 WHIRLPOOL a75d2bf1c46672d21596281b3000b42517756640e1173abc68c99609fbf58ea4197fc3f3ae8ce9919a18a0c1e43f88cd0f33b9e25cc2e50291aa041d3de5129c
-EBUILD sysdig-0.19.1.ebuild 1821 SHA256 aa51602feb7debe16adda13a705a074639cfff03cb703c2f41a0a7da8f8138f0 SHA512 0dae4db4f1178ea0ddec2b22edd036fd63c9625642e06b154fe052da5a53257e825bf7b560bdee57015062d9534d2c2985e7c738f9baa328b4df5e1df13769e0 WHIRLPOOL a75d2bf1c46672d21596281b3000b42517756640e1173abc68c99609fbf58ea4197fc3f3ae8ce9919a18a0c1e43f88cd0f33b9e25cc2e50291aa041d3de5129c
+EBUILD sysdig-0.19.1.ebuild 1881 SHA256 1e0d7ef6b07032de62999bc816c7debe98dbda411247e378388ae3f4b9912349 SHA512 1481f78d1b106f64f4610b3240b2276748820485503782d4ba5df22e756a2b16a5b44a0839aa79df3a0e1c09d1725f0f1b95942b167fa49248aa8ac3c11ab55f WHIRLPOOL a3f7cd5d56e3fcadbda3ee8dc8a37aa557482b89f2a3b3bc75d7964e2727d27c87fa310c0e4bec81834a2faf6accc7f809bd8337394504dca09a5c13703e208e
 MISC ChangeLog 5677 SHA256 70c1f045cb72ce8c04d6ca90b3258ad7d15a0dbb3132a2cbeb68318609441da7 SHA512 c2744fe0955b0b962cff531cd9f23f24813a125e5ec9e063fa17bedce087cf186cdd796a6f3e332c84b22a885a858dfa5493f3c61de406f2803f364733e5690f WHIRLPOOL a8cccfba4cb4d7136050ad7c4c7b62bc7256aa943ce80766413e3fa74f14f4d7724439672e798de4d0c3fd3919af8eacf786220632e2b9ff8820d11f75f00aa5
 MISC ChangeLog-2015 807 SHA256 d13ddf4d0354b46c20d300f0248f2c68260ba445a351442f63ee838ce680f84c SHA512 062e74dc59198d4206325b6d4f0e9528cb888ed5b4cf8490f94f0ed9a489efe6be519eecff8d02d91f54a52ef597b4b5abc9b8fdfccbc8fce75874cd199034a8 WHIRLPOOL 24f060a7091c30519996fee68a6b794c36c346d0a7b962ec9eb00ee5ef911ef1abe5af376f5818d6f9c74ab4550744e995bfe34b97ea23d8476e1b7c62569a2e
 MISC metadata.xml 507 SHA256 d12824ad27f1d0f6fb5b44fa945149141d47cce277f2aba8f3ad7a4e75b251ad SHA512 d218731de7acfbbfa3c3043b2d942c00b7f5aff1a020b6dca2019f202be3a5390f44337e04691a0d4641e661f7581f703db5fda3d2a116c0d63fb7d9da25ed06 WHIRLPOOL 7378e0a59f6cd3a61ba2d45ee67cbbcc2dd0db66e9e30c3ec4d45954623620849351cf6b36effb1fef0e1a9e1da252b29269f8d6186454ae68be277ede0ce6f2
diff --git a/dev-util/sysdig/files/sysdig-0.17.0-curlbuild.h.patch b/dev-util/sysdig/files/sysdig-0.17.0-curlbuild.h.patch
deleted file mode 100644
index 465be572b1fe..000000000000
--- a/dev-util/sysdig/files/sysdig-0.17.0-curlbuild.h.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From d15be88ccb1b7df9a0b6db2967131521b526918b Mon Sep 17 00:00:00 2001
-From: Mark Stemm <mark.stemm@gmail.com>
-Date: Tue, 15 Aug 2017 17:49:53 -0700
-Subject: [PATCH] Don't include curlbuild.h
-
-It's not required to build and it's not present with some newer versions
-of libcurl, so removing it.
-
-Thanks to https://github.com/hhoffstaette for the tip.
-
-This fixes https://github.com/draios/sysdig/issues/895.
----
- userspace/libsinsp/marathon_http.cpp | 1 -
- userspace/libsinsp/mesos_http.cpp    | 1 -
- userspace/sysdig.project             | 1 -
- 3 files changed, 3 deletions(-)
-
-diff --git a/userspace/libsinsp/marathon_http.cpp b/userspace/libsinsp/marathon_http.cpp
-index f7937b681..2e4449ad9 100644
---- a/userspace/libsinsp/marathon_http.cpp
-+++ b/userspace/libsinsp/marathon_http.cpp
-@@ -7,7 +7,6 @@
- #include "marathon_http.h"
- #include "curl/curl.h"
- #include "curl/easy.h"
--#include "curl/curlbuild.h"
- #define BUFFERSIZE 512 // b64 needs this macro
- #include "b64/encode.h"
- #include "sinsp.h"
-diff --git a/userspace/libsinsp/mesos_http.cpp b/userspace/libsinsp/mesos_http.cpp
-index 18ac9f5b5..c6bfb5810 100644
---- a/userspace/libsinsp/mesos_http.cpp
-+++ b/userspace/libsinsp/mesos_http.cpp
-@@ -7,7 +7,6 @@
- #include "mesos_http.h"
- #include "curl/curl.h"
- #include "curl/easy.h"
--#include "curl/curlbuild.h"
- #include "sinsp.h"
- #include "sinsp_int.h"
- #include "sinsp_curl.h"
-diff --git a/userspace/sysdig.project b/userspace/sysdig.project
-index 5d00f18f2..76a18f0a8 100644
---- a/userspace/sysdig.project
-+++ b/userspace/sysdig.project
-@@ -752,7 +752,6 @@
-             </VirtualDirectory>
-             <VirtualDirectory Name="include">
-               <VirtualDirectory Name="curl">
--                <File Name="../build/release/curl-prefix/src/curl/include/curl/curlbuild.h"/>
-                 <File Name="../build/release/curl-prefix/src/curl/include/curl/easy.h"/>
-                 <File Name="../build/release/curl-prefix/src/curl/include/curl/stdcheaders.h"/>
-                 <File Name="../build/release/curl-prefix/src/curl/include/curl/curlrules.h"/>
diff --git a/dev-util/sysdig/sysdig-0.17.0-r1.ebuild b/dev-util/sysdig/sysdig-0.17.0-r1.ebuild
deleted file mode 100644
index d886e9c22e5d..000000000000
--- a/dev-util/sysdig/sysdig-0.17.0-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-MODULES_OPTIONAL_USE=modules
-inherit linux-mod bash-completion-r1 cmake-utils
-
-DESCRIPTION="A system exploration and troubleshooting tool"
-HOMEPAGE="https://www.sysdig.org/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+modules"
-
-RDEPEND="
-	app-misc/jq:0=
-	dev-lang/luajit:2=
-	>=dev-libs/jsoncpp-0.6_pre:0=
-	dev-libs/libb64:0=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:0=
-	dev-libs/openssl:0=
-	net-misc/curl:0="
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/os-headers"
-
-# needed for the kernel module
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-pkg_pretend() {
-	linux-mod_pkg_setup
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	local PATCHES=(
-		# fix building against curl-7.55.0+
-		# https://bugs.gentoo.org/627572
-		"${FILESDIR}"/sysdig-0.17.0-curlbuild.h.patch
-	)
-
-	sed -i -e 's:-ggdb::' CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# we will use linux-mod for that
-		-DBUILD_DRIVER=OFF
-		# libscap examples are not installed or really useful
-		-DBUILD_LIBSCAP_EXAMPLES=OFF
-
-		# unbundle the deps
-		-DUSE_BUNDLED_DEPS=OFF
-	)
-
-	cmake-utils_src_configure
-
-	# setup linux-mod ugliness
-	MODULE_NAMES="sysdig-probe(extra:${S}/driver:)"
-	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
-	BUILD_TARGETS="all"
-
-	if use modules; then
-		cmake-utils_src_make configure_driver
-
-		cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	linux-mod_src_install
-
-	# remove sources
-	rm -r "${ED%/}"/usr/src || die
-
-	# move bashcomp to the proper location
-	dobashcomp "${ED%/}"/usr/etc/bash_completion.d/sysdig || die
-	rm -r "${ED%/}"/usr/etc || die
-}
diff --git a/dev-util/sysdig/sysdig-0.18.0.ebuild b/dev-util/sysdig/sysdig-0.18.0.ebuild
deleted file mode 100644
index ebc9e98519ac..000000000000
--- a/dev-util/sysdig/sysdig-0.18.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-MODULES_OPTIONAL_USE=modules
-inherit linux-mod bash-completion-r1 cmake-utils
-
-DESCRIPTION="A system exploration and troubleshooting tool"
-HOMEPAGE="https://www.sysdig.org/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+modules"
-
-RDEPEND="
-	app-misc/jq:0=
-	dev-lang/luajit:2=
-	>=dev-libs/jsoncpp-0.6_pre:0=
-	dev-libs/libb64:0=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:0=
-	dev-libs/openssl:0=
-	net-misc/curl:0="
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/os-headers"
-
-# needed for the kernel module
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-pkg_pretend() {
-	linux-mod_pkg_setup
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-ggdb::' CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# we will use linux-mod for that
-		-DBUILD_DRIVER=OFF
-		# libscap examples are not installed or really useful
-		-DBUILD_LIBSCAP_EXAMPLES=OFF
-
-		# unbundle the deps
-		-DUSE_BUNDLED_DEPS=OFF
-	)
-
-	cmake-utils_src_configure
-
-	# setup linux-mod ugliness
-	MODULE_NAMES="sysdig-probe(extra:${S}/driver:)"
-	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
-	BUILD_TARGETS="all"
-
-	if use modules; then
-		cmake-utils_src_make configure_driver
-
-		cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	linux-mod_src_install
-
-	# remove sources
-	rm -r "${ED%/}"/usr/src || die
-
-	# move bashcomp to the proper location
-	dobashcomp "${ED%/}"/usr/etc/bash_completion.d/sysdig || die
-	rm -r "${ED%/}"/usr/etc || die
-}
diff --git a/dev-util/sysdig/sysdig-0.19.1.ebuild b/dev-util/sysdig/sysdig-0.19.1.ebuild
index ebc9e98519ac..bd54765568c0 100644
--- a/dev-util/sysdig/sysdig-0.19.1.ebuild
+++ b/dev-util/sysdig/sysdig-0.19.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+modules"
+IUSE="libressl +modules"
 
 RDEPEND="
 	app-misc/jq:0=
@@ -23,7 +23,8 @@ RDEPEND="
 	dev-libs/libb64:0=
 	sys-libs/ncurses:0=
 	sys-libs/zlib:0=
-	dev-libs/openssl:0=
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0= )
 	net-misc/curl:0="
 DEPEND="${RDEPEND}
 	app-arch/xz-utils