[gentoo-commits] proj/kde-sunset:master commit in: eclass/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     b0c6bf7aaef17b9f7e5d2359cd0cc831b34f38a4
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jun 30 08:23:04 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 30 08:45:02 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=b0c6bf7a

kde4-base.eclass: Remove kdelibs conditionals, no longer inherits kde4-base

 eclass/kde4-base.eclass | 46 ++++++++++++++++++++--------------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 5a9a49c..d8e922e 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -360,25 +360,23 @@ kdecommondepend="
 "
 unset qtcoreuse
 
-if [[ ${PN} != kdelibs ]]; then
-	[[ -n ${kdelibsuse} ]] && kdelibsuse="[${kdelibsuse}]"
-	kdecommondepend+=" kde-frameworks/kdelibs:4${kdelibsuse}"
-	if [[ ${KDEBASE} = kdevelop ]]; then
-		if [[ ${PN} != kdevplatform ]]; then
-			# @ECLASS-VARIABLE: KDEVPLATFORM_REQUIRED
-			# @DESCRIPTION:
-			# Specifies whether kdevplatform is required. Possible values are 'always' (default) and 'never'.
-			# Applies to KDEBASE=kdevelop only.
-			KDEVPLATFORM_REQUIRED="${KDEVPLATFORM_REQUIRED:-always}"
-			case ${KDEVPLATFORM_REQUIRED} in
-				always)
-					kdecommondepend+="
-						>=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}:4
-					"
-					;;
-				*) ;;
-			esac
-		fi
+[[ -n ${kdelibsuse} ]] && kdelibsuse="[${kdelibsuse}]"
+kdecommondepend+=" kde-frameworks/kdelibs:4${kdelibsuse}"
+if [[ ${KDEBASE} = kdevelop ]]; then
+	if [[ ${PN} != kdevplatform ]]; then
+		# @ECLASS-VARIABLE: KDEVPLATFORM_REQUIRED
+		# @DESCRIPTION:
+		# Specifies whether kdevplatform is required. Possible values are 'always' (default) and 'never'.
+		# Applies to KDEBASE=kdevelop only.
+		KDEVPLATFORM_REQUIRED="${KDEVPLATFORM_REQUIRED:-always}"
+		case ${KDEVPLATFORM_REQUIRED} in
+			always)
+				kdecommondepend+="
+					>=dev-util/kdevplatform-${KDEVPLATFORM_VERSION}:4
+				"
+				;;
+			*) ;;
+		esac
 	fi
 fi
 unset kdelibsuse
@@ -421,12 +419,12 @@ kdehandbookrdepend="
 case ${KDE_HANDBOOK} in
 	always)
 		kdedepend+=" ${kdehandbookdepend}"
-		[[ ${PN} != kdelibs ]] && kderdepend+=" ${kdehandbookrdepend}"
+		kderdepend+=" ${kdehandbookrdepend}"
 		;;
 	optional)
 		IUSE+=" +handbook"
 		kdedepend+=" handbook? ( ${kdehandbookdepend} )"
-		[[ ${PN} != kdelibs ]] && kderdepend+=" handbook? ( ${kdehandbookrdepend} )"
+		kderdepend+=" handbook? ( ${kdehandbookrdepend} )"
 		;;
 	*) ;;
 esac
@@ -720,10 +718,9 @@ kde4-base_src_prepare() {
 
 	# Enable/disable handbooks for kde4-base packages
 	# kde4-l10n inherits kde4-base but is metapackage, so no check for doc
-	# kdelibs inherits kde4-base but handle installing the handbook itself
 	if ! has kde4-meta ${INHERITED} && in_iuse handbook; then
 		if [[ ${KDEBASE} == kde-base ]]; then
-			if [[ ${PN} != kde4-l10n && ${PN} != kdepim-l10n && ${PN} != kdelibs ]] && use !handbook; then
+			if [[ ${PN} != kde4-l10n && ${PN} != kdepim-l10n ]] && use !handbook; then
 				# documentation in kde4-functions
 				: ${KDE_DOC_DIRS:=doc}
 				local dir
@@ -786,9 +783,6 @@ kde4-base_src_configure() {
 		append-cppflags -DQT_NO_DEBUG
 	fi
 
-	# Set distribution name
-	[[ ${PN} = kdelibs ]] && cmakeargs+=(-DKDE_DISTRIBUTION_TEXT=Gentoo)
-
 	# Here we set the install prefix
 	tc-is-cross-compiler || cmakeargs+=(-DCMAKE_INSTALL_PREFIX="${EPREFIX}${PREFIX}")