gentoo resync : 15.01.2020

5 files changed, 16 insertions, 67 deletions

diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest
index 9fe367f38e31..2faf79e46693 100644
--- a/media-video/obs-studio/Manifest
+++ b/media-video/obs-studio/Manifest
@@ -1,7 +1,6 @@
-AUX obs-studio-23.2.1-use-correct-libdir.patch 1776 BLAKE2B 4b3bcc6a0b1c128b3b2e90ce65d8515847413fb7b879943cd42789b8597dd7cb7036916cc5c796fb860237235cfba464c2a51c7aa43fb607f21dd9b823e9b2ce SHA512 33396fdb59d0588b8cae14539742f65d4f257ad1b9fb85fefae68c636de31099d8878e4b5ffde2ca16575c4ebe642164a2a8a4b8e87ca7101cf5bb3474bcd367
-DIST obs-studio-23.2.1.tar.gz 6204515 BLAKE2B bd025a1ec2809e8a0b47fba79c6a3d40feb255a03a461725501a9c7cdbc40c04b75ff714fa4b3787f876a3f524f3371119a3ea9666c3aeb003184f1eb2a63123 SHA512 aabc23d825c2ca3f40274a8e2c4935939dab4955d929c44b28cebde114e808543c1c0dc05791bb6d9f2611effb0f2cb3e20c9a653154c30a9851ea94e74c8169
 DIST obs-studio-24.0.3.tar.gz 6285359 BLAKE2B f799e93e9c35c22e5d7f6e4da04e30b06a3a1ad1b3bfd0a75acdbb5d1f28a717d84809a1f35a858252ff30094fa80521d752a35b5285b0a606d0d77ff88fb3cf SHA512 57cef700076457da1eee344042261e1ada6d6744fcb3033a1d4eaffb9e84dd350aa198984fba3de82d4e727706f562c7c3568d95de6859a4942d9fa6368a02ab
-EBUILD obs-studio-23.2.1.ebuild 3076 BLAKE2B 537845e1bb605bef3fb624912c2433dd52c350119a4ae6bb6a620b3bfa0de6a5170074b3b5c99521e7d54d255e27b32f4e8c117e545e06c9302e2560ab1d9fa6 SHA512 02fb36afdee9f05b98df9b21ae9c6fb449e8acb8be03aaf6b7e8533c3546fc3a72376fac4a2279a9eb96c73203c6cceb9658904e8226df1bd274acbb80c97c12
-EBUILD obs-studio-24.0.3.ebuild 3113 BLAKE2B fc0e8d1ece5c80eba87e73be0ab1c39504a7f58ebd6a5ee484e8061b6a03200e27e0770e95e524456f2d95de0f9a3a3d151a925bb3158fd48ada693fe68f320c SHA512 e87680d42f2a0ca5329b6a0c0dfd2614efcfbb59f15a3b03946ae853726181206f089b847165640b9e293a1e11430a594b458eba1778c0ef043f59a29f88f441
-EBUILD obs-studio-9999.ebuild 3082 BLAKE2B e17e770fca7a25e2eeab49230a7feb72d4c0ffd76f9b6f22bbecddb0e12c07b63a5bbf3a2b71262af1e1e9c8fcbbba61c43527238e2e46bfe861cdb5fe8a1173 SHA512 5a01e927ae74a8b65fa88b6ad90ebb16b4b04c1846b979546612c791606f567659d813f10e9e274efb95684ac2e697fc7739fac14b96db6a2f50bc19cf64f8f4
+DIST obs-studio-24.0.5.tar.gz 7901198 BLAKE2B 79c9712f3523114a70e0df3e0631c19067fd7ead5fd9031123dd4c82d9b92dee69473fb51a495f938430540505a5cf45258eeee01d61a7aaa6654255fee14aca SHA512 99be46046b70597474f25a85036ebe5a2f704eef47c77bc27e2ba8890b877da346ff6008c5922d7a83a4cead9df7214c6a3be885430693e609a42d9d06fedfaf
+EBUILD obs-studio-24.0.3.ebuild 3111 BLAKE2B e884db933172b8fdda667ac8b1f206c65074b74a130feb709233795c8aee37461d29580242424f58fa61763d802122fddbc7e9e3fa79fd08477945a7b389fb94 SHA512 1cb3890980ded6994ae723427e1b34407055172cddac7c0013bcbf3049baf3dc00b7309339c28bdb6628730819af74190a418ed54801520722617a784926e298
+EBUILD obs-studio-24.0.5.ebuild 3111 BLAKE2B e884db933172b8fdda667ac8b1f206c65074b74a130feb709233795c8aee37461d29580242424f58fa61763d802122fddbc7e9e3fa79fd08477945a7b389fb94 SHA512 1cb3890980ded6994ae723427e1b34407055172cddac7c0013bcbf3049baf3dc00b7309339c28bdb6628730819af74190a418ed54801520722617a784926e298
+EBUILD obs-studio-9999.ebuild 3080 BLAKE2B 6928b8bb308958bddd83498b6fd2db03a907e120a78982360a1deafb757a56a0a5f3e8ce4c56a35522b7a6aab2a52b89a051b02193bcf1caeff50fc89fa2ceee SHA512 50a09407949e25548207e5957bad2e2a4d0fc0af171ce951a5a34a7dbc595c55644e57b7f6f803a64e40726081742be153dab1574ca3cc2416d69ca9037b4252
 MISC metadata.xml 1333 BLAKE2B 64d005a96fe4861ab30cc51ff8f9b37dfc6e24eda2149b487ca2f5af9db663f2a2ce564ff4953c6cf5b35d425d1fb1c3774c86e610db0eb336119baddcbc52b5 SHA512 06ab2cd75b521a2753fdc7e379ed67bd2179a74f0868324af4365a2bffa6c132528fd72b98d319bc0a924cad9bb006e382093f368602fb5dd7dc94db94ae703b
diff --git a/media-video/obs-studio/files/obs-studio-23.2.1-use-correct-libdir.patch b/media-video/obs-studio/files/obs-studio-23.2.1-use-correct-libdir.patch
deleted file mode 100644
index 619c414d6b8a..000000000000
--- a/media-video/obs-studio/files/obs-studio-23.2.1-use-correct-libdir.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From ab67b39257be83eaab87c4a938c4c58b5cccad7e Mon Sep 17 00:00:00 2001
-From: Jimi Huotari <chiitoo@gentoo.org>
-Date: Fri, 21 Jun 2019 17:48:32 +0300
-Subject: [PATCH] cmake: Install 'libobs.pc' under the correct 'libdir'
-
-In 'libobs/CMakeLists.txt', use '${CMAKE_INSTALL_LIBDIR}' instead of
-'${CMAKE_INSTALL_PREFIX}/lib', as the latter results into 'libobs.pc'
-being installed under '/lib' when '/lib64' would be more appropriate.
-
-In 'libobs/libobs.pc.in', use '@CMAKE_INSTALL_FULL_LIBDIR@' for
-'libdir', '@CMAKE_INSTALL_FULL_INCLUDEDIR@' for 'includedir',
-and '@CMAKE_INSTALL_PREFIX@' for 'prefix'.
-
-Gentoo-Bug: https://bugs.gentoo.org/644538
----
- libobs/CMakeLists.txt | 2 +-
- libobs/libobs.pc.in   | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt
-index fed3e694..86811481 100644
---- a/libobs/CMakeLists.txt
-+++ b/libobs/CMakeLists.txt
-@@ -454,7 +454,7 @@ if(UNIX AND NOT APPLE)
- 		set(PRIVATE_LIBS "${PRIVATE_LIBS} -l${LIB}")
- 	endforeach()
- 	CONFIGURE_FILE("libobs.pc.in" "libobs.pc" @ONLY)
--	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libobs.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
-+	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libobs.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
- endif()
- 
- set_target_properties(libobs PROPERTIES
-diff --git a/libobs/libobs.pc.in b/libobs/libobs.pc.in
-index 03fe4cdd..f6c471ba 100644
---- a/libobs/libobs.pc.in
-+++ b/libobs/libobs.pc.in
-@@ -1,7 +1,7 @@
--prefix=@DEST_DIR@
-+prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=${prefix}
--libdir=${prefix}/@OBS_LIBRARY_DESTINATION@
--includedir=${prefix}/include
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
- 
- Name: libobs
- Description: OBS Studio Library
--- 
-2.22.0
-
diff --git a/media-video/obs-studio/obs-studio-24.0.3.ebuild b/media-video/obs-studio/obs-studio-24.0.3.ebuild
index 58691bbb1db1..041e31be8073 100644
--- a/media-video/obs-studio/obs-studio-24.0.3.ebuild
+++ b/media-video/obs-studio/obs-studio-24.0.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils python-single-r1 xdg-utils
 
diff --git a/media-video/obs-studio/obs-studio-23.2.1.ebuild b/media-video/obs-studio/obs-studio-24.0.5.ebuild
index 2b14f6e82721..041e31be8073 100644
--- a/media-video/obs-studio/obs-studio-23.2.1.ebuild
+++ b/media-video/obs-studio/obs-studio-24.0.5.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils python-single-r1 xdg-utils
 
@@ -21,7 +22,7 @@ HOMEPAGE="https://obsproject.com"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex truetype v4l"
+IUSE="+alsa fdk imagemagick jack luajit nvenc pulseaudio python speex +ssl truetype v4l vlc"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 BDEPEND="
@@ -38,7 +39,6 @@ DEPEND="
 	dev-qt/qtquickcontrols:5
 	dev-qt/qtsql:5
 	dev-qt/qtsvg:5
-	dev-qt/qttest:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	media-video/ffmpeg:=[x264]
@@ -60,18 +60,16 @@ DEPEND="
 	pulseaudio? ( media-sound/pulseaudio )
 	python? ( ${PYTHON_DEPS} )
 	speex? ( media-libs/speexdsp )
+	ssl? ( net-libs/mbedtls )
 	truetype? (
 		media-libs/fontconfig
 		media-libs/freetype
 	)
 	v4l? ( media-libs/libv4l )
+	vlc? ( media-video/vlc:= )
 "
 RDEPEND="${DEPEND}"
 
-PATCHES="${FILESDIR}/${PN}-23.2.1-use-correct-libdir.patch"
-
-CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
@@ -86,10 +84,12 @@ src_configure() {
 		-DDISABLE_PULSEAUDIO=$(usex !pulseaudio)
 		-DDISABLE_SPEEXDSP=$(usex !speex)
 		-DDISABLE_V4L2=$(usex !v4l)
+		-DDISABLE_VLC=$(usex !vlc)
 		-DLIBOBS_PREFER_IMAGEMAGICK=$(usex imagemagick)
 		-DOBS_MULTIARCH_SUFFIX=${libdir#lib}
 		-DOBS_VERSION_OVERRIDE=${PV}
 		-DUNIX_STRUCTURE=1
+		-DWITH_RTMPS=$(usex ssl)
 	)
 
 	if use luajit || use python; then
diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild
index 1629603a1fa5..01b6cd617a29 100644
--- a/media-video/obs-studio/obs-studio-9999.ebuild
+++ b/media-video/obs-studio/obs-studio-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_REMOVE_MODULES_LIST=( FindFreetype )
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit cmake-utils python-single-r1 xdg-utils