media-video/vidcutter: 6.0.5 bump; deps adjusted; QA fixes; takeover.

Closes: https://bugs.gentoo.org/769398
Closes: https://bugs.gentoo.org/723378
Signed-off-by: Piotr Karbowski <slashbeast@gentoo.org>

4 files changed, 50 insertions, 3 deletions

diff --git a/media-video/vidcutter/Manifest b/media-video/vidcutter/Manifest
index c00289ae0a1e..b1fd4e1fb9ad 100644
--- a/media-video/vidcutter/Manifest
+++ b/media-video/vidcutter/Manifest
@@ -1 +1,2 @@
 DIST vidcutter-6.0.0.tar.gz 9877867 BLAKE2B 91f153222f37d452ed8af5c4f24e32790189f058b5cbb3c80f7805ed48b5e953bfeeb8be92f04e049384dc30f416d0ee603237b8a59a329b0bc0cd61bf0fdbe2 SHA512 9970d9918cca9a7681bc5ca8d8b5d16212cf3dad0f2bc3e9c6727340c340801696dcb7ff4e901c2c0a25b86e9cb165bb3f783c18b4a8fd5f4ddba8490a7fd7a0
+DIST vidcutter-6.0.5.tar.gz 9911435 BLAKE2B 2d901768064b7c3b7444289db84e8f8d6e179d915b04f870a6b397f0d905c6b4ecab0768d045a8c1aa43b3bf7bccb2dcd60e9c043595f2aaf857ce657ec997f8 SHA512 b4a0e0cc3132038e9216f05117768695ba30840f04251c60561b7555cde9064efcf12440c801c834c2160d5b5acad011dc31055d9547269a5689361c875bca80
diff --git a/media-video/vidcutter/metadata.xml b/media-video/vidcutter/metadata.xml
index a56d19341fbd..2f18a1a2d894 100644
--- a/media-video/vidcutter/metadata.xml
+++ b/media-video/vidcutter/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
+    <email>slashbeast@gentoo.org</email>
+    <name>Piotr Karbowski</name>
+  </maintainer>
+  <maintainer type="person">
     <email>zerochaos@gentoo.org</email>
     <name>Rick Farina</name>
   </maintainer>
diff --git a/media-video/vidcutter/vidcutter-6.0.5.ebuild b/media-video/vidcutter/vidcutter-6.0.5.ebuild
new file mode 100644
index 000000000000..95923c5ef0ae
--- /dev/null
+++ b/media-video/vidcutter/vidcutter-6.0.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1 xdg
+
+DESCRIPTION="FFmpeg-based simple video cutter & joiner with a modern PyQt5 GUI"
+HOMEPAGE="http://vidcutter.ozmartians.com https://github.com/ozmartian/vidcutter"
+
+if [[ ${PV} == 9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ozmartian/vidcutter"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ozmartian/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	>=media-video/mpv-0.25[libmpv]
+"
+RDEPEND="${DEPEND}
+	>=dev-python/PyQt5-5.7[dbus,multimedia,widgets,${PYTHON_USEDEP}]
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+	media-video/ffmpeg[X,encode]
+	media-video/mediainfo"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_install() {
+	distutils-r1_src_install
+	mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}"
+}
diff --git a/media-video/vidcutter/vidcutter-9999.ebuild b/media-video/vidcutter/vidcutter-9999.ebuild
index 399c8d2dceb2..95923c5ef0ae 100644
--- a/media-video/vidcutter/vidcutter-9999.ebuild
+++ b/media-video/vidcutter/vidcutter-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8} )
 
-inherit distutils-r1
+inherit distutils-r1 xdg
 
 DESCRIPTION="FFmpeg-based simple video cutter & joiner with a modern PyQt5 GUI"
 HOMEPAGE="http://vidcutter.ozmartians.com https://github.com/ozmartian/vidcutter"
@@ -27,7 +27,8 @@ DEPEND="
 	>=media-video/mpv-0.25[libmpv]
 "
 RDEPEND="${DEPEND}
-	>=dev-python/PyQt5-5.7[dbus,multimedia,${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.7[dbus,multimedia,widgets,${PYTHON_USEDEP}]
+	dev-python/pyopengl[${PYTHON_USEDEP}]
 	media-video/ffmpeg[X,encode]
 	media-video/mediainfo"
 BDEPEND="