[gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-loader/

["Nick Sarnie" <sarnex@gentoo.org>]

commit:     6d227501bb5dd45bad6d260b2dcc020474a48830
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 18 00:11:33 2018 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Tue Sep 18 00:12:56 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d227501

media-libs/vulkan-loader: Drop old, update USE description

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 media-libs/vulkan-loader/Manifest                  |  1 -
 media-libs/vulkan-loader/metadata.xml              |  3 +-
 .../vulkan-loader/vulkan-loader-1.1.70.0-r1.ebuild | 65 ----------------------
 3 files changed, 1 insertion(+), 68 deletions(-)

diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 15b1d2558c0..b37d155550a 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,3 +1,2 @@
-DIST vulkan-loader-1.1.70.0.tar.gz 4107351 BLAKE2B 86859e74839a0a7c667476db62a1bc73d89f22e6bb951f2742bc6990ed498e9201bd17973e887f360b2eec610e29d547e79d5323ed74fd5618cb0fc75dbba063 SHA512 ae57e6890225b6e4607fde04a296a14bc54fd6b61b360b771bd24f00607dcb6fff06b3ec38a761173c92c90628a139f1424445e174c21adad4af6f445b91ed26
 DIST vulkan-loader-1.1.77.0.tar.gz 1512876 BLAKE2B bf5fbf3623f0ca2b2473d496edd23ce388313d7dbeb8e3f95549da5726a1ab25fcce673d5dd3df094d3abdd2c5ecc4a87759a80e7d05d7b34abf30ee325895f2 SHA512 95fe179c93df1ea36cee8123588b232433c988e9a5889a606e7adbc4192d6a4bc8809f9936cf11ae953090392d0c9e4265697b608adacc7eb7cf6479baf49f48
 DIST vulkan-loader-1.1.82.0.tar.gz 1342427 BLAKE2B 4b2c589e2c1edaa29e13e892cc839f2d7af5bbadf7dda3f50eca2543c1877af175e9640545b886ffe3e8b1c51373502ee272829ddb15c07629ea08ece697e5b9 SHA512 624e493454e622e29bc0de5fdf1c425691b3c98f317660847e95aee6bc42dafa0b4d8caa9de52e8f3229b7e743afa475485cd3affbdb295e16ba49d30d1eb19e

diff --git a/media-libs/vulkan-loader/metadata.xml b/media-libs/vulkan-loader/metadata.xml
index 5896567b6cb..6d56c31a9fe 100644
--- a/media-libs/vulkan-loader/metadata.xml
+++ b/media-libs/vulkan-loader/metadata.xml
@@ -9,7 +9,6 @@
 		<remote-id type="github">KhronosGroup/Vulkan-LoaderAndValidationLayers</remote-id>
 	</upstream>
 	<use>
-		<flag name="demos">Build vulkan demos and vulkaninfo</flag>
-		<flag name="layers">Build the vulkan layers</flag>
+		<flag name="layers">Include the vulkan layers</flag>
 	</use>
 </pkgmetadata>

diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.70.0-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.70.0-r1.ebuild
deleted file mode 100644
index 3f8fd8e41b3..00000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.1.70.0-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Vulkan-LoaderAndValidationLayers-sdk-${PV}"
-fi
-
-inherit python-any-r1 cmake-multilib
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="demos layers wayland X"
-REQUIRED_USE="demos? ( X )"
-
-RDEPEND=""
-DEPEND="${PYTHON_DEPS}
-	demos? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
-	layers? (
-			dev-util/glslang:=[${MULTILIB_USEDEP}]
-			>=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}]
-		)
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)"
-
-PATCHES=(
-		"${FILESDIR}/${P}-Dont-require-glslang-if-not-building-layers.patch"
-		"${FILESDIR}/${PN}-Fix-layers-install-directory.patch"
-		"${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch"
-	)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=True
-		-DBUILD_TESTS=False
-		-DBUILD_LAYERS=$(usex layers)
-		-DBUILD_DEMOS=$(usex demos)
-		-DBUILD_VKJSON=False
-		-DBUILD_LOADER=True
-		-DBUILD_WSI_MIR_SUPPORT=False
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake-utils_src_install
-}