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

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index edac7a79ecd1b435c6a997c99496ab7ad6e93645..284a24290871315d796a87f11743942cfb8c3ff0 100644 (file)
--- 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 928dc6072c5b1631cd3b86553c157fb10a1faf42..2d63015382b37ec038aa3b1f2ff59324547477c5 100644 (file)
--- 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