gentoo resync : 24.12.2018

7 files changed, 10 insertions, 347 deletions

diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest
index 788a3a58004c..c15ffe15bdf1 100644
--- a/media-video/simplescreenrecorder/Manifest
+++ b/media-video/simplescreenrecorder/Manifest
@@ -1,10 +1,4 @@
-AUX simplescreenrecorder-0.3.9-cmake.patch 3098 BLAKE2B 5f744c8b56e04022a1048f9fb37924ec4443b12da7bd8c6d8569bab302f39cbe7d697948e578e4b2f19050ff78d7a3d278d0c9481aadafc5b9883e7b84923bc4 SHA512 ffcbc6822d1d0fe833018206fc23bf3c880d5a39bb607346b78dcb6d37e320b357f73b4216d8724c30052cebe70cc0167889fbd4c1ddd2a3713cbaf8ad4ae338
-AUX simplescreenrecorder-0.3.9-pulseaudio_dep.patch 427 BLAKE2B 9ce385a87222d4684f6626db9f6be5d7efc04e84e5175a804e415f053c4c3e4684b0b7338615e74801485f1962d1f8ccc114ec357d6c1446ab56816d0880ede6 SHA512 d9616bf99d784c5ab0a1446b965ebec4e089a3ecafc2ed128dbc04747ad2511a84d679e309530369241816b662f527d7109dfb26df13888d8c4f917a99ea2c72
-DIST simplescreenrecorder-0.3.10.tar.gz 1823448 BLAKE2B 5eef2a803be90b357b08ba6a009cd9bfda73bc7c29200de50c32902598b7044aedaa0a39d9eb71ab0a660bb1a3c03f7d57ae2437203037951f06821ce8a417bb SHA512 dc7b9de386b5f87e8315695ef105dea2491d09b98b19029146dd29562fec001bf6b3fd3f30e91bc87bdb55ec87ff213567b5b17a234b0c06c6b7fe93db63d4ae
 DIST simplescreenrecorder-0.3.11.tar.gz 1823944 BLAKE2B b7692ad158b4784f0222dd47227b85d33aae7eb416ed87d2eda1040027c910ec8d0ebe6a7e164e77cb9c3f6f2756e15fe97a7f05f45c92465473d2ae90e86b34 SHA512 5919774a00cd7015cd7db40561efaea43809b9465508b7770db9eb0fc87f338746e5cd4a79a0ab6c09e516257fa80184c3dcb5ab400c0ef2c0a8cf50ea2a073f
-DIST simplescreenrecorder-0.3.9.tar.gz 1816221 BLAKE2B 995ac44da0a5e65dcb33a10b353085f6907531b2af84a0b4c5898f1a44d45676a759b94facdf7f6f311444bcb1ea2cbd8dcf143b8c6e0efac4a7eb06484d1096 SHA512 36dc30597d1cb07f060dcb667d79074851fec75f369efe349d1a1852110e663f0704fd0ec7d85fd0fc0dac27e478b7422f6e273dfecbb27ddeb6d2228217a3b2
-EBUILD simplescreenrecorder-0.3.10.ebuild 2827 BLAKE2B 97ee9516f58c00e93ffafb47e416c5d7d6b686deec24271a7c59f8f713a327b8179733d3e1f4f2a9799cbaf32206b24e6fcd9ead61bf442092b5d641d7bffc98 SHA512 42d178d475278d1d7c888215b3d11182786575eb3d7447628ee4eeda73799da27c0c291b9ca40fddb4db66a00ebdd969a8dc82b68ab9e8f67d4685eaf236d3d4
-EBUILD simplescreenrecorder-0.3.11.ebuild 2827 BLAKE2B 97ee9516f58c00e93ffafb47e416c5d7d6b686deec24271a7c59f8f713a327b8179733d3e1f4f2a9799cbaf32206b24e6fcd9ead61bf442092b5d641d7bffc98 SHA512 42d178d475278d1d7c888215b3d11182786575eb3d7447628ee4eeda73799da27c0c291b9ca40fddb4db66a00ebdd969a8dc82b68ab9e8f67d4685eaf236d3d4
-EBUILD simplescreenrecorder-0.3.9-r1.ebuild 2913 BLAKE2B da8680a70094428174dd39a169b38cedaec5a4304c031d1024fe5616832252fee8b391889e0de413d291397f3edf39eefc8027136221202f5341b51e542fc5db SHA512 33b9d71372a3fa47492e8afc0d5341b99a2ab33544ca53badabc8678e4f1b2c71a0f6592f7b7c13f6dc6120ca7390b5863ec34a6193402e9ff98245c4bb1f88f
-EBUILD simplescreenrecorder-9999.ebuild 2827 BLAKE2B 97ee9516f58c00e93ffafb47e416c5d7d6b686deec24271a7c59f8f713a327b8179733d3e1f4f2a9799cbaf32206b24e6fcd9ead61bf442092b5d641d7bffc98 SHA512 42d178d475278d1d7c888215b3d11182786575eb3d7447628ee4eeda73799da27c0c291b9ca40fddb4db66a00ebdd969a8dc82b68ab9e8f67d4685eaf236d3d4
+EBUILD simplescreenrecorder-0.3.11-r1.ebuild 2889 BLAKE2B c741205598595d625fdf83e9df3cc06032b7e7b440fc84d880402af6bf58e75cb23e3aae45f1bae352b94d2437dfa034294984a4c51273af45975e799828e2dc SHA512 ea236e2ad36e41e0c5ff7344028150f4a18e2561e29c8e9ee668d984657cf997ddf51fdb85e7b06f21df4f0d8a6db2689b1ff62c8f29e6b523286d9c660f9759
+EBUILD simplescreenrecorder-9999.ebuild 2889 BLAKE2B c741205598595d625fdf83e9df3cc06032b7e7b440fc84d880402af6bf58e75cb23e3aae45f1bae352b94d2437dfa034294984a4c51273af45975e799828e2dc SHA512 ea236e2ad36e41e0c5ff7344028150f4a18e2561e29c8e9ee668d984657cf997ddf51fdb85e7b06f21df4f0d8a6db2689b1ff62c8f29e6b523286d9c660f9759
 MISC metadata.xml 508 BLAKE2B c43c69903c35e9e1f87c94cb26b06a8d6c4dd1a51c8a3409027ab8c867e54851aa8e4bfcaf4a0a37298795ded69743e82d2b0a4e0bb84cb3d88d6a6c5c4a1c0f SHA512 d4879cb7f57f23d273e45b429ab5548d30a0a6eefe63e28c2c60e7cef9a44b295d8455bfedaf9d9294ff4cf16b4f841f0ddb34541c62c25cbf190f7b6c7538ce
diff --git a/media-video/simplescreenrecorder/files/simplescreenrecorder-0.3.9-cmake.patch b/media-video/simplescreenrecorder/files/simplescreenrecorder-0.3.9-cmake.patch
deleted file mode 100644
index 6d9fc1fa607b..000000000000
--- a/media-video/simplescreenrecorder/files/simplescreenrecorder-0.3.9-cmake.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 7f8f72ac5f7ba7b060b4366828200050b96a9df0 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Thu, 11 Jan 2018 21:28:15 +0100
-Subject: [PATCH 1/3] Fix Qt5LinguistTools detection/lrelease binary location
-
-Correctly find the Qt5 module that provides the path to Qt5-based lrelease.
-Only available since >= Qt-5.3.1 which is a low enough minimum dependency.
----
- src/CMakeLists.txt              | 10 ++++++----
- src/translations/CMakeLists.txt |  7 ++++++-
- 2 files changed, 12 insertions(+), 5 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 64652c5..5779a49 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -17,10 +17,12 @@ if(WITH_JACK)
- endif()
- 
- if(WITH_QT5)
--	find_package(Qt5Core REQUIRED)
--	find_package(Qt5Gui REQUIRED)
--	find_package(Qt5Widgets REQUIRED)
--	find_package(Qt5X11Extras REQUIRED)
-+	set(QT_MIN_VERSION "5.3.1")
-+	find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED
-+		Gui
-+		Widgets
-+		X11Extras
-+	)
- else()
- 	find_package(Qt4 REQUIRED QtGui)
- endif()
-diff --git a/src/translations/CMakeLists.txt b/src/translations/CMakeLists.txt
-index 455fdb2..0902cfd 100644
---- a/src/translations/CMakeLists.txt
-+++ b/src/translations/CMakeLists.txt
-@@ -1,6 +1,11 @@
- # translations for 'simplescreenrecorder' executable
- 
--find_program(LRELEASE lrelease)
-+if(WITH_QT5)
-+	find_package(Qt5LinguistTools REQUIRED)
-+	set(LRELEASE Qt5::lrelease)
-+else()
-+	find_program(LRELEASE lrelease)
-+endif()
- 
- if(LRELEASE)
- 
--- 
-2.15.1
-
-
-From 24db02e2a689e08f737c4d720e195a3758cba2eb Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Thu, 11 Jan 2018 21:43:08 +0100
-Subject: [PATCH 2/3] Use FeatureSummary
-
----
- CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e770251..cb36d7d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -25,6 +25,7 @@ option(WITH_GLINJECT "Build the 'libssr-glinject' library. Required for OpenGL r
- 
- set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
- 
-+include(FeatureSummary)
- include(GNUInstallDirs)
- 
- # try to guess the correct 32-bit library path on 64-bit systems
-@@ -106,3 +107,5 @@ if(WITH_SIMPLESCREENRECORDER)
- 	)
- 
- endif()
-+
-+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
--- 
-2.15.1
-
-
-From 329ec866097de4f011cd1bbde9dad784acbb487f Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Thu, 11 Jan 2018 22:07:39 +0100
-Subject: [PATCH 3/3] FindFFmpeg.cmake: Provide FFMPEG_FOUND
-
----
- cmake/FindFFmpeg.cmake | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake
-index 117e654..993219b 100644
---- a/cmake/FindFFmpeg.cmake
-+++ b/cmake/FindFFmpeg.cmake
-@@ -28,3 +28,4 @@ mark_as_advanced(SWSCALE_INCLUDE_DIR SWSCALE_LIBRARY)
- 
- set(FFMPEG_INCLUDE_DIRS ${AVFORMAT_INCLUDE_DIR} ${AVCODEC_INCLUDE_DIR} ${AVUTIL_INCLUDE_DIR} ${SWSCALE_INCLUDE_DIR})
- set(FFMPEG_LIBRARIES ${AVFORMAT_LIBRARY} ${AVCODEC_LIBRARY} ${AVUTIL_LIBRARY} ${SWSCALE_LIBRARY})
-+set(FFMPEG_FOUND ${PC_FFMPEG_FOUND})
--- 
-2.15.1
-
diff --git a/media-video/simplescreenrecorder/files/simplescreenrecorder-0.3.9-pulseaudio_dep.patch b/media-video/simplescreenrecorder/files/simplescreenrecorder-0.3.9-pulseaudio_dep.patch
deleted file mode 100644
index b5d914e5ef6c..000000000000
--- a/media-video/simplescreenrecorder/files/simplescreenrecorder-0.3.9-pulseaudio_dep.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://github.com/MaartenBaert/ssr/issues/599
-https://bugs.gentoo.org/641680#c10
-
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -3,9 +3,11 @@
- find_package(Threads REQUIRED)
- find_package(ALSA REQUIRED)
- find_package(FFmpeg REQUIRED)
--find_package(PulseAudio REQUIRED)
- find_package(X11 REQUIRED)
- 
-+if(WITH_PULSEAUDIO)
-+	find_package(PulseAudio REQUIRED)
-+endif()
- if(WITH_JACK)
- 	find_package(Jack REQUIRED)
- endif()
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.10.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r1.ebuild
index da1692bb1d65..1cf430a123ec 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.10.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-multilib flag-o-matic xdg-utils
+inherit cmake-multilib flag-o-matic gnome2-utils xdg-utils
 
 if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
@@ -95,9 +95,11 @@ multilib_src_configure() {
 }
 
 pkg_postinst() {
+	gnome2_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
+	gnome2_icon_cache_update
 	xdg_desktop_database_update
 }
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 da1692bb1d65..000000000000
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.11.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2018 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}
-	dev-qt/linguist-tools:5
-"
-
-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/simplescreenrecorder/simplescreenrecorder-0.3.9-r1.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.9-r1.ebuild
deleted file mode 100644
index 2f317e44e5d3..000000000000
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.9-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 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}
-	dev-qt/linguist-tools:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-pulseaudio_dep.patch"
-	"${FILESDIR}/${P}-cmake.patch"
-)
-
-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/simplescreenrecorder/simplescreenrecorder-9999.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
index da1692bb1d65..1cf430a123ec 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-multilib flag-o-matic xdg-utils
+inherit cmake-multilib flag-o-matic gnome2-utils xdg-utils
 
 if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
@@ -95,9 +95,11 @@ multilib_src_configure() {
 }
 
 pkg_postinst() {
+	gnome2_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
+	gnome2_icon_cache_update
 	xdg_desktop_database_update
 }