gentoo resync : 12.11.2017

5 files changed, 4 insertions, 249 deletions

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