Gentoo Archives: gentoo-commits

From: "Sergey Popov (pinkbyte)" <pinkbyte@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog qt4-r2.eclass
Date: Mon, 23 Jun 2014 08:53:54
Message-Id: 20140623085348.C305D2004E@flycatcher.gentoo.org
1 pinkbyte 14/06/23 08:53:48
2
3 Modified: ChangeLog qt4-r2.eclass
4 Log:
5 Simplify documentation files handling by utilizing einstalldocs from eutils eclass
6
7 Revision Changes Path
8 1.1298 eclass/ChangeLog
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1298&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1298&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1297&r2=1.1298
13
14 Index: ChangeLog
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
17 retrieving revision 1.1297
18 retrieving revision 1.1298
19 diff -u -r1.1297 -r1.1298
20 --- ChangeLog 22 Jun 2014 07:01:37 -0000 1.1297
21 +++ ChangeLog 23 Jun 2014 08:53:48 -0000 1.1298
22 @@ -1,6 +1,10 @@
23 # ChangeLog for eclass directory
24 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1297 2014/06/22 07:01:37 mgorny Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1298 2014/06/23 08:53:48 pinkbyte Exp $
27 +
28 + 23 Jun 2014; Sergey Popov <pinkbyte@g.o> qt4-r2.eclass:
29 + Simplify documentation files handling by utilizing einstalldocs from eutils
30 + eclass
31
32 22 Jun 2014; Michał Górny <mgorny@g.o> distutils-r1.eclass:
33 Set LD{,CXX}SHARED properly for Darwin, reported by Fabian Groffen on bug
34
35
36
37 1.30 eclass/qt4-r2.eclass
38
39 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-r2.eclass?rev=1.30&view=markup
40 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-r2.eclass?rev=1.30&content-type=text/plain
41 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-r2.eclass?r1=1.29&r2=1.30
42
43 Index: qt4-r2.eclass
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v
46 retrieving revision 1.29
47 retrieving revision 1.30
48 diff -u -r1.29 -r1.30
49 --- qt4-r2.eclass 21 Dec 2013 20:11:55 -0000 1.29
50 +++ qt4-r2.eclass 23 Jun 2014 08:53:48 -0000 1.30
51 @@ -1,6 +1,6 @@
52 -# Copyright 1999-2013 Gentoo Foundation
53 +# Copyright 1999-2014 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v 1.29 2013/12/21 20:11:55 pesa Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v 1.30 2014/06/23 08:53:48 pinkbyte Exp $
57
58 # @ECLASS: qt4-r2.eclass
59 # @MAINTAINER:
60 @@ -15,7 +15,7 @@
61 *) die "qt4-r2.eclass: unsupported EAPI=${EAPI:-0}" ;;
62 esac
63
64 -inherit base qmake-utils
65 +inherit base eutils qmake-utils
66
67 export XDG_CONFIG_HOME="${T}"
68
69 @@ -132,14 +132,7 @@
70 debug-print-function $FUNCNAME "$@"
71
72 base_src_install INSTALL_ROOT="${D}" "$@"
73 -
74 - # backward compatibility for non-array variables
75 - if [[ -n ${DOCS} ]] && [[ "$(declare -p DOCS 2>/dev/null 2>&1)" != "declare -a"* ]]; then
76 - dodoc ${DOCS} || die "dodoc failed"
77 - fi
78 - if [[ -n ${HTML_DOCS} ]] && [[ "$(declare -p HTML_DOCS 2>/dev/null 2>&1)" != "declare -a"* ]]; then
79 - dohtml -r ${HTML_DOCS} || die "dohtml failed"
80 - fi
81 + einstalldocs
82 }
83
84 EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install