[gentoo-commits] proj/qt:master commit in: dev-qt/qthelp/

["Davide Pesavento" <pesa@gentoo.org>]

commit:     40289fb225374d71db90b76fc64daa9790b1a70b
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue May 27 22:57:28 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue May 27 22:57:28 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=40289fb2

[dev-qt/qthelp:4] Minor cleanup.

Package-Manager: portage-2.2.10

---
 dev-qt/qthelp/qthelp-4.8.9999.ebuild | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
index e9aa312..ff5f20b 100644
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
@@ -75,7 +75,7 @@ src_prepare() {
 
 	qt4-build-multilib_src_prepare
 
-	# bug 348034
+	# prevent rebuild of QtCore and QtXml (bug 348034)
 	sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
 }
 
@@ -93,8 +93,9 @@ src_configure() {
 src_compile() {
 	qt4-build-multilib_src_compile
 
-	# ugly hack to build docs
-	"${S}"/bin/qmake "LIBS+=-L${QT4_LIBDIR}" "CONFIG+=nostrip" || die
+	# this generates a top-level Makefile containing the targets
+	# used below to build and install the documentation
+	"${S}"/bin/qmake || die
 
 	if use doc; then
 		emake docs