Sync kde4-*.eclass from kde overlay: add x11-libs/qt-dbus to kde dependencies, eqawarn on ${mycmakeargs} as string, properly treat case of undefined LINGUAS (bug 372457)

5 files changed, 22 insertions, 12 deletions

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 681ba9ec5873..0ac4455ebd0e 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.243 2012/05/08 21:27:10 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.244 2012/05/08 22:00:49 dilfridge Exp $
+
+  08 May 2012; Andreas K. Huettel <dilfridge@gentoo.org> kde4-base.eclass,
+  kde4-functions.eclass, kde4-meta.eclass, kde4-meta-pkg.eclass:
+  Sync kde4-*.eclass from kde overlay: add x11-libs/qt-dbus to kde
+  dependencies, eqawarn on ${mycmakeargs} as string, properly treat case of
+  undefined LINGUAS (bug 372457)
 
   08 May 2012; Andreas K. Huettel <dilfridge@gentoo.org> cmake-utils.eclass:
   Update cmake-utils.eclass from kde overlay: make builds verbose by default,
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 95ede35250fa..407371048173 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.115 2012/05/02 18:31:42 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.116 2012/05/08 22:00:49 dilfridge Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -292,6 +292,7 @@ unset cppuintdepend
 kdecommondepend="
 	dev-lang/perl
 	>=x11-libs/qt-core-${QT_MINIMAL}:4[qt3support,ssl]
+	>=x11-libs/qt-dbus-${QT_MINIMAL}:4
 	>=x11-libs/qt-gui-${QT_MINIMAL}:4[accessibility,dbus]
 	>=x11-libs/qt-qt3support-${QT_MINIMAL}:4[accessibility]
 	>=x11-libs/qt-script-${QT_MINIMAL}:4
@@ -774,6 +775,9 @@ kde4-base_src_configure() {
 	cmakeargs+=(-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc)
 
 	if [[ $(declare -p mycmakeargs 2>&-) != "declare -a mycmakeargs="* ]]; then
+		if [[ ${mycmakeargs} ]]; then
+			eqawarn "mycmakeargs should always be declared as an array, not a string"
+		fi
 		mycmakeargs=(${mycmakeargs})
 	fi
 
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index 9ec0a818e2aa..e67d12cc528d 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.58 2011/12/18 00:00:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.59 2012/05/08 22:00:49 dilfridge Exp $
 
 inherit versionator
 
@@ -183,11 +183,6 @@ enable_selected_linguas() {
 enable_selected_doc_linguas() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	# if there is no linguas defined we enable everything
-	if ! $(env | grep -q "^LINGUAS="); then
-		return 0
-	fi
-
 	# @ECLASS-VARIABLE: KDE_DOC_DIRS
 	# @DESCRIPTION:
 	# Variable specifying whitespace separated patterns for documentation locations.
@@ -208,6 +203,11 @@ enable_selected_doc_linguas() {
 				-e "/ADD_SUBDIRECTORY[[:space:]]*([[:space:]]*${handbookdir}[[:space:]]*)/s/^/#DONOTCOMPILE /" \
 				-i CMakeLists.txt || die 'failed to comment out all handbooks'
 		else
+			# if there is no linguas defined we enable everything (i.e. comment out nothing)
+			if ! $(env | grep -q "^LINGUAS="); then
+				return 0
+			fi
+
 			# Disable subdirectories recursively
 			comment_all_add_subdirectory "${handbookdir}"
 			# Add requested translations
diff --git a/eclass/kde4-meta-pkg.eclass b/eclass/kde4-meta-pkg.eclass
index c6b4fdc32328..85ff0e1ff50c 100644
--- a/eclass/kde4-meta-pkg.eclass
+++ b/eclass/kde4-meta-pkg.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta-pkg.eclass,v 1.7 2011/07/10 17:53:37 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta-pkg.eclass,v 1.8 2012/05/08 22:00:49 dilfridge Exp $
 
 # @ECLASS: kde4-meta-pkg.eclass
 # @MAINTAINER:
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 405210d91c28..aff57c62e43f 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.63 2012/04/19 19:49:25 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.64 2012/05/08 22:00:49 dilfridge Exp $
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER: