gentoo resync : 11.05.2021

25 files changed, 760 insertions, 245 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 3323b0a8209d..a5f3b0396e80 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/brscan4/Manifest b/media-gfx/brscan4/Manifest
new file mode 100644
index 000000000000..06dc3c8a520a
--- /dev/null
+++ b/media-gfx/brscan4/Manifest
@@ -0,0 +1,4 @@
+DIST brscan4-0.4.10-1.i386.rpm 100151 BLAKE2B 94fd7daa5682b294740a6e1345c4ab8d488589896c3fa34eafc131b1cdc2ef2e022e11795ebc261538c6107583602a9622946ea049a3cfbbeb547e7e9c8825ad SHA512 5daeb9a1304f3aeb0a2e17823887a546ff872dfb42bf08ab403539815553da597504ac7afcbb2a34fbcfd8d973c03c8ca2c62617f8c499b9fc44b1719e4f2611
+DIST brscan4-0.4.10-1.x86_64.rpm 118863 BLAKE2B 1e518122b049a6cd594e4603311d37f289aef4ad3973cbe846700c2a5c0c8f0ec994f6608817a1c12d6494c3ae78178b43f4ba8450ab00153e27f533ec1957c8 SHA512 c648db8d8543dec9e1cd556f2e0415c170c06935febd1373d783191b159ed9ed67043644ef81fb18027de89270e10a5cedcee11ea66ee262df1a2d4f006e4875
+EBUILD brscan4-0.4.10.1.ebuild 2000 BLAKE2B f5c827106cb0d556308239d846fcbeeaa276589b77370a63945df99c091c8c531ea7fd3ed85cb8c9ffcf2dabb616f716334dd98fc77bebafe3b4d4c3b0b2ba4a SHA512 799d059557810a9ecd686d242629a552380c5f14896b43985d4e089533fd78880da0b7d60bb8cfdb4067748c971716b8d3c18374eccc7ffc1b4251bc4b3490a3
+MISC metadata.xml 290 BLAKE2B 7b33307843dfe1ad587233554236500ada8d39e8d22f41d491a09201c502583456267c40332cfc3b0be3d5f703c6dc9be3dd41d325a60aa0c231b0fd2794f623 SHA512 c5fc92f0260d536d70d042d043c3925e7b207efa8c53b5a76f642ed42228df8e957837bb2bd7b735b4067ea779fa679212ff782a0391cdeb518b6b45247658f8
diff --git a/media-gfx/brscan4/brscan4-0.4.10.1.ebuild b/media-gfx/brscan4/brscan4-0.4.10.1.ebuild
new file mode 100644
index 000000000000..7a1df035f4c1
--- /dev/null
+++ b/media-gfx/brscan4/brscan4-0.4.10.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eapi8-dosym readme.gentoo-r1 rpm
+
+MY_P="${PN}-${PV%.*}-${PV##*.}"
+DESCRIPTION="Brother scanner driver"
+HOMEPAGE="https://www.brother.com/"
+SRC_URI="
+	amd64? ( https://download.brother.com/welcome/dlf105203/${MY_P}.x86_64.rpm )
+	x86? ( https://download.brother.com/welcome/dlf105202/${MY_P}.i386.rpm )"
+S="${WORKDIR}/opt/brother/scanner/${PN}"
+
+LICENSE="Brother"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="zeroconf"
+RESTRICT="strip"
+
+RDEPEND="media-gfx/sane-backends
+	virtual/libusb:0
+	zeroconf? ( net-dns/avahi )"
+
+QA_PREBUILT="/opt/brother/*"
+
+src_install() {
+	local dest=/opt/brother/scanner/${PN}
+	local lib=$(get_libdir)
+
+	insinto /etc${dest}
+	doins Brsane4.ini brsanenetdevice4.cfg
+	doins -r models4
+	dosym8 -r {/etc,}${dest}/Brsane4.ini
+	dosym8 -r {/etc,}${dest}/brsanenetdevice4.cfg
+	dosym8 -r {/etc,}${dest}/models4
+
+	exeinto ${dest}
+	doexe brsaneconfig4
+	dosym8 -r {${dest},/usr/bin}/brsaneconfig4
+
+	if use zeroconf; then
+		doexe brscan_cnetconfig
+		# Don't install brscan_gnetconfig because it depends on gtk+:2
+	fi
+
+	into ${dest}
+	dolib.so "${WORKDIR}"/usr/${lib}/sane/libsane-brother4.so.1.0.7
+	dosym libsane-brother4.so.1.0.7 ${dest}/${lib}/libsane-brother4.so.1
+	dosym libsane-brother4.so.1.0.7 ${dest}/${lib}/libsane-brother4.so
+	dosym8 -r {${dest}/${lib},/usr/${lib}/sane}/libsane-brother4.so.1.0.7
+	dosym libsane-brother4.so.1.0.7 /usr/${lib}/sane/libsane-brother4.so.1
+	dosym libsane-brother4.so.1.0.7 /usr/${lib}/sane/libsane-brother4.so
+
+	insinto /etc/sane.d/dll.d
+	newins - ${PN} <<< "brother4"
+
+	local DOC_CONTENTS="If want to use a remote scanner over the network,
+		you will have to add it with \"brsaneconfig4\"."
+	use zeroconf || DOC_CONTENTS+="\\n\\nNote that querying the network
+		(\"brsaneconfig4 -q\") will not work unless you emerge ${PN} with
+		the zeroconf flag enabled."
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-gfx/brscan4/metadata.xml b/media-gfx/brscan4/metadata.xml
new file mode 100644
index 000000000000..5bd0c1a7db5c
--- /dev/null
+++ b/media-gfx/brscan4/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>ulm@gentoo.org</email>
+</maintainer>
+<maintainer type="person">
+  <email>mattst88@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 1088048cea45..072c970e5c9b 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,16 +1,13 @@
 AUX darktable-2.6.2-exiv2-0.27.patch 598 BLAKE2B 724290bb5c1344c0113abde04688009b3db10f530684f3f53e0fcc935a9ebef4b3680a36cb5d005e8826ea1512f0ec505b06e404d144006848601699d33d1416 SHA512 77fc92bf8d373552fc82de1927a1708b989caf0b080c8ef279692c0b9f2e95526a70d2bf4af5f62abb68ccb733af08237f9e143773cc8a75d72dfb6ba434df6c
 AUX darktable-3.0.2_cmake-march-autodetection.patch 908 BLAKE2B aa1c0cedfe1f267332f11b9a8f38ce368af02b7e4f9751b128b7af91dcdfb066a0529ae126d41a34bc3fc66f336924f3376f270674bcc7e0912d2e23d46ec83b SHA512 da1f10e86b7b9e2a3f317d620a58ebed156a5c6e0f22f429da617cb176d1c18d6d1b6706c1444c9007ccb776bc6b951e3560214e89e95b4050899ec692b74dde
-AUX darktable-3.4.0-xmmintrin-sse-only.patch 748 BLAKE2B 4466070726d011e2522dd939a55e5d8671f927d0c0165e176b3732a8eac17401cfc7d681fa0b97a8ee0f4dd796da1f937a6cf7d4ee2bfb2d828d7a37b92c3570 SHA512 998804a761320db915f96a499136be8abcbf7e906d07f0ed7df62c07cd5ed277ed9bcf0b348660731ecb131feb3611f1435efc485ebcb3c13fcb48020c1d93fa
 AUX darktable-3.4.0_jsonschema-automagic.patch 891 BLAKE2B b0abdd7ea80a446e2556daf06f78343deeb781a12b670f3c3d2f8a34ec9877e16991f6a105c90d58f437915b30bd8bddfb995d515bc73563a44f3807258c9fee SHA512 57cdf87586c6382347334577fff71d415be0123ad101c073535e9d4e87e7edac275272e0b3be91bd34965bacf1f6166cfc64af34b4cdedfb27b409e27bc3bdc9
 AUX darktable-find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73834d734c454a7c561654bc27f052de55db6c62f454927b2c701b7f4f6c52d5d2fac0b7c230b90ef89bdc9431856bd4ae69a SHA512 93023a318158850a5bac4a1d871ea6e69a3c9f2bc57f8af47bc83bb131f96e8972c23b07945df2eddfb05bffdd950e8250da77c47d1543b776a7e9405adad020
 DIST darktable-2.6.2-gcc9.patch.tar.xz 25864 BLAKE2B 857803d4c46b47b1e06e962533c231621fa23e72dffae617bc4e078316fc22c5883df404b30e63d7ed2111078d0d7b54bfa3510524c92fa739238904e2ec17f0 SHA512 29b208fa0b04aa11a2c45312763ba471785b2d0f669c07a6092b82adc0284428d7dc9ea8ebae7bd851414f04191e6aafb434fcc127f062ef66d075208c7d49cb
 DIST darktable-2.6.2.tar.xz 3512572 BLAKE2B ee3070ac0f6b6b1c401865801631fb28397f484f30778065b7f899204813530a47ff6e752504b645f59bc29f868e1498e39f5f4e70f8259d8fecf5abc3f15cd6 SHA512 e7a90535747a8615fa2dbd1eb05f81314cc61c689a8a85fda0e2be40208ab0248e6f6ef296bb0894d3d527ed47c6cf6640538029c0c2d58a38d2d5ce10f6f5c0
-DIST darktable-3.4.0.tar.xz 4444452 BLAKE2B 98b717aafe940a6916a2c2c42577be4956a171e7b445d69d20cb6aa1db35a255919524e8547c229461c64022fa3df5ace57a9e7a5ed32304820d5f263c3acbfc SHA512 b0a1e58f9af4007b22bacd7c61c75bdd036db9b1bbb6bd0ed785759d1a7a5a095a49a2a68c1555c661c4fff2549fcd35d2db2d9d4c16fc035bb37939804c749f
 DIST darktable-3.4.1.tar.xz 4456192 BLAKE2B 7b573db69cb32496ad79d6636b50d3b2db471376c2486d356e1da2740d48644821265c3249a40603a521d588ef89cee33e31d7a6b216f106625ca2aa3f8bfb68 SHA512 3376c5e2aa52d02fcfc45d9efb1a60a7bee6210dc81e1131f2c163ca2059860f7e3a64b5cfd05117dcaaf8c7810d08a84058a0b64ef6fd24c90bbafde7ca4f6f
 DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
 DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56 SHA512 fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e
 EBUILD darktable-2.6.2.ebuild 3475 BLAKE2B 447c7330f1721443008a4794458d2365c5459a17e9257e4b2ae9a218824b78481ac66f37b230689035021d345908815135d71bfffad40e5c7d28bc7687cfcaa6 SHA512 23cf95b35f5445d7b21f13f11304e1eed211adb738d6d4389123b82596a77bcd8c8412b89c793d93fe1f6ab5dfde104618903ec35ab1e59a784eb7e43328362b
-EBUILD darktable-3.4.0-r1.ebuild 4588 BLAKE2B adc2823c2cf2849c3c93e833817afd023da1ab0060f526651d9e5c5eff955ad3286fd828592fcb2bbf7356dce18ea27b1e0ff34f18027b90fb6aba3f00b0147b SHA512 960511d2f1df6bcd4affb5b02b89378c78277f645b1bfefb36278b22caa6b80b9e1d5f12fb2f2e4eff19756a9dc6d73f2401abc4d71ec6bd42fe485a5edf979b
 EBUILD darktable-3.4.1.ebuild 4478 BLAKE2B cc2a4a83d6d2dbef0fc4c7a52cdfbd8649fdbf39fd8d32886705f711fb72898a5a4ccc88a0c7b98a0a60eb2b8e399d97b993c16bd33bcc5c3bc6470f1a6ace82 SHA512 4ff0d3498ddc6b940d7787fd870546eaee0a42b467cc3f91d75d4af08c25a642f2cf1e27dba480ac04884b6d72d9282ca06f3671eb136e6797cc1478bcfdffc4
 EBUILD darktable-9999.ebuild 4480 BLAKE2B 6d3d2e59331dfe3d44afeccf8616f0f14bf63a8b7a9f8c203416fe6fa907047b059cb09081e26ac216bcd98957c4a9651579df48a4dc1dc79e073a884b421095 SHA512 3f2e5818e2af72ba8ee3c7e82ab947f7a6a36c666b7cbd994be8890e102cbe08247af01640d7f437a67b1a58b955fddf48084375651ad2c48743cd58088eae39
 MISC metadata.xml 1151 BLAKE2B 45fdf41338969512b2790e0dc3fb75b1633244c398c8f2eb67b9264ceba3b41c64d19713bc6727870465d03ebc37714c464a537c5ef4c7b1b7f52711a8e8c268 SHA512 784be9b2454a021f7547894cafb4e2e0fdbda8e30dbfbf78a0d234f596ab8321a5e5a0b8944af8f55d0ce7b466139837d4f0f5139152e2fc691ae528c0e3eef8
diff --git a/media-gfx/darktable/darktable-3.4.0-r1.ebuild b/media-gfx/darktable/darktable-3.4.0-r1.ebuild
deleted file mode 100644
index 36695e589e29..000000000000
--- a/media-gfx/darktable/darktable-3.4.0-r1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-3 )
-
-inherit cmake flag-o-matic lua-single toolchain-funcs xdg
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/"
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
-
-	LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW"
-else
-	DOC_PV="3.4.0"
-	MY_PV="${PV/_/}"
-	MY_P="${P/_/.}"
-
-	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-		doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
-
-	KEYWORDS="amd64 arm64 -x86"
-	LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
-fi
-
-IUSE="avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-	lto lua nls opencl openmp openexr test tools webp
-	${LANGS// / l10n_}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-python/jsonschema-3.2.0 )
-"
-COMMON_DEPEND="
-	dev-db/sqlite:3
-	dev-libs/json-glib
-	dev-libs/libxml2:2
-	>=dev-libs/pugixml-1.8:0=
-	gnome-base/librsvg:2
-	>=media-gfx/exiv2-0.25-r2:0=[xmp]
-	media-libs/lcms:2
-	>=media-libs/lensfun-0.2.3:0=
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	net-libs/libsoup:2.4
-	net-misc/curl
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/pango
-	avif? ( >=media-libs/libavif-0.8.2 )
-	colord? ( x11-libs/colord-gtk:0= )
-	cups? ( net-print/cups )
-	flickr? ( media-libs/flickcurl )
-	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	gmic? ( media-gfx/gmic )
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lua? ( ${LUA_DEPS} )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	opencl? (
-		>=sys-devel/clang-4
-		>=sys-devel/llvm-4
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
-"
-
-# the xmmintrin patch will no longer be needed come 3.4.1
-PATCHES=(
-	"${FILESDIR}"/"${PN}"-find-opencl-header.patch
-	"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
-	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
-	"${FILESDIR}"/${PN}-3.4.0-xmmintrin-sse-only.patch
-)
-
-S="${WORKDIR}/${P/_/~}"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# Bug #695658
-		if tc-is-gcc; then
-			test-flags-CC -floop-block &> /dev/null || \
-				die "Please switch to a gcc version built with USE=graphite"
-		fi
-
-		if use openmp ; then
-			tc-has-openmp || die "Please switch to an openmp compatible compiler"
-		fi
-	fi
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse3 && append-flags -msse3
-
-	sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CURVE_TOOLS=$(usex tools)
-		-DBUILD_NOISE_TOOLS=$(usex tools)
-		-DBUILD_PRINT=$(usex cups)
-		-DCUSTOM_CFLAGS=ON
-		-DDONT_USE_INTERNAL_LUA=ON
-		-DRAWSPEED_ENABLE_LTO=$(usex lto)
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-		-DUSE_COLORD=$(usex colord)
-		-DUSE_FLICKR=$(usex flickr)
-		-DUSE_GMIC=$(usex gmic)
-		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DUSE_KWALLET=$(usex kwallet)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_LUA=$(usex lua)
-		-DUSE_MAP=$(usex geolocation)
-		-DUSE_NLS=$(usex nls)
-		-DUSE_OPENCL=$(usex opencl)
-		-DUSE_OPENEXR=$(usex openexr)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENMP=$(usex openmp)
-		-DUSE_WEBP=$(usex webp)
-		-DWANT_JSON_VALIDATION=$(usex test)
-	)
-	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# This USE flag is masked for -9999
-	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
-
-	if use nls; then
-		for lang in ${LANGS} ; do
-			if ! use l10n_${lang}; then
-				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog
-	elog "When updating a major version,"
-	elog "please bear in mind that your edits will be preserved during this process,"
-	elog "but it will not be possible to downgrade any more."
-	elog
-	ewarn "It will not be possible to downgrade!"
-	ewarn
-}
diff --git a/media-gfx/darktable/files/darktable-3.4.0-xmmintrin-sse-only.patch b/media-gfx/darktable/files/darktable-3.4.0-xmmintrin-sse-only.patch
deleted file mode 100644
index 2e13ad859c82..000000000000
--- a/media-gfx/darktable/files/darktable-3.4.0-xmmintrin-sse-only.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d10c290fb3b47bbc8fd90d6d1d7935b900c1caf6 Mon Sep 17 00:00:00 2001
-From: Pascal Obry <pascal@obry.net>
-Date: Thu, 24 Dec 2020 16:17:19 +0100
-Subject: [PATCH] guided_filter: include xmmintrin.h only if SSE defined.
-
-Fixes #7428.
----
- src/common/guided_filter.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/common/guided_filter.h b/src/common/guided_filter.h
-index 36be0de04b9..59c8b2af999 100644
---- a/src/common/guided_filter.h
-+++ b/src/common/guided_filter.h
-@@ -18,6 +18,7 @@
- 
- #pragma once
- 
-+#if defined(__SSE__)
- #ifdef __PPC64__
- #ifdef NO_WARN_X86_INTRINSICS
- #include <xmmintrin.h>
-@@ -29,6 +30,7 @@
- #else
- #include <xmmintrin.h>
- #endif // __PPC64__
-+#endif
- 
- #include "common/darktable.h"
- #include "common/opencl.h"
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index c7db3f04fa3a..73da2729be69 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,5 +1,6 @@
+AUX digikam-7.2.0-qt-5.15.2-after-f8ad329f.patch 1560 BLAKE2B dd2d9995787593f736f406566131af29573df097801f2c9b9eec12947838bf748c697bf6ab75d69f72359a1783d18fde994b4899861065d4d10dab100e0edf44 SHA512 eb1d1c4bff3dcc7e1d03069591ad8d48a3947ee962757baccf70e2e6c7577f6d52a4ae527af20d88aa24b66c0b1705367f67b7e3da70b19825a57def7371420a
 DIST digikam-7.1.0.tar.xz 593501044 BLAKE2B dcd124a18299a75c02b51642cc33d2a053f1fce4abd82b3f50ea93cc17e8b302b73284106ed716e815741cc38326695f1303e018998a6687f8cd92ab539faeb0 SHA512 df7138a45ff8de6c1e32cb0eea83e1cd4b67f027b149a696d8feb8008ceaae55934c1f1d9625c1ba29de850ad70aa01dc73f1b7517253ca6aa99f0f97b84a3a4
 DIST digikam-7.2.0.tar.xz 255278796 BLAKE2B 5ccc6c6d1f3ce8d83746a1022dcf22b11b87af354f93f0b872a713f438d1bd2ee3f8e59d6206cd83dbbcaf1a8f2568ad0920d887b11d65864802f7eb2b02ba90 SHA512 2908a802fda84caf6b398a5dc328d2e9c00ab68776bde4620db1cb981995879e89d590520bf855471c968f065951280f863620641ccf945c43704e6cf3c0abd7
 EBUILD digikam-7.1.0-r1.ebuild 4000 BLAKE2B ab10f960037cb269d0dd758624e2c263e8697f4c1c9ba8b1d88a4bd1684b364555b6704b765d003eca271626fe352e8dff0fa115154ce6762287ac23905800ad SHA512 2111860137feff79c9812f2aede64069ad4a68c0180063722e43b0c74ce7f3316fb44f59a4820671944f965329409932fe4e0c71fbbee76ce1c6cf2c9d85636a
-EBUILD digikam-7.2.0.ebuild 4001 BLAKE2B 64dafd1f1414923d7dabc0549bfb599fb6f9300804073c72b4c354470995e86bc0958424593e14ea30dc77c12b54d2e09659487aca804b17c43c363fb08d8922 SHA512 ce910cfbba0988e6241b83c8cff61e26cef20509f370f728800d62656f05ea149b34212ef34945dab5acc2896070b00c0aa87b90a5ec8f0b685699a57a8a2c17
+EBUILD digikam-7.2.0.ebuild 4064 BLAKE2B cf9e2198102df1c8e8c776be495fc5078e2fa86e633b5620b69980367c2fdeeb15924769e661887e89f8e1d77e76efa460a8bcb8120f05596d03dc67ba089b14 SHA512 ffa8e41e8676433b6ab23fb9d3e9f8117a359900d62849d548ba2bf8e0426efaa436b3598c11514be55367def92858b2a6ed611640e6ffe76b9fe7c8872db3c6
 MISC metadata.xml 1097 BLAKE2B 1870f4bef0643db48fa2e6241f25d33c718010556b79bb54339f4ff9a13d7d005cea8e358e83d54ee94860b191969c834b9e5fd8152a17d7a5cc464a6813000e SHA512 25c2fcb533b644cf4aa376518a77f35bab0676c6f8853998f50e1eebbb2de20ca49e02fc110b1d6f55d2502f4e353803f12a2b336b98d85321b891a42ba16ccd
diff --git a/media-gfx/digikam/digikam-7.2.0.ebuild b/media-gfx/digikam/digikam-7.2.0.ebuild
index c7406e0e9cf7..7024418a1e3a 100644
--- a/media-gfx/digikam/digikam-7.2.0.ebuild
+++ b/media-gfx/digikam/digikam-7.2.0.ebuild
@@ -108,6 +108,8 @@ RDEPEND="${COMMON_DEPEND}
 	panorama? ( media-gfx/hugin )
 "
 
+PATCHES=( "${FILESDIR}"/${P}-qt-5.15.2-after-f8ad329f.patch )
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 	ecm_pkg_pretend
diff --git a/media-gfx/digikam/files/digikam-7.2.0-qt-5.15.2-after-f8ad329f.patch b/media-gfx/digikam/files/digikam-7.2.0-qt-5.15.2-after-f8ad329f.patch
new file mode 100644
index 000000000000..938cd8a990cd
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-7.2.0-qt-5.15.2-after-f8ad329f.patch
@@ -0,0 +1,29 @@
+From 7078ffb91c05e6cd436eaf222541044b98265113 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Fri, 16 Apr 2021 19:45:05 +0200
+Subject: [PATCH] Fix build after Qt commit
+ f8ad329f7ee01993c388f78851fc4ac88f5093b4
+
+Build fails after this commit when using QT_NO_CAST_FROM_ASCII
+---
+ .../webservices/mediawiki/backend/mediawiki_queryrevision.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/core/dplugins/generic/webservices/mediawiki/backend/mediawiki_queryrevision.cpp b/core/dplugins/generic/webservices/mediawiki/backend/mediawiki_queryrevision.cpp
+index dce0fc9eb5..625d170d5e 100644
+--- a/core/dplugins/generic/webservices/mediawiki/backend/mediawiki_queryrevision.cpp
++++ b/core/dplugins/generic/webservices/mediawiki/backend/mediawiki_queryrevision.cpp
+@@ -299,8 +299,8 @@ void QueryRevision::doWorkProcessReply()
+                 while (count < 2)
+                 {
+                     if (replytmp[i] == QLatin1Char('"') && replytmp[i-1] != QLatin1Char('\\')) count++;
+-                    if (replytmp[i] == QLatin1Char('<'))                          replytmp[i] = char(255);
+-                    if (replytmp[i] == QLatin1Char('>'))                          replytmp[i] = char(254);
++                    if (replytmp[i] == QLatin1Char('<'))                          replytmp[i] = QLatin1Char(char(255));
++                    if (replytmp[i] == QLatin1Char('>'))                          replytmp[i] = QLatin1Char(char(254));
+                     ++i;
+                 }
+             }
+-- 
+GitLab
+
diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest
index 5934932461f7..518c54c98fe3 100644
--- a/media-gfx/gnome-font-viewer/Manifest
+++ b/media-gfx/gnome-font-viewer/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-font-viewer-3.34.0.tar.xz 157756 BLAKE2B dabda5516fc5461d382f6ac6ed2ac6177dee137983833e3643d029e2370b76ef586223a41b591ef0f6c21024f1e42fe7b234c8ef9cdbbbf9845c46b9a55222eb SHA512 1be6230da5ff47a129db43b5f5467d3fed8925fad7a6637f24d72c8c99c80d8dd1635eaef1b7c7f650a86132a54cde8326d3418075f5818d0154dc8d503927c7
 DIST gnome-font-viewer-40.0.tar.xz 175396 BLAKE2B 33e10646fe31f76696867c0c5e7a99385064f09049390adb78149141f906958a6f14c3e29a9fbbfe8c48879f4600963ec66e9753018d9d7d658f4111c6dad120 SHA512 c82044e6750494d693cf631abe7fb76c655b58965ccd1ca08f512f0e79c40e9f207997465908b99e5813f350ca05ea8e76f029be79f3008173c49f3c5a4ee23d
-EBUILD gnome-font-viewer-3.34.0.ebuild 661 BLAKE2B 8739b88db8eb33fd8e926e6d2332d2709295d9b717e57aba42968b2946777358b052f7ff74c7662c59549b81d186136ef0730830a6d4d9a7b417615026a4e0d4 SHA512 31f4a036e1c791507d655b7dd7e984ffe594eace707539efb797accc11b04b27a8ef00cafb6ea9aeeb630565a3dbb3b6a7452e1ee810bed079c6b72ed02b8d91
-EBUILD gnome-font-viewer-40.0.ebuild 697 BLAKE2B be88c9be05b96972ac8fa8c7c9d14c62e239d097f9504789d9f9e546b7f830b65bd9e6880c42dcec2d2a93378b30c1f931510890e8115285422fe329b54657a2 SHA512 539829a641857982fb9f613353cce677b3a986b76af2c292755eab1fc12728fdb3db4fce00e8ef9aad06a6060ed8c30b03b69b8426cc0e4acacb410195b4095d
+EBUILD gnome-font-viewer-3.34.0.ebuild 663 BLAKE2B 72c32fe0f9de0424a9b40675c517aefd39b5215a6c4fd6e3e5ad0af7591a33654d46b34fd31ecbcf8355c659d3093648e7ce30e11d153af32ff98d6b3b8bfe00 SHA512 38610161484b35700354930c782f7cbbc1d13bf6bc8d5a185d50a071db91b789633ba74c47a381b9f8bc12c720347e423a2112005d84d2cd7682edbe93e7b4e9
+EBUILD gnome-font-viewer-40.0.ebuild 699 BLAKE2B 44e15a20602247e43041686ea628b6eb035e97325877260f873eeaa707549f84dfe7b6f7bdd14d86e175b62d78d84f6e7c45c4a2e859cc5c66b5db25dbdf6377 SHA512 bd752e690c49ffce2df4494bbcd9f8f000b2da067e784cd25bbcdce851fd7eeedcb79237509572203424f6225f5cea9e593db07108403da1bbaa288801dc73fb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.34.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.34.0.ebuild
index eceff0c61b9a..99dbeed9c0db 100644
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-3.34.0.ebuild
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-3.34.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit gnome.org meson xdg
 
 DESCRIPTION="Font viewer utility for GNOME"
-HOMEPAGE="https://git.gnome.org/browse/gnome-font-viewer"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0.ebuild
index e30e1d5675f2..0fdb36355a6f 100644
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0.ebuild
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-40.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit gnome.org meson xdg
 
 DESCRIPTION="Font viewer utility for GNOME"
-HOMEPAGE="https://git.gnome.org/browse/gnome-font-viewer"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index e43ea7ea0abf..7f0b822c55ad 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -3,5 +3,5 @@ AUX graphviz-2.47.1-bashisms.patch 407 BLAKE2B 957817776e4ea7a0ae84a64d65c452e1b
 DIST graphviz-2.44.1.tar.gz 34079677 BLAKE2B 90183afa6affedb097eab237fae148a9c085c3a724fb74d370f7c042b53d09b44ba0cb755a2ac74175d89d3a45687b60f0e210bdd404fc72da98bdf61b9eaa8d SHA512 42e6137c7cce18daf6f17e6fcbbdfe8e0a531de1bdd3ac7b8751445214aa0d85713b65ba896a234a02670827b0d608bd64b758ef60a4d0384ffa3355ee0dbc42
 DIST graphviz-2.47.1.tar.xz 23226336 BLAKE2B 7e9f8683ba3694ff34c589dee7f595694e3fb44fa14b3904d648e2f6effebcd725b3cbf09bdfbc25825a92a8fdb4a6cf988f7000997d0a6be065138585fc897a SHA512 4a49a14ca738058ced6ce6352b65137c34cd130525ab2b84a436d282b8b65ecfe7330a214e472e74cfa8e432b4574a746460daff0a4d292962c851fec341aefb
 EBUILD graphviz-2.44.1-r1.ebuild 7818 BLAKE2B dffb6585f3d02af75a32ee80c497432344ad9f4c1508807d9eee3f9eee437872ab120e4e2e6cef679cc93620697c38540a3ee9cb642bfdb16b648def86484483 SHA512 eea967b85b9f22fd3826cf21b0441acefd6350cd5670975602e4d435731731b210b9eb38dbebc0b5740ee92238737f14e71063329c2bed72ebfa1f2ac50073e7
-EBUILD graphviz-2.47.1.ebuild 7690 BLAKE2B a7f9318f44a6a512f82a63b00590a656226f3cd7493014bbf03746fa61de73699bbb1ff6cd8e55e88a54b28317d705cba999ec15248111b91b30ceeb69b8a4e0 SHA512 5cc01c00b7068d00fd725801312ba0d9162821a897797b1dc92052c78f3c0559456aaeaf80f1e8b6b7e2a0d255ef98a458c4ca472c1fdc40ca198ccefc6b6d1f
+EBUILD graphviz-2.47.1.ebuild 7692 BLAKE2B 008e7900b9f154a076626f376f4ee4baae269faf42fa5c838a4843e8d8b366ceb327ee941c5192d5f03f7f3b5ca7d84c01247ea55bb5acca14d10757a58159aa SHA512 11abc87e40bf7a605305d29b6a8920dad489cacf0610964861504646ae238c6a6029116160c245736ff79d792b9c9fea54e39d95abb0b2b35e049170151dfd86
 MISC metadata.xml 2244 BLAKE2B 61cc818a6f736cee316c026bef8f02dc03ffa3c63f620832fd063f00111178b07be4c5224f5d4fc0f1cddbfc3180e31ac277d493107e0d716d0d2f05c7272633 SHA512 e8c8d5b2abf9c21c6fe8dd7e3489210275065a2f0f64023f5aa52fac2b2646b974fc36c60aa189be022728384ff223aae5856095846dc5ea85638d1b882ad7e0
diff --git a/media-gfx/graphviz/graphviz-2.47.1.ebuild b/media-gfx/graphviz/graphviz-2.47.1.ebuild
index e0b4dec8afe4..17d8c281d0e1 100644
--- a/media-gfx/graphviz/graphviz-2.47.1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.47.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/graphviz/graphviz/-/package_files/9573974/download -
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
 IUSE="+cairo devil doc examples gtk gts guile java lasi nls pdf perl postscript python qt5 ruby svg tcl X"
 
 REQUIRED_USE="
@@ -40,7 +40,7 @@ BDEPEND="
 	)
 	java? (
 		dev-lang/swig
-		virtual/jdk:1.8
+		>=virtual/jdk-1.8:*
 	)
 	nls? ( >=sys-devel/gettext-0.14.5 )
 	perl? ( dev-lang/swig )
@@ -66,7 +66,7 @@ RDEPEND="
 	gtk? ( x11-libs/gtk+:2 )
 	gts? ( sci-libs/gts )
 	guile? ( dev-scheme/guile )
-	java? ( virtual/jdk:1.8 )
+	java? ( >=virtual/jre-1.8:* )
 	lasi? ( media-libs/lasi )
 	pdf? ( app-text/poppler )
 	perl? ( dev-lang/perl:= )
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 3dc1d451c80f..25f8e9968b80 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,18 +1,22 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
 DIST ImageMagick-6.9.12-10.tar.xz 9154060 BLAKE2B 23f9ba449970190a8fee14b161ff893199188f93d9a29e188325448b97a68b61ba70a92289c096371e2988db3d599b52d0d8df06105d06f5dcc4f7d3c6ef4ea5 SHA512 75f3450cfbf779af22efc02733f99ac62ed92ad869ae28a279805ffe38adb515507592e7111ba881ac5b781972841942f7f8e5ecc8ab6f773aef8de454a80b35
+DIST ImageMagick-6.9.12-12.tar.xz 9141288 BLAKE2B 95ec30e77fc3f963bb0cae5280ad8e72ba9b6e0c8419fdf41f1899371ecbf5f64bbb70cc6193e751da0c3365551bdb2442e9f4746284ecff92ca351fc906fa4c SHA512 7e680809954326d32439c922cbcb65c9076823c50bd56ba2a230ec4a6d46f00a03a032d2ff153fe9b7651a9f6bac9625fe2aea7acccba56e15b6dce96e477c8d
 DIST ImageMagick-6.9.12-7.tar.xz 9156816 BLAKE2B 56a13ff744b15fb987232b70d9ea2a14b10de709011375da2b970e408d91079be38ccc5a301308734293c18c81d78a2e68ecee56b7d8478c6222cd7745b847ab SHA512 cfb261c60c07bc52cd491173a17040b33b0fa95f396d933fe9e14767cb5d009a8ebe7194949c2387c723d3a0492bc7b7a078ed89ce8a0024dd8ed73b40748d4c
 DIST ImageMagick-6.9.12-8.tar.xz 9159788 BLAKE2B ceb383d93cd70a2d5755a982a47a7f996b4e9cd4eaa7cfcb14d01fdc84904ccac9d897337616116f0fbf1bed7640ba93bcf5426552a83b45d2de455cbf0bda42 SHA512 e248aab0490eaf382a7be36679c23c0a84386302d5a1cd0d054af79fa95d8f6f03a5ad0f628cd818d453284f9b353168491ed58047338ec8eec15983d3007fed
 DIST ImageMagick-6.9.12-9.tar.xz 9161440 BLAKE2B 05c7e3290060fe83aaf1f88761fa2afe63b720fe397ab2f22264d1c4b28cc92c33a2f94782994dce33f8f4528df7cc60503460b23183f815cc43e169cf38c73c SHA512 90848fa3381c69c6526fe6473b9b847cfa81e500aa7ad2be32c4030de1fb84432d83c1dee75a90914e6a18d6aa747aa58696adec43ff61e797f92d0dbcfde01a
 DIST ImageMagick-7.0.11-10.tar.xz 10280304 BLAKE2B 9db1c26eb80dfb929bfced2ac0d6adc29e4e68c759611723812edfb4bf8132d1e39e053506c43179d468ac4027ddea8a85bd5f34d0d738778b7b92546bbbeef8 SHA512 a92a8a65ab7503edada45da9c34488deb79c00d005afcc85a17365fd76c83a174a7213bea4bd072f1125f2342722cb067ffa1513f6530db9608cb6dcff4f68d1
+DIST ImageMagick-7.0.11-12.tar.xz 10284100 BLAKE2B 2b664106152f764948f34fe766552cb48e7ff2a5c83f3f8b7e0a83861ed218bbda278f487678704d42aee900f1ef4be4252d94ccafda2192f39d9a3701115520 SHA512 f5faf124a1923d8b3d362ae59c594dff4d92cf097b42995f6631812bbb320830cee71ca10a15b3894cecf1a286b4fa10e874d213c7438356d194d3ebff778cbe
 DIST ImageMagick-7.0.11-7.tar.xz 10280524 BLAKE2B a4d0cb3e157bff25245d6c3bf3eba55d6f3693ba66d8c5efbc757b31077b1bac0753dca095f853455793355e92e8376a8e41acf3809115c6dbae47977190c42d SHA512 5c36aa566892f0e473ccec0058d7113779704cdf8f4d747132434216c9c0f304de5aafbbbcacc4b21d7e6224e3b9c9439fe6b446e28e821f614c2d1026a280e7
 DIST ImageMagick-7.0.11-8.tar.xz 10280632 BLAKE2B 99c41f09b740f4222b17efa41c8b54445ccb3cfd23aa16d6ae16433952e6c94a02c8db0ffaa3b51e432a2bddb39060b1789b4778f1d9f756b0b992d706a3884d SHA512 e4aa87b30bb75fba815cd4f617a7c0dba29523c03ad6670c7514842587678553d0b45100ccd6e041d59628cf30fe047243d440af78b39d0f82cd405ff0ea0f96
 DIST ImageMagick-7.0.11-9.tar.xz 10266692 BLAKE2B 18e2b7d5e8f93af68cd7a7379968279a1119d25a06bc131465c9ebb500f923664b4332c02828d0837fd1f15395de99b1bdacaf016f1a4a021d71dbe7d0878f46 SHA512 73ecb116fd8885f2ec88a12ae8b36c51b37de3e7e2aa2f9fbbd24a90bc0d78d7603663ec8003abea8af0f200a6176fb26998963a9bb90ce80ebc7feb2dd8921a
 EBUILD imagemagick-6.9.12.10.ebuild 7190 BLAKE2B dd19343291540d9b16a9788d9f2f6b15066d4266bccd43007223c87aef52bb26d5525a54bba2e5d1db7dff888ab39aa8b9c254bf90933e272b648336ba1981d5 SHA512 9eafa9a51938be0e0b8ec28fb147cb71b9f0fc81f97ddc2b9d48bbeb45a21a39331ab22644fb8739feecf7d0b4130d1b2c9be006db9b5b623bbeadf8473a0c20
+EBUILD imagemagick-6.9.12.12.ebuild 7190 BLAKE2B dd19343291540d9b16a9788d9f2f6b15066d4266bccd43007223c87aef52bb26d5525a54bba2e5d1db7dff888ab39aa8b9c254bf90933e272b648336ba1981d5 SHA512 9eafa9a51938be0e0b8ec28fb147cb71b9f0fc81f97ddc2b9d48bbeb45a21a39331ab22644fb8739feecf7d0b4130d1b2c9be006db9b5b623bbeadf8473a0c20
 EBUILD imagemagick-6.9.12.7.ebuild 7182 BLAKE2B d971cfc66508d794a3409e00c6165f9e78c7dfa40ca8e631499368be50efaa8d12ed08d2712c8bd0fc392245c22471bff5f2662c6abe89b301badeb9dc82de42 SHA512 8ebf8dd67a2efe586495f245bad587616a746bb8d161217d9680adbc714bb461403a171d3be4ff843c20e45f090de81fb5cb50ae5b128a5813d8199bee88fa12
 EBUILD imagemagick-6.9.12.8.ebuild 7190 BLAKE2B dd19343291540d9b16a9788d9f2f6b15066d4266bccd43007223c87aef52bb26d5525a54bba2e5d1db7dff888ab39aa8b9c254bf90933e272b648336ba1981d5 SHA512 9eafa9a51938be0e0b8ec28fb147cb71b9f0fc81f97ddc2b9d48bbeb45a21a39331ab22644fb8739feecf7d0b4130d1b2c9be006db9b5b623bbeadf8473a0c20
 EBUILD imagemagick-6.9.12.9.ebuild 7190 BLAKE2B dd19343291540d9b16a9788d9f2f6b15066d4266bccd43007223c87aef52bb26d5525a54bba2e5d1db7dff888ab39aa8b9c254bf90933e272b648336ba1981d5 SHA512 9eafa9a51938be0e0b8ec28fb147cb71b9f0fc81f97ddc2b9d48bbeb45a21a39331ab22644fb8739feecf7d0b4130d1b2c9be006db9b5b623bbeadf8473a0c20
 EBUILD imagemagick-7.0.11.10.ebuild 7348 BLAKE2B 42e9b6cd1b6878fd985dc3b445dfa7f034ddaab981c59b8cedba865d349204a6cd046fbf3901c71ed1125f51ef5dcca35b4473a7803e790c35887cf0798c1b00 SHA512 85e4cb868711c678ddea99bd2442faf52a10c9dc5ba28a5b5dbc80a575073ac48eba4c9f1384b65911bd190fe5e7ffa7000d695086677d07c2d296e9eaa7db9b
+EBUILD imagemagick-7.0.11.12.ebuild 7348 BLAKE2B 42e9b6cd1b6878fd985dc3b445dfa7f034ddaab981c59b8cedba865d349204a6cd046fbf3901c71ed1125f51ef5dcca35b4473a7803e790c35887cf0798c1b00 SHA512 85e4cb868711c678ddea99bd2442faf52a10c9dc5ba28a5b5dbc80a575073ac48eba4c9f1384b65911bd190fe5e7ffa7000d695086677d07c2d296e9eaa7db9b
 EBUILD imagemagick-7.0.11.7.ebuild 7340 BLAKE2B ecd38b0e0d7ed63543c514bdbf3f232ac2ca908891f2cab24a93fced4a08586eb207e3d236c8f1ee35361d743995f129e96e4f693eca30973f3c9320a7cd5a45 SHA512 258513e90922bb80e11c9a148d9d04a28ade01c6187281f6741ea2f384180aaf3ba81f25394bb58b7d6e28bc2379a41aad01a1b7c669b52efd5c5dc5bacc6d50
 EBUILD imagemagick-7.0.11.8.ebuild 7348 BLAKE2B 42e9b6cd1b6878fd985dc3b445dfa7f034ddaab981c59b8cedba865d349204a6cd046fbf3901c71ed1125f51ef5dcca35b4473a7803e790c35887cf0798c1b00 SHA512 85e4cb868711c678ddea99bd2442faf52a10c9dc5ba28a5b5dbc80a575073ac48eba4c9f1384b65911bd190fe5e7ffa7000d695086677d07c2d296e9eaa7db9b
 EBUILD imagemagick-7.0.11.9.ebuild 7348 BLAKE2B 42e9b6cd1b6878fd985dc3b445dfa7f034ddaab981c59b8cedba865d349204a6cd046fbf3901c71ed1125f51ef5dcca35b4473a7803e790c35887cf0798c1b00 SHA512 85e4cb868711c678ddea99bd2442faf52a10c9dc5ba28a5b5dbc80a575073ac48eba4c9f1384b65911bd190fe5e7ffa7000d695086677d07c2d296e9eaa7db9b
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.12.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.12.ebuild
new file mode 100644
index 000000000000..d17773f5081b
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.12.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/6.9.11-60"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+REQUIRED_USE="corefonts? ( truetype )
+	svg? ( xml )
+	test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? (
+		gnome-base/librsvg
+		media-gfx/potrace
+		)
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	X? ( x11-base/xorg-proto )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.11.12.ebuild b/media-gfx/imagemagick/imagemagick-7.0.11.12.ebuild
new file mode 100644
index 000000000000..769cb4c0e00a
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.11.12.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/7.0.11-0"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+REQUIRED_USE="corefonts? ( truetype )
+	svg? ( xml )
+	test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? (
+		gnome-base/librsvg
+		media-gfx/potrace
+		)
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	X? ( x11-base/xorg-proto )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		--without-jxl
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	if [[ ${PV} == "9999" ]] ; then
+		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+	else
+		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	fi
+	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 99e071c61deb..31ff7daa05ca 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -3,6 +3,8 @@ AUX libimagequant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1
 AUX libimagequant-2.14.0-fix-openmp-pragma.patch 1209 BLAKE2B 9a6ea44db62524b454c37abd236d9a7186e3dc5cbda4b0d55a4f96216bd74db13e6bcf8d9d06a490e7ba1a717f7ec8de320780ee3699e10e1c700f441a4d18a5 SHA512 fad1505e2037b87f031838643443d0e2f728855d4a1929b1cae3f37b3d2d22c2408f11461b81818d4c68f52c99d981a134ad8c0ae738fe9240b41e4a460155fc
 DIST libimagequant-2.12.3.tar.gz 75866 BLAKE2B 857a0e3f0187251e37e0c7f4f5f5cbf49266e4eb9f684118705778d9469330cf95780ea11b83d19e28251f047a7e9b8e7ac32ac4d9554cb5d9e1b3230d39e796 SHA512 4818b00b6f154407f3e402d56f4891c2d7594c8056fada0402d7fa0024ae50127340dd8295da5f5dca13fe1829670a3fa8793aa528f3e74a2294c9a7e37b7257
 DIST libimagequant-2.14.0.tar.gz 97471 BLAKE2B df6403aea0b0e3cbaf05c6c60726ac3de85195779e4829dd04acec28ba93ea8d629846fa71d765949e721f592300da1d35227ec7bb28e00c600c575ba3fdc4fe SHA512 d34aa2ac9f08eebd80fb9e3e7fe22a3f10ce840152c4192735d57ae37c223350af09eeff6870ee2634b3fc51b03d1663cd6afd17daeab923af3b5f60fbef57d4
+DIST libimagequant-2.15.0.tar.gz 98668 BLAKE2B 916bb32ad848c5076502be7f471bd693396e8a7bd36878ec928f294776bd3343e76c2323372e577d58f5bb5c4f4e6aa3a32d5103901b190b0a036684cbf5cf56 SHA512 b856daaf79dd748ed3bb4cdc432dcffebf6678f8dffd6b4b0e79b96ec9c64ebf19597de35cf56ed47d3202947f3f5f208745c2c2c92fadf6c5b62f17e61b3f13
 EBUILD libimagequant-2.12.3.ebuild 1409 BLAKE2B 6a922a5bf768f0736c5aa8b22ae53255e6ea54ff577f66503e954ed2601cb26576f125200c922d940663a69dbc6335f6a4c5d372f0deda449e181a50311eb497 SHA512 2c5fa9f2d558d640adb39f3569a4f3b230210d5e18c0cada7a2bfdd56a3d98680b8d2d286c0aa17c06eb2dbf3c648281d13f887a9174de96a287f76da7907d77
 EBUILD libimagequant-2.14.0.ebuild 1240 BLAKE2B e14f9e27f965c6dcb30f1e33e9e849e184a88d1478539f4d9379649f11644a34cf9884a2f85e7f2fbe78d432f1e88fa2cd3342a72b13e3d7bf309e37570ff00b SHA512 20e69a655b9c8b5d9ed787298d1646bc71ae995006cd04ea727219af76a0e4008f31252708e4b5a0e8095100b8593f53015d634f4a942b5f371a410d4982a3fd
+EBUILD libimagequant-2.15.0.ebuild 1158 BLAKE2B cc58a7fe5e2d4e5b18b2064ebe25e644520586b3a3eb0e3b3d4e4f6f81ebb5dff744c41becb74bf6acbc9c6d36e7891b6aceab874b45727a617277abacb0cb27 SHA512 51c3c8a5b695fd899dbcdf458a590d7e7126d63da32d30e388588871b50688e92f122fae830bad895894397a7d3000354a2fe0dffbe1a6a350df12b319f328a4
 MISC metadata.xml 430 BLAKE2B 026b07580a573d4221658d920a91ef9a48b74b1b3314250413e16027fb45ae30589ae800f064f8caaf3117b6e9439202554f04394fa3d30d419c61e8a60dd588 SHA512 968098402f9783f65232dda56e60013050eca50176347beb3f40814509f9540879480ce9dd5480c62f1ae9ec9e3059414b620314bff611830d4148974cbb1e5f
diff --git a/media-gfx/libimagequant/libimagequant-2.15.0.ebuild b/media-gfx/libimagequant/libimagequant-2.15.0.ebuild
new file mode 100644
index 000000000000..e0d9b920c44d
--- /dev/null
+++ b/media-gfx/libimagequant/libimagequant-2.15.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Palette quantization library that powers pngquant and other PNG optimizers"
+HOMEPAGE="https://pngquant.org/lib/"
+SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cpu_flags_x86_sse2 openmp"
+
+PATCHES=(
+	"${FILESDIR}"/libimagequant-2.12.2-respect-CFLAGS.patch
+	"${FILESDIR}"/libimagequant-2.12.2-fix-pkgconfig.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	default
+	sed -i '/install.*STATICLIB/d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC
+
+	# Hand rolled configure script, so not all flags are supported.
+	./configure \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_enable cpu_flags_x86_sse2 sse) \
+		$(use_with openmp) \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" || die
+}
+
+src_compile() {
+	emake shared imagequant.pc
+}
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index a72819c97ba3..8bce2373af92 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,7 +1,8 @@
+AUX librecad-2.1.3-boost-1.76.patch 1032 BLAKE2B 9c8893627fd43cb831d48e9f86472c0e0029cfa155f08e3813f12f7f2750a91eac1d384ad149ee87585437d26426242e6f69364cabb33d30db74d220494b0395 SHA512 7751fc6ec2106f4b0a8f9d1fdd676ec4e2098d79e52e6365c5e857bc0e96adde30c66320f6b2625c0ecec7e4bff0352683b467a5e699b57c6ad87f494bd1bcb8
 AUX librecad-2.1.3-gcc-9.patch 8494 BLAKE2B 85f7cfd7822d27c4b76b6cc9b71f9667b912ef80229e2a70110155d4b52f0e203b186ffb6a0be160d6d2aadcaf241994d7f78d81a096d7540c46b946ed7cb892 SHA512 5adb8086244ec18e78f503b7522ea79213b629d297bb07fad0c21ae1e205731fd544aff7e979f1cc5709542a23311c771d61f13f4ba09f34baff9a24deae5eed
 AUX librecad-2.1.3-qt-5.11.patch 1396 BLAKE2B 80e637b724df81dce60c17354bed56a2329dd4c3f445b40ea18a4a49614f2ee34114e1b6cc008b29e2dbd7b65c53340aaa447173f6f4d23d80e1a8809131aae7 SHA512 5e4ae43ac89fc8acf779fec9e062cac3896f0e41b0bf7fdab91ef128ab1a20a4ecda71ef332d9af7403f11a813323cc509e0682e5ffdf97786599271a2711f25
 AUX librecad-2.1.3-qt-5.15.patch 1270 BLAKE2B 0947b13ff328e4f1c3ac04d846e7ed372d76d4858cecff5fe4ff8fc8c3c1558cd0e9ac53354e1f0b5b1d137db09c8205f034df9356b9b9e3206a611608fb8166 SHA512 b1a5afe1d22b7725c7d10a10bed5e52495cda7699ff20bd0f75bbfe28f7131a3d9cd5ec0a1ae7fd329196d2f88bb4b8336301fdb6efa073d773f31340a062ba0
 DIST librecad-2.1.3.tar.gz 22415288 BLAKE2B fb920113a7e4b2e9e7e3425f77364c36f6be676a3cd109798786b06d31698fd11437bc7f50cb843ca02d761730e83db7fde475d1bce6a65336a845b5b0114918 SHA512 246cffcc1ea3389997b4a738ab5e3d78e8c1096817ecb1ca28f38d601bc5d1a95f60798ac82308914a34da7b5dbc302b8363cf8b58a97221fdc8ee63010adc6c
-EBUILD librecad-2.1.3-r5.ebuild 1205 BLAKE2B d67aacabb6f255121b05dc70ae105fdf4e1065ec70965c55e5c7e4d37883a67c01e0826129051514fe9faa2e45402329eb34c980eed41a04d7e4006d6fb0a3e2 SHA512 f7d5a84c94cbe86a9e21c9f97a51680dfc3c0c0897e31ac2b454eadcd0bda469bc6a32f9349a2eaac05d8ce76304d0244336eb2170675618b1e2d6df3378aae7
-EBUILD librecad-9999.ebuild 1143 BLAKE2B 640a03b64ac56e00a3821dc9278efc0cfbb4eb7ca3ca83d428242aff78a0ab1d783b705cef0af939537a281b57db4d1ce640f3baa1eda7086b52a4fad481a77a SHA512 173a061d72db9ec980e13173d7d8caf7583d57a794cbb3c72a42553d4546cc28f45c5ae8ceab19ef71a838739c717a3c75e6506cada23a123c060fa89c04000c
-MISC metadata.xml 408 BLAKE2B 40e860453480281f8a148bfe527530c836bf21801a435f787c4d07ab1005dc9492a96c3dc0fc7dc4362fe35626f653052f0058eaef84336c59c8910256cfeaf5 SHA512 e08b9546617943ae66186e4b99c53c900a98a1950f429f84b525791c8030b1ec1786b4dfafe983537915ed597e3e9fe089bfc6f701a57af9c453293a2db2c2f6
+EBUILD librecad-2.1.3-r6.ebuild 1247 BLAKE2B 8e485f4201300cd7f2f0bdfeac80ffe6f817bd8ffd84ebb09bb25040ebd117f5a8dc9479dbe9774eb404472019a75afa0040dd6040fc54928901b76b715ed155 SHA512 647bb8b6030ac9cd5a5f1bc45b411a4df611bad6f17d43272c5b0b673335371d44637d7902c224424fe4fe14aa92d5dcb6d891fcacd8b7a23a428cdaf3119e8b
+EBUILD librecad-9999.ebuild 1184 BLAKE2B 885ffdfa84fe6474aa6e8b37c155b3541368ccdc74a300d9051cb8660d089366c0438c7da072025ef1c337d498df31e816e3588056b61d1b769c38f5e20a6c27 SHA512 97c0ba730cd9887409ce3f0b413e966402cb12d988fae0a0bcf1486842260492e89a5c7fb707f77bc99993f8c9b319cebbf89d8d88743cfc39db6c567723f6b1
+MISC metadata.xml 332 BLAKE2B 6919c32bb2d72857076de2a52a3fc5fc726288fa5d15b5f151f314eee2c0551b9c3bc3325d8f2b9e042c6313cd970449755b558c9f5a6afcf13754ec69f536ef SHA512 e123c1f0a7aa74e2a3d505203f16a7fb114a5b4a83e32c5a802f8d69646be45a2e008974c89b4c8006edab8279181ea69868b19315112125ab4f84ad449d8c22
diff --git a/media-gfx/librecad/files/librecad-2.1.3-boost-1.76.patch b/media-gfx/librecad/files/librecad-2.1.3-boost-1.76.patch
new file mode 100644
index 000000000000..2500bab79b19
--- /dev/null
+++ b/media-gfx/librecad/files/librecad-2.1.3-boost-1.76.patch
@@ -0,0 +1,29 @@
+From 1fd07fcd847659d518efa0897a9f603de83fe362 Mon Sep 17 00:00:00 2001
+From: Jiri Slaby <jslaby@suse.cz>
+Date: Tue, 4 May 2021 09:25:03 +0200
+Subject: [PATCH] add boost tuple include to fix build
+
+With boost 1.76, we see:
+lib/engine/rs_ellipse.cpp:70:15: error: 'tuple' in namespace 'boost::math' does not name a template type
+   70 |  boost::math::tuple<double, double, double> operator()(double const& z) const {
+      |               ^~~~~
+
+Fix this by including the proper boost header.
+---
+ librecad/src/lib/engine/rs_ellipse.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/librecad/src/lib/engine/rs_ellipse.cpp b/librecad/src/lib/engine/rs_ellipse.cpp
+index 291f734ea..d47bf6ca4 100644
+--- a/librecad/src/lib/engine/rs_ellipse.cpp
++++ b/librecad/src/lib/engine/rs_ellipse.cpp
+@@ -48,6 +48,9 @@
+ #include <boost/version.hpp>
+ #include <boost/math/tools/roots.hpp>
+ #include <boost/math/special_functions/ellint_2.hpp>
++#if BOOST_VERSION > 104500
++#include <boost/math/tools/tuple.hpp>
++#endif
+ #endif
+ 
+ namespace{
diff --git a/media-gfx/librecad/librecad-2.1.3-r5.ebuild b/media-gfx/librecad/librecad-2.1.3-r6.ebuild
index bc56b908be42..9e36da264e46 100644
--- a/media-gfx/librecad/librecad-2.1.3-r5.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,9 +14,6 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc tools"
 
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
 RDEPEND="
 	dev-cpp/muParser
 	dev-libs/boost:=
@@ -31,13 +28,17 @@ DEPEND="${RDEPEND}
 	dev-qt/qthelp:5
 	dev-qt/qtxml:5
 "
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
 
 S="${WORKDIR}/LibreCAD-${PV}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-qt-5.11.patch"
 	"${FILESDIR}/${P}-gcc-9.patch"
-	"${FILESDIR}/${P}-qt-5.15.patch" # pending upstream PR#1224
+	"${FILESDIR}/${P}-qt-5.15.patch"
+	"${FILESDIR}/${P}-boost-1.76.patch" # bug 788706, upstream PR#1345
 )
 
 src_configure() {
@@ -50,7 +51,7 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins -r unix/resources/*
 	use doc && docinto html && dodoc -r librecad/support/doc/*
-	insinto /usr/share/appdata
+	insinto /usr/share/metainfo
 	doins unix/appdata/librecad.appdata.xml
 	doicon librecad/res/main/${PN}.png
 	make_desktop_entry ${PN} LibreCAD ${PN} Graphics
diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild
index 04902b991e93..4f1a71b35035 100644
--- a/media-gfx/librecad/librecad-9999.ebuild
+++ b/media-gfx/librecad/librecad-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,16 +14,13 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/LibreCAD-${PV}"
+	KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="3d debug doc tools"
+IUSE="debug doc tools"
 
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
 RDEPEND="
 	dev-cpp/muParser
 	dev-libs/boost:=
@@ -38,6 +35,9 @@ DEPEND="${RDEPEND}
 	dev-qt/qthelp:5
 	dev-qt/qtxml:5
 "
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
 
 src_configure() {
 	eqmake5 -r
@@ -49,7 +49,7 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins -r unix/resources/*
 	use doc && docinto html && dodoc -r librecad/support/doc/*
-	insinto /usr/share/appdata
+	insinto /usr/share/metainfo
 	doins unix/appdata/librecad.appdata.xml
 	doicon librecad/res/main/${PN}.png
 	make_desktop_entry ${PN} LibreCAD ${PN} Graphics
diff --git a/media-gfx/librecad/metadata.xml b/media-gfx/librecad/metadata.xml
index e83f7a4a7026..803bf3514a84 100644
--- a/media-gfx/librecad/metadata.xml
+++ b/media-gfx/librecad/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="3d">Require all 2D coordinates stored as 3D</flag>
-    <flag name="tools">Build additional tool programs: tff2lff</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">LibreCAD/LibreCAD</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="tools">Build additional tool programs: tff2lff</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">LibreCAD/LibreCAD</remote-id>
+	</upstream>
 </pkgmetadata>