gentoo resync : 11.02.2018

3 files changed, 2 insertions, 98 deletions

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 720aff0c307c..3426cbe85164 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,6 +1,4 @@
 AUX krita-3.2.0-tests-optional.patch 8806 BLAKE2B 90355102edb82e69539dbbedae83a9bb51f98a34fdfd85758e4b4427ed5ec058cfe28931fb6a1c604a9631ff1b3b5c86651a7d6fde80d2002d7e7a2ef6f6aa69 SHA512 aeba8043f7a31a24fad6b515608a881b34bffd0f05502ddd7591f8bb7a7c82eae5ec21bcab4c17091255f94422817ca5e89d97836ab0ce9298f29350a1666b34
-DIST krita-3.3.2.1.tar.xz 132385220 BLAKE2B c1d6d11435f3b6edf91000bcd395ac982e039b236a311635ada33eabf8afc507661e0930a4a418c808970d07ab12854f7044bb095816954b1c5599123635a471 SHA512 e10a0a0400cd88889fce8b87afa133450401d9b2482d9442fde3b69eb73e5b6ef6f2ca7109599e11aafaf3de2965319b8a6e10c952e039fa23ded31a1346cb6b
 DIST krita-3.3.3.tar.gz 207582956 BLAKE2B 36fd2978956fbba870ff8d8c28c31db0731742385620d6b5fd0cc275d74bf6352635c4fd4a537a87b7994fa41d140ee05000593d5a95cd288fd07959e8ef1693 SHA512 b6dc30809e0d6c19fee4bbb240aa53c65e88361ebe273c73c2f24f43904c3cd51719dadb9c11fb7f691f17d75732374295ce904810d8893b7f95b45f859901e0
-EBUILD krita-3.3.2.1.ebuild 2553 BLAKE2B 0716dec5a5140e917f63b00bc0ebf9eddaa8aa2be02df27723bf2750f951864e76288867d93a7cc89a34fc1924cdbfedea5b90a5cf77cc4565a414d38eb09572 SHA512 01541dbb987080133677738e003e0e912a89d30f8750ee2268373b7cca4efd432ce3b89a20dddabeedbdd9d4b9d934eb195afa5c03b918006f41f5d26b1fe530
-EBUILD krita-3.3.3.ebuild 2554 BLAKE2B 830865c1597bcd6320228edadd44b525913f00d7a6c5897eb8865a11ea3f1cbe176c0673b5b370ffa7dad28403471f7ab189646b7bc63717f672ff6df36f0f14 SHA512 875f92e0af525ec0f12f564a0184b9b96d4e21580930fbeb3addf8d20aca77069ba499af08b895a30763fa0f05f45871cfbf8be5973f65a331dbe82929283818
+EBUILD krita-3.3.3.ebuild 2553 BLAKE2B a1d97fa3af8a79da72fa2dbdddd73135892d9df066f9316359036eed49d0bf21cc57ff2aab2d9e43549bab839d3949e0623aea9fc946337fbd1004ef10df6404 SHA512 c750f5904eddcee56469a463c0421250d905d9d6bb3f97711e19ee98b1e3b614c07e6fd68cc46597b4e500d8c8b51f9b10401cdb54622243cdc6491807657662
 MISC metadata.xml 569 BLAKE2B 7609e8cfc1f63fd04b3306a37a9b429eddaf56bf4bcca32d707b529d0267d7f63979a850edf8fcb5b1043134b1baa7210e849903a65243ac300596ccbdb473bd SHA512 44b2dc2f5d0e737a780e16f4d88cb3c2ff1dbab8b1878ae3561659c3a191040ef0f0f2ef0e7325b16ca6c149e29d417c10bec18bfcf06d8e847000e1e8279b27
diff --git a/media-gfx/krita/krita-3.3.2.1.ebuild b/media-gfx/krita/krita-3.3.2.1.ebuild
deleted file mode 100644
index 7bbbcef30e18..000000000000
--- a/media-gfx/krita/krita-3.3.2.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# 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%.1}/${P}.tar.xz"
-
-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(+)]
-"
-
-RESTRICT+=" test"
-
-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
-}
diff --git a/media-gfx/krita/krita-3.3.3.ebuild b/media-gfx/krita/krita-3.3.3.ebuild
index 9ad864df24e8..24bf800d2a04 100644
--- a/media-gfx/krita/krita-3.3.3.ebuild
+++ b/media-gfx/krita/krita-3.3.3.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.gz"
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="color-management fftw +gsl +jpeg openexr pdf qtmedia +raw tiff vc"
 
 COMMON_DEPEND="