gentoo resync : 25.08.2020

4 files changed, 10 insertions, 115 deletions

diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest
index 9ee3635d106c..c97bf7d48f96 100644
--- a/media-video/simplescreenrecorder/Manifest
+++ b/media-video/simplescreenrecorder/Manifest
@@ -1,6 +1,4 @@
-DIST simplescreenrecorder-0.4.1.tar.gz 1893293 BLAKE2B d05765788b23073bd03997b92dfa34e3437514ccd88216dea429305f4d43ac25019d141b248ee4a4844d72fd6a87f196579e876ee16a235da34cb3f2404ce5e3 SHA512 b890fafb65a87c298562d25388384577408d7ccbb0b1280bb4fdad198c9b9581893e68b99aa9e478a61c59736689ae40be0f30132d56ee9a9796b8885541d8d5
 DIST simplescreenrecorder-0.4.2.tar.gz 1912151 BLAKE2B d8a4605a82e49693f94ecfac8853405a660a4528c3001961b1734d4387e49eeb4c91603929b3cd5d5b67a23a6ec839ace606b29666b916960f10322e6ec1b452 SHA512 60b0127d7f82f294e5a8f015363e37a10b5492089a0178b07a5e383c7e4b857102ed2bda7a95e3c67293a255f892481aeaf4037c583320d68d463637348ed7f7
-EBUILD simplescreenrecorder-0.4.1.ebuild 2659 BLAKE2B 8ab589afbac89613d77dcfb6d09268db0df42df7b5e6e30b3d964eab23b04aed105f6c7507e6b0c4353b27ff3169d41206bdf0106992028aad52b5e2c80a72c6 SHA512 6fbbee990963fbc68dd9ec72d65877dde9c7bedee319834615696600e184d03cb92acee9945b64ac368d4cdaeac5ce3e44e00f96f931ac63b5798646a14d5ade
-EBUILD simplescreenrecorder-0.4.2.ebuild 2659 BLAKE2B 8ab589afbac89613d77dcfb6d09268db0df42df7b5e6e30b3d964eab23b04aed105f6c7507e6b0c4353b27ff3169d41206bdf0106992028aad52b5e2c80a72c6 SHA512 6fbbee990963fbc68dd9ec72d65877dde9c7bedee319834615696600e184d03cb92acee9945b64ac368d4cdaeac5ce3e44e00f96f931ac63b5798646a14d5ade
-EBUILD simplescreenrecorder-9999.ebuild 2659 BLAKE2B 8ab589afbac89613d77dcfb6d09268db0df42df7b5e6e30b3d964eab23b04aed105f6c7507e6b0c4353b27ff3169d41206bdf0106992028aad52b5e2c80a72c6 SHA512 6fbbee990963fbc68dd9ec72d65877dde9c7bedee319834615696600e184d03cb92acee9945b64ac368d4cdaeac5ce3e44e00f96f931ac63b5798646a14d5ade
+EBUILD simplescreenrecorder-0.4.2.ebuild 2666 BLAKE2B c186fd39471080abef980ced16a9e56bd91edcc86f40300dfca6ba420d5e06ea2b2a5839c27398b2898fdb2cf9ea5a624997fa7158b96e581c46b38cd88782cb SHA512 27cf19b3f1adceaf8c17e7b2bc0dd500b95c948e35115fef081f7ed3cbea5e2e8550bdb92175680268364d30cd95c13f43a7b1a3f01da394a73ab49344450041
+EBUILD simplescreenrecorder-9999.ebuild 2666 BLAKE2B c186fd39471080abef980ced16a9e56bd91edcc86f40300dfca6ba420d5e06ea2b2a5839c27398b2898fdb2cf9ea5a624997fa7158b96e581c46b38cd88782cb SHA512 27cf19b3f1adceaf8c17e7b2bc0dd500b95c948e35115fef081f7ed3cbea5e2e8550bdb92175680268364d30cd95c13f43a7b1a3f01da394a73ab49344450041
 MISC metadata.xml 508 BLAKE2B c43c69903c35e9e1f87c94cb26b06a8d6c4dd1a51c8a3409027ab8c867e54851aa8e4bfcaf4a0a37298795ded69743e82d2b0a4e0bb84cb3d88d6a6c5c4a1c0f SHA512 d4879cb7f57f23d273e45b429ab5548d30a0a6eefe63e28c2c60e7cef9a44b295d8455bfedaf9d9294ff4cf16b4f841f0ddb34541c62c25cbf190f7b6c7538ce
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.1.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.1.ebuild
deleted file mode 100644
index 98efd341c929..000000000000
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic xdg
-
-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},X(+)]
-	media-video/ffmpeg[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}
-	dev-qt/linguist-tools:5
-"
-
-pkg_pretend() {
-	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-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
-}
-
-pkg_setup() {
-	# QT requires -fPIC. Compile fails otherwise.
-	# Recently removed from the default compile options upstream
-	# https://github.com/MaartenBaert/ssr/commit/25fe1743058f0d1f95f6fbb39014b6ac146b5180
-	append-flags -fPIC
-}
-
-src_prepare() {
-	# required because xdg.eclass overrides default cmake_src_prepare
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_X86_ASM="$(usex asm)"
-		-DWITH_PULSEAUDIO="$(multilib_native_usex pulseaudio)"
-		-DWITH_JACK="$(multilib_native_usex jack)"
-		-DWITH_GLINJECT="true"
-	)
-
-	if multilib_is_native_abi ; then
-		mycmakeargs+=(
-			-DENABLE_32BIT_GLINJECT="false"
-			-DWITH_QT5="true"
-		)
-	else
-		mycmakeargs+=(
-			# https://bugs.gentoo.org/660438
-			-DCMAKE_INSTALL_LIB32DIR="$(get_libdir)"
-			-DENABLE_32BIT_GLINJECT="true"
-			-DWITH_SIMPLESCREENRECORDER="false"
-		)
-	fi
-
-	cmake_src_configure
-}
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.2.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.2.ebuild
index 98efd341c929..9fb007c901bd 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.2.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.2.ebuild
@@ -6,15 +6,12 @@ EAPI=7
 CMAKE_ECLASS=cmake
 inherit cmake-multilib flag-o-matic xdg
 
-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
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/MaartenBaert/${PKGNAME}.git"
 	EGIT_BOOTSTRAP=""
 else
@@ -32,11 +29,13 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	media-libs/alsa-lib:0=
-	media-libs/mesa[${MULTILIB_USEDEP},X(+)]
+	media-libs/libglvnd[${MULTILIB_USEDEP},X]
 	media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
 	x11-libs/libX11[${MULTILIB_USEDEP}]
 	x11-libs/libXext
 	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXi
+	x11-libs/libXinerama
 	virtual/glu[${MULTILIB_USEDEP}]
 	jack? ( virtual/jack )
 	pulseaudio? ( media-sound/pulseaudio )
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
index 98efd341c929..9fb007c901bd 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
@@ -6,15 +6,12 @@ EAPI=7
 CMAKE_ECLASS=cmake
 inherit cmake-multilib flag-o-matic xdg
 
-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
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/MaartenBaert/${PKGNAME}.git"
 	EGIT_BOOTSTRAP=""
 else
@@ -32,11 +29,13 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	media-libs/alsa-lib:0=
-	media-libs/mesa[${MULTILIB_USEDEP},X(+)]
+	media-libs/libglvnd[${MULTILIB_USEDEP},X]
 	media-video/ffmpeg[vorbis?,vpx?,x264?,mp3?,theora?]
 	x11-libs/libX11[${MULTILIB_USEDEP}]
 	x11-libs/libXext
 	x11-libs/libXfixes[${MULTILIB_USEDEP}]
+	x11-libs/libXi
+	x11-libs/libXinerama
 	virtual/glu[${MULTILIB_USEDEP}]
 	jack? ( virtual/jack )
 	pulseaudio? ( media-sound/pulseaudio )