summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Lauer <patrick@gentoo.org>2013-07-19 03:20:34 +0000
committerPatrick Lauer <patrick@gentoo.org>2013-07-19 03:20:34 +0000
commitac39f93d42c90cfa8c9f25335a168d726e5013e1 (patch)
treee5f1e8f847ee3fa9b8fd29be6eeb15a32e98f719 /dev-qt/qthelp
parentRemove redundant useflag descriptions (diff)
downloadgentoo-2-ac39f93d42c90cfa8c9f25335a168d726e5013e1.tar.gz
gentoo-2-ac39f93d42c90cfa8c9f25335a168d726e5013e1.tar.bz2
gentoo-2-ac39f93d42c90cfa8c9f25335a168d726e5013e1.zip
Adding compat bits back in that the splitting disabled #477316
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'dev-qt/qthelp')
-rw-r--r--dev-qt/qthelp/ChangeLog5
-rw-r--r--dev-qt/qthelp/qthelp-4.8.5.ebuild17
2 files changed, 19 insertions, 3 deletions
diff --git a/dev-qt/qthelp/ChangeLog b/dev-qt/qthelp/ChangeLog
index 33a4d31b8a95..48b38adc79b2 100644
--- a/dev-qt/qthelp/ChangeLog
+++ b/dev-qt/qthelp/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-qt/qthelp
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.7 2013/07/18 09:35:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.8 2013/07/19 03:20:34 patrick Exp $
+
+ 19 Jul 2013; Patrick Lauer <patrick@gentoo.org> qthelp-4.8.5.ebuild:
+ Adding compat bits back in that the splitting disabled #477316
18 Jul 2013; Patrick Lauer <patrick@gentoo.org> qthelp-4.8.5.ebuild:
Adding qtclucene broken by splitting #476614
diff --git a/dev-qt/qthelp/qthelp-4.8.5.ebuild b/dev-qt/qthelp/qthelp-4.8.5.ebuild
index 25bbeeeb0359..aabfb48c1e98 100644
--- a/dev-qt/qthelp/qthelp-4.8.5.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.5.ebuild,v 1.3 2013/07/18 09:35:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.5.ebuild,v 1.4 2013/07/19 03:20:34 patrick Exp $
EAPI=5
@@ -89,6 +89,12 @@ src_compile() {
qt4-build_src_compile
+ if use compat; then
+ # need to explicitly mangle this as we lack the toplevel makefiles
+ pushd .
+ cd src/plugins/accessible && "${S}"/bin/qmake || die
+ popd
+ fi
# ugly hack to build docs
"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die
@@ -102,7 +108,14 @@ src_compile() {
src_install() {
qt4-build_src_install
-
+ if use compat; then
+ # need to explicitly mangle this as we lack the toplevel makefiles
+ pushd .
+ cd src/plugins/accessible && "${S}"/bin/qmake || die
+ popd
+ insinto /usr/include/qt4/
+ doins -r include/QtAssistant || die
+ fi
emake INSTALL_ROOT="${D}" install_qchdocs
# do not compress .qch files