From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1357860-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 66E95158087
for <garchives@archives.gentoo.org>; Fri, 14 Jan 2022 15:35:18 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 631C4E07B2;
Fri, 14 Jan 2022 15:35:17 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 1606FE077C
for <gentoo-commits@lists.gentoo.org>; Fri, 14 Jan 2022 15:35:17 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 26A0E342B77
for <gentoo-commits@lists.gentoo.org>; Fri, 14 Jan 2022 15:35:16 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 873BC297
for <gentoo-commits@lists.gentoo.org>; Fri, 14 Jan 2022 15:35:14 +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: <1642174506.f77d2fb985376f03a272b2628ac5e140e76cbfe7.marecki@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-gfx/gmic/Manifest media-gfx/gmic/gmic-2.9.9.ebuild media-gfx/gmic/gmic-3.0.1.ebuild
X-VCS-Directories: media-gfx/gmic/
X-VCS-Committer: marecki
X-VCS-Committer-Name: Marek Szuba
X-VCS-Revision: f77d2fb985376f03a272b2628ac5e140e76cbfe7
X-VCS-Branch: master
Date: Fri, 14 Jan 2022 15:35:14 +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: 722a70ee-fff2-48a5-9bfe-dc1fb67d3e30
X-Archives-Hash: 8b2e0a640884ed8645ec4eb1e429dc5a
commit: f77d2fb985376f03a272b2628ac5e140e76cbfe7
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 14 15:32:47 2022 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Jan 14 15:35:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f77d2fb9
media-gfx/gmic: add 3.0.1, drop 2.9.9
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
media-gfx/gmic/Manifest | 2 +-
.../gmic/{gmic-2.9.9.ebuild => gmic-3.0.1.ebuild} | 39 +++++++++++-----------
2 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index e4cdf89bbb61..d0e13ce81e85 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,2 +1,2 @@
-DIST gmic_2.9.9.tar.gz 7325061 BLAKE2B 256b4f1180edfc8ebb3a3e7f7666c7b44d95cd36a52c1b5539a355f022471eeef776c77b820864ca05b2ccc4a58a2e85970994cfdbce9e55aff31112af4e6000 SHA512 fcc129f5acfb32a3154d4c987f574c18ad68dd35e9e357fdc391166211747f5d7eed63a2fcde29c110a79e8665f2a6d1e70b68c81e19bb02be43a84ec7f1cc64
DIST gmic_3.0.0.tar.gz 10225122 BLAKE2B 1066c62c2c56fafbfd11608eb9e3b7c7e9a87b404aae1e7e673e21d9b7b76a599e241f16656786bfa35687f3b3921fcba96368227753105aa25e2fa451962bfa SHA512 89353d16d6304e322400c93bafb50f7557df93c933ed2994f33a17d877e4e12ec511a355b38058680f356bccab5aa84b607fab225354c19d4b8ab3e64424c87c
+DIST gmic_3.0.1.tar.gz 10457923 BLAKE2B b495d10237abf5abe3d7df166119d2fc0b04142975d97db01ab0c5aa177f6e681931799fb392844e5c34d0503874a16d946a7146c5152cca1e64107948c02c03 SHA512 4bc08a3510e8987eea0463bfcf04de6dfd9a8ee8a38c14661ff201b8f563cab1b914dc60dc35b082cb5e868eb6232e2240a2d6703e0751215a82d6709236946a
diff --git a/media-gfx/gmic/gmic-2.9.9.ebuild b/media-gfx/gmic/gmic-3.0.1.ebuild
similarity index 83%
rename from media-gfx/gmic/gmic-2.9.9.ebuild
rename to media-gfx/gmic/gmic-3.0.1.ebuild
index 5591771336db..b2a210733dc4 100644
--- a/media-gfx/gmic/gmic-2.9.9.ebuild
+++ b/media-gfx/gmic/gmic-3.0.1.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-CMAKE_BUILD_TYPE=Release
-
inherit cmake bash-completion-r1 toolchain-funcs
if [[ ${PV} == "9999" ]]; then
@@ -12,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
- KEYWORDS="amd64 arm64 x86"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
fi
DESCRIPTION="GREYC's Magic Image Converter"
@@ -20,10 +18,9 @@ HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
LICENSE="CeCILL-2 GPL-3"
SLOT="0"
-IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X zlib"
REQUIRED_USE="
gimp? ( png zlib fftw X )
- krita? ( png zlib fftw X )
qt5? ( png zlib fftw X )
"
@@ -43,7 +40,6 @@ COMMON_DEPEND="
)
graphicsmagick? ( media-gfx/graphicsmagick:0= )
jpeg? ( virtual/jpeg:0 )
- krita? ( ${QT_DEPEND} )
opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
openexr? (
media-libs/ilmbase:0=
@@ -62,13 +58,12 @@ RDEPEND="${COMMON_DEPEND}
"
DEPEND="${COMMON_DEPEND}
gimp? ( dev-qt/linguist-tools )
- krita? ( dev-qt/linguist-tools )
qt5? ( dev-qt/linguist-tools )
"
BDEPEND="virtual/pkgconfig"
PATCHES=(
- "${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
+ "${FILESDIR}"/${PN}-3.0.0_ipa-sra.patch
)
pkg_pretend() {
@@ -83,7 +78,7 @@ src_prepare() {
cmake_src_prepare
sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
- if use gimp || use krita || use qt5; then
+ if use gimp || use qt5; then
# respect user flags
sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
@@ -98,7 +93,7 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
-DBUILD_LIB=ON
- -DBUILD_LIB_STATIC=$(usex static-libs)
+ -DBUILD_LIB_STATIC=no
-DBUILD_CLI=$(usex cli)
-DBUILD_MAN=$(usex cli)
-DBUILD_BASH_COMPLETION=$(usex cli)
@@ -134,11 +129,6 @@ src_configure() {
BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
fi
- if use krita; then
- mycmakeargs+=( -DGMIC_QT_HOST=krita )
- BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
- fi
-
if use qt5; then
mycmakeargs+=( -DGMIC_QT_HOST=none )
BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
@@ -151,13 +141,12 @@ src_compile() {
# build gmic-qt frontends
local S="${S}/gmic-qt"
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" ; }
}
src_install() {
cmake_src_install
- dodoc README
+
use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
@@ -169,6 +158,18 @@ src_install() {
exeinto "${PLUGINDIR}"
doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
fi
- use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
}
+
+pkg_postinst() {
+ if [[ -n "${REPLACING_VERSIONS}" ]]; then
+ local v
+ for v in ${REPLACING_VERSIONS}; do
+ if ver_test "${v}" -le "3.0.0"; then
+ einfo "Note that starting with version 3.0.1 ${CATEGORY}/${PN} no longer provides a Krita interface."
+ einfo "Please use the built-in G'MIC plugin provided with Krita 5, or use an older version."
+ break
+ fi
+ done
+ fi
+}