gentoo resync : 17.12.2017

3 files changed, 2 insertions, 101 deletions

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index f00c357901d0..4d760a93b2c4 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,8 +1,6 @@
 AUX krita-3.1.4-qt-5.9.patch 722 BLAKE2B 7ebb7f3e222e2f16842730e481d3e8d1a5759fd7878a7acbccec6edbf151d95c316215df21c72a27771fb72c0e979a4d5316772d2e5959e40b3fb9d9a423a774 SHA512 265b4bdc3b75ac346dac24fad6824dd713f7c40855bb10ab8373b18a55943a67c1b203676689a49d1a34cd682059c70d9371ba463a0e0e16496c67d5b19389c7
 AUX krita-3.2.0-tests-optional.patch 8806 BLAKE2B 90355102edb82e69539dbbedae83a9bb51f98a34fdfd85758e4b4427ed5ec058cfe28931fb6a1c604a9631ff1b3b5c86651a7d6fde80d2002d7e7a2ef6f6aa69 SHA512 aeba8043f7a31a24fad6b515608a881b34bffd0f05502ddd7591f8bb7a7c82eae5ec21bcab4c17091255f94422817ca5e89d97836ab0ce9298f29350a1666b34
 AUX krita-vc-fix-gcc49-abi.patch 539 BLAKE2B 67925fb6f3b70f6eb6df3e62e2f2da8dda49e6d7e73597d0272df50f909d41b25b2aaa02fdef1ee0d9a2c731c2d4bb0c1a2c04bc930dab98378d49400e464156 SHA512 41e750c336ce2869d5653fd47ce951977af74bd9d8cd0da6fb3d1bcb770759ca531dfe5bcf9f6d1cb4cdb914f7d374b97c9b3a59fa318f121fccf7527654dd2b
-DIST krita-3.1.4.tar.gz 209778186 BLAKE2B a8b2bdae2da85a30364f4950032f72f55e8b9a592307b8be6c6d3cb18e294180579071247914c89e39ec339d2e031631917c24d48233a1b5af63a7a231d53463 SHA512 6695d8d09552de2d98cb4a8fac1aefc6b5e35df50d7b72c088f11a25af54574b303a7445b4a9cb099844cdf0729a185f03fd208ab2f98329123398fd54a374df
 DIST krita-3.3.2.1.tar.xz 132385220 BLAKE2B c1d6d11435f3b6edf91000bcd395ac982e039b236a311635ada33eabf8afc507661e0930a4a418c808970d07ab12854f7044bb095816954b1c5599123635a471 SHA512 e10a0a0400cd88889fce8b87afa133450401d9b2482d9442fde3b69eb73e5b6ef6f2ca7109599e11aafaf3de2965319b8a6e10c952e039fa23ded31a1346cb6b
-EBUILD krita-3.1.4.ebuild 2570 BLAKE2B 5743f9283da354549f9241edc344e46be33c6b430bdfe3a592af4615edc61cf0a0a5d77dabfbb0ac6ddeaae48819daf8f64a817246cc9c4ca31931cfbc7cbd00 SHA512 3665dfbba6eb29710d96de572e9da30f594c2c9c3d415bbfe196dfeafd954fa039d156b336a4cbd0a83c4055311e5e7bf4e1a7fd4e6d0caae3ecc5a009e2e6ed
-EBUILD krita-3.3.2.1.ebuild 2554 BLAKE2B 953d93a78281775c3d58ed551d5b5179c673311cd0c29a0951f3caeef292c7086a77cc68cdaa550e1ab3035130d014f1e890c9a89aef0fb7444705b9dded7b36 SHA512 ff438723f70b490b27188b40903dc5c6b29ce9753033c8bb0709a5ab6b4e4d43c6cca03c3273fbc4ae4cede9ef2b499229e04d80a0b3e525a2c8a8aa983741da
+EBUILD krita-3.3.2.1.ebuild 2553 BLAKE2B 0716dec5a5140e917f63b00bc0ebf9eddaa8aa2be02df27723bf2750f951864e76288867d93a7cc89a34fc1924cdbfedea5b90a5cf77cc4565a414d38eb09572 SHA512 01541dbb987080133677738e003e0e912a89d30f8750ee2268373b7cca4efd432ce3b89a20dddabeedbdd9d4b9d934eb195afa5c03b918006f41f5d26b1fe530
 MISC metadata.xml 569 BLAKE2B 7609e8cfc1f63fd04b3306a37a9b429eddaf56bf4bcca32d707b529d0267d7f63979a850edf8fcb5b1043134b1baa7210e849903a65243ac300596ccbdb473bd SHA512 44b2dc2f5d0e737a780e16f4d88cb3c2ff1dbab8b1878ae3561659c3a191040ef0f0f2ef0e7325b16ca6c149e29d417c10bec18bfcf06d8e847000e1e8279b27
diff --git a/media-gfx/krita/krita-3.1.4.ebuild b/media-gfx/krita/krita-3.1.4.ebuild
deleted file mode 100644
index 9802e84cf69e..000000000000
--- a/media-gfx/krita/krita-3.1.4.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-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=
-	net-misc/curl
-	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(+)]
-"
-
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-vc-fix-gcc49-abi.patch
-	"${FILESDIR}"/${P}-qt-5.9.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
-}
diff --git a/media-gfx/krita/krita-3.3.2.1.ebuild b/media-gfx/krita/krita-3.3.2.1.ebuild
index 4fc11b09d793..7bbbcef30e18 100644
--- a/media-gfx/krita/krita-3.3.2.1.ebuild
+++ b/media-gfx/krita/krita-3.3.2.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
 SRC_URI="mirror://kde/stable/${PN}/${PV%.1}/${P}.tar.xz"
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="color-management fftw +gsl +jpeg openexr pdf qtmedia +raw tiff vc"
 
 COMMON_DEPEND="