From: Maciej Mrozowski <reavertm@gentoo.org>
Date: Mon, 17 May 2010 01:16:39 +0000 (+0000)
Subject: Improve automatic misc documentation files installation (README's, ChangeLogs, etc)
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7d8311b2faf005f794e36115d1a19bee6a99aa7d;p=gentoo.git

Improve automatic misc documentation files installation (README's, ChangeLogs, etc)
---

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index edac7a79ecd1..284a24290871 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.61 2010/05/15 15:19:04 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.62 2010/05/17 01:16:39 reavertm Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -725,19 +725,12 @@ kde4-base_src_install() {
 	# Install common documentation of KDE4 applications
 	local doc
 	if ! has kde4-meta ${INHERITED}; then
-		for doc in AUTHORS ChangeLog* README* NEWS TODO HACKING; do
-			[[ -s "${S}/${doc}" ]] && dodoc "${doc}"
+		for doc in "${S}"/{AUTHORS,CHANGELOG,ChangeLog*,README*,NEWS,TODO,HACKING}; do
+			[[ -s "${doc}" ]] && dodoc "${doc}"
+		done
+		for doc in "${S}"/*/{AUTHORS,CHANGELOG,ChangeLog*,README*,NEWS,TODO,HACKING}; do
+			[[ -s "${doc}" ]] && newdoc "${doc}" "$(basename $(dirname ${doc})).$(basename ${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
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 928dc6072c5b..2d63015382b3 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.36 2010/05/15 16:51:46 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.37 2010/05/17 01:16:39 reavertm Exp $
 #
 # @ECLASS: kde4-meta.eclass
 # @MAINTAINER:
@@ -711,10 +711,10 @@ kde4-meta_src_test() {
 kde4-meta_src_install() {
 	debug-print-function $FUNCNAME "$@"
 
-	# Search ${S}/${KMMODULE} and install any "AUTHORS ChangeLog* README* NEWS TODO HACKING" found
+	# Search ${S}/${KMMODULE} and install common documentation files found
 	local doc
-	for doc in AUTHORS ChangeLog* README* NEWS TODO HACKING; do
-		[[ -s "${S}/${KMMODULE}/${doc}" ]] && dodoc "${S}/${KMMODULE}/${doc}"
+	for doc in "${S}/${KMMODULE}"/{AUTHORS,CHANGELOG,ChangeLog*,README*,NEWS,TODO,HACKING}; do
+		[[ -s "${doc}" ]] && dodoc "${doc}"
 	done
 
 	kde4-base_src_install