Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

3 files changed, 117 insertions, 2 deletions

diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index 53ca70a56dca..66b21cf77595 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,4 +1,6 @@
 AUX konqueror-18.08.3-tidyhtml5.patch 1645 BLAKE2B 9c9edb5f6cf7f40bcce3764c3c778752baeb27b9df55efbba96db603be61f5a1d01257538abaa8ee44e59d13d0942fdf8afd16860018c07c9c232ec7d2538b90 SHA512 98e13b59d94b65dc163827f0b8b85ee8b4d02afa794ff5e3156a6b7ab0a996df3958fe272e766b5799daf1c5cbb746f48c520f01d6a808f0ce19925d3a95e38c
+DIST konqueror-18.08.3.tar.xz 7742624 BLAKE2B 13b4ee924a3ba1f5373c35676ac940ff446aa5d4beb34fc32b34afc80387695e270543ad720a541c249ef560dc04e87b067a7377986778348c5ffb0dcab1e8a9 SHA512 ac7f03c03e8fed6c052350654d7248c35832d8b13ab325afc7d48e1beb321c3016ff57c434e7121fedc12a9e52780390cdcbe2745c290bb52a5f2dab64a7113c
 DIST konqueror-18.12.3.tar.xz 7755872 BLAKE2B 87a6d0a506aa989fe43064c9c197f2b2dc8e521580f9ef63daa74fd2c2bf5e30ffee1dd70af092879147616331941086aaf8f6a12563b8403a60744db2be44c7 SHA512 a7cc231887af484c2bdd45f6f7ec3664aa15d799bb7715f27191d3cfbb11b135a28b5742a121608025cfc462367539389caee38f83d3f4dc75ab94fc29997830
-EBUILD konqueror-18.12.3.ebuild 3143 BLAKE2B a4396597eb255393be41a032a4ad709ee2745a28b64da07eedf4353dc0eea8229b12cf582b2f5b6b0e9e395b6fad310cb68b53cfb5d01882f38890f88adddaf5 SHA512 f25b27146228e1eb1767ae5e433bfd609f8d0054366b9e46cf55fea4ba6ae029c59da7165e1a7cdd4ed282b7c9a8c047389aa2d8f2dd05cc755dc4ad8aa3e113
+EBUILD konqueror-18.08.3-r1.ebuild 3042 BLAKE2B 8765eea7e54e670282d66e40c1339618e6dc897525772e12aff82bb2e7397e957e40a3e67bb949cf3304b765e67ba01fb94548e6e906eda65ae417649dc63da5 SHA512 60f46ee94d108bd849ee942a49e5113cb5528ea528e5baeec9d6320331845b51c70382d616b14acd30ed40f33c6907715f71f177f1704caa0c758aaadf132e47
+EBUILD konqueror-18.12.3.ebuild 3145 BLAKE2B f9ac7fc3649df224ba6c199f6e6117a75ca06044c28b270b946311c4fd583fbd2309de05a61f0e270c0e91b78bc6e1ff8ad7334ecdb967b3ccd690158cd61343 SHA512 92b589782839391b26c1632fccfefdfdd62cda180aad30b42e031b04314e118e901e2a91541d364d4cce4c735489ad537545690340d79d2779ea80e48428bc17
 MISC metadata.xml 518 BLAKE2B 4b7859d0edb6e15cf4b14e7d7092ab3cf48214f6895bef94476920440a072aa1dce619bb9e1ba6c0f848fb261faa08f1ec425e39dfd734238648274ed91157a8 SHA512 675012d4e94393e9bec06325f0551253dd70a26f4328b37403170dd6f705fb33bc2ae87c63dbd5c659827619b22038fa3921112ec7643c775302681e3573c0d2
diff --git a/kde-apps/konqueror/konqueror-18.08.3-r1.ebuild b/kde-apps/konqueror/konqueror-18.08.3-r1.ebuild
new file mode 100644
index 000000000000..a735711ee864
--- /dev/null
+++ b/kde-apps/konqueror/konqueror-18.08.3-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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://www.kde.org/applications/internet/konqueror/
+	https://konqueror.org/
+"
+KEYWORDS="amd64 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}
+	!kde-apps/kfmclient:4
+	!kde-apps/konq-plugins
+	!kde-apps/libkonq:5
+	$(add_kdeapps_dep kfind)
+	$(add_plasma_dep kde-cli-tools)
+	!webengine? ( kde-misc/kwebkitpart:5 )
+"
+
+PATCHES=( "${FILESDIR}/${P}-tidyhtml5.patch" )
+
+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 ! 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
+}
diff --git a/kde-apps/konqueror/konqueror-18.12.3.ebuild b/kde-apps/konqueror/konqueror-18.12.3.ebuild
index 87116a390c10..00084e4118e2 100644
--- a/kde-apps/konqueror/konqueror-18.12.3.ebuild
+++ b/kde-apps/konqueror/konqueror-18.12.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 	https://www.kde.org/applications/internet/konqueror/
 	https://konqueror.org/
 "
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="activities speech tidy +webengine X"
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT+=" test"