gentoo auto-resync : 21:08:2023 - 21:44:47

4 files changed, 15 insertions, 143 deletions

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 26cf01f36d20..a6ea7da87ab5 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -4,10 +4,9 @@ AUX gmic-3.2.0-makefile_automagic.patch 5397 BLAKE2B f5678cf7aba485c9d035fc34c0a
 AUX gmic-3.2.0-relative_rpath.patch 406 BLAKE2B cb92f21c090bfdb3c91aef60fc854fd21531ba8e7560458503ae0c123baf89a703057b870dc9a4366f179575373861696dedebd930c472a51644d4ef41553520 SHA512 8653697eea7da0b0db5ad9f7d8882a147a6aa9bd80085e6bfba21922431e52fa0b7e67c1c74afe8237a994861864f1df07ca2855c5d99bc0e69d0c630f11ebc7
 AUX gmic-3.2.4-makefile_automagic.patch 5367 BLAKE2B 7f720d964746fdb745f7741b092f3b313d9d92fb885e4660cc869ee0cd11affd57ec405e6db4002bd1085d8809c9b5af310b78103cf036ca3a7af272adcc1f63 SHA512 bca841fbd9bbca0c89833fcc77c3921db1a3fd83a156b1d58c2d8cebdb025ff0c9ab5c29a2ff9e9ffefb739f9513a1e2844fd0746973423cfcd2ace60ab95743
 AUX gmic-3.2.5-relative_rpath.patch 759 BLAKE2B 0c6deda724d6f983e9d1cf3101862fc5c3096fecd5951fc185c814bdb8e59774a30591ec969b4121951c3a1662ab5cb4040d4e9b9cfaa463496fc90bc59a301f SHA512 9c5daf6ad03002867594fc48c19c19b1050d9e7be3cab161e8fbe2f84a5fc31ceece2241c0bfa6cc9eaced44a6ceb0d716f485ca04e62a1160530316e4a3d50c
+AUX gmic-3.2.6-makefile_target_deps.patch 354 BLAKE2B bfa068ecb9f2b1e98c2eb992f9a5a90fbe3ed017c64840bec016677b204a2c18d5983a4e1fe6a9a372637684c51dcff1664bd82a5ad29fee0d03a9b81d12c64f SHA512 5d4b7ff4b08b24dede995f842ea768c69db03073c0026e0ca472abf6bb8cfe76c793a2980360fe162f6f9b611b22c567e393c6c5abab0b86dd8cf8566cdafe48
 DIST gmic_3.2.0.tar.gz 10933655 BLAKE2B 6b87acb2a356d3d0c00e795d8b66de75acffa1f87b63caf58986ab52730fcd58bb9dfa37caf057ac2ab2a58695dd783c09018305f21d258427d9c1e450d1c14d SHA512 2eccf179e865416ce5a6cc38fd5587fe79fb30cda381ca2bcb1e587f101a55c502422121d4696834bc25b6200aa3c2292ff30947f2704a610f46e61460685f5b
-DIST gmic_3.2.5.tar.gz 11352319 BLAKE2B 812e28119bcbe485a7551c7afc89d7efb2a46ba3d9cc31597fddcd4c4ba48fa040827eccd92c1abbef3035c057d432f6b7b783ff9067da8be2806a05902bdf35 SHA512 e453b83201fa7aff7dc193c529c6b81306e94990a03356488abbbe3acdf8eb6b07e12c16e496e9607bcb730258218b3431c489b3fd1434bb31e28727be7eae27
 DIST gmic_3.2.6.tar.gz 11574989 BLAKE2B abd33048a448ca8406169c61a9d97bf6e785cbb286cec1d5104f12960640de9eb292677256c074eee5371fa77ed7041671f77a63140c2fa58070c01404962be6 SHA512 26b222c94d68273a8ad4a0c72dca315cb0e17695e601f69cb06d44c49166b8c1050926b8c5d73d21a64613e6ba3b0462e730617db83d2c67b53674bf22e50395
 EBUILD gmic-3.2.0.ebuild 3456 BLAKE2B 5e98b8d4ce0bc98c91ce5f77a92833ca4a48a17986fdac664528981451a723061b469ab3b502f5cb9988768cd9afd5bf03edf51573169f1a0bd261386b65fd98 SHA512 209ab91667f7574fb5cdd9e42a54f444d6c96ff91b55a5677c3e4c05284eae79d48237eac8bda942408df9ca7a2aa3b50f4827364cdba5a865e9774b4fe475d5
-EBUILD gmic-3.2.5.ebuild 3471 BLAKE2B 877f5bcbf0b15e202ca28fdd35e6b5b38883cba8f808647c9a75cc6357b53b62eb66c5e54431afb4122028bdcff01cb79382163c2eba7387621ceb0af7f3edbd SHA512 f76eb11a0827bd026b3e234342e446bbc08e0ca8ba0a78a040dcd7a592b4749343a56def6f9f9eed81243f1a57dbbf45e9bc7fef1dc6735c52f9355459e1059b
-EBUILD gmic-3.2.6.ebuild 3471 BLAKE2B 877f5bcbf0b15e202ca28fdd35e6b5b38883cba8f808647c9a75cc6357b53b62eb66c5e54431afb4122028bdcff01cb79382163c2eba7387621ceb0af7f3edbd SHA512 f76eb11a0827bd026b3e234342e446bbc08e0ca8ba0a78a040dcd7a592b4749343a56def6f9f9eed81243f1a57dbbf45e9bc7fef1dc6735c52f9355459e1059b
+EBUILD gmic-3.2.6.ebuild 3524 BLAKE2B b1ee9a48763b527e8e93db4aa7c7b34fd44599d118eb8af5c7dec3039c3377154f3a981ebbd580d1395859b9241a6a23cfc61a1e19b5ee7105e8256e145c3971 SHA512 28a135b0b34f5b770566770564b336e0afd1d3784eb93e4cafceffe4031ad29ae210d111c33780905470fdb030dd5cbbe94042c500434b2ffea0f519dfff655a
 MISC metadata.xml 466 BLAKE2B 672259377cf7d693bc2493557b22150ddd3504d5bcb3f7b11c8e7e9a8ff591573503e5c9481d8a81e27757d4ebe205dd51a0fb57c0e691461988bc99fc714fc5 SHA512 62d65a13a3061fb31954fc08d753f6df7d76c262dc1c14304c1473dbe3f3412fb77cf808f0f205dc73d124f6dd1104c13d9dc79194eba702a0acdfb112fe6530
diff --git a/media-gfx/gmic/files/gmic-3.2.6-makefile_target_deps.patch b/media-gfx/gmic/files/gmic-3.2.6-makefile_target_deps.patch
new file mode 100644
index 000000000000..6aea9e1579eb
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-3.2.6-makefile_target_deps.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -503,7 +503,7 @@
+ libcgmic.o: gmic_libc.cpp CImg.h gmic_libc.h gmic.h
+ 	$(CXX) -o libcgmic.o -c gmic_libc.cpp -Dgmic_core $(PIC) $(CFLAGS)
+ 
+-use_libcgmic: use_libcgmic.c gmic_libc.h
++use_libcgmic: use_libcgmic.c libcgmic.so
+ 	$(CC) -std=c99 -o use_libcgmic use_libcgmic.c -lcgmic $(LIBS)
+ 
+ # libcgmic (static).
diff --git a/media-gfx/gmic/gmic-3.2.5.ebuild b/media-gfx/gmic/gmic-3.2.5.ebuild
deleted file mode 100644
index e49f4fe6fe0d..000000000000
--- a/media-gfx/gmic/gmic-3.2.5.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# 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.4-makefile_automagic.patch
-	"${FILESDIR}"/${PN}-3.2.5-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
-	gmic_emake 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
-}
diff --git a/media-gfx/gmic/gmic-3.2.6.ebuild b/media-gfx/gmic/gmic-3.2.6.ebuild
index e49f4fe6fe0d..2b300e5482d0 100644
--- a/media-gfx/gmic/gmic-3.2.6.ebuild
+++ b/media-gfx/gmic/gmic-3.2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
 
 LICENSE="CeCILL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X"
 
 REQUIRED_USE="
@@ -65,6 +65,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.2.0-grep38.patch
 	"${FILESDIR}"/${PN}-3.2.4-makefile_automagic.patch
 	"${FILESDIR}"/${PN}-3.2.5-relative_rpath.patch
+	"${FILESDIR}"/${PN}-3.2.6-makefile_target_deps.patch
 )
 
 pkg_pretend() {