Gentoo Archives: gentoo-commits

From: Tim Harder <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/files/, media-gfx/gmic/
Date: Fri, 03 Jan 2020 06:34:15
Message-Id: 1578033098.4e9ad7bfce476e056f61fcaba6b256038bc6598e.radhermit@gentoo
1 commit: 4e9ad7bfce476e056f61fcaba6b256038bc6598e
2 Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 3 06:29:28 2020 +0000
4 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 3 06:31:38 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e9ad7bf
7
8 media-gfx/gmic: remove old
9
10 Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
11
12 media-gfx/gmic/Manifest | 2 -
13 media-gfx/gmic/files/gmic-2.6.7-qt-cmake.patch | 54 --------
14 media-gfx/gmic/gmic-2.7.0.ebuild | 171 -------------------------
15 media-gfx/gmic/gmic-2.7.1.ebuild | 171 -------------------------
16 4 files changed, 398 deletions(-)
17
18 diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
19 index edf579caa75..ccf872e7f68 100644
20 --- a/media-gfx/gmic/Manifest
21 +++ b/media-gfx/gmic/Manifest
22 @@ -1,4 +1,2 @@
23 -DIST gmic_2.7.0.tar.gz 5823828 BLAKE2B 5a59e247ca5eb5f1aad841597fb008d9816e3c968224b8f59e51bc443218292601f8b5eea76353429677eb3ddc3fcf8f8ff28eaedd3a8ec66d84ebeb825fe7d3 SHA512 8269540253774061b108b309463dfbadb76b925e36f5d62be59020fef4178fc83b79a221f32104880b51cd9d7aef67a698beb648c6e544e4e58b88796e46a0c4
24 -DIST gmic_2.7.1.tar.gz 5843308 BLAKE2B 8a348d9444ba0879816a438161c130e9fc706178f93c6a1202586209f2d3779dfce48d2bd3147b47dec9614e4a3687108913b45e6c91afc8bc6266aabee26012 SHA512 9a2f8536217ba449207022bb1dfc92d3826bea80f8e7a048880c5c4451070e7a09b21c0c17199941284040b8f3661dc93737d0f67975c58b6a7015038c49465e
25 DIST gmic_2.7.2.tar.gz 5848157 BLAKE2B 192eb02c1079072064d67d4cc834e8d674b55e0ce663501775ca2d31a4627129d9c1075d217800049e150c3dc7b6059c2521be1a594034df04beef416c6d888a SHA512 d8e26720d30235d613a618ce01615bd82fe0caf73979e5797865a459d7d7f877169111da98db88bfff62d0383e0301789aae7d3449ca9869d43847c6a5cbd7fb
26 DIST gmic_2.8.1.tar.gz 5995556 BLAKE2B 3f3c35290d18c927745b4b527f5297a9c3beb109a34b7e8b70dcff064f2587e022616e0fe5063d79e94b8fbd0ce3f70b6b5417ebaa0f0cc0f61891d79330afa9 SHA512 0f9ae9454c6f053026cdace43b24e32183f384d79099bc654c3b154647d24ef6541b1fae62cb17e27e527fb51ed8cef03a46490af3ace1551646fc8b3cd64eb9
27
28 diff --git a/media-gfx/gmic/files/gmic-2.6.7-qt-cmake.patch b/media-gfx/gmic/files/gmic-2.6.7-qt-cmake.patch
29 deleted file mode 100644
30 index e268558a95e..00000000000
31 --- a/media-gfx/gmic/files/gmic-2.6.7-qt-cmake.patch
32 +++ /dev/null
33 @@ -1,54 +0,0 @@
34 -Fix linking with fftw when thread support is enabled and fix source code file
35 -name typo.
36 -
37 ---- gmic-qt/CMakeLists.txt
38 -+++ gmic-qt/CMakeLists.txt
39 -@@ -13,6 +13,7 @@
40 - set(CMAKE_AUTOUIC OFF)
41 - set(CMAKE_AUTORCC ON)
42 - set(CMAKE_INCLUDE_CURRENT_DIR ON)
43 -+set(EXTRA_LIBRARIES)
44 -
45 - set (GMIC_QT_HOST "gimp" CACHE STRING "Define for which host qmic-qt will be built: gimp, krita or none.")
46 - if (${GMIC_QT_HOST} STREQUAL "none")
47 -@@ -143,8 +144,13 @@
48 - #
49 - find_package(FFTW3 REQUIRED)
50 - add_definitions(-Dcimg_use_fftw3 )
51 --add_definitions(-Dcimg_use_fftw3_singlethread )
52 - include_directories(${FFTW3_INCLUDE_DIR})
53 -+find_library(FFTW3_THREADS_LIB fftw3_threads PATHS ${FFTW3_LIBRARY_DIRS})
54 -+if(FFTW3_THREADS_LIB STREQUAL "FFTW3_THREADS_LIB-NOTFOUND")
55 -+ add_definitions(-Dcimg_use_fftw3_singlethread)
56 -+else()
57 -+ list(APPEND EXTRA_LIBRARIES "-lfftw3_threads")
58 -+endif()
59 -
60 - #
61 - # CURL
62 -@@ -185,6 +191,7 @@
63 - ${PNG_LIBRARIES}
64 - ${FFTW3_LIBRARIES}
65 - ${ZLIB_LIBRARIES}
66 -+ ${EXTRA_LIBRARIES}
67 - )
68 -
69 - if (CURL_FOUND)
70 -@@ -278,7 +285,7 @@
71 - src/FilterParameters/ChoiceParameter.h
72 - src/FilterParameters/ColorParameter.h
73 - src/FilterParameters/ConstParameter.h
74 -- src/FilterParameters/CustomDoubleSpinbox.h
75 -+ src/FilterParameters/CustomDoubleSpinBox.h
76 - src/FilterParameters/FileParameter.h
77 - src/FilterParameters/FilterParametersWidget.h
78 - src/FilterParameters/FloatParameter.h
79 -@@ -350,7 +357,7 @@
80 - src/FilterParameters/ChoiceParameter.cpp
81 - src/FilterParameters/ColorParameter.cpp
82 - src/FilterParameters/ConstParameter.cpp
83 -- src/FilterParameters/CustomDoubleSpinbox.cpp
84 -+ src/FilterParameters/CustomDoubleSpinBox.cpp
85 - src/FilterParameters/FileParameter.cpp
86 - src/FilterParameters/FilterParametersWidget.cpp
87 - src/FilterParameters/FloatParameter.cpp
88
89 diff --git a/media-gfx/gmic/gmic-2.7.0.ebuild b/media-gfx/gmic/gmic-2.7.0.ebuild
90 deleted file mode 100644
91 index 1edb9254ff0..00000000000
92 --- a/media-gfx/gmic/gmic-2.7.0.ebuild
93 +++ /dev/null
94 @@ -1,171 +0,0 @@
95 -# Copyright 1999-2020 Gentoo Authors
96 -# Distributed under the terms of the GNU General Public License v2
97 -
98 -EAPI=7
99 -
100 -CMAKE_BUILD_TYPE=Release
101 -CMAKE_MIN_VERSION=3.9
102 -
103 -inherit cmake-utils bash-completion-r1
104 -
105 -if [[ ${PV} == "9999" ]]; then
106 - EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
107 - inherit git-r3
108 -else
109 - SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
110 - KEYWORDS="~amd64 ~x86"
111 -fi
112 -
113 -DESCRIPTION="GREYC's Magic Image Converter"
114 -HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
115 -
116 -LICENSE="CeCILL-2 GPL-3"
117 -SLOT="0"
118 -IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
119 -REQUIRED_USE="
120 - || ( cli gimp krita qt5 )
121 - gimp? ( png zlib fftw X )
122 - krita? ( png zlib fftw X )
123 - qt5? ( png zlib fftw X )
124 -"
125 -
126 -MIN_QT_VER="5.2.0"
127 -QT_DEPEND="
128 - >=dev-qt/qtcore-${MIN_QT_VER}:5=
129 - >=dev-qt/qtgui-${MIN_QT_VER}:5=
130 - >=dev-qt/qtnetwork-${MIN_QT_VER}:5=
131 - >=dev-qt/qtwidgets-${MIN_QT_VER}:5=
132 -"
133 -COMMON_DEPEND="
134 - curl? ( net-misc/curl )
135 - fftw? ( sci-libs/fftw:3.0=[threads] )
136 - gimp? (
137 - >=media-gfx/gimp-2.8.0
138 - ${QT_DEPEND}
139 - )
140 - graphicsmagick? ( media-gfx/graphicsmagick:0= )
141 - jpeg? ( virtual/jpeg:0 )
142 - krita? ( ${QT_DEPEND} )
143 - opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
144 - openexr? (
145 - media-libs/ilmbase:0=
146 - media-libs/openexr:0=
147 - )
148 - png? ( media-libs/libpng:0= )
149 - qt5? ( ${QT_DEPEND} )
150 - tiff? ( media-libs/tiff:0 )
151 - X? (
152 - x11-libs/libX11
153 - x11-libs/libXext
154 - )
155 - zlib? ( sys-libs/zlib:0= )"
156 -RDEPEND="${COMMON_DEPEND}
157 - ffmpeg? ( media-video/ffmpeg:0= )
158 -"
159 -DEPEND="${COMMON_DEPEND}
160 - gimp? ( dev-qt/linguist-tools )
161 - krita? ( dev-qt/linguist-tools )
162 - qt5? ( dev-qt/linguist-tools )
163 -"
164 -BDEPEND="virtual/pkgconfig"
165 -
166 -pkg_pretend() {
167 - if use openmp ; then
168 - tc-has-openmp || die "Please switch to an openmp compatible compiler"
169 - fi
170 -
171 - if ! test-flag-CXX -std=c++11 ; then
172 - die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
173 - fi
174 -}
175 -
176 -src_prepare() {
177 - local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
178 - cmake-utils_src_prepare
179 - sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
180 -
181 - if use gimp || use krita || use qt5; then
182 - sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
183 - local S="${S}/gmic-qt"
184 - PATCHES=( "${FILESDIR}"/${PN}-2.6.7-qt-cmake.patch )
185 - cmake-utils_src_prepare
186 - fi
187 -}
188 -
189 -src_configure() {
190 - local mycmakeargs=(
191 - -DBUILD_LIB=ON
192 - -DBUILD_LIB_STATIC=$(usex static-libs)
193 - -DBUILD_CLI=$(usex cli)
194 - -DBUILD_MAN=$(usex cli)
195 - -DBUILD_BASH_COMPLETION=$(usex cli)
196 - -DCUSTOM_CFLAGS=ON
197 - -DENABLE_CURL=$(usex curl)
198 - -DENABLE_X=$(usex X)
199 - -DENABLE_FFMPEG=$(usex ffmpeg)
200 - -DENABLE_FFTW=$(usex fftw)
201 - -DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
202 - -DENABLE_JPEG=$(usex jpeg)
203 - -DENABLE_OPENCV=$(usex opencv)
204 - -DENABLE_OPENEXR=$(usex openexr)
205 - -DENABLE_OPENMP=$(usex openmp)
206 - -DENABLE_PNG=$(usex png)
207 - -DENABLE_TIFF=$(usex tiff)
208 - -DENABLE_ZLIB=$(usex zlib)
209 - -DENABLE_DYNAMIC_LINKING=ON
210 - )
211 -
212 - cmake-utils_src_configure
213 -
214 - # configure gmic-qt frontends
215 - local CMAKE_USE_DIR="${S}/gmic-qt"
216 - mycmakeargs=(
217 - -DENABLE_DYNAMIC_LINKING=ON
218 - -DENABLE_CURL=$(usex curl)
219 - -DGMIC_LIB_PATH="${BUILD_DIR}"
220 - -DGMIC_PATH="${S}/src"
221 - )
222 -
223 - if use gimp; then
224 - mycmakeargs+=( -DGMIC_QT_HOST=gimp )
225 - BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
226 - fi
227 -
228 - if use krita; then
229 - mycmakeargs+=( -DGMIC_QT_HOST=krita )
230 - BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
231 - fi
232 -
233 - if use qt5; then
234 - mycmakeargs+=( -DGMIC_QT_HOST=none )
235 - BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
236 - fi
237 -}
238 -
239 -src_compile() {
240 - cmake-utils_src_compile
241 -
242 - # build gmic-qt frontends
243 - local S="${S}/gmic-qt"
244 - use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
245 - use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
246 - use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
247 -}
248 -
249 -src_install() {
250 - cmake-utils_src_install
251 - dodoc README
252 - use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
253 -
254 - local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
255 - insinto "${PLUGINDIR}"
256 - doins resources/gmic_cluts.gmz
257 -
258 - # install gmic-qt frontends
259 - if use gimp; then
260 - exeinto "${PLUGINDIR}"
261 - doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
262 - fi
263 - use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
264 - use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
265 -}
266
267 diff --git a/media-gfx/gmic/gmic-2.7.1.ebuild b/media-gfx/gmic/gmic-2.7.1.ebuild
268 deleted file mode 100644
269 index 2a575ef1eb6..00000000000
270 --- a/media-gfx/gmic/gmic-2.7.1.ebuild
271 +++ /dev/null
272 @@ -1,171 +0,0 @@
273 -# Copyright 1999-2020 Gentoo Authors
274 -# Distributed under the terms of the GNU General Public License v2
275 -
276 -EAPI=7
277 -
278 -CMAKE_BUILD_TYPE=Release
279 -CMAKE_MIN_VERSION=3.9
280 -
281 -inherit cmake-utils bash-completion-r1
282 -
283 -if [[ ${PV} == "9999" ]]; then
284 - EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
285 - inherit git-r3
286 -else
287 - SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
288 - KEYWORDS="~amd64 ~x86"
289 -fi
290 -
291 -DESCRIPTION="GREYC's Magic Image Converter"
292 -HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
293 -
294 -LICENSE="CeCILL-2 GPL-3"
295 -SLOT="0"
296 -IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
297 -REQUIRED_USE="
298 - || ( cli gimp krita qt5 )
299 - gimp? ( png zlib fftw X )
300 - krita? ( png zlib fftw X )
301 - qt5? ( png zlib fftw X )
302 -"
303 -
304 -MIN_QT_VER="5.2.0"
305 -QT_DEPEND="
306 - >=dev-qt/qtcore-${MIN_QT_VER}:5=
307 - >=dev-qt/qtgui-${MIN_QT_VER}:5=
308 - >=dev-qt/qtnetwork-${MIN_QT_VER}:5=
309 - >=dev-qt/qtwidgets-${MIN_QT_VER}:5=
310 -"
311 -COMMON_DEPEND="
312 - curl? ( net-misc/curl )
313 - fftw? ( sci-libs/fftw:3.0=[threads] )
314 - gimp? (
315 - >=media-gfx/gimp-2.8.0
316 - ${QT_DEPEND}
317 - )
318 - graphicsmagick? ( media-gfx/graphicsmagick:0= )
319 - jpeg? ( virtual/jpeg:0 )
320 - krita? ( ${QT_DEPEND} )
321 - opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
322 - openexr? (
323 - media-libs/ilmbase:0=
324 - media-libs/openexr:0=
325 - )
326 - png? ( media-libs/libpng:0= )
327 - qt5? ( ${QT_DEPEND} )
328 - tiff? ( media-libs/tiff:0 )
329 - X? (
330 - x11-libs/libX11
331 - x11-libs/libXext
332 - )
333 - zlib? ( sys-libs/zlib:0= )"
334 -RDEPEND="${COMMON_DEPEND}
335 - ffmpeg? ( media-video/ffmpeg:0= )
336 -"
337 -DEPEND="${COMMON_DEPEND}
338 - gimp? ( dev-qt/linguist-tools )
339 - krita? ( dev-qt/linguist-tools )
340 - qt5? ( dev-qt/linguist-tools )
341 -"
342 -BDEPEND="virtual/pkgconfig"
343 -
344 -pkg_pretend() {
345 - if use openmp ; then
346 - tc-has-openmp || die "Please switch to an openmp compatible compiler"
347 - fi
348 -
349 - if ! test-flag-CXX -std=c++11 ; then
350 - die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
351 - fi
352 -}
353 -
354 -src_prepare() {
355 - local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch )
356 - cmake-utils_src_prepare
357 - sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
358 -
359 - if use gimp || use krita || use qt5; then
360 - sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
361 - local S="${S}/gmic-qt"
362 - PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch )
363 - cmake-utils_src_prepare
364 - fi
365 -}
366 -
367 -src_configure() {
368 - local mycmakeargs=(
369 - -DBUILD_LIB=ON
370 - -DBUILD_LIB_STATIC=$(usex static-libs)
371 - -DBUILD_CLI=$(usex cli)
372 - -DBUILD_MAN=$(usex cli)
373 - -DBUILD_BASH_COMPLETION=$(usex cli)
374 - -DCUSTOM_CFLAGS=ON
375 - -DENABLE_CURL=$(usex curl)
376 - -DENABLE_X=$(usex X)
377 - -DENABLE_FFMPEG=$(usex ffmpeg)
378 - -DENABLE_FFTW=$(usex fftw)
379 - -DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
380 - -DENABLE_JPEG=$(usex jpeg)
381 - -DENABLE_OPENCV=$(usex opencv)
382 - -DENABLE_OPENEXR=$(usex openexr)
383 - -DENABLE_OPENMP=$(usex openmp)
384 - -DENABLE_PNG=$(usex png)
385 - -DENABLE_TIFF=$(usex tiff)
386 - -DENABLE_ZLIB=$(usex zlib)
387 - -DENABLE_DYNAMIC_LINKING=ON
388 - )
389 -
390 - cmake-utils_src_configure
391 -
392 - # configure gmic-qt frontends
393 - local CMAKE_USE_DIR="${S}/gmic-qt"
394 - mycmakeargs=(
395 - -DENABLE_DYNAMIC_LINKING=ON
396 - -DENABLE_CURL=$(usex curl)
397 - -DGMIC_LIB_PATH="${BUILD_DIR}"
398 - -DGMIC_PATH="${S}/src"
399 - )
400 -
401 - if use gimp; then
402 - mycmakeargs+=( -DGMIC_QT_HOST=gimp )
403 - BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure
404 - fi
405 -
406 - if use krita; then
407 - mycmakeargs+=( -DGMIC_QT_HOST=krita )
408 - BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure
409 - fi
410 -
411 - if use qt5; then
412 - mycmakeargs+=( -DGMIC_QT_HOST=none )
413 - BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure
414 - fi
415 -}
416 -
417 -src_compile() {
418 - cmake-utils_src_compile
419 -
420 - # build gmic-qt frontends
421 - local S="${S}/gmic-qt"
422 - use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; }
423 - use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; }
424 - use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; }
425 -}
426 -
427 -src_install() {
428 - cmake-utils_src_install
429 - dodoc README
430 - use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
431 -
432 - local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
433 - insinto "${PLUGINDIR}"
434 - doins resources/gmic_cluts.gmz
435 -
436 - # install gmic-qt frontends
437 - if use gimp; then
438 - exeinto "${PLUGINDIR}"
439 - doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
440 - fi
441 - use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
442 - use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
443 -}