pinkbyte 14/06/23 08:53:48 Modified: ChangeLog qt4-r2.eclass Log: Simplify documentation files handling by utilizing einstalldocs from eutils eclass
Revision Changes Path 1.1298 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1298&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1298&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1297&r2=1.1298 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1297 retrieving revision 1.1298 diff -u -r1.1297 -r1.1298 --- ChangeLog 22 Jun 2014 07:01:37 -0000 1.1297 +++ ChangeLog 23 Jun 2014 08:53:48 -0000 1.1298 @@ -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.1297 2014/06/22 07:01:37 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1298 2014/06/23 08:53:48 pinkbyte Exp $ + + 23 Jun 2014; Sergey Popov <pinkb...@gentoo.org> qt4-r2.eclass: + Simplify documentation files handling by utilizing einstalldocs from eutils + eclass 22 Jun 2014; Michał Górny <mgo...@gentoo.org> distutils-r1.eclass: Set LD{,CXX}SHARED properly for Darwin, reported by Fabian Groffen on bug 1.30 eclass/qt4-r2.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-r2.eclass?rev=1.30&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-r2.eclass?rev=1.30&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4-r2.eclass?r1=1.29&r2=1.30 Index: qt4-r2.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- qt4-r2.eclass 21 Dec 2013 20:11:55 -0000 1.29 +++ qt4-r2.eclass 23 Jun 2014 08:53:48 -0000 1.30 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v 1.29 2013/12/21 20:11:55 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-r2.eclass,v 1.30 2014/06/23 08:53:48 pinkbyte Exp $ # @ECLASS: qt4-r2.eclass # @MAINTAINER: @@ -15,7 +15,7 @@ *) die "qt4-r2.eclass: unsupported EAPI=${EAPI:-0}" ;; esac -inherit base qmake-utils +inherit base eutils qmake-utils export XDG_CONFIG_HOME="${T}" @@ -132,14 +132,7 @@ debug-print-function $FUNCNAME "$@" base_src_install INSTALL_ROOT="${D}" "$@" - - # backward compatibility for non-array variables - if [[ -n ${DOCS} ]] && [[ "$(declare -p DOCS 2>/dev/null 2>&1)" != "declare -a"* ]]; then - dodoc ${DOCS} || die "dodoc failed" - fi - if [[ -n ${HTML_DOCS} ]] && [[ "$(declare -p HTML_DOCS 2>/dev/null 2>&1)" != "declare -a"* ]]; then - dohtml -r ${HTML_DOCS} || die "dohtml failed" - fi + einstalldocs } EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install
