Fix bug 370929.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

7 files changed, 72 insertions, 104 deletions

diff --git a/x11-libs/qt-assistant/ChangeLog b/x11-libs/qt-assistant/ChangeLog
index 9f4cfe26c12e..5d3ccc06d49c 100644
--- a/x11-libs/qt-assistant/ChangeLog
+++ b/x11-libs/qt-assistant/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-assistant
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.127 2012/04/05 15:19:56 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.128 2012/04/12 23:47:32 pesa Exp $
+
+  12 Apr 2012; Davide Pesavento <pesa@gentoo.org>
+  -files/qt-assistant-4.7-include.tar.gz,
+  -files/qt-assistant-4.8.0-install-fix.patch, qt-assistant-4.7.2.ebuild,
+  qt-assistant-4.7.4.ebuild, qt-assistant-4.8.1-r1.ebuild:
+  Fix bug 370929.
 
   05 Apr 2012; Johannes Huber <johu@gentoo.org> -qt-assistant-4.8.0-r1.ebuild:
   Drop Qt-4.8.0
diff --git a/x11-libs/qt-assistant/Manifest b/x11-libs/qt-assistant/Manifest
index 23e8788f084d..0eeed2f7eb61 100644
--- a/x11-libs/qt-assistant/Manifest
+++ b/x11-libs/qt-assistant/Manifest
@@ -4,27 +4,32 @@ Hash: SHA512
 AUX disable-webkit.patch 872 RMD160 cfcb8a1f44a1fe0cddc0d45977cc62351eb2b02a SHA1 cbe42f5611aa06292dd26e6770e553c6f852d5af SHA256 b6fd53493f8f663d8d23a174d20fceb5a5258275ce77eb5d6a6115322e5beddc
 AUX qt-assistant-4.6.3-tools.patch 1321 RMD160 06ea39717425fb2e6cb8938c7525f9ee78eadb87 SHA1 aa2930a29c4cf19fd11596c7725ac995b52eda91 SHA256 ac35ca99e4d0d697bdd1598fc7c29237e48954f840676205a6ffb0b4cd31ab6f
 AUX qt-assistant-4.7-fix-compat.patch 2987 RMD160 1086b830699b5357388fa0c1b3633c6c4c3f6bd4 SHA1 63dd8200f0a4fcbd29356fbbc11de19f13a75ed2 SHA256 eefa0a24d8dd708b86655f67179182e479fc67f0e58b7a789701428e5ad5f9bc
-AUX qt-assistant-4.7-include.tar.gz 448 RMD160 5432ab486dae1d2510798b53c32365f860a8b8dc SHA1 782a7ebf6486fa80c5253f6e37b6ac48cdede7a4 SHA256 73ae604834cc89d6c67bafc65bb5d3cadaec23076d02711fc0c30a85df3d8580
-AUX qt-assistant-4.8.0-install-fix.patch 2708 RMD160 b64c206d48b0939e4c504585a44cc06cd29fd62a SHA1 cb1740e69ffb163234e6cfff4043e071ee85d4bf SHA256 7c525c8bf696e3082bdf86e079703b2a033ea16b3fb882d519fc6463da8e5dde
+DIST qt-assistant-compat-headers-4.7.tar.gz 448 RMD160 5432ab486dae1d2510798b53c32365f860a8b8dc SHA1 782a7ebf6486fa80c5253f6e37b6ac48cdede7a4 SHA256 73ae604834cc89d6c67bafc65bb5d3cadaec23076d02711fc0c30a85df3d8580
 DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 RMD160 f34da3587cb311f42aa19b9c8259b90269590c61 SHA1 7a5e5155136c406e5b7eb880eed752f56625d10b SHA256 e698be8fc0d32c5f0b5b46cafcb8f615accaed524b864e58b99b64b7b5549c2d
 DIST qt-everywhere-opensource-src-4.6.3.tar.gz 160993454 RMD160 ceb3ca78263d0d9cdf92fef903e30c0026db6bff SHA1 1c18a564df9296c7cb0e0dedde40b9843e1b30e8 SHA256 f4e0ada8d4d516bbb8600a3ee7d9046c9c79e38cd781df9ffc46d8f16acd1768
 DIST qt-everywhere-opensource-src-4.7.2.tar.gz 213663032 RMD160 de3d1c172c23c33681a0945c331db179c84cb7b5 SHA1 84414f82bbc9e8d356b986d5d1ebee89d06e4f2e SHA256 d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336
 DIST qt-everywhere-opensource-src-4.7.4.tar.gz 220388303 RMD160 3e47b09663a89973b1c8628506c995dfc2a5387c SHA1 af9016aa924a577f7b06ffd28c9773b56d74c939 SHA256 97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e
 DIST qt-everywhere-opensource-src-4.8.1.tar.gz 239606696 RMD160 538e626fae80ca8ca5aac575919f469a9827ad4f SHA1 a074d0f605f009e23c63e0a4cb9b71c978146ffc SHA256 ef851a36aa41b4ad7a3e4c96ca27eaed2a629a6d2fa06c20f072118caed87ae8
 EBUILD qt-assistant-4.6.3.ebuild 2773 RMD160 e3d2eb177c7227b1f263da608c14301003b21062 SHA1 eb33b8bc87f7d47fa0fb74d371e71e49f672ffe7 SHA256 a9ca1298bfc0d13386907ef643bd488661ef621535857adce3e160fd24c49aa7
-EBUILD qt-assistant-4.7.2.ebuild 3750 RMD160 4f9256b6bb6dbf28bc2c668ef84d57974a0ebb0c SHA1 023d6d0ec7bfef5cd044c8fd58650ec535ebbc70 SHA256 3c7322b1ce6abd596fd0d780a457feca70c4f8f70091d17f27731dd1da5bf4df
-EBUILD qt-assistant-4.7.4.ebuild 3813 RMD160 0cf83c2e1d0ceee9fe7c6193df009b1a8f008357 SHA1 bfba88d3e2935f0a749439f4fc6109c58183dd3c SHA256 b93bc674d0bfae369453dcb3d009d0cbad63348681917fc322db79b480ac570c
-EBUILD qt-assistant-4.8.1-r1.ebuild 3304 RMD160 228387c2252d289c0bda2a4d7a2d009192a405b6 SHA1 5416dd92291bcbbdc89a9c0cd7c4c4e0ec367808 SHA256 2c5d6e90649a608fd7292db3113a47e0e1a41d6a41780147f0ad0f88b03b0de1
-MISC ChangeLog 17303 RMD160 6d42300341e6fa9cce86a292d8554ced23cb885a SHA1 08d8f09d98e0bb4c383c7e5187be10e60e234d5e SHA256 bfa1900025e278a0380f5441272df5b141be7ce7293bb513bf4a82c28972b83b
+EBUILD qt-assistant-4.7.2.ebuild 3725 RMD160 115fccf65b3c835adae68a81b856217849a76ff5 SHA1 b2b97debfeff57d677bff9f4b81fccc54020d377 SHA256 c446530018b9bd98f805bfedd75c0ead43d1ef2f22155e601a4a6c36953785cc
+EBUILD qt-assistant-4.7.4.ebuild 3807 RMD160 4da8ed64826ce8fa2e0728409b262e2d2da87879 SHA1 d2fa36c997497688fed4afbeada569ddd7cf985e SHA256 423449a33c1739d0810fb4c1bd95a0b414b3f35a7b8fba8b5cbf2d2801cea6da
+EBUILD qt-assistant-4.8.1-r1.ebuild 3309 RMD160 692278a0fd51bdd36a34724e610cfd4beb2f9ee1 SHA1 a461dd523e5c78aa513fc669a7f427233b4d69be SHA256 d91e655171069c8ec60d364d2d2e0cf9e079d43ace33ecd257484bd298693fac
+MISC ChangeLog 17547 RMD160 aa6a5d7ba8bb634ca15ebc221771966e35beba06 SHA1 3abadbf59e8226d0878716030f217be00f697429 SHA256 155ec94e42af8faf9846ec577b738772e601f9298c89243dd2e527e009a8d712
 MISC metadata.xml 1086 RMD160 ce6419ab9a7df55e05adca6403a728735e874524 SHA1 775beea724b2823361bc01c0b5569c6c24fc5cbf SHA256 72d77a6228a9010378d4f9eae1cbc0730d5c38e03754906a95d895947d5d574f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPfbg7AAoJEO+t9ga+3I3aaIwIAJ46SLGO9Rcyj07UG6xWJemA
-CmU8L1dCJJoeFmtf43xKBGo79HpbsuPO4c5PHwgBZDc6Hx/oxssuvxJMyzsgokKQ
-sd1B3dd1av0eDg8UNuUMuM7qrVWYsfO+bNhdko39bUQiiVf7mJB0CeUCokNpqEfi
-6re6HWsoCq7aGeg1ItjkhMcGKawZ0av2dOsl45+6046oSCQ/5WVjF6JOBdMUZMgc
-j6UFNVgducTSDGYIfJTueSQ8yvUjyDQ+Zyg3Ttxltp5T+gWnLUUmcBMQcEiO7QXl
-ZJD8zIoUOUGXRdY87OEx6/lU2ur19wS/4lpNKCj6CwLWosQKbIZji7DTKDQ52qc=
-=P6fQ
+iQIcBAEBCgAGBQJPh2mcAAoJENXLsxwXqFxyhQ8QAILCzvhSadfaRa/LMJ2EFWlM
+vTnQJK4rct04NPlZQUVkt5IsnHFaq9B6WyDVLFc9+q8vbGUt4o1sy5zq9oDlFht8
+RimRUyaO7IQE0QZOmaZ/PmxwH7bmSmZ9V47vxoLC5J4TL4KnM6w0WngP/2WELswl
+gQo3dBq2Rx4v6rvOd6x+FIZjiV/zbPYW8mnrNftl9aVbLD8/RB/EVlRDhxV1WkG9
+41uitUEMwO1JXHTcE7bDNfTJkDkfI2VB+RkSE4kyLMdnDyXqHobcBiXSan+/Kzpy
+N/GciWvP9+PY2bsZJU/5pc86eQftiPTMfj41utZq4spepBHJdwYXw9bqZ7mIQB+b
+Pp2O22Va9TY0VqpEN4VvkY/5df6U2XaLFNItnXs0Cth0wPZAPy8SHEHIK95mNRc3
+Eyt2poae4JxmbStQcJCM0eav2qzIUOWSgVBSvTlWMKWRTP0joDTxpG0+caxbZ8tW
+ipEsOidQ71GBeX1oZIrt6JRwHcB1sBI2KRdjV35DsfFCLbHRz3AuT9N6AX6piOT/
+VbbxDApAkSIx7lIqNHh0RWRzj5n6ehQAxB5Jo23kPiE6RxWsoB9l95Hhe2Ju/QUi
+9g6DvnG+16Fw1cyBx2Q94UD/gQvJofmTqKJQw4tWH1DzmKWEyEkIsn7xubh9IKS2
+HVL+OCqV2RZahDlbA7oq
+=ynBk
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-assistant/files/qt-assistant-4.7-include.tar.gz b/x11-libs/qt-assistant/files/qt-assistant-4.7-include.tar.gz
deleted file mode 100644
index 34207d7051e8..000000000000
--- a/x11-libs/qt-assistant/files/qt-assistant-4.7-include.tar.gz
+++ /dev/null
diff --git a/x11-libs/qt-assistant/files/qt-assistant-4.8.0-install-fix.patch b/x11-libs/qt-assistant/files/qt-assistant-4.8.0-install-fix.patch
deleted file mode 100644
index f18f45e0190a..000000000000
--- a/x11-libs/qt-assistant/files/qt-assistant-4.8.0-install-fix.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-fix qt-assistant-4.8.0 not installing
-
-gentoo bug #395067
-https://bugs.gentoo.org/show_bug.cgi?id=395067
-
---- doc/doc.pri.org
-+++ doc/doc.pri
-@@ -17,11 +17,6 @@
- COPYWEBKITTARGA = $$QT_BUILD_TREE/doc-build/html-qt
- COPYWEBKITTARGB = $$QT_BUILD_TREE/doc/html
- 
--EXAMPLESMANIFEST = $$QT_BUILD_TREE/doc/html/examples-manifest.xml
--DEMOSMANIFEST = $$QT_BUILD_TREE/doc/html/demos-manifest.xml
--EXAMPLESMANIFESTTARGET = $$QT_BUILD_TREE/examples
--DEMOSMANIFESTTARGET = $$QT_BUILD_TREE/demos
--
- $$unixstyle {
-     QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && QT_BUILD_TREE=$$QT_BUILD_TREE QT_SOURCE_TREE=$$QT_SOURCE_TREE $$QT_BUILD_TREE/bin/qdoc3 $$DOCS_GENERATION_DEFINES
- } else {
-@@ -30,18 +25,12 @@
-     COPYWEBKITGUIDE = $$replace(COPYWEBKITGUIDE, "/", "\\")
-     COPYWEBKITTARGA = $$replace(COPYWEBKITTARGA, "/", "\\")
-     COPYWEBKITTARGB = $$replace(COPYWEBKITTARGB, "/", "\\")
--    EXAMPLESMANIFEST = $$replace(EXAMPLESMANIFEST,  "/", "\\")
--    DEMOSMANIFEST  = $$replace(DEMOSMANIFEST,  "/", "\\")
--    EXAMPLESMANIFESTTARGET = $$replace(EXAMPLESMANIFESTTARGET,  "/", "\\")
--    DEMOSMANIFESTTARGET = $$replace(DEMOSMANIFESTTARGET,  "/", "\\")
- }
- ADP_DOCS_QDOCCONF_FILE = qt-build-docs-online.qdocconf
- QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \
-                     linguist.qdocconf qmake.qdocconf qdeclarative.qdocconf) && \
-                (cd $$QT_BUILD_TREE && \
-                     $$QMAKE_COPY_DIR $$COPYWEBKITGUIDE $$COPYWEBKITTARGA && \
--                    $$QMAKE_COPY $$EXAMPLESMANIFEST $$EXAMPLESMANIFESTTARGET && \
--                    $$QMAKE_COPY $$DEMOSMANIFEST $$DEMOSMANIFESTTARGET && \
-                     $$GENERATOR doc-build/html-qt/qt.qhp -o doc/qch/qt.qch && \
-                     $$GENERATOR doc-build/html-assistant/assistant.qhp -o doc/qch/assistant.qch && \
-                     $$GENERATOR doc-build/html-designer/designer.qhp -o doc/qch/designer.qch && \
-@@ -85,14 +74,6 @@
- htmldocs.path = $$[QT_INSTALL_DOCS]
- htmldocs.CONFIG += no_check_exist directory
- 
--examplesmanifest.files = $$EXAMPLESMANIFEST
--examplesmanifest.path = $$[QT_INSTALL_EXAMPLES]
--examplesmanifest.CONFIG += no_check_exist directory
--
--demosmanifest.files = $$DEMOSMANIFEST
--demosmanifest.path = $$[QT_INSTALL_DEMOS]
--demosmanifest.CONFIG += no_check_exist directory
--
- qchdocs.files= $$QT_BUILD_TREE/doc/qch
- qchdocs.path = $$[QT_INSTALL_DOCS]
- qchdocs.CONFIG += no_check_exist directory
-@@ -104,4 +85,4 @@
- sub-qdoc3.commands += (cd tools/qdoc3 && $(MAKE))
- 
- QMAKE_EXTRA_TARGETS += sub-qdoc3 adp_docs qch_docs docs docs_zh_CN docs_ja_JP
--INSTALLS += htmldocs qchdocs docimages examplesmanifest demosmanifest
-+INSTALLS += htmldocs qchdocs docimages
diff --git a/x11-libs/qt-assistant/qt-assistant-4.7.2.ebuild b/x11-libs/qt-assistant/qt-assistant-4.7.2.ebuild
index 2055100250af..5634776ebea4 100644
--- a/x11-libs/qt-assistant/qt-assistant-4.7.2.ebuild
+++ b/x11-libs/qt-assistant/qt-assistant-4.7.2.ebuild
@@ -1,15 +1,20 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.7.2.ebuild,v 1.6 2011/07/13 12:55:28 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.7.2.ebuild,v 1.7 2012/04/12 23:47:32 pesa Exp $
 
 EAPI="3"
 inherit qt4-build
 
 DESCRIPTION="The assistant help module for the Qt toolkit"
+SRC_URI+="
+	compat? (
+		ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz
+		http://dev.gentoo.org/~pesa/distfiles/${PN}-compat-headers-4.7.tar.gz
+	)"
+
 SLOT="4"
 KEYWORDS="amd64 arm ~ia64 ppc ppc64 x86"
 IUSE="compat doc +glib qt3support trace"
-SRC_URI+=" compat? ( ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz )"
 
 DEPEND="~x11-libs/qt-gui-${PV}[aqua=,debug=,glib=,qt3support=,trace?]
 	~x11-libs/qt-sql-${PV}[aqua=,debug=,qt3support=,sqlite]
@@ -19,7 +24,7 @@ RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	# Pixeltool isn't really assistant related, but it relies on
-	# the assistant libraries. doc/qch/
+	# the assistant libraries.
 	QT4_TARGET_DIRECTORIES="
 		tools/assistant
 		tools/pixeltool
@@ -34,30 +39,31 @@ pkg_setup() {
 
 	use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
 		tools/qttracereplay"
+
 	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
 		${QT4_EXTRACT_DIRECTORIES}"
+
 	qt4-build_pkg_setup
 }
 
 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/
 	if use compat; then
-		unpack "${PN}"-qassistantclient-library-compat-src-4.6.3.tar.gz
-		mv "${WORKDIR}"/"${PN}"-qassistantclient-library-compat-version-4.6.3 \
-			"${S}"/tools/assistant/compat ||
-				die "moving compat to the right place failed"
-		tar xzf "${FILESDIR}"/"${PN}"-4.7-include.tar.gz -C "${S}"/include/ ||
-			die "unpacking the include files failed"
+		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 \
+			"${S}"/tools/assistant/compat || die
+		mv "${WORKDIR}"/QtAssistant "${S}"/include/ || die
 	fi
 }
 
 src_prepare() {
 	qt4-build_src_prepare
-	if use compat; then
-		epatch "${FILESDIR}"/"${PN}"-4.7-fix-compat.patch
-	fi
+
+	use compat && epatch "${FILESDIR}"/${PN}-4.7-fix-compat.patch
 }
 
 src_configure() {
diff --git a/x11-libs/qt-assistant/qt-assistant-4.7.4.ebuild b/x11-libs/qt-assistant/qt-assistant-4.7.4.ebuild
index 4b2230c1ba02..b5eeba08cb95 100644
--- a/x11-libs/qt-assistant/qt-assistant-4.7.4.ebuild
+++ b/x11-libs/qt-assistant/qt-assistant-4.7.4.ebuild
@@ -1,15 +1,20 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.7.4.ebuild,v 1.5 2012/02/10 00:51:18 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.7.4.ebuild,v 1.6 2012/04/12 23:47:32 pesa Exp $
 
 EAPI="3"
 inherit qt4-build
 
 DESCRIPTION="The assistant help module for the Qt toolkit"
+SRC_URI+="
+	compat? (
+		ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz
+		http://dev.gentoo.org/~pesa/distfiles/${PN}-compat-headers-4.7.tar.gz
+	)"
+
 SLOT="4"
 KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~ppc-macos"
 IUSE="compat doc +glib qt3support trace"
-SRC_URI+=" compat? ( ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz )"
 
 DEPEND="~x11-libs/qt-gui-${PV}[aqua=,debug=,glib=,qt3support=,trace?]
 	~x11-libs/qt-sql-${PV}[aqua=,debug=,qt3support=,sqlite]
@@ -19,7 +24,7 @@ RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	# Pixeltool isn't really assistant related, but it relies on
-	# the assistant libraries. doc/qch/
+	# the assistant libraries.
 	QT4_TARGET_DIRECTORIES="
 		tools/assistant
 		tools/pixeltool
@@ -34,22 +39,24 @@ pkg_setup() {
 
 	use trace && QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
 		tools/qttracereplay"
+
 	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
 		${QT4_EXTRACT_DIRECTORIES}"
+
 	qt4-build_pkg_setup
 }
 
 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/
 	if use compat; then
-		unpack "${PN}"-qassistantclient-library-compat-src-4.6.3.tar.gz
-		mv "${WORKDIR}"/"${PN}"-qassistantclient-library-compat-version-4.6.3 \
-			"${S}"/tools/assistant/compat ||
-				die "moving compat to the right place failed"
-		tar xzf "${FILESDIR}"/"${PN}"-4.7-include.tar.gz -C "${S}"/include/ ||
-			die "unpacking the include files failed"
+		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 \
+			"${S}"/tools/assistant/compat || die
+		mv "${WORKDIR}"/QtAssistant "${S}"/include/ || die
 	fi
 }
 
diff --git a/x11-libs/qt-assistant/qt-assistant-4.8.1-r1.ebuild b/x11-libs/qt-assistant/qt-assistant-4.8.1-r1.ebuild
index 5396ed5ea2c1..d3d8c1a3ef1c 100644
--- a/x11-libs/qt-assistant/qt-assistant-4.8.1-r1.ebuild
+++ b/x11-libs/qt-assistant/qt-assistant-4.8.1-r1.ebuild
@@ -1,15 +1,19 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.8.1-r1.ebuild,v 1.1 2012/03/30 13:55:10 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.8.1-r1.ebuild,v 1.2 2012/04/12 23:47:32 pesa Exp $
 
 EAPI=4
 
 inherit qt4-build
 
 DESCRIPTION="The Help module and Assistant application for the Qt toolkit"
-SRC_URI+=" compat? ( ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz )"
-SLOT="4"
+SRC_URI+="
+	compat? (
+		ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz
+		http://dev.gentoo.org/~pesa/distfiles/${PN}-compat-headers-4.7.tar.gz
+	)"
 
+SLOT="4"
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~ppc-macos"
 IUSE="compat doc +glib qt3support trace webkit"
 
@@ -49,12 +53,11 @@ src_unpack() {
 	# compat version
 	# http://labs.qt.nokia.com/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
+		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 \
-			"${S}"/tools/assistant/compat ||
-				die "moving compat to the right place failed"
-		tar xzf "${FILESDIR}"/${PN}-4.7-include.tar.gz -C "${S}"/include/ ||
-			die "unpacking the include files failed"
+			"${S}"/tools/assistant/compat || die
+		mv "${WORKDIR}"/QtAssistant "${S}"/include/ || die
 	fi
 }