gentoo resync : 18.12.2020

5 files changed, 55 insertions, 9 deletions

diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index bbb4a5abb283..cf9e6e606c50 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,6 +1,7 @@
-DIST vulkan-loader-1.2.141.tar.gz 1410381 BLAKE2B a52c384cdda41083705008b0a00f820482d5f7cb16aeb347ebb1b0dfa55e1bc5851e60275728e0d73272a2c4335bbd5efe5aaaed21c0ac9cbd3d5fb76e73cc24 SHA512 251cc617693d651feba887a737ff724631160b172577cd3365d1a93e9c17ee87719d7aa78efa6570ee4f17fa15feb4e39bee1c706f7c12c6f96617348bdd8f26
+AUX vulkan-loader-1.2.162-Fix-pkgconfig.patch 1421 BLAKE2B 6271cbf4b9b91976a2e0e821f0f62a75c556d6fc54482add5c3be7d139013d9971e22ee462e0fed251e4d78a41f94ee3127702aa1052a1a5ff04e9ba036f9d64 SHA512 63309d605f269d7c48c86aff823cf1a17a1ab1e6778ee6fa838eecbc3e439fbd730610753fc64eba19c43ef441ab68dc378f778ef8ff84349fe925ff3be6a321
 DIST vulkan-loader-1.2.154.tar.gz 1417349 BLAKE2B b134932b31325884639e94ef74f7b97c9111554ef904777df9b4e398d927e89bdf2394593ce8e4483e9fda1cd1f299df0841471ac11263580b04bc97786ac973 SHA512 003f16bff7eb24791e458b757d0fee5db9ab68d6e7b56eae623af0c4702c534cc19099c79d2ec2493cd3c30c796f1dff060bc3aaa4057b9215749de65566c157
-EBUILD vulkan-loader-1.2.141-r1.ebuild 1725 BLAKE2B 9c7064acb06fef62321cab2d0290477e6d428759ad3015a620c3948ea0a42d4891befdced4bbf51b04f1c1ae1ec2395be37364e6a8c9c0119a81e150124bbb6a SHA512 a99664f8c2b9397e6d55dd695956904b20e192880e5ae429338cc5224ecf35d2e910a0c1f5d63fee1c1cb63f645d35e4a99ca09ba2e6f4287225eadda4fa2247
-EBUILD vulkan-loader-1.2.154.ebuild 1733 BLAKE2B be562be463f54540d9d406d75280aab4c394b93c8999f2545aa831cf40507ba40b43e71eb0d1d49355b2bc0dcf7812470a222a4ff2da6d93630f06aea3f29b42 SHA512 3a6a7ecefae3d7ecd8f7128cd98de4d8883950cdc1feb7dd2eb876d2b72bc6da3bf6d2cf409bc2d9a3d0ea19d74c5670ede31d9ec9ede0aab712b1a2c14cf987
-EBUILD vulkan-loader-9999.ebuild 1729 BLAKE2B d0755a57d1a49f6386287648e1088c4f4378209cd671efb94ce2f2a40ffe1556ad228272805c6bfafe67cb4e2bc092d06b17b512d1d4522d6ed35d135b51562a SHA512 e55209e5da0c68ff2c74a0103d5775ae5daecc3c89f48439543ff0b1fdd6d5f05ffadca6dc1afeb25e489d2ed7c3caffec50503389c0737af992d6cb08342d5d
+DIST vulkan-loader-1.2.162.tar.gz 1421710 BLAKE2B 94b739821c5a12a94a52d8f0a9d79c13055ef3b45b907d53b82325b7be13db52b77d01397534e939bed5629d7a405ff8a09f8da374274a066986b4126fae9863 SHA512 89a99f282b73ec59dde30e4c8c09056b40416185a14ff9b7f7bd496754840e5ac764e7624f1f9a0f11792e786b00f19c3c9e55ccbb22a3c501d8ea9e815d84f9
+EBUILD vulkan-loader-1.2.154.ebuild 1732 BLAKE2B 08279f7f9363058f4b4c7a7c9bf88b5d34b5be88490792df68fcb53699cbb6914b58300705704ebd711a87b955c2f1305c02a44641653b14d88067c17d5a6cab SHA512 bf7da02911bee62cf54d701c5f3785c40bbf0fe038721ae1d17a022fa3e74d71d0b8f6da16c1a48ed3a4f2c3fdab240d46925ce0f4b07b18d7ededc338f970f5
+EBUILD vulkan-loader-1.2.162-r1.ebuild 1796 BLAKE2B 254b07d98aa803d4b90b43c861637ca60af08f9e886c496fffedad99b8f4fb43754c11773f9b042548c26e8b584deb0daeff77d8302ce779130b95d36e3bd933 SHA512 f49fb9cb948ac1dd5172e1130f118ae3fb386cd0b6f2ed16ae8ed7914bba311d6a674cc19c0ae643c59ab4c5817f464a58ecc6c3b4d8e482fd40a2a742322c1b
+EBUILD vulkan-loader-9999.ebuild 1731 BLAKE2B adc4fccce6f98f7b17f29b9dcededd21fd5487ffe0f427a068173f92a61f918c24ec508c6f7e7ff2851f6bc9bd585207addfca3bf82d2ee35d81c18dcb4baaac SHA512 5acd4e2f9c5f3c4ffcd1f0219814810b9a3fa4387063606eeecd1e0d0b7e3454bb8a3b66a8bb7efab518dde966c8cc33e7477408871bc2d715d1327d93f63b49
 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/files/vulkan-loader-1.2.162-Fix-pkgconfig.patch b/media-libs/vulkan-loader/files/vulkan-loader-1.2.162-Fix-pkgconfig.patch
new file mode 100644
index 000000000000..f06f5cffdad3
--- /dev/null
+++ b/media-libs/vulkan-loader/files/vulkan-loader-1.2.162-Fix-pkgconfig.patch
@@ -0,0 +1,43 @@
+From d0cfd15c09f1581278317a5c0ece8f213ba5578f Mon Sep 17 00:00:00 2001
+From: Nick Sarnie <sarnex@gentoo.org>
+Date: Wed, 16 Dec 2020 23:38:00 -0500
+Subject: [PATCH] Revert "pkgconfig: Missing lib suffx on win32"
+
+This reverts commit 10c4ebadb9fc41e0abf5a32daa7263c6d1aff575.
+
+Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
+---
+ loader/CMakeLists.txt | 3 ---
+ loader/vulkan.pc.in   | 2 +-
+ 2 files changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
+index 659511855..f7b9916b2 100644
+--- a/loader/CMakeLists.txt
++++ b/loader/CMakeLists.txt
+@@ -326,9 +326,6 @@ if(PKG_CONFIG_FOUND)
+     foreach(LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES} ${PLATFORM_LIBS})
+         set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
+     endforeach()
+-    if(WIN32)
+-        set(LIB_SUFFIX "-1")
+-    endif ()
+     configure_file("vulkan.pc.in" "vulkan.pc" @ONLY)
+     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/vulkan.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ endif()
+diff --git a/loader/vulkan.pc.in b/loader/vulkan.pc.in
+index fc17cb1f3..f1588c412 100644
+--- a/loader/vulkan.pc.in
++++ b/loader/vulkan.pc.in
+@@ -6,7 +6,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+ Name: @CMAKE_PROJECT_NAME@
+ Description: Vulkan Loader
+ Version: @VK_API_VERSION@
+-Libs: -L${libdir} -lvulkan@LIB_SUFFIX@
++Libs: -L${libdir} -lvulkan
+ Libs.private: @PRIVATE_LIBS@
+ Cflags: -I${includedir}
+ 
+-- 
+2.29.2
+
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild
index cdca9496e2a7..7a0fa12561ed 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.154.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 arm arm64 ~ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild
index affad9ddf648..1fb27663e902 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.141-r1.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.162-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_PN=Vulkan-Loader
 CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit flag-o-matic cmake-multilib python-any-r1 toolchain-funcs
 
 if [[ ${PV} == *9999* ]]; then
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
@@ -27,7 +27,7 @@ IUSE="layers wayland X"
 
 BDEPEND=">=dev-util/cmake-3.10.2"
 DEPEND="${PYTHON_DEPS}
-	~dev-util/vulkan-headers-1.2.143
+	~dev-util/vulkan-headers-${PV}
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
 		x11-libs/libX11:=[${MULTILIB_USEDEP}]
@@ -36,6 +36,8 @@ DEPEND="${PYTHON_DEPS}
 "
 PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
 
+PATCHES=( "${FILESDIR}/${PN}-${PV}-Fix-pkgconfig.patch" )
+
 multilib_src_configure() {
 	# Integrated clang assembler doesn't work with x86 - Bug #698164
 	if tc-is-clang && [[ ${ABI} == x86 ]]; then
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index bb006a7a4f3a..05922ef1a74f 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_PN=Vulkan-Loader
 CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit flag-o-matic cmake-multilib python-any-r1 toolchain-funcs
 
 if [[ ${PV} == *9999* ]]; then