gentoo resync : 02.03.2018

3 files changed, 2 insertions, 39 deletions

diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index 79fcd8a16074..c04076488d59 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,7 +1,6 @@
-AUX phonon-vlc-0.10.0-pre-vlc-3.patch 997 BLAKE2B 0f6b91afb77a4ecfad704175a8ec7f55464130b4393b774c29fc1cffe6f24702ef1556010bdce74cef59d55aec463e1ba0c14bc3597c645804c2a4efe5c676bf SHA512 dee32671bb74cf46644f1c71d8fd8ac7857ff67e4b4c6a9987c12b0de7c9a98dc6cae47ec9e5855b5fd61d3447fb94b147b15cff0317ad96531f86fbeb51d419
-DIST phonon-backend-vlc-0.10.0.tar.xz 61080 BLAKE2B 1397bff2791b6baf1de2967aeb5ee1a6d71dcd68cff937bd9d4e2de51d36d8f95db3095a8cbb0786c78b420d3b4a1d0e2e102051cc6458a2267aeea3b2e6aec5 SHA512 cfe2050ac4c9b43fdf33b3cee9d60e5f1e5702aed4b4f14ec915f84578dba08dd5375c2fba6d19817c34197575e29eb9ed5fd816ea753e2bc124d97ea71b0bc8
+DIST phonon-backend-vlc-0.10.1.tar.xz 61096 BLAKE2B 5124d43a68af5a1ecac46c591e8b727868096e07156e6bc277c94199b6138433c826febf46cf5ffc7776c936fa6373d5ac2114c7a730a6b89380014c44e581fe SHA512 fa94298a8236c29f792285d3f288140d244e0eacba02511a32ee56b5bace50f92a93a714b5c44dc5bafb15b2a9d5ae792231e78dce8ca1a45ab3a328492911df
 DIST phonon-backend-vlc-0.9.1.tar.xz 59972 BLAKE2B 79c3b0d2cb21a04446cfe0a5b4bfed20f4c63cf6eb00037b0f0d8a67ff74fc9eab484d9a108a8d6694bb1ed97ac5618ad1813f7bbcd981bca9678b862bdc9eeb SHA512 104a29159541002d4064486b54d02183c32cf87931c205badf44333d9481b0c0e70e6eae7f9d3c558bef977de37f76cc203dc5c15120f4146d64d451992947aa
-EBUILD phonon-vlc-0.10.0.ebuild 845 BLAKE2B e56dc7f5679d14107eacc5f82b122029611fcf89a4977c6cc3f458be3b7335a95eb079f0f417eb773787dbd4d8a7e69979d93bc193d3f5fd2e86aa0e5eafa51e SHA512 1c351e9e1d33b10088a0bb43f61e6ebee7f67f43578e0ddb17ebf26964537e1a09caee0e973127523e36bb0739157ae7f066b490afbe23cf5b126cc2bbeb369c
+EBUILD phonon-vlc-0.10.1.ebuild 797 BLAKE2B 5dc25a00e545c408243ca77aacce55644aa42588fecc0000695a871311c102703294d98398c4c9eef4a7c0c0a13103961e945eaae9516956c6145615e7ebca3a SHA512 cfd63cb76e8dcb28646e25dc87ce814f1b2864bdf075e72478ef9729b9d20581dd79568b27eb73193c6b97e3b6c4c40e86bfbf2f75b330bb2291f6f19efcbd4e
 EBUILD phonon-vlc-0.9.1-r1.ebuild 1664 BLAKE2B 59522c485d8aaf0d37fb0e6a69605fbfa889d101e6975c11a97d1f93b459b1ed0d4bb32e6048189b6f2a431d5105ea33b474eb373ca74af44326e91861b3f8df SHA512 653af9c113b9de6c41cbd070a1f044c621f6505c5502c9e830e2a314850022834407c9720eae4da86e5b6b1886d7c922ffc6a44bf50e64ee3054a0293b85105a
 EBUILD phonon-vlc-9999.ebuild 797 BLAKE2B 5dc25a00e545c408243ca77aacce55644aa42588fecc0000695a871311c102703294d98398c4c9eef4a7c0c0a13103961e945eaae9516956c6145615e7ebca3a SHA512 cfd63cb76e8dcb28646e25dc87ce814f1b2864bdf075e72478ef9729b9d20581dd79568b27eb73193c6b97e3b6c4c40e86bfbf2f75b330bb2291f6f19efcbd4e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/phonon-vlc/files/phonon-vlc-0.10.0-pre-vlc-3.patch b/media-libs/phonon-vlc/files/phonon-vlc-0.10.0-pre-vlc-3.patch
deleted file mode 100644
index c670da35738d..000000000000
--- a/media-libs/phonon-vlc/files/phonon-vlc-0.10.0-pre-vlc-3.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From ea4d78ac3fc01f33bc2c0f3fb4a44a4103196da5 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Fri, 23 Feb 2018 21:51:45 +0100
-Subject: Fix build with VLC<3
-
-libvlc_title_description_t and libvlc_chapter_description_t are not defined in vlc < 3
-
-Differential Revision: https://phabricator.kde.org/D10775
----
- src/mediaplayer.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/mediaplayer.h b/src/mediaplayer.h
-index 9d413d4..cd847db 100644
---- a/src/mediaplayer.h
-+++ b/src/mediaplayer.h
-@@ -62,11 +62,13 @@ private:
-     unsigned int m_size;
- };
- 
-+#if (LIBVLC_VERSION_INT >= LIBVLC_VERSION(3, 0, 0, 0))
- typedef Descriptions<libvlc_title_description_t> TitleDescriptions;
- typedef QSharedPointer<const TitleDescriptions> SharedTitleDescriptions;
- 
- typedef Descriptions<libvlc_chapter_description_t> ChapterDescriptions;
- typedef QSharedPointer<ChapterDescriptions> SharedChapterDescriptions;
-+#endif
- 
- class MediaPlayer : public QObject
- {
--- 
-cgit v0.11.2
-
-
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.10.0.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild
index 6c36bbe135d1..18a2f10173c6 100644
--- a/media-libs/phonon-vlc/phonon-vlc-0.10.0.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild
@@ -33,8 +33,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}/${P}-pre-vlc-3.patch" )
-
 src_configure() {
 	local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
 	cmake-utils_src_configure