gentoo resync : 15.01.2020

3 files changed, 16 insertions, 26 deletions

diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index 2999a95b7459..a452ac3d22e8 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.0.tar.xz 7378460 BLAKE2B fc44607213ed0394f44cee39e1de876f2766129c2bcb88ca3be0de94542e2c689557cd1c7bcb5f1e11d76d58e9d056b906c8d2e9f881be1d0c4018fdcadd1902 SHA512 ce585ab7c1abaaa34579b09a5109497bbfac4a8caac769a13964053171af57338837729d5627caaaddd05678ffb59acb5baf603cb1f51814110dd2973ad28e72
-EBUILD konqueror-19.08.3.ebuild 3321 BLAKE2B 02151868526f38cd624dba0c646fa481c1246711b61caba3a491a9a725a22818b4ed2a4d917aac2cfb6d06bd9d9b9863ab8ba167b20121b26a67308f1f0c87bd SHA512 6454430327812b6f42c89fd938f677315efc7f6f2638d0de99797d883de329d44839112fdd4aa7d8e6b675ba4083bd95241e7c17dc6c7313a001e75220a36dd8
-EBUILD konqueror-19.12.0.ebuild 3282 BLAKE2B bb43db7464ae007cb3d4ad0eadb010d65578949c7e37e8bc7b83e7a14ea144a2ad2946ca8d79c3f31262ec17d6b9571d8ad975e76aff88a063d78c98f1a83945 SHA512 80fe1c4d212da95346fef45881f1eeab1ad1b0ccce413b8f127f384e426549abad30f07842041b9d43bae984e6e06410ac6f2091f81e3d25aeb4757b7b3087fa
+DIST konqueror-19.12.1.tar.xz 7383336 BLAKE2B 1465fed040b61079737d9e59449d9e7d1a0f48699257916c03d4c73b8ca556efabcfbb9db5aeb5752ddbe47e395aed2d0d77407a5caf10d5256ff8b53f224fbf SHA512 1f6718f4d7b00b07c7fdecf699ff269f6b2e2a3b404a0d7b386adc09a6a2b31ebaf1b0dd411acc70060560a61ca5a796433b3098066f7de7536fc34cde4757ec
+EBUILD konqueror-19.08.3.ebuild 3297 BLAKE2B f2c50fb3e8fbbb33220d2a0fca19acb618e6a94d6703ff6f1e3fbab936fa96b7da854cee5d822da43d52cd9d101f8db13640e461985bc415d200651e95dc75c0 SHA512 1d00c84028b43257390284500aeb7cc01f9b223987d047cf64a64d302c59e5c7c681383b77a0390ec944beac76ac6b34e4927ee1cff7792299c3199059a31148
+EBUILD konqueror-19.12.1.ebuild 2945 BLAKE2B e585447b9a2aa5f5cba26e444e3738b8cd360e4eeb45cdd21edf42b54e7a3ab7f4b266227c80093587222d59afa42b4eb75f4713da1796d27fcc320804375a24 SHA512 0ff6acc982116d3f2f162037bd1cae6aa61ac8b20b66e0d7c31220004f9f92ac8a37b3ab1b16c3b480f06cc8e99079d2e9b8beb819adb01655b320dff287d655
 MISC metadata.xml 518 BLAKE2B 4b7859d0edb6e15cf4b14e7d7092ab3cf48214f6895bef94476920440a072aa1dce619bb9e1ba6c0f848fb261faa08f1ec425e39dfd734238648274ed91157a8 SHA512 675012d4e94393e9bec06325f0551253dd70a26f4328b37403170dd6f705fb33bc2ae87c63dbd5c659827619b22038fa3921112ec7643c775302681e3573c0d2
diff --git a/kde-apps/konqueror/konqueror-19.08.3.ebuild b/kde-apps/konqueror/konqueror-19.08.3.ebuild
index 57da29eb84eb..fbf41c362937 100644
--- a/kde-apps/konqueror/konqueror-19.08.3.ebuild
+++ b/kde-apps/konqueror/konqueror-19.08.3.ebuild
@@ -82,10 +82,10 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package activities KF5Activities)
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-		$(cmake-utils_use_find_package tidy LibTidy)
-		$(cmake-utils_use_find_package X X11)
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package speech Qt5TextToSpeech)
+		$(cmake_use_find_package tidy LibTidy)
+		$(cmake_use_find_package X X11)
 	)
 	ecm_src_configure
 }
diff --git a/kde-apps/konqueror/konqueror-19.12.0.ebuild b/kde-apps/konqueror/konqueror-19.12.1.ebuild
index 5c5b4e85515d..911b8ea7556c 100644
--- a/kde-apps/konqueror/konqueror-19.12.0.ebuild
+++ b/kde-apps/konqueror/konqueror-19.12.1.ebuild
@@ -1,13 +1,11 @@
-# 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"
-PVCUT=$(ver_cut 1-3)
 KFMIN=5.63.0
-PLASMA_MINIMAL=5.16.5
 QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
 inherit flag-o-matic ecm kde.org
@@ -18,12 +16,17 @@ 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 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
@@ -49,33 +52,21 @@ 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
 }
 
@@ -83,7 +74,6 @@ src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package activities KF5Activities)
 		$(cmake_use_find_package speech Qt5TextToSpeech)
-		$(cmake_use_find_package tidy LibTidy)
 		$(cmake_use_find_package X X11)
 	)
 	ecm_src_configure