pesa 14/11/26 18:26:53 Modified: qthelp-4.8.6-r1.ebuild ChangeLog Log: Restore mv of compat headers in src_unpack, accidentally deleted in the previous commit (bug 529398 comment #6). (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)
Revision Changes Path 1.3 dev-qt/qthelp/qthelp-4.8.6-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild?r1=1.2&r2=1.3 Index: qthelp-4.8.6-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qthelp-4.8.6-r1.ebuild 16 Nov 2014 04:06:13 -0000 1.2 +++ qthelp-4.8.6-r1.ebuild 26 Nov 2014 18:26:53 -0000 1.3 @@ -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/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild,v 1.2 2014/11/16 04:06:13 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r1.ebuild,v 1.3 2014/11/26 18:26:53 pesa Exp $ EAPI=5 @@ -52,8 +52,8 @@ # compat version # http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/ if use compat; then - mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 \ - "${S}"/tools/assistant/compat || die + mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 "${S}"/tools/assistant/compat || die + mv "${WORKDIR}"/QtAssistant "${S}"/include || die fi } @@ -78,7 +78,7 @@ if use compat; then # syncqt knows nothing about these headers (bug 529398) - cp -pr "${WORKDIR}"/QtAssistant "${BUILD_DIR}"/include || die + cp -pr "${S}"/include/QtAssistant "${BUILD_DIR}"/include || die fi } 1.25 dev-qt/qthelp/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/ChangeLog?rev=1.25&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/ChangeLog?rev=1.25&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qthelp/ChangeLog?r1=1.24&r2=1.25 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- ChangeLog 16 Nov 2014 04:06:13 -0000 1.24 +++ ChangeLog 26 Nov 2014 18:26:53 -0000 1.25 @@ -1,6 +1,10 @@ # ChangeLog for dev-qt/qthelp # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.24 2014/11/16 04:06:13 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.25 2014/11/26 18:26:53 pesa Exp $ + + 26 Nov 2014; Davide Pesavento <[email protected]> qthelp-4.8.6-r1.ebuild: + Restore mv of compat headers in src_unpack, accidentally deleted in the + previous commit (bug 529398 comment #6). 16 Nov 2014; Davide Pesavento <[email protected]> qthelp-4.8.6-r1.ebuild: Fix build of QtAssistantClient compat library (bug 529398). Fix assistant.prf
