gentoo resync : 17.02.2020

3 files changed, 15 insertions, 25 deletions

diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index f26b4eec41a2..6f565686bc42 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,5 +1,5 @@
 DIST konqueror-19.08.3.tar.xz 7604888 BLAKE2B c66ebcdaffc0b3e502ce4b9bdd981cfd732d37dc7973f6f4f48b5a2a3ced98f55e9c14af699599d4dbb22d398999b899e89adbed72106fd2b8612e93cc682baa SHA512 ea2416fdcc102b41302635964983bf27945e49d53b237479f1cbe7d81a781671884c4e020295dc92d84e2eb14e7a503d0f994ba509eaf4372b8f2c63ae450728
 DIST konqueror-19.12.2.tar.xz 7379568 BLAKE2B 2e5c28283db111abc7c2a1306ab409a5bc2d2159b455d80ec189e5d0b06652f35a9a3a725b4c099b4ede0cad6c086efd5b20da1dde8f2eaba0e0b8694f64d590 SHA512 fc65280ade68db9d6e6156059d4c0f88a1f0f4c7866b88149aae7f90812f553bb9b8c9525495d692261e27ea90af50ab73bd45ea96a829f80bd339b97339d9f7
-EBUILD konqueror-19.08.3.ebuild 3297 BLAKE2B f2c50fb3e8fbbb33220d2a0fca19acb618e6a94d6703ff6f1e3fbab936fa96b7da854cee5d822da43d52cd9d101f8db13640e461985bc415d200651e95dc75c0 SHA512 1d00c84028b43257390284500aeb7cc01f9b223987d047cf64a64d302c59e5c7c681383b77a0390ec944beac76ac6b34e4927ee1cff7792299c3199059a31148
+EBUILD konqueror-19.08.3-r1.ebuild 3019 BLAKE2B 2214dd9e22a63e4d84ed917bf7fdd0921cdd908868ac05295074a9b2a65794fd60065198a481b9921adf185f66b733a3e6bc69895ab10e9bb7d7e455eaceca14 SHA512 92c5135becdee85a15430363a7e4a594e9ab46546c2bd7a5912503acf7054afed578c920060d4fb162aa8fe95e97030f84191eb24cf359d22e3ad5c82e1d87ec
 EBUILD konqueror-19.12.2.ebuild 2945 BLAKE2B e585447b9a2aa5f5cba26e444e3738b8cd360e4eeb45cdd21edf42b54e7a3ab7f4b266227c80093587222d59afa42b4eb75f4713da1796d27fcc320804375a24 SHA512 0ff6acc982116d3f2f162037bd1cae6aa61ac8b20b66e0d7c31220004f9f92ac8a37b3ab1b16c3b480f06cc8e99079d2e9b8beb819adb01655b320dff287d655
-MISC metadata.xml 518 BLAKE2B 4b7859d0edb6e15cf4b14e7d7092ab3cf48214f6895bef94476920440a072aa1dce619bb9e1ba6c0f848fb261faa08f1ec425e39dfd734238648274ed91157a8 SHA512 675012d4e94393e9bec06325f0551253dd70a26f4328b37403170dd6f705fb33bc2ae87c63dbd5c659827619b22038fa3921112ec7643c775302681e3573c0d2
+MISC metadata.xml 381 BLAKE2B 79667410a7131e11432baf95c334232a6ced7438359477f6cace5f70ca28a9bb8b4e9d43c251c87614fa049a91e50b0dc7cd3b92a148d551abc84e5cfc2f63a9 SHA512 09ff944d639b46cc6f203db77821ac0c063ba08102d94c751f887a84f6daff3569a6665d7ba58c2cab32ee58454e3acb8742cc2843152c98ec355cd0af648955
diff --git a/kde-apps/konqueror/konqueror-19.08.3.ebuild b/kde-apps/konqueror/konqueror-19.08.3-r1.ebuild
index fbf41c362937..bc0d8af44d4e 100644
--- a/kde-apps/konqueror/konqueror-19.08.3.ebuild
+++ b/kde-apps/konqueror/konqueror-19.08.3-r1.ebuild
@@ -1,30 +1,32 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
 ECM_TEST="true"
-VIRTUALX_REQUIRED="test"
-PVCUT=$(ver_cut 1-3)
 KFMIN=5.60.0
-PLASMA_MINIMAL=5.16.5
 QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
 inherit flag-o-matic ecm kde.org
 
 DESCRIPTION="Web browser and file manager based on KDE Frameworks"
-HOMEPAGE="
-	https://kde.org/applications/internet/konqueror/
-	https://konqueror.org/
-"
+HOMEPAGE="https://kde.org/applications/internet/org.kde.konqueror"
+
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS="amd64 arm64 x86"
-IUSE="activities speech tidy +webengine X"
+IUSE="activities speech tidy X"
+
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT+=" test"
 
 COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
 	>=kde-frameworks/karchive-${KFMIN}:5
 	>=kde-frameworks/kbookmarks-${KFMIN}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
@@ -50,33 +52,22 @@ COMMON_DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
 	sys-libs/zlib
 	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
 	tidy? ( app-text/tidy-html5 )
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
 	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
 "
 DEPEND="${COMMON_DEPEND}
 	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
 "
 RDEPEND="${COMMON_DEPEND}
-	>=kde-apps/kfind-${PVCUT}:5
-	>=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
-	!webengine? ( kde-misc/kwebkitpart:5 )
+	kde-apps/kfind:5
+	kde-plasma/kde-cli-tools:5
 "
 
 src_prepare() {
 	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
-	if ! use webengine; then
-		ecm_punt_bogus_dep Qt5 WebEngineWidgets
-		cmake_comment_add_subdirectory webenginepart
-	fi
-
 	ecm_src_prepare
 }
 
diff --git a/kde-apps/konqueror/metadata.xml b/kde-apps/konqueror/metadata.xml
index 462e8ca3746b..a198affb5420 100644
--- a/kde-apps/konqueror/metadata.xml
+++ b/kde-apps/konqueror/metadata.xml
@@ -8,6 +8,5 @@
 	<use>
 		<flag name="activities">Enable kactivities support</flag>
 		<flag name="speech">Build text-to-speech plugin</flag>
-		<flag name="webengine">Enable <pkg>dev-qt/qtwebengine</pkg> as web browser engine (fallback is <pkg>kde-misc/kwebkitpart</pkg>)</flag>
 	</use>
 </pkgmetadata>