gentoo resync : 14.04.2018

3 files changed, 194 insertions, 1 deletions

diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index 3e055cb7da9b..f62495cb97f1 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,7 +1,8 @@
+AUX phonon-4.10.0-qt-5.11.patch 7953 BLAKE2B 980598938afe0f64c872f41dfaea13e44d25c50dcaedaf7540000c6dcf657b86560a0a63fdb86f954ed8323b167b4aa50f9918598cff908798c887b3db99c996 SHA512 1760c5f5adaead31ab6bd8f80cc7765ed26186337f4558e313b62a0ecda1065eae1d7dcd4eeeacc3c30c1c998ffffc2b7f8338acdbcf604e81fe3cecc2e9fd8d
 AUX phonon-4.7.0-plugin-install.patch 1252 BLAKE2B b9c0022007babf5f56d7f651e18bce5ef3c7b36a5bb6d2d042fd14639433faadd6a99f0f276751fc4849ab2845f265481d4c307a1d16af029f3c11c6b6104f7b SHA512 62b6cffa985057722c5d2dbe07bd1124f9fcb6e1b861fe76fafd46ec980702655d55b37a29006e79c8e28e5a4df82dafa1a308dca8a6abd3402889777a93d8f2
 DIST phonon-4.10.0.tar.xz 322072 BLAKE2B ba49893368fc13946e2e83a498787bf8fe605b2b3d8e2b1c28eacad5ec13d9679b8c9ddd2adc54c340bbc60a01c7c1143ccaca6f26b86be105cb7502de5f39fc SHA512 6074c7c33edcdfeed8a6199024f1faedebe09652cf5d01075f2d97146b54c4269924b69ca8298e2341c0cf6ca4d18f930a59a937697f6f282b6de8e976d097c4
 DIST phonon-4.9.1.tar.xz 321872 BLAKE2B a315189f578ad71e241ebfbea1bc6c81f06cf041b2eb2914d66f82f35c69c3811d16dbf4303551aafdd1a63d6ff6da619b06a6f03274a9867393f6d032348673 SHA512 a1741765071a625d9b9073d9ad1571b91cf5bfce2223bd1b034828d02dc52624587a6ec5352f3702df79f6e4201007596843fbcb9f15c9b489a858200787d728
-EBUILD phonon-4.10.0.ebuild 1318 BLAKE2B f81d0fa3e4d96d19c0ca73f69c70929d0f3f8ef5ed6d0056c5c77b7de3ba4770e8b0f5260ee761374b3bd92091af015364d8d3651c322603e580c4a309b58809 SHA512 ec473a05b87f24fa10b52097f4a3dec0d890ab368a92b4bbcf176a8b80242776a37bc999b23c6f16da123e76c9df1b8a61e21d90e579718ad48e550c8cf457f8
+EBUILD phonon-4.10.0.ebuild 1364 BLAKE2B 0e9d09cf4b7bcb75bfb626cabb4a1a184dfbc8b7f5b70edf42b60568a0c417c9e643bee145d524e87789feabf0830879fe26b45a810b3a5cb03573cdd2a56e8d SHA512 31fd8461c9be7fd99a9c73643edb871253de55e80d5847b8bded86ba771f126eb0670eba553597d2c1fb4dc6fd038815a7eb554e6a315117988ea1040af4e3c7
 EBUILD phonon-4.9.1-r1.ebuild 3088 BLAKE2B 0d162cfad037d952af2b935999fb0634073103e727a7426101cb2cffb03b8bed18461687ec767e81a6a1d9728ff6cbd02793e8d60940b0ea56b2b7deca17118b SHA512 22ab58d17069ebbe15f0f7bce13026c4fd0accd32db2fdd6d158da489ac0399407c840b01195b22b2e5fa454443b9f71ff94f4cc24f31f0ef55eb87563c1d7ec
 EBUILD phonon-9999.ebuild 1306 BLAKE2B 0c124727d6c0052966c90042246023d3927ddd7a076b79c8e0f56e43e1c2727863ded2c0aedc2f6524b14e446365f04965e3ae1d579477726b50600a29f5101f SHA512 916fca63f9ddd17f207b1349507bd408c462551d14380a3428c783177eb2a68012bffb697882b52339442b39b253280af39808ee8e8bba9278d2e9fbade6aca4
 MISC metadata.xml 394 BLAKE2B e551fa12fcce92bd237d1cdb3fcbd496768e012004ace1e08a89f1e0e5f5c997d5b9d1488afce03925337d28a9c431994ce23244ffcb46f7138cde951dc26662 SHA512 963308198d2057bc2869eb21b644c59211f3c4bb04a46de3cca04dc85cdcf67b113555870149b971c8c43a0c64fb88cd141ccf20740f6428d1573485844574a6
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
new file mode 100644
index 000000000000..f8444b343a40
--- /dev/null
+++ b/media-libs/phonon/files/phonon-4.10.0-qt-5.11.patch
@@ -0,0 +1,190 @@
+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
index 478b0d3bb95d..5da7537646b2 100644
--- a/media-libs/phonon/phonon-4.10.0.ebuild
+++ b/media-libs/phonon/phonon-4.10.0.ebuild
@@ -41,6 +41,8 @@ PDEPEND="
 	vlc? ( >=media-libs/phonon-vlc-0.9.0[qt5(+)] )
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DPHONON_BUILD_PHONON4QT5=ON