gentoo resync : 18.11.2019

3 files changed, 118 insertions, 112 deletions

diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index ee883a3e8c9a..18fd9185c617 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,5 +1,5 @@
 DIST konqueror-19.04.3.tar.xz 7578812 BLAKE2B 370ae99b1662cb3f548027718f4bf97d58bcab61f252fccafe2dce518543e90cf37f182d5025350405e2c9d120dac391f79a10051791f6f26a4b660659db8d1a SHA512 ac04f601ddcf711e70298a7af72aba6fd2b72510d62f0337f3df7422a09cc16235b624ce32e6cfab8c1768b8cc6fce9275529705fc73c07d6e83b725a51a5372
-DIST konqueror-19.08.2.tar.xz 7610208 BLAKE2B 44a5f1e4b13c03e4413d100d72b0a3ba7cd1691d4a14ed29f59f2dbfa621ee1889e531f259f618bff171595dcd9b7169c4e74fc9d9f28f1530f1193020c413b5 SHA512 0c1035082716c20232ddcf5c28b0ebdc61225beb4ac604c58e035b7212610f8e94bbabe4e1f8d2c2fcbbcc16a8037d6da6651a08cbfb04a729209aaa27180ac7
+DIST konqueror-19.08.3.tar.xz 7604888 BLAKE2B c66ebcdaffc0b3e502ce4b9bdd981cfd732d37dc7973f6f4f48b5a2a3ced98f55e9c14af699599d4dbb22d398999b899e89adbed72106fd2b8612e93cc682baa SHA512 ea2416fdcc102b41302635964983bf27945e49d53b237479f1cbe7d81a781671884c4e020295dc92d84e2eb14e7a503d0f994ba509eaf4372b8f2c63ae450728
 EBUILD konqueror-19.04.3.ebuild 2990 BLAKE2B 5bc4eb968b821345b21dc1f4af0f41a563ea8dc62098ea9607da8e507d266619c3e020db6dff8dd807b54e6a2b2dcbe52b5c5d585b54853192a8241b11e23075 SHA512 9321a9d6bfd7910e88bfef46a2f782240ceb3d2d92bf4608b616af381f651e05fce739eca787a517c426a4f14eba745d55c36939adf2c3750071fa0aa25ff222
-EBUILD konqueror-19.08.2.ebuild 2993 BLAKE2B 1931af494e8f39ab6e5f419c51ff2f6faf7864f5e70a46b62589090d11cd9b1b8a2ac80e271a364513194407bef0a39e676d2deea2c975fa5189b6540fc21531 SHA512 ff04c09e151e3aacffa5f3734ae411a56650bdeb8191e98956415dd6f25f0a058b98f74fa27b300ad61b7d2b56d6d86387836da22857b612c1d09a2396852afc
+EBUILD konqueror-19.08.3.ebuild 3324 BLAKE2B a6f7d7e26ae70fc9ebba6318c0e9632b3033409898b83ce009a2bd23e178e319e77e6d8f545e4fc3517506119826df7df1886665cb3de97ba4614956c62f418d SHA512 aee4d451a7cd6f0f7c0f77c65295de95074710d2f788dc561ca92662f5976bb993bbd21a6696adc8fcac272162f1ead4df575bebf2f3a5872bcc1750882d353e
 MISC metadata.xml 518 BLAKE2B 4b7859d0edb6e15cf4b14e7d7092ab3cf48214f6895bef94476920440a072aa1dce619bb9e1ba6c0f848fb261faa08f1ec425e39dfd734238648274ed91157a8 SHA512 675012d4e94393e9bec06325f0551253dd70a26f4328b37403170dd6f705fb33bc2ae87c63dbd5c659827619b22038fa3921112ec7643c775302681e3573c0d2
diff --git a/kde-apps/konqueror/konqueror-19.08.2.ebuild b/kde-apps/konqueror/konqueror-19.08.2.ebuild
deleted file mode 100644
index 1e545b7f4b1c..000000000000
--- a/kde-apps/konqueror/konqueror-19.08.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit flag-o-matic kde5
-
-DESCRIPTION="Web browser and file manager based on KDE Frameworks"
-HOMEPAGE="
-	https://kde.org/applications/internet/konqueror/
-	https://konqueror.org/
-"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="activities speech tidy +webengine X"
-# 4 of 4 tests fail. Last checked for 4.0.3
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kdesu)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	sys-libs/zlib
-	speech? ( $(add_qt_dep qtspeech) )
-	tidy? ( app-text/tidy-html5 )
-	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
-	X? ( $(add_qt_dep qtx11extras) )
-"
-DEPEND="${COMMON_DEPEND}
-	activities? ( $(add_frameworks_dep kactivities) )
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kfind)
-	$(add_plasma_dep kde-cli-tools)
-	!webengine? ( kde-misc/kwebkitpart:5 )
-"
-
-src_prepare() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
-
-	if ! use webengine; then
-		punt_bogus_dep Qt5 WebEngineWidgets
-		cmake_comment_add_subdirectory webenginepart
-	fi
-
-	kde5_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)
-	)
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
-			elog "For bookmarks support, install keditbookmarks:"
-			elog "kde-apps/keditbookmarks:${SLOT}"
-		fi
-
-		if ! has_version kde-apps/dolphin:${SLOT} ; then
-			elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
-			elog "kde-apps/dolphin:${SLOT}"
-		fi
-
-		if ! has_version kde-apps/svg:${SLOT} ; then
-			elog "For konqueror to view SVGs, install the svg kpart:"
-			elog "kde-apps/svgpart:${SLOT}"
-		fi
-
-		if ! has_version virtual/jre ; then
-			elog "To use Java on webpages install virtual/jre."
-		fi
-	fi
-}
diff --git a/kde-apps/konqueror/konqueror-19.08.3.ebuild b/kde-apps/konqueror/konqueror-19.08.3.ebuild
new file mode 100644
index 000000000000..b65450437434
--- /dev/null
+++ b/kde-apps/konqueror/konqueror-19.08.3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 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
+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/
+"
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="activities speech tidy +webengine X"
+# 4 of 4 tests fail. Last checked for 4.0.3
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5
+	>=kde-frameworks/kdesu-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/khtml-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=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 )
+"
+
+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
+}
+
+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)
+	)
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
+			elog "For bookmarks support, install keditbookmarks:"
+			elog "kde-apps/keditbookmarks:${SLOT}"
+		fi
+
+		if ! has_version kde-apps/dolphin:${SLOT} ; then
+			elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
+			elog "kde-apps/dolphin:${SLOT}"
+		fi
+
+		if ! has_version kde-apps/svg:${SLOT} ; then
+			elog "For konqueror to view SVGs, install the svg kpart:"
+			elog "kde-apps/svgpart:${SLOT}"
+		fi
+
+		if ! has_version virtual/jre ; then
+			elog "To use Java on webpages install virtual/jre."
+		fi
+	fi
+}