gentoo resync : 10.02.2020

4 files changed, 74 insertions, 17 deletions

diff --git a/media-video/openshot/Manifest b/media-video/openshot/Manifest
index de68763705e3..798444f57b50 100644
--- a/media-video/openshot/Manifest
+++ b/media-video/openshot/Manifest
@@ -1,5 +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-qt-2.4.0.tar.gz 60710408 BLAKE2B 33c8abe7ba3122ae720163d6ab91d367ee282b94d3d8986fdccf4f9efae832f54af7f946472c781a17f7e54083028762952d02d7139e6815cd0d44e80515c728 SHA512 95778effa5b02a467c44741384b0f43bf90343d4f450d5fcc2319ff1c3bee212338435dd8c781e0ff111a704aacdce3dbfb6bdcf62afa1f59bbb0668b58074ca
-EBUILD openshot-2.4.0-r1.ebuild 1271 BLAKE2B 7cdf661ce20add5534d4b56dc3f0480c49a8867c87f435dabe2cf2a4250c6bfc205c6212d40aef0e896ce2d53d3e99906ff20dc1c05ed902bc0b5f2c736b6a5d SHA512 44debba712fb7d542989ee48262f73684f899dc8a92a67563c27754b197c3bbd51e49e5d95d85ee031db5d6b165120bbaf9c1fe581774155deb3266f45b3f097
-EBUILD openshot-2.4.4.ebuild 1206 BLAKE2B 2b56cc68d695cc6e7b3bb482e2b13d5bfe7abcfc8c7091fce0712881f2136b847b43010980bdd38d8b355bbf7183216c44c8dabea480e97d965ce67173cd5d01 SHA512 37bfc6c50c940fb2f8cc75d34074242478bfa6f5ab5dc4ac3b23772499923bdc93e04dd5682c7a5122d89f244a1bac2f9446db74c17df4a6c5629baa9e138164
+EBUILD openshot-2.4.0-r1.ebuild 1283 BLAKE2B 1ca81c34d0d99593719c65c38ec59df75df5ba937ab6f62482a885068f36c5cdebde2bc351d97ab873cdcd87cb7eef6fb5303868ce687ee81526c4030da47f40 SHA512 5a86460edd21308837e2172cbbaa4cc2a02f567982de61b287a294db1d22457598a77113e4ce5f284900c8788703b643075d82885bfefdcad1ead65016fbe1e0
+EBUILD openshot-2.4.4-r1.ebuild 1265 BLAKE2B 1a8dc1f69f0b7c357b10bde0a6d49b3a0731798fd714bbfe0202838d19b74de9144db6e2f0c2efd4f3d1027bc6a3aad9c36bf4df0ad5973d8a5e6497fd7aeb27 SHA512 e4d50ed1ed5ca1d417f5aa3e9951e3c107d66b03acef17040007aa2c0985ae9bea16b2e877e23b68e9d084975c76e8c40b78b083206aad3e69296a1cac2444bc
+EBUILD openshot-2.5.0.ebuild 1238 BLAKE2B 3b0d72a809439def72602de855d7a31efb10a6b94196014b0207b54bf115e1064528351d43fee4fab266ba5aef05bfffe671dc2946df1d8c8d2dc771d49f2408 SHA512 6d1e743de1520665bcec187d981f3c4fa27fae6c969308a9532f2f07b2a091d42b529d844bd96f7940e8ec9e40cde686bde0f7c42e335306299cfbf90841abd7
 MISC metadata.xml 636 BLAKE2B 08e8c695bf15de910bb90ebe5fef7b6883ce1fac03eb6c7de660d280cb402c5a70befd6e99dc281aa76098322439e2c4bff48e63ade946fa390dfe5f1ccbe156 SHA512 1b736005e9564431798291c83f1ccba5de2b03ba18b41a0fe400e2b2b58020fb0863e6aad2c348191f5903f288ed4fef1cef1e7615bbc3e97f2deb35633b5bd4
diff --git a/media-video/openshot/openshot-2.4.0-r1.ebuild b/media-video/openshot/openshot-2.4.0-r1.ebuild
index cbde49448910..e426ccbfaa58 100644
--- a/media-video/openshot/openshot-2.4.0-r1.ebuild
+++ b/media-video/openshot/openshot-2.4.0-r1.ebuild
@@ -21,14 +21,13 @@ SLOT="1"
 KEYWORDS="amd64 x86"
 
 RDEPEND="
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},svg,webkit]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=media-libs/libopenshot-0.1.8[python,${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/httplib2[${PYTHON_MULTI_USEDEP}]
+		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},svg,webkit]
+		dev-python/pyzmq[${PYTHON_MULTI_USEDEP}]
+		dev-python/requests[${PYTHON_MULTI_USEDEP}]
+	')
+	>=media-libs/libopenshot-0.1.8[python,${PYTHON_SINGLE_USEDEP}]
 "
 
 S="${WORKDIR}"
diff --git a/media-video/openshot/openshot-2.4.4.ebuild b/media-video/openshot/openshot-2.4.4-r1.ebuild
index 954d0061c562..cf2c948c325c 100644
--- a/media-video/openshot/openshot-2.4.4.ebuild
+++ b/media-video/openshot/openshot-2.4.4-r1.ebuild
@@ -21,15 +21,18 @@ KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="
-	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.3[python,${PYTHON_USEDEP}]
+	$(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.3[python,${PYTHON_SINGLE_USEDEP}]
 "
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	$(python_gen_cond_dep '
+		doc? ( dev-python/sphinx[${PYTHON_MULTI_USEDEP}] )
+	')
 "
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-video/openshot/openshot-2.5.0.ebuild b/media-video/openshot/openshot-2.5.0.ebuild
new file mode 100644
index 000000000000..3d62b7ccd98f
--- /dev/null
+++ b/media-video/openshot/openshot-2.5.0.ebuild
@@ -0,0 +1,53 @@
+# 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
+}