[eclass/kde4-base,kde4-meta] Fix installation of README's and such

Fix installation of README's and other misc files:
- for kde4-base packages (including kdelibs) - behaviour unchanched, just add HACKING
- for kde4-meta packages - actually install KMMODULE/${docs}, do not install toplevel README's (they do not provide any package specific meaningful info)

2 files changed, 20 insertions, 34 deletions

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 00a2509460c..6a575189f3e 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -662,30 +662,25 @@ kde4-base_src_install() {
 		install_library_dependencies
 	fi
 
-	kde4-base_src_make_doc
-	cmake-utils_src_install
-}
-
-# @FUNCTION: kde4-base_src_make_doc
-# @DESCRIPTION:
-# Function for installing the documentation of KDE4 applications.
-kde4-base_src_make_doc() {
-	debug-print-function ${FUNCNAME} "$@"
-
+	# Install common documentation of KDE4 applications
 	local doc
-	for doc in AUTHORS ChangeLog* README* NEWS TODO; do
-		[[ -s ${doc} ]] && dodoc ${doc}
-	done
-
-	if [[ -z ${KMNAME} ]]; then
-		for doc in {apps,runtime,workspace,.}/*/{AUTHORS,README*}; do
-			if [[ -s ${doc} ]]; then
-				local doc_complete=${doc}
-				doc="${doc#*/}"
-				newdoc "$doc_complete" "${doc%/*}.${doc##*/}"
-			fi
+	if ! has kde4-meta ${INHERITED}; then
+		for doc in AUTHORS ChangeLog* README* NEWS TODO HACKING; do
+			[[ -s "${S}/${doc}" ]] && dodoc "${doc}"
 		done
+		# kdelibs, kdepimlibs
+		if [[ -z ${KMNAME} ]]; then
+			for doc in "${S}"/*/{AUTHORS,ChangeLog*,README*,NEWS,TODO,HACKING}; do
+				if [[ -s "${S}/${doc}" ]]; then
+					local doc_complete=${doc}
+					doc="${doc#*/}"
+					newdoc "$doc_complete" "${doc%/*}.${doc##*/}"
+				fi
+			done
+		fi
 	fi
+
+	cmake-utils_src_install
 }
 
 # @FUNCTION: kde4-base_pkg_postinst
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index cfbe9243b32..0c21345cb38 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -711,22 +711,13 @@ kde4-meta_src_test() {
 kde4-meta_src_install() {
 	debug-print-function $FUNCNAME "$@"
 
-	kde4-base_src_install
-}
-
-# @FUNCTION: kde4-meta_src_make_doc
-# @DESCRIPTION:
-# 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} "$@"
-
+	# Search ${S}/${KMMODULE} and install any "AUTHORS ChangeLog* README* NEWS TODO HACKING" found
 	local doc
-	for doc in AUTHORS ChangeLog* README* NEWS TODO; do
-		[[ -s ${KMMODULE}/${doc} ]] && newdoc "${KMMODULE}/${doc}" "${doc}.${KMMODULE##*/}"
+	for doc in AUTHORS ChangeLog* README* NEWS TODO HACKING; do
+		[[ -s "${S}/${KMMODULE}/${doc}" ]] && dodoc "${S}/${KMMODULE}/${doc}"
 	done
 
-	kde4-base_src_make_doc
+	kde4-base_src_install
 }
 
 # @FUNCTION: kde4-meta_pkg_postinst