gentoo resync : 24.02.2018

4 files changed, 87 insertions, 47 deletions

diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index c7f3e1971f40..79fcd8a16074 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,4 +1,7 @@
+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.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.9.1-r1.ebuild 1664 BLAKE2B 59522c485d8aaf0d37fb0e6a69605fbfa889d101e6975c11a97d1f93b459b1ed0d4bb32e6048189b6f2a431d5105ea33b474eb373ca74af44326e91861b3f8df SHA512 653af9c113b9de6c41cbd070a1f044c621f6505c5502c9e830e2a314850022834407c9720eae4da86e5b6b1886d7c922ffc6a44bf50e64ee3054a0293b85105a
-EBUILD phonon-vlc-9999.ebuild 1612 BLAKE2B 264f067024e692b970baea2c3c03360f892c73a815fe42885a09e713fb4d276da34e57422d43168010dcd2297c763ec74a437171a143fd071c24aff03de1d394 SHA512 248a93c84a0a947aab5ff4106f9083e7d76d34a36cc6a28d4ea3e4a3496f1cac08471c28aa399d47d8ac82a85d87cc051b582a9274317ba38a5a4f3588312386
+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
new file mode 100644
index 000000000000..c670da35738d
--- /dev/null
+++ b/media-libs/phonon-vlc/files/phonon-vlc-0.10.0-pre-vlc-3.patch
@@ -0,0 +1,34 @@
+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.0.ebuild
new file mode 100644
index 000000000000..6c36bbe135d1
--- /dev/null
+++ b/media-libs/phonon-vlc/phonon-vlc-0.10.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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}
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${P}-pre-vlc-3.patch" )
+
+src_configure() {
+	local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
+	cmake-utils_src_configure
+}
diff --git a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
index aee83519e54b..18a2f10173c6 100644
--- a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
@@ -1,77 +1,39 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 MY_PN="phonon-backend-vlc"
-MY_P="${MY_PN}-${PV}"
 
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
+	SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-	S="${WORKDIR}/${MY_P}"
 else
 	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
 	inherit git-r3
 fi
 
-inherit cmake-utils multibuild
+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 qt4"
+IUSE="debug"
 
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
-	>=media-libs/phonon-4.9.0[qt4=,qt5(+)]
-	>=media-video/vlc-2.0.1:=[dbus,ogg,vorbis]
-	qt4? (
-		>=dev-qt/qtcore-4.8.7-r2:4
-		>=dev-qt/qtgui-4.8.7:4
-	)
+	>=media-libs/phonon-4.10.0
+	media-video/vlc:=[dbus,ogg,vorbis]
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-DOCS=( AUTHORS )
-
-pkg_setup() {
-	if use qt4 && [[ $(gcc-major-version) -lt 5 ]] ; then
-		ewarn "A GCC version older than 5 was detected. There may be trouble. See also Gentoo bug #595618"
-	fi
-
-	MULTIBUILD_VARIANTS=( $(usev qt4) qt5 )
-}
-
 src_configure() {
-	myconfigure() {
-		local mycmakeargs=()
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=OFF )
-		fi
-		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			mycmakeargs+=( -DPHONON_BUILD_PHONON4QT5=ON )
-		fi
-		cmake-utils_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_test() {
-	multibuild_foreach_variant cmake-utils_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
+	local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
+	cmake-utils_src_configure
 }