Fix bug 370929.

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

6 files changed, 53 insertions, 90 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/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
 }