gentoo resync : 18.05.2019

4 files changed, 68 insertions, 1 deletions

diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index bdf7a98ae5da..a9abd2670ef0 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -2,6 +2,8 @@ AUX apitrace-8.0-brotli-unbundle.patch 4729 BLAKE2B 62d035f6924b4c1af7d8cffe8b57
 AUX apitrace-8.0-disable-multiarch.patch 1800 BLAKE2B e7eb8a642392ecbdf5a29c17520df137e6c581073571114e4e1e60b00a027780f41057368dc5ac7d20d6be42371ff4171de342ac88745d00ff1ee4822f814f69 SHA512 73213188d4e2506bf61142c9366a2163cf713ba7f06676e241a05b20bc6601858f707bd21dcf675630315aebfc667b943290e1e7343bff9f89b625527d0b3f5c
 AUX apitrace-8.0-docs-install.patch 1452 BLAKE2B e8fe92e29614dcf416221c61cab5989cea2308771e8b87cd914194c26a79a27abdc5594938e7d7578d6d2a2980136446d1091d4a73d84cdb21125f46e97556e8 SHA512 ce405289a0c526b8e83e1624f9cd98e8eec9843509dc52f905ab884ad1091c61bdf06497f70233e703001ac638906875747d07167aca3e881e9dee1e543fe7b0
 AUX apitrace-8.0-glxtrace-only.patch 1591 BLAKE2B 45dae3a9bfdea147fd865124db7865bd389e15f7feec491f1ae520077e06134b9305351295975449dceea13aa65fee11db1a245eec73666b63c8874e72043cd3 SHA512 eea930563f125df25ff0912bcddb925fd3724fa17c1d3f1a9a5648b1f44351d3f79cf44d5e7f59ca8282a0dffb62afba583059721f9e5545707294ea62fa90c4
+AUX apitrace-8.0-system-snappy1.patch 846 BLAKE2B 5c5ba05af785556dcd0a7508698693cf73a283a2a476df89b0e0072841de0ed301aaf5d991353f294511aae29c38bc039c1b6b9b23d3d8f61377bbda05843fc6 SHA512 334f607959f6b4d6b0798e6ba6a1e252d6f8fda4560d0ca44be38da803ce545ea15ce951c40604464d283cebb99b16b606dd0403aaa7c9538380f871b3ec87e7
+AUX apitrace-8.0-system-snappy2.patch 1319 BLAKE2B 4c02a87fde35c004177f1fe9df074e3fa01fbcc7dcf6ab9b497cb69259243f9bfb8b76fd2c78194d624ebaf2fbfbb871155a031d6a58e6dc1b9c426c116a590d SHA512 67e7b3bd69023db8341c74fe30d0f846f6b751cc972681062d491414d31dc65c3869e0387b436436394aaf11e0d001652970daa895b6740f94de9bc4544ef0e7
 DIST apitrace-8.0.tar.gz 3601109 BLAKE2B f3e8f7ff93ef4866370e791fa7768ca0445bd8f62a7d26f203bade7fec7aab475115ea2820b351fbc974697160b49a0c0628fb01ca9afa248b3e31ab7b75d4fc SHA512 1bd8ed4468fde17fbdc43bdd50508e6c7662ddf79b6d34aa222ee69cd033aeedcdc3a8c2fc4e88ba85bf13f7e7c516a83dc158b11f0e4dd67d2ec65ad10cef2c
-EBUILD apitrace-8.0.ebuild 2471 BLAKE2B eba6b605d9fcdb8397159323d7dd2769db436150e8f75334a0055e0dd32586299dbb6c6439004ad134d93cb9a1e1a14b2cb361b0d0503d584a4dd90bedc25110 SHA512 e4bb4a6e85b2d6af3604ae2b71ef73759de22bf6e7e739d4d05eeb8149e575438438f7e69d0ef4cfabbbedc1626345021cd2eef11ddfd0f655035bebdffd2e82
+EBUILD apitrace-8.0.ebuild 2548 BLAKE2B f7de5ec357788b50e2cfd957e589e79d105c8614fb7f082bf4ddd797fd0c57b2abb99157471aa968cf8ec0c6bae2fbad39a7ed91b497d9fed265681226370dd4 SHA512 90154019510cedf394c737e1a51fcd61807e2392fb255a83d5aac2407faa4e8772b54746b0951fdd3c670140c83ad410ed25597f87d262b1c28e2e128ea3669e
 MISC metadata.xml 438 BLAKE2B f88a54537c6bd0c1f9965ec8d520928cea727ba4f8424b49993c4e310078676d9394ddaa64c3c0fb9e0f1bf9eca36142260148945f455e0700dbc362dce73fd6 SHA512 45a818f2bbbfd046e403940734323c027929de373f8366a7de29e4342fe3f98ea27ba2c151f80dbbd33d1110acf2f363669c3c4176d2c15d8b5a783182128cd5
diff --git a/dev-util/apitrace/apitrace-8.0.ebuild b/dev-util/apitrace/apitrace-8.0.ebuild
index 96e336ad5adc..2e34348ebc21 100644
--- a/dev-util/apitrace/apitrace-8.0.ebuild
+++ b/dev-util/apitrace/apitrace-8.0.ebuild
@@ -39,10 +39,13 @@ DEPEND="${PYTHON_DEPS}
 RDEPEND="${DEPEND}"
 
 PATCHES=(
+	# TODO: upstream
 	"${FILESDIR}"/${P}-disable-multiarch.patch
 	"${FILESDIR}"/${P}-glxtrace-only.patch
 	"${FILESDIR}"/${P}-docs-install.patch
 	"${FILESDIR}"/${P}-brotli-unbundle.patch
+	# git master
+	"${FILESDIR}"/${P}-system-snappy{1,2}.patch
 )
 
 src_prepare() {
diff --git a/dev-util/apitrace/files/apitrace-8.0-system-snappy1.patch b/dev-util/apitrace/files/apitrace-8.0-system-snappy1.patch
new file mode 100644
index 000000000000..a774ec322dca
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-8.0-system-snappy1.patch
@@ -0,0 +1,21 @@
+From 1294f69ed84e3c35f108fb55533b6687cdfcd419 Mon Sep 17 00:00:00 2001
+From: "i.Dark_Templar" <darktemplar@dark-templar-archives.net>
+Date: Tue, 30 Apr 2019 22:19:08 +0300
+Subject: [PATCH] cmake: Fix out-of-source build without bundled snappy.
+
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2cf5ab2f5..3751f078e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -532,6 +532,7 @@ add_subdirectory (thirdparty/crc32c)
+ if (CMAKE_EXECUTABLE_FORMAT STREQUAL "ELF")
+     add_subdirectory (thirdparty/libbacktrace)
+     include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libbacktrace)
++    include_directories (${CMAKE_CURRENT_BINARY_DIR}/thirdparty/libbacktrace)
+     set (LIBBACKTRACE_LIBRARIES ${CMAKE_DL_LIBS} backtrace)
+     add_definitions (-DHAVE_BACKTRACE=1)
+ endif ()
diff --git a/dev-util/apitrace/files/apitrace-8.0-system-snappy2.patch b/dev-util/apitrace/files/apitrace-8.0-system-snappy2.patch
new file mode 100644
index 000000000000..981a10b4e751
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-8.0-system-snappy2.patch
@@ -0,0 +1,41 @@
+From 5777f1a8aaef7a39754db9708062b7630c5644a2 Mon Sep 17 00:00:00 2001
+From: Jose Fonseca <jfonseca@vmware.com>
+Date: Wed, 1 May 2019 10:40:43 +0100
+Subject: [PATCH] snappy: Place config.h on a subdirectory.
+
+And ensure it's only included internally.
+
+This addresses the issue described in
+https://github.com/apitrace/apitrace/pull/611#issuecomment-488087078
+---
+ thirdparty/snappy/CMakeLists.txt        | 6 +++++-
+ thirdparty/snappy/{ => config}/config.h | 0
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ rename thirdparty/snappy/{ => config}/config.h (100%)
+
+diff --git a/thirdparty/snappy/CMakeLists.txt b/thirdparty/snappy/CMakeLists.txt
+index 84ecbac8a..581de38fa 100644
+--- a/thirdparty/snappy/CMakeLists.txt
++++ b/thirdparty/snappy/CMakeLists.txt
+@@ -18,12 +18,16 @@ add_convenience_library (snappy_bundled EXCLUDE_FROM_ALL
+     snappy-sinksource.cc
+     snappy-stubs-internal.cc
+     snappy.cc
+-    config.h
+ 
+     snappy-c.h
+     snappy-sinksource.h
+     snappy.h
+     snappy-stubs-public.h
++    config/config.h
++)
++
++target_include_directories (snappy_bundled PRIVATE
++    ${CMAKE_CURRENT_SOURCE_DIR}/config
+ )
+ 
+ install (
+diff --git a/thirdparty/snappy/config.h b/thirdparty/snappy/config/config.h
+similarity index 100%
+rename from thirdparty/snappy/config.h
+rename to thirdparty/snappy/config/config.h