pesa 14/11/14 02:49:57 Modified: ChangeLog qt5-build.eclass Log: Install global docs (part of bug 457028). Generate and install qtchooser configuration file.
Revision Changes Path 1.1420 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1420&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1420&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1419&r2=1.1420 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1419 retrieving revision 1.1420 diff -u -r1.1419 -r1.1420 --- ChangeLog 13 Nov 2014 07:15:54 -0000 1.1419 +++ ChangeLog 14 Nov 2014 02:49:57 -0000 1.1420 @@ -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.1419 2014/11/13 07:15:54 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1420 2014/11/14 02:49:57 pesa Exp $ + + 14 Nov 2014; Davide Pesavento <p...@gentoo.org> qt5-build.eclass: + Install global docs (part of bug 457028). Generate and install qtchooser + configuration file. 13 Nov 2014; Ulrich Müller <u...@gentoo.org> bzr.eclass: Remove Emacs team from maintainers of bzr.eclass. 1.10 eclass/qt5-build.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.10&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?rev=1.10&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt5-build.eclass?r1=1.9&r2=1.10 Index: qt5-build.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- qt5-build.eclass 9 Oct 2014 16:55:28 -0000 1.9 +++ qt5-build.eclass 14 Nov 2014 02:49:57 -0000 1.10 @@ -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/qt5-build.eclass,v 1.9 2014/10/09 16:55:28 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.10 2014/11/14 02:49:57 pesa Exp $ # @ECLASS: qt5-build.eclass # @MAINTAINER: @@ -261,12 +261,14 @@ if [[ ${PN} == qtcore ]]; then pushd "${QT5_BUILD_DIR}" >/dev/null || die - set -- emake INSTALL_ROOT="${D}" install_{mkspecs,qmake,syncqt} + set -- emake INSTALL_ROOT="${D}" install_{global_docs,mkspecs,qmake,syncqt} einfo "Running $*" "$@" popd >/dev/null || die + docompress -x "${QT5_DOCDIR#${EPREFIX}}"/global + # install an empty Gentoo/gentoo-qconfig.h in ${D} # so that it's placed under package manager control > "${T}"/gentoo-qconfig.h @@ -276,9 +278,24 @@ ) # include gentoo-qconfig.h at the beginning of QtCore/qconfig.h - sed -i -e '1a#include <Gentoo/gentoo-qconfig.h>\n' \ + sed -i -e '1i #include <Gentoo/gentoo-qconfig.h>\n' \ "${D}${QT5_HEADERDIR}"/QtCore/qconfig.h \ || die "sed failed (qconfig.h)" + + # install qtchooser configuration file + cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ + ${QT5_BINDIR} + ${QT5_LIBDIR} + _EOF_ + + ( + insinto /etc/xdg/qtchooser + doins "${T}/qt5-${CHOST}.conf" + ) + + # convenience symlinks + dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/5.conf + dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/qt5.conf fi qt5_install_module_qconfigs
