From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1249376-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 5D8621382C5
for <garchives@archives.gentoo.org>; Tue, 9 Feb 2021 09:27:38 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id AAD87E09F5;
Tue, 9 Feb 2021 09:27:37 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 9770EE09F5
for <gentoo-commits@lists.gentoo.org>; Tue, 9 Feb 2021 09:27:37 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id ADD5B340BC9
for <gentoo-commits@lists.gentoo.org>; Tue, 9 Feb 2021 09:27:36 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 2C0C4332
for <gentoo-commits@lists.gentoo.org>; Tue, 9 Feb 2021 09:25:36 +0000 (UTC)
From: "Marek Szuba" <marecki@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" <marecki@gentoo.org>
Message-ID: <1612862727.7412f904e54b0d1285d008df4e4f91beb7ad0f3e.marecki@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-gfx/gmic/gmic-2.9.5.ebuild
X-VCS-Directories: media-gfx/gmic/
X-VCS-Committer: marecki
X-VCS-Committer-Name: Marek Szuba
X-VCS-Revision: 7412f904e54b0d1285d008df4e4f91beb7ad0f3e
X-VCS-Branch: master
Date: Tue, 9 Feb 2021 09:25:36 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: aea42e05-5ccd-47ad-bbf9-7c384d0da79f
X-Archives-Hash: d6c38efce04f5f3e3bfb3cc885c3bc77
commit: 7412f904e54b0d1285d008df4e4f91beb7ad0f3e
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 9 09:21:55 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Feb 9 09:25:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7412f904
media-gfx/gmic-2.9.5: drop IUSE=digikam
The digiKam host got removed from gmic-qt (which comes bunded with G'MIC
itself) in late January 2021.
Closes: https://bugs.gentoo.org/769560
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
media-gfx/gmic/gmic-2.9.5.ebuild | 21 ++-------------------
1 file changed, 2 insertions(+), 19 deletions(-)
diff --git a/media-gfx/gmic/gmic-2.9.5.ebuild b/media-gfx/gmic/gmic-2.9.5.ebuild
index 30c1bc1b4da..20cad100504 100644
--- a/media-gfx/gmic/gmic-2.9.5.ebuild
+++ b/media-gfx/gmic/gmic-2.9.5.ebuild
@@ -20,9 +20,8 @@ HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
LICENSE="CeCILL-2 GPL-3"
SLOT="0"
-IUSE="cli curl digikam ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
REQUIRED_USE="
- digikam? ( png zlib fftw X )
gimp? ( png zlib fftw X )
krita? ( png zlib fftw X )
qt5? ( png zlib fftw X )
@@ -37,10 +36,6 @@ QT_DEPEND="
"
COMMON_DEPEND="
curl? ( net-misc/curl )
- digikam? (
- media-gfx/digikam
- ${QT_DEPEND}
- )
fftw? ( sci-libs/fftw:3.0=[threads] )
gimp? (
media-gfx/gimp:0/2
@@ -66,7 +61,6 @@ RDEPEND="${COMMON_DEPEND}
ffmpeg? ( media-video/ffmpeg:0= )
"
DEPEND="${COMMON_DEPEND}
- digikam? ( dev-qt/linguist-tools )
gimp? ( dev-qt/linguist-tools )
krita? ( dev-qt/linguist-tools )
qt5? ( dev-qt/linguist-tools )
@@ -89,7 +83,7 @@ src_prepare() {
cmake_src_prepare
sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
- if use digikam || use gimp || use krita || use qt5; then
+ if use gimp || use krita || use qt5; then
# respect user flags
sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
@@ -135,11 +129,6 @@ src_configure() {
-DGMIC_PATH="${S}/src"
)
- if use digikam; then
- mycmakeargs+=( -DGMIC_QT_HOST=digikam )
- BUILD_DIR="${BUILD_DIR}"/digikam cmake_src_configure
- fi
-
if use gimp; then
mycmakeargs+=( -DGMIC_QT_HOST=gimp )
BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
@@ -161,7 +150,6 @@ src_compile() {
# build gmic-qt frontends
local S="${S}/gmic-qt"
- use digikam && { BUILD_DIR="${BUILD_DIR}"/digikam cmake_src_compile || die "failed building digikam plugin" ; }
use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
@@ -177,11 +165,6 @@ src_install() {
doins resources/gmic_cluts.gmz
# install gmic-qt frontends
- if use digikam; then
- local DIGIKAMDIR="/usr/$(get_libdir)/qt5/plugins/digikam/editor"
- exeinto "${DIGIKAMDIR}"
- doexe "${BUILD_DIR}"/digikam/Editor_GmicQt_Plugin.so
- fi
if use gimp; then
exeinto "${PLUGINDIR}"
doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt