gentoo resync : 12.01.2019

3 files changed, 6 insertions, 38 deletions

diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index 210772149eaf..e8a1803b18b7 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,7 +1,7 @@
 AUX phonon-vlc-0.10.1-qt-5.11.patch 998 BLAKE2B e182ed8a038577c48c8798e6769b992a3099930a8332c0cdf146af699f7ca5020df3e9d2f072cf83f43e5570307f90558b2facdf526d216c423a705fa6121d4b SHA512 2bc6f4e08693ff8d02eab9a1aad9ef1f425ced736b7cb11ebfadbe33c111ec053dc60bd48220130f4a80cc117a08fb53e3fd5789554bd0e57f81a61203d2ba9c
-AUX phonon-vlc-0.10.1-screensaver-inhibitor.patch 1311 BLAKE2B e0afc0d3575bc82fbb4815a794bd34c3d5b0c0ec7972d01563cf81c4e2b70dd8bb0d79d6f19ab88bf30136cd17af5140915b443cbf95932674ae925505953b99 SHA512 78a4eddd498e0a2abaf324ba07dceb62ffdc888b848f39e83b810530c70ea670bfab3705c797397aaf3fdca5b992f075cef246401e346c3d4fe7f02790757cfd
 DIST phonon-backend-vlc-0.10.1.tar.xz 61096 BLAKE2B 5124d43a68af5a1ecac46c591e8b727868096e07156e6bc277c94199b6138433c826febf46cf5ffc7776c936fa6373d5ac2114c7a730a6b89380014c44e581fe SHA512 fa94298a8236c29f792285d3f288140d244e0eacba02511a32ee56b5bace50f92a93a714b5c44dc5bafb15b2a9d5ae792231e78dce8ca1a45ab3a328492911df
-EBUILD phonon-vlc-0.10.1-r1.ebuild 900 BLAKE2B 03e2079bc207ea31a45410e8fee6a96b0a69de56d772550e2eba6f6b545490e228c52724d20c1354dd819e80ef38dea3440b5c0c594d56e7dd8789427f499f77 SHA512 f60d30163188e2a8cba868c4a14f59146e2d9071fbe413cdae8e9f391badfb57ec58fb17f016c706ab8f53302f69241605b05eb427ab3d54539d7e2de68e729b
+DIST phonon-backend-vlc-0.10.2.tar.xz 60568 BLAKE2B 7ee5ea6cc627ec2bd872b4c60f9c915f383e9b2826b30c4b0db96e8348b1a26ea4f710076b68892c28c73d45dae118f06a315093b6e954d48967891f1e31eec4 SHA512 3c4e7c60582d7871b209f4b38b139f43ab5f97618399164ecc649cd0e077a1d4c7848bc5c5c213d747cf7e5f1252ff53ded745880dfd36247494479840789ba5
 EBUILD phonon-vlc-0.10.1.ebuild 841 BLAKE2B 90482c1985f84edca55bca9dfc488d84472045d44ee4046e7044afd9258a0179c45ed604f4e985b6cdd6bbcc7c9d541d0ec531b917a9bbbe334e3c16ab37bb2a SHA512 8f6e296b8a8eac9b8738cd53a38f30855f84a33b916ca40b2653d631f416ec52eb41dc88e698436f7893ea4701d532f633dd52f81b5aeae797d28ac27b6a9cf9
+EBUILD phonon-vlc-0.10.2.ebuild 890 BLAKE2B 2c561361159c686734344629ceb7bafcf6490e2a94353c623c55bc4b2e98d36df07ade1a01006d2cbb5ef5f657da65a91030c5e04ca594900e3475f89cec7f94 SHA512 71ab1777b188ac593f2e94d293ca33946a39700c23c5ed2b5bfc889c0b1cef8b91b635b13edb547f65fa04dc2310542196c0854313fdf9d17a96f5153c7d1295
 EBUILD phonon-vlc-9999.ebuild 805 BLAKE2B 68dea701bda421326ea0b2fadd1c8b212442855e9c4a4fbd12d43e058dcb823a04b53b13a654102e58df26877dfea82cbed1c6735e78bd1076992ac5d83ff2e9 SHA512 608dbbd83aba883b269ea53ecf7eb816cd5bc9fa482c4bc9759f19cd7f51cde1940c3b9b157323b413eede37a8a1a9c458a0cdac0fd4ad5bd177486e0e23c172
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-screensaver-inhibitor.patch b/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-screensaver-inhibitor.patch
deleted file mode 100644
index 1e482a027e52..000000000000
--- a/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-screensaver-inhibitor.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From cb7c2b74b25380b49b2bb7bbfb7ac3fb37f1cd28 Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter@kde.org>
-Date: Tue, 9 Oct 2018 13:22:30 +0200
-Subject: disable the builtin vlc screen saver inhibitor
-
-from a phonon perspective we expect the application to inhibit.
-additionally destructing a player may attempt to uninhibit and block
-on dbus not responding because the call is too late in the lifecycle or
-to an unresponsive remote (all of which the app would ordinarily
-deal with)
----
- src/utils/libvlc.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/utils/libvlc.cpp b/src/utils/libvlc.cpp
-index 39e831c..3a33d9a 100644
---- a/src/utils/libvlc.cpp
-+++ b/src/utils/libvlc.cpp
-@@ -90,6 +90,10 @@ bool LibVLC::init()
-     args << "--no-xlib";
-     // Do not preload services discovery modules, we don't use them.
-     args << "--services-discovery=''";
-+    // The application is meant to manage this. Also, using the builtin
-+    // inhibitor may cause problems on shutdown if VLC tries to uninhibit too
-+    // late in the application lifecycle.
-+    args << "--no-disable-screensaver";
-     // Allow multiple starts (one gets to wonder whether that makes a difference).
- #if !defined(Q_OS_MAC) && (defined(Q_OS_WIN) || !defined(PHONON_NO_DBUS))
-     args << "--no-one-instance";
--- 
-cgit v1.1
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.10.1-r1.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild
index 9c4a65c67546..f4ae408d5c77 100644
--- a/media-libs/phonon-vlc/phonon-vlc-0.10.1-r1.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -34,10 +34,9 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}/${P}-qt-5.11.patch"
-	"${FILESDIR}/${P}-screensaver-inhibitor.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-0.10.1-qt-5.11.patch" )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 src_configure() {
 	local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )