gentoo resync : 20.10.2017

4 files changed, 96 insertions, 2 deletions

diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index f15c6775e18f..356c40a3dd65 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -3,7 +3,7 @@ AUX graphicsmagick-1.3.19-perl.patch 491 SHA256 98899a22071a112e332bbe2dfec119e0
 DIST GraphicsMagick-1.3.25.tar.xz 5387880 SHA256 d64bfa52d2e0730eff9ce3ed51d4fc78dbb68e2adaa317b2bb3c56e6ee61ac9f SHA512 d62d6aee96d7b8444f1aa206b0c5cbbed9511612cb71d667af072ea52b68dcd11088699debc58faacbb014ad83fb8c2b3e474220f506069f7b5d22f0340f8ef8 WHIRLPOOL 8c2ffccf588495b78e0d84737e83ae396cbe86efa5dfddf6ec440626829d7b83f036771ec8be585dae58c3076eba8190ee809f0c09fc74c744efec96480a634b
 DIST GraphicsMagick-1.3.26.tar.xz 5400564 SHA256 fba015f3d5e5d5f17e57db663f1aa9d338e7b62f1d415b85d13ee366927e5f88 SHA512 b33ca0f1c858428693aee27a9089acff9e63d1110f85fa036894cfefe6274e7b2422758ea39852f94fdb4823c9c3f3c44b0d8906627503301f5928096f739f22 WHIRLPOOL 8c8874c34be6c921dfc5623352a04d2cf502f2b28aebad1f8d63c1067d5ffa7af6a22e9b9b7095bd98674ffc5c456434598145721431d1d5f7c7e68ab362e238
 EBUILD graphicsmagick-1.3.25.ebuild 3162 SHA256 9772c4d5ffdfbe07e98e4e9597f845925a1b5a29c8890e4c7e64f130bc9d5f8a SHA512 ec889b617290ea3163b25be55260dffc754867db2f730104de45b465e90ad31550fd451c813d52dc611e66f5a2639e5d4923e48e25a5ca49ccd8797183385c32 WHIRLPOOL 617d7a9a3c1ad531e39107a9c1dcf3497e6adee6cb72e4f515afb70e2e273ff9e7f8e320253bed59cb028f913aaa1fc6bec36e96380237cc2583f8a67f8c7bb0
-EBUILD graphicsmagick-1.3.26.ebuild 3282 SHA256 3778b309dff47b0b9d2a8b149b2154a36b1903d2d9adb2792f8809934ce21cc3 SHA512 d3b3e7ad5fda12c5690f2fe565cd5dcd82477c3b35b7af78387d84d707e25688b453c9da5193f188434ff3e86ae8d7da0ab97b5f525b2cba412106f26f538b61 WHIRLPOOL 8b712f6b02acc08eb996e897fd37594a900b0b34b43cbc7c9b541943b25e0a3380b4d5667289b4df3d8f270d96be85c8a67f91f9919bf23c3b6f903d7b0525c7
+EBUILD graphicsmagick-1.3.26.ebuild 3281 SHA256 0d820796918a20a075a2de0ad80fa9e2babec7a6fcc07ae349fe9851efec6c2e SHA512 00779d62e3be7117b5d61950086f16969f8117f0732ec3aae5d8e9d850cc33f497a3322f4c564c0bff96f98db22ee50389c37b5b09a7775001e952aa3df01e3b WHIRLPOOL a1512696dbd6b1673d8c2d730eb3f09d56a5cd0885639bccc7f5cf3f9377844e8f07ef4d0dce1d0ec74c010524e968df6bed071f172d3dfc3f04a6efc6d166e9
 EBUILD graphicsmagick-9999.ebuild 3283 SHA256 604914952995e6c0e53f6b86df71007a8e9c3b13a6351546b82060e3a5970817 SHA512 361ebf78cf28c28073a786931e0470e8bbf0da188edd5c9b68e51d1c3cf04916ead74e743b9fd8e5980bb9de37c4d639c5c32fc630665d55e6fc9c4717a15480 WHIRLPOOL dae4588534d0b627051adae32c8ac6d9b10593bb7e9c6a443e2f9979a5fc9ae9e59d2ae501e90989bcd23bd6361617b1c7f3219a4310e3a26dddf0a5e2338e26
 MISC ChangeLog 8279 SHA256 942d53bb0df3374e5a890ba0fa3b6410a4570e4f32a6140422760aca294f2729 SHA512 4e57e7d633fa10818e13e5b66cbd914a8d359bd1982d828c11328cb52eb00994b0ae62e1917722085736c16e06677da0e67e76b92eb38cb130f13adaec362e05 WHIRLPOOL 21c6e65a2aa94a1588479e9b42943c774507f49127db5c056c3b9d6652562cec97d32e68817052c5a8e95fdfa4f36e710a22e3c55e08fcf88ab31e32005d3b3e
 MISC ChangeLog-2015 14451 SHA256 22b7127860406f4d3c6e56317c76c6765e1fe46a790f238506c83101199c9a92 SHA512 50e9a3c6b90e6ec809048762d154a075f4e3c9468bdfd8d1cebdd4cda067f82a9e58380c7c74565058de80cc4a180558613d9c5c7459bb5b13335b6a84db0cc0 WHIRLPOOL 7820861ab3397fc23dd4a497cc4860beef98393d0e6ed95b82dc35bae54357f8ab4bf2ac6c270fa7bfb6fbcea959f955272cee989b0ae8cc4715226464d6a741
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild
index d1958488f431..2189f940ff40 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
 else
 	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 9173876a3f97..78210c7da7f1 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -3,7 +3,9 @@ AUX krita-3.2.0-tests-optional.patch 8806 SHA256 839bf01eccee18c6dec2cf2b0ab5d47
 AUX krita-vc-fix-gcc49-abi.patch 539 SHA256 c2d38b00853df1fccd2b161b53f8b7b65cc81777ef33a6ee6a9e62d6bac76615 SHA512 41e750c336ce2869d5653fd47ce951977af74bd9d8cd0da6fb3d1bcb770759ca531dfe5bcf9f6d1cb4cdb914f7d374b97c9b3a59fa318f121fccf7527654dd2b WHIRLPOOL f47005d4446f5986517b54fc1979138119ffd99edeb7f7f4cf17967e979fe97fe30eb8dca2a71d3d35c02b791de58d63069f18edc35abea4e07775cc5275e45a
 DIST krita-3.1.4.tar.gz 209778186 SHA256 741837b0d12afa795dbbca45d5efc78966f3041dbfb22a268c101c7dc23e82aa SHA512 6695d8d09552de2d98cb4a8fac1aefc6b5e35df50d7b72c088f11a25af54574b303a7445b4a9cb099844cdf0729a185f03fd208ab2f98329123398fd54a374df WHIRLPOOL 9b8819432594d10377ef6db5adaca06193044203ae5b870a2f014171c817dd2ffc251bd20af0a05183251a798d06fc6aa7b33c1a640879af3ac3c01c0e9869e7
 DIST krita-3.2.1.tar.gz 207014866 SHA256 ef06cee677d75861edca0e1f825bca42ff59b7200aeb827e16f8d1fb5ef14e39 SHA512 ddc7153a3fcef072de762cd48d4d6df765cc88b7a413028b3aec5690382c1ab7f61f6ae37070c78ef2be1bdc26107908d288976bfa12d14ca35934ce33fb10a3 WHIRLPOOL 79bc89b7ebf63b2a31bac726e91e4b77bf7b2a6eafe15a6bf15baf935f2bf56e2f612359fc16c7129251623dfe4d7fe53cd9d2f42d423385487a832309afd17e
+DIST krita-3.3.1.tar.gz 207093337 SHA256 5fb86577753b28b8915ae993c80a417f388977d04159feb69f5afc0e592bfee9 SHA512 b4293e9166a810142f7a5769415f1693d91d1749aa9c4e4ac77686eb705a28522a83242955cbf0f1b64da8c7f1b79a2f3118e04105b3478a090b4fb49baafb7f WHIRLPOOL 571ff3449bb5ab4996bc0dc7712418bf7f1ec4cee905152913b3300155fb7e1447c7b0d5664321878886c4d4557f8ef1a47c7b5a6baa9d255f6181cb4dac80e3
 EBUILD krita-3.1.4.ebuild 2551 SHA256 d56beb770f09e4ddd3907dad4aab1ed3dbb13a0dc36bddf2beca1b64315d6b9c SHA512 74661e02ea49dac6f78a996f839520ebd9e29787293b3585c78c4c5b4faa46f13d31a2dd26765c058f964b925e59fa5ebdf81b95cbc24c7093ae61e84afec022 WHIRLPOOL 629c8eb72b3ebca52674ad569e17558f5337cfbe3e49f551ad4393cc3231d34d1ecfddd187c96ddf47c7088760585b0067d98673e4d01a6bb07835309253e0e3
 EBUILD krita-3.2.1.ebuild 2532 SHA256 e9e620230349be4702b5c5e03410d6ac6911143a93276491538c3236526e459e SHA512 7606da963f518188d2e7b951ffb3095b4e2a69604cfc24ca7251854fab6f0823a6ca54d56eb2d8b4524cb2601ed49fae5ace5c1406ff0d4758d8953535ca09d8 WHIRLPOOL 662c66fcb9c366be39f346612fa879845b5821de9de25c37b9e1e5d1b88bfdc455c0a1ce6562d2821e292fd38891366e17d36c5da437900a0d2e3ce7a1fe0219
+EBUILD krita-3.3.1.ebuild 2532 SHA256 e9e620230349be4702b5c5e03410d6ac6911143a93276491538c3236526e459e SHA512 7606da963f518188d2e7b951ffb3095b4e2a69604cfc24ca7251854fab6f0823a6ca54d56eb2d8b4524cb2601ed49fae5ace5c1406ff0d4758d8953535ca09d8 WHIRLPOOL 662c66fcb9c366be39f346612fa879845b5821de9de25c37b9e1e5d1b88bfdc455c0a1ce6562d2821e292fd38891366e17d36c5da437900a0d2e3ce7a1fe0219
 MISC ChangeLog 1347 SHA256 0842c6da6c74f58c2bf65ea5842f75857f7339daaa702947fef7625893487030 SHA512 51fbe12ec66ca91dcb60cb00d8c0563a7d033da26b9ada5188e94bcaac9852648191e700b62ec8a6f40af2773b1b566bc3de394bccf0d96b716dcc8f72a9460e WHIRLPOOL 8b7a12f8c82b8fcad1bb59e9438a722c5da203a386b97b8b8970b09cc3450fa53887f6354c027fbf0802887b678276dddb76db163e3548a6c702637d3105196b
 MISC metadata.xml 569 SHA256 734de7cdb3cd12de975cf7fa2a02370178fbe8ec8c9f6ea3b424f5bff1fed336 SHA512 44b2dc2f5d0e737a780e16f4d88cb3c2ff1dbab8b1878ae3561659c3a191040ef0f0f2ef0e7325b16ca6c149e29d417c10bec18bfcf06d8e847000e1e8279b27 WHIRLPOOL 67a8f8f9c346a040683a568a63cd3230bcf1a9fa613ceebd3d185179d750d8a050c8b1abb96758e5bd27e70c08683c6727d52c266e63fb22292e3619a4283a39
diff --git a/media-gfx/krita/krita-3.3.1.ebuild b/media-gfx/krita/krita-3.3.1.ebuild
new file mode 100644
index 000000000000..7c6ab717abaa
--- /dev/null
+++ b/media-gfx/krita/krita-3.3.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE="color-management fftw +gsl +jpeg openexr pdf qtmedia +raw tiff vc"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui '-gles2')
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	dev-libs/boost:=
+	media-gfx/exiv2:=
+	media-libs/lcms
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXi
+	color-management? ( media-libs/opencolorio )
+	fftw? ( sci-libs/fftw:3.0= )
+	gsl? ( sci-libs/gsl:= )
+	jpeg? ( virtual/jpeg:0 )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr
+	)
+	pdf? ( app-text/poppler[qt5] )
+	qtmedia? ( $(add_qt_dep qtmultimedia) )
+	raw? ( media-libs/libraw:= )
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:3
+	dev-lang/perl
+	sys-devel/gettext
+	vc? ( >=dev-libs/vc-1.1.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!app-office/calligra:4[calligra_features_krita]
+	!app-office/calligra-l10n:4[calligra_features_krita(+)]
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.2.0-tests-optional.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package color-management OCIO)
+		$(cmake-utils_use_find_package fftw FFTW3)
+		$(cmake-utils_use_find_package gsl GSL)
+		$(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 qtmedia Qt5Multimedia)
+		$(cmake-utils_use_find_package raw LibRaw)
+		$(cmake-utils_use_find_package tiff TIFF)
+		$(cmake-utils_use_find_package vc Vc)
+	)
+
+	kde5_src_configure
+}