Gentoo Archives: gentoo-commits

From: Marek Szuba <marecki@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
Date: Tue, 09 Feb 2021 09:27:38
Message-Id: 1612862727.7412f904e54b0d1285d008df4e4f91beb7ad0f3e.marecki@gentoo
1 commit: 7412f904e54b0d1285d008df4e4f91beb7ad0f3e
2 Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 9 09:21:55 2021 +0000
4 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 9 09:25:27 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7412f904
7
8 media-gfx/gmic-2.9.5: drop IUSE=digikam
9
10 The digiKam host got removed from gmic-qt (which comes bunded with G'MIC
11 itself) in late January 2021.
12
13 Closes: https://bugs.gentoo.org/769560
14 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
15
16 media-gfx/gmic/gmic-2.9.5.ebuild | 21 ++-------------------
17 1 file changed, 2 insertions(+), 19 deletions(-)
18
19 diff --git a/media-gfx/gmic/gmic-2.9.5.ebuild b/media-gfx/gmic/gmic-2.9.5.ebuild
20 index 30c1bc1b4da..20cad100504 100644
21 --- a/media-gfx/gmic/gmic-2.9.5.ebuild
22 +++ b/media-gfx/gmic/gmic-2.9.5.ebuild
23 @@ -20,9 +20,8 @@ HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
24
25 LICENSE="CeCILL-2 GPL-3"
26 SLOT="0"
27 -IUSE="cli curl digikam ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
28 +IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
29 REQUIRED_USE="
30 - digikam? ( png zlib fftw X )
31 gimp? ( png zlib fftw X )
32 krita? ( png zlib fftw X )
33 qt5? ( png zlib fftw X )
34 @@ -37,10 +36,6 @@ QT_DEPEND="
35 "
36 COMMON_DEPEND="
37 curl? ( net-misc/curl )
38 - digikam? (
39 - media-gfx/digikam
40 - ${QT_DEPEND}
41 - )
42 fftw? ( sci-libs/fftw:3.0=[threads] )
43 gimp? (
44 media-gfx/gimp:0/2
45 @@ -66,7 +61,6 @@ RDEPEND="${COMMON_DEPEND}
46 ffmpeg? ( media-video/ffmpeg:0= )
47 "
48 DEPEND="${COMMON_DEPEND}
49 - digikam? ( dev-qt/linguist-tools )
50 gimp? ( dev-qt/linguist-tools )
51 krita? ( dev-qt/linguist-tools )
52 qt5? ( dev-qt/linguist-tools )
53 @@ -89,7 +83,7 @@ src_prepare() {
54 cmake_src_prepare
55 sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
56
57 - if use digikam || use gimp || use krita || use qt5; then
58 + if use gimp || use krita || use qt5; then
59 # respect user flags
60 sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
61 -e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
62 @@ -135,11 +129,6 @@ src_configure() {
63 -DGMIC_PATH="${S}/src"
64 )
65
66 - if use digikam; then
67 - mycmakeargs+=( -DGMIC_QT_HOST=digikam )
68 - BUILD_DIR="${BUILD_DIR}"/digikam cmake_src_configure
69 - fi
70 -
71 if use gimp; then
72 mycmakeargs+=( -DGMIC_QT_HOST=gimp )
73 BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
74 @@ -161,7 +150,6 @@ src_compile() {
75
76 # build gmic-qt frontends
77 local S="${S}/gmic-qt"
78 - use digikam && { BUILD_DIR="${BUILD_DIR}"/digikam cmake_src_compile || die "failed building digikam plugin" ; }
79 use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
80 use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
81 use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
82 @@ -177,11 +165,6 @@ src_install() {
83 doins resources/gmic_cluts.gmz
84
85 # install gmic-qt frontends
86 - if use digikam; then
87 - local DIGIKAMDIR="/usr/$(get_libdir)/qt5/plugins/digikam/editor"
88 - exeinto "${DIGIKAMDIR}"
89 - doexe "${BUILD_DIR}"/digikam/Editor_GmicQt_Plugin.so
90 - fi
91 if use gimp; then
92 exeinto "${PLUGINDIR}"
93 doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt