From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Fri, 6 Jan 2017 14:40:57 +0000 (+0100)
Subject: kde5-functions.eclass: Assume slot 5 for add_qt_dep unless defined
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=da7379a5aab71db3e13d444e7e8da7fc97d38078;p=gentoo.git

kde5-functions.eclass: Assume slot 5 for add_qt_dep unless defined

So far we relied on ${SLOT} (4|5) to depend on the correct Qt slot, but
this is not always the case. If an ebuild inherits kde5-functions and
uses add_qt_dep then it is safe to assume it will depend on Qt5.
---

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 2012c53535e2..06a7bf617fe1 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -271,14 +271,19 @@ add_qt_dep() {
 	fi
 
 	local version
+	local slot=${4}
 
 	if [[ -n ${3} ]]; then
 		version=${3}
-	elif [[ -z "${version}" ]] ; then
+	elif [[ -z "${version}" ]]; then
 		version=${QT_MINIMAL}
 	fi
 
-	_add_category_dep dev-qt "${1}" "${2}" "${version}" "${4}"
+	if [[ -z ${slot} ]]; then
+		slot="5"
+	fi
+
+	_add_category_dep dev-qt "${1}" "${2}" "${version}" "${slot}"
 }
 
 # @FUNCTION: get_kde_version