commit:     14f9cda09f23327a05e54266e1789f1993c4414a
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 22:10:24 2022 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 22:31:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14f9cda0

media-gfx/gmic: drop 3.0.0, 3.0.1

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-gfx/gmic/Manifest             |   1 -
 media-gfx/gmic/gmic-3.0.0.ebuild    | 172 -----------------------------------
 media-gfx/gmic/gmic-3.0.1-r1.ebuild |   2 +-
 media-gfx/gmic/gmic-3.0.1.ebuild    | 175 ------------------------------------
 media-gfx/gmic/metadata.xml         |   1 -
 5 files changed, 1 insertion(+), 350 deletions(-)

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index d0e13ce81e85..12e056f95844 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,2 +1 @@
-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-3.0.0.ebuild b/media-gfx/gmic/gmic-3.0.0.ebuild
deleted file mode 100644
index 2ef54b68ee93..000000000000
--- a/media-gfx/gmic/gmic-3.0.0.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake bash-completion-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-       EGIT_REPO_URI="https://github.com/dtschump/gmic.git";
-       inherit git-r3
-else
-       SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz";
-       KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-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 tiff X zlib"
-REQUIRED_USE="
-       gimp? ( png zlib fftw X )
-       krita? ( png zlib fftw X )
-       qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-       >=dev-qt/qtcore-${MIN_QT_VER}:5=
-       >=dev-qt/qtgui-${MIN_QT_VER}:5=
-       >=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-       >=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-       curl? ( net-misc/curl )
-       fftw? ( sci-libs/fftw:3.0=[threads] )
-       gimp? (
-               media-gfx/gimp:0/2
-               ${QT_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=
-               media-libs/openexr:0=
-       )
-       png? ( media-libs/libpng:0= )
-       qt5? ( ${QT_DEPEND} )
-       tiff? ( media-libs/tiff:0 )
-       X? (
-               x11-libs/libX11
-               x11-libs/libXext
-       )
-       zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-       ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-       gimp? ( dev-qt/linguist-tools )
-       krita? ( dev-qt/linguist-tools )
-       qt5? ( dev-qt/linguist-tools )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-3.0.0_ipa-sra.patch
-)
-
-pkg_pretend() {
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               if use openmp; then
-                       tc-has-openmp || die "Please switch to an openmp 
compatible compiler"
-               fi
-       fi
-}
-
-src_prepare() {
-       cmake_src_prepare
-       sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-       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' \
-                       -i gmic-qt/CMakeLists.txt || die
-               local S="${S}/gmic-qt"
-               # Bug #753377
-               local PATCHES=()
-               cmake_src_prepare
-       fi
-}
-
-src_configure() {
-       local mycmakeargs=(
-               -DBUILD_LIB=ON
-               -DBUILD_LIB_STATIC=no
-               -DBUILD_CLI=$(usex cli)
-               -DBUILD_MAN=$(usex cli)
-               -DBUILD_BASH_COMPLETION=$(usex cli)
-               -DCUSTOM_CFLAGS=ON
-               -DENABLE_CURL=$(usex curl)
-               -DENABLE_X=$(usex X)
-               -DENABLE_FFMPEG=$(usex ffmpeg)
-               -DENABLE_FFTW=$(usex fftw)
-               -DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-               -DENABLE_JPEG=$(usex jpeg)
-               -DENABLE_OPENCV=$(usex opencv)
-               -DENABLE_OPENEXR=$(usex openexr)
-               -DENABLE_OPENMP=$(usex openmp)
-               -DENABLE_PNG=$(usex png)
-               -DENABLE_TIFF=$(usex tiff)
-               -DENABLE_ZLIB=$(usex zlib)
-               -DENABLE_DYNAMIC_LINKING=ON
-       )
-
-       cmake_src_configure
-
-       # configure gmic-qt frontends
-       local CMAKE_USE_DIR="${S}/gmic-qt"
-       mycmakeargs=(
-               -DENABLE_DYNAMIC_LINKING=ON
-               -DENABLE_CURL=$(usex curl)
-               -DGMIC_LIB_PATH="${BUILD_DIR}"
-               -DGMIC_PATH="${S}/src"
-       )
-
-       if use gimp; then
-               mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-               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
-       fi
-}
-
-src_compile() {
-       cmake_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"
-       insinto "${PLUGINDIR}"
-       doins resources/gmic_cluts.gmz
-
-       # install gmic-qt frontends
-       if use gimp; then
-               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
-}

diff --git a/media-gfx/gmic/gmic-3.0.1-r1.ebuild 
b/media-gfx/gmic/gmic-3.0.1-r1.ebuild
index 2c806f819a10..997f0d677392 100644
--- a/media-gfx/gmic/gmic-3.0.1-r1.ebuild
+++ b/media-gfx/gmic/gmic-3.0.1-r1.ebuild
@@ -168,7 +168,7 @@ pkg_postinst() {
                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."
+                               einfo "Please use the built-in G'MIC plugin 
provided with Krita 5 instead."
                                break
                        fi
                done

diff --git a/media-gfx/gmic/gmic-3.0.1.ebuild b/media-gfx/gmic/gmic-3.0.1.ebuild
deleted file mode 100644
index b2a210733dc4..000000000000
--- a/media-gfx/gmic/gmic-3.0.1.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake bash-completion-r1 toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-       EGIT_REPO_URI="https://github.com/dtschump/gmic.git";
-       inherit git-r3
-else
-       SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz";
-       KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic";
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png 
qt5 tiff X zlib"
-REQUIRED_USE="
-       gimp? ( png zlib fftw X )
-       qt5? ( png zlib fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-       >=dev-qt/qtcore-${MIN_QT_VER}:5=
-       >=dev-qt/qtgui-${MIN_QT_VER}:5=
-       >=dev-qt/qtnetwork-${MIN_QT_VER}:5=
-       >=dev-qt/qtwidgets-${MIN_QT_VER}:5=
-"
-COMMON_DEPEND="
-       curl? ( net-misc/curl )
-       fftw? ( sci-libs/fftw:3.0=[threads] )
-       gimp? (
-               media-gfx/gimp:0/2
-               ${QT_DEPEND}
-       )
-       graphicsmagick? ( media-gfx/graphicsmagick:0= )
-       jpeg? ( virtual/jpeg:0 )
-       opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
-       openexr? (
-               media-libs/ilmbase:0=
-               media-libs/openexr:0=
-       )
-       png? ( media-libs/libpng:0= )
-       qt5? ( ${QT_DEPEND} )
-       tiff? ( media-libs/tiff:0 )
-       X? (
-               x11-libs/libX11
-               x11-libs/libXext
-       )
-       zlib? ( sys-libs/zlib:0= )"
-RDEPEND="${COMMON_DEPEND}
-       ffmpeg? ( media-video/ffmpeg:0= )
-"
-DEPEND="${COMMON_DEPEND}
-       gimp? ( dev-qt/linguist-tools )
-       qt5? ( dev-qt/linguist-tools )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-3.0.0_ipa-sra.patch
-)
-
-pkg_pretend() {
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               if use openmp; then
-                       tc-has-openmp || die "Please switch to an openmp 
compatible compiler"
-               fi
-       fi
-}
-
-src_prepare() {
-       cmake_src_prepare
-       sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
-
-       if use gimp || use qt5; then
-               # respect user flags
-               sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
-                       -e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
-                       -i gmic-qt/CMakeLists.txt || die
-               local S="${S}/gmic-qt"
-               # Bug #753377
-               local PATCHES=()
-               cmake_src_prepare
-       fi
-}
-
-src_configure() {
-       local mycmakeargs=(
-               -DBUILD_LIB=ON
-               -DBUILD_LIB_STATIC=no
-               -DBUILD_CLI=$(usex cli)
-               -DBUILD_MAN=$(usex cli)
-               -DBUILD_BASH_COMPLETION=$(usex cli)
-               -DCUSTOM_CFLAGS=ON
-               -DENABLE_CURL=$(usex curl)
-               -DENABLE_X=$(usex X)
-               -DENABLE_FFMPEG=$(usex ffmpeg)
-               -DENABLE_FFTW=$(usex fftw)
-               -DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
-               -DENABLE_JPEG=$(usex jpeg)
-               -DENABLE_OPENCV=$(usex opencv)
-               -DENABLE_OPENEXR=$(usex openexr)
-               -DENABLE_OPENMP=$(usex openmp)
-               -DENABLE_PNG=$(usex png)
-               -DENABLE_TIFF=$(usex tiff)
-               -DENABLE_ZLIB=$(usex zlib)
-               -DENABLE_DYNAMIC_LINKING=ON
-       )
-
-       cmake_src_configure
-
-       # configure gmic-qt frontends
-       local CMAKE_USE_DIR="${S}/gmic-qt"
-       mycmakeargs=(
-               -DENABLE_DYNAMIC_LINKING=ON
-               -DENABLE_CURL=$(usex curl)
-               -DGMIC_LIB_PATH="${BUILD_DIR}"
-               -DGMIC_PATH="${S}/src"
-       )
-
-       if use gimp; then
-               mycmakeargs+=( -DGMIC_QT_HOST=gimp )
-               BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
-       fi
-
-       if use qt5; then
-               mycmakeargs+=( -DGMIC_QT_HOST=none )
-               BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
-       fi
-}
-
-src_compile() {
-       cmake_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 qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die 
"failed building qt5 GUI" ; }
-}
-
-src_install() {
-       cmake_src_install
-
-       use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh 
${PN}
-
-       local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
-       insinto "${PLUGINDIR}"
-       doins resources/gmic_cluts.gmz
-
-       # install gmic-qt frontends
-       if use gimp; then
-               exeinto "${PLUGINDIR}"
-               doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
-       fi
-       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
-}

diff --git a/media-gfx/gmic/metadata.xml b/media-gfx/gmic/metadata.xml
index efde0ceebe6f..d725eae2d066 100644
--- a/media-gfx/gmic/metadata.xml
+++ b/media-gfx/gmic/metadata.xml
@@ -7,7 +7,6 @@
        </maintainer>
        <use>
                <flag name="cli">Build CLI interface</flag>
-               <flag name="krita">Build <pkg>media-gfx/krita</pkg> 
plugin</flag>
                <flag name="opencv">Enable support for webcams using the OpenCV 
library</flag>
        </use>
        <upstream>

Reply via email to