gentoo resync : 20.12.2017

3 files changed, 125 insertions, 13 deletions

diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest
index 75af16afd860..750bdfd91bc9 100644
--- a/media-video/simplescreenrecorder/Manifest
+++ b/media-video/simplescreenrecorder/Manifest
@@ -1,5 +1,7 @@
 AUX simplescreenrecorder-0.3.8-qtbindir.patch 659 BLAKE2B c5de5c06d2dae1e3e0133b77a7d02fade47de65c9a90e9e3a8c5e69dfb8bc6dd3f17e09b974f6021b2ed23b2cc2a5934b84b553cf22e3d4b37e6527416982109 SHA512 5321b44e6cdfbe9081d716008c1da4b5f828a298a2e73e313b7bd960274f1d5151f8c653f2fc165ab7fe27d20ef76fc6a77f4e87de2cf91a91e6f84f8b66bf4f
 DIST simplescreenrecorder-0.3.8.tar.gz 2037017 BLAKE2B 891d4ab5e02a0a47452dfdd0c936819a46ea558221edb5699dd95682561153f7db9f4a301414145e8582f944490ce6d4f722b71e197fc5fa54008c3dbbc25f4c SHA512 f94c7ac7d5f6fdebd1c68da7469b6c46a21b399e2ad8744c52d3e9959d2ec74d15e6ac061d7fe41f02ebb9ee9a89fbd8feecf4e0a10110975f3857a7fbb66365
+DIST simplescreenrecorder-0.3.9.tar.gz 1816221 BLAKE2B 995ac44da0a5e65dcb33a10b353085f6907531b2af84a0b4c5898f1a44d45676a759b94facdf7f6f311444bcb1ea2cbd8dcf143b8c6e0efac4a7eb06484d1096 SHA512 36dc30597d1cb07f060dcb667d79074851fec75f369efe349d1a1852110e663f0704fd0ec7d85fd0fc0dac27e478b7422f6e273dfecbb27ddeb6d2228217a3b2
 EBUILD simplescreenrecorder-0.3.8.ebuild 2734 BLAKE2B d59ba3285fab99bf61f5ab9eeeb03dbce471c529d5b3ada2494e95318403b936db3ac0d92b2100dc12b6351bf0a9a24136856924012fa8ef996ce1bb876296d6 SHA512 99bc9d5244b5ad58c88db47f0d4bc0d8f5468e3174a652446eba8a11e455b66137beefd18982c23b8180ba95b486b527f147c44d760e7b6e344ec63fbc8131b7
-EBUILD simplescreenrecorder-9999.ebuild 2610 BLAKE2B 11f51fcd667bbf216cc9f2d0e5b3c4e8381db3bcb817fe7c82805e613e2e8aa52c8e565e148219b8cb8ea50dd9c8cf156ff594ba43f8b5e4c6d6ed5cd3f7af54 SHA512 d3f0af48d44419b4483502ffa0e09f679fedc6273b8ebbe81a184ac253a41230fb2e35b6cc9367b1d48d46f713a19f88f2f2c3a0e30243b817d4bdd527275167
+EBUILD simplescreenrecorder-0.3.9.ebuild 2800 BLAKE2B 12f338e90359a670e851ff8398dd00d6a2fe06071460e8aa1399196bca497a97145a40444877a43ad3a83756c64ecd158eb09bdf2f89d82dd592f00f60cd1a83 SHA512 38565644043a13959fb27c578bb4a8951c89936dbb79ae4fc30f6a86e3b08ac1e2c53a2d77b3c8c9dd0edea85fda5b10897749aa18f1c038ff18b0d703c0d460
+EBUILD simplescreenrecorder-9999.ebuild 2800 BLAKE2B 12f338e90359a670e851ff8398dd00d6a2fe06071460e8aa1399196bca497a97145a40444877a43ad3a83756c64ecd158eb09bdf2f89d82dd592f00f60cd1a83 SHA512 38565644043a13959fb27c578bb4a8951c89936dbb79ae4fc30f6a86e3b08ac1e2c53a2d77b3c8c9dd0edea85fda5b10897749aa18f1c038ff18b0d703c0d460
 MISC metadata.xml 508 BLAKE2B c43c69903c35e9e1f87c94cb26b06a8d6c4dd1a51c8a3409027ab8c867e54851aa8e4bfcaf4a0a37298795ded69743e82d2b0a4e0bb84cb3d88d6a6c5c4a1c0f SHA512 d4879cb7f57f23d273e45b429ab5548d30a0a6eefe63e28c2c60e7cef9a44b295d8455bfedaf9d9294ff4cf16b4f841f0ddb34541c62c25cbf190f7b6c7538ce
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.9.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.9.ebuild
new file mode 100644
index 000000000000..a732537e48c5
--- /dev/null
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.9.ebuild
@@ -0,0 +1,101 @@
+# 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
+		mymakeargs+=( -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 22b763bb40ea..a732537e48c5 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit flag-o-matic multilib-minimal
+inherit cmake-multilib flag-o-matic xdg-utils
 
 if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
@@ -23,7 +23,7 @@ else
 fi
 
 SLOT="0"
-IUSE="+asm debug jack mp3 pulseaudio theora vorbis vpx x264"
+IUSE="+asm jack mp3 pulseaudio theora vorbis vpx x264"
 
 RDEPEND="
 	dev-qt/qtcore:5
@@ -69,24 +69,33 @@ pkg_setup() {
 }
 
 multilib_src_configure() {
-	local myconf=(
-		$(multilib_native_use_enable debug assert)
-		$(multilib_native_use_with pulseaudio)
-		$(multilib_native_use_with jack)
-		$(use_enable asm x86-asm)
+	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
-		myconf+=( --disable-ffmpeg-versions )
+	if has_version media-video/libav ; then
+		mycmakeargs+=( -DENABLE_FFMPEG_VERSIONS="false" )
 	fi
 
 	if multilib_is_native_abi ; then
-		myconf+=( --with-qt5 )
+		mymakeargs+=( -DWITH_QT5="true" )
 	else
-		myconf+=( --disable-ssrprogram )
+		mycmakeargs+=( -DWITH_SIMPLESCREENRECORDER="false" )
 	fi
 
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
 }