[gentoo-commits] repo/gentoo:master commit in: kde-misc/skanlite/, kde-misc/skanlite/files/

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

commit:     75a167ae1971db9087e46b165ef7ba196b34413e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  2 19:36:27 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr  2 20:26:29 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75a167ae

kde-misc/skanlite: 2.1.0.1 version bump

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 kde-misc/skanlite/Manifest                         |  1 +
 .../skanlite/files/skanlite-2.1.0.1-cmake.patch    | 97 ++++++++++++++++++++++
 kde-misc/skanlite/skanlite-2.1.0.1.ebuild          | 36 ++++++++
 3 files changed, 134 insertions(+)

diff --git a/kde-misc/skanlite/Manifest b/kde-misc/skanlite/Manifest
index 8ce37d19c56..5c50cf0bea3 100644
--- a/kde-misc/skanlite/Manifest
+++ b/kde-misc/skanlite/Manifest
@@ -1,2 +1,3 @@
 DIST skanlite-2.0.1.tar.xz 2139624 BLAKE2B f6959650e6e59899e24f20214b2e94b0f4c004982e2ff961384c4a07e13305c6f839f679759db088c16ab879b499eb700edb5f7d8d65056ddd155c3a55f5365b SHA512 2dc29f3aeca32a7afb515ae9349fab7ef635de731718b53ceaf532cbd3860fbb07bd936fd2988b6dddb74109775e22752ffd05a0a3d0218b9c8ae393af52b14e
+DIST skanlite-2.1.0.1.tar.xz 2151312 BLAKE2B c03ace256fd4159e36c7eb871f4f88a11142e36e427120560a09a0d0516f91450d350d4ae5db2004da6493d3a2a0aaaf5d45b4a688f3943cf92b76a71fb5f937 SHA512 8eb1a32994259010d4a134c1b25b74b8cc03ba4fa6ce70ee2026a3070c675c2b11f38770453d197008fbe12df976cc653362eb44d6ef89a7f0173c3a2cef3658
 DIST skanlite-2.1.0.tar.xz 1121468 BLAKE2B 8fd9bc7018e812203023a7e2906eb724e01baca70dbcccc08633f49e08de687738390a87d5c27526c084601d76f3cf272998818ad102d3dcd47518fab2fa47f6 SHA512 b346998f37def6b99c2feba7b323dbcb299c2bb0553598f83a30f8e7a04af1deaf60e7f5c70c4b663e0aecf95e7ee03252a15ef61745e6bc7d1c5a9d617aec00

diff --git a/kde-misc/skanlite/files/skanlite-2.1.0.1-cmake.patch b/kde-misc/skanlite/files/skanlite-2.1.0.1-cmake.patch
new file mode 100644
index 00000000000..7b7daae11ea
--- /dev/null
+++ b/kde-misc/skanlite/files/skanlite-2.1.0.1-cmake.patch
@@ -0,0 +1,97 @@
+From 7c155671b5ea1a7ed1244510e79e094fc6f8ff4e Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+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 | 32 +++++++++++++++-----------------
+ 1 file changed, 15 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2c23351..6b326df 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,44 +17,40 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+ include(KDECMakeSettings)
+ include(GenerateExportHeader)
+ 
+-find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets)
+-
+ # be not so strict with the poor developer who just wants to use strings
+ remove_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+ remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
+ 
+-set(KF5_VERSION "5.1.0")
++set(REQUIRED_QT_VERSION "5.2.0")
++set(KF5_MIN_VERSION "5.1.0")
+ 
+ ecm_setup_version(
+-  ${KF5_VERSION}
++  ${KF5_MIN_VERSION}
+   VARIABLE_PREFIX SKANLITE
+   VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/skanlite_version.h"
+   PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/src/version.h.cmake"
+ )
+ 
++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)
++
+ # Dependencies
+-set(REQUIRED_QT_VERSION "5.2.0")
++find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets)
+ 
+-# Required Qt5 components to build this framework
+-find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core)
+ find_package(PNG REQUIRED)
+-
+ include_directories(${PNG_INCLUDE_DIRS})
+ 
+-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)
+-
+-find_package(KF5 ${KF5_VERSION} REQUIRED
+-    COMPONENTS # alias to find_package(KFGuiAddons ${KF5_VERSION} REQUIRED)
++find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+         CoreAddons # KAboutData
++        DocTools # yields kdoctools_create_handbook
+         I18n
+-        XmlGui # KAboutApplicationDialog
+         KIO # contains the KIOWidgets which we use in target_link_libraries
+-        DocTools # yields kdoctools_create_handbook
+-        Sane # will find KF5Sane
++        XmlGui # KAboutApplicationDialog
+ )
+ 
++find_package(KF5Sane ${KF5_MIN_VERSION} REQUIRED)
++
+ add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+ 
+ # Subdirectories
+@@ -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.1.ebuild b/kde-misc/skanlite/skanlite-2.1.0.1.ebuild
new file mode 100644
index 00000000000..c0883592a57
--- /dev/null
+++ b/kde-misc/skanlite/skanlite-2.1.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE image scanning application"
+HOMEPAGE="https://www.kde.org/applications/graphics/skanlite"
+SRC_URI="mirror://kde/stable/${PN}/2.1/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep libksane)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	media-libs/libpng:0=
+"
+RDEPEND="${DEPEND}
+	!kde-misc/skanlite:4
+"
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )