gentoo resync : 15.12.2019

4 files changed, 8 insertions, 59 deletions

diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index 9b5d4fa59757..3bc2a4501a97 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -1,6 +1,4 @@
-DIST libplacebo-v1.18.0.tar.gz 322963 BLAKE2B 640accaa64b1a5abdcc60f89c1b80ccc880ed060799a48cb9d41c7b891648913b05d06c62fa6dd21ccce07ac61b7c89e1702ac26013c596dc4a4d71c7b10721f SHA512 a2ca4a8b2bf9e5242c39c704e579575ccbfd0a7dadc4f73fe1994abb6e3f132d19f6d95415704a62e285e3f94e7b0ab8aeed14b4fce466df1ba34952f7127686
 DIST libplacebo-v1.21.0.tar.gz 326918 BLAKE2B fe9500de23487d7d5dfc51d9f94dd3d33d22bdac3005fc3334814c53a76a46cebd40655675b5172f058d02dd865385a993b3c52a863b9e9b32ac0bc4801e0126 SHA512 5de95b8cc48ba4ec9bc3afb8c8f2c4fae0d53ce6e69ffb53884c3a3ee2580998bae46b8934e462740b6c9c2e66e3c5d5f009f9b0f8ad2cb7b4fba829891cf333
-EBUILD libplacebo-1.18.0.ebuild 1293 BLAKE2B b828eb4507eb436162fcfd64ed3a5f57674536d22f60336087ab94e99855f7d0554499cba67299aee32a7b98c160d84623d2cd5b32965c2fa6022e041cd01492 SHA512 4271adfb5341966ec1c37a9abbb8be3e599d2e21414b270572e1608174d3db07480be443cc3bc5f2943b37edceec0180a8e29114c877f2d0ba84b2c92788b8f4
-EBUILD libplacebo-1.21.0.ebuild 1293 BLAKE2B b828eb4507eb436162fcfd64ed3a5f57674536d22f60336087ab94e99855f7d0554499cba67299aee32a7b98c160d84623d2cd5b32965c2fa6022e041cd01492 SHA512 4271adfb5341966ec1c37a9abbb8be3e599d2e21414b270572e1608174d3db07480be443cc3bc5f2943b37edceec0180a8e29114c877f2d0ba84b2c92788b8f4
-EBUILD libplacebo-9999.ebuild 1288 BLAKE2B 283c89aeebb758473d5c9db5d84e774e6962a80b0cc625c08d3d0b4a07a459bc415c291e541b2cea07510268661336667f2a37cb6710f12e9d78d564e7a4746e SHA512 ed38e53a0d8f7ae09aa543f8a600047958f0cd1c716e75352c2a7e12a1db83db30e3687fc669c2df357b0a26f2c241bd9f756ed02aea614bc4e9c654e40d44a4
+EBUILD libplacebo-1.21.0-r1.ebuild 1315 BLAKE2B 6f07c094d183b1e7a001ef98e109625d7efcd3b3effbe635a848fa179641022e946cfcf27d986f79dde07e9881f4cfae26a6810b2b1ab5faaf7332999ce99266 SHA512 2d7a8ffd725a7d77021bf0728caab1b2c2b6586f9104615022d7c9f3ebbd0e77d6e81cbdfbbaadba4427f4f075e68bb64f83c284fb1e1d99f27b60063a8f3e76
+EBUILD libplacebo-9999.ebuild 1310 BLAKE2B 9a3c9efe511c8e2503432691a7cd0cdf20934954ed46a56e98b0d34ed8894796210c0a47c28d457555d931278d0012fe075aa0c9d46a5bcb8f86c396ae9c23c7 SHA512 ef9b721876b4dcc3c721e41f8c9ea4f2249c280851d143e05fade381f08663c7e061c23853d3f01a2959d940d2ba07c36896992b72adc049ab1571c0d63c7147
 MISC metadata.xml 807 BLAKE2B f04df70a40523ad668bfa7dda7c841ce098f2105d2bc94ab6291bb194bf1fec18445b779952db33614d685ee0964c7ac6b7666b3d8cf89f8bd9391b1ccd2c553 SHA512 48d5e93ca7e964d80dc579789c6f626f9590d102b451c4f0fced538aed1301e0cb7f93fce4d03deaddb72dcad22489aa3846d8fa8ac443fcdbc4fcb90ef19040
diff --git a/media-libs/libplacebo/libplacebo-1.18.0.ebuild b/media-libs/libplacebo/libplacebo-1.21.0-r1.ebuild
index ab132357b85c..04411d8db985 100644
--- a/media-libs/libplacebo/libplacebo-1.18.0.ebuild
+++ b/media-libs/libplacebo/libplacebo-1.21.0-r1.ebuild
@@ -22,13 +22,15 @@ SLOT="0"
 IUSE="glslang lcms +shaderc test +vulkan"
 REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
 
-RDEPEND="glslang? ( <dev-util/glslang-7.10[${MULTILIB_USEDEP}] )
+RDEPEND="glslang? ( dev-util/glslang[${MULTILIB_USEDEP}] )
 	lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )
 	shaderc? ( >=media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] )
 	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+RESTRICT="!test? ( test )"
+
 multilib_src_configure() {
 	local emesonargs=(
 		$(meson_feature glslang)
diff --git a/media-libs/libplacebo/libplacebo-1.21.0.ebuild b/media-libs/libplacebo/libplacebo-1.21.0.ebuild
deleted file mode 100644
index ab132357b85c..000000000000
--- a/media-libs/libplacebo/libplacebo-1.21.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz"
-	S="${WORKDIR}/${PN}-v${PV}"
-fi
-
-inherit meson multilib-minimal
-
-DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
-HOMEPAGE="https://github.com/haasn/libplacebo"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="glslang lcms +shaderc test +vulkan"
-REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
-
-RDEPEND="glslang? ( <dev-util/glslang-7.10[${MULTILIB_USEDEP}] )
-	lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )
-	shaderc? ( >=media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] )
-	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_feature glslang)
-		$(meson_feature lcms)
-		$(meson_feature shaderc)
-		$(meson_feature vulkan)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/media-libs/libplacebo/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild
index eda8818f5919..1b5d610f2596 100644
--- a/media-libs/libplacebo/libplacebo-9999.ebuild
+++ b/media-libs/libplacebo/libplacebo-9999.ebuild
@@ -22,13 +22,15 @@ SLOT="0"
 IUSE="glslang lcms +shaderc test +vulkan"
 REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
 
-RDEPEND="glslang? ( <dev-util/glslang-7.10[${MULTILIB_USEDEP}] )
+RDEPEND="glslang? ( dev-util/glslang[${MULTILIB_USEDEP}] )
 	lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )
 	shaderc? ( >=media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] )
 	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+RESTRICT="!test? ( test )"
+
 multilib_src_configure() {
 	local emesonargs=(
 		$(meson_feature glslang)