gentoo resync : 19.04.2018

4 files changed, 113 insertions, 108 deletions

diff --git a/media-libs/liblastfm/Manifest b/media-libs/liblastfm/Manifest
index 07d86468343d..1853fd7a1738 100644
--- a/media-libs/liblastfm/Manifest
+++ b/media-libs/liblastfm/Manifest
@@ -1,7 +1,6 @@
-AUX liblastfm-1.1.0_pre20150206-cmake.patch 2863 BLAKE2B a3bfd133819615ac059e11072ef6761074a2c9bae35caac25ec7c99c6e91ca0a13ddd6aa44302033a30d9f7328da1587e667ca02941b86e24fe50eb44279ddc5 SHA512 e8bd568d9b48f67f491db88099cb2f84410196cb4bfb3b31c1ca8c6c8e14f49727edbd3d6e80f25cb5603aeab79f57d334cf9266447a8abf9bb18f74a5d70983
-AUX liblastfm-1.1.0_pre20150206-qt-5.11b3.patch 6169 BLAKE2B 101077c99e91bc3f1b2024788adaed119d903012fe2263886d19105ff14b86120459ef7c0a795fe320373ebc19dff63cb6993d6655bb19ef5c432cf601e1c267 SHA512 e0b477fe8e059861a11791d98a315af1d9e2e84328913b1db84573c712db815efb82b0d68edfb7ec18934c864b5a51196365531d3ae0cf70a501ac72315dd6ee
+AUX liblastfm-1.1.0_pre20150206-qt-5.11b3.patch 9192 BLAKE2B 0c4e96448692869202514ad54e0c1b371e839c9f9c4ea6ff9b085fc28f29d9f65912cd501d0c83b442242e292f868eb1d79eea6e36d20ef967cab9fb681b6b2b SHA512 f88acaed5b7a53e7e4ab47100a769a88c9579f373b7d6d305b8fd9ccd3cc749a5d5ec544e0d8f30734d940016bb8ce23e49ffc4347afd87601ad013a7111bacb
 DIST liblastfm-1.0.9.tar.gz 119320 BLAKE2B 4c661b703af1e94b42d2bddffd994e0d33360979e47e0079f3824a9febcdba22c3ccedd8599da5c1d4b701a329cb4779bd680181837152cb1d23a231ec6eee73 SHA512 9d2bcf71b26d8a95920a07649c97b3faa071c49a8269268bb08fab01537392774873233d03cada09d3ce3fe2c45b0affdb74cd27c41f69342b973896effe1018
 DIST liblastfm-1.1.0_pre20150206.tar.gz 119380 BLAKE2B ec532b7577e60c02f9e8202b06e4e496b052801d60a27795d58204c6fbec62eea24512979ea9e42f643e7cfc01794982e07b808f6411b884893e13c29d9e17b0 SHA512 984d4b6b36a12e019e486425d243fc5be24fc3968b30f7ec746204c976b9c526477d56793205c9a6eed79bff1b33a2b1c7063d1d08fd376c4b89346337d8b166
 EBUILD liblastfm-1.0.9-r1.ebuild 1713 BLAKE2B 6f97bd3c43a5435b3b5e793966e71a8f23406589b9457b5d1715e6c6d364e9212616b4b1e74619b3f901b0b0f64d6105d9bff897b8586bac5c5693392a704614 SHA512 08262b6e37da21b66d869504c671cb46d4402a204a705571adac67bcc70b9bafad389905c8ec339196927580c0de3994113bc73ac6c41d365c4a1d1bc4a3de5b
-EBUILD liblastfm-1.1.0_pre20150206.ebuild 1100 BLAKE2B 98936bbc8dd4d9cddb3537c5d326cf36a511bf100ecb323db3ea7fe089c4775e1e511f4fc20c4c016f9f8a34e36582b5c0d16fafacedfec29f346550b319cc76 SHA512 cc1861f792777edbec11c57e8df39eb56c2594cbb5f764954ff74f8fc8749b34c2ce4a5932e570e7f01aa145e44c6e20069e968043b15ab9230ef6b9f12facc6
+EBUILD liblastfm-1.1.0_pre20150206.ebuild 1067 BLAKE2B 3a511140f786137ff95137efc75e2715978d67e5aae850f6949fd58f950dedfe150e873383c73ea17c146de2e216a97701e509b07bc4debc8f5141431010c25a SHA512 ea439b4e081b9089c856cd85cde0fb16e0e6dacff23f4a9aa35fdc17f10f3a69dc4291e88516cd0acbd1c91b5e67867b20ea6aa05023ef26356efb6638e414a6
 MISC metadata.xml 416 BLAKE2B 8f559223d9c09d5bcb551e582240252467d3846806e2d1ca1c2fe243286cd88b7f5760ec8313f15924b4041f55937c08795df1d4485e96c6523721c910b33efd SHA512 61b4387e1a4d837b28f13a7c705f1ab043fefb1ef80dda47399d52cb1a14ba79127f323967eb2e993fd6118375f134d9894fea9e132cc147c883758d1d5222a6
diff --git a/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-cmake.patch b/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-cmake.patch
deleted file mode 100644
index a42baf0ca30e..000000000000
--- a/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-cmake.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 8703c12d7a177627fab4a2f67018d01cc7bf0808 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 1 Apr 2018 11:51:42 +0200
-Subject: [PATCH 1/3] Make Qt5 build default and simplify logic, add missing
- deps
-
----
- CMakeLists.txt | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index be88967..a8c81dd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -27,16 +27,12 @@ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Module
- # setup qt stuff
- set(CMAKE_AUTOMOC ON)
- 
--option(BUILD_WITH_QT4 "Build liblastfm with Qt4 no matter if Qt5 was found" OFF)
-+option(BUILD_WITH_QT4 "Build liblastfm with Qt4" OFF)
- 
--if( NOT BUILD_WITH_QT4 )
--    # try Qt5 first, and prefer that if found
--    find_package(Qt5Core QUIET)
--endif()
-+if(NOT BUILD_WITH_QT4)
-+    find_package(Qt5 CONFIG REQUIRED Core Network Sql Xml)
- 
--if(Qt5Core_DIR)
-     set(LASTFM_LIB_VERSION_SUFFIX 5)
--    message(STATUS "Found Qt5! Please keep in mind, this is highly experimental and not our main development target..")
-     include_directories(${Qt5Core_INCLUDE_DIRS})
-     if(UNIX AND NOT APPLE)
-         find_package(Qt5DBus REQUIRED)
--- 
-2.16.3
-
-
-From 22f6900552839bc90c0fc68b62707d42544eaccf Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 1 Apr 2018 11:56:48 +0200
-Subject: [PATCH 2/3] Make use of FeatureSummary
-
----
- CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a8c81dd..d5fd5b1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,6 +20,7 @@ option(BUILD_TESTS "Build liblastfm tests" ON)
- 
- # installation dirs
- include(GNUInstallDirs)
-+include(FeatureSummary)
- 
- #cmake module path
- set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules")
-@@ -93,3 +94,5 @@ if(BUILD_TESTS)
-     enable_testing()
-     add_subdirectory(tests)
- endif()
-+
-+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
--- 
-2.16.3
-
-
-From bf3ee28f1aa5de7a3f3f5a3077adc97804e27b0e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 1 Apr 2018 12:06:48 +0200
-Subject: [PATCH 3/3] Cleanup include dirs
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d5fd5b1..ef7fdd5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -34,10 +34,10 @@ if(NOT BUILD_WITH_QT4)
-     find_package(Qt5 CONFIG REQUIRED Core Network Sql Xml)
- 
-     set(LASTFM_LIB_VERSION_SUFFIX 5)
--    include_directories(${Qt5Core_INCLUDE_DIRS})
-     if(UNIX AND NOT APPLE)
-         find_package(Qt5DBus REQUIRED)
-     endif()
-+    include_directories(Qt5::Core Qt5::Network Qt5::Xml)
- 
- #     macro(qt_wrap_ui)
- #         qt5_wrap_ui(${ARGN})
--- 
-2.16.3
-
diff --git a/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-qt-5.11b3.patch b/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-qt-5.11b3.patch
index dfbd694ed3d5..fc0e9b8938dd 100644
--- a/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-qt-5.11b3.patch
+++ b/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-qt-5.11b3.patch
@@ -1,7 +1,113 @@
-From 5d6ef4c27804a43b26dffcb46d6b27523a1ca340 Mon Sep 17 00:00:00 2001
+From 62a08d490a1e75e3ef5d08f3fb37e65c1563e706 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 1 Apr 2018 11:51:42 +0200
+Subject: [PATCH 1/4] Make Qt5 build default and simplify logic, add missing
+ deps
+
+---
+ CMakeLists.txt | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index be88967..e628611 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,19 +27,19 @@ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Module
+ # setup qt stuff
+ set(CMAKE_AUTOMOC ON)
+ 
+-option(BUILD_WITH_QT4 "Build liblastfm with Qt4 no matter if Qt5 was found" OFF)
++option(BUILD_WITH_QT4 "Build liblastfm with Qt4" OFF)
+ 
+-if( NOT BUILD_WITH_QT4 )
+-    # try Qt5 first, and prefer that if found
+-    find_package(Qt5Core QUIET)
+-endif()
++if(NOT BUILD_WITH_QT4)
++    find_package(Qt5 REQUIRED COMPONENTS Core Network Xml CONFIG)
++
++    if(BUILD_FINGERPRINT)
++        find_package(Qt5Sql REQUIRED CONFIG)
++    endif()
+ 
+-if(Qt5Core_DIR)
+     set(LASTFM_LIB_VERSION_SUFFIX 5)
+-    message(STATUS "Found Qt5! Please keep in mind, this is highly experimental and not our main development target..")
+     include_directories(${Qt5Core_INCLUDE_DIRS})
+     if(UNIX AND NOT APPLE)
+-        find_package(Qt5DBus REQUIRED)
++        find_package(Qt5DBus REQUIRED CONFIG)
+     endif()
+ 
+ #     macro(qt_wrap_ui)
+-- 
+2.17.0
+
+
+From ff32d56e5e1bd8b1f86a8e9840c778249ff19118 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 1 Apr 2018 11:56:48 +0200
+Subject: [PATCH 2/4] Make use of FeatureSummary
+
+---
+ CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e628611..dcdfd91 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,6 +20,7 @@ option(BUILD_TESTS "Build liblastfm tests" ON)
+ 
+ # installation dirs
+ include(GNUInstallDirs)
++include(FeatureSummary)
+ 
+ #cmake module path
+ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules")
+@@ -97,3 +98,5 @@ if(BUILD_TESTS)
+     enable_testing()
+     add_subdirectory(tests)
+ endif()
++
++feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+-- 
+2.17.0
+
+
+From 5762278b29c1ab6559dcca7a1e8fbad1d75134da Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 1 Apr 2018 12:06:48 +0200
+Subject: [PATCH 3/4] Cleanup include dirs
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dcdfd91..52589b5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -38,10 +38,10 @@ if(NOT BUILD_WITH_QT4)
+     endif()
+ 
+     set(LASTFM_LIB_VERSION_SUFFIX 5)
+-    include_directories(${Qt5Core_INCLUDE_DIRS})
+     if(UNIX AND NOT APPLE)
+         find_package(Qt5DBus REQUIRED CONFIG)
+     endif()
++    include_directories(Qt5::Core Qt5::Network Qt5::Xml)
+ 
+ #     macro(qt_wrap_ui)
+ #         qt5_wrap_ui(${ARGN})
+-- 
+2.17.0
+
+
+From aeb0cbc56376021444a56a984613faacefedfea9 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
 Date: Sun, 15 Apr 2018 21:31:14 +0200
-Subject: [PATCH] Fix build with Qt 5.11_beta3 (drop qt5_use_modules)
+Subject: [PATCH 4/4] Fix build with Qt 5.11_beta3 (drop qt5_use_modules)
 
 ---
  CMakeLists.txt                 |  3 --
@@ -11,10 +117,10 @@ Subject: [PATCH] Fix build with Qt 5.11_beta3 (drop qt5_use_modules)
  4 files changed, 55 insertions(+), 47 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index be88967..57da635 100644
+index 52589b5..c8bc89d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -56,9 +56,6 @@ if(Qt5Core_DIR)
+@@ -57,9 +57,6 @@ if(NOT BUILD_WITH_QT4)
  #     endmacro()
  else()
      find_package(Qt4 COMPONENTS QtCore QtNetwork QtXml REQUIRED)
diff --git a/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild b/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild
index 6e0926da1028..b20109621436 100644
--- a/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild
+++ b/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild
@@ -33,10 +33,7 @@ DEPEND="${RDEPEND}
 # 1 of 2 (UrlBuilderTest) is failing, last checked version 1.0.9
 RESTRICT="test"
 
-PATCHES=(
-	"${FILESDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${P}-qt-5.11b3.patch"
-)
+PATCHES=( "${FILESDIR}/${P}-qt-5.11b3.patch" )
 
 src_configure() {
 	# demos not working