gentoo resync : 08.08.2018

3 files changed, 2 insertions, 108 deletions

diff --git a/kde-apps/konqueror/Manifest b/kde-apps/konqueror/Manifest
index caca5a8e31cc..dcd562f7a245 100644
--- a/kde-apps/konqueror/Manifest
+++ b/kde-apps/konqueror/Manifest
@@ -1,5 +1,3 @@
-DIST konqueror-17.12.3.tar.xz 7720068 BLAKE2B 803f1ea753764be169339e48f490f4e379eaeeec1ab048fca8fc75c82a0b952b9f1e1a3b0cd1f40f35f7412d51f1b8c909526c03676b8e946acebcfeb060296e SHA512 12d3b33b8d437e8f20bd329281c3b03600bc15d2ebbb85016b79d9f5da002f88f2906cc982bc3e5c94d8a9511880ee0155e6ac800e7186ad8368620b3ab5ff92
 DIST konqueror-18.04.3.tar.xz 7694900 BLAKE2B fa20f95abee369084796785b622056b759c3acf11f6feee597a0ac788c9d64740283f6bb4e45150b2eb52f4de8689f1e66d3c4f3cf1e8f6d50ead6eae8900e16 SHA512 c55c0bf0f97c5ecaa73c7c56e2fd236642620b9256ef6f7dc3bd922b8d590e33c2524ea154d8308fc9dac9196e5cac3bf08d109565afa756ee6d54264ee4ab3b
-EBUILD konqueror-17.12.3.ebuild 2782 BLAKE2B 356f538e8b789972345c451b56226ba2c8f14bf998f6e4e314a54047a9b1af2aea560b9abc39e43bb7471fbe5e4e53cce56c520a3dc521cb2b9c25022dd8854b SHA512 7c918eb59c79a1aa283ad7b9fa0d237c0fe68af5a4397002934db635cbcf2e4abbcb99a2c0f2c7ca6d7efcd52840605213be9730f2b96a779ca9d46ee0d591df
-EBUILD konqueror-18.04.3.ebuild 2999 BLAKE2B 3bda63da5a2be533765bfc786cc2a93db051495d0be1b9113348f27714def34d206f0fb65f727eae9c908dba3f24f6f942b1ff005ab2bfca3729502321ed6b4a SHA512 ac8b1f55dbbef8684a002500013c037b5615cde9e7c6f30ba5d925910d1fa8e7b13a9e9669f9da67ce5de8f28e574cb4b51ede413bd8a7dd4a4ec24182862177
+EBUILD konqueror-18.04.3-r1.ebuild 2995 BLAKE2B 4c5f270217b06f782ef1930aa9c14f6bc52b189d860207e7ef0acf86a2edaceca9a581519e1892aba73e438f703e17d629ee7f556fee0a965de77858efe4ed5c SHA512 8b7016e5b2f365b18269c6df9195768f30250a2111072a05791ff9f74b845f7a6e82ebc5cfceb199d55664d119182e6c2e160c815cabf60d2b22a0cf151d9f0b
 MISC metadata.xml 518 BLAKE2B 4b7859d0edb6e15cf4b14e7d7092ab3cf48214f6895bef94476920440a072aa1dce619bb9e1ba6c0f848fb261faa08f1ec425e39dfd734238648274ed91157a8 SHA512 675012d4e94393e9bec06325f0551253dd70a26f4328b37403170dd6f705fb33bc2ae87c63dbd5c659827619b22038fa3921112ec7643c775302681e3573c0d2
diff --git a/kde-apps/konqueror/konqueror-17.12.3.ebuild b/kde-apps/konqueror/konqueror-17.12.3.ebuild
deleted file mode 100644
index 676cbcd92950..000000000000
--- a/kde-apps/konqueror/konqueror-17.12.3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 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 kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	sys-libs/zlib
-	speech? ( $(add_qt_dep qtspeech) )
-	tidy? ( app-text/htmltidy )
-	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)
-	!kde-apps/kfmclient:4
-	!kde-apps/konq-plugins
-	!kde-apps/libkonq:5
-"
-
-src_prepare() {
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
-
-	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.04.3.ebuild b/kde-apps/konqueror/konqueror-18.04.3-r1.ebuild
index 377dba24af65..fa56ec002dee 100644
--- a/kde-apps/konqueror/konqueror-18.04.3.ebuild
+++ b/kde-apps/konqueror/konqueror-18.04.3-r1.ebuild
@@ -71,7 +71,7 @@ src_prepare() {
 
 	if ! use webengine; then
 		punt_bogus_dep Qt5 WebEngineWidgets
-		cmake_comment_add_subdirectory webenginepartexit
+		cmake_comment_add_subdirectory webenginepart
 	fi
 
 	kde5_src_prepare