diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2013-07-19 06:19:38 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2013-07-19 06:19:38 +0000 |
| commit | 4e3d658464a682c055547e3cb14b431f42479d55 (patch) | |
| tree | f2594e81304381e2ecd4721b6a4ee3b4d1fdf97f /dev-qt/qthelp | |
| parent | Version bump. (diff) | |
| download | gentoo-2-4e3d658464a682c055547e3cb14b431f42479d55.tar.gz gentoo-2-4e3d658464a682c055547e3cb14b431f42479d55.tar.bz2 gentoo-2-4e3d658464a682c055547e3cb14b431f42479d55.zip | |
Proper fix for compat bits
(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/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-qt/qthelp/qthelp-4.8.5-r1.ebuild (renamed from dev-qt/qthelp/qthelp-4.8.5.ebuild) | 17 |
2 files changed, 20 insertions, 5 deletions
diff --git a/dev-qt/qthelp/ChangeLog b/dev-qt/qthelp/ChangeLog index 48b38adc79b2..3948f7af10e2 100644 --- a/dev-qt/qthelp/ChangeLog +++ b/dev-qt/qthelp/ChangeLog @@ -1,6 +1,12 @@ # 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.8 2013/07/19 03:20:34 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.9 2013/07/19 06:19:38 patrick Exp $ + +*qthelp-4.8.5-r1 (19 Jul 2013) + + 19 Jul 2013; Patrick Lauer <patrick@gentoo.org> +qthelp-4.8.5-r1.ebuild, + -qthelp-4.8.5.ebuild: + Proper fix for compat bits 19 Jul 2013; Patrick Lauer <patrick@gentoo.org> qthelp-4.8.5.ebuild: Adding compat bits back in that the splitting disabled #477316 diff --git a/dev-qt/qthelp/qthelp-4.8.5.ebuild b/dev-qt/qthelp/qthelp-4.8.5-r1.ebuild index aabfb48c1e98..c9f90750e551 100644 --- a/dev-qt/qthelp/qthelp-4.8.5.ebuild +++ b/dev-qt/qthelp/qthelp-4.8.5-r1.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.4 2013/07/19 03:20:34 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.5-r1.ebuild,v 1.1 2013/07/19 06:19:38 patrick Exp $ EAPI=5 @@ -92,7 +92,10 @@ 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 + cd src/plugins/accessible + "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" && make || die + cd ../../../tools/assistant/compat/lib + "${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" && make || die popd fi # ugly hack to build docs @@ -111,10 +114,16 @@ 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 + cd src/plugins/accessible && emake INSTALL_ROOT="${D}" install || die + cd ../../../tools/assistant/compat/lib && emake INSTALL_ROOT="${D}" install || die popd insinto /usr/include/qt4/ - doins -r include/QtAssistant || die + doins -r include/QtAssistant + insinto /usr/include/qt4/QtAssistant/ + # this is rather confusing + doins -r tools/assistant/compat/lib/*.h || die + # collides with qtgui + rm "${D}"/usr/lib64/qt4/plugins/accessible/libqtaccessiblewidgets.so fi emake INSTALL_ROOT="${D}" install_qchdocs |