Properly fix building with USE=compat by teaching syncqt how to generate QtAssistant forwarding headers. Finally solves bug 529398.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)

5 files changed, 76 insertions, 49 deletions

diff --git a/dev-qt/qthelp/ChangeLog b/dev-qt/qthelp/ChangeLog
index 61cd20c22592..d2d8bdac7670 100644
--- a/dev-qt/qthelp/ChangeLog
+++ b/dev-qt/qthelp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-qt/qthelp
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.37 2015/03/08 14:01:23 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.38 2015/05/06 21:48:06 pesa Exp $
+
+*qthelp-4.8.6-r3 (06 May 2015)
+
+  06 May 2015; Davide Pesavento <pesa@gentoo.org>
+  +files/qthelp-4.8.6-compat-install.patch,
+  +files/qthelp-4.8.6-compat-syncqt.patch, +qthelp-4.8.6-r3.ebuild,
+  -files/qthelp-4.8.6-fix-compat.patch, -qthelp-4.8.6-r2.ebuild:
+  Properly fix building with USE=compat by teaching syncqt how to generate
+  QtAssistant forwarding headers. Finally solves bug 529398.
 
   08 Mar 2015; Davide Pesavento <pesa@gentoo.org> qthelp-5.4.1.ebuild:
   Remove all keywords from "live" branch.
diff --git a/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch b/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch
new file mode 100644
index 000000000000..e157381c8f05
--- /dev/null
+++ b/dev-qt/qthelp/files/qthelp-4.8.6-compat-install.patch
@@ -0,0 +1,35 @@
+From 89f99089abe0c1369a78a3bb8e2a576c513ec809 Mon Sep 17 00:00:00 2001
+From: Davide Pesavento <pesa@gentoo.org>
+Date: Wed, 6 May 2015 23:21:54 +0200
+Subject: [PATCH] Install assistant_adp binary.
+
+---
+ tools/assistant/compat/compat.pro | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/tools/assistant/compat/compat.pro b/tools/assistant/compat/compat.pro
+index 171106a..a14e3f8 100755
+--- a/tools/assistant/compat/compat.pro
++++ b/tools/assistant/compat/compat.pro
+@@ -14,6 +14,8 @@ QT += xml network
+ 
+ PROJECTNAME = Assistant
+ 
++DESTDIR = ../../../bin
++
+ FORMS += helpdialog.ui \
+         mainwindow.ui \
+         tabbedbrowser.ui \
+@@ -59,6 +61,9 @@ mac {
+     TARGET = Assistant_adp
+ }
+ 
++target.path = $$[QT_INSTALL_BINS]
++INSTALLS += target
++
+ TRANSLATIONS = translations/assistant_adp_de.ts \
+     translations/assistant_adp_ja.ts \
+     translations/assistant_adp_pl.ts \
+-- 
+2.4.0
+
diff --git a/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch b/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch
new file mode 100644
index 000000000000..4ba6b6ff7417
--- /dev/null
+++ b/dev-qt/qthelp/files/qthelp-4.8.6-compat-syncqt.patch
@@ -0,0 +1,25 @@
+From 37725ccec4d26148dde377d78c71046e8b6a6de9 Mon Sep 17 00:00:00 2001
+From: Davide Pesavento <pesa@gentoo.org>
+Date: Wed, 6 May 2015 22:44:57 +0200
+Subject: [PATCH] Teach syncqt how to handle the QtAssistant compat headers.
+
+See https://bugs.gentoo.org/show_bug.cgi?id=529398#c47
+---
+ bin/syncqt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/bin/syncqt b/bin/syncqt
+index dd94d4d..cc5a7bf 100755
+--- a/bin/syncqt
++++ b/bin/syncqt
+@@ -81,6 +81,7 @@ my %modules = ( # path to module name map
+         "ActiveQt" => "$basedir/src/activeqt",
+         "QtTest" => "$basedir/src/testlib",
+         "QtHelp" => "$basedir/tools/assistant/lib",
++        "QtAssistant" => "$basedir/tools/assistant/compat/lib",
+         "QtDesigner" => "$basedir/tools/designer/src/lib",
+         "QtUiTools" => "$basedir/tools/designer/src/uitools",
+         "QtDBus" => "$basedir/src/dbus",
+-- 
+2.4.0
+
diff --git a/dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch b/dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch
deleted file mode 100644
index bdebfd584317..000000000000
--- a/dev-qt/qthelp/files/qthelp-4.8.6-fix-compat.patch
+++ /dev/null
@@ -1,40 +0,0 @@
- tools/assistant/compat/compat.pro  | 5 +++++
- tools/assistant/compat/lib/lib.pro | 2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/tools/assistant/compat/compat.pro b/tools/assistant/compat/compat.pro
-index 171106a..51b8d5b 100755
---- a/tools/assistant/compat/compat.pro
-+++ b/tools/assistant/compat/compat.pro
-@@ -14,6 +14,8 @@ QT += xml network
- 
- PROJECTNAME = Assistant
- 
-+DESTDIR = ../../../bin
-+
- FORMS += helpdialog.ui \
-         mainwindow.ui \
-         tabbedbrowser.ui \
-@@ -59,6 +61,9 @@ mac {
-     TARGET = Assistant_adp
- }
- 
-+target.path=$$[QT_INSTALL_BINS]
-+INSTALLS += target
-+
- TRANSLATIONS = translations/assistant_adp_de.ts \
-     translations/assistant_adp_ja.ts \
-     translations/assistant_adp_pl.ts \
-diff --git a/tools/assistant/compat/lib/lib.pro b/tools/assistant/compat/lib/lib.pro
-index e50d470..8973d43 100755
---- a/tools/assistant/compat/lib/lib.pro
-+++ b/tools/assistant/compat/lib/lib.pro
-@@ -31,7 +31,7 @@ contains(CONFIG, static) {
- 
- #load up the headers info
- CONFIG += qt_install_headers
--HEADERS_PRI = $$QT_BUILD_TREE/include/QtAssistant/headers.pri
-+HEADERS_PRI = $$QT_SOURCE_TREE/include/QtAssistant/headers.pri
- include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI)
- 
- #mac frameworks
diff --git a/dev-qt/qthelp/qthelp-4.8.6-r2.ebuild b/dev-qt/qthelp/qthelp-4.8.6-r3.ebuild
index cc857aaa17e3..8f88a8daa78e 100644
--- a/dev-qt/qthelp/qthelp-4.8.6-r2.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r2.ebuild,v 1.2 2015/01/26 02:49:28 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.6-r3.ebuild,v 1.1 2015/05/06 21:48:06 pesa Exp $
 
 EAPI=5
 
@@ -50,7 +50,7 @@ src_unpack() {
 	qt4-build-multilib_src_unpack
 
 	# compat version
-	# http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
+	# http://blog.qt.io/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
 	if use compat; then
 		mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 "${S}"/tools/assistant/compat || die
 		mv "${WORKDIR}"/QtAssistant "${S}"/include || die
@@ -58,7 +58,10 @@ src_unpack() {
 }
 
 src_prepare() {
-	use compat && PATCHES+=("${FILESDIR}/${PN}-4.8.6-fix-compat.patch")
+	use compat && PATCHES+=(
+		"${FILESDIR}/${PN}-4.8.6-compat-install.patch"
+		"${FILESDIR}/${PN}-4.8.6-compat-syncqt.patch"
+	)
 
 	qt4-build-multilib_src_prepare
 
@@ -75,11 +78,6 @@ multilib_src_configure() {
 		-no-nas-sound -no-cups -no-nis -fontconfig
 	)
 	qt4_multilib_src_configure
-
-	if use compat; then
-		# syncqt knows nothing about these headers (bug 529398)
-		cp -pr "${S}"/include/QtAssistant "${BUILD_DIR}"/include || die
-	fi
 }
 
 multilib_src_compile() {