gentoo resync : 13.06.2020

7 files changed, 78 insertions, 10 deletions

diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 9cfcfe52fabc..a8a5ef0a8bef 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -2,10 +2,12 @@ DIST vulkan-loader-1.1.125.tar.gz 1398802 BLAKE2B 7cf1f99f60b4b37bfad12580fc8809
 DIST vulkan-loader-1.2.133.tar.gz 1401215 BLAKE2B 4a52e2735ed584f96f563dd23761c25169158a12488f50267375cb85dec411fed61f3ac0f090d77a650e9d055e384562d4fd644571b20e45ff0c316547b88647 SHA512 ba486cd0b20d1936a8a7e97509bdaa5e1c42f024428d6f710af80152d55f486c76db072ae44add089ff20eef21a768073904236e6d29d46dd1475d77d26f9907
 DIST vulkan-loader-1.2.135.tar.gz 1405922 BLAKE2B 02d984f758da0c57fbabf18b042da73a2e44d8990e74da9959eddabfb6190732f72ffbe91ccad9c54daf76535ad1b5d7a24244db5e6a0a32a2f1be0ca9dae683 SHA512 cd0092761fed30c830872ee7d5b923996047ac5fcd4e3ba7f5e5f02f36c31a17f93a4acf2b2a5f42e3b956a9769427730b6974f745697a2c871e1582afec7284
 DIST vulkan-loader-1.2.137.tar.gz 1407611 BLAKE2B 32762198b4a71d14c9f487c28a728067a81c8607df2174688cbe3dc575fc5655e22ff7840b516d7dc5d1eaf291d098c26d927ebfa9c80e49e702735af98bca02 SHA512 8ada45a79fed7c99bb7b35d8d2f15a69086aca30a1175469a6a2be31a418828abd16d1695ce36c0df305a6d0395e65008115a82aede8b31313edd745314b4796
-EBUILD vulkan-loader-1.1.125-r1.ebuild 1801 BLAKE2B fd54a22c96c7a4e7c300d0e1c0a550fe0efef2be29fcaf5aa2b0c4f5488ea723e628b9e155bac6c95cac219bcd7b2ef176e44a7f0b7260f687f237314fca7509 SHA512 dfdb4a2b512e61e1d4aee6290d401e5081b53311452b0e265ac659c43fc84b7b443b71a80c95473658c85ce93d6924a2f3da0d40b086eedcd4eaf54c682a88ef
+DIST vulkan-loader-1.2.141.tar.gz 1410381 BLAKE2B a52c384cdda41083705008b0a00f820482d5f7cb16aeb347ebb1b0dfa55e1bc5851e60275728e0d73272a2c4335bbd5efe5aaaed21c0ac9cbd3d5fb76e73cc24 SHA512 251cc617693d651feba887a737ff724631160b172577cd3365d1a93e9c17ee87719d7aa78efa6570ee4f17fa15feb4e39bee1c706f7c12c6f96617348bdd8f26
+EBUILD vulkan-loader-1.1.125-r1.ebuild 1814 BLAKE2B 85c569e9dc7779940d6ce2d6fb1d56cc2d0bd21625f09dc172b1439e6919c40f6258b5c0a69666af5d4f966fc657db23696c5b29f978b994fbd621380c95d809 SHA512 70cdc83a57c0285f0a632e0f04b63274f48a8bd91e1c2aeea625f145014027973769c6d3acaabc6cab6846f169329812c6ec1ae8346f923c3696c96f9187a88e
 EBUILD vulkan-loader-1.1.125.ebuild 1800 BLAKE2B 16285fe9cd9fff1e3e2ff741fb6755aa383cf6519adef4fb9e9ab0ee093b3a0e73212d16c94c6e366ef34cbcaa6aa6394288b6a180a605e5998b80628129f00f SHA512 0f6f1e42cde2d1f53e32d4b217986fc1e50e8c5286d58891181392ff1b85c59f6d6556519e1b82fca00e43433b7b85054f76c8805fffd211af45acbd920e0f9c
-EBUILD vulkan-loader-1.2.133.ebuild 1697 BLAKE2B f4bf1eed24c38ce0021f600991c0ca54030ddf15be2e324c891b5c1b1f3aee3d66f5c3f6777a12af98a577f7e85da5b027cf1a02bb8b85686bd82729a897315b SHA512 ad844080c6a0d96dddabf970462248850d6c0aa4f97e0b88751fe537f8616d54e7f21619b55b0118c33103eecfafd39554bace0f2c37f539b56f01071b01637e
-EBUILD vulkan-loader-1.2.135.ebuild 1699 BLAKE2B f4ecffc6d5076ac5f2b14ab560710b64b72ad91b1f90222132cbb9caed631a30012de6969f990f8d121753e34c090558d09dd0ad860981ef144724ccbe3955c4 SHA512 f0968104aca0b72e3a12e5268518904fcf7c46c8def6549a3145becc5d76e0dbdbbb0321e2dcb47c73f27e5d7c2ab4805aab4036eeee67b1debb32f2694e7c15
-EBUILD vulkan-loader-1.2.137.ebuild 1699 BLAKE2B 17fd74e931fc376c6f10468990e647ba337fbdcd0ca7425be2b5668ae0b5ac364237abe0dcd5efa90ff859821f0dcb80a49098ada6ba7329454c44bd4920a907 SHA512 a5c8989d7365431805da588a317b5accca8f782fcb614b48c2717281ac520ba2749f627bd9a821f2346df08f943326949954fd8a21b4f14c0494127ffdca1650
-EBUILD vulkan-loader-9999.ebuild 1698 BLAKE2B 3632bd3bf1f2068c1a56c3aa4cb624713035d991a1ecab697fa2c72d98ce9edd2fcf6c6b485f887b21f12c439c47223224016f172b0321a7e9b0f0c1ff5d3e52 SHA512 2ead18fc2b3afece6e66147f8c7b0f43c2b2ba30963d678e4a1c5d8277f7861c0cd4d27d9707c68a02b1b228c76d13f0879a242d63fb1a7ca1bcd07371cfcd05
+EBUILD vulkan-loader-1.2.133.ebuild 1710 BLAKE2B 58d6114fdbc285b35423bd318cccd55e7a6bcddd682a2f7f8e622d1c38657991082bc1832c6c6edecff3101b9d85585ffcbe74e555b683751410b0a7c2ec9ccc SHA512 22c3909f1118270cf00f9a90d19bb5c89072a0da7691a91b53b0f1c20f853435c713022f69cbc83f3c8144dad13bb9e4bea5a5855b04a0153ea0a9e594451aa0
+EBUILD vulkan-loader-1.2.135.ebuild 1712 BLAKE2B aa4f8b37b669b257e1bfc7e61fbad75187ce6604c7a4b73f992255ce9de582bf9e06a04030638ffdd51e2b47bf1a77aa6ad245661d003d243481d7556a0d985c SHA512 6f327be621a3f90bc39b88a5d31eb32af3be0ee3609d8b71b810ef39fb0f7830ebdc75adb418ca43d8c46bcd91af2edff00b6e2ef3e56b7c8b29f2fa72038fb6
+EBUILD vulkan-loader-1.2.137.ebuild 1712 BLAKE2B 55ac967b74ec23b16cef99478681958964db6ee22c73ffe83b68c86f969e225ee31af58b842dd8e43508c1e7172808be44f066c74ab8827d9009aa1241610d9c SHA512 3e0fb63325d9d296190d45ad4311919787f4186854d641f81056d8f120a4f2de3696a11eb61a589e9da432ac6623c7ba0997486c58b47d1611d5e2c5711e9f45
+EBUILD vulkan-loader-1.2.141.ebuild 1712 BLAKE2B 499e5e98e4767791ddd389693ccf8a337cc3f520471fac0e88224d4b4e3d00679a36f32222e5cc6689be2125c177314580b7477c43adc91d312ae5d030ea606d SHA512 5c051c635ba1d300ef8000e6aa4daf264400019f17772c09179ce496dabf117e84e344c714a4eec2a19ea64237c7644d38a59adcc6c5c965cc6b5a3b95502d07
+EBUILD vulkan-loader-9999.ebuild 1711 BLAKE2B 8a7cfcd2603391ba298c407b8fc5eff6bc6364bd650ffa6e07637ccfad00aea16ea813c81d6855fa6b84049f59e8eca039967a1cf89d8a2ddaaaa1ed4e8153df SHA512 f561c79296a73545c3cbca97d1807e57549869c9bff4f81aaa017d8846a3b28cd85208f1956af8b51982896411aea2c7f94ff6b77f97026a7da2d77ac5ec092b
 MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.125-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.125-r1.ebuild
index 703cf7774d17..815cee75b5ab 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.1.125-r1.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.125-r1.ebuild
@@ -21,7 +21,7 @@ else
 	S="${WORKDIR}"/${MY_P}
 fi
 
-inherit toolchain-funcs python-any-r1 cmake-multilib
+inherit flag-o-matic toolchain-funcs python-any-r1 cmake-multilib
 
 DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
 HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild
index 33cdb2c53840..24139711b288 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.133.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN=Vulkan-Loader
 CMAKE_ECLASS="cmake"
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-multilib python-any-r1 toolchain-funcs
+inherit flag-o-matic cmake-multilib python-any-r1 toolchain-funcs
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild
index 45a674083b07..f82708238364 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.135.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN=Vulkan-Loader
 CMAKE_ECLASS="cmake"
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-multilib python-any-r1 toolchain-funcs
+inherit flag-o-matic cmake-multilib python-any-r1 toolchain-funcs
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild
index 0c346926f2c6..ad3f56422f29 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.137.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN=Vulkan-Loader
 CMAKE_ECLASS="cmake"
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-multilib python-any-r1 toolchain-funcs
+inherit flag-o-matic cmake-multilib python-any-r1 toolchain-funcs
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.141.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.141.ebuild
new file mode 100644
index 000000000000..9f43ba5ef134
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.141.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Loader
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit flag-o-matic cmake-multilib python-any-r1 toolchain-funcs
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+	S="${WORKDIR}"/${MY_PN}-${PV}
+fi
+
+DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="layers wayland X"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
+DEPEND="${PYTHON_DEPS}
+	~dev-util/vulkan-headers-1.2.143
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
+
+multilib_src_configure() {
+	# Integrated clang assembler doesn't work with x86 - Bug #698164
+	if tc-is-clang && [[ ${ABI} == x86 ]]; then
+		append-cflags -fno-integrated-as
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_TESTS=OFF
+		-DBUILD_LOADER=ON
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr"
+	)
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	keepdir /etc/vulkan/icd.d
+
+	cmake_src_install
+}
+
+pkg_postinst() {
+	einfo "USE=demos has been dropped as per upstream packaging"
+	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
+}
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index 60deb31aa071..f6e5a7abb270 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PN=Vulkan-Loader
 CMAKE_ECLASS="cmake"
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-multilib python-any-r1 toolchain-funcs
+inherit flag-o-matic cmake-multilib python-any-r1 toolchain-funcs
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"