gentoo resync : 07.01.2022

4 files changed, 4 insertions, 84 deletions

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index c72d38b851ea..f2a41dad6495 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -2,11 +2,9 @@ AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc
 AUX krita-4.4.2-quazip1.patch 1422 BLAKE2B 917bf30f1dc702276b524713b1ec01a4807f967bc974c0c9896e6972fc56554a4da954c690a0743a4d92d86e57d32028c809418cbf10b30294bf1412a1a08beb SHA512 7c55e371f4c6a5e6d3d275298bf22810b58cb845bf4abcdd3cecdd84cb228499c59e8f7e9902319009dc52ea4dde575de77668ab2d1e9cf076e8ffa6fba582b5
 AUX krita-4.4.7-pykrita-crash-on-exit.patch 1583 BLAKE2B 077ebf5108badd615d9bc1086f2890a8f45506ca8cf0b5abf089b68e469200513f9be0a5516bad17b131e4afecc9560c8903ed6b1aaecd7c245a432ac8a2cd02 SHA512 44f023f49a0c5bfd895f65a013787bf2870b06fbba6fe292fb97c791b05965de176184d6a669225748848bc0ae1c7984d0c8dfaf3fd3ccf5ae0dbee953a08f92
 AUX krita-4.4.8-prefer-newer-sip-to-build.patch 2000 BLAKE2B 762d2230e866f7db639802dcf55ba3ff57cd125d115246721e645458376e1a26864f4e0506338300c533f18b8ed52e96374d97d2da161987fc5f8786c59f0edd SHA512 da79a6c457e3b7e04370c5ff527f7ba34e49d0e2493ec747d76af5e728ca72372476dbf85a4b69064ce5cc2f6d20b028883028c0ae59c2c5af6dc2074c8bff9e
-AUX krita-5.0.0-clang.patch 1645 BLAKE2B 9f02317b40b2408cab46acbe73797c2fea9b71ca543e0c7787b2f66a088a79d121e80ee7f4d57cef125e7f73de438c60f6e24dfe00b179a1e4452058b12391e7 SHA512 b5ce85eb346e518f51c4b5c8a18056801839deeb9826e02625171e123e3d46bf8503c4d1ac49477d44231efc14e6fe8c85c79cc8cf262326cf10c364e89d1ebd
-AUX krita-5.0.0-krita_jp2.desktop.patch 710 BLAKE2B 5227648049b9977c077efd2082be43a49dc5a6c677e4f97c138ed121b9c07bbcdfe5ce8183ce9ed99e9bce53320cfe8ae732ac7524a8d38b00976aed70f6d7ce SHA512 2fadeb6099d6bedab95c72a24fe2e0ffb73444eb141e158859c1b5210336cab062377785cac384cbca5eb8b4f1cbe3f8f53f053e9a0208be45db6bca88544f1a
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
 DIST krita-4.4.8.tar.gz 254887779 BLAKE2B 251c621a235b8d977c886d3d31f07187efb6d45eab1960eab84ba4078216a1ecf5c7f0b90bdbf791e0c219867c6df59bb99b47c4b23c7658e1d2990f3e869cdb SHA512 53b9814fcf61fbaee06e81f456aa9de7ab09df99e04932251984c8ae190248e48fa20762bdb7be503ea267e1fb835095b105ce4bf2078fd510ab5a8ef6d82f81
-DIST krita-5.0.0.tar.xz 179036344 BLAKE2B cde7684931363a30598e626fd21751e2b3c0418aa3908e527d2888e41f8cc26065e6d74f000530e153b9a47627b149eb0f834985a84d92b2d87a2d398b59e9eb SHA512 29ad09f00b85688b7150a2705e0b3317e449d932b9906bc994397c4686d6d1058573f5ce84449e7c611d04385ee5ec82182b361fd067630a292ec5f88f0c9007
+DIST krita-5.0.2.tar.xz 179049488 BLAKE2B a58ee0e7d654f18509f970d32a680a9a993c7172a3818517ddf0a41f500c2d1f9102a432b728b9d9254f39f1be0c926602e3b1806ae19b6efc49f99becdffcdd SHA512 5dd2d6961feabf20dbcef49f3499281e34b409e96d379b0247eec70449f82c05ed3cf3ca09014535adb7ce66659d58e988f1f054364637c9851181fa8ee926a5
 EBUILD krita-4.4.8-r1.ebuild 3603 BLAKE2B e3d9d8a9d6060c2b1e621627623668ae29fce652769533ad898064e7f491ee9859fabd9df154bad3346aba37a8a5024061beca045547a87cfb6aa2d8b781ebc1 SHA512 3c3a5b4d98393c6ece66e15b6ca636689da97ce4423855d36d9c02e2fbaa71d51ad91873ae03e47f0fee3c0074307225189b8194a2fa1c4a3472cccb1a6b500d
-EBUILD krita-5.0.0-r1.ebuild 3500 BLAKE2B d1bd50a2cf2da59f312c8b43b29a7638c53be7c58e4ee9ec42a09f0116339b9d72916e555dcd8193d92a66658544ca5f81089550bbce0adf746cde24cc07abdf SHA512 4b98d38c52850d90b43e48e0aaf21d4b5f35c60160fdbba93d630177d3643cd750cc668f15d0603df943fe21c3718fa8cd7711ec8e77bdc539a0c57779aac811
+EBUILD krita-5.0.2.ebuild 3397 BLAKE2B ebc0c001b90520ec8ca685c7a54a8f33588de92d1ffb25f74d6490ded4954c0b21a41b51b8add929567f86264a5a6f967df38ec137d0be6f173b1dd5c53bdcfa SHA512 76859ecf0b4acdbec51f7e9031b2ae1c509c8f570ad5ff797b23d091d9fb3f9d934d59733165a08192514983ccaed31c0683dea6652132b297e211a1ee8bd386
 MISC metadata.xml 877 BLAKE2B 529639e044480796204d2338601d4d10ccac0aa83565469b37d838446b4e924b8440c1c3d1eac1473a1220fedea2c49c392c5c99495c27ab7899ed7909666c32 SHA512 6f826baa1918ed944b22944f85304452d34b3a326c615ba8416589facc0208351b25d6eed9a3f8b0f3614db6c3ddd26b0b54554da95aee8ed332f1645d6fda0d
diff --git a/media-gfx/krita/files/krita-5.0.0-clang.patch b/media-gfx/krita/files/krita-5.0.0-clang.patch
deleted file mode 100644
index 6c9c71d4fca2..000000000000
--- a/media-gfx/krita/files/krita-5.0.0-clang.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0b755beaa1fdba03d38f887b93a15a58fc0830c7 Mon Sep 17 00:00:00 2001
-From: Sharaf Zaman <shzam@sdf.org>
-Date: Wed, 27 Oct 2021 22:19:07 +0000
-Subject: [PATCH] Fix build on linux clang targets
-
-In CheckAtomic.cmake we include is_lock_free because these routines
-don't seem to be included in the compiler's "simple atomics". This
-triggers a failure in clang toolchain, forcing it to link libatomic.
-
-Resulting in error: ld.lld: error: undefined symbol: __atomic_is_lock_free
-
-CCBUG:444247
-CCBUG:444547
----
- cmake/modules/CheckAtomic.cmake | 1 +
- libs/image/CMakeLists.txt       | 6 ++----
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/cmake/modules/CheckAtomic.cmake b/cmake/modules/CheckAtomic.cmake
-index b061e2d65b..df6b70504c 100644
---- a/cmake/modules/CheckAtomic.cmake
-+++ b/cmake/modules/CheckAtomic.cmake
-@@ -46,6 +46,7 @@ function(check_working_cxx_atomics64 varname)
- 	std::atomic<uint64_t> x (0);
- 	int main() {
- 		uint64_t i = x.load(std::memory_order_relaxed);
-+		x.is_lock_free();
- 		return 0;
- 	}
- 	" ${varname})
-diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
-index e883c7f1c8..43c945fad3 100644
---- a/libs/image/CMakeLists.txt
-+++ b/libs/image/CMakeLists.txt
-@@ -372,10 +372,8 @@ target_link_libraries(kritaimage
- 
- target_link_libraries(kritaimage PUBLIC ${Boost_SYSTEM_LIBRARY})
- 
--if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
--    if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
--        target_link_libraries(kritaimage PUBLIC atomic)
--    endif()
-+if(HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB)
-+   target_link_libraries(kritaimage PUBLIC atomic)
- endif()
- 
- if(OpenEXR_FOUND)
--- 
-GitLab
-
diff --git a/media-gfx/krita/files/krita-5.0.0-krita_jp2.desktop.patch b/media-gfx/krita/files/krita-5.0.0-krita_jp2.desktop.patch
deleted file mode 100644
index c678a9f05492..000000000000
--- a/media-gfx/krita/files/krita-5.0.0-krita_jp2.desktop.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e1b2760966b738f1d467013272035433f1666406 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 27 Dec 2021 15:25:25 +0100
-Subject: [PATCH] Fix duplicate "Type" key
-
-Introduced by 542dcd306e236ec776a81e389d0a601387739e48
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- plugins/impex/jp2/krita_jp2.desktop | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/plugins/impex/jp2/krita_jp2.desktop b/plugins/impex/jp2/krita_jp2.desktop
-index 26c448f48b..7de190b247 100644
---- a/plugins/impex/jp2/krita_jp2.desktop
-+++ b/plugins/impex/jp2/krita_jp2.desktop
-@@ -120,4 +120,3 @@ Icon=krita
- StartupNotify=true
- NoDisplay=true
- Terminal=false
--Type=Application
--- 
-GitLab
-
diff --git a/media-gfx/krita/krita-5.0.0-r1.ebuild b/media-gfx/krita/krita-5.0.2.ebuild
index d2782068ebcc..e880d07ce0b2 100644
--- a/media-gfx/krita/krita-5.0.0-r1.ebuild
+++ b/media-gfx/krita/krita-5.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -86,11 +86,7 @@ BDEPEND="
 	sys-devel/gettext
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
-	"${FILESDIR}"/${P}-clang.patch # bug 830225
-	"${FILESDIR}"/${P}-krita_jp2.desktop.patch # bug 829987
-)
+PATCHES=( "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch )
 
 pkg_setup() {
 	python-single-r1_pkg_setup