gentoo resync : 25.11.2020

5 files changed, 92 insertions, 28 deletions

diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 93e0e161c9b5..26d127e139b1 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,5 +1,6 @@
-DIST gmic_2.9.0.tar.gz 6195597 BLAKE2B 3e1f83aa7e2024c545cab16c15cbd108ecaa33e7b0423c37cbb7e19fc9179280dfb31d819926110f06ff10a8b2b3e22b3c7f6c3e8bdece8b51c7295b8e78a974 SHA512 3b3703520998e5ad547316683158d7b60541a8cea2a7c1e7118f8de88492e0961bf1fe1da360dfb26d0ba7eaf997e7005a864364297db2bb405d532dedc4241d
-DIST gmic_2.9.1.tar.gz 6212626 BLAKE2B cb948987629f9bf07f3e756eb5f90526ac2012a7bd2c11021a3fbc253709d9e62ecd60a2f3a9f9fd9a8605f0f2a73497143c4f121e27d1cb5aa4f3a455916c56 SHA512 dc6a90bb130b50164f7696a2e0c702ee24267f1559f52b77d4040fa0477c452b52eb140263bb3abb49673638246784b356004866e13f6d0660feff759688b45b
-EBUILD gmic-2.9.0.ebuild 4280 BLAKE2B d75d51965efd8f73b1b3112b14d640ddc63ee4ea8f0c51aa7deaa06ae16b87259e1d3b50c8513271a1004633246d788862ace4cbf05e341c13a0c6ebee427293 SHA512 99dc7f60578d1b42865e476527e4a2f86622dec59afd182d85c5588ace1764f34f2c92f08a6ffae1cb2f27c66e8b2044cd20d9daaa19aed64b5a03d21a01142b
-EBUILD gmic-2.9.1.ebuild 4280 BLAKE2B d75d51965efd8f73b1b3112b14d640ddc63ee4ea8f0c51aa7deaa06ae16b87259e1d3b50c8513271a1004633246d788862ace4cbf05e341c13a0c6ebee427293 SHA512 99dc7f60578d1b42865e476527e4a2f86622dec59afd182d85c5588ace1764f34f2c92f08a6ffae1cb2f27c66e8b2044cd20d9daaa19aed64b5a03d21a01142b
-MISC metadata.xml 455 BLAKE2B 3854d23d62226a85f06404a3df62db1520a966a921137768f90a64bf2fcb0235f0786b8187154a0758682551eae61550fd571f7dfd940396de6f03fd6be204ad SHA512 95088719b28034519d74495a7232695eedd527cb031f65b808ac30d4cf0fc8ab2bca2271d02ef285f338d60151b30f0b3420eb29a45ac4f8a8922ab6b7e42a5e
+AUX gmic-2.9.2_ipa-sra.patch 665 BLAKE2B b61fa87ac2da5fd5956c89cb4a6c128f266a175dca70cd34ff4bed0483c934241a375131eaddd6ebd5f3afb52e694d4fc6839d20718bc06463c0e263f15b6d5a SHA512 6f04cac4de5914cedd269655fe58ca406199c042bdbab6e706cfea49516d0a7e1234e61c51b6a142341a7984dd96e97c4b8f13c2efbe427627be26539af8653e
+DIST gmic_2.9.2.tar.gz 6639693 BLAKE2B 4b452cc5c82e8ea30a1bd65e51b6187fc12d9c7f8af6d0f8107a8d183c6e87dff11394f103eae7ac17daa00c6c9aa0f47ce78a92156e2da9bc4ee0fcacbf398d SHA512 be8707b5c156b17189548c1f808b976afcb7b7cce20ff54ff4589eda9a76a8cddf81c64b7a53c332254b2c8c29fb8ca0926016cadcb1efb7131a38d857fce796
+DIST gmic_2.9.3.tar.gz 7279292 BLAKE2B 920a94321b2916f65bb2c5b273c4938acdcd7b4825a3eeeb15407b1a6d7881f927792f89524db7d3a33272ddae8e39e8f60d29a922b5dd2873e6b9be2948a646 SHA512 e640c73b9d008b445d075b02ed7d359a0c2ee51df8245557192e38ed108e6db43de0fca577f1636c40b2c4a7db038f79926e7666b9f00b6421cda96d9a91b3ff
+EBUILD gmic-2.9.2-r1.ebuild 4848 BLAKE2B 19cec459abf67e10c99319c9fc1174eba19390e94bfe07595d75c3bcf144cad2235281b1a07eabb56c245aba87ceda414c602f64b51734669010961f652db473 SHA512 1857c8b9c01dbd03f3e2dee257fece0ebb6574ce1eb91db76be86e1b3879b0aed7067ba25857e247e49ec1adfb4cc483f52b41ede31f9156b8650e4f295593c8
+EBUILD gmic-2.9.3.ebuild 4848 BLAKE2B 19cec459abf67e10c99319c9fc1174eba19390e94bfe07595d75c3bcf144cad2235281b1a07eabb56c245aba87ceda414c602f64b51734669010961f652db473 SHA512 1857c8b9c01dbd03f3e2dee257fece0ebb6574ce1eb91db76be86e1b3879b0aed7067ba25857e247e49ec1adfb4cc483f52b41ede31f9156b8650e4f295593c8
+MISC metadata.xml 605 BLAKE2B f1ed3b46614a3e3273e4bdedfd7b45629eca482a0805ff1bda2161e4d785a478b91f8ccdbab399b184ec93d020211e35e4503fbf4205b1e2e1f04c7e547303bd SHA512 8303e0a301edb88bdb7522baf47e29b39e895ccaa729231d64b6a39af73f0eb1626c39439f1ed70d496d982f3abca4ff9586d20fc5a9d08b0e57a19b60bf088d
diff --git a/media-gfx/gmic/files/gmic-2.9.2_ipa-sra.patch b/media-gfx/gmic/files/gmic-2.9.2_ipa-sra.patch
new file mode 100644
index 000000000000..384856a0464f
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-2.9.2_ipa-sra.patch
@@ -0,0 +1,15 @@
+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)
+    set(COMPILE_FLAGS "${COMPILE_FLAGS} -mmacosx-version-min=10.8 -stdlib=libc++ -Wno-error=c++11-narrowing -Wc++11-extensions -fpermissive")
+ else()
+-  set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-error=narrowing -fno-ipa-sra -fpermissive")
++  set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-error=narrowing -fpermissive")
+ endif()
+ 
+ if(NOT "${PRERELEASE_TAG}" STREQUAL "")
diff --git a/media-gfx/gmic/gmic-2.9.0.ebuild b/media-gfx/gmic/gmic-2.9.2-r1.ebuild
index 660e4b3ff4dc..4af6d1c63fa1 100644
--- a/media-gfx/gmic/gmic-2.9.0.ebuild
+++ b/media-gfx/gmic/gmic-2.9.2-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 CMAKE_BUILD_TYPE=Release
+
 inherit cmake bash-completion-r1 toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
@@ -11,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"
@@ -19,9 +20,10 @@ 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 digikam ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
 REQUIRED_USE="
-	|| ( cli gimp krita qt5 )
+	|| ( cli digikam gimp krita qt5 )
+	digikam? ( png zlib fftw X )
 	gimp? ( png zlib fftw X )
 	krita? ( png zlib fftw X )
 	qt5? ( png zlib fftw X )
@@ -36,9 +38,13 @@ 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-2.8.0
+		media-gfx/gimp:0/2
 		${QT_DEPEND}
 	)
 	graphicsmagick? ( media-gfx/graphicsmagick:0= )
@@ -61,19 +67,22 @@ 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 )
 "
 BDEPEND="virtual/pkgconfig"
 
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
+)
 
-	if ! test-flag-CXX -std=c++11 ; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use openmp; then
+			tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		fi
 	fi
 }
 
@@ -81,12 +90,14 @@ 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 digikam || 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
 }
@@ -125,6 +136,11 @@ 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
@@ -146,6 +162,7 @@ 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" ; }
@@ -161,6 +178,11 @@ 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
diff --git a/media-gfx/gmic/gmic-2.9.1.ebuild b/media-gfx/gmic/gmic-2.9.3.ebuild
index 660e4b3ff4dc..4af6d1c63fa1 100644
--- a/media-gfx/gmic/gmic-2.9.1.ebuild
+++ b/media-gfx/gmic/gmic-2.9.3.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 CMAKE_BUILD_TYPE=Release
+
 inherit cmake bash-completion-r1 toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
@@ -11,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"
@@ -19,9 +20,10 @@ 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 digikam ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
 REQUIRED_USE="
-	|| ( cli gimp krita qt5 )
+	|| ( cli digikam gimp krita qt5 )
+	digikam? ( png zlib fftw X )
 	gimp? ( png zlib fftw X )
 	krita? ( png zlib fftw X )
 	qt5? ( png zlib fftw X )
@@ -36,9 +38,13 @@ 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-2.8.0
+		media-gfx/gimp:0/2
 		${QT_DEPEND}
 	)
 	graphicsmagick? ( media-gfx/graphicsmagick:0= )
@@ -61,19 +67,22 @@ 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 )
 "
 BDEPEND="virtual/pkgconfig"
 
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
+)
 
-	if ! test-flag-CXX -std=c++11 ; then
-		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use openmp; then
+			tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		fi
 	fi
 }
 
@@ -81,12 +90,14 @@ 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 digikam || 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
 }
@@ -125,6 +136,11 @@ 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
@@ -146,6 +162,7 @@ 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" ; }
@@ -161,6 +178,11 @@ 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
diff --git a/media-gfx/gmic/metadata.xml b/media-gfx/gmic/metadata.xml
index aa4cb5a5a511..39d49193716b 100644
--- a/media-gfx/gmic/metadata.xml
+++ b/media-gfx/gmic/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 	<use>
 		<flag name="cli">Build CLI interface</flag>
+		<flag name="digikam">Build <pkg>media-gfx/digikam</pkg> plugin</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>