gentoo resync : 28.04.2021

4 files changed, 13 insertions, 105 deletions

diff --git a/kde-apps/umbrello/Manifest b/kde-apps/umbrello/Manifest
index fda5d83ecc3b..b99bd2fb6232 100644
--- a/kde-apps/umbrello/Manifest
+++ b/kde-apps/umbrello/Manifest
@@ -1,9 +1,8 @@
 AUX umbrello-20.08.3-gentoo-docbundledir.patch 1990 BLAKE2B c629fa51a4d701576e2c5bc870d8368851773687b93309a02986f2cd3140089c435a2964edafd1be930796906295bc8ef1477ba8c9837f560f986ed07ae19358 SHA512 9635b33d0aa612eebbbed37f82812b5f1ea8edcc6bfd0a8749e667cbc718d3ed56568397a6db43838a84f04085682dcd5c3a8a272b92bd9ee9a84de30a2f2d40
 AUX umbrello-20.08.3-no-qtwebkit.patch 3168 BLAKE2B f3908ac2755b70b611182b9b92bf8d08124d11bc0bc690d2c49bb40fd498ab9a0cdb55b0dbac54d0a355c322ac65ba611c48d4a11a27d498ede1f3f3f251ca43 SHA512 6437226d9d3970f6ac8e9b0a53546470e2235021a3e1d4d3339202ba1107259f26ef817760635f40a4cf3ff581f301f49a665c22ef1f070236885ef25bfb24a0
-AUX umbrello-20.08.3-unbundle-kdevelop-php.patch 2791 BLAKE2B 45720ff9807504dfe85c23bf3a5db57212d77e8f6dfec3fc3fe7c99cab656ddf27c40fcae6853ce43282bf499a0b0418c73028a86aa55186188123630a4b594e SHA512 504fc9bffd1b5ebeb9c65349027de25bf0f54fe9e85a4a145784464a4b463a1082f67e5561d156e9a96715330c5d8a414d8e20f3e6d3d1b52097a2ddf9705010
 AUX umbrello-20.08.3-unused-qtwebkit.patch 900 BLAKE2B 6457e81527e8fad652bc9d41f190806c5aae0ac047975d7ecd0309190ece1ac10980179362dd0703822786da1c809535d14a9ecc9f164caba0b1e9ed2ee721b4 SHA512 1194a66b427fdbd85e50d8c658c150b06253f89f6aded75a627db7c259621496b0021ee18d792b528a28e8ce2e2782b9bd06e4c49f721761a10fff853e81164f
-DIST umbrello-20.08.3.tar.xz 5555108 BLAKE2B c8ccc39d43f061d78889776e6adc6d1a07a67608b8cbfc8c18e8f94a3d1608b3764c15d496538bb76db2672cd6bdfa8158b30a24f38f3c40e8b18dfe72262155 SHA512 541d637cd892f5b162fa88e3380c9ed4c9c175d5479bb1947b415b8fa59a419fd90eac2e47d939ec3d9b7b43b14fbf6777683f884b7ff10e7dee85eccb59f813
 DIST umbrello-20.12.3.tar.xz 5555804 BLAKE2B a923d4f4d952dbbfc8166b2ca2bff990a4ad8652762277c3f16d4c37ffd26c1761a3480d45640c2821b0e85633158a90d82358afedc11fae98b2d5e58d0e7f57 SHA512 619d83ffd307be57fc8f3dc935dde6bdeffc60186ab675b8f2e530bb6a125ec1e03fccc49772c6d4cc120b3280e56f28344cba2627c3b955f9cd338cd071da6a
-EBUILD umbrello-20.08.3.ebuild 2045 BLAKE2B 17a42a5774c26b6dc11c52fb2abcc5586a6a375a56d65eaa5ff23b071cf84cb55763c8779c0b795c226ffd09d8ee5f494c1031087068f4918cc91c8a9580d3ba SHA512 c58721830bd401e991d61314f68b5b1241bae8b9d42cd368f649752f1b42efcbc8de925ce1e9af6ca9100940d6b3727e0bfaf7de86db6ed7a7ed89806fe3026e
-EBUILD umbrello-20.12.3.ebuild 1998 BLAKE2B f619c5e26cad3834aa662cf5a4a51044e6df469f75844e372975d51ec69646072a54c6a169d394084ef268f6ffeb86b2f05c1a47bf87e2dad9f7dd1f24e42569 SHA512 965b1b91eaf0226daa06a1a931cf97b16d0a3b529c957f6ff0ea46893303bbcf82ab7df8742e36c0595fbd546bec002e4ed14ee32c9b4b3cacde1d9eb8336f20
+DIST umbrello-21.04.0.tar.xz 5568700 BLAKE2B c68487e8e5db3da201003d923ac7f717f749110b22efe08d7e7476a7ddc79d1aadd8863a3ed7ee78dbd838d4e0afbfbe655925818fec72cfa4c9ba02f53d1b26 SHA512 b14a90afea1e33a4c5c3a3b8f9a9589a845afa278c8e3e165542be36ddb1ecd28abe4f678c753e34a85e92fba65d98f0f9be34b1976d1c52edfbfff87432e379
+EBUILD umbrello-20.12.3.ebuild 2045 BLAKE2B 00c1037f3d087c19a949650f090168e76310a24754df5de2ba964c4e584e2b142f444ea231dc5b903a51e863daeb4253e952a2d714f5ac0ad5c22b228426edec SHA512 10f23ef3b8fc5f4653b7d541e7f4510638de270df8c23e1af47ee903a2e5e6c9d00675ddba9476c006ef2fb4263e09da7f7df81e820badc39e36dae8c42cf725
+EBUILD umbrello-21.04.0.ebuild 1998 BLAKE2B e4f2bb6106b938096f71e84764f83140cf098437e5ec305401f73d5776e54a8da0d925606e51b5771bfed9ecf024529ae74d77cca643a60004e911526944d513 SHA512 d3a5603ea0be9c3b8eca90bbc117752553271f25818758844ee9346380b846686edcaf0860d9c4ca02a5715955a0e891bb7b954e3df9c9457d74fa16b27d5708
 MISC metadata.xml 390 BLAKE2B c631566eb3c7fa8c1826b91e33c209ac431b66508b21e457166e291d15cdd6c5ca45203f148f011926625fb1a1daea875b696c2b7088b5d568e7292c63e74ac1 SHA512 cfce84a2844d675cbfd3a9546b1f95bc2aec863f2bef680d8c6fa8ef2323614d7e678e3ab411ed33d0b072e3820d44ef1e343d3570c4ebb0fd8e492dd82e4813
diff --git a/kde-apps/umbrello/files/umbrello-20.08.3-unbundle-kdevelop-php.patch b/kde-apps/umbrello/files/umbrello-20.08.3-unbundle-kdevelop-php.patch
deleted file mode 100644
index cce395a837ff..000000000000
--- a/kde-apps/umbrello/files/umbrello-20.08.3-unbundle-kdevelop-php.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 57fef3b1d54959d5b719469c7c67e1d3e7be49dc Mon Sep 17 00:00:00 2001
-From: Ralf Habacker <ralf.habacker@freenet.de>
-Date: Fri, 30 Oct 2020 08:32:41 +0100
-Subject: [PATCH] Add support to use external KDevPHP packaga
-
-If no external development package has been found fallback to embedded
-version.
-
-This commit adds an additional optional dependency for the KDevPHP package, which
-named e.g. on openSUSE 'kdevelop5-plugin-php-devel'.
-
-BUG:428460
-FIXED-IN:2.32.80 (KDE releases 20.11.80)
----
- CMakeLists.txt                    | 20 ++++++++++++++------
- umbrello/codeimport/phpimport.cpp | 19 +++++++++++--------
- 2 files changed, 25 insertions(+), 14 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 221c04e31..398415f09 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -129,18 +129,26 @@ if(KDEVPGQT_FOUND AND KDEVPLATFORM_FOUND)
-     include_directories(
-         ${KDEVPGQT_INCLUDE_DIR}
-         ${KDEVPLATFORM_INCLUDE_DIR}
--        ${CMAKE_SOURCE_DIR}/${KDEV_SOURCE_DIR}/parser
--        ${CMAKE_BINARY_DIR}/${KDEV_SOURCE_DIR}/parser
-     )
--    set(NO_INSTALL 1)
--    set(BUILD_PARSER_ONLY 1)
-     set(BUILD_PHP_IMPORT 1)
-     add_definitions(
--        -DKDEVPHPPARSER_EXPORT=
-         -DENABLE_PHP_IMPORT
-     )
-     add_subdirectory(lib/kdevplatform)
--    add_subdirectory(${KDEV_SOURCE_DIR})
-+    find_package(KDevPHP)
-+    if(NOT KDevPHP_FOUND)
-+        set(NO_INSTALL 1)
-+        set(BUILD_PARSER_ONLY 1)
-+        set(BUILD_PHP_IMPORT 1)
-+        add_definitions(
-+            -DKDEVPHPPARSER_EXPORT=
-+        )
-+        include_directories(
-+            ${CMAKE_SOURCE_DIR}/${KDEV_SOURCE_DIR}
-+            ${CMAKE_BINARY_DIR}/${KDEV_SOURCE_DIR}
-+        )
-+        add_subdirectory(${KDEV_SOURCE_DIR})
-+    endif()
- else()
-     set(BUILD_PHP_IMPORT 0)
- endif()
-diff --git a/umbrello/codeimport/phpimport.cpp b/umbrello/codeimport/phpimport.cpp
-index f45f1416f..f714dcbad 100644
---- a/umbrello/codeimport/phpimport.cpp
-+++ b/umbrello/codeimport/phpimport.cpp
-@@ -39,18 +39,21 @@ QTextStream qout(stdout);
- QTextStream qerr(stderr);
- QTextStream qin(stdin);
- 
--#include "parsesession.h"
--#include "phplexer.h"
--#include "phpparser.h"
--#include "phpdebugvisitor.h"
--#include "phpast.h"
--#include "tokenstream.h"
--#include "phptokentext.h"
--
-+// kdevphp
-+#include <parser/parsesession.h>
-+#include <parser/phplexer.h>
-+#include <parser/phpparser.h>
-+#include <parser/phpdebugvisitor.h>
-+#include <parser/phpast.h>
-+#include <parser/tokenstream.h>
-+#include <parser/phptokentext.h>
-+
-+// kdevplatform
- #include <tests/autotestshell.h>
- #include <language/duchain/duchain.h>
- #include <language/duchain/problem.h>
- #include <language/codegen/coderepresentation.h>
-+#include <language/editor/documentrange.h>
- #include <tests/testcore.h>
- 
- namespace Php {
--- 
-GitLab
-
diff --git a/kde-apps/umbrello/umbrello-20.12.3.ebuild b/kde-apps/umbrello/umbrello-20.12.3.ebuild
index df705db6634e..358f8ac234aa 100644
--- a/kde-apps/umbrello/umbrello-20.12.3.ebuild
+++ b/kde-apps/umbrello/umbrello-20.12.3.ebuild
@@ -16,9 +16,11 @@ HOMEPAGE="https://apps.kde.org/en/umbrello https://umbrello.kde.org"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="php"
 
+RESTRICT+=" test"
+
 RDEPEND="
 	dev-libs/libxml2
 	dev-libs/libxslt
@@ -52,7 +54,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-20.08.3-no-qtwebkit.patch
+	"${FILESDIR}"/${PN}-20.08.3-no-qtwebkit.patch # TODO: fix tests, bug #774219
 	"${FILESDIR}"/${PN}-20.08.3-gentoo-docbundledir.patch # fix hardcoded path
 )
 
diff --git a/kde-apps/umbrello/umbrello-20.08.3.ebuild b/kde-apps/umbrello/umbrello-21.04.0.ebuild
index ac0fd86af5da..20c68b3b625a 100644
--- a/kde-apps/umbrello/umbrello-20.08.3.ebuild
+++ b/kde-apps/umbrello/umbrello-21.04.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_QTHELP="false" # TODO: figure out install error
 ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
+KFMIN=5.80.0
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/en/umbrello https://umbrello.kde.org"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="php"
 
 RDEPEND="
@@ -52,9 +52,8 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-{no,unused}-qtwebkit.patch
-	"${FILESDIR}"/${P}-gentoo-docbundledir.patch # downstream fix hardcoded path
-	"${FILESDIR}"/${P}-unbundle-kdevelop-php.patch
+	"${FILESDIR}"/${PN}-20.08.3-no-qtwebkit.patch
+	"${FILESDIR}"/${PN}-20.08.3-gentoo-docbundledir.patch # fix hardcoded path
 )
 
 src_configure() {