Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/, media-gfx/krita/files/
Date: Fri, 08 Sep 2017 21:00:33
Message-Id: 1504904396.2cc5dd0ef9bd058906055037bf798fa5127d7141.johu@gentoo
1 commit: 2cc5dd0ef9bd058906055037bf798fa5127d7141
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 8 20:59:33 2017 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 8 20:59:56 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cc5dd0e
7
8 media-gfx/krita: Remove 3.2.0
9
10 Package-Manager: Portage-2.3.8, Repoman-2.3.3
11
12 media-gfx/krita/Manifest | 1 -
13 media-gfx/krita/files/krita-3.2.0-unused-dep.patch | 69 ----------------
14 media-gfx/krita/krita-3.2.0.ebuild | 94 ----------------------
15 3 files changed, 164 deletions(-)
16
17 diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
18 index 1fab2f458db..58962f199bf 100644
19 --- a/media-gfx/krita/Manifest
20 +++ b/media-gfx/krita/Manifest
21 @@ -1,3 +1,2 @@
22 DIST krita-3.1.4.tar.gz 209778186 SHA256 741837b0d12afa795dbbca45d5efc78966f3041dbfb22a268c101c7dc23e82aa SHA512 6695d8d09552de2d98cb4a8fac1aefc6b5e35df50d7b72c088f11a25af54574b303a7445b4a9cb099844cdf0729a185f03fd208ab2f98329123398fd54a374df WHIRLPOOL 9b8819432594d10377ef6db5adaca06193044203ae5b870a2f014171c817dd2ffc251bd20af0a05183251a798d06fc6aa7b33c1a640879af3ac3c01c0e9869e7
23 -DIST krita-3.2.0.tar.gz 207016115 SHA256 0891be48a0338e1419d084da594900864b85de89cc4a38c8946d907cc1009356 SHA512 62fc8f333097eb23bd631f4e28a23c38bfffba2206277463454f2b9cd199a2972b185511407d50e62ce069c3dfbcfadcebbbb8faa89484f41bcbed3b352e27d5 WHIRLPOOL 403d0381af6fcf9404b790dc34feb26705629795f77c2fb61d50bfb6691872ffb1d9c56099841088a9d32135fe23ed91cd8f35eb491de2888aa0e6b01c83ef74
24 DIST krita-3.2.1.tar.gz 207014866 SHA256 ef06cee677d75861edca0e1f825bca42ff59b7200aeb827e16f8d1fb5ef14e39 SHA512 ddc7153a3fcef072de762cd48d4d6df765cc88b7a413028b3aec5690382c1ab7f61f6ae37070c78ef2be1bdc26107908d288976bfa12d14ca35934ce33fb10a3 WHIRLPOOL 79bc89b7ebf63b2a31bac726e91e4b77bf7b2a6eafe15a6bf15baf935f2bf56e2f612359fc16c7129251623dfe4d7fe53cd9d2f42d423385487a832309afd17e
25
26 diff --git a/media-gfx/krita/files/krita-3.2.0-unused-dep.patch b/media-gfx/krita/files/krita-3.2.0-unused-dep.patch
27 deleted file mode 100644
28 index 34031b51bac..00000000000
29 --- a/media-gfx/krita/files/krita-3.2.0-unused-dep.patch
30 +++ /dev/null
31 @@ -1,69 +0,0 @@
32 -From 176546ed492883b63f6b8c274a97ce781af3631c Mon Sep 17 00:00:00 2001
33 -From: Heiko Becker <heirecka@×××××××.org>
34 -Date: Wed, 16 Aug 2017 23:35:07 +0200
35 -Subject: Remove unused dependency
36 -
37 -Summary:
38 -libcurl doesn't seem to be used anymore since
39 -427a9ede658e4bee0e96e09741adb879e396c0c1 and the removal of the gmic
40 -plugin.
41 -
42 -Test Plan: Still builds fine.
43 -
44 -Reviewers: #krita, rempt
45 -
46 -Subscribers: woltherav
47 -
48 -Tags: #krita
49 -
50 -Differential Revision: https://phabricator.kde.org/D7360
51 ----
52 - CMakeLists.txt | 10 ----------
53 - README_PACKAGERS.md | 3 ---
54 - 2 files changed, 13 deletions(-)
55 -
56 -diff --git a/CMakeLists.txt b/CMakeLists.txt
57 -index 5575b8c..b1edfc1 100644
58 ---- a/CMakeLists.txt
59 -+++ b/CMakeLists.txt
60 -@@ -604,16 +604,6 @@ set_package_properties(OpenMP PROPERTIES
61 - TYPE OPTIONAL
62 - PURPOSE "Optionally used by the G'Mic plugin")
63 -
64 --##
65 --## Test for Curl (for G'Mic)
66 --##
67 --find_package(CURL)
68 --set_package_properties(CURL PROPERTIES
69 -- DESCRIPTION "A tool to fetch remote data"
70 -- URL "http://curl.haxx.se/"
71 -- TYPE OPTIONAL
72 -- PURPOSE "Optionally used by the G'Mic plugin")
73 --
74 - ############################
75 - #############################
76 - ## Add Krita helper macros ##
77 -diff --git a/README_PACKAGERS.md b/README_PACKAGERS.md
78 -index ef66f9d..bd3d694 100644
79 ---- a/README_PACKAGERS.md
80 -+++ b/README_PACKAGERS.md
81 -@@ -23,8 +23,6 @@ There are four forks of 3rd party libraries that are relevant and cannot be repl
82 -
83 - * plugins/impex/xcf/3rdparty contains the xcftools code. This has never been released as a library
84 -
85 --* plugins/extensions/gmic/3rdparty contains G'Mic. This has never been released as a shared library.
86 --
87 - * libs/image/3rdparty contains einspline. This code is directly linke d into the kritaimage library and has never been released as a separate library.
88 -
89 - == Build flags ==
90 -@@ -47,7 +45,6 @@ Krita depends on:
91 - * ilmbase
92 - * jpeg: Note that libjpeg-turbo is recommended.
93 - * lcms2
94 -- * libcurl
95 - * libraw
96 - * opencolorio
97 - * openexr
98 ---
99 -cgit v0.11.2
100 -
101
102 diff --git a/media-gfx/krita/krita-3.2.0.ebuild b/media-gfx/krita/krita-3.2.0.ebuild
103 deleted file mode 100644
104 index fb7757c8404..00000000000
105 --- a/media-gfx/krita/krita-3.2.0.ebuild
106 +++ /dev/null
107 @@ -1,94 +0,0 @@
108 -# Copyright 1999-2017 Gentoo Foundation
109 -# Distributed under the terms of the GNU General Public License v2
110 -
111 -EAPI=6
112 -
113 -KDE_TEST="forceoptional"
114 -inherit kde5
115 -
116 -DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
117 -HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
118 -SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
119 -
120 -LICENSE="GPL-3"
121 -KEYWORDS="~amd64 ~x86"
122 -IUSE="color-management fftw +gsl +jpeg openexr pdf qtmedia +raw tiff vc"
123 -
124 -COMMON_DEPEND="
125 - $(add_frameworks_dep karchive)
126 - $(add_frameworks_dep kcompletion)
127 - $(add_frameworks_dep kconfig)
128 - $(add_frameworks_dep kcoreaddons)
129 - $(add_frameworks_dep kcrash)
130 - $(add_frameworks_dep kguiaddons)
131 - $(add_frameworks_dep ki18n)
132 - $(add_frameworks_dep kiconthemes)
133 - $(add_frameworks_dep kio)
134 - $(add_frameworks_dep kitemmodels)
135 - $(add_frameworks_dep kitemviews)
136 - $(add_frameworks_dep kwidgetsaddons)
137 - $(add_frameworks_dep kwindowsystem)
138 - $(add_frameworks_dep kxmlgui)
139 - $(add_qt_dep qtconcurrent)
140 - $(add_qt_dep qtdbus)
141 - $(add_qt_dep qtgui '-gles2')
142 - $(add_qt_dep qtnetwork)
143 - $(add_qt_dep qtprintsupport)
144 - $(add_qt_dep qtsvg)
145 - $(add_qt_dep qtwidgets)
146 - $(add_qt_dep qtx11extras)
147 - $(add_qt_dep qtxml)
148 - dev-libs/boost:=
149 - media-gfx/exiv2:=
150 - media-libs/lcms
151 - media-libs/libpng:0=
152 - sys-libs/zlib
153 - virtual/opengl
154 - x11-libs/libX11
155 - x11-libs/libxcb
156 - x11-libs/libXi
157 - color-management? ( media-libs/opencolorio )
158 - fftw? ( sci-libs/fftw:3.0= )
159 - gsl? ( sci-libs/gsl:= )
160 - jpeg? ( virtual/jpeg:0 )
161 - openexr? (
162 - media-libs/ilmbase:=
163 - media-libs/openexr
164 - )
165 - pdf? ( app-text/poppler[qt5] )
166 - qtmedia? ( $(add_qt_dep qtmultimedia) )
167 - raw? ( media-libs/libraw:= )
168 - tiff? ( media-libs/tiff:0 )
169 -"
170 -DEPEND="${COMMON_DEPEND}
171 - dev-cpp/eigen:3
172 - dev-lang/perl
173 - sys-devel/gettext
174 - vc? ( >=dev-libs/vc-1.1.0 )
175 -"
176 -RDEPEND="${COMMON_DEPEND}
177 - !app-office/calligra:4[calligra_features_krita]
178 - !app-office/calligra-l10n:4[calligra_features_krita(+)]
179 -"
180 -
181 -PATCHES=(
182 - "${FILESDIR}"/${P}-tests-optional.patch
183 - "${FILESDIR}"/${P}-unused-dep.patch
184 -)
185 -
186 -src_configure() {
187 - local mycmakeargs=(
188 - $(cmake-utils_use_find_package color-management OCIO)
189 - $(cmake-utils_use_find_package fftw FFTW3)
190 - $(cmake-utils_use_find_package gsl GSL)
191 - $(cmake-utils_use_find_package jpeg JPEG)
192 - $(cmake-utils_use_find_package openexr OpenEXR)
193 - $(cmake-utils_use_find_package pdf Poppler)
194 - $(cmake-utils_use_find_package qtmedia Qt5Multimedia)
195 - $(cmake-utils_use_find_package raw LibRaw)
196 - $(cmake-utils_use_find_package tiff TIFF)
197 - $(cmake-utils_use_find_package vc Vc)
198 - )
199 -
200 - kde5_src_configure
201 -}