Merge branch 'edge' into next

4 files changed, 2 insertions, 104 deletions

diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest
deleted file mode 100644
index 9a3f1c2f..00000000
--- a/media-video/simplescreenrecorder/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST simplescreenrecorder-0.3.11.tar.gz 1823944 BLAKE2B b7692ad158b4784f0222dd47227b85d33aae7eb416ed87d2eda1040027c910ec8d0ebe6a7e164e77cb9c3f6f2756e15fe97a7f05f45c92465473d2ae90e86b34 SHA512 5919774a00cd7015cd7db40561efaea43809b9465508b7770db9eb0fc87f338746e5cd4a79a0ab6c09e516257fa80184c3dcb5ab400c0ef2c0a8cf50ea2a073f
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11.ebuild
deleted file mode 100644
index bfbb3e23..00000000
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib flag-o-matic xdg-utils
-
-if [[ ${PV} = 9999 ]]; then
-	inherit git-r3
-fi
-
-DESCRIPTION="A Simple Screen Recorder"
-HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder"
-LICENSE="GPL-3"
-PKGNAME="ssr"
-if [[ ${PV} = 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/MaartenBaert/${PKGNAME}.git"
-	EGIT_BOOTSTRAP=""
-else
-	SRC_URI="https://github.com/MaartenBaert/${PKGNAME}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-	S="${WORKDIR}/${PKGNAME}-${PV}"
-fi
-
-SLOT="0"
-IUSE="+asm jack mp3 pulseaudio theora vorbis vpx x264"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib:0=
-	media-libs/mesa[${MULTILIB_USEDEP}]
-	|| (
-		media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
-		media-video/libav[vorbis?,vpx?,x264?,mp3?,theora?]
-	)
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext
-	x11-libs/libXfixes[${MULTILIB_USEDEP}]
-	virtual/glu[${MULTILIB_USEDEP}]
-	jack? ( virtual/jack )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if [[ ${ABI} == amd64 ]]; then
-		elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
-		elog "When added 32bit GLInject libraries are also included. This is"
-		elog "required if you want to use OpenGL recording on 32bit applications."
-		elog
-	fi
-
-	if { has_version media-video/ffmpeg[x264] || has_version media-video/libav[x264] ; } && has_version media-libs/x264[10bit] ; then
-		ewarn
-		ewarn "media-libs/x264 is currently built with 10bit useflag."
-		ewarn "This is known to prevent simplescreenrecorder from recording x264 videos"
-		ewarn "correctly. Please build media-libs/x264 without 10bit if you want to "
-		ewarn "record videos with x264."
-		ewarn
-	fi
-
-	# QT requires -fPIC. Compile fails otherwise.
-	# Recently removed from the default compile options upstream
-	# https://github.com/MaartenBaert/ssr/commit/25fe1743058f0d1f95f6fbb39014b6ac146b5180
-	append-flags -fPIC
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_32BIT_GLINJECT="$(usex abi_x86_32)"
-		-DENABLE_X86_ASM="$(usex asm)"
-		-DWITH_PULSEAUDIO="$(multilib_native_usex pulseaudio)"
-		-DWITH_JACK="$(multilib_native_usex jack)"
-		-DWITH_GLINJECT="true"
-	)
-
-	# libav doesn't have AVFrame::channels
-	# https://github.com/MaartenBaert/ssr/issues/195#issuecomment-45646159
-	if has_version media-video/libav ; then
-		mycmakeargs+=( -DENABLE_FFMPEG_VERSIONS="false" )
-	fi
-
-	if multilib_is_native_abi ; then
-		mycmakeargs+=( -DWITH_QT5="true" )
-	else
-		mycmakeargs+=( -DWITH_SIMPLESCREENRECORDER="false" )
-	fi
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-video/vidcutter/Manifest b/media-video/vidcutter/Manifest
index 60205c50..c00289ae 100644
--- a/media-video/vidcutter/Manifest
+++ b/media-video/vidcutter/Manifest
@@ -1 +1 @@
-DIST vidcutter-3.0.1.tar.gz 1299320 BLAKE2B 19ca27dc7cf78a1b7f866c6d5f9e7bec009b2def34a7698e39baf2920622dc62dae6a24e80545a3c3f791149ec347ae1a9217b2f20468513eadd36536178746d SHA512 6e202287186c4c5d2245f23a18caa3e4e2db2e13d3b327c3eee309eabdd1a2ba0b02ad7227764f8d3b1818ea989790e0ae05308224fcd9c14bc75f369684d1a3
+DIST vidcutter-6.0.0.tar.gz 9877867 BLAKE2B 91f153222f37d452ed8af5c4f24e32790189f058b5cbb3c80f7805ed48b5e953bfeeb8be92f04e049384dc30f416d0ee603237b8a59a329b0bc0cd61bf0fdbe2 SHA512 9970d9918cca9a7681bc5ca8d8b5d16212cf3dad0f2bc3e9c6727340c340801696dcb7ff4e901c2c0a25b86e9cb165bb3f783c18b4a8fd5f4ddba8490a7fd7a0
diff --git a/media-video/vidcutter/vidcutter-3.0.1.ebuild b/media-video/vidcutter/vidcutter-6.0.0.ebuild
index 10664545..f2e2fbfa 100644
--- a/media-video/vidcutter/vidcutter-3.0.1.ebuild
+++ b/media-video/vidcutter/vidcutter-6.0.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 
 inherit distutils-r1