From fc637fb28da700da71ec2064d65ca5a7a31b9c6c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 18 Aug 2019 18:16:17 +0100
Subject: gentoo resync : 18.08.2019

---
 eclass/kde5.eclass | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

(limited to 'eclass/kde5.eclass')

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index a7a08f97a5e2..347182b23316 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -62,12 +62,6 @@ EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_
 # be set depending on the value of CATEGORY.
 : ${KDE_AUTODEPS:=true}
 
-# @ECLASS-VARIABLE: KDE_BLOCK_SLOT4
-# @DESCRIPTION:
-# This variable only has any effect when when CATEGORY = "kde-apps" and
-# KDE_AUTODEPS is also set. If set to "true", add RDEPEND block on kde-apps/${PN}:4
-: ${KDE_BLOCK_SLOT4:=true}
-
 # @ECLASS-VARIABLE: KDE_DEBUG
 # @DESCRIPTION:
 # If set to "false", add -DNDEBUG (via cmake-utils_src_configure) and -DQT_NO_DEBUG
@@ -295,6 +289,7 @@ _calculate_src_uri() {
 
 	case ${PN} in
 		kdelibs4support | \
+		kdewebkit | \
 		khtml | \
 		kjs | \
 		kjsembed | \
@@ -302,9 +297,6 @@ _calculate_src_uri() {
 		kross)
 			_kmname="portingAids/${_kmname}"
 			;;
-		kdewebkit)
-			[[ ${PV} = 5.57.0 ]] || _kmname="portingAids/${_kmname}"
-			;;
 	esac
 
 	case ${CATEGORY} in
@@ -678,17 +670,6 @@ kde5_src_install() {
 
 	cmake-utils_src_install
 
-	# We don't want QCH and tags files to be compressed, because then
-	# cmake can't find the tags and qthelp viewers can't find the docs
-	local p=$(best_version dev-qt/qtcore:5)
-	local pv=$(echo ${p/%-r[0-9]*/} | rev | cut -d - -f 1 | rev)
-	if [[ ${pv} = 5.11* ]]; then
-		#todo: clean up trailing slash check when EAPI <7 is removed
-		if [[ -d ${ED%/}/usr/share/doc/qt-${pv} ]]; then
-			docompress -x /usr/share/doc/qt-${pv}
-		fi
-	fi
-
 	if [[ ${EAPI} = 6 ]]; then
 		# We don't want /usr/share/doc/HTML to be compressed,
 		# because then khelpcenter can't find the docs
-- 
cgit v1.2.3