gentoo Easter resync : 12.04.2020

3 files changed, 3 insertions, 112 deletions

diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index 6f565686bc42..ceea6d946436 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,5 +1,3 @@
-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-r1.ebuild 3019 BLAKE2B 2214dd9e22a63e4d84ed917bf7fdd0921cdd908868ac05295074a9b2a65794fd60065198a481b9921adf185f66b733a3e6bc69895ab10e9bb7d7e455eaceca14 SHA512 92c5135becdee85a15430363a7e4a594e9ab46546c2bd7a5912503acf7054afed578c920060d4fb162aa8fe95e97030f84191eb24cf359d22e3ad5c82e1d87ec
-EBUILD konqueror-19.12.2.ebuild 2945 BLAKE2B e585447b9a2aa5f5cba26e444e3738b8cd360e4eeb45cdd21edf42b54e7a3ab7f4b266227c80093587222d59afa42b4eb75f4713da1796d27fcc320804375a24 SHA512 0ff6acc982116d3f2f162037bd1cae6aa61ac8b20b66e0d7c31220004f9f92ac8a37b3ab1b16c3b480f06cc8e99079d2e9b8beb819adb01655b320dff287d655
+DIST konqueror-19.12.3.tar.xz 7369676 BLAKE2B 0f36f016b3b1d556faf247574f8d9a94ca2e72e6c4d2010739179eeab0aa2c71f9970487db349dc063295b94dbd83ded57e1dae30a62c2f269350155ef1801d7 SHA512 50550af334f7b9e848f7568092b89f927053a2c421da08a40357ae3732a8663b969a3babdab764146195c83b08bccf6834ea07c67e6064262e27dc8288cef420
+EBUILD konqueror-19.12.3.ebuild 2942 BLAKE2B 5eb0611c43d36eb5622c7d18ed4e3a5746c477abfb33ebb31f851efff756cbcf4cde5e869e7a5ef6165e9414e04c123cdab9bffaf0a6bf2ac34163871bd3b252 SHA512 872260f513859eb9e09c6bfb226c318b5b79f5b8760d1efb1bb1421aac51e2e3e20429bceb285df5a3546b8bd1ed62de106076d69bbed70d30156e2019aa52bd
 MISC metadata.xml 381 BLAKE2B 79667410a7131e11432baf95c334232a6ced7438359477f6cace5f70ca28a9bb8b4e9d43c251c87614fa049a91e50b0dc7cd3b92a148d551abc84e5cfc2f63a9 SHA512 09ff944d639b46cc6f203db77821ac0c063ba08102d94c751f887a84f6daff3569a6665d7ba58c2cab32ee58454e3acb8742cc2843152c98ec355cd0af648955
diff --git a/kde-apps/konqueror/konqueror-19.08.3-r1.ebuild b/kde-apps/konqueror/konqueror-19.08.3-r1.ebuild
deleted file mode 100644
index bc0d8af44d4e..000000000000
--- a/kde-apps/konqueror/konqueror-19.08.3-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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"
-KFMIN=5.60.0
-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/org.kde.konqueror"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-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
-	>=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
-	sys-libs/zlib
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-	tidy? ( app-text/tidy-html5 )
-	X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	kde-apps/kfind:5
-	kde-plasma/kde-cli-tools:5
-"
-
-src_prepare() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
-
-	ecm_src_prepare
-}
-
-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
-}
-
-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
-}
diff --git a/kde-apps/konqueror/konqueror-19.12.2.ebuild b/kde-apps/konqueror/konqueror-19.12.3.ebuild
index 911b8ea7556c..3f19c55e5d97 100644
--- a/kde-apps/konqueror/konqueror-19.12.2.ebuild
+++ b/kde-apps/konqueror/konqueror-19.12.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kde.org/applications/internet/org.kde.konqueror"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="activities speech X"
 
 # 4 of 4 tests fail. Last checked for 4.0.3