gentoo resync : 18.03.2018

3 files changed, 24 insertions, 34 deletions

diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest
index bc938cd7eb23..a5dccd9f7b47 100644
--- a/media-video/simplescreenrecorder/Manifest
+++ b/media-video/simplescreenrecorder/Manifest
@@ -1,9 +1,8 @@
-AUX simplescreenrecorder-0.3.8-qtbindir.patch 659 BLAKE2B c5de5c06d2dae1e3e0133b77a7d02fade47de65c9a90e9e3a8c5e69dfb8bc6dd3f17e09b974f6021b2ed23b2cc2a5934b84b553cf22e3d4b37e6527416982109 SHA512 5321b44e6cdfbe9081d716008c1da4b5f828a298a2e73e313b7bd960274f1d5151f8c653f2fc165ab7fe27d20ef76fc6a77f4e87de2cf91a91e6f84f8b66bf4f
 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.8.tar.gz 2037017 BLAKE2B 891d4ab5e02a0a47452dfdd0c936819a46ea558221edb5699dd95682561153f7db9f4a301414145e8582f944490ce6d4f722b71e197fc5fa54008c3dbbc25f4c SHA512 f94c7ac7d5f6fdebd1c68da7469b6c46a21b399e2ad8744c52d3e9959d2ec74d15e6ac061d7fe41f02ebb9ee9a89fbd8feecf4e0a10110975f3857a7fbb66365
+DIST simplescreenrecorder-0.3.10.tar.gz 1823448 BLAKE2B 5eef2a803be90b357b08ba6a009cd9bfda73bc7c29200de50c32902598b7044aedaa0a39d9eb71ab0a660bb1a3c03f7d57ae2437203037951f06821ce8a417bb SHA512 dc7b9de386b5f87e8315695ef105dea2491d09b98b19029146dd29562fec001bf6b3fd3f30e91bc87bdb55ec87ff213567b5b17a234b0c06c6b7fe93db63d4ae
 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-0.3.10.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
 MISC metadata.xml 508 BLAKE2B c43c69903c35e9e1f87c94cb26b06a8d6c4dd1a51c8a3409027ab8c867e54851aa8e4bfcaf4a0a37298795ded69743e82d2b0a4e0bb84cb3d88d6a6c5c4a1c0f SHA512 d4879cb7f57f23d273e45b429ab5548d30a0a6eefe63e28c2c60e7cef9a44b295d8455bfedaf9d9294ff4cf16b4f841f0ddb34541c62c25cbf190f7b6c7538ce
diff --git a/media-video/simplescreenrecorder/files/simplescreenrecorder-0.3.8-qtbindir.patch b/media-video/simplescreenrecorder/files/simplescreenrecorder-0.3.8-qtbindir.patch
deleted file mode 100644
index 6e1cc7d5cc44..000000000000
--- a/media-video/simplescreenrecorder/files/simplescreenrecorder-0.3.8-qtbindir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2016-11-07 01:21:01.000000000 +0100
-+++ b/configure.ac	2017-12-04 19:49:32.993241964 +0100
-@@ -56,7 +56,7 @@
- 	AM_COND_IF([WITH_QT5], [
- 		PKG_CHECK_MODULES([QT5], [Qt5Core >= 5.1.0 Qt5Gui Qt5Widgets Qt5X11Extras], [
- 			QT_PATH1="$( eval $PKG_CONFIG --variable=libdir Qt5Core )/qt5/bin"
--			QT_PATH2="$( eval $PKG_CONFIG --variable=exec_prefix Qt5Core )/bin"
-+			QT_PATH2="$( eval $PKG_CONFIG --variable=host_bins Qt5Core )/bin"
- 			AC_PATH_PROGS([MOC], [moc-qt5 moc], [moc], [$QT_PATH1:$QT_PATH2])
- 			AC_PATH_PROGS([RCC], [rcc-qt5 rcc], [rcc], [$QT_PATH1:$QT_PATH2])
- 			AC_PATH_PROGS([UIC], [uic-qt5 uic], [uic], [$QT_PATH1:$QT_PATH2])
diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.8.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.10.ebuild
index af9ce70e97a2..da1692bb1d65 100644
--- a/media-video/simplescreenrecorder/simplescreenrecorder-0.3.8.ebuild
+++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.3.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools 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
@@ -47,8 +47,6 @@ DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 "
 
-PATCHES=( "${FILESDIR}/${P}-qtbindir.patch" )
-
 pkg_setup() {
 	if [[ ${ABI} == amd64 ]]; then
 		elog "You may want to add USE flag 'abi_x86_32' when running a 64bit system"
@@ -72,30 +70,34 @@ pkg_setup() {
 	append-flags -fPIC
 }
 
-src_prepare() {
-	default
-	eautoreconf
-}
-
 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 )
+		mycmakeargs+=( -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
 }