gentoo resync : 07.10.2018

4 files changed, 20 insertions, 24 deletions

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index b45dd847682a..ce572e4b0213 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,7 +1,7 @@
 AUX krita-4.0.3-libraw-0.19.patch 3124 BLAKE2B c84c94b2e0032b4f1f78f1ca944940688775c91a48a0a6449343af36d03f5a754a48749e67365a028314757c0b822db7bda5e9b4e7c7c58796b032306abcd19b SHA512 90e2d40a6d30990b7de7365c06a769e500d2df75281767f3d724b7e5288e131b4cfcfff989a75e66642e374f624bdb8da2e6afe8c12de0ba3282ebd362189140
 AUX krita-4.0.3-tests-optional.patch 10001 BLAKE2B d31e7e89c745642e6cf5fec9f464122954bc050104f1f3dacff2001b8a594a376cd9a61243ca3e6eafc842c68a63c8d1a3b5dc75e737ff8ef8b0e2f1f08d61a2 SHA512 753af31735cd9df6d17e9323fa6699b2b27b60f58d0597e84a30f749c97c7a0595b3719e94235a34e3e51a90b0f6c183e4864ea6a0c5e5f70f27c41e3da0ffdb
-DIST krita-4.0.3.tar.gz 241332929 BLAKE2B 222a3425f64c98d964f421c84f48295d5cb72e622631e9b1cb5a2ac9980a6f59cbf12b0815df68a09daf138efc2d4e2e83cb46034c8e12ddd621cb49f1117b72 SHA512 13b3263a09dbb955dea435e97bf12b6f0670fce68c4c2c9e97e7b45b480301119f317e72fac63eec07caff295885b7d62ac7c6255545a139e1e5f4b1106989e8
 DIST krita-4.0.4.tar.gz 241431012 BLAKE2B c8bb51132f089276761d5a6897fee416a23154267fef72ad525660125770d0fe4b6ab93f70b67ba11c8344f2b27f82bbadc96306d111ff77145b4056ec2c7601 SHA512 a1d82366f7b145c5db4c74ea8c31672a96a3dccd1b31fe2758606de50a4a8e5f8fd794e319127f98cc80f067d851edd4bc6e2f842eba76b807cc3a075a997f45
-EBUILD krita-4.0.3.ebuild 3209 BLAKE2B 969d1fed2d60fe9e3dc7a648d3e1fdad7c405e4af03bc339edd8016c0f0fce7dc63c5839286c9f42f02dcb0426fd6bc273909e13e87a47dee6c5e2bda42578a0 SHA512 d4e5d1a9603c6c660f3c0cb03ecefe2707f7c2c05f9664b4702373166e97ca0d953d9b33425d7bfcb145ad91bc75bfc6ee08fc3f4fdd12447e7dbfca35bbddba
-EBUILD krita-4.0.4.ebuild 3096 BLAKE2B 4d54402c4fe4ab7b6802b88338bf436b4d74410191d38e037df4ecb15c101a4a1c9c3b88a36a6c1731ea6df864e45f042bc1c84ed91b4d34c5c3e9a6ff559b21 SHA512 a8a288bd685a1b8f86078d398e35462dadffdb8d2ebb7ca4d967dfed80b1261bebc565e54bb51385e9bdd60e043d129188c147faaba276c39e66bec3d8859f52
-MISC metadata.xml 569 BLAKE2B 7609e8cfc1f63fd04b3306a37a9b429eddaf56bf4bcca32d707b529d0267d7f63979a850edf8fcb5b1043134b1baa7210e849903a65243ac300596ccbdb473bd SHA512 44b2dc2f5d0e737a780e16f4d88cb3c2ff1dbab8b1878ae3561659c3a191040ef0f0f2ef0e7325b16ca6c149e29d417c10bec18bfcf06d8e847000e1e8279b27
+DIST krita-4.1.3.tar.gz 243979838 BLAKE2B 460d7c507b0d86d318b384ad26fd0d2be82d7b60734bd7b1f2016baaf5e0cc3ad91ef7410837aaab207d270745a3a08c1abde11ce3c3543cbf990d922794b606 SHA512 b0d9d8fecdf9f49e6431d0e31fdd6df2f53e654f64e93a05c73afbbdff0625c072a00347e667f1ba87c6d145185fe98d0518df3a4c0c56ccb944216a42d53d5c
+EBUILD krita-4.0.4.ebuild 3092 BLAKE2B d1fbb96ff445244a35e16411cf49fbcd3e81317a1759965ccde6b492568a7b69d30430582fa74e3239c66238fe80ad070456ae4c7b3fda36d9ddf14c81f90ba3 SHA512 4af6eabe2319395ac019a5679ae4176ae5629722ef57544a12a1c7a6b5c3f7ba108099b13c3e304fc6979a2bf9a7a65748321639cfa49ccc3b212897912dbc7a
+EBUILD krita-4.1.3.ebuild 3131 BLAKE2B f2f64de5571c11861bcff90fe335d47c0ff5caeb3b22554d87a0c636d3b602efd3f3e5d91b0b85d03361162ec0233f68bcc7b4e6f4fdb0671f75a41078553777 SHA512 7ef19e4b4267710942e32e18c333eec5d51d51049ab469af507c2bdcf24278ae2e4d5a8de73b0286cc53e239c8388749987dbae619d5fcedeb6073800888a9d4
+MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/krita-4.0.4.ebuild b/media-gfx/krita/krita-4.0.4.ebuild
index b7f682f286eb..8e5ccf9eb204 100644
--- a/media-gfx/krita/krita-4.0.4.ebuild
+++ b/media-gfx/krita/krita-4.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ inherit kde5 python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
diff --git a/media-gfx/krita/krita-4.0.3.ebuild b/media-gfx/krita/krita-4.1.3.ebuild
index 839c3b054f8d..1e3252cbd580 100644
--- a/media-gfx/krita/krita-4.0.3.ebuild
+++ b/media-gfx/krita/krita-4.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,17 +9,17 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 inherit kde5 python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
+	SRC_URI="mirror://kde/stable/${PN}/${PV%.1}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
 HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
 LICENSE="GPL-3"
-IUSE="color-management fftw gif +gsl +jpeg openexr pdf python qtmedia +raw tiff vc"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-COMMON_DEPEND="
+COMMON_DEPEND="${PYTHON_DEPS}
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -45,6 +45,8 @@ COMMON_DEPEND="
 	$(add_qt_dep qtx11extras)
 	$(add_qt_dep qtxml)
 	dev-libs/boost:=
+	dev-python/PyQt5[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
 	media-gfx/exiv2:=
 	media-libs/lcms
 	media-libs/libpng:0=
@@ -58,16 +60,12 @@ COMMON_DEPEND="
 	gif? ( media-libs/giflib )
 	gsl? ( sci-libs/gsl:= )
 	jpeg? ( virtual/jpeg:0 )
+	heif? ( media-libs/libheif:= )
 	openexr? (
 		media-libs/ilmbase:=
 		media-libs/openexr
 	)
 	pdf? ( app-text/poppler[qt5] )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/PyQt5[${PYTHON_USEDEP}]
-		dev-python/sip[${PYTHON_USEDEP}]
-	)
 	qtmedia? ( $(add_qt_dep qtmultimedia) )
 	raw? ( media-libs/libraw:= )
 	tiff? ( media-libs/tiff:0 )
@@ -86,13 +84,11 @@ RDEPEND="${COMMON_DEPEND}
 # bug 630508
 RESTRICT+=" test"
 
-PATCHES=(
-	"${FILESDIR}/${P}-tests-optional.patch"
-	"${FILESDIR}/${P}-libraw-0.19.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-4.0.3-tests-optional.patch" )
 
 pkg_setup() {
-	use python && python-single-r1_pkg_setup
+	python-single-r1_pkg_setup
+	kde5_pkg_setup
 }
 
 src_configure() {
@@ -105,11 +101,10 @@ src_configure() {
 		$(cmake-utils_use_find_package fftw FFTW3)
 		$(cmake-utils_use_find_package gif GIF)
 		$(cmake-utils_use_find_package gsl GSL)
+		$(cmake-utils_use_find_package heif HEIF)
 		$(cmake-utils_use_find_package jpeg JPEG)
 		$(cmake-utils_use_find_package openexr OpenEXR)
 		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package python PyQt5)
-		$(cmake-utils_use_find_package python SIP)
 		$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
 		$(cmake-utils_use_find_package raw LibRaw)
 		$(cmake-utils_use_find_package tiff TIFF)
diff --git a/media-gfx/krita/metadata.xml b/media-gfx/krita/metadata.xml
index c63335afbc91..0ee0df7f22ce 100644
--- a/media-gfx/krita/metadata.xml
+++ b/media-gfx/krita/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag>
+		<flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using <pkg>media-libs/libheif</pkg></flag>
 		<flag name="qtmedia">Enable sound support for animations via <pkg>dev-qt/qtmultimedia</pkg></flag>
 		<flag name="vc">Enable support for <pkg>dev-libs/vc</pkg>, could be a significant speed boost</flag>
 	</use>