gentoo resync : 08.01.2021

3 files changed, 4 insertions, 59 deletions

diff --git a/media-video/openshot/Manifest b/media-video/openshot/Manifest
index eabe046d573b..8874dceedc18 100644
--- a/media-video/openshot/Manifest
+++ b/media-video/openshot/Manifest
@@ -1,9 +1,7 @@
 DIST openshot-2.4.4.tar.gz 63065376 BLAKE2B 2ee00f24d699d5935a182c394821f215a27ba2701d493f51299c19cf99452ca4df2e5b86f7a6e5734e6194e39e5b7995eb94be168c0e9f7bc7a3b78206277304 SHA512 efa71f97a83b89e691b7dab09288ba7d3e91eb25119669fa8f6e28becb8d4cb3e60a923f936ee4ff9a593d016fe3a6b0348153cff937ab7d21a5517de5dfa10c
-DIST openshot-2.5.0.tar.gz 60153193 BLAKE2B cdc79c68be7cd5b9e2714c98c4edbb5fc9ec349283da8439e9f9e26b2341688e2b8ae0f108413f59582d6e447faeb96d1da6916503299ca40939d73f5983377f SHA512 0944bff48c8957a4a3c5a37428b4d3e45e8ad6e1664812ea90b7c16d014a3c355daf2fe183ce855586114ccfa36c419b6baacc42c4bf871de29bda4c24f2a814
 DIST openshot-2.5.1.tar.gz 60217543 BLAKE2B 3f195b14a9fb004e845c731be64138c20da84ac0c90db43b547ee9ea059d32f85ada04aa0462b755a7ea5c3d3b30088fab35414147dded55deb9d5eab5926d2d SHA512 8254a45254bbe523b6485b9598022de2c46ec30818e606ac4665790d29486693c4efe9f5bc55ee43d6342de6782cf0090e4bc880e831c08e3b1218bca555af14
-DIST openshot-2.5.1_p20201203.tar.gz 64708017 BLAKE2B b95834b8b75460b60a54b2c1efab1752424c291f5e16fefd33671f7ea9eb9c29d48047a18287a9cf2837c21e3c1ea9a7217fcbdc27440bacc04ff6f8da6202a2 SHA512 668c3155489d469042220e059cb0fc4de50b4d949c28d4ae6e8ef9b6ccdd3235dd4912b5163ae4126758621052d4b40f21aa40c6e1682776a71076f0c45cbcdc
+DIST openshot-2.5.1_p20201227.tar.gz 64708834 BLAKE2B 7b8742eae1865fe510d1690eb1df907ba4e5079093af075308a17304ea184976df064b6065fab6ef2394efbad2e0042174145ea9cd7213e6d8993bf30a865c81 SHA512 3688bee7a7febfbb12351e0bcceb9831c778bec3ae441cc9b10fc01e695747cf20912ceee54a275a956c443aaf1c4fcb0cd6b54f10474e6e95d025685d0bd4bd
 EBUILD openshot-2.4.4-r1.ebuild 1265 BLAKE2B 1a8dc1f69f0b7c357b10bde0a6d49b3a0731798fd714bbfe0202838d19b74de9144db6e2f0c2efd4f3d1027bc6a3aad9c36bf4df0ad5973d8a5e6497fd7aeb27 SHA512 e4d50ed1ed5ca1d417f5aa3e9951e3c107d66b03acef17040007aa2c0985ae9bea16b2e877e23b68e9d084975c76e8c40b78b083206aad3e69296a1cac2444bc
-EBUILD openshot-2.5.0.ebuild 1238 BLAKE2B 3b0d72a809439def72602de855d7a31efb10a6b94196014b0207b54bf115e1064528351d43fee4fab266ba5aef05bfffe671dc2946df1d8c8d2dc771d49f2408 SHA512 6d1e743de1520665bcec187d981f3c4fa27fae6c969308a9532f2f07b2a091d42b529d844bd96f7940e8ec9e40cde686bde0f7c42e335306299cfbf90841abd7
 EBUILD openshot-2.5.1.ebuild 1243 BLAKE2B 471a504e9592f9524192cd87231ea96db33bf19910905394d681aedb0735aa99f0dccbb7877c209de56e341b1cdb63c4affa2d18b1af9c58dea6387c61e76641 SHA512 a1dff240e62fedd8d0e2785c9c1d217c66b04cc177f80bcbd56931d2bb8393776f22c8d5333abe5c8b13a8e6af21a0a2b568b37dec856f1e2d1012a5a26fc3db
-EBUILD openshot-2.5.1_p20201203.ebuild 1339 BLAKE2B a26d66d6761090f48936b73cbae5e4522b9390c80b7587e70b2d54dfaa5e0f9a770aed8c9b42a1c5d2718ddf20d67fe2ef766f4ae1b8a4b3963ebf33f8965e81 SHA512 0b846c7eac6c9a60852325a823f5dde200c41524fcff81a2084abe8d80b4098aff16c2944e7d98fa8925e42cb5af3b4689a97da725b0107efe65cb64b9173ec3
+EBUILD openshot-2.5.1_p20201227.ebuild 1339 BLAKE2B 0ddce84d24aa28af941e2a46bafb9e98c541c2018d35ad6fafc518593e5720cacb2bb495ea89cba673de3a89101ec0677326fd1e7834d46927c124d851e9673e SHA512 ded4a55c639ad039a18c7dcf7a6a5c36889b7c1acb398da4da63ebc9ca827ab684946cb7191d56f6c84f4dd46a458b61692b0f0d02d3d45b0e344192b2e0b31b
 MISC metadata.xml 520 BLAKE2B 78c1c2c7058fe041a5aa1e783622529dd897a609ce801d718466c7d14b9b5ccd05ba496f468f9100301f20ccfa04c3824aed975f39f7febce487b87bddce9282 SHA512 3d2227d47b72451b5b600384ef70b3085a8e46cba1f076d05c558b69ef50d18084dd31d2f14323237c1500842ddea664bcc78a68de9f9d5d472f44ab90a6c325
diff --git a/media-video/openshot/openshot-2.5.0.ebuild b/media-video/openshot/openshot-2.5.0.ebuild
deleted file mode 100644
index 3d62b7ccd98f..000000000000
--- a/media-video/openshot/openshot-2.5.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE=xml
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1 xdg
-
-MY_PN="${PN}-qt"
-
-DESCRIPTION="An award-winning free and open-source video editor"
-HOMEPAGE="https://www.openshot.org/"
-SRC_URI="https://github.com/OpenShot/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
-		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},gui,svg,webkit,widgets]
-		dev-python/pyzmq[${PYTHON_MULTI_USEDEP}]
-		dev-python/requests[${PYTHON_MULTI_USEDEP}]
-	')
-	>=media-libs/libopenshot-0.2.4[python,${PYTHON_SINGLE_USEDEP}]
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		doc? ( dev-python/sphinx[${PYTHON_MULTI_USEDEP}] )
-	')
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	distutils-r1_python_prepare_all
-	# prevent setup.py from trying to update MIME databases
-	sed -i 's/^ROOT =.*/ROOT = False/' setup.py || die
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/media-video/openshot/openshot-2.5.1_p20201203.ebuild b/media-video/openshot/openshot-2.5.1_p20201227.ebuild
index 53484ce02495..97eb2a8c185e 100644
--- a/media-video/openshot/openshot-2.5.1_p20201203.ebuild
+++ b/media-video/openshot/openshot-2.5.1_p20201227.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE=xml
 DISTUTILS_SINGLE_IMPL=1
 
-COMMIT=8c3d90cca72e2051b1b74dc0d731824ed5edf0de
+COMMIT=5056d240c5dff1a9191ca2e0f7a8813c57b5b5ca
 MY_PN="${PN}-qt"
 inherit distutils-r1 xdg