gentoo auto-resync : 28:02:2023 - 16:04:24

5 files changed, 140 insertions, 224 deletions

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 342df65f1d19..e86b227e331e 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,5 +1,3 @@
-AUX gmic-3.0.0_ipa-sra.patch 665 BLAKE2B d1b47e2f0e8e63251172ee6cbc2c5b1bd86d100904a3d7bb0c5df39c051769b8b6c0aa0bb1f81010fd9ca195886a0dbce41528d31a811627ee28d1af58a83432 SHA512 4677fc93e72ed5e71a91197d364a04e1f8c6c13bb3f5b6eb5402a03c0d6ab395b54788669e028b932e207986121138419a58ed5f4333c0a45cbe6c0b9638ed96
-AUX gmic-3.0.1-openexr-3-imath.patch 1051 BLAKE2B 03d1cd6be5c5af76b6ecb071b46ee20abc4bd05d055fcd3ee21943ae5821c8c41e080b20d054b2f5e53cfbeb7326b8af6fa599182cdfd5e47679a57b47fa2f1d SHA512 83e9ec847328eef9f275f747ca6d2ac1071151cc7eb62ad70fa9de121d790e45d60514993274a44fe980537a793eaa56d397da5e207355fa2c9723bdafe7ff88
 AUX gmic-3.1.6-ar_so.patch 758 BLAKE2B 95031f8c3af292ef91d5cdf94406db158c74864c644571ad98630f9b3bd57d816c512a103cf6dd2adc86aa859d06bf73b3596f0c789d3e0d373f0ae0a7a6505f SHA512 19b424e189ddd3b3660a8a80821a907de86f79f22f6014f9af9f8f895bdef0e61c023b9d6859370bfec018274bacf3d13a0da5addf62430b6020f290ccca3f6f
 AUX gmic-3.1.6-grep38.patch 1200 BLAKE2B 6cfe274eb0577c9fb55b98564dc7a69e407ae8e7e80e66d62ca6d09485dbad4f578a1c2569041887040d73c02c0865695afaf504a546c93aa3a5f3e9574d3408 SHA512 7bdb4f45aef020dd4a9071f4bfd995da078526b37d693781c463d866e31a6bc1387c46035007fc4fcb9e2b871c42886483142aa4e8c244d5bd9e684a7e98e8af
 AUX gmic-3.1.6-makefile_automagic.patch 5327 BLAKE2B 0df03edbba289d327957a2e703be955dc357e12047e6f1d95a19fc906e4f42d395c2964d10220f642e9a0091b9349d2872066b787b3ae29ca7e231b21bec280f SHA512 80b28b476c61d80466d389924758a218591f5a50edd4583dfd8239d4f8f5a684da1403f7638ca2c99d8038a1135b15b95a87c51bdb65c7f637ce613429922143
@@ -7,10 +5,10 @@ AUX gmic-3.1.6-relative_rpath.patch 400 BLAKE2B 0f457f585d7efde1b05937f1baa240f6
 AUX gmic-3.2.0-grep38.patch 1330 BLAKE2B 22a241d8c574ca87691ec84107c718aa36404325891e3f50458753cc9051f1da3100206286ebeab2142360146b81b94ba3c063897722dd7b01730790f5672276 SHA512 46c078ef39cae6a0763a6e4e8d6ff9ac736b51e0b5f73fc6f75609fffa06eddd895f6803b5d39cfcd3bccb6e09549bdc0ca2ca3a7c1a2c8fa075869599eeb7d1
 AUX gmic-3.2.0-makefile_automagic.patch 5397 BLAKE2B f5678cf7aba485c9d035fc34c0a2a75133567e6c4b91dc0a58f8511f8858c6c5facc4fced4fb4582a2336d03b68f6a5e95cc3490de0385e4a083568a20769c17 SHA512 904dbddee273c6ebb80d94e24a508043766e43c712464d02631fa584634248379f01e989749d218965afa593865883da2ebe267ac9b1755ca116573cdcfeeb73
 AUX gmic-3.2.0-relative_rpath.patch 406 BLAKE2B cb92f21c090bfdb3c91aef60fc854fd21531ba8e7560458503ae0c123baf89a703057b870dc9a4366f179575373861696dedebd930c472a51644d4ef41553520 SHA512 8653697eea7da0b0db5ad9f7d8882a147a6aa9bd80085e6bfba21922431e52fa0b7e67c1c74afe8237a994861864f1df07ca2855c5d99bc0e69d0c630f11ebc7
-DIST gmic_3.0.1.tar.gz 10457923 BLAKE2B b495d10237abf5abe3d7df166119d2fc0b04142975d97db01ab0c5aa177f6e681931799fb392844e5c34d0503874a16d946a7146c5152cca1e64107948c02c03 SHA512 4bc08a3510e8987eea0463bfcf04de6dfd9a8ee8a38c14661ff201b8f563cab1b914dc60dc35b082cb5e868eb6232e2240a2d6703e0751215a82d6709236946a
 DIST gmic_3.1.6.tar.gz 10843311 BLAKE2B c50bcb9bd6c3d7d68a06f72faf0061d22b37c6fa357b40c16963c16a8841dba5ee8cf4509076a6734bb4eedbddfa2870897cb30687715ee6d7d84f2520700c17 SHA512 7d1ab97e8dfdf75b647cb7248eaa153e3ebcd5d1b799c67a6e027a5e2e8746047d348ea8e25485aed615d62f485dd06895fe6234f67a055cab423997b96f9775
 DIST gmic_3.2.0.tar.gz 10933655 BLAKE2B 6b87acb2a356d3d0c00e795d8b66de75acffa1f87b63caf58986ab52730fcd58bb9dfa37caf057ac2ab2a58695dd783c09018305f21d258427d9c1e450d1c14d SHA512 2eccf179e865416ce5a6cc38fd5587fe79fb30cda381ca2bcb1e587f101a55c502422121d4696834bc25b6200aa3c2292ff30947f2704a610f46e61460685f5b
-EBUILD gmic-3.0.1-r3.ebuild 4205 BLAKE2B 71f6968b9f8b6b4a242c5995c5f521c29830bf4a438d6e67f1f1422a0d2f7093b8b6bbf02338cc97cd302dbcf218edcda2ed6d532fcbd6ccd4163f7d23454a1f SHA512 15715c804177eeabb7184996526a8b9ff7a03c2c62e8207b0f3439a3425847f5bb142aa9b5820de776b227b12e72849e5ca62b2750bbef389c6b67e78a0a3625
+DIST gmic_3.2.1.tar.gz 11236401 BLAKE2B 8a68cee641892298e93373f9ad1a1ea4dd9995d813db7050a8a1c5f6658b2b08f9f9c4064dbef2a87e5350dc62c0bfa10d226a53ebff1962c3ad3a75ad318fba SHA512 c03a06acdf6669291602df4938a14de113d48ffa598b3c4af7975bd16aea37d426878ff0f593f22992da135a7b6e27fbb39dbaca4f89726ec367552f14be433b
 EBUILD gmic-3.1.6-r1.ebuild 3509 BLAKE2B 0934a967523f764a803828dfdd37cc0e3ec0823058fda0c3e75c8f6f22c89e2c9d12c222681c747ece4b2ef63d3eef942285a180eedfaad96a07ff807249d921 SHA512 0180b54c193419f2c9bc382d1f59faa8fce136fc5d1ed87862b5107126133dd6424e7a930aab2c0eb414200be1676251c42924e99a17593ffb2d158919cc72c6
 EBUILD gmic-3.2.0.ebuild 3459 BLAKE2B f0bb5422482b190bf24bc0af0478da7939183ebf40184ceb2b48f568bb662f06309faddddf8ea65f693c9780db6573011d24e9fba2d4a8709bdd77527c87b234 SHA512 9a92034fca2e8d309d73f7b5851506042e5036703a69b522e8d51c4a5e7f67b3d2258bbfcca42b241f5860b90ad607bdae552f9a8ab5fb58da10d410f8dafd33
+EBUILD gmic-3.2.1.ebuild 3459 BLAKE2B f0bb5422482b190bf24bc0af0478da7939183ebf40184ceb2b48f568bb662f06309faddddf8ea65f693c9780db6573011d24e9fba2d4a8709bdd77527c87b234 SHA512 9a92034fca2e8d309d73f7b5851506042e5036703a69b522e8d51c4a5e7f67b3d2258bbfcca42b241f5860b90ad607bdae552f9a8ab5fb58da10d410f8dafd33
 MISC metadata.xml 466 BLAKE2B 672259377cf7d693bc2493557b22150ddd3504d5bcb3f7b11c8e7e9a8ff591573503e5c9481d8a81e27757d4ebe205dd51a0fb57c0e691461988bc99fc714fc5 SHA512 62d65a13a3061fb31954fc08d753f6df7d76c262dc1c14304c1473dbe3f3412fb77cf808f0f205dc73d124f6dd1104c13d9dc79194eba702a0acdfb112fe6530
diff --git a/media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch b/media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch
deleted file mode 100644
index 04cfa560f193..000000000000
--- a/media-gfx/gmic/files/gmic-3.0.0_ipa-sra.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-A GCC-specific setting from years ago. gcc-9 quietly ignores it (the
-resulting binaries appear to be the same whether -fno-ipa-sra has been
-specified or not), clang fails on it as not recognised.
-Just get rid of it altogether.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -100,7 +100,7 @@
- if(APPLE)
-     list(APPEND GMIC_CXX_COMPILE_FLAGS -mmacosx-version-min=10.8 -stdlib=libc++ -Wno-error=c++11-narrowing -Wc++11-extensions -fpermissive)
- else()
--    list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=narrowing -fno-ipa-sra -fpermissive)
-+    list(APPEND GMIC_CXX_COMPILE_FLAGS -Wno-error=narrowing -fpermissive)
- endif()
- 
- if(NOT "${PRERELEASE_TAG}" STREQUAL "")
diff --git a/media-gfx/gmic/files/gmic-3.0.1-openexr-3-imath.patch b/media-gfx/gmic/files/gmic-3.0.1-openexr-3-imath.patch
deleted file mode 100644
index e97ef6bf6138..000000000000
--- a/media-gfx/gmic/files/gmic-3.0.1-openexr-3-imath.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://src.fedoraproject.org/rpms/gmic/raw/rawhide/f/gmic-openexr3.patch
---- a/cmake/FindCImg.cmake
-+++ b/cmake/FindCImg.cmake
-@@ -147,7 +147,10 @@ if(ENABLE_JPEG)
- endif()
- 
- if(ENABLE_OPENEXR)
--  find_package(OpenEXR)
-+  find_package(OpenEXR CONFIG)
-+  if(NOT TARGET OpenEXR::OpenEXR)
-+    find_package(OpenEXR)
-+  endif()
- 
-   if(OpenEXR_FOUND)
-     list(APPEND CLI_COMPILE_FLAGS "cimg_use_openexr")
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -307,8 +307,8 @@
- 
- # Enable native support of EXR image files, using the OpenEXR library.
- # (http://www.openexr.com/)
--OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(USR)/$(INCLUDE)/OpenEXR)
--OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lIlmImf -lHalf)
-+OPENEXR_CFLAGS = -Dcimg_use_openexr $(shell pkg-config --cflags OpenEXR || echo -I$(USR)/$(INCLUDE)/OpenEXR -I$(USR)/$(INCLUDE)/Imath)
-+OPENEXR_LIBS = $(shell pkg-config --libs OpenEXR || echo -lOpenEXR -lImath)
- 
- # Enable Fast Fourier Transforms, using the FFTW3 library.
- # (http://www.fftw.org/)
diff --git a/media-gfx/gmic/gmic-3.0.1-r3.ebuild b/media-gfx/gmic/gmic-3.0.1-r3.ebuild
deleted file mode 100644
index bb07cf674b67..000000000000
--- a/media-gfx/gmic/gmic-3.0.1-r3.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2023 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/GreycLab/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=
-"
-DEPEND="
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		media-gfx/gimp:0/2
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:= )
-	openexr? (
-		dev-libs/imath:=
-		media-libs/openexr:=
-	)
-	png? ( media-libs/libpng:= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	zlib? ( sys-libs/zlib:= )"
-RDEPEND="${DEPEND}
-	ffmpeg? ( media-video/ffmpeg:= )
-"
-BDEPEND="
-	virtual/pkgconfig
-	gimp? ( dev-qt/linguist-tools:5 )
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.0_ipa-sra.patch
-	"${FILESDIR}"/${PN}-3.0.1-openexr-3-imath.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-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"
-	local 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 instead."
-				break
-			fi
-		done
-	fi
-}
diff --git a/media-gfx/gmic/gmic-3.2.1.ebuild b/media-gfx/gmic/gmic-3.2.1.ebuild
new file mode 100644
index 000000000000..e37b2cb59f90
--- /dev/null
+++ b/media-gfx/gmic/gmic-3.2.1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/GreycLab/gmic"
+SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X"
+
+REQUIRED_USE="
+	gimp? ( png fftw X )
+	qt5? ( png 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
+"
+DEPEND="
+	sys-libs/zlib:0=
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		media-gfx/gimp:0/2
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:= )
+	openexr? (
+		dev-libs/imath:=
+		media-libs/openexr:=
+	)
+	png? ( media-libs/libpng:= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)"
+RDEPEND="${DEPEND}
+	ffmpeg? ( media-video/ffmpeg:= )
+"
+BDEPEND="
+	virtual/pkgconfig
+	gimp? (
+		dev-qt/linguist-tools:5
+		media-gfx/gimp:0/2
+	)
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.6-ar_so.patch
+	"${FILESDIR}"/${PN}-3.2.0-grep38.patch
+	"${FILESDIR}"/${PN}-3.2.0-makefile_automagic.patch
+	"${FILESDIR}"/${PN}-3.2.0-relative_rpath.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+gmic_emake() {
+	local mymakeargs=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		STRIP="/bin/true"
+		LIB="$(get_libdir)"
+		OPT_CFLAGS="${CXXFLAGS}"
+		OPT_LIBS="${LDFLAGS}"
+		GMIC_USE_CURL=$(usex curl)
+		GMIC_USE_EXR=$(usex openexr)
+		GMIC_USE_FFTW=$(usex fftw)
+		GMIC_USE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		GMIC_USE_JPEG=$(usex jpeg)
+		GMIC_USE_OPENCV=$(usex opencv)
+		GMIC_USE_OPENMP=$(usex openmp)
+		GMIC_USE_PNG=$(usex png)
+		GMIC_USE_TIFF=$(usex tiff)
+		GMIC_USE_X11=$(usex X)
+		QMAKE="qmake5"
+	)
+
+	# Possibly unnecessary since 3.2.0, just in case though.
+	tc-is-clang && mymakeargs+=( OPENMP_LIBS="-lomp" )
+
+	emake -j1 -C src \
+		"${mymakeargs[@]}" \
+		$@
+}
+
+src_compile() {
+	gmic_emake lib libc
+	use cli && gmic_emake cli_shared
+	use gimp && gmic_emake gimp_shared
+	use qt5 && gmic_emake gmic_qt_shared
+}
+
+src_install() {
+	# See below for why this has to name a directory even if USE=-gimp
+	local gimp_plugindir="/deleteme"
+	if use gimp; then
+		if type gimptool &>/dev/null; then
+			gimp_plugindir="$(gimptool --gimpplugindir)/plug-ins"
+		elif type gimptool-2.0 &>/dev/null; then
+			gimp_plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
+		elif type gimptool-2.99 &>/dev/null; then
+			gimp_plugindir="$(gimptool-2.99 --gimpplugindir)/plug-ins"
+		else
+			die "Cannot find GIMP plugin directory"
+		fi
+	fi
+
+	gmic_emake DESTDIR="${ED}" PLUGINDIR="${gimp_plugindir}" install
+
+	# Upstream build scripts create PLUGINDIR and write some files to it
+	# regardless of whether the GIMP plug-in has been built or not, or even
+	# when they haven't been able to execute gimptool to get the base path.
+	use gimp || rm -rf "${ED}/${gimp_plugindir}"
+
+	# These are already gzipped in the source tarballs
+	find "${ED}/usr/share/man" -name "*.gz" -exec gunzip {} \; || die
+}