gentoo resync : 10.09.2021

3 files changed, 3 insertions, 134 deletions

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index d4a31b30ab09..58a92cba533c 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -4,9 +4,7 @@ AUX krita-4.4.5-pykrita-crash-on-exit.patch 1197 BLAKE2B bebb54df49f02056acc4323
 AUX krita-4.4.7-pykrita-crash-on-exit.patch 1583 BLAKE2B 077ebf5108badd615d9bc1086f2890a8f45506ca8cf0b5abf089b68e469200513f9be0a5516bad17b131e4afecc9560c8903ed6b1aaecd7c245a432ac8a2cd02 SHA512 44f023f49a0c5bfd895f65a013787bf2870b06fbba6fe292fb97c791b05965de176184d6a669225748848bc0ae1c7984d0c8dfaf3fd3ccf5ae0dbee953a08f92
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
 DIST krita-4.4.5.tar.gz 254879190 BLAKE2B 6eb12bba3ff2a5a6400eb7719faa3ffa1a4b1863e177aad0a737e13ce59dc53feb27083ccbeea51db6d69322871cc159eda5dff67e4daf1e7b4806edeb49adfc SHA512 9926e1cae7db2b89b8cd5f1e45631ff8cbf63cdbd367fc2f4b901a3f1d708dabaa6ac293a8f53b9ca67d7afc263ff51fe6f6b6a9a70017ee23fbf8aa2732abc4
-DIST krita-4.4.7.tar.gz 254871508 BLAKE2B c7e964ddec3fdf16db0644f6d61daa278b0fed2969bbcad99ca476240196ff4da3371af718049482ffe09e314bc96d40f28929fccb8cf0d3a9c98d7f20658695 SHA512 b1fbab9f69e700a1e9e562adfa1776c2de481a5dd92cee2a0ea533a0233a7277b512823023736784c41b387210a35c07cc23b3e2b3a89ed9cb60d440cc5906d5
 DIST krita-4.4.8.tar.gz 254887779 BLAKE2B 251c621a235b8d977c886d3d31f07187efb6d45eab1960eab84ba4078216a1ecf5c7f0b90bdbf791e0c219867c6df59bb99b47c4b23c7658e1d2990f3e869cdb SHA512 53b9814fcf61fbaee06e81f456aa9de7ab09df99e04932251984c8ae190248e48fa20762bdb7be503ea267e1fb835095b105ce4bf2078fd510ab5a8ef6d82f81
 EBUILD krita-4.4.5-r1.ebuild 3566 BLAKE2B 2ed6de5f9a8cf257d63397647621c51b716a1be2e5147ab1e22d4b698acc026b1ed1b5b09ba4ca45a6deaa7e53de87bb28b9ef1ae92a5c5c6f052d5f5863fa41 SHA512 004b3e83eb730b8212c9c50134e378e36cbf60cabfa7672a29c139b512daf2f73ab214cf8685f73e257b2dd0aec7d8b0f69c6a5db78f0ce08329a0098af10c7e
-EBUILD krita-4.4.7.ebuild 3511 BLAKE2B 26a779a209dfc361e5f80b44b266eadca7af2f9c2f6f0b9ef6db88f87e40afdc9fbca812bd9029bf9f192cd2962ef45eef96659d950f6771311454af84ef5293 SHA512 3618ebb0d61ed181ddb11b7ea614e7f0721d63c50c7fe674c3aa2517cd8fadfd30bca6a63b1c056e6bdc6dbe6c2651e57f86e80dc64be8413ec03fe4294166c0
-EBUILD krita-4.4.8.ebuild 3517 BLAKE2B 142433d0bed8e43f1c232405b49d7c85d43af4fdc66bfab975fca89e3c532c0e1ae817f0303548ac2ea467b111c076445b7a40ad0a3201397dcdd62978e7fd5c SHA512 ac33a66f5f4dc6c6b0fc0b56e3f23897e6d2ec6355b0fefb944bc2fe2d8f41a4427715034fb212fac4af9aa16bc08a761370f1445e6f19ee55357cc9d94b7ac8
+EBUILD krita-4.4.8.ebuild 3515 BLAKE2B 2d28bebd5f455e0d6dab6da45f1733ed982574cc9ee1d1befeb3d9be1508c2bdac441b1a2e206140ed2c7be1178011db9c4a2a74258db22f42467ecf33d25ca7 SHA512 b249fdda5db441a3b5224f503610db1d2873671289e34926c0e59e3fec6509e6d3d78c10ba50472d353ba0e3576a378ebd5ba247318cbf5209391a68db72d449
 MISC metadata.xml 764 BLAKE2B b54f93efa3355522788dd1434ae168eb53ec402784307cdc8fde54e9855b4c5133a3e56f019f2f4812bf3963f51c43be2b5735ed745c2cc6bfec7500d45b527f SHA512 8c123214add6f8bb8a79827a6c7d070a5a6057be04493156a5ce2ce2f40fa1b0a17ef6eb503a3f79c41be29d3a6b939ff7ea777c43da3b20521e14083a3cfede
diff --git a/media-gfx/krita/krita-4.4.7.ebuild b/media-gfx/krita/krita-4.4.7.ebuild
deleted file mode 100644
index c80ed32f9980..000000000000
--- a/media-gfx/krita/krita-4.4.7.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{8,9,10} )
-KFMIN=5.74.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz
-		https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/"
-
-LICENSE="GPL-3"
-SLOT="5"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# bug 630508
-RESTRICT+=" test"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	dev-libs/quazip:0=
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-	')
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libpng:0=
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXi
-	color-management? ( =media-libs/opencolorio-1* )
-	fftw? ( sci-libs/fftw:3.0= )
-	gif? ( media-libs/giflib )
-	gsl? ( sci-libs/gsl:= )
-	jpeg? ( virtual/jpeg:0 )
-	heif? ( media-libs/libheif:= )
-	openexr? (
-		media-libs/ilmbase:=
-		<media-libs/openexr-3.0.0:0=
-	)
-	pdf? ( app-text/poppler[qt5] )
-	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
-	raw? ( media-libs/libraw:= )
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${RDEPEND}
-	vc? ( >=dev-libs/vc-1.1.0 )
-"
-BDEPEND="
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
-	"${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
-	"${FILESDIR}"/${PN}-4.4.2-quazip1.patch
-	"${FILESDIR}"/${P}-pykrita-crash-on-exit.patch # KDE-Bug #417465, git master
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_prepare() {
-	ecm_src_prepare
-	sed -e "/CMAKE_CXX_STANDARD/s/11/14/" -i CMakeLists.txt || die
-}
-
-src_configure() {
-	# Prevent sandbox violation from FindPyQt5.py module
-	# See Gentoo-bug 655918
-	addpredict /dev/dri
-
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged
-		$(cmake_use_find_package color-management OCIO)
-		$(cmake_use_find_package fftw FFTW3)
-		$(cmake_use_find_package gif GIF)
-		$(cmake_use_find_package gsl GSL)
-		$(cmake_use_find_package heif HEIF)
-		$(cmake_use_find_package jpeg JPEG)
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package qtmedia Qt5Multimedia)
-		$(cmake_use_find_package raw LibRaw)
-		$(cmake_use_find_package tiff TIFF)
-		$(cmake_use_find_package vc Vc)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/krita/krita-4.4.8.ebuild b/media-gfx/krita/krita-4.4.8.ebuild
index 30ca71bc92a8..b54ea50988e2 100644
--- a/media-gfx/krita/krita-4.4.8.ebuild
+++ b/media-gfx/krita/krita-4.4.8.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="forceoptional"
 PYTHON_COMPAT=( python3_{8..10} )
@@ -25,7 +25,7 @@ IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # bug 630508
-RESTRICT+=" test"
+RESTRICT="test"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=