[gentoo-commits] repo/gentoo:master commit in: media-libs/phonon/, media-libs/phonon/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     3c7bc4f6c5fe8e362e315e30a98ddb7177ea839e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 27 19:29:35 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 27 21:42:46 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c7bc4f6

media-libs/phonon: Drop 4.10.0

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 media-libs/phonon/Manifest                         |   1 -
 .../phonon/files/phonon-4.10.0-qt-5.11.patch       | 190 ---------------------
 media-libs/phonon/phonon-4.10.0.ebuild             |  57 -------
 3 files changed, 248 deletions(-)

diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index 9731ecbd2fb..af16bdd2024 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,3 +1,2 @@
-DIST phonon-4.10.0.tar.xz 322072 BLAKE2B ba49893368fc13946e2e83a498787bf8fe605b2b3d8e2b1c28eacad5ec13d9679b8c9ddd2adc54c340bbc60a01c7c1143ccaca6f26b86be105cb7502de5f39fc SHA512 6074c7c33edcdfeed8a6199024f1faedebe09652cf5d01075f2d97146b54c4269924b69ca8298e2341c0cf6ca4d18f930a59a937697f6f282b6de8e976d097c4
 DIST phonon-4.10.1.tar.xz 322100 BLAKE2B 0040bcc82e68a52cb8056c29b5008daddfd8b985f95113e17f1c18d1b5bf1f81222a34ae45b2ee5bd3bc0f104614551638642a85e1770fc218cbe7e2209b5a0e SHA512 a1cc0960c587d09a2fb0f43ae82147df133c34cba7bf01f5720b4b27aca4dda1d83444e89e40fb2f25828d152f89ccfff56d2d4649007c57b7df9eca8c64c007
 DIST phonon-4.9.1.tar.xz 321872 BLAKE2B a315189f578ad71e241ebfbea1bc6c81f06cf041b2eb2914d66f82f35c69c3811d16dbf4303551aafdd1a63d6ff6da619b06a6f03274a9867393f6d032348673 SHA512 a1741765071a625d9b9073d9ad1571b91cf5bfce2223bd1b034828d02dc52624587a6ec5352f3702df79f6e4201007596843fbcb9f15c9b489a858200787d728

diff --git a/media-libs/phonon/files/phonon-4.10.0-qt-5.11.patch b/media-libs/phonon/files/phonon-4.10.0-qt-5.11.patch
deleted file mode 100644
index f8444b343a4..00000000000
--- a/media-libs/phonon/files/phonon-4.10.0-qt-5.11.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From 2670e33c418acdf6c08fd0cf5d238a4d93cc12e6 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 13 Apr 2018 22:35:30 +0200
-Subject: [PATCH] Fix cmake with Qt 5.11_beta3 (dropping qt5_use_modules)
-
----
- declarative/CMakeLists.txt          | 10 ++++-----
- demos/metadatareader/CMakeLists.txt |  7 ++++--
- demos/phota/CMakeLists.txt          |  7 ++++--
- demos/simplecapture/CMakeLists.txt  |  7 ++++--
- demos/simpleplayer/CMakeLists.txt   |  7 ++++--
- designer/CMakeLists.txt             | 10 ++++-----
- phonon/CMakeLists.txt               | 33 +++++++++++++++++------------
- phonon/experimental/CMakeLists.txt  |  9 ++++++--
- 9 files changed, 57 insertions(+), 58 deletions(-)
-
-diff --git a/declarative/CMakeLists.txt b/declarative/CMakeLists.txt
-index da2d2eb9..cdc1b842 100644
---- a/declarative/CMakeLists.txt
-+++ b/declarative/CMakeLists.txt
-@@ -19,11 +19,11 @@ set(declarative_SRCS
- 
- phonon_add_declarative_plugin(phononqmlplugin ${declarative_SRCS})
- 
--target_link_libraries(phononqmlplugin
--    ${PHONON_LIBS}
--)
--
--qt5_use_modules(phononqmlplugin Core Gui Declarative)
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(phononqmlplugin Qt5::Core Qt5::Gui Qt5::Declarative ${PHONON_LIBS})
-+else()
-+    target_link_libraries(phononqmlplugin ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${PHONON_LIBS})
-+endif()
- 
- install(TARGETS phononqmlplugin DESTINATION ${PHONON_QT_IMPORTS_INSTALL_DIR}/Phonon)
- install(FILES ${phonon_QMLS} DESTINATION ${PHONON_QT_IMPORTS_INSTALL_DIR}/Phonon)
-diff --git a/demos/metadatareader/CMakeLists.txt b/demos/metadatareader/CMakeLists.txt
-index a307c071..69e2b3a6 100644
---- a/demos/metadatareader/CMakeLists.txt
-+++ b/demos/metadatareader/CMakeLists.txt
-@@ -13,5 +13,8 @@ set(metadatareader_SRCS
- 
- phonon_add_executable(metadatareader ${metadatareader_SRCS})
- 
--qt5_use_modules(metadatareader Core Widgets)
--target_link_libraries(metadatareader ${PHONON_LIBRARY})
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(metadatareader Qt5::Core Qt5::Widgets ${PHONON_LIBRARY})
-+else()
-+    target_link_libraries(metadatareader ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PHONON_LIBRARY})
-+endif()
-diff --git a/demos/phota/CMakeLists.txt b/demos/phota/CMakeLists.txt
-index e9a4ee34..aa70cf39 100644
---- a/demos/phota/CMakeLists.txt
-+++ b/demos/phota/CMakeLists.txt
-@@ -17,5 +17,8 @@ qt5_wrap_ui(phota_SRCS videoeffects.ui)
- 
- phonon_add_executable(phota ${phota_SRCS})
- 
--qt5_use_modules(phota Core Widgets)
--target_link_libraries(phota ${PHONON_LIBRARY})
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(phota Qt5::Core Qt5::Widgets ${PHONON_LIBRARY})
-+else()
-+    target_link_libraries(phota ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PHONON_LIBRARY})
-+endif()
-diff --git a/demos/simplecapture/CMakeLists.txt b/demos/simplecapture/CMakeLists.txt
-index cd910707..811d29c6 100644
---- a/demos/simplecapture/CMakeLists.txt
-+++ b/demos/simplecapture/CMakeLists.txt
-@@ -13,5 +13,8 @@ set(simplecapture_SRCS
- 
- phonon_add_executable(simplecapture ${simplecapture_SRCS})
- 
--qt5_use_modules(simplecapture Core Widgets)
--target_link_libraries(simplecapture ${PHONON_LIBRARY})
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(simplecapture Qt5::Core Qt5::Widgets ${PHONON_LIBRARY})
-+else()
-+    target_link_libraries(simplecapture ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PHONON_LIBRARY})
-+endif()
-diff --git a/demos/simpleplayer/CMakeLists.txt b/demos/simpleplayer/CMakeLists.txt
-index 3d66c74e..f759224f 100644
---- a/demos/simpleplayer/CMakeLists.txt
-+++ b/demos/simpleplayer/CMakeLists.txt
-@@ -13,5 +13,8 @@ set(simpleplayer_SRCS
- 
- phonon_add_executable(simpleplayer ${simpleplayer_SRCS})
- 
--qt5_use_modules(simpleplayer Core Widgets)
--target_link_libraries(simpleplayer ${PHONON_LIBRARY})
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(simpleplayer Qt5::Core Qt5::Widgets ${PHONON_LIBRARY})
-+else()
-+    target_link_libraries(simpleplayer ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PHONON_LIBRARY})
-+endif()
-diff --git a/designer/CMakeLists.txt b/designer/CMakeLists.txt
-index 9d437547..e9d2e982 100644
---- a/designer/CMakeLists.txt
-+++ b/designer/CMakeLists.txt
-@@ -11,10 +11,10 @@ set(phononwidgetsplugin_SRCS
- 
- phonon_add_designer_plugin(phononwidgets phononwidgets.qrc ${phononwidgetsplugin_SRCS})
- 
--qt5_use_modules(phononwidgets Core Gui Widgets Designer)
--
--target_link_libraries(phononwidgets
--    ${PHONON_LIBS}
--)
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(phononwidgets Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Designer ${PHONON_LIBS})
-+else()
-+    target_link_libraries(phononwidgets ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDESIGNER_LIBRARY} ${PHONON_LIBS})
-+endif()
- 
- install(TARGETS phononwidgets DESTINATION ${PHONON_QT_PLUGIN_INSTALL_DIR})
-diff --git a/phonon/CMakeLists.txt b/phonon/CMakeLists.txt
-index f9ae09e5..b80c96d8 100644
---- a/phonon/CMakeLists.txt
-+++ b/phonon/CMakeLists.txt
-@@ -137,25 +137,32 @@ add_definitions(-DPHONON_LIBRARY_PATH="${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_
- add_definitions(-DPHONON_BACKEND_DIR_SUFFIX="/${PHONON_LIB_SONAME}_backend/")
- 
- add_library(${PHONON_LIB_SONAME} SHARED ${phonon_LIB_SRCS})
--qt5_use_modules(${PHONON_LIB_SONAME} Core Widgets)
- 
--if(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS)
--    qt5_use_modules(${PHONON_LIB_SONAME} DBus)
--endif(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS)
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(${PHONON_LIB_SONAME} Qt5::Core Qt5::Widgets)
-+    if(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS)
-+        target_link_libraries(${PHONON_LIB_SONAME} Qt5::DBus)
-+    endif(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS)
-+    if(NOT PHONON_NO_GRAPHICSVIEW)
-+        target_link_libraries(${PHONON_LIB_SONAME} Qt5::OpenGL ${OPENGL_gl_LIBRARY})
-+    endif()
-+else()
-+    target_link_libraries(${PHONON_LIB_SONAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-+    if(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS)
-+        target_link_libraries(${PHONON_LIB_SONAME} ${QT_QTDBUS_LIBRARY})
-+    endif(QT_QTDBUS_FOUND AND NOT PHONON_NO_DBUS)
-+    if(NOT PHONON_NO_GRAPHICSVIEW)
-+        target_link_libraries(${PHONON_LIB_SONAME} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY})
-+    endif()
-+    if (QZEITGEIST_FOUND)
-+        target_link_libraries(${PHONON_LIB_SONAME} ${QZEITGEIST_LIBRARY})
-+    endif(QZEITGEIST_FOUND)
-+endif()
- 
- if (PHONON_PULSESUPPORT)
-     target_link_libraries(${PHONON_LIB_SONAME} ${GOBJECT_LIBRARIES} ${PULSEAUDIO_LIBRARY} ${PULSEAUDIO_MAINLOOP_LIBRARY})
- endif (PHONON_PULSESUPPORT)
- 
--if(NOT PHONON_NO_GRAPHICSVIEW)
--    qt5_use_modules(${PHONON_LIB_SONAME} OpenGL)
--    target_link_libraries(${PHONON_LIB_SONAME} ${OPENGL_gl_LIBRARY})
--endif()
--
--if (QZEITGEIST_FOUND)
--    target_link_libraries(${PHONON_LIB_SONAME} ${QZEITGEIST_LIBRARY})
--endif(QZEITGEIST_FOUND)
--
- if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
-   # We need to explicitly link libm to phonon in Solaris
-   target_link_libraries(${PHONON_LIB_SONAME} m)
-diff --git a/phonon/experimental/CMakeLists.txt b/phonon/experimental/CMakeLists.txt
-index e44cb7ac..13101ec9 100644
---- a/phonon/experimental/CMakeLists.txt
-+++ b/phonon/experimental/CMakeLists.txt
-@@ -20,8 +20,13 @@ set(phononexperimental_LIB_SRCS
-     ../abstractvideooutput_p.cpp
-    )
- add_library(${PHONON_LIB_SONAME}experimental SHARED ${phononexperimental_LIB_SRCS})
--qt5_use_modules(${PHONON_LIB_SONAME}experimental Core Widgets)
--target_link_libraries(${PHONON_LIB_SONAME}experimental ${PHONON_LIBS})
-+
-+if(PHONON_BUILD_PHONON4QT5)
-+    target_link_libraries(${PHONON_LIB_SONAME}experimental Qt5::Core Qt5::Widgets ${PHONON_LIBS})
-+else()
-+    target_link_libraries(${PHONON_LIB_SONAME}experimental ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PHONON_LIBS})
-+endif()
-+
- set_target_properties(${PHONON_LIB_SONAME}experimental PROPERTIES
-                                          VERSION ${PHONON_LIB_VERSION}
-                                          SOVERSION ${PHONON_LIB_SOVERSION}
--- 
-2.17.0
-

diff --git a/media-libs/phonon/phonon-4.10.0.ebuild b/media-libs/phonon/phonon-4.10.0.ebuild
deleted file mode 100644
index 5da7537646b..00000000000
--- a/media-libs/phonon/phonon-4.10.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
-else
-	EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
-	inherit git-r3
-fi
-
-inherit cmake-utils qmake-utils
-
-DESCRIPTION="KDE multimedia API"
-HOMEPAGE="https://phonon.kde.org/"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="debug designer gstreamer pulseaudio +vlc"
-
-RDEPEND="
-	!!dev-qt/qtphonon:4
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	designer? ( dev-qt/designer:5 )
-	pulseaudio? (
-		dev-libs/glib:2
-		>=media-sound/pulseaudio-0.9.21[glib]
-	)
-"
-DEPEND="${RDEPEND}
-	kde-frameworks/extra-cmake-modules:5
-	virtual/pkgconfig
-"
-PDEPEND="
-	gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt5(+)] )
-	vlc? ( >=media-libs/phonon-vlc-0.9.0[qt5(+)] )
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DPHONON_BUILD_PHONON4QT5=ON
-		-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
-		-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
-		-DWITH_GLIB2=$(usex pulseaudio)
-		-DWITH_PulseAudio=$(usex pulseaudio)
-		-DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)"/qmake
-	)
-	cmake-utils_src_configure
-}