summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2013-03-08 08:08:59 +0000
committerDavide Pesavento <pesa@gentoo.org>2013-03-08 08:08:59 +0000
commit86b75159632ef0d9a94ae2dfa2f2d6bcde4d6ae9 (patch)
treef8cc34fe05f7b1a2cfd0df6b8e2e846d5ae0d1e5 /dev-qt/qthelp
parentVersion bump. (diff)
downloadgentoo-2-86b75159632ef0d9a94ae2dfa2f2d6bcde4d6ae9.tar.gz
gentoo-2-86b75159632ef0d9a94ae2dfa2f2d6bcde4d6ae9.tar.bz2
gentoo-2-86b75159632ef0d9a94ae2dfa2f2d6bcde4d6ae9.zip
Fix bug 460654.
(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 17A85C72)
Diffstat (limited to 'dev-qt/qthelp')
-rw-r--r--dev-qt/qthelp/ChangeLog9
-rw-r--r--dev-qt/qthelp/qthelp-4.8.4.ebuild13
2 files changed, 13 insertions, 9 deletions
diff --git a/dev-qt/qthelp/ChangeLog b/dev-qt/qthelp/ChangeLog
index fdc9b8cb8121..774eaf6482e9 100644
--- a/dev-qt/qthelp/ChangeLog
+++ b/dev-qt/qthelp/ChangeLog
@@ -1,6 +1,9 @@
-# ChangeLog for dev-qt/qtassistant
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.2 2013/03/03 04:15:47 yngwin Exp $
+# 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.3 2013/03/08 08:08:59 pesa Exp $
+
+ 08 Mar 2013; Davide Pesavento <pesa@gentoo.org> qthelp-4.8.4.ebuild:
+ Fix bug 460654.
30 Dec 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml:
Cleanup metadata.
diff --git a/dev-qt/qthelp/qthelp-4.8.4.ebuild b/dev-qt/qthelp/qthelp-4.8.4.ebuild
index 42ed203d5831..0dd7d96727ae 100644
--- a/dev-qt/qthelp/qthelp-4.8.4.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.4.ebuild,v 1.1 2013/03/02 15:30:20 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.4.ebuild,v 1.2 2013/03/08 08:08:59 pesa Exp $
EAPI=4
@@ -59,11 +59,11 @@ src_unpack() {
qt4-build_src_unpack
# compat version
- # http://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
+ # http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
if use compat; then
- unpack ${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz \
- ${PN}-compat-headers-4.7.tar.gz
- mv "${WORKDIR}"/${PN}-qassistantclient-library-compat-version-4.6.3 \
+ unpack qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz \
+ qt-assistant-compat-headers-4.7.tar.gz
+ mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 \
"${S}"/tools/assistant/compat || die
mv "${WORKDIR}"/QtAssistant "${S}"/include/ || die
fi
@@ -117,6 +117,7 @@ src_install() {
qt4-build_src_install
emake INSTALL_ROOT="${D}" install_qchdocs
+
# do not compress .qch files
docompress -x "${QTDOCDIR}"/qch