gentoo (leap year) resync : 29.02.2020

9 files changed, 1 insertions, 492 deletions

diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index d85f7c15674d..2cf250515b67 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -1,13 +1,5 @@
-AUX apitrace-8.0-brotli-unbundle.patch 4729 BLAKE2B 62d035f6924b4c1af7d8cffe8b57845c4e1b4f10423c6c54438ef069f37c3ed39cad62a5066189a604601f5df1a2949c584481948a662f0d00a27305fd6b6416 SHA512 209d41f221c439a0abe4a021c8335cc51eaa6d4769c41c7526501be127e2089b99ccad5e417b10339ff65af37e37c51975be25a68e23a33cae71c61ab9e968ce
-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
 AUX apitrace-9.0-brotli-unbundle.patch 4728 BLAKE2B 66ff205968db551cdd8ebc7ba33dfcd39fd36356691722f593f7ce0fa615279c0e440077b3e29c5a643bf5be8a2406a656bfa91fb9f128c2afa922b3ad832a35 SHA512 0690f8d178fd7a5ca11b26d1e23c9c26e984214cef2e3619a22fc6cf58a7ee96fe0b046dd038c202cd6f60b9175dbdd346813c53ca85932f9a4d9dd40e9bdba1
 AUX apitrace-9.0-disable-multiarch.patch 1796 BLAKE2B c687c87b23f3711bd9ac70a345e7e2fbe7dab36f48cbf5a949d7fbeab41ac670054bcee203bf4db8df24cdabc418b7a04980fd1436962a15a8c6371e7d8d0f05 SHA512 5bb89dc98e5bbd92b707988d301ec50ea57f1562bd9a54fc2dada9b5ddafde5da66dd02d03efc377cbcf2bdc7d430f0b1353ed7a7f2d8703aabfeb9b563c1278
-DIST apitrace-8.0.tar.gz 3601109 BLAKE2B f3e8f7ff93ef4866370e791fa7768ca0445bd8f62a7d26f203bade7fec7aab475115ea2820b351fbc974697160b49a0c0628fb01ca9afa248b3e31ab7b75d4fc SHA512 1bd8ed4468fde17fbdc43bdd50508e6c7662ddf79b6d34aa222ee69cd033aeedcdc3a8c2fc4e88ba85bf13f7e7c516a83dc158b11f0e4dd67d2ec65ad10cef2c
 DIST apitrace-9.0.tar.gz 3623693 BLAKE2B 885cfd22d1cc82e36f7f0d65b816784986a8a693d04b483c059d3cffb0328c2cbbfd043793b964cea84d7b09a0dc8dda5f464099e91df26fd5eecef4bbeb28cc SHA512 4234bc2d14378b1bd9554752d83f8ce0703b4e08c3edc85769dc988a2b3a44b8e55d2f5856954658155a11d69802849bae6350ed5031a5916c7ac7bc7287918c
-EBUILD apitrace-8.0.ebuild 2560 BLAKE2B 922dfe6163be5c2ce1c718207f710f43b613584e14433c4f0ae9309910effd08d6757256eae802b261fae2220a8a3f661a018f2d4827f910b23d134c5742f6d7 SHA512 a795f9fe94de53746fad35190c5c4a42548944111c99395f24bad1bccd21a47d4ba11a5514d70d86f3cccf9a8fb7b90acea87045afe9dfd8838387e06fa954bd
 EBUILD apitrace-9.0.ebuild 2168 BLAKE2B 7e72e7306c94d2f81306fec1ba34f364507a583f6729bf3d445a0e0177045a5adefcf4282803708ec1cf06d253b65232b09046391c83a152f3212b0b8e7c8e1a SHA512 4a60edf54c6d6d1749d3c3a0c60ecc90045e4a1da3918b6eb0563afc7dea3c28d6d72e5101211042dfbbdf1edf986e75e0e1cac7ba8b932a944f74651fb16f43
-MISC metadata.xml 438 BLAKE2B f88a54537c6bd0c1f9965ec8d520928cea727ba4f8424b49993c4e310078676d9394ddaa64c3c0fb9e0f1bf9eca36142260148945f455e0700dbc362dce73fd6 SHA512 45a818f2bbbfd046e403940734323c027929de373f8366a7de29e4342fe3f98ea27ba2c151f80dbbd33d1110acf2f363669c3c4176d2c15d8b5a783182128cd5
+MISC metadata.xml 249 BLAKE2B eb5bf02945b5d031a07adba28359ab63035d1ce8601c8dc1d9c6aea54de6a55899672c4606b472a308e61a4b8a45d2f752d4472d7b45bb368fccec9c4c3fc739 SHA512 7230e2d97a0540aed68eb2d1f8383c4e5df9b0c09a628db997fea6224615f76744537e5476a7c1984934d27b9ee05d53b0294d00234b2d16cbc722f822a27f21
diff --git a/dev-util/apitrace/apitrace-8.0.ebuild b/dev-util/apitrace/apitrace-8.0.ebuild
deleted file mode 100644
index 25faf457158f..000000000000
--- a/dev-util/apitrace/apitrace-8.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python2_7 )
-inherit cmake-multilib python-single-r1
-
-DESCRIPTION="Tool for tracing, analyzing, and debugging graphics APIs"
-HOMEPAGE="https://github.com/apitrace/apitrace"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT !system-snappy? ( BSD CC-BY-3.0 CC-BY-4.0 public-domain )" #bundled snappy
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+cli egl qt5 system-snappy"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	app-arch/brotli:=
-	media-libs/libpng:0=
-	media-libs/mesa[egl?,X(+),${MULTILIB_USEDEP}]
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	sys-process/procps:=
-	x11-libs/libX11
-	egl? (
-		>=media-libs/mesa-8.0[gles1,gles2]
-		media-libs/waffle[egl]
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5[-gles2]
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5[-gles2]
-	)
-	system-snappy? ( >=app-arch/snappy-1.1.1[${MULTILIB_USEDEP}] )
-"
-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() {
-	cmake_src_prepare
-
-	# The apitrace code grubs around in the internal zlib structures.
-	# We have to extract this header and clean it up to keep that working.
-	# Do not be surprised if a zlib upgrade breaks things ...
-	rm -rf thirdparty/{brotli,getopt,less,libpng,zlib,dxerr,directxtex,devcon} || die
-	if use system-snappy ; then
-		rm -rf thirdparty/snappy || die
-	fi
-}
-
-src_configure() {
-	my_configure() {
-		local mycmakeargs=(
-			-DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
-			-DENABLE_EGL=$(usex egl)
-			-DENABLE_STATIC_SNAPPY=$(usex !system-snappy)
-		)
-		if multilib_is_native_abi ; then
-			mycmakeargs+=(
-				-DENABLE_CLI=$(usex cli)
-				-DENABLE_GUI=$(usex qt5)
-			)
-		else
-			mycmakeargs+=(
-				-DBUILD_LIB_ONLY=ON
-				-DENABLE_CLI=OFF
-				-DENABLE_GUI=OFF
-			)
-		fi
-		cmake_src_configure
-	}
-
-	multilib_parallel_foreach_abi my_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1
-	dosym glxtrace.so /usr/$(get_libdir)/${PN}/wrappers/libGL.so.1.2
-
-	rm docs/INSTALL.markdown || die
-	dodoc docs/* README.markdown
-
-	exeinto /usr/$(get_libdir)/${PN}/scripts
-	doexe $(find scripts -type f -executable)
-}
diff --git a/dev-util/apitrace/files/apitrace-8.0-brotli-unbundle.patch b/dev-util/apitrace/files/apitrace-8.0-brotli-unbundle.patch
deleted file mode 100644
index 09ed21c0c54e..000000000000
--- a/dev-util/apitrace/files/apitrace-8.0-brotli-unbundle.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From b0f5a220c41af013da3362e5c9751b593b22754a Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 29 Apr 2019 21:08:02 +0200
-Subject: [PATCH 1/2] Import FindBrotliDec.cmake and FindBrotliEnc.cmake from
- Igalia S.L.
-
-MIT License, which fits well.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- cmake/FindBrotliDec.cmake | 35 +++++++++++++++++++++++++++++++++++
- cmake/FindBrotliEnc.cmake | 35 +++++++++++++++++++++++++++++++++++
- 2 files changed, 70 insertions(+)
- create mode 100644 cmake/FindBrotliDec.cmake
- create mode 100644 cmake/FindBrotliEnc.cmake
-
-diff --git a/cmake/FindBrotliDec.cmake b/cmake/FindBrotliDec.cmake
-new file mode 100644
-index 00000000..abb06f44
---- /dev/null
-+++ b/cmake/FindBrotliDec.cmake
-@@ -0,0 +1,35 @@
-+# Copyright 2017 Igalia S.L. All Rights Reserved.
-+#
-+# Distributed under MIT license.
-+# See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
-+
-+# Try to find BrotliDec. Once done, this will define
-+#
-+#  BROTLIDEC_FOUND - system has BrotliDec.
-+#  BROTLIDEC_INCLUDE_DIRS - the BrotliDec include directories
-+#  BROTLIDEC_LIBRARIES - link these to use BrotliDec.
-+
-+find_package(PkgConfig)
-+
-+pkg_check_modules(PC_BROTLIDEC libbrotlidec)
-+
-+find_path(BROTLIDEC_INCLUDE_DIRS
-+    NAMES brotli/decode.h
-+    HINTS ${PC_BROTLIDEC_INCLUDEDIR}
-+)
-+
-+find_library(BROTLIDEC_LIBRARIES
-+    NAMES brotlidec
-+    HINTS ${PC_BROTLIDEC_LIBDIR}
-+)
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(BrotliDec
-+    REQUIRED_VARS BROTLIDEC_INCLUDE_DIRS BROTLIDEC_LIBRARIES
-+    FOUND_VAR BROTLIDEC_FOUND
-+    VERSION_VAR PC_BROTLIDEC_VERSION)
-+
-+mark_as_advanced(
-+    BROTLIDEC_INCLUDE_DIRS
-+    BROTLIDEC_LIBRARIES
-+)
-diff --git a/cmake/FindBrotliEnc.cmake b/cmake/FindBrotliEnc.cmake
-new file mode 100644
-index 00000000..4be347db
---- /dev/null
-+++ b/cmake/FindBrotliEnc.cmake
-@@ -0,0 +1,35 @@
-+# Copyright 2017 Igalia S.L. All Rights Reserved.
-+#
-+# Distributed under MIT license.
-+# See file LICENSE for detail or copy at https://opensource.org/licenses/MIT
-+
-+# Try to find BrotliEnc. Once done, this will define
-+#
-+#  BROTLIENC_FOUND - system has BrotliEnc.
-+#  BROTLIENC_INCLUDE_DIRS - the BrotliEnc include directories
-+#  BROTLIENC_LIBRARIES - link these to use BrotliEnc.
-+
-+find_package(PkgConfig)
-+
-+pkg_check_modules(PC_BROTLIENC libbrotlienc)
-+
-+find_path(BROTLIENC_INCLUDE_DIRS
-+    NAMES brotli/encode.h
-+    HINTS ${PC_BROTLIENC_INCLUDEDIR}
-+)
-+
-+find_library(BROTLIENC_LIBRARIES
-+    NAMES brotlienc
-+    HINTS ${PC_BROTLIENC_LIBDIR}
-+)
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(BrotliEnc
-+    REQUIRED_VARS BROTLIENC_INCLUDE_DIRS BROTLIENC_LIBRARIES
-+    FOUND_VAR BROTLIENC_FOUND
-+    VERSION_VAR PC_BROTLIENC_VERSION)
-+
-+mark_as_advanced(
-+    BROTLIENC_INCLUDE_DIRS
-+    BROTLIENC_LIBRARIES
-+)
--- 
-2.21.0
-
-
-From cd3486343001d6a47e4a468caa425ef835012463 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 29 Apr 2019 21:11:57 +0200
-Subject: [PATCH 2/2] Find system brotli instead of bundled
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt           | 5 +++--
- cli/CMakeLists.txt       | 2 +-
- lib/trace/CMakeLists.txt | 2 +-
- 3 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bc988e95..6a62b3b7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -483,8 +483,9 @@ if (ENABLE_STATIC_SNAPPY OR NOT SNAPPY_FOUND)
- endif ()
- include_directories (${SNAPPY_INCLUDE_DIRS})
- 
--include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/brotli/c/include)
--add_subdirectory (thirdparty/brotli)
-+find_package(BrotliDec REQUIRED)
-+find_package(BrotliEnc REQUIRED)
-+include_directories (${BROTLIDEC_INCLUDE_DIRS} ${BROTLIENC_INCLUDE_DIRS})
- 
- if (NOT WIN32 AND NOT ENABLE_STATIC_EXE)
-     # zlib 1.2.4-1.2.5 made it impossible to read the last block of incomplete
-diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt
-index a0189202..16428c63 100644
---- a/cli/CMakeLists.txt
-+++ b/cli/CMakeLists.txt
-@@ -39,7 +39,7 @@ add_executable (apitrace
- 
- target_link_libraries (apitrace
-     common
--    brotli_dec brotli_enc brotli_common
-+    ${BROTLIDEC_LIBRARIES} ${BROTLIENC_LIBRARIES}
-     ${ZLIB_LIBRARIES}
-     ${SNAPPY_LIBRARIES}
-     ${GETOPT_LIBRARIES}
-diff --git a/lib/trace/CMakeLists.txt b/lib/trace/CMakeLists.txt
-index c68bd00f..ce2e469e 100644
---- a/lib/trace/CMakeLists.txt
-+++ b/lib/trace/CMakeLists.txt
-@@ -31,7 +31,7 @@ target_link_libraries (common
-     guids
-     highlight
-     os
--    brotli_dec brotli_common
-+    ${BROTLIDEC_LIBRARIES} ${BROTLIENC_LIBRARIES}
- )
- 
- add_gtest (trace_parser_flags_test trace_parser_flags_test.cpp)
--- 
-2.21.0
-
diff --git a/dev-util/apitrace/files/apitrace-8.0-disable-multiarch.patch b/dev-util/apitrace/files/apitrace-8.0-disable-multiarch.patch
deleted file mode 100644
index 9ab6ca27f635..000000000000
--- a/dev-util/apitrace/files/apitrace-8.0-disable-multiarch.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 849289703b1c8ef1461d0d0f6a5465e20f3c0932 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 29 Apr 2019 20:32:04 +0200
-Subject: [PATCH 1/3] Use CMAKE_INSTALL_LIBDIR for LIB_INSTALL_DIR
-
-Respect the libdir cmake already set up for us instead of using
-debian-specific multiarch paths.
-
-Patch was rebased multiple times from 4.0 to 8.0 now.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 17 ++---------------
- 1 file changed, 2 insertions(+), 15 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 34b55554..36879db6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -429,15 +429,6 @@ endif ()
- ##############################################################################
- # Installation directories
- 
--if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
--    # Debian multiarch support
--    execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
--        OUTPUT_VARIABLE ARCH_SUBDIR
--        ERROR_QUIET
--        OUTPUT_STRIP_TRAILING_WHITESPACE
--    )
--endif()
--
- if (WIN32 OR APPLE)
-     # On Windows/MacOSX, applications are usually installed on a directory of
-     # their own
-@@ -446,12 +437,8 @@ if (WIN32 OR APPLE)
-     set (LIB_ARCH_INSTALL_DIR lib)
- else ()
-     set (DOC_DEFAULT_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
--    set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
--    if (ARCH_SUBDIR)
--        set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
--    else ()
--        set (LIB_ARCH_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
--    endif ()
-+    set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME})
-+    set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
- endif ()
- 
- # Allow customization of the doc installation dir (Slackware uses different
--- 
-2.21.0
-
diff --git a/dev-util/apitrace/files/apitrace-8.0-docs-install.patch b/dev-util/apitrace/files/apitrace-8.0-docs-install.patch
deleted file mode 100644
index 4c8e215ff70c..000000000000
--- a/dev-util/apitrace/files/apitrace-8.0-docs-install.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 17864ae1e14362d56bbd7dd75149e094a4716bc6 Mon Sep 17 00:00:00 2001
-From: Michael Weber <xmw@gentoo.org>
-Date: Mon, 29 Apr 2019 20:56:28 +0200
-Subject: [PATCH 3/3] Disable doc files installation by build system
-
-Patch was rebased from 7.1 on top of 8.0.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt                   | 14 --------------
- thirdparty/snappy/CMakeLists.txt |  5 -----
- 2 files changed, 19 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6466cd8a..84fd0ae1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -604,20 +604,6 @@ endif ()
- ##############################################################################
- # Packaging
- 
--install (
--    FILES
--        README.markdown
--        docs/BUGS.markdown
--        docs/NEWS.markdown
--        docs/USAGE.markdown
--    DESTINATION ${DOC_INSTALL_DIR}
--)
--install (
--    FILES LICENSE
--    DESTINATION ${DOC_INSTALL_DIR}
--    RENAME LICENSE.txt
--)
--
- set (CPACK_PACKAGE_VERSION_MAJOR "8")
- set (CPACK_PACKAGE_VERSION_MINOR "0")
- 
-diff --git a/thirdparty/snappy/CMakeLists.txt b/thirdparty/snappy/CMakeLists.txt
-index 84ecbac8..f732dbc0 100644
---- a/thirdparty/snappy/CMakeLists.txt
-+++ b/thirdparty/snappy/CMakeLists.txt
-@@ -26,8 +26,3 @@ add_convenience_library (snappy_bundled EXCLUDE_FROM_ALL
-     snappy-stubs-public.h
- )
- 
--install (
--    FILES COPYING
--    DESTINATION ${DOC_INSTALL_DIR}
--    RENAME LICENSE-snappy.txt
--)
--- 
-2.21.0
-
diff --git a/dev-util/apitrace/files/apitrace-8.0-glxtrace-only.patch b/dev-util/apitrace/files/apitrace-8.0-glxtrace-only.patch
deleted file mode 100644
index 2655e0abfc09..000000000000
--- a/dev-util/apitrace/files/apitrace-8.0-glxtrace-only.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 747fe00d3b4e2648003715f949cf2ac18e32862a Mon Sep 17 00:00:00 2001
-From: Tim Harder <radhermit@gentoo.org>
-Date: Mon, 29 Apr 2019 20:45:42 +0200
-Subject: [PATCH 2/3] Allow building of just glxtrace library (without GUI
- tools)
-
-Patch was rebased multiple times from 1.0 to 8.0 now.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt         | 2 ++
- retrace/CMakeLists.txt | 4 ++++
- 2 files changed, 6 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 36879db6..6466cd8a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -47,6 +47,8 @@ if (ANDROID)
-     message (FATAL_ERROR "Android is no longer supported (https://git.io/vH2gW)")
- endif ()
- 
-+option (BUILD_LIB_ONLY "Build the glxtrace library only" OFF)
-+
- # Proprietary Linux games often ship their own libraries (zlib, libstdc++,
- # etc.) in order to ship a single set of binaries across multiple
- # distributions.  Given that apitrace wrapper modules will be loaded into those
-diff --git a/retrace/CMakeLists.txt b/retrace/CMakeLists.txt
-index 76dc8362..e1bad990 100644
---- a/retrace/CMakeLists.txt
-+++ b/retrace/CMakeLists.txt
-@@ -15,6 +15,8 @@ include_directories (
- 
- add_definitions (-DRETRACE)
- 
-+if (NOT BUILD_LIB_ONLY)
-+
- add_custom_command (
-     OUTPUT glretrace_gl.cpp
-     COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace_gl.cpp
-@@ -343,3 +345,5 @@ if (WIN32)
-     install (TARGETS d3dretrace RUNTIME DESTINATION bin)
-     install_pdb (d3dretrace DESTINATION bin)
- endif ()
-+
-+endif (NOT BUILD_LIB_ONLY)
--- 
-2.21.0
-
diff --git a/dev-util/apitrace/files/apitrace-8.0-system-snappy1.patch b/dev-util/apitrace/files/apitrace-8.0-system-snappy1.patch
deleted file mode 100644
index a774ec322dca..000000000000
--- a/dev-util/apitrace/files/apitrace-8.0-system-snappy1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index 981a10b4e751..000000000000
--- a/dev-util/apitrace/files/apitrace-8.0-system-snappy2.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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
diff --git a/dev-util/apitrace/metadata.xml b/dev-util/apitrace/metadata.xml
index 6ff16988eb41..0a166ed586ab 100644
--- a/dev-util/apitrace/metadata.xml
+++ b/dev-util/apitrace/metadata.xml
@@ -2,11 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<use>
-		<flag name="cli">Enable command line interface</flag>
-		<flag name="egl">Enable EGL support</flag>
-		<flag name="system-snappy">Link dynamic against app-arch/snappy</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">apitrace/apitrace</remote-id>
 	</upstream>