gentoo resync : 05.04.2018

3 files changed, 26 insertions, 29 deletions

diff --git a/kde-misc/skanlite/Manifest b/kde-misc/skanlite/Manifest
index b02a168cbc83..9b2feb3b406d 100644
--- a/kde-misc/skanlite/Manifest
+++ b/kde-misc/skanlite/Manifest
@@ -1,6 +1,6 @@
-AUX skanlite-2.1.0-cmake.patch 3169 BLAKE2B f0e6f4568bf6bdd42dd0c8d2038bbfc503441ee5e0dae10cc1008aac0fb062eceb93fa7db93c7194f5a22b5711aa35cca78d17219e671c7dc4eef6e2d03d891d SHA512 a598d0011819eabb80296ab6a66742fb3735307fe324207a13160ca26a876a01f1b0e17d5c67a531869f413f372efc6843a9d1ef5f3b016187c4088d17cfb5f3
+AUX skanlite-2.1.0.1-cmake.patch 2978 BLAKE2B 68d39415f4199b018028b16727f734117a7499be83904e80b9aeb2837a835141363516e0b452d81ddaab8b874de75e869168c9215babb3230c9a02a33b7f33e7 SHA512 7a7ee0f6b7b82a2b8e90ac58d632c92eb7c0992195f104ed794d14c451a21fefb7a3621bc22c14948b83b8e9aa86d9868ebd97d780a8d31f01186485d507d3ce
 DIST skanlite-2.0.1.tar.xz 2139624 BLAKE2B f6959650e6e59899e24f20214b2e94b0f4c004982e2ff961384c4a07e13305c6f839f679759db088c16ab879b499eb700edb5f7d8d65056ddd155c3a55f5365b SHA512 2dc29f3aeca32a7afb515ae9349fab7ef635de731718b53ceaf532cbd3860fbb07bd936fd2988b6dddb74109775e22752ffd05a0a3d0218b9c8ae393af52b14e
-DIST skanlite-2.1.0.tar.xz 1121468 BLAKE2B 8fd9bc7018e812203023a7e2906eb724e01baca70dbcccc08633f49e08de687738390a87d5c27526c084601d76f3cf272998818ad102d3dcd47518fab2fa47f6 SHA512 b346998f37def6b99c2feba7b323dbcb299c2bb0553598f83a30f8e7a04af1deaf60e7f5c70c4b663e0aecf95e7ee03252a15ef61745e6bc7d1c5a9d617aec00
+DIST skanlite-2.1.0.1.tar.xz 2151312 BLAKE2B c03ace256fd4159e36c7eb871f4f88a11142e36e427120560a09a0d0516f91450d350d4ae5db2004da6493d3a2a0aaaf5d45b4a688f3943cf92b76a71fb5f937 SHA512 8eb1a32994259010d4a134c1b25b74b8cc03ba4fa6ce70ee2026a3070c675c2b11f38770453d197008fbe12df976cc653362eb44d6ef89a7f0173c3a2cef3658
 EBUILD skanlite-2.0.1.ebuild 1037 BLAKE2B b3c71e2dda3337152176a621b3fe600a10ff99fdb1ac8ee11a51d7e0bc1f2852e12cf13f0533ad77682ae3f7e91e027ea37f50cca07b0bdf2bcd8592c2511717 SHA512 9f736d35833822020e1d569c03ed67d1695fdfcdd81db2996fe2212b55db192ad27ce9bc659fb22b558066ccea60fcb1a9978da61501b88a6346fde0000a6717
-EBUILD skanlite-2.1.0.ebuild 887 BLAKE2B 07625cdeb396047ad3a55197f7d24b976b7f932756e4bce5067123a0019c0fb6a635deb5d205c676ed34a83a231c102a0194ec0a86768c9ba825561a3942f6a4 SHA512 1b570692ae768fd6cf9d581c0c47e4949e3aff32193446125188bf8305615743eb8ad2d500a8203b6cd53f89ca440bfd80425c8ae54a00d039cbad9355848787
+EBUILD skanlite-2.1.0.1.ebuild 887 BLAKE2B 07625cdeb396047ad3a55197f7d24b976b7f932756e4bce5067123a0019c0fb6a635deb5d205c676ed34a83a231c102a0194ec0a86768c9ba825561a3942f6a4 SHA512 1b570692ae768fd6cf9d581c0c47e4949e3aff32193446125188bf8305615743eb8ad2d500a8203b6cd53f89ca440bfd80425c8ae54a00d039cbad9355848787
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/skanlite/files/skanlite-2.1.0-cmake.patch b/kde-misc/skanlite/files/skanlite-2.1.0.1-cmake.patch
index fe5600c8c9a4..7b7daae11eac 100644
--- a/kde-misc/skanlite/files/skanlite-2.1.0-cmake.patch
+++ b/kde-misc/skanlite/files/skanlite-2.1.0.1-cmake.patch
@@ -1,17 +1,28 @@
-From ac188879ebf7cab5631213305f289bec4ab25613 Mon Sep 17 00:00:00 2001
+From 7c155671b5ea1a7ed1244510e79e094fc6f8ff4e Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 1 Apr 2018 13:36:48 +0200
-Subject: [PATCH 1/2] Cleanup CMakeLists.txt
+Date: Mon, 2 Apr 2018 21:27:52 +0200
+Subject: [PATCH] Cleanup CMakeLists.txt
 
+Summary:
 Cleanup duplicate find Qt5 and move all below #Dependencies block.
 Sort dependencies.
 KF5Sane is not an actual framework, so separate it from KF5 modules.
+
+Make use of FeatureSummary
+
+Reviewers: sars
+
+Reviewed By: sars
+
+Subscribers: ltoscano
+
+Differential Revision: https://phabricator.kde.org/D11861
 ---
- CMakeLists.txt | 30 +++++++++++++-----------------
- 1 file changed, 13 insertions(+), 17 deletions(-)
+ CMakeLists.txt | 32 +++++++++++++++-----------------
+ 1 file changed, 15 insertions(+), 17 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d05fb37..6aacfb9 100644
+index 2c23351..6b326df 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -17,44 +17,40 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
@@ -36,7 +47,7 @@ index d05fb37..6aacfb9 100644
    PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/src/version.h.cmake"
  )
  
-+set(SKANLITE_VERSION_STRING "2.1.0")
++set(SKANLITE_VERSION_STRING "2.1.0.1")
 +
 +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/version.h)
 +
@@ -50,7 +61,7 @@ index d05fb37..6aacfb9 100644
 -
  include_directories(${PNG_INCLUDE_DIRS})
  
--set(SKANLITE_VERSION_STRING "2.1.0")
+-set(SKANLITE_VERSION_STRING "2.1.0.1")
 -
 -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/version.h)
 -
@@ -72,29 +83,15 @@ index d05fb37..6aacfb9 100644
  add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
  
  # Subdirectories
--- 
-2.16.3
-
-
-From 8bcc7e4fb701d2e95b8024df86830b9eeb6c97de Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 1 Apr 2018 13:50:34 +0200
-Subject: [PATCH 2/2] Make use of FeatureSummary
-
----
- CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6aacfb9..1736bff 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -58,3 +58,5 @@ add_subdirectory(src)
+@@ -62,6 +58,8 @@ add_subdirectory(src)
  add_subdirectory(doc)
  add_subdirectory(autotests)
  add_subdirectory(tests)
 +
 +feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+ 
+ find_package(KF5I18n CONFIG REQUIRED)
+ ki18n_install(po)
 -- 
 2.16.3
 
diff --git a/kde-misc/skanlite/skanlite-2.1.0.ebuild b/kde-misc/skanlite/skanlite-2.1.0.1.ebuild
index c0883592a570..c0883592a570 100644
--- a/kde-misc/skanlite/skanlite-2.1.0.ebuild
+++ b/kde-misc/skanlite/skanlite-2.1.0.1.ebuild