gentoo resync : 10.09.2021

3 files changed, 22 insertions, 75 deletions

diff --git a/media-video/openshot/Manifest b/media-video/openshot/Manifest
index f07c476a6214..30010a4118c3 100644
--- a/media-video/openshot/Manifest
+++ b/media-video/openshot/Manifest
@@ -1,5 +1,3 @@
-DIST openshot-2.5.1.tar.gz 60217543 BLAKE2B 3f195b14a9fb004e845c731be64138c20da84ac0c90db43b547ee9ea059d32f85ada04aa0462b755a7ea5c3d3b30088fab35414147dded55deb9d5eab5926d2d SHA512 8254a45254bbe523b6485b9598022de2c46ec30818e606ac4665790d29486693c4efe9f5bc55ee43d6342de6782cf0090e4bc880e831c08e3b1218bca555af14
-DIST openshot-2.5.1_p20210228.tar.gz 64780534 BLAKE2B c31bd2531df28ce9bed688fbc34dc383018024ffe9364699e45c08135f5c0692d97f601bc578ba07fd44e2f8f58f0b27c5bc10bb3af48c8cf0be17a45b966116 SHA512 b5ce39d31bc1b997d272b3817ccdcef4749126755e329a278700f6735a1484b0c2b917e04a5f1b9826ee0e5ea983a624be59af16bf79f038be44a29763cc68b5
-EBUILD openshot-2.5.1-r1.ebuild 1212 BLAKE2B 115cdee1e2387d7aef578e93aee8c14287bd586fcd5610caaa9b2d30dd7bcfe427d5e48d9b0a8c192f5478addba460ebe3be404a34bd49b951ab6e5638bc110b SHA512 4f959d3c043c62832fd78af6f69b619b49dfc2679a165ce08367567b262f52c20bc26185f00c3e5e89ac377af2a8c1f53b9e8d11c324ad0bb53ae0dec4e536d1
-EBUILD openshot-2.5.1_p20210228.ebuild 1297 BLAKE2B a73294a019877143fef1dd33c1aa15ad5571239954f60e9d249ff33e6ac0b0a18eea9cbb04bf1219be0cbd68a262a3fc4541cca5ae01fb019b57fd154c0766d3 SHA512 c75338d63a32d903ac6754de4f0557e90af0288b24638b10e70ddd17c42fb495e335f53d8e7cbee84d6059ce6f1f4263cf1b7e3a016309577eb875f11dbb3166
+DIST openshot-2.6.0.tar.gz 68096356 BLAKE2B e34ef6ee043565a895a110f867bbdbe4f49290d883224eec1c710f7b94186cea3a5083502b5c80d2dc02ddd61fc87d0ceacd397465892bd5e149b1846a2328ef SHA512 9e569f318672047e8251d00ce0bb80e4b295d5daba58c11a3e286b7daebf45b35a34d4ecc5a9d81891b0a68d75d813a78023ee984b8690a2d1217a8517239ee9
+EBUILD openshot-2.6.0.ebuild 1399 BLAKE2B ec7aac8b80aaa9204390d6f874044c46bc3e2a7cc1b85a377a083e580909993a0db0b49a7279b99f3ed9fab6ab996a0261ecbce3dfbc04f2bc6c264446df7134 SHA512 b8fad7214d387979a2959d0f54ea6acd60ce5136db8842f9ebaad36f36a0fdedad157b6a70ba69cbb5b084402811556f4161d7226d4ee2efcd6ff6dcba24ab89
 MISC metadata.xml 520 BLAKE2B 78c1c2c7058fe041a5aa1e783622529dd897a609ce801d718466c7d14b9b5ccd05ba496f468f9100301f20ccfa04c3824aed975f39f7febce487b87bddce9282 SHA512 3d2227d47b72451b5b600384ef70b3085a8e46cba1f076d05c558b69ef50d18084dd31d2f14323237c1500842ddea664bcc78a68de9f9d5d472f44ab90a6c325
diff --git a/media-video/openshot/openshot-2.5.1_p20210228.ebuild b/media-video/openshot/openshot-2.5.1_p20210228.ebuild
deleted file mode 100644
index 16b6035f8946..000000000000
--- a/media-video/openshot/openshot-2.5.1_p20210228.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE=xml
-DISTUTILS_SINGLE_IMPL=1
-
-COMMIT=146189dc050a9462f71a8b37e783aa52b73e4d9b
-MY_PN="${PN}-qt"
-inherit distutils-r1 xdg
-
-DESCRIPTION="Award-winning free and open-source video editor"
-HOMEPAGE="https://openshot.org/"
-SRC_URI="https://github.com/OpenShot/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${COMMIT}"
-
-LICENSE="GPL-3+"
-SLOT="1"
-# KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/PyQt5[${PYTHON_USEDEP},gui,svg,widgets]
-		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-		dev-python/pyzmq[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	')
-	>=media-libs/libopenshot-0.2.5:0=[python,${PYTHON_SINGLE_USEDEP}]
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	')
-"
-
-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-r1.ebuild b/media-video/openshot/openshot-2.6.0.ebuild
index 5bdad6fff912..9add97810814 100644
--- a/media-video/openshot/openshot-2.5.1-r1.ebuild
+++ b/media-video/openshot/openshot-2.6.0.ebuild
@@ -11,31 +11,28 @@ inherit distutils-r1 xdg
 
 MY_PN="${PN}-qt"
 
-DESCRIPTION="An award-winning free and open-source video editor"
-HOMEPAGE="https://www.openshot.org/"
+DESCRIPTION="Award-winning free and open-source video editor"
+HOMEPAGE="https://openshot.org/"
 SRC_URI="https://github.com/OpenShot/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="GPL-3+"
 SLOT="1"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		dev-python/PyQt5[${PYTHON_USEDEP},gui,svg,webkit(-),widgets]
-		dev-python/pyzmq[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	')
-	>=media-libs/libopenshot-0.2.5:0=[python,${PYTHON_SINGLE_USEDEP}]
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+RDEPEND="$(python_gen_cond_dep '
+		dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},gui,svg,widgets]
+		dev-python/PyQtWebEngine[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyzmq[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
 	')
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
+	>=media-libs/libopenshot-0.2.6:0=[python,${PYTHON_SINGLE_USEDEP}]"
+DEPEND=""
+BDEPEND="$(python_gen_cond_dep '
+		doc? ( dev-python/sphinx[${PYTHON_MULTI_USEDEP}] )
+	')"
 
 src_prepare() {
 	distutils-r1_python_prepare_all
@@ -51,3 +48,8 @@ python_install_all() {
 	use doc && local HTML_DOCS=( doc/_build/html/. )
 	distutils-r1_python_install_all
 }
+
+python_test() {
+	distutils_install_for_testing
+	"${EPYTHON}" src/tests/query_tests.py -v --platform minimal || die
+}