gentoo (valentine's day) resync : 14.02.2021

3 files changed, 73 insertions, 11 deletions

diff --git a/media-video/shotcut/Manifest b/media-video/shotcut/Manifest
index 9a5ec3191e78..671d8e1ee4ad 100644
--- a/media-video/shotcut/Manifest
+++ b/media-video/shotcut/Manifest
@@ -1,5 +1,6 @@
-DIST shotcut-20.10.31.tar.gz 5735908 BLAKE2B 04b9bada177216c81950a551a9dc06624efe7fd50df9cc12cbe1b358436721700d7ecd49a89c48988ce33eee8a8bcdb9c58ccf74775ee2e2828090e53567ade0 SHA512 4d0109e87c86e3b7bb20aeb4b9a38fac175f90f00b8b13b605af9f5959578a2329da5a91d96891c814a84e7f23501ee5d3be9d2ca7a4bdd1a70af9894f0f7348
 DIST shotcut-20.11.28.tar.gz 5781716 BLAKE2B 28f678a9c166c2e7e9abba3e61722cffb54ee62302e85ba494d075e0f8634dd7f2b4d88b992d7d8bde0618ac21bd6e983a33ea9b874e83746904ecbcf32cdae4 SHA512 fd4b9e2e7a5e93920980d4023d1e9803d6ce4de1d962548a7a3ad5cf815ea0e9e29c4645fec7f0db90ac8581a6ea3e92f2a3e34faf03f8991c303c371285ae7c
-EBUILD shotcut-20.10.31.ebuild 1211 BLAKE2B ccf0bd78f85110e3fc43c6ea9f9e9874a36073708fdece10f42d23731c82069d0ff32e90d7d03daa13c0e2cc20ba5b2d588c4a9a513a2552c228bdd53ed6d43a SHA512 c2ec4fc061586f4c795fe0a472e994006f37449702bcb05dd2dbdec6cb8c0d465e1b72b458ea2f67b0a37589130c316b0f675c59587cd6a8d783c079bbfd8f53
+DIST shotcut-21.01.29.tar.gz 4094623 BLAKE2B 7f0642ffaf342061d2ebb2882b412f57fb70dac01387855872d23cf1ac9a93e4569de45d5e26db2990e7deedd677eaf227cbfe1ffcfc1aac0deb6f9a9c36c7ed SHA512 fc47110771a0f891a3cf43a9730121a7b2f687d762ecc6df18907094830e9e89110174b3e3df391f58d9d1ab12c850fd822b85652bd20c02707b02304104dc55
 EBUILD shotcut-20.11.28.ebuild 1238 BLAKE2B 37a8db2c7de91c3dca60ab335f49ba5919228ae8687cd3862b211bac52550dbcc7a6bfabaaccd88fe5d8bde4b07dea239369f08166ea503e8ca242206650234c SHA512 96aa7c74e48de76b24e9c6a7720faafb071a17963e4965ffcf5657b4d14d95a7d102ce79071286da2fbdbfd499a132751008dd908f991dc36b9fcefefc179665
+EBUILD shotcut-21.01.29.ebuild 1290 BLAKE2B 5daf5459f217c9a3652ec9c702b6d540cbb604bcb8773a238ccd631a543cb2a677d2da381ec61bfa1d5fbeccc42d8a21a50d0efba6d1e981008b485e5fb0d8c0 SHA512 01e9d0d26c6a167da0e44a98eb33cb6b9b4232230f9dbb6f2b021ee34d6f67aa54abe80703ab65d86e730ab37f27c9c2a32758173504b0b9de37f8eee077d211
+EBUILD shotcut-9999.ebuild 1290 BLAKE2B 5daf5459f217c9a3652ec9c702b6d540cbb604bcb8773a238ccd631a543cb2a677d2da381ec61bfa1d5fbeccc42d8a21a50d0efba6d1e981008b485e5fb0d8c0 SHA512 01e9d0d26c6a167da0e44a98eb33cb6b9b4232230f9dbb6f2b021ee34d6f67aa54abe80703ab65d86e730ab37f27c9c2a32758173504b0b9de37f8eee077d211
 MISC metadata.xml 450 BLAKE2B 979a125701ee0da3a2ead50518500e32a7d4bbd78f42069b268aedd5d1c933f2a10022d63b98e2f135a2e3156a6019d4b82da62394ebd8724d55001b7d470e8a SHA512 c742013bd49807786261384f73d9350962affba6d914a6dcb1542376b760fc7cfbb847ce38b281fde1b67ea3db3d299db235c7f9716b20426329c971a485e7c3
diff --git a/media-video/shotcut/shotcut-20.10.31.ebuild b/media-video/shotcut/shotcut-21.01.29.ebuild
index ee415787b81a..598b4f6b6561 100644
--- a/media-video/shotcut/shotcut-20.10.31.ebuild
+++ b/media-video/shotcut/shotcut-21.01.29.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,11 +7,16 @@ inherit qmake-utils xdg
 
 DESCRIPTION="A free, open source, cross-platform video editor"
 HOMEPAGE="https://www.shotcut.org/ https://github.com/mltframework/shotcut/"
-SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+if [[ ${PV} != 9999* ]] ; then
+	SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mltframework/shotcut/"
+fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
@@ -24,11 +29,12 @@ COMMON_DEPEND="
 	dev-qt/qtnetwork:5
 	dev-qt/qtopengl:5
 	dev-qt/qtprintsupport:5
+	dev-qt/qtquickcontrols2:5
 	dev-qt/qtsql:5
 	dev-qt/qtwebsockets:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	>=media-libs/mlt-6.22.1[ffmpeg,frei0r,jack,melt(+),qt5,sdl,xml]
+	>=media-libs/mlt-6.22.1[ffmpeg,frei0r,fftw,jack,melt(+),opengl,qt5,sdl,xml]
 	media-video/ffmpeg
 "
 DEPEND="${COMMON_DEPEND}
@@ -41,11 +47,6 @@ RDEPEND="${COMMON_DEPEND}
 	virtual/jack
 "
 
-src_prepare() {
-	default
-	sed -i -e '/QT.*private/d' src/src.pro || die
-}
-
 src_configure() {
 	eqmake5 \
 		PREFIX="${EPREFIX}/usr" \
diff --git a/media-video/shotcut/shotcut-9999.ebuild b/media-video/shotcut/shotcut-9999.ebuild
new file mode 100644
index 000000000000..598b4f6b6561
--- /dev/null
+++ b/media-video/shotcut/shotcut-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils xdg
+
+DESCRIPTION="A free, open source, cross-platform video editor"
+HOMEPAGE="https://www.shotcut.org/ https://github.com/mltframework/shotcut/"
+if [[ ${PV} != 9999* ]] ; then
+	SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mltframework/shotcut/"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtquickcontrols2:5
+	dev-qt/qtsql:5
+	dev-qt/qtwebsockets:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	>=media-libs/mlt-6.22.1[ffmpeg,frei0r,fftw,jack,melt(+),opengl,qt5,sdl,xml]
+	media-video/ffmpeg
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qtconcurrent:5
+	dev-qt/qtx11extras:5
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-qt/qtgraphicaleffects:5
+	dev-qt/qtquickcontrols:5
+	virtual/jack
+"
+
+src_configure() {
+	eqmake5 \
+		PREFIX="${EPREFIX}/usr" \
+		SHOTCUT_VERSION="${PV}" \
+		DEFINES+=SHOTCUT_NOUPGRADE
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}