gentoo resync : 16.04.2018

3 files changed, 137 insertions, 3 deletions

diff --git a/media-libs/libmygpo-qt/Manifest b/media-libs/libmygpo-qt/Manifest
index fca00f1f59c4..532e5d6fe9ad 100644
--- a/media-libs/libmygpo-qt/Manifest
+++ b/media-libs/libmygpo-qt/Manifest
@@ -1,7 +1,8 @@
 AUX libmygpo-qt-1.0.8-fix-JsonCreatorTest-failure.patch 2832 BLAKE2B 54d040461db07b12dc5d259d5521693a4af6dc1f2b55af9418f3b45ffe89024f25f4f388406804e7c1acd9980adbce8f08372fda60b4d6099c76d44bfbb1ec2d SHA512 f51a9edfa359f7bced8c70254c7200aed7688fd356159e6dc53298dc376855c7cfe47ad4ab5e809d8e748b41dccad3175e967c173f1d2ae751c7f2c3e46fce27
+AUX libmygpo-qt-1.1.0_pre20180401-qt-5.11b3.patch 4846 BLAKE2B 05aca9ef29a790243ddc7a8d84cf1c2fe70e51321d4b95c3dd8d3385a29ffa8c2ec12266c6ba742fed458e85f506a0e161b6b89edf96e736c7d922ede8efc94d SHA512 3fa47945af5dff87d781db033b4f9bc34606c8a7a66db5c16091716374774eccd7b3cca16aadadcb063c42a616cfb445ac51e61b055a45832f81742a6e9b2f9e
 DIST libmygpo-qt-1.0.9.tar.gz 65153 BLAKE2B 67ad1530eccabb7fc76f9aaec19714716ee1e55888c02a0c8ca2efb7549929c00fbe86d066c7cd310f6203db27374b70306e737b49eb254eb53b8a1aa6364f45 SHA512 c7920841310c7b971d305e38586238e081c80a449a1b442e668d2b07ada5d6ff626e697db905a83d7b12a06127f975a9b02af13d8d3e1ebee04d407b4d4b48b6
-DIST libmygpo-qt-1.0.9_p20180307.tar.gz 65245 BLAKE2B 16fe3a9659a53c907979156b14ef55a413d1ee856ea6653bc140b39342db721f10b26c3f8ee5fe6be69793f93dbea4acf11eb2589b1c9a9e9bb4e153c0d0fbd8 SHA512 a09f4f2b9f5dda0f23b15b9670c0f1fe76c8a54677633db18b2980a89e2821b494b0ab1d7f97ab973d8ea3f2e2dea49d4010dad7184800582b0dc503dece7897
+DIST libmygpo-qt-1.1.0_pre20180401.tar.gz 64989 BLAKE2B dde55657b6ac391aa64756b40cc0e1152a33ab2c77e7ce8efe1d7731f6485ef7199ac45b41d4eb5df1c2ed86f8e7b86e831f7683f3966574550bd9ea355a8ccd SHA512 3a06d1e40843d460bafba4db166bfcb2f706f906e7d239506bb80ecbc5607c438914d2920f35d65d544596f07d3ed6fbd5e19bd01e5a3a70131aa6d795e3d193
 EBUILD libmygpo-qt-1.0.9.ebuild 1670 BLAKE2B 5aaaa48f08ca84400c554b499499a817b3b7c4b11c9bc97db84b969db86193abf264239c1f33d3304033e451e7c4e1e40f025e7104a3c3bb3ca1831e36b7bfa3 SHA512 6d5c206312cd2cb1bce3e9fdc92ff85a5a7429b6e186032088fc58fde15042d8ba9d6c86e2b7a6f1feda430c95da4c656899a56ad4183acf098736e7bf48af8d
-EBUILD libmygpo-qt-1.0.9_p20180307.ebuild 828 BLAKE2B 93935fa5aa5b1d80341a5e5cc6c681ac1ee6622cdaba74d6fb4c7e28b4f0ba4ff7353fc082652ba0ea1cb849e2a2b8e050b560c790798bfa36e95271c52bf710 SHA512 9797da18e9ff508b1c01d777d572ca26494b4086cf947cf155531fdd91ed0f0ef36f1696f9807e7e5a80b333073123cf0c5cf09dfe1a13552bd18a47d6f3766d
+EBUILD libmygpo-qt-1.1.0_pre20180401.ebuild 876 BLAKE2B 891bb3a733805fe1a35a8ef39e2e62bdad4fa0fe0724182d6d9a231fc78b13c8c21c6a42d27b7b7c1ce7de54d51f043d395eed9388319a1ccde4ef3a31c89005 SHA512 4e7477055a570f8ac70db3857f055fffcc19768dc9027d6fab409680d95ac197b335adf0abcb29737a07b01b7903d3e58d3df1f316622bf1cab0e15cc689e828
 EBUILD libmygpo-qt-9999.ebuild 763 BLAKE2B f939dd1c0f26fb2a940b83d3a709dfac0c7e6ebf25c07c56175313015a4b109333dfbe3bea6c64184a7c3488f3d6faba8c53842a044c990c2daa2dcd75403990 SHA512 3e010b8c420eb3a605f2490cfea52d30e5147abcd5601575dff993743f3a459bdba7abcbe0e5c5371f6f4905f6d7ac5c70e34b9cfff7d71b06994c08d90c9a74
 MISC metadata.xml 347 BLAKE2B 22a365b5f63dd847e2b9ed77d778fd645c8ebb5cbe30f933488739b5e039f879eecb5d07b176a29cd43defc9bb9a73d241c898623c11b60e753fd9a801b823ea SHA512 c9a3b16cdced1a5876ed473cce964ed24e72fac4ed6e78de8d74ac0bac4c3d1a9b6d372e4f2271e1aca75125f22c25c84a2acae448e514d623d524e844bb68db
diff --git a/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0_pre20180401-qt-5.11b3.patch b/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0_pre20180401-qt-5.11b3.patch
new file mode 100644
index 000000000000..2b10ae4d7bd9
--- /dev/null
+++ b/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0_pre20180401-qt-5.11b3.patch
@@ -0,0 +1,131 @@
+From e5128384620014bca2cd9d1b5f31c405818e1a74 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 15 Apr 2018 22:20:34 +0200
+Subject: [PATCH 1/2] Add missing Qt5Network, make BUILD_WITH_QT4 more strict
+
+---
+ CMakeLists.txt | 18 +++++++-----------
+ 1 file changed, 7 insertions(+), 11 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2a1f652..85d46fd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,25 +5,21 @@ project( libmygpo-qt )
+ set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII" )
+ 
+-option(BUILD_WITH_QT4 "Build libmygpo-qt with Qt4 no matter if Qt5 was found" OFF)
++option(BUILD_WITH_QT4 "Build libmygpo-qt with Qt4" OFF)
+ 
+ if( NOT BUILD_WITH_QT4 )
+-    find_package(Qt5Core QUIET)
+-    if( Qt5Core_DIR )
+-        set(MYGPO_QT_VERSION_SUFFIX 5)
++    find_package(Qt5 CONFIG REQUIRED Core Network)
++    set(MYGPO_QT_VERSION_SUFFIX 5)
+ 
+-        macro(qt_wrap_cpp)
+-            qt5_wrap_cpp(${ARGN})
+-        endmacro()
+-    endif()
++    macro(qt_wrap_cpp)
++        qt5_wrap_cpp(${ARGN})
++    endmacro()
+ 
+     # pkg-config names of QtCore and QtNetwork are Qt5Core and Qt5Network for
+     # Qt5
+     set(MYGPO_QT_MAJOR_VERSION "5")
+     set(MYGPO_QT4_QJSON_DEP "")
+-endif()
+-
+-if( NOT Qt5Core_DIR )
++else()
+     message(STATUS "Could not find Qt5, searching for Qt4 instead...")
+     message(STATUS "Qt4 Support is deprecated, building with Qt4 is no longer officially supported")
+     if( MYGPO_BUILD_TESTS )
+-- 
+2.17.0
+
+
+From 1cadc5d15d0de4dd2d7d08069a421337547031d2 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 15 Apr 2018 22:29:33 +0200
+Subject: [PATCH 2/2] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
+
+---
+ CMakeLists.txt       |  3 ---
+ src/CMakeLists.txt   |  8 ++++++--
+ tests/CMakeLists.txt | 12 +++++++++---
+ 3 files changed, 15 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 85d46fd..d6b3a15 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -30,9 +30,6 @@ else()
+     set( QT_DONT_USE_QTGUI TRUE )
+     include( ${QT_USE_FILE} )
+ 
+-    macro(qt5_use_modules)
+-    endmacro()
+-
+     macro(qt_wrap_cpp)
+         qt4_wrap_cpp(${ARGN})
+     endmacro()
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 802125b..253e81e 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -79,9 +79,13 @@ QT_WRAP_CPP(LIBMYGPO_QT_MOC_SRC ${LIBMYGPO_QT_MOC_H} )
+ 
+ add_library( ${MYGPO_QT_TARGET_NAME} SHARED ${LIBMYGPO_QT_SRC} ${LIBMYGPO_QT_MOC_SRC} )
+ 
+-target_link_libraries( ${MYGPO_QT_TARGET_NAME} ${QJSON_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY}  )
+ set_target_properties( ${MYGPO_QT_TARGET_NAME} PROPERTIES VERSION ${MYGPO_QT_VERSION} SOVERSION ${MYGPO_QT_SONAME} DEFINE_SYMBOL MYGPO_MAKEDLL)
+-qt5_use_modules( ${MYGPO_QT_TARGET_NAME} Core Network )
++
++if( NOT BUILD_WITH_QT4 )
++    target_link_libraries( ${MYGPO_QT_TARGET_NAME} Qt5::Core Qt5::Network)
++else()
++    target_link_libraries( ${MYGPO_QT_TARGET_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QJSON_LIBRARIES})
++endif()
+ 
+ install( TARGETS ${MYGPO_QT_TARGET_NAME} EXPORT ${MYGPO_QT_TARGET_NAME}Export DESTINATION ${LIB_INSTALL_DIR} )
+ 
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index a3e3223..4f77158 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -11,11 +11,15 @@ include_directories( ${QJSON_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CU
+ 
+ # UrlBuilder library
+ add_library( UrlBuilder ${TESTOBJECTS_SRCDIR}/UrlBuilder.cpp ${TESTOBJECTS_SRCDIR}/Config.cpp )
+-qt5_use_modules( UrlBuilder Core )
++if( NOT BUILD_WITH_QT4 )
++    target_link_libraries( UrlBuilder Qt5::Core )
++endif()
+ # JSONCreator library
+ QT_WRAP_CPP(LIBMYGPO_QT_MOC_SRC ${TESTOBJECTS_SRCDIR}/EpisodeAction.h ${TESTOBJECTS_SRCDIR}/EpisodeAction_p.h )
+ add_library( JsonCreator ${TESTOBJECTS_SRCDIR}/JsonCreator.cpp ${TESTOBJECTS_SRCDIR}/EpisodeAction.cpp ${TESTOBJECTS_SRCDIR}/qjsonwrapper/Json.cpp ${LIBMYGPO_QT_MOC_SRC})
+-qt5_use_modules( JsonCreator Core Network )
++if( NOT BUILD_WITH_QT4 )
++    target_link_libraries( JsonCreator Qt5::Core Qt5::Network )
++endif()
+ 
+ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
+ 
+@@ -25,7 +29,9 @@ macro(add_libmygpo_test _source)
+     add_executable(${_name} ${_source} ${${_name}_MOC_SRC})
+     target_link_libraries(${_name} ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTNETWORK_LIBRARY})
+     add_test(${_name}-test ${EXECUTABLE_OUTPUT_PATH}/${_name})
+-    qt5_use_modules(${_name} Network Test)
++    if( NOT BUILD_WITH_QT4 )
++        target_link_libraries(${_name} Qt5::Network Qt5::Test)
++    endif()
+ endmacro(add_libmygpo_test)
+ 
+ add_libmygpo_test( UrlBuilderTest.cpp )
+-- 
+2.17.0
+
diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.0.9_p20180307.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0_pre20180401.ebuild
index f528099bacff..7f7d18f3bf03 100644
--- a/media-libs/libmygpo-qt/libmygpo-qt-1.0.9_p20180307.ebuild
+++ b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0_pre20180401.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-COMMIT=28c492b6b789ba1c3c292995a52fe4e456268182
+COMMIT=b84549b8803033b803f7d4dc14d5dcd7a5c344b7
 inherit cmake-utils vcs-snapshot
 
 DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice"
@@ -30,6 +30,8 @@ DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.11b3.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_WITH_QT4=OFF