gentoo resync : 16.01.2021

3 files changed, 3 insertions, 34 deletions

diff --git a/media-libs/ctl/Manifest b/media-libs/ctl/Manifest
index dad24afefd57..7e28ff49f560 100644
--- a/media-libs/ctl/Manifest
+++ b/media-libs/ctl/Manifest
@@ -4,6 +4,5 @@ AUX ctl-1.5.2-fix-unit-tests.patch 1863 BLAKE2B 7fab88b476d9e5468d4195e8dc3f9c9c
 AUX ctl-1.5.2-install-dpx-library.patch 565 BLAKE2B 234ba1ca74575a0babcf080c74052ce433a7698afa86b4991d67fe29c51c2eb42ad8a2748a5c1187c6c865e1860695d11736da788f41be919334bd119456a66c SHA512 bcf3ee6e44193436f1e70f0fef739dee74f83d814cfac1ad7b652a908934f73bc9f00f83ed4327e82d917f8579b9b476416e68e523a747ba9e5bbf8bc82d0bec
 AUX ctl-1.5.2-openexr-2.3.patch 455 BLAKE2B b42032d28612bef6f6a3beeda67c6b6a20fb4b99527003acd6a97eceec8286e073b3c6594c92ae99ad559c9d520b9d94fe93ea783e9d6021d81f66b258c3e2f1 SHA512 0e97065c78c6ef5c2a8f657c6c41031f66379483aaf2754f612d69261932a7f6ee1ccd01c5c0b1b450e511aa758a640cacf55629651d5974a92c519f4ff3a25a
 DIST ctl-1.5.2.tar.gz 1411871 BLAKE2B 223740aa8b68630f449b65e17470c76b2825a77eead040724b65e9e69752a696f642ae6755116046e188305a7d043c4def7cb8a773ad08d51fba35e9273b3a71 SHA512 c92af23e897f30f96ecb27b4b865e2fe1a1e33c8616797fc18f68e7fcc89210ce8ae70a003169b2f449bfd5f90d192734f1e8038b1d3e03c5f48c81587c871c6
-EBUILD ctl-1.5.2-r1.ebuild 691 BLAKE2B 144763f1cf205cd8a4414aaf06e17623b34dcf873bb9d9937c28ee87b8386b484d24be6b0fcfe675eab228ec7e78d388965328e082f67730b422b9710cc2a1f6 SHA512 3cf53a0b342f137fcb1a5911a622b8c4fe24c26cf3e81d5a5e0ee9f1168ab2f6824a8a056b9a902b9df05fbcd48b00528fa98b6b17dc34921d4b83bbf9486566
-EBUILD ctl-1.5.2-r2.ebuild 955 BLAKE2B 47a39c747919d9cf5bb06b7930520f9309cf8740430258875d7e50171e09c88306a35dee5d04ca18553fb621ef88445588f9922f5a233270eab89f72746396de SHA512 b54730ff744e871f7c806af273f1321b5e0daf0ca80f4d541ace12758be6354a5052ba99b8b388761bb7930799f18dc6e9c9a9637d5fa38cc911d974ce718be4
+EBUILD ctl-1.5.2-r2.ebuild 957 BLAKE2B af2a6023003be840969e8ed0c79bd65894070c1bb97629ccae4ffda5fd6eed603702ff8ae7fec3a3db669efea4559bcfb4b5f1994f1a4fe558626a9bd5cdf662 SHA512 76bf296a962ac0c8918a78b1f0d0fd4b7e592d579ba5d97d4b240f2b0451c224b3e9a07de6d4dd90d8efbff9a558beff1d3687112c8a172dcdc09139c124b010
 MISC metadata.xml 298 BLAKE2B 6e4266628d090b71081fd7756e6e725250f41a8a670fa745eef96503c01915a93d41e82b84bca8f81b173b846f5437a40a1974491cb261adeb3e692e4750a40c SHA512 318801a89aef840e0aa9e823bc50bad3c95aa4f993a2a67097fe1ebe397d3702ad18165074e7887c090921f2e3330965b45114375ddb1ac60b40161a8acda8de
diff --git a/media-libs/ctl/ctl-1.5.2-r1.ebuild b/media-libs/ctl/ctl-1.5.2-r1.ebuild
deleted file mode 100644
index 7562ed9c901c..000000000000
--- a/media-libs/ctl/ctl-1.5.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="AMPAS' Color Transformation Language"
-HOMEPAGE="https://github.com/ampas/CTL"
-SRC_URI="https://github.com/ampas/CTL/archive/${P}.tar.gz"
-
-LICENSE="AMPAS"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc64 x86"
-
-RDEPEND="media-libs/ilmbase:=
-	media-libs/openexr:=
-	media-libs/tiff:=
-	!media-libs/openexr_ctl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/CTL-ctl-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch"
-	"${FILESDIR}/${P}-openexr-2.3.patch"
-)
-
-mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" )
diff --git a/media-libs/ctl/ctl-1.5.2-r2.ebuild b/media-libs/ctl/ctl-1.5.2-r2.ebuild
index 45d613f9e712..f545786ec060 100644
--- a/media-libs/ctl/ctl-1.5.2-r2.ebuild
+++ b/media-libs/ctl/ctl-1.5.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,7 +35,7 @@ PATCHES=(
 mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" )
 
 src_test() {
-	pushd ${BUILD_DIR} >/dev/null || die
+	pushd "${BUILD_DIR}" >/dev/null || die
 	eninja check
 	popd >/dev/null || die
 }