[gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass kde4-functions.eclass kde4-meta.eclass

[Tomas Chvatal (scarabeus)]

scarabeus    09/03/01 11:44:09

  Modified:             kde4-base.eclass kde4-functions.eclass
                        kde4-meta.eclass
  Log:
  Update kde4 eclasses. Was in testing for month now so hope all problems squashed. Resolves some annoying issues and enhance deps.

Revision  Changes    Path
1.30                 eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?r1=1.29&r2=1.30

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- kde4-base.eclass	10 Feb 2009 20:07:24 -0000	1.29
+++ kde4-base.eclass	1 Mar 2009 11:44:09 -0000	1.30
@@ -1,6 +1,6 @@
-# Copyright 2007-2008 Gentoo Foundation
+# Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.29 2009/02/10 20:07:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.30 2009/03/01 11:44:09 scarabeus Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -16,7 +16,7 @@
 inherit base cmake-utils eutils multilib kde4-functions
 
 get_build_type
-if [[ $BUILD_TYPE = live ]]; then
+if [[ ${BUILD_TYPE} = live ]]; then
 	inherit subversion
 fi
 
@@ -59,15 +59,36 @@
 }
 kde4-base_set_qt_dependencies
 
-# Set the cmake dependencies
-# Quite a few packages fail with cmake-2.4 even for KDE 4.1, so we just require 2.6.2
-CMAKEDEPEND=">=dev-util/cmake-2.6.2"
+# Xorg
+COMMONDEPEND="${COMMONDEPEND}
+	>=x11-base/xorg-server-1.5.2
+"
+
+# X11 libs
+COMMONDEPEND="${COMMONDEPEND}
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXxf86vm
+"
+
+# localization deps 
+# DISABLED UNTIL PMS decide correct approach :(
+if [[ -n ${KDE_LINGUAS} ]]; then
+	LNG_DEP=""
+	for _lng in ${KDE_LINGUAS}; do
+		# there must be or due to issue if lingua is not present in kde-l10n so
+		# it wont die but pick kde-l10n as-is.
+		LNG_DEP="${LNG_DEP}
+			|| ( kde-base/kde-l10n[linguas_${_lng},kdeprefix=] kde-base/kde-l10n[kdeprefix=] )"
+	done
+fi
 
-# Set the common dependencies
-DEPEND="${DEPEND} ${COMMONDEPEND} ${CMAKEDEPEND}
+# Set common dependencies for all ebuilds that inherit this eclass
+DEPEND="${DEPEND} ${COMMONDEPEND}
+	>=dev-util/cmake-2.6.2
 	dev-util/pkgconfig
-	x11-libs/libXt
-	x11-proto/xf86vidmodeproto"
+	>=sys-apps/sandbox-1.3.2
+"
 RDEPEND="${RDEPEND} ${COMMONDEPEND}"
 
 if [[ $BUILD_TYPE = live ]]; then
@@ -137,7 +158,7 @@
 # @CODE
 # Note: default minimal version is kde-4.1, which means that the apps will work
 # with any KDE version >=${KDE_MINIMAL}
-KDE_MINIMAL="${KDE_MINIMAL:=4.1}"
+KDE_MINIMAL="${KDE_MINIMAL:=4.2}"
 export KDE_MINIMAL
 
 # FIXME: the code section, explanation of live. The last sentence needs other
@@ -166,7 +187,7 @@
 	latest)
 		if [[ $KDEBASE = kde-base ]]; then
 			case ${PV} in
-				4.2.6*)
+				4.3* | 4.2.9* | 4.2.8* | 4.2.7* | 4.2.6*)
 					_kdedir="4.3"
 					_pv="-${PV}:4.3"
 					_pvn="-${PV}"
@@ -198,7 +219,7 @@
 					;;
 				*)
 					die "NEED_KDE=latest not supported for PV=${PV}" ;;
-				esac
+			esac
 			_operator=">="
 		else
 			# this creates dependency on any version of kde4
@@ -216,7 +237,7 @@
 		_pvn="-${NEED_KDE}"
 		export NEED_KDE="live"
 		;;
-	4.2.6*)
+	4.3 | 4.2.9* | 4.2.8* | 4.2.7* | 4.2.6*)
 		_kdedir="4.3"
 		_pv="-${NEED_KDE}:4.3"
 		_pvn="-${NEED_KDE}"
@@ -258,10 +279,9 @@
 esac
 
 if [[ ${NEED_KDE} != none ]]; then
-
 	#Set the SLOT
-	if [[ -n $KDEBASE ]]; then
-		if [[ $NEED_KDE = live ]]; then
+	if [[ -n ${KDEBASE} ]]; then
+		if [[ ${NEED_KDE} = live ]]; then
 			SLOT="live"
 		else
 			case ${KMNAME} in
@@ -286,12 +306,13 @@
 				*)
 					case ${PV} in
 						9999*) SLOT="live" ;;
+						4.3* | 4.2.9* | 4.2.8* | 4.2.7* | 4.2.6*) SLOT="4.3" ;;
 						4.2* | 4.1.9* | 4.1.8* | 4.1.7* | 4.1.6*) SLOT="4.2" ;;
 						4.1* | 4.0.9* | 4.0.8*) SLOT="4.1" ;;
 						*) SLOT="4.1" ;;
 					esac
 					;;
-				esac
+			esac
 		fi
 	fi
 
@@ -309,21 +330,21 @@
 
 	# Adding kdelibs, kdepimlibs and kdebase-data deps to all other packages.
 	# We only need to add the dependencies if ${PN} is not "kdelibs" or "kdepimlibs"
-	if [[ $PN != kdelibs ]]; then
+	if [[ ${PN} != kdelibs ]]; then
 		DEPEND="${DEPEND}
 				kdeprefix? ( ${_operator}kde-base/kdelibs${_pv}[kdeprefix] )
 				!kdeprefix? ( ${_operator}kde-base/kdelibs${_pvn}[-kdeprefix] )"
 		RDEPEND="${RDEPEND}
 				kdeprefix? ( ${_operator}kde-base/kdelibs${_pv}[kdeprefix] )
 				!kdeprefix? ( ${_operator}kde-base/kdelibs${_pvn}[-kdeprefix] )"
-		if [[ $PN != kdepimlibs ]]; then
+		if [[ ${PN} != kdepimlibs ]]; then
 			DEPEND="${DEPEND}
 				kdeprefix? ( ${_operator}kde-base/kdepimlibs${_pv}[kdeprefix] )
 				!kdeprefix? ( ${_operator}kde-base/kdepimlibs${_pvn}[-kdeprefix] )"
 			RDEPEND="${RDEPEND}
 				kdeprefix? ( ${_operator}kde-base/kdepimlibs${_pv}[kdeprefix] )
 				!kdeprefix? ( ${_operator}kde-base/kdepimlibs${_pvn}[-kdeprefix] )"
-			if [[ $PN != kdebase-data ]]; then
+			if [[ ${PN} != kdebase-data ]]; then
 				RDEPEND="${RDEPEND}
 					kdeprefix? ( ${_operator}kde-base/kdebase-data${_pv}[kdeprefix] )
 					!kdeprefix? ( ${_operator}kde-base/kdebase-data${_pvn}[-kdeprefix] )"
@@ -335,11 +356,12 @@
 
 # Fetch section - If the ebuild's category is not 'kde-base' and if it is not a
 # koffice ebuild, the URI should be set in the ebuild itself
-case ${SLOT} in
+case ${BUILD_TYPE} in
 	live)
+		SRC_URI=""
 		ESVN_MIRROR=${ESVN_MIRROR:=svn://anonsvn.kde.org/home/kde}
 		# Split ebuild, or extragear stuff
-		if [[ -n $KMNAME ]]; then
+		if [[ -n ${KMNAME} ]]; then
 		    ESVN_PROJECT="${KMNAME}"
 			if [[ -z ${KMNOMODULE} && -z ${KMMODULE} ]]; then
 				KMMODULE="${PN}"
@@ -347,31 +369,22 @@
 			# Split kde-base/ ebuilds: (they reside in trunk/KDE)
 			case ${KMNAME} in
 				kdebase-*)
-					ESVN_REPO_URI="${ESVN_MIRROR}/trunk/KDE/kdebase/${KMNAME#kdebase-}/"
+					ESVN_REPO_URI="${ESVN_MIRROR}/trunk/KDE/kdebase/${KMNAME#kdebase-}"
 					;;
 				kdereview)
-					ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}/${KMMODULE}/"
+					ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}/${KMMODULE}"
 					;;
 				kde*)
 					ESVN_REPO_URI="${ESVN_MIRROR}/trunk/KDE/${KMNAME}"
 					;;
 				extragear*|playground*)
-					case ${PN} in
-						*-plasma)
-							ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}/${KMMODULE}/"
-							ESVN_PROJECT="${KMNAME}/${KMMODULE}/"
-							;;
-						*)
-							ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}/${KMMODULE}/"
-							;;
-					esac
-				;;
+					ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}/${KMMODULE}"
+					;;
 				koffice)
 					ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}"
 					;;
 				*)
-					# Extragear material
-					ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}/${KMMODULE}/"
+					ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}/${KMMODULE}"
 					;;
 			esac
 		else
@@ -383,9 +396,14 @@
 		ESVN_UP_FREQ=${ESVN_UP_FREQ:-1}
 		;;
 	*)
-		if [[ -n $KDEBASE ]]; then
+		if [[ -n ${KDEBASE} ]]; then
 			if [[ -n ${KMNAME} ]]; then
-				_kmname=${KMNAME}
+				case ${KMNAME} in
+					kdebase-apps)
+						_kmname="kdebase" ;;
+					*)
+						_kmname=${KMNAME} ;;
+				esac
 			else
 				_kmname=${PN}
 			fi
@@ -394,11 +412,7 @@
 			case ${KDEBASE} in
 				kde-base)
 					case ${PV} in
-						4.2.60)
-							SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.svn912032tar.bz2" ;;
-						4.2.61)
-							SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.svn917530.tar.bz2" ;;
-						4.1.9* | 4.1.8* | 4.1.7* | 4.1.6* | 4.0.9* | 4.0.8*)
+						4.2.6* | 4.1.9* | 4.1.8* | 4.1.7* | 4.1.6* | 4.0.9* | 4.0.8*)
 							SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2" ;;
 						*)	SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.bz2" ;;
 					esac
@@ -408,8 +422,8 @@
 				;;
 			esac
 			fi
-				unset _kmname _kmname_pv
-			fi
+			unset _kmname _kmname_pv
+		fi
 		;;
 esac
 
@@ -432,14 +446,14 @@
 # errors and die if any required flags listed in $QT4_BUILT_WITH_USE_CHECK or
 # $KDE4_BUILT_WITH_USE_CHECK are missing.
 kde4-base_pkg_setup() {
-	debug-print-function $FUNCNAME "$@"
+	debug-print-function ${FUNCNAME} "$@"
 
 	# Don't set KDEHOME during compile, it will cause access violations
 	unset KDEHOME
 
 	# Search for best suitable kde installation for misc kde package.
 	# Computation based on NEED_KDE and KDE_MINIMAL
-	[[ ${NEED_KDE} = latest || ${NEED_KDE} = none ]] && get_latest_kdedir
+	[[ ${KDEBASE} != kde-base ]] && [[ ${NEED_KDE} = latest || ${NEED_KDE} = none ]] && get_latest_kdedir
 
 	# Set PREFIX
 	if use kdeprefix; then
@@ -451,7 +465,7 @@
 	fi
 	# Set the prefix based on KDEDIR
 	# Make it a consequence of kdeprefix
-	PREFIX=$KDEDIR
+	PREFIX=${KDEDIR}
 
 	unset _kdedir
 
@@ -459,7 +473,7 @@
 	[[ -n ${QT4_BUILT_WITH_USE_CHECK} || -n ${KDE4_BUILT_WITH_USE_CHECK[@]} ]] && \
 		die "built_with_use illegal in this EAPI!"
 
-	if [[ $BUILD_TYPE = live && -z $I_KNOW_WHAT_I_AM_DOING ]]; then
+	if [[ ${BUILD_TYPE} = live && -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
 		echo
 		elog "WARNING! This is an experimental live ebuild of ${KMNAME:-${PN}}"
 		elog "Use it at your own risk."
@@ -471,30 +485,14 @@
 # @FUNCTION: kde4-base_src_unpack
 # @DESCRIPTION:
 # This function unpacks the source tarballs for KDE4 applications.
-#
-# If no argument is passed to this function, then standard src_unpack is
-# executed. Otherwise, options are passed to base_src_unpack.
 kde4-base_src_unpack() {
-	debug-print-function $FUNCNAME "$@"
+	debug-print-function ${FUNCNAME} "$@"
 
-	if [[ $BUILD_TYPE = live ]]; then
+	if [[ ${BUILD_TYPE} = live ]]; then
 		migrate_store_dir
 		subversion_src_unpack
 	else
-		[[ -z $KDE_S ]] && KDE_S="${S}"
-		if [[ -z $* ]]; then
-			# Unpack first and deal with KDE patches after examing possible patch sets.
-			# To be picked up, patches need to conform to the guidelines stated before.
-			# Monolithic ebuilds will use the split ebuild patches.
-			[[ -d "${KDE_S}" ]] || unpack ${A}
-		fi
-		# Updated cmake dir
-		if [[ -d "${WORKDIR}/cmake" && -d "${KDE_S}/cmake" ]]; then
-			ebegin "Updating cmake/ directory..."
-			rm -rf "${KDE_S}/cmake" || die "Unable to remove old cmake/ directory"
-			ln -s "${WORKDIR}/cmake" "${KDE_S}/cmake" || die "Unable to symlink the new cmake/ directory"
-			eend 0
-		fi
+		base_src_unpack
 	fi
 }
 
@@ -507,7 +505,7 @@
 	debug-print-function ${FUNCNAME} "$@"
 
 	# Only enable selected languages, used for KDE extragear apps.
-	if [[ -n $KDE_LINGUAS ]]; then
+	if [[ -n ${KDE_LINGUAS} ]]; then
 		enable_selected_linguas
 	fi
 
@@ -515,12 +513,12 @@
 	base_src_prepare
 
 	# Save library dependencies
-	if [[ -n $KMSAVELIBS ]] ; then
+	if [[ -n ${KMSAVELIBS} ]] ; then
 		save_library_dependencies
 	fi
 
 	# Inject library dependencies
-	if [[ -n $KMLOADLIBS ]] ; then
+	if [[ -n ${KMLOADLIBS} ]] ; then
 		load_library_dependencies
 	fi
 }
@@ -549,7 +547,7 @@
 	mycmakeargs="${mycmakeargs} -DKDE4_BUILD_TESTS=OFF"
 
 	# Set distribution name
-	[[ $PN = kdelibs ]] && mycmakeargs="${mycmakeargs} -DKDE_DISTRIBUTION_TEXT=Gentoo"
+	[[ ${PN} = kdelibs ]] && mycmakeargs="${mycmakeargs} -DKDE_DISTRIBUTION_TEXT=Gentoo"
 
 	# runpath linking
 	mycmakeargs="${mycmakeargs} -DKDE4_USE_ALWAYS_FULL_RPATH=ON"
@@ -562,26 +560,22 @@
 
 	# Set environment
 	QTEST_COLORED=1
-	QT_PLUGIN_PATH=${KDEDIR}/$(get_libdir)/kde4/plugins/
+	QT_PLUGIN_PATH="${KDEDIR}/$(get_libdir)/kde4/plugins/"
 
-	# hardcode path to *.cmake KDE files
+	# Hardcode path to *.pc KDE files
 	export PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+${PKG_CONFIG_PATH}:}${KDEDIR}/$(get_libdir)/pkgconfig"
 
-	# additonal arguments for KOFFICE
-	if [[ $KMNAME = koffice ]]; then
-		case ${PN} in
-			koffice-data) : ;;
-			*)
-				mycmakeargs="${mycmakeargs}
-					-DWITH_OpenEXR=ON
-					$(cmake-utils_use_with crypt QCA2)
-					$(cmake-utils_use_with opengl OpenGL)"
-				if use crypt; then
-					mycmakeargs="${mycmakeargs}
-						-DQCA2_LIBRARIES=/usr/$(get_libdir)/qca2/libqca.so.2"
-				fi
-				;;
-		esac
+	# Override some environment variables
+	PATH="${KDEDIR}/bin:${PATH}"
+	LDPATH="${KDEDIR}/$(get_libdir):${LDPATH}"
+
+	# Set cmake prefixes to allow buildsystem to localize valid KDE installation when more are present
+	if use kdeprefix; then
+		mycmakeargs="${mycmakeargs}
+			-DCMAKE_SYSTEM_INCLUDE_PATH=${KDEDIR}/include
+			-DCMAKE_SYSTEM_LIBRARY_PATH=${KDEDIR}/$(get_libdir)
+			-DCMAKE_SYSTEM_PREFIX_PATH=${KDEDIR}
+			-DCMAKE_SYSTEM_PROGRAM_PATH=${KDEDIR}/bin"
 	fi
 
 	[ -e CMakeLists.txt ] && cmake-utils_src_configure
@@ -604,7 +598,7 @@
 	debug-print-function ${FUNCNAME} "$@"
 
 	if [[ -d "$WORKDIR/${PN}_build" ]]; then
-		pushd "${WORKDIR}"/${PN}_build > /dev/null
+		pushd "${WORKDIR}/${PN}_build" > /dev/null
 	fi
 	[ -e [Mm]akefile ] && cmake-utils_src_make "$@"
 }
@@ -617,7 +611,8 @@
 
 	# Override this value, set in kde4-base_src_configure()
 	mycmakeargs="${mycmakeargs} -DKDE4_BUILD_TESTS=ON"
-	cmake-utils_src_compile
+	cmake-utils_src_configure
+	kde4-base_src_compile
 
 	cmake-utils_src_test
 }
@@ -628,13 +623,13 @@
 kde4-base_src_install() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	if [[ -n $KMSAVELIBS ]] ; then
+	if [[ -n ${KMSAVELIBS} ]] ; then
 		install_library_dependencies
 	fi
 
 	kde4-base_src_make_doc
 	if [[ -d "$WORKDIR/${PN}_build" ]]; then
-		pushd "${WORKDIR}"/${PN}_build > /dev/null
+		pushd "${WORKDIR}/${PN}_build" > /dev/null
 	fi
 	[ -e [Mm]akefile ] && cmake-utils_src_install
 }
@@ -647,12 +642,12 @@
 
 	local doc
 	for doc in AUTHORS ChangeLog* README* NEWS TODO; do
-		[[ -s $doc ]] && dodoc ${doc}
+		[[ -s ${doc} ]] && dodoc ${doc}
 	done
 
-	if [[ -z $KMNAME ]]; then
+	if [[ -z ${KMNAME} ]]; then
 		for doc in {apps,runtime,workspace,.}/*/{AUTHORS,README*}; do
-			if [[ -s $doc ]]; then
+			if [[ -s ${doc} ]]; then
 				local doc_complete=${doc}
 				doc="${doc#*/}"
 				newdoc "$doc_complete" "${doc%/*}.${doc##*/}"
@@ -663,7 +658,7 @@
 	if [[ -n ${KDEBASE} && -d "${D}/usr/share/doc/${PF}" ]]; then
 		# work around bug #97196
 		dodir /usr/share/doc/kde && \
-			mv "${D}"/usr/share/doc/${PF} "${D}"/usr/share/doc/kde/ || \
+			mv "${D}/usr/share/doc/${PF}" "${D}"/usr/share/doc/kde/ || \
 			die "Failed to move docs to kde/ failed."
 	fi
 }
@@ -672,6 +667,8 @@
 # @DESCRIPTION:
 # Function to rebuild the KDE System Configuration Cache after an application has been installed.
 kde4-base_pkg_postinst() {
+	debug-print-function ${FUNCNAME} "$@"
+
 	buildsycoca
 }
 
@@ -679,5 +676,7 @@
 # @DESCRIPTION:
 # Function to rebuild the KDE System Configuration Cache after an application has been removed.
 kde4-base_pkg_postrm() {
+	debug-print-function ${FUNCNAME} "$@"
+
 	buildsycoca
 }



1.13                 eclass/kde4-functions.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-functions.eclass?r1=1.12&r2=1.13

Index: kde4-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kde4-functions.eclass	10 Feb 2009 20:07:24 -0000	1.12
+++ kde4-functions.eclass	1 Mar 2009 11:44:09 -0000	1.13
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.12 2009/02/10 20:07:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.13 2009/03/01 11:44:09 scarabeus Exp $
 
 # @ECLASS: kde4-functions.eclass
 # @MAINTAINER:
@@ -38,7 +38,7 @@
 # @DESCRIPTION:
 # The slots used by all KDE versions later than 4.0. The live-ebuilds use
 # KDE_LIVE_SLOTS instead.
-KDE_SLOTS=( kde-4 4.1 4.2 )
+KDE_SLOTS=( kde-4 4.1 4.2 4.3 )
 
 # @ECLASS-VARIABLE: KDE_LIVE_SLOTS
 # @DESCRIPTION:
@@ -64,7 +64,7 @@
 
 		ebegin "Running kbuildsycoca4 to build global database"
 		# This is needed because we support multiple kde versions installed together.
-		XDG_DATA_DIRS="/usr/share:${KDEDIRS//:/\/share:}/share:/usr/local/share" \
+		XDG_DATA_DIRS="/usr/share:${KDEDIR}/share:/usr/local/share" \
 			DISPLAY="" DBUS_SESSION_BUS_ADDRESS="" \
 			${KDEDIR}/bin/kbuildsycoca4 --global --noincremental &> /dev/null
 		eend $?
@@ -102,14 +102,6 @@
 # but this default can be overridden by defining KDE_LINGUAS_DIR.
 enable_selected_linguas() {
 	local lingua sr_mess wp
-	# inform user about kde-l10n for full translation.
-	if ! has_version kde-base/kde-l10n; then
-		echo
-		elog "For fully translated application you should also emerge"
-		elog "kde-base/kde-l10n package which ships translated kde core"
-		elog "strings."
-		echo
-	fi
 
 	# ebuild overridable linguas directory definition
 	KDE_LINGUAS_DIR=${KDE_LINGUAS_DIR:=${S}/po}
@@ -150,63 +142,6 @@
 	done
 }
 
-# @FUNCTION: koffice_fix_libraries
-# @DESCRIPTION:
-# replace the weird koffice lib search with hardcoded one, so it
-# actually builds and works.
-koffice_fix_libraries() {
-	local LIB_ARRAY R_QT_kostore R_BAS_kostore R_BAS_koodf R_KROSS_kokross R_QT_komain
-	local R_CMS_pigmentcms R_BAS_pigmentcms R_BAS_koresources R_BAS_flake R_BAS_koguiutils
-	local R_BAS_kopageapp R_BAS_kotext R_BAS_kowmf libname R
-	case ${PN} in
-		koffice-data|koffice-libs)
-			;;
-		*)
-			### basic array
-			LIB_ARRAY="kostore koodf kokross komain pigmentcms koresources flake koguiutils kopageapp kotext kowmf"
-			### dep array
-			R_QT_kostore="\"/usr/$(get_libdir)/qt4/libQtCore.so\"
-				\"/usr/$(get_libdir)/qt4/libQtXml.so\"
-				\"${KDEDIR}/$(get_libdir)/libkdecore.so\""
-			R_BAS_kostore="libkostore ${R_QT_kostore}"
-			R_BAS_koodf="libkoodf ${R_BAS_kostore}"
-			R_KROSS_kokross="
-				\"${KDEDIR}/$(get_libdir)/libkrossui.so\"
-				\"${KDEDIR}/$(get_libdir)/libkrosscore.so\""
-			R_BAS_kokross="libkokross ${R_BAS_koodf} ${R_KROSS_kokross}"
-			R_QT_komain="\"/usr/$(get_libdir)/qt4/libQtGui.so\""
-			R_BAS_komain="libkomain ${R_BAS_koodf} ${R_QT_komain}"
-			R_CMS_pigmentcms="\"/usr/$(get_libdir)/liblcms.so\""
-			R_BAS_pigmentcms="libpigmentcms ${R_BAS_komain} ${R_CMS_pigmentcms}"
-			R_BAS_koresources="libkoresources ${R_BAS_pigmentcms}"
-			R_BAS_flake="libflake ${R_BAS_pigmentcms}"
-			R_BAS_koguiutils="libkoguiutils libkoresources libflake ${R_BAS_pigmentcms}"
-			R_BAS_kopageapp="libkopageapp ${R_BAS_koguitls}"
-			R_BAS_kotext="libkotext libkoresources libflake ${R_BAS_pigmentcms}"
-			### additional unmentioned stuff
-			R_BAS_kowmf="libkowmf"
-			for libname in ${LIB_ARRAY}; do
-				ebegin "Fixing library ${libname} with hardcoded path"
-				for libpath in $(eval "echo \$R_BAS_${libname}"); do
-					if [[ "${libpath}" != "\"/usr/"* ]]; then
-						R="${R} \"${KDEDIR}/$(get_libdir)/${libpath}.so\""
-					else
-						R="${R} ${libpath}"
-					fi
-				done
-				find "${S}" -name CMakeLists.txt -print| xargs -i \
-					sed -i \
-						-e "s: ${libname} : ${R} :g" \
-						-e "s: ${libname}): ${R}):g" \
-						-e "s:(${libname} :(${R} :g" \
-						-e "s:(${libname}):(${R}):g" \
-						-e "s: ${libname}$: ${R}:g" \
-					{} || die "Fixing library names failed."
-				eend $?
-			done
-			;;
-	esac
-}
 # @FUNCTION: get_build_type
 # @DESCRIPTION:
 # Determine whether we are using live ebuild or tbzs.
@@ -229,16 +164,16 @@
 	case ${KDE_WANTED} in
 		# note this will need to be updated as stable moves and so on
 		live)
-			_versions="9999 4.1.69 4.1.0"
+			_versions="9999 4.2.61 4.2.0 4.1.0"
 			;;
 		snapshot)
-			_versions="4.1.69 4.1.0 9999"
+			_versions="4.2.61 4.2.0 4.1.0 9999"
 			;;
 		testing)
-			_versions="4.1.0 4.1.69 9999"
+			_versions="4.2.0 4.1.0 4.2.61 9999"
 			;;
 		stable)
-			_versions="4.1.0 4.1.69 9999"
+			_versions="4.2.0 4.1.0 4.1.61 9999"
 			;;
 		*) die "KDE_WANTED=${KDE_WANTED} not supported here." ;;
 	esac
@@ -252,7 +187,11 @@
 					_kdedir="live"
 					break
 				;;
-				4.1.69)
+				4.3.0 | 4.2.61)
+					_kdedir="4.3"
+					break
+				;;
+				4.2.0 | 4.1.61)
 					_kdedir="4.2"
 					break
 				;;
@@ -263,6 +202,8 @@
 			esac
 		fi
 	done
+
+	debug-print-function ${FUNCNAME} "$@" "KDE_WANTED=${KDE_WANTED} -> _kdedir=${_kdedir}"
 }
 
 # @FUNCTION: migrate_store_dir



1.11                 eclass/kde4-meta.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.eclass?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.eclass?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-meta.eclass?r1=1.10&r2=1.11

Index: kde4-meta.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kde4-meta.eclass	12 Jan 2009 19:40:34 -0000	1.10
+++ kde4-meta.eclass	1 Mar 2009 11:44:09 -0000	1.11
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.10 2009/01/12 19:40:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.11 2009/03/01 11:44:09 scarabeus Exp $
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
@@ -12,17 +12,6 @@
 # You must define KMNAME to use this eclass, and do so before inheriting it. All other variables are optional.
 # Do not include the same item in more than one of KMMODULE, KMMEXTRA, KMCOMPILEONLY, KMEXTRACTONLY.
 
-# we want opengl optional in each koffice package
-if [[ $KMNAME = koffice ]]; then
-	case ${PN} in
-		koffice-data)
-			;;
-		*)
-			OPENGL_REQUIRED=optional
-			;;
-	esac
-fi
-
 inherit kde4-base versionator
 
 EXPORT_FUNCTIONS pkg_setup src_unpack src_prepare src_configure src_compile src_test src_install pkg_postinst pkg_postrm
@@ -51,25 +40,26 @@
 	kdepim)
 		DEPEND="${DEPEND} dev-libs/boost app-office/akonadi-server"
 		RDEPEND="${RDEPEND} dev-libs/boost"
-		if [[ $PN != kode ]]; then
-			DEPEND="${DEPEND} >=kde-base/kode-${PV}:${SLOT}"
-			RDEPEND="${RDEPEND} >=kde-base/kode-${PV}:${SLOT}"
+		if [[ ${PN} != kode ]]; then
+			DEPEND="${DEPEND} >=kde-base/kode-${PV}:${SLOT}[kdeprefix=]"
+			RDEPEND="${RDEPEND} >=kde-base/kode-${PV}:${SLOT}[kdeprefix=]"
 		fi
 		case ${PN} in
 			akregator|kaddressbook|kjots|kmail|kmobiletools|knode|knotes|korganizer|ktimetracker)
 				IUSE="+kontact"
-				DEPEND="${DEPEND} kontact? ( >=kde-base/kontactinterfaces-${PV}:${SLOT} )"
-				RDEPEND="${RDEPEND} kontact? ( >=kde-base/kontactinterfaces-${PV}:${SLOT} )"
+				DEPEND="${DEPEND} kontact? ( >=kde-base/kontactinterfaces-${PV}:${SLOT}[kdeprefix=] )"
+				RDEPEND="${RDEPEND} kontact? ( >=kde-base/kontactinterfaces-${PV}:${SLOT}[kdeprefix=] )"
 				;;
 		esac
 		;;
 	kdegames)
-		if [[ $PN != libkdegames ]]; then
-			DEPEND="${DEPEND} >=kde-base/libkdegames-${PV}:${SLOT}"
-			RDEPEND="${RDEPEND} >=kde-base/libkdegames-${PV}:${SLOT}"
+		if [[ ${PN} != libkdegames ]]; then
+			DEPEND="${DEPEND} >=kde-base/libkdegames-${PV}:${SLOT}[kdeprefix=]"
+			RDEPEND="${RDEPEND} >=kde-base/libkdegames-${PV}:${SLOT}[kdeprefix=]"
 		fi
 		;;
 	koffice)
+		[[ ${PN} != koffice-data ]] && IUSE="debug"
 		case ${PV} in
 			9999*) DEPEND="${DEPEND} !app-office/${PN}:2" ;;
 			1.9*|2*) DEPEND="${DEPEND} !app-office/${PN}:live" ;;
@@ -84,12 +74,18 @@
 				RDEPEND="${RDEPEND} media-libs/lcms"
 				;;
 			*)
-				IUSE="+crypt"
-				DEPEND="${DEPEND} crypt? ( >=app-crypt/qca-2 )"
-				RDEPEND="${RDEPEND} crypt? ( >=app-crypt/qca-2 )"
-				if [[ $PN != koffice-libs ]]; then
-					DEPEND="${DEPEND} >=app-office/koffice-libs-${PV}:${SLOT}"
-					RDEPEND="${RDEPEND} >=app-office/koffice-libs-${PV}:${SLOT}"
+				DEPEND="${DEPEND}
+					dev-cpp/eigen:2
+					media-gfx/imagemagick[openexr?]
+					media-libs/fontconfig
+					media-libs/freetype:2
+				"
+				RDEPEND="${DEPEND}"
+				if [[ ${PN} != koffice-libs && ${PN} != koffice-data ]]; then
+					DEPEND="${DEPEND}
+					>=app-office/koffice-libs-${PV}:${SLOT}[kdeprefix=]"
+					RDEPEND="${RDEPEND}
+					>=app-office/koffice-libs-${PV}:${SLOT}[kdeprefix=]"
 				fi
 				;;
 		esac
@@ -99,6 +95,17 @@
 debug-print "line ${LINENO} ${ECLASS}: DEPEND ${DEPEND} - after metapackage-specific dependencies"
 debug-print "line ${LINENO} ${ECLASS}: RDEPEND ${RDEPEND} - after metapackage-specific dependencies"
 
+# Useful to build kde4-meta style stuff from extragear/playground (plasmoids etc)
+case ${SLOT} in
+	live)
+		case ${KMNAME} in
+			extragear*|playground*)
+				ESVN_REPO_URI="${ESVN_MIRROR}/trunk/${KMNAME}"
+				;;
+		esac
+		;;
+esac
+
 # @ECLASS-VARIABLE: KMNAME
 # @DESCRIPTION:
 # Name of the parent-module (e.g. kdebase, kdepim, ...). You _must_ set it
@@ -120,8 +127,8 @@
 # Example usage: If you're installing subdirectories of a package, like plugins,
 # you mark the top subdirectory (containing the package) as $KMEXTRACTONLY, and
 # set KMNOMODULE="true".
-if [[ -z $KMMODULE && $KMNOMODULE != true  ]]; then
-	KMMODULE=$PN
+if [[ -z ${KMMODULE} && ${KMNOMODULE} != true  ]]; then
+	KMMODULE=${PN}
 fi
 
 # @ECLASS-VARIABLE: KMEXTRA
@@ -153,6 +160,8 @@
 # Currently just calls its equivalent in kde4-base.eclass(5). Use this one in
 # split ebuilds.
 kde4-meta_pkg_setup() {
+	debug-print-function ${FUNCNAME} "$@"
+
 	kde4-base_pkg_setup
 }
 
@@ -161,10 +170,11 @@
 # This function unpacks the source for split ebuilds. See also
 # kde4-meta-src_extract.
 kde4-meta_src_unpack() {
-	debug-print-function  ${FUNCNAME} "$@"
-	if [[ $BUILD_TYPE = live ]]; then
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${BUILD_TYPE} = live ]]; then
 		migrate_store_dir
-		S="${WORKDIR}/${PN}-${PV}"
+		S="${WORKDIR}/${P}"
 		mkdir -p "${S}"
 		ESVN_RESTRICT="export" subversion_src_unpack
 		subversion_wc_info
@@ -183,7 +193,9 @@
 # Also see KMMODULE, KMNOMODULE, KMEXTRA, KMCOMPILEONLY, KMEXTRACTONLY and
 # KMTARPARAMS.
 kde4-meta_src_extract() {
-	if [[ $BUILD_TYPE = live ]]; then
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${BUILD_TYPE} = live ]]; then
 		local rsync_options subdir kmnamedir targetdir
 		# Export working copy to ${S}
 		einfo "Exporting parts of working copy to ${S}"
@@ -211,12 +223,13 @@
 					|| die "${ESVN}: can't export subdirectory '${subdir}' to '${S}/${targetdir}'."
 		done
 
-		if [[ $KMNAME = kdebase-runtime && $PN != kdebase-data ]]; then
+		if [[ ${KMNAME} = kdebase-runtime && ${PN} != kdebase-data ]]; then
 			sed -i -e '/^install(PROGRAMS[[:space:]]*[^[:space:]]*\/kde4[[:space:]]/s/^/#DONOTINSTALL /' \
 				"${S}"/CMakeLists.txt || die "Sed to exclude bin/kde4 failed"
 		fi
 	else
-		local abort tarball tarfile f extractlist
+		local abort tarball tarfile f extractlist moduleprefix
+
 		case $KMNAME in
 			kdebase-apps)
 				tarball="${KMNAME#-apps}-${PV}.tar.bz2"
@@ -225,7 +238,7 @@
 				tarball="${KMNAME}-${PV}.tar.bz2"
 				;;
 		esac
-		tarfile="${DISTDIR}"/${tarball}
+		tarfile="${DISTDIR}/${tarball}"
 
 		ebegin "Unpacking parts of ${tarball} to ${WORKDIR}"
 
@@ -240,30 +253,28 @@
 		KMTARPARAMS="${KMTARPARAMS} -j"
 
 		pushd "${WORKDIR}" > /dev/null
-		[[ -n ${KDE4_STRICTER} ]] && echo tar -xpf $tarfile $KMTARPARAMS $extractlist >&2
-		tar -xpf $tarfile $KMTARPARAMS $extractlist 2> /dev/null
+		[[ -n ${KDE4_STRICTER} ]] && echo tar -xpf "${tarfile}" ${KMTARPARAMS} ${extractlist} >&2
+		tar -xpf "${tarfile}" ${KMTARPARAMS} ${extractlist} 2> /dev/null
 
-		# Default $S is based on $P; rename the extracted directory to match $S
+		# Default $S is based on $P; rename the extracted directory to match $S if necessary
 		mv ${KMNAME}-${PV} ${P} || die "Died while moving \"${KMNAME}-${PV}\" to \"${P}\""
 
 		popd > /dev/null
 
 		eend $?
 
+		# We need to clear it here to make verification below work
+		unset moduleprefix
+
 		if [[ -n ${KDE4_STRICTER} ]]; then
 			for f in $(__list_needed_subdirectories fatal); do
-				if [[ ! -e ${S}/${f#*/} ]]; then
+				if [[ ! -e "${S}/${f#*/}" ]]; then
 					eerror "'${f#*/}' is missing"
 					abort=true
 				fi
 			done
 			[[ -n ${abort} ]] && die "There were missing files."
 		fi
-		kde4-base_src_unpack
-	fi
-	# fix koffice linking
-	if [[ $KMNAME = koffice ]]; then
-		koffice_fix_libraries
 	fi
 }
 
@@ -305,17 +316,11 @@
 				ConfigureChecks.cmake
 				config-workspace.h.cmake
 				config-X11.h.cmake
-				startkde.cmake"
-			case ${SLOT} in
-				4.2)
-					KMEXTRACTONLY="${KMEXTRACTONLY}
-						KDE4WorkspaceConfig.cmake.in"
-					;;
-				*) : ;;
-			esac
+				startkde.cmake
+				KDE4WorkspaceConfig.cmake.in"
 			;;
 		kdegames)
-			if [[ ${PN} != "libkdegames" ]]; then
+			if [[ ${PN} != libkdegames ]]; then
 				KMEXTRACTONLY="${KMEXTRACTONLY}
 					libkdegames"
 			fi
@@ -337,20 +342,6 @@
 				config-openexr.h.cmake
 				config-opengl.h.cmake
 				config-prefix.h.cmake"
-			case ${PN} in
-				koffice-libs|koffice-data)
-					;;
-				*)
-					# add basic extract for all packages
-					KMEXTRACTONLY="${KMEXTRACTONLY}
-						filters/
-						libs/
-						plugins/"
-					if [[ ${PN} != "kplato" ]]; then
-						KMEXTRA="${KMEXTRA} filters/${PN}"
-					fi
-					;;
-			esac
 			;;
 	esac
 	# Don't install cmake modules for split ebuilds, to avoid collisions.
@@ -388,12 +379,12 @@
 	done
 
 	# Expand KMMODULE
-	if [[ -n $KMMODULE  ]]; then
+	if [[ -n ${KMMODULE} ]]; then
 		kmmodule_expanded="${KMMODULE}"
 		j=$(dirname ${KMMODULE})
 		while [[ ${j} != "." ]]; do
-			kmmodule_expanded="${kmmodule_expanded} $j/CMakeLists.txt";
-			j=$(dirname $j)
+			kmmodule_expanded="${kmmodule_expanded} ${j}/CMakeLists.txt";
+			j=$(dirname ${j})
 		done
 	fi
 
@@ -411,17 +402,16 @@
 	debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME} - kmmodule_expanded:  ${kmmodule_expanded}"
 	debug-print "line ${LINENO} ${ECLASS} ${FUNCNAME} - kmcompileonly_expanded: ${kmcompileonly_expanded}"
 
-
 	case ${PV} in
 		scm|9999*) : ;;
 		*) topdir="${KMNAME}-${PV}/" ;;
 	esac
-
 	# Create final list of stuff to extract
+	# We append topleveldir only when specified (usually for tarballs)
 	for i in ${kmmodule_expanded} ${kmextra_expanded} ${kmcompileonly_expanded} \
 		${KMEXTRACTONLY}
 	do
-		extractlist="${extractlist} ${topdir}${i}"
+		extractlist="${extractlist} ${topdir}${moduleprefix}${i}"
 	done
 
 	echo ${extractlist}
@@ -460,7 +450,7 @@
 # @FUNCTION: kde4-meta_change_cmakelists
 # @DESCRIPTION:
 kde4-meta_change_cmakelists() {
-	debug-print-function  ${FUNCNAME} "$@"
+	debug-print-function ${FUNCNAME} "$@"
 
 	pushd "${S}" > /dev/null
 
@@ -526,23 +516,21 @@
 			# COLLISION PROTECT section
 			# Install the startkde script just once, as a part of kde-base/kdebase-startkde,
 			# not as a part of every package.
-			if [[ ${PN} != "kdebase-startkde" && -f "${S}"/CMakeLists.txt ]]; then
+			if [[ ${PN} != kdebase-startkde && -f "${S}"/CMakeLists.txt ]]; then
 				# The startkde script moved to kdebase-workspace for KDE4 versions > 3.93.0.
 				sed -i -e '/startkde/s/^/#DONOTINSTALL /' "${S}"/CMakeLists.txt || \
 					die "${LINENO}: sed died in the kdebase-startkde collision prevention section"
 			fi
 			# Strip EXPORT feature section from workspace for KDE4 versions > 4.1.82
-			if [[ ${SLOT} == 4.2 ]] || [[ ${PV} == 9999 ]]; then
-				if [[ ${PN} != libkworkspace ]]; then
-					sed -i -e '/install(FILES ${CMAKE_CURRENT_BINARY_DIR}\/KDE4WorkspaceConfig.cmake/,/^[[:space:]]*FILE KDE4WorkspaceLibraryTargets.cmake )[[:space:]]*^/d' \
-						CMakeLists.txt || die "${LINENO}: sed died in kdebase-workspace strip EXPORT section"
-				fi
+			if [[ ${PN} != libkworkspace ]]; then
+				sed -i -e '/install(FILES ${CMAKE_CURRENT_BINARY_DIR}\/KDE4WorkspaceConfig.cmake/,/^[[:space:]]*FILE KDE4WorkspaceLibraryTargets.cmake )[[:space:]]*^/d' \
+					CMakeLists.txt || die "${LINENO}: sed died in kdebase-workspace strip EXPORT section"
 			fi
 			;;
 		kdebase-runtime)
 			# COLLISION PROTECT section
 			# Only install the kde4 script as part of kde-base/kdebase-data
-			if [[ ${PN} != "kdebase-data" && -f "${S}"/CMakeLists.txt ]]; then
+			if [[ ${PN} != kdebase-data && -f "${S}"/CMakeLists.txt ]]; then
 				sed -i -e '/^install(PROGRAMS[[:space:]]*[^[:space:]]*\/kde4[[:space:]]/s/^/#DONOTINSTALL /' \
 					"${S}"/CMakeLists.txt || die "Sed to exclude bin/kde4 failed"
 			fi
@@ -556,6 +544,16 @@
 				;;
 			esac
 			;;
+		koffice)
+			# prevent collisions
+			if [[ ${PN} != koffice-data ]]; then
+				sed -i -e '/install(.*FindKOfficeLibs.cmake/,/)/ d' \
+					"${S}"/cmake/modules/CMakeLists.txt || \
+					die "${LINENO}: sed died in collision prevention section"
+				sed -i -n -e '1h;1!H;${g;s/install(.\+config-openexr.h.\+)//;p}' \
+					"${S}"/CMakeLists.txt || \
+					die "${LINENO}: sed died in collision prevention section"
+			fi
 	esac
 
 	popd > /dev/null
@@ -566,7 +564,7 @@
 # Currently just calls its equivalent in kde4-base.eclass(5). Use this one in split
 # ebuilds.
 kde4-meta_src_configure() {
-	debug-print-function  ${FUNCNAME} "$@"
+	debug-print-function ${FUNCNAME} "$@"
 
 	kde4-base_src_configure
 }
@@ -576,7 +574,7 @@
 # General function for compiling split KDE4 applications.
 # Overrides kde4-base_src_compile.
 kde4-meta_src_compile() {
-	debug-print-function  ${FUNCNAME} "$@"
+	debug-print-function ${FUNCNAME} "$@"
 
 	kde4-base_src_make
 }
@@ -603,12 +601,6 @@
 	if [[ -n ${KMSAVELIBS} ]]; then
 		install_library_dependencies
 	fi
-
-	# remove unvanted koffice stuff
-	if [[ $KMNAME = koffice && $PN != koffice-data ]]; then
-		rm "$D/$KDEDIR/include/config-openexr.h"
-		rm "$D/$KDEDIR/share/apps/cmake/modules/FindKOfficeLibs.cmake"
-	fi
 }
 
 # @FUNCTION: kde4-meta_src_make_doc
@@ -616,11 +608,11 @@
 # This function searches in ${S}/${KMMODULE},
 # and tries to install "AUTHORS ChangeLog* README* NEWS todo" if these files exist.
 kde4-meta_src_make_doc() {
-	debug-print-function  $FUNCNAME "$@"
+	debug-print-function ${FUNCNAME} "$@"
 
 	local doc
 	for doc in AUTHORS ChangeLog* README* NEWS TODO; do
-		[[ -s ${KMMODULE}/$doc ]] && newdoc "${KMMODULE}/${doc}" "${doc}.${KMMODULE##*/}"
+		[[ -s ${KMMODULE}/${doc} ]] && newdoc "${KMMODULE}/${doc}" "${doc}.${KMMODULE##*/}"
 	done
 
 	kde4-base_src_make_doc
@@ -631,6 +623,8 @@
 # Currently just calls its equivalent in kde4-base.eclass(5). Use this in split
 # ebuilds.
 kde4-meta_pkg_postinst() {
+	debug-print-function ${FUNCNAME} "$@"
+
 	kde4-base_pkg_postinst
 }
 
@@ -639,6 +633,7 @@
 # Currently just calls its equivalent in kde4-base.eclass(5). Use this in split
 # ebuilds.
 kde4-meta_pkg_postrm() {
+	debug-print-function ${FUNCNAME} "$@"
+
 	kde4-base_pkg_postrm
 }
-