Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-misc/skanlite/files/, kde-misc/skanlite/
Date: Mon, 02 Apr 2018 20:26:56
Message-Id: 1522700793.cf91f215ac2b6e5f9ca768c667da41fe2a6994af.asturm@gentoo
1 commit: cf91f215ac2b6e5f9ca768c667da41fe2a6994af
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 2 19:36:47 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 2 20:26:33 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf91f215
7
8 kde-misc/skanlite: Drop 2.1.0
9
10 Package-Manager: Portage-2.3.28, Repoman-2.3.9
11
12 kde-misc/skanlite/Manifest | 1 -
13 kde-misc/skanlite/files/skanlite-2.1.0-cmake.patch | 100 ---------------------
14 kde-misc/skanlite/skanlite-2.1.0.ebuild | 36 --------
15 3 files changed, 137 deletions(-)
16
17 diff --git a/kde-misc/skanlite/Manifest b/kde-misc/skanlite/Manifest
18 index 5c50cf0bea3..1cd9330cd6c 100644
19 --- a/kde-misc/skanlite/Manifest
20 +++ b/kde-misc/skanlite/Manifest
21 @@ -1,3 +1,2 @@
22 DIST skanlite-2.0.1.tar.xz 2139624 BLAKE2B f6959650e6e59899e24f20214b2e94b0f4c004982e2ff961384c4a07e13305c6f839f679759db088c16ab879b499eb700edb5f7d8d65056ddd155c3a55f5365b SHA512 2dc29f3aeca32a7afb515ae9349fab7ef635de731718b53ceaf532cbd3860fbb07bd936fd2988b6dddb74109775e22752ffd05a0a3d0218b9c8ae393af52b14e
23 DIST skanlite-2.1.0.1.tar.xz 2151312 BLAKE2B c03ace256fd4159e36c7eb871f4f88a11142e36e427120560a09a0d0516f91450d350d4ae5db2004da6493d3a2a0aaaf5d45b4a688f3943cf92b76a71fb5f937 SHA512 8eb1a32994259010d4a134c1b25b74b8cc03ba4fa6ce70ee2026a3070c675c2b11f38770453d197008fbe12df976cc653362eb44d6ef89a7f0173c3a2cef3658
24 -DIST skanlite-2.1.0.tar.xz 1121468 BLAKE2B 8fd9bc7018e812203023a7e2906eb724e01baca70dbcccc08633f49e08de687738390a87d5c27526c084601d76f3cf272998818ad102d3dcd47518fab2fa47f6 SHA512 b346998f37def6b99c2feba7b323dbcb299c2bb0553598f83a30f8e7a04af1deaf60e7f5c70c4b663e0aecf95e7ee03252a15ef61745e6bc7d1c5a9d617aec00
25
26 diff --git a/kde-misc/skanlite/files/skanlite-2.1.0-cmake.patch b/kde-misc/skanlite/files/skanlite-2.1.0-cmake.patch
27 deleted file mode 100644
28 index fe5600c8c9a..00000000000
29 --- a/kde-misc/skanlite/files/skanlite-2.1.0-cmake.patch
30 +++ /dev/null
31 @@ -1,100 +0,0 @@
32 -From ac188879ebf7cab5631213305f289bec4ab25613 Mon Sep 17 00:00:00 2001
33 -From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
34 -Date: Sun, 1 Apr 2018 13:36:48 +0200
35 -Subject: [PATCH 1/2] Cleanup CMakeLists.txt
36 -
37 -Cleanup duplicate find Qt5 and move all below #Dependencies block.
38 -Sort dependencies.
39 -KF5Sane is not an actual framework, so separate it from KF5 modules.
40 ----
41 - CMakeLists.txt | 30 +++++++++++++-----------------
42 - 1 file changed, 13 insertions(+), 17 deletions(-)
43 -
44 -diff --git a/CMakeLists.txt b/CMakeLists.txt
45 -index d05fb37..6aacfb9 100644
46 ---- a/CMakeLists.txt
47 -+++ b/CMakeLists.txt
48 -@@ -17,44 +17,40 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
49 - include(KDECMakeSettings)
50 - include(GenerateExportHeader)
51 -
52 --find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets)
53 --
54 - # be not so strict with the poor developer who just wants to use strings
55 - remove_definitions(-DQT_NO_URL_CAST_FROM_STRING)
56 - remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
57 -
58 --set(KF5_VERSION "5.1.0")
59 -+set(REQUIRED_QT_VERSION "5.2.0")
60 -+set(KF5_MIN_VERSION "5.1.0")
61 -
62 - ecm_setup_version(
63 -- ${KF5_VERSION}
64 -+ ${KF5_MIN_VERSION}
65 - VARIABLE_PREFIX SKANLITE
66 - VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/skanlite_version.h"
67 - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/src/version.h.cmake"
68 - )
69 -
70 -+set(SKANLITE_VERSION_STRING "2.1.0")
71 -+
72 -+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/version.h)
73 -+
74 - # Dependencies
75 --set(REQUIRED_QT_VERSION "5.2.0")
76 -+find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets)
77 -
78 --# Required Qt5 components to build this framework
79 --find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core)
80 - find_package(PNG REQUIRED)
81 --
82 - include_directories(${PNG_INCLUDE_DIRS})
83 -
84 --set(SKANLITE_VERSION_STRING "2.1.0")
85 --
86 --configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/version.h)
87 --
88 --find_package(KF5 ${KF5_VERSION} REQUIRED
89 -- COMPONENTS # alias to find_package(KFGuiAddons ${KF5_VERSION} REQUIRED)
90 -+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
91 - CoreAddons # KAboutData
92 -+ DocTools # yields kdoctools_create_handbook
93 - I18n
94 -- XmlGui # KAboutApplicationDialog
95 - KIO # contains the KIOWidgets which we use in target_link_libraries
96 -- DocTools # yields kdoctools_create_handbook
97 -- Sane # will find KF5Sane
98 -+ XmlGui # KAboutApplicationDialog
99 - )
100 -
101 -+find_package(KF5Sane ${KF5_MIN_VERSION} REQUIRED)
102 -+
103 - add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
104 -
105 - # Subdirectories
106 ---
107 -2.16.3
108 -
109 -
110 -From 8bcc7e4fb701d2e95b8024df86830b9eeb6c97de Mon Sep 17 00:00:00 2001
111 -From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
112 -Date: Sun, 1 Apr 2018 13:50:34 +0200
113 -Subject: [PATCH 2/2] Make use of FeatureSummary
114 -
115 ----
116 - CMakeLists.txt | 2 ++
117 - 1 file changed, 2 insertions(+)
118 -
119 -diff --git a/CMakeLists.txt b/CMakeLists.txt
120 -index 6aacfb9..1736bff 100644
121 ---- a/CMakeLists.txt
122 -+++ b/CMakeLists.txt
123 -@@ -58,3 +58,5 @@ add_subdirectory(src)
124 - add_subdirectory(doc)
125 - add_subdirectory(autotests)
126 - add_subdirectory(tests)
127 -+
128 -+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
129 ---
130 -2.16.3
131 -
132
133 diff --git a/kde-misc/skanlite/skanlite-2.1.0.ebuild b/kde-misc/skanlite/skanlite-2.1.0.ebuild
134 deleted file mode 100644
135 index c0883592a57..00000000000
136 --- a/kde-misc/skanlite/skanlite-2.1.0.ebuild
137 +++ /dev/null
138 @@ -1,36 +0,0 @@
139 -# Copyright 1999-2018 Gentoo Foundation
140 -# Distributed under the terms of the GNU General Public License v2
141 -
142 -EAPI=6
143 -
144 -KDE_HANDBOOK="forceoptional"
145 -KDE_TEST="forceoptional"
146 -inherit kde5
147 -
148 -DESCRIPTION="KDE image scanning application"
149 -HOMEPAGE="https://www.kde.org/applications/graphics/skanlite"
150 -SRC_URI="mirror://kde/stable/${PN}/2.1/${P}.tar.xz"
151 -
152 -LICENSE="|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )"
153 -KEYWORDS="~amd64 ~x86"
154 -IUSE=""
155 -
156 -DEPEND="
157 - $(add_frameworks_dep kconfig)
158 - $(add_frameworks_dep kconfigwidgets)
159 - $(add_frameworks_dep kcoreaddons)
160 - $(add_frameworks_dep ki18n)
161 - $(add_frameworks_dep kio)
162 - $(add_frameworks_dep kjobwidgets)
163 - $(add_frameworks_dep kwidgetsaddons)
164 - $(add_frameworks_dep kxmlgui)
165 - $(add_kdeapps_dep libksane)
166 - $(add_qt_dep qtgui)
167 - $(add_qt_dep qtwidgets)
168 - media-libs/libpng:0=
169 -"
170 -RDEPEND="${DEPEND}
171 - !kde-misc/skanlite:4
172 -"
173 -
174 -PATCHES=( "${FILESDIR}/${P}-cmake.patch" )