kensington    14/07/17 13:02:11

  Modified:             ChangeLog kde4-functions.eclass
  Log:
  Fix missing handbooks when the default handbook language is en_US instead of 
the usual en.

Revision  Changes    Path
1.1322               eclass/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1322&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1322&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1321&r2=1.1322

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1321
retrieving revision 1.1322
diff -u -r1.1321 -r1.1322
--- ChangeLog   16 Jul 2014 17:18:32 -0000      1.1321
+++ ChangeLog   17 Jul 2014 13:02:11 -0000      1.1322
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1321 2014/07/16 
17:18:32 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1322 2014/07/17 
13:02:11 kensington Exp $
+
+  17 Jul 2014; Michael Palimaka <kensing...@gentoo.org> kde4-functions.eclass:
+  Fix missing handbooks when the default handbook language is en_US instead of
+  the usual en.
 
   16 Jul 2014; Johannes Huber <j...@gentoo.org> kde4-base.eclass:
   Add kde-workspace 4.11.11 SRC_URI, remove obsolete.



1.71                 eclass/kde4-functions.eclass

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.71&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?rev=1.71&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-functions.eclass?r1=1.70&r2=1.71

Index: kde4-functions.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- kde4-functions.eclass       11 Jul 2014 08:21:58 -0000      1.70
+++ kde4-functions.eclass       17 Jul 2014 13:02:11 -0000      1.71
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.70 
2014/07/11 08:21:58 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.71 
2014/07/17 13:02:11 kensington Exp $
 
 inherit versionator
 
@@ -216,6 +216,14 @@
 
                        # Disable subdirectories recursively
                        comment_all_add_subdirectory "${handbookdir}"
+
+                       # In certain packages, the default handbook is en_US 
instead of the usual en. Since there is no en_US 'translation',
+                       # it makes no sense to add to KDE_LINGUAS which causes 
this type of handbook to not be installed.
+                       if [[ -d "${handbookdir}/en_US" && ! -d 
"${handbookdir}/en" ]]; then
+                               mv "${handbookdir}/en_US" "${handbookdir}/en" 
|| die
+                               sed -e "s/en_US/en/" -i 
"${handbookdir}/CMakeLists.txt"
+                       fi
+
                        # Add requested translations
                        local lingua
                        for lingua in en ${KDE_LINGUAS}; do




Reply via email to