gentoo resync : 21.06.2020

10 files changed, 161 insertions, 349 deletions

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index eae2294a8b06..8d90dccb1392 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,17 +1,15 @@
 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.0.2_cmake-opencl-kernel-loop.patch 952 BLAKE2B 15839776c3b03bd5aee0e71115c7e2522dd56a773bd8ab34d1953671b336a6aca5cd9b1041327ead6d4f89aaef20ee3dad7772bc949010e1059c6be680fe17cf SHA512 cdf4ae76ebf5d90e761e187f0c5d82284e77c93c8d087352a0638ba4559fd22a6de4b0dc46e6c383ca7b196585d3cfce971909f5d911f34bbff507c5d7e8f522
+AUX darktable-3.0.2_jsonschema-automagic.patch 729 BLAKE2B fdf306a513cc78fbd2b377d55baa4631b0feb885312252a784b06477afb08f8b43b742b4acfb9da7cb52c20eecf997668ff17444020690671136e17573dc75e9 SHA512 7b2f17827ad099c476f3272d9ffc41dbd3d1e1bdea482beaddb4d654d3555677212ed50df1fd83f94e1274670baecd951878280e1a052f327fce47b12ad720e5
 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-2.6.3.tar.xz 3522292 BLAKE2B 7f631a4e68affa41adf538355bd6d0dc8a79c24003b56f414061f8da95f200346fc8b54274fbc256daf705b300d55a370a6d6f24e3420d6f3ba8f848e59fcb98 SHA512 4672f4f4d5fa57fb0d53d3886cd2773a6036334b85a0df29995f1a67c59d6b57534e06c8bf1666c8e294dd92db1197113bb3d625512671625c14e0abf5e2f14c
-DIST darktable-3.0.0.tar.xz 3827412 BLAKE2B c461db8dbbeb1342c2911aae3c9803d7762c10bcca434f2a9617e6b83c838db4cae2846a1e40444ec12dc48e3ea210d4d98d520e7a5731fb457b9c03d5344c5d SHA512 de154cc19281f61316363243db3e531be33ac4c4632d6277ba715884b83a3c35f1d433a0e53f5f1eb7ffe03c6fcba4629612c94f942c196807c876b421faafc6
-DIST darktable-3.0.1.tar.xz 3859720 BLAKE2B 5d3145effaaf8f6f7013575e9ae76a1e33aca3e2144d00748e9bf76057822d9fc4767b0908de923ba803c1c0ebcf83858a6ff72965e465679c2df5742d9da475 SHA512 a01830c5177512fb7b59f07a5ac594b486f854d41e7123faa0252caef52386ef3df4896f2c23a61b57a2b9b7bec33f3fd2f1fce6cea1388e1b74056a159e7ffa
 DIST darktable-3.0.2.tar.xz 3931240 BLAKE2B 5f86579a43e396c8116aba63c43e13d7312e5c3a569f9c242fe9a7882f02c5e0ebd7e4b9bbd34576eb83b3b78298038bf0d87bf4786dd19d0fa73ed30de21f67 SHA512 ee2d83f60621586f9e1be958f4b0c3d2214fbf30338837dbd07b901641c32d565cd29f814f5ff75a450495acee2383aa62ba3da3873009077704c925bab501f1
 DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
 DIST darktable-usermanual-3.0.0.pdf 16237603 BLAKE2B ff5c24bb038deb37269a84389937740fa0ff77a9fb5bef4c484cdd903e39609588f632f577ce53c690d3abb832ace451d0d9d3f563ebdb6196ae8e2dac008a01 SHA512 2523b48e2baaa71561dc119340aed3bbf2ab4481dceb0c3ca2bbb7b0cacfaab894fa4eef82b667648cd7bb049304dbda09fa1a638f7734219b672b3ea8ee0eac
 EBUILD darktable-2.6.2.ebuild 3879 BLAKE2B 58de04e0d0b727c939ece0f11a3fccf30f2cd7e81ef11e6a64a4857d2bdfe77592e2e748dc64f34bd27b20603f1a2270e1af0d78b5d280f5d8c98bc403c38e68 SHA512 176fc9b85a1c4d5c28032e435e92c59299c857731c4c1e01490ca57aca18704187e0b62c5d9b7dcca4ac760cbefdf7a00eb3b66b036902ff7c4a6e3769b27f80
-EBUILD darktable-2.6.3.ebuild 3791 BLAKE2B 261a2e330605f1fcfdd4b1bb8aaa37918d98130391e4357f5b37e56587e835a90550918f3b821166204f094180946289326be0131e91441cf465f6d30146eb76 SHA512 02c5232606639bde660acbdab7099074c1d649a65029ac730cf63845c6214dbf110e861dbdfd27a2ca4013be5280fb81372fcf701e0f16aafa042a2e8432bcef
-EBUILD darktable-3.0.0.ebuild 3758 BLAKE2B 6443b09c668cf00d481b48eefe766513b7b49d2e72bae760318668fe4cf65c0320e90e1ff903ee5f8bcd34a4157bc26975d67e38d2dfd1dc11d8b41c8ec6c8fd SHA512 13d8437dc3036ee70e4d7c41780e27a67841feed0169fbd4c774508c3a8198373b60d1b7524d470724aa8d5bf842ed49d56ac15a5a7396c9b0f8d22db0c16682
-EBUILD darktable-3.0.1.ebuild 3822 BLAKE2B 981f9d0f4732719a232064a82713150f83d50dc25ee9da208360272f9c7fe5fa4c9dfa6fa6edf2c03936d807af0e0c46ddd80d7e93ad5a8931c01ae611f13f63 SHA512 343b9312d48cc3f018e4c0a2b87be69d68d669ba847d42a2e0dcc077d6d17a3a069584d053497b7c4462c1cc4799702a0953e38494d56429d108184f3f9b11ad
-EBUILD darktable-3.0.2.ebuild 3822 BLAKE2B 981f9d0f4732719a232064a82713150f83d50dc25ee9da208360272f9c7fe5fa4c9dfa6fa6edf2c03936d807af0e0c46ddd80d7e93ad5a8931c01ae611f13f63 SHA512 343b9312d48cc3f018e4c0a2b87be69d68d669ba847d42a2e0dcc077d6d17a3a069584d053497b7c4462c1cc4799702a0953e38494d56429d108184f3f9b11ad
-EBUILD darktable-9999.ebuild 3135 BLAKE2B 885443963d545004c2d10d49e65bac9d44c22ed1d0414f57ec2dc76a85760e09f06a78ea70a77c6f36739da0c45cc39a133954bccd5ad8af2e1a4149015b7d16 SHA512 da2ac016c0a15b14417a5ee373f6470630e045485738e39bb596365a0013ae48b1d4e0b197d7825ea17faa02e435ef2cbe95dd5b5ccf672cc99eb4cac60a12a2
-MISC metadata.xml 692 BLAKE2B 71a52ed735b9bb4dc7b11a89173418c64b8f35898637519b94966c5708b474e47e24e3c9d914b67a95c0dc1db596e712ea7992912f0fc0743087b86a7abce942 SHA512 4efcb02d1b916d8ddf7bfc5a75c992b0a0785b4421337a613eb80e92e341c8e6d66b66c4cd71c791367560d3d87387fba99231d5e19cc0d755a48b720d4880e0
+EBUILD darktable-3.0.2-r1.ebuild 3881 BLAKE2B 958ebc2d6d7b8057fbd2cea57708c415f7e17967705938d5178c705db3ab52a7684dd2aedc7d80f4603530d21bca5e536518f6ce67c83e25515764c92bb6c947 SHA512 5b9836520a9039fb06c68277e5dde1f4cf394aae92dd8fdb005d8cf0f6454148eaa769477247872c94152b2c132ad6d9a068b8e984c38c94216717f4d63798d7
+EBUILD darktable-3.0.2.ebuild 3782 BLAKE2B 79f1f8dbb810a10274c40ff93ec59a74291dd7c3d9d7fad52b44b97a1b8211fb3ef314a4cb937d6886fb6ba150e7ba0c7d4244d3e6aef70bf4ea949dd8d0830e SHA512 8094322d7c29078718354d5fac8f9e9c8be01d4cddac4d30a033b42a1d5c757171e1a90e234170d81eaece1a1dc4d699850fc8ec02ed87fdcb10ee4df384cffc
+EBUILD darktable-9999.ebuild 3262 BLAKE2B aeadead1b20cd782e263b4f67f20d18255034626b9898273827baa60fb528d632ecb831b584bb0c0ed71e1226a9e32049e2bcc96b4d03c2ee5a9a725ef3858d2 SHA512 c323d686bcd203fc58833fdb89429440c801015dab82f26dfb4133e048a2f59449f6120fb6d0165177aa30a7f7c1d6acad08016286d7b989e7731a9e2f0bc4af
+MISC metadata.xml 1045 BLAKE2B 2094a1de028b4db282941604a3af2e608a4694b47d269293c09c1874594054a2457f44a94d9802eb84502c64c714a5af0499e2d2d67a71f61980906fc78acaf8 SHA512 1e0e67191daac03f5aebed02b7981a4944d4b0da4b00b8781fb79a1a362f260e51d182fdf10cf37494ab854cb7627ea4f7d279fad7191a53c0118e8d3c791166
diff --git a/media-gfx/darktable/darktable-2.6.3.ebuild b/media-gfx/darktable/darktable-2.6.3.ebuild
deleted file mode 100644
index b08753b83535..000000000000
--- a/media-gfx/darktable/darktable-2.6.3.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic pax-utils toolchain-funcs xdg
-
-DOC_PV="2.6.0"
-MY_PV="${PV/_/}"
-MY_P="${P/_/.}"
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/"
-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 )"
-
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LANGS=" ca cs de es fi fr hu ja nb nl pl pt-BR ru sl"
-# TODO add lua once dev-lang/lua-5.2 is unmasked
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-nls opencl openmp openexr pax_kernel webp
-${LANGS// / l10n_}"
-
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-COMMON_DEPEND="
-	dev-db/sqlite:3
-	dev-libs/json-glib
-	dev-libs/libxml2:2
-	dev-libs/pugixml: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.14:3
-	x11-libs/pango
-	colord? ( x11-libs/colord-gtk:0= )
-	cups? ( net-print/cups )
-	flickr? ( media-libs/flickcurl )
-	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	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 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/"${PN}"-find-opencl-header.patch
-	"${FILESDIR}"/"${PN}"-2.6.2-exiv2-0.27.patch
-)
-
-S="${WORKDIR}/${P/_/~}"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse3 && append-flags -msse3
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PRINT=$(usex cups)
-		-DCUSTOM_CFLAGS=ON
-		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-		-DUSE_COLORD=$(usex colord)
-		-DUSE_FLICKR=$(usex flickr)
-		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DUSE_KWALLET=$(usex kwallet)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_LUA=OFF
-		-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)
-	)
-	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	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
-
-	if use pax_kernel && use opencl ; then
-		pax-mark Cm "${ED}"/usr/bin/${PN} || die
-		eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
-		eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
-		eqawarn "must be modified and this *may* lead to breakage! If"
-		eqawarn "you suspect that ${PN} is broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog "when updating from the currently stable 1.6 series,"
-	elog "please bear in mind that your edits will be preserved during this process,"
-	elog "but it will not be possible to downgrade from 2.0 to 1.6 any more."
-	echo
-	ewarn "It will not be possible to downgrade!"
-}
diff --git a/media-gfx/darktable/darktable-3.0.0.ebuild b/media-gfx/darktable/darktable-3.0.0.ebuild
deleted file mode 100644
index c91fabeb3ab2..000000000000
--- a/media-gfx/darktable/darktable-3.0.0.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic pax-utils toolchain-funcs xdg
-
-DOC_PV="2.6.0"
-MY_PV="${PV/_/}"
-MY_P="${P/_/.}"
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/"
-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 )"
-
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LANGS=" ca cs da de es fr he hu it ja nb nl pl ru sl"
-# TODO add lua once dev-lang/lua-5.2 is unmasked
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-nls opencl openmp openexr pax_kernel webp
-${LANGS// / l10n_}"
-
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-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
-	colord? ( x11-libs/colord-gtk:0= )
-	cups? ( net-print/cups )
-	flickr? ( media-libs/flickcurl )
-	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	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
-	)
-	openmp? ( sys-devel/gcc[openmp,graphite] )
-"
-RDEPEND="${COMMON_DEPEND}
-	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/"${PN}"-find-opencl-header.patch
-)
-
-S="${WORKDIR}/${P/_/~}"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse3 && append-flags -msse3
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_PRINT=$(usex cups)
-		-DCUSTOM_CFLAGS=ON
-		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-		-DUSE_COLORD=$(usex colord)
-		-DUSE_FLICKR=$(usex flickr)
-		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DUSE_KWALLET=$(usex kwallet)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_LUA=OFF
-		-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)
-	)
-	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	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
-
-	if use pax_kernel && use opencl ; then
-		pax-mark Cm "${ED}"/usr/bin/${PN} || die
-		eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
-		eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
-		eqawarn "must be modified and this *may* lead to breakage! If"
-		eqawarn "you suspect that ${PN} is broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	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."
-	echo
-	ewarn "It will not be possible to downgrade!"
-}
diff --git a/media-gfx/darktable/darktable-3.0.1.ebuild b/media-gfx/darktable/darktable-3.0.2-r1.ebuild
index 2c9eb9a00a34..a27d9ec520c6 100644
--- a/media-gfx/darktable/darktable-3.0.1.ebuild
+++ b/media-gfx/darktable/darktable-3.0.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake flag-o-matic pax-utils toolchain-funcs xdg
+inherit cmake flag-o-matic toolchain-funcs xdg
 
 DOC_PV="3.0.0"
 MY_PV="${PV/_/}"
@@ -20,8 +20,8 @@ KEYWORDS="~amd64 ~x86"
 LANGS=" ca cs da de es fr he hu it ja nb nl pl ru sl"
 # TODO add lua once dev-lang/lua-5.2 is unmasked
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-nls opencl openmp openexr pax_kernel webp
-${LANGS// / l10n_}"
+	lto nls opencl openmp openexr tools webp
+	${LANGS// / l10n_}"
 
 BDEPEND="
 	dev-util/intltool
@@ -63,7 +63,6 @@ DEPEND="${COMMON_DEPEND}
 		>=sys-devel/clang-4
 		>=sys-devel/llvm-4
 	)
-	openmp? ( sys-devel/gcc[openmp,graphite] )
 "
 RDEPEND="${COMMON_DEPEND}
 	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
@@ -71,13 +70,24 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/"${PN}"-find-opencl-header.patch
+	"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
+	"${FILESDIR}"/${PN}-3.0.2_cmake-opencl-kernel-loop.patch
+	"${FILESDIR}"/${PN}-3.0.2_jsonschema-automagic.patch
 )
 
 S="${WORKDIR}/${P/_/~}"
 
 pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	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
 }
 
@@ -91,8 +101,11 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DBUILD_CURVE_TOOLS=$(usex tools)
+		-DBUILD_NOISE_TOOLS=$(usex tools)
 		-DBUILD_PRINT=$(usex cups)
 		-DCUSTOM_CFLAGS=ON
+		-DRAWSPEED_ENABLE_LTO=$(usex lto)
 		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
 		-DUSE_COLORD=$(usex colord)
 		-DUSE_FLICKR=$(usex flickr)
@@ -123,23 +136,16 @@ src_install() {
 			fi
 		done
 	fi
-
-	if use pax_kernel && use opencl ; then
-		pax-mark Cm "${ED}"/usr/bin/${PN} || die
-		eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
-		eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
-		eqawarn "must be modified and this *may* lead to breakage! If"
-		eqawarn "you suspect that ${PN} is broken by this modification,"
-		eqawarn "please open a bug."
-	fi
 }
 
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	elog "when updating a major version,"
+	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."
-	echo
+	elog
 	ewarn "It will not be possible to downgrade!"
+	ewarn
 }
diff --git a/media-gfx/darktable/darktable-3.0.2.ebuild b/media-gfx/darktable/darktable-3.0.2.ebuild
index 2c9eb9a00a34..1584653803c3 100644
--- a/media-gfx/darktable/darktable-3.0.2.ebuild
+++ b/media-gfx/darktable/darktable-3.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake flag-o-matic pax-utils toolchain-funcs xdg
+inherit cmake flag-o-matic toolchain-funcs xdg
 
 DOC_PV="3.0.0"
 MY_PV="${PV/_/}"
@@ -20,8 +20,8 @@ KEYWORDS="~amd64 ~x86"
 LANGS=" ca cs da de es fr he hu it ja nb nl pl ru sl"
 # TODO add lua once dev-lang/lua-5.2 is unmasked
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-nls opencl openmp openexr pax_kernel webp
-${LANGS// / l10n_}"
+	nls opencl openmp openexr tools webp
+	${LANGS// / l10n_}"
 
 BDEPEND="
 	dev-util/intltool
@@ -63,7 +63,6 @@ DEPEND="${COMMON_DEPEND}
 		>=sys-devel/clang-4
 		>=sys-devel/llvm-4
 	)
-	openmp? ( sys-devel/gcc[openmp,graphite] )
 "
 RDEPEND="${COMMON_DEPEND}
 	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
@@ -71,13 +70,23 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/"${PN}"-find-opencl-header.patch
+	"${FILESDIR}"/${PN}-3.0.2_cmake-opencl-kernel-loop.patch
+	"${FILESDIR}"/${PN}-3.0.2_jsonschema-automagic.patch
 )
 
 S="${WORKDIR}/${P/_/~}"
 
 pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	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
 }
 
@@ -91,6 +100,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DBUILD_CURVE_TOOLS=$(usex tools)
+		-DBUILD_NOISE_TOOLS=$(usex tools)
 		-DBUILD_PRINT=$(usex cups)
 		-DCUSTOM_CFLAGS=ON
 		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
@@ -123,23 +134,16 @@ src_install() {
 			fi
 		done
 	fi
-
-	if use pax_kernel && use opencl ; then
-		pax-mark Cm "${ED}"/usr/bin/${PN} || die
-		eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
-		eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
-		eqawarn "must be modified and this *may* lead to breakage! If"
-		eqawarn "you suspect that ${PN} is broken by this modification,"
-		eqawarn "please open a bug."
-	fi
 }
 
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	elog "when updating a major version,"
+	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."
-	echo
+	elog
 	ewarn "It will not be possible to downgrade!"
+	ewarn
 }
diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
index 111dc666f46f..422d45185bb7 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake flag-o-matic git-r3 pax-utils toolchain-funcs xdg
+inherit cmake flag-o-matic git-r3 toolchain-funcs xdg
 
 EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
 
@@ -13,13 +13,13 @@ HOMEPAGE="https://www.darktable.org/"
 LICENSE="GPL-3 CC-BY-3.0"
 SLOT="0"
 #KEYWORDS="~amd64 ~x86"
-LANGS=" ca cs da de es fr he hu it ja nl pl ru sk sl sv uk"
+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"
 # TODO add lua once dev-lang/lua-5.2 is unmasked
 IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-nls opencl openmp openexr pax_kernel webp
-${LANGS// / l10n_}"
+	lto nls opencl openmp openexr tools webp
+	${LANGS// / l10n_}"
 
-BDEPEND="
+BDEPEND=">=dev-python/jsonschema-3.2.0
 	dev-util/intltool
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
@@ -28,7 +28,7 @@ COMMON_DEPEND="
 	dev-db/sqlite:3
 	dev-libs/json-glib
 	dev-libs/libxml2:2
-	dev-libs/pugixml:0=
+	>=dev-libs/pugixml-1.8:0=
 	gnome-base/librsvg:2
 	>=media-gfx/exiv2-0.25-r2:0=[xmp]
 	media-libs/lcms:2
@@ -40,7 +40,7 @@ COMMON_DEPEND="
 	sys-libs/zlib:=
 	virtual/jpeg:0
 	x11-libs/cairo
-	>=x11-libs/gtk+-3.14:3
+	>=x11-libs/gtk+-3.22:3
 	x11-libs/pango
 	colord? ( x11-libs/colord-gtk:0= )
 	cups? ( net-print/cups )
@@ -64,22 +64,39 @@ RDEPEND="${COMMON_DEPEND}
 	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
 "
 
+PATCHES=(
+	"${FILESDIR}"/"${PN}"-find-opencl-header.patch
+)
+
 pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	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
 }
 
 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_PRINT=$(usex cups)
+		-DBUILD_CURVE_TOOLS=$(usex tools)
+		-DBUILD_NOISE_TOOLS=$(usex tools)
 		-DCUSTOM_CFLAGS=ON
+		-DRAWSPEED_ENABLE_LTO=$(usex lto)
 		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
 		-DUSE_COLORD=$(usex colord)
 		-DUSE_FLICKR=$(usex flickr)
@@ -110,13 +127,4 @@ src_install() {
 			fi
 		done
 	fi
-
-	if use pax_kernel && use opencl ; then
-		pax-mark Cm "${ED}"/usr/bin/${PN} || die
-		eqawarn "USE=pax_kernel is set meaning that ${PN} will be run"
-		eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary"
-		eqawarn "must be modified and this *may* lead to breakage! If"
-		eqawarn "you suspect that ${PN} is broken by this modification,"
-		eqawarn "please open a bug."
-	fi
 }
diff --git a/media-gfx/darktable/files/darktable-3.0.2_cmake-march-autodetection.patch b/media-gfx/darktable/files/darktable-3.0.2_cmake-march-autodetection.patch
new file mode 100644
index 000000000000..8ad4f0e9329f
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-3.0.2_cmake-march-autodetection.patch
@@ -0,0 +1,26 @@
+Darktable and RawSpeed upstream support two build modes: if BINARY_PACKAGE_BUILD==1
+they pass -mtune=generic to the compiler, otherwise they use -march=native.
+In either case, these options override externally set CFLAGS.
+
+Disable this behaviour so that the users' settings provided to the ebuild by Portage
+are respected.
+
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -521,7 +521,7 @@
+     set(DT_REQ_INSTRUCTIONS "-msse2")
+   endif()
+ 
+-  include(march-mtune)
++  set(MARCH "")
+ 
+   #if(NOT BUILD_SSE2_CODEPATHS)
+   #  set(MARCH "${MARCH} -mno-sse2 -D__DISABLE_SSE2__ -U__SSE2__ -D__DISABLE_SSE__ -U__SSE__")
+--- a/src/external/rawspeed/cmake/compiler-flags.cmake
++++ b/src/external/rawspeed/cmake/compiler-flags.cmake
+@@ -1,5 +1,4 @@
+ include(CheckCXXCompilerFlag)
+-include(CpuMarch)
+ include(CheckCXXCompilerFlagAndEnableIt)
+ 
+ # yes, need to keep both the CMAKE_CXX_FLAGS and CMAKE_CXX_STANDARD.
diff --git a/media-gfx/darktable/files/darktable-3.0.2_cmake-opencl-kernel-loop.patch b/media-gfx/darktable/files/darktable-3.0.2_cmake-opencl-kernel-loop.patch
new file mode 100644
index 000000000000..c1fd701fb9a4
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-3.0.2_cmake-opencl-kernel-loop.patch
@@ -0,0 +1,28 @@
+From 767d48e0f60e7f858e8b31a88dd8cc1258e7ee9e Mon Sep 17 00:00:00 2001
+From: Marcus Haehnel <marcus@mh-development.info>
+Date: Sat, 21 Mar 2020 09:14:45 +0100
+Subject: [PATCH] Fix invalid CMake syntax
+
+The syntax of the foreach statement in data/kernels/CMakeLists.txt
+was invalid. This lead to errors when running cmake.
+
+Use correct syntax to make the build work.
+---
+ data/kernels/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/kernels/CMakeLists.txt b/data/kernels/CMakeLists.txt
+index ce947bef9c..f605c18b7e 100644
+--- a/data/kernels/CMakeLists.txt
++++ b/data/kernels/CMakeLists.txt
+@@ -31,8 +31,8 @@ macro (testcompile_opencl_kernel IN)
+ endmacro (testcompile_opencl_kernel)
+ 
+ if (TESTBUILD_OPENCL_PROGRAMS)
+-  foreach(IN ${DT_OPENCL_KERNELS})
+-    testcompile_opencl_kernel(${IN})
++  foreach(KERNEL IN ITEMS ${DT_OPENCL_KERNELS})
++    testcompile_opencl_kernel(${KERNEL})
+   endforeach()
+ endif()
+ 
diff --git a/media-gfx/darktable/files/darktable-3.0.2_jsonschema-automagic.patch b/media-gfx/darktable/files/darktable-3.0.2_jsonschema-automagic.patch
new file mode 100644
index 000000000000..1aa0aec5163f
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-3.0.2_jsonschema-automagic.patch
@@ -0,0 +1,19 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -319,15 +319,7 @@
+   message(STATUS "Test-compilation of OpenCL programs is disabled.")
+ endif()
+ 
+-# we need jsonschema to check noiseprofiles.json
+-find_program(jsonschema_BIN jsonschema)
+-if(${jsonschema_BIN} STREQUAL "jsonschema_BIN-NOTFOUND")
+-  message(STATUS "Missing jsonschema, problems in noiseprofiles.json might go unnoticed")
+-  set(VALIDATE_JSON 0)
+-else(${jsonschema_BIN} STREQUAL "jsonschema_BIN-NOTFOUND")
+-  message(STATUS "Found jsonschema")
+-  set(VALIDATE_JSON 1)
+-endif(${jsonschema_BIN} STREQUAL "jsonschema_BIN-NOTFOUND")
++set(VALIDATE_JSON 0)
+ 
+ # we need an xslt interpreter to generate preferences_gen.h and darktablerc
+ find_program(Xsltproc_BIN xsltproc)
diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index 21e610fbc04d..08c6f2bb31f8 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -1,13 +1,22 @@
 <?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>
+	<maintainer type="person">
+		<email>maekke@gentoo.org</email>
+		<name>Markus Meier</name>
+	</maintainer>
 	<use>
 		<flag name="flickr">Add support for uploading photos to flickr</flag>
 		<flag name="geolocation">Enable geotagging support</flag>
 		<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
+		<flag name="lto">Enable link-time optimisations in the RawSpeed library</flag>
 		<flag name="opencl">Enable opencl support</flag>
 		<flag name="pax_kernel">Triggers paxmarking of main darktable binary</flag>
+		<flag name="tools">Install tools for generating base curves and noise profiles</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">darktable-org/darktable</remote-id>