gentoo resync : 06.08.2019

4 files changed, 5 insertions, 67 deletions

diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index cbfdc165a637..9676f91dc4f4 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,6 +1,5 @@
-AUX sysdig-0.26.0-build-fixes.patch 1545 BLAKE2B f182cf721180ee624deeefafff54a48fc4e5024cff00e26f178960d9f7a3d7e8a481dee028fe1dac789f77ec8ba772cc5da82c4d0ebc388f1aa711824d42a2d1 SHA512 2d34ab81da7d3a07e9c7116dc1d25e6db93b5faf2be2a4fe1710efba43293892255591284bc1d2c39953c4cf73ebcacb73b5626cc2d649a0505e351165c9b8d7
-DIST sysdig-0.26.1.tar.gz 892441 BLAKE2B 38302458c54a10719fadaf5e5bb6d29931a262550eaf44350543e99cd33e6a90889d81f49096d2f57fcc903bc9245a1f782b438a48613f9fc9f90273c46f0f39 SHA512 817573dd2945e20094c548a481205d7ae700e8242a12c75bcab41c52330fb6f508214d71f3d3ba4ecc86576e555c8c2a0c155921d61d29a5861bbf982600f6fb
-DIST sysdig-0.26.2.tar.gz 907496 BLAKE2B ce489d7c1a54aa2930599aa7141b1a3d4815c0395b4a444dea565334a1b39a36d339eb2bc9d0c2b3924e8c54f9c3adec6b31278017cfee955fe9ed9d3c29977f SHA512 1a2476060f43559ec89663377361d1fcaace7fe3aa3b472629dca78557e6d5868d8f5cfce3411c46804b501d6a56dcb074f6becf3d8e756b7f7fd943087cd3ae
-EBUILD sysdig-0.26.1.ebuild 1998 BLAKE2B 52ae3ad4e180a6640c613d6d5adba3e11d0485e7ee235f79eeadd19291e1291927fb6666c66555b0239d9015de9c56dcbca5f9a922a37422d155dd88e48f5097 SHA512 e6299a6be79367693680df3f2a5bc2555731ffad9dba8c333a1a4553120705a62be74127f0163c41343bf8b63d74c73d6b895a173812c57df394b64f1941368a
-EBUILD sysdig-0.26.2.ebuild 1822 BLAKE2B 409bec675d0a5449eb4f13b8779199eede799932526798c1efa8cf40a3df7405d9e2d6247d9364b8500241c7cef4e0c4409752a50046c764e91192b99a8a6dd3 SHA512 f88d540381670786a876a11dc6c783016073d3e02d8f704f50c1a58f3c05d490a48eba658576427b5c87a57985ac1e890ece85add3b4072dd89a216c8cef8342
+DIST sysdig-0.26.3.tar.gz 902206 BLAKE2B ec25d0441c69b8c4c4fc431d073d2f93e476ece7add98412e54ce4286bcd7e32d4b1ff89f75dd728dc66c7d77da157bed2182bad85557c0dcec09648f86abb3d SHA512 f700d1ddae687a3474a8bf6816d2fef6c69e963a269a90a8362287dee698ac9799da18f01f383368c906d294ceb046160a8b0792292a72a3b08fc614b5b69d32
+DIST sysdig-0.26.4.tar.gz 902181 BLAKE2B a7ac38be2f7a3d7e4f4fdec6a2fbf5305a8224ee27352da70f509139ebefd14616f84c7b8860f50d2546819a94deb1117034bceddd22128fcf25386b835274f2 SHA512 f56f5d0a522b861df4803bfdafcaf8db3fc9c0e751d06c321082757f6828a210cb86bab4550a3b35bf6412f930e44ab0f5cf709a30651c57dd7064a68e273a88
+EBUILD sysdig-0.26.3.ebuild 1822 BLAKE2B 409bec675d0a5449eb4f13b8779199eede799932526798c1efa8cf40a3df7405d9e2d6247d9364b8500241c7cef4e0c4409752a50046c764e91192b99a8a6dd3 SHA512 f88d540381670786a876a11dc6c783016073d3e02d8f704f50c1a58f3c05d490a48eba658576427b5c87a57985ac1e890ece85add3b4072dd89a216c8cef8342
+EBUILD sysdig-0.26.4.ebuild 1822 BLAKE2B 409bec675d0a5449eb4f13b8779199eede799932526798c1efa8cf40a3df7405d9e2d6247d9364b8500241c7cef4e0c4409752a50046c764e91192b99a8a6dd3 SHA512 f88d540381670786a876a11dc6c783016073d3e02d8f704f50c1a58f3c05d490a48eba658576427b5c87a57985ac1e890ece85add3b4072dd89a216c8cef8342
 MISC metadata.xml 507 BLAKE2B 4e19c0d3370019c80eda625ae812a4485139ab8a83285946ebc6ef62abad280beaefaaac29d7a57e14b5ca5448bd9d1c23a8cf6a4f783149633dd09e7ae1465c SHA512 d218731de7acfbbfa3c3043b2d942c00b7f5aff1a020b6dca2019f202be3a5390f44337e04691a0d4641e661f7581f703db5fda3d2a116c0d63fb7d9da25ed06
diff --git a/dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch b/dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch
deleted file mode 100644
index 8e0dfd606a16..000000000000
--- a/dev-util/sysdig/files/sysdig-0.26.0-build-fixes.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/userspace/libscap/scap_fds.c b/userspace/libscap/scap_fds.c
-index 452353a6..6eb7cd16 100644
---- a/userspace/libscap/scap_fds.c
-+++ b/userspace/libscap/scap_fds.c
-@@ -49,6 +49,7 @@ limitations under the License.
- #include <errno.h>
- #include <netinet/tcp.h>
- #if defined(__linux__)
-+#include <sys/sysmacros.h>
- #include <linux/netlink.h>
- #include <linux/rtnetlink.h>
- //#include <linux/sock_diag.h>
-diff --git a/userspace/libsinsp/CMakeLists.txt b/userspace/libsinsp/CMakeLists.txt
-index bc851319..ec454de7 100644
---- a/userspace/libsinsp/CMakeLists.txt
-+++ b/userspace/libsinsp/CMakeLists.txt
-@@ -145,7 +145,9 @@ add_library(sinsp STATIC ${SINSP_SOURCES})
- 
- target_link_libraries(sinsp 
- 	scap
--	"${JSONCPP_LIB}")
-+	"${CURL_LIBRARIES}"
-+	"${JSONCPP_LIB}"
-+	"${TBB_LIB}")
- 
- if(USE_BUNDLED_LUAJIT)
- 	add_dependencies(sinsp luajit)
-@@ -157,13 +159,12 @@ if(NOT WIN32)
- 	endif()
- 	if(USE_BUNDLED_CURL)
- 		add_dependencies(sinsp curl)
--		target_link_libraries(sinsp
--			"${CURL_LIBRARIES}")
- 	endif()
- 	if(USE_BUNDLED_TBB)
- 		add_dependencies(sinsp tbb)
--		target_link_libraries(sinsp
--			"${TBB_LIB}")
-+	endif()
-+	if(USE_BUNDLED_GRPC)
-+		add_dependencies(sinsp grpc)
- 	endif()
- 
- 	if(NOT APPLE)
-@@ -177,7 +178,6 @@ if(NOT WIN32)
- 				COMMAND ${PROTOC} -I ${CMAKE_CURRENT_SOURCE_DIR} --grpc_out=. --plugin=protoc-gen-grpc=${GRPC_CPP_PLUGIN} ${CMAKE_CURRENT_SOURCE_DIR}/cri.proto
- 				WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- 
--		add_dependencies(sinsp grpc)
- 		target_link_libraries(sinsp
- 			"${GRPCPP_LIB}"
- 			"${GRPC_LIB}"
diff --git a/dev-util/sysdig/sysdig-0.26.2.ebuild b/dev-util/sysdig/sysdig-0.26.3.ebuild
index 2d4c0de2f51f..2d4c0de2f51f 100644
--- a/dev-util/sysdig/sysdig-0.26.2.ebuild
+++ b/dev-util/sysdig/sysdig-0.26.3.ebuild
diff --git a/dev-util/sysdig/sysdig-0.26.1.ebuild b/dev-util/sysdig/sysdig-0.26.4.ebuild
index a6c3bad4d48f..2d4c0de2f51f 100644
--- a/dev-util/sysdig/sysdig-0.26.1.ebuild
+++ b/dev-util/sysdig/sysdig-0.26.4.ebuild
@@ -48,7 +48,6 @@ pkg_setup() {
 src_prepare() {
 	sed -i -e 's:-ggdb::' CMakeLists.txt || die
 
-	eapply "${FILESDIR}"/sysdig-0.26.0-build-fixes.patch
 	cmake-utils_src_prepare
 }
 
@@ -66,26 +65,18 @@ src_configure() {
 	cmake-utils_src_configure
 
 	# setup linux-mod ugliness
-	MODULE_NAMES="sysdig-probe(extra:${S}/driver:)"
+	MODULE_NAMES="sysdig-probe(extra:${BUILD_DIR}/driver/src:)"
 	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