gentoo resync : 15.12.2019

4 files changed, 2 insertions, 81 deletions

diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index 9d94f6853ac2..cf05fa2efeac 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,6 +1,3 @@
-AUX phonon-vlc-0.10.1-qt-5.11.patch 998 BLAKE2B e182ed8a038577c48c8798e6769b992a3099930a8332c0cdf146af699f7ca5020df3e9d2f072cf83f43e5570307f90558b2facdf526d216c423a705fa6121d4b SHA512 2bc6f4e08693ff8d02eab9a1aad9ef1f425ced736b7cb11ebfadbe33c111ec053dc60bd48220130f4a80cc117a08fb53e3fd5789554bd0e57f81a61203d2ba9c
-DIST phonon-backend-vlc-0.10.2.tar.xz 60568 BLAKE2B 7ee5ea6cc627ec2bd872b4c60f9c915f383e9b2826b30c4b0db96e8348b1a26ea4f710076b68892c28c73d45dae118f06a315093b6e954d48967891f1e31eec4 SHA512 3c4e7c60582d7871b209f4b38b139f43ab5f97618399164ecc649cd0e077a1d4c7848bc5c5c213d747cf7e5f1252ff53ded745880dfd36247494479840789ba5
 DIST phonon-backend-vlc-0.11.1.tar.xz 65064 BLAKE2B 2380d31f574b71e2552b37e5c2a8b22239268aac9c2875417486fd77496c89820b5b4c7e94d39bfebad62a5175a35767945e3f57830e69041ed7c58be4b978cc SHA512 4a068478eb1467477cf5c21813723779742eb15766aee2df8184da8c0b58598c5eff8aecefdcfed8e6136495f3caf7691c99d43e98226ab477c162ff19e1fa4e
-EBUILD phonon-vlc-0.10.2.ebuild 887 BLAKE2B 97ac0090629d73ac4c0cdc17540fbeaf4258869ad16934b0277887c8bcf1de1ca4346a35b360089c029d289cd979dd11f6256794e418c0ff7fc3234de1c39c9b SHA512 33d774dc5a0c613d96de315754dc274fe9297eae6e7b08c42e7c6ebd283eb99674ec98b5afc480054265dfb0b5f6d39160b06a8fe101427de68b17e7c4b7b3e4
-EBUILD phonon-vlc-0.11.1.ebuild 712 BLAKE2B 6b9bb437f86e368635471fab3f2ef68002de1d207f346d82ef2176282dd7378f24650bf650077b72dfca699b52550552e7c43d8deca26b101e06bcdba628f699 SHA512 fc71636cae074b1cc0a2a03f615639df55d58b765b76781bf010ebb253160bab5cc446339030377c74458335665a99f2fcf58183c71c744b8a379889d10c4959
+EBUILD phonon-vlc-0.11.1.ebuild 709 BLAKE2B bf668e8d74709027bded7a2496db9393ea36880ad3fbcfde22d5232209d1900d915df7390d1c5235b4c2023d8ed0a4dc2c990e9c01f5cc60d0916c4fbdbde7be SHA512 03cf7b3953d003960eb2c8d44563f03c710d77f4235f73b516af9b9f625c774bae85b7c4fb0b56e80597d07236066b32d124a78db69e580a169c37adf641c226
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-qt-5.11.patch b/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-qt-5.11.patch
deleted file mode 100644
index b87a1e175777..000000000000
--- a/media-libs/phonon-vlc/files/phonon-vlc-0.10.1-qt-5.11.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d053719a405ceaea58bffc2f08580875322e4158 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 13 Apr 2018 23:16:52 +0200
-Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
-
-Also replace automoc4_add_library with add_library.
----
- src/CMakeLists.txt | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 47427b2..f91975e 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -80,8 +80,12 @@ if(APPLE)
-         video/mac/vlcmacwidget.mm)
- endif(APPLE)
- 
--automoc4_add_library(phonon_vlc MODULE ${phonon_vlc_SRCS})
--qt5_use_modules(phonon_vlc Core Widgets)
-+add_library(phonon_vlc MODULE ${phonon_vlc_SRCS})
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(phonon_vlc Qt5::Core Qt5::Widgets)
-+else()
-+    target_link_libraries(phonon_vlc ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+endif()
- 
- set_target_properties(phonon_vlc PROPERTIES
-     PREFIX ""
--- 
-2.17.0
-
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild
deleted file mode 100644
index 9480384f2a52..000000000000
--- a/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="phonon-backend-vlc"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-else
-	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
-	inherit git-r3
-fi
-
-inherit cmake-utils
-
-DESCRIPTION="Phonon VLC backend"
-HOMEPAGE="https://phonon.kde.org/"
-
-LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="debug"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	>=media-libs/phonon-4.10.0
-	media-video/vlc:=[dbus,ogg,vorbis]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.10.1-qt-5.11.patch" )
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
-	local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
-	cmake-utils_src_configure
-}
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.11.1.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.11.1.ebuild
index 58b0b5b22056..e186b6bba7d7 100644
--- a/media-libs/phonon-vlc/phonon-vlc-0.11.1.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.11.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://phonon.kde.org/"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"