Properly fix bug 477316, also fixing bug 478034 that was caused by the ugly hacks in -r1.

(Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key 17A85C72)

3 files changed, 42 insertions, 27 deletions

diff --git a/dev-qt/qthelp/ChangeLog b/dev-qt/qthelp/ChangeLog
index 3948f7af10e2..263f8b1abfdc 100644
--- a/dev-qt/qthelp/ChangeLog
+++ b/dev-qt/qthelp/ChangeLog
@@ -1,6 +1,14 @@
 # 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.9 2013/07/19 06:19:38 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.10 2013/07/30 18:10:30 pesa Exp $
+
+*qthelp-4.8.5-r2 (30 Jul 2013)
+
+  30 Jul 2013; Davide Pesavento <pesa@gentoo.org>
+  +files/qthelp-4.8.5-fix-compat.patch, +qthelp-4.8.5-r2.ebuild,
+  -qthelp-4.8.5-r1.ebuild:
+  Properly fix bug 477316, also fixing bug 478034 that was caused by the ugly
+  hacks in -r1.
 
 *qthelp-4.8.5-r1 (19 Jul 2013)
 
diff --git a/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch b/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch
new file mode 100644
index 000000000000..cc7621969991
--- /dev/null
+++ b/dev-qt/qthelp/files/qthelp-4.8.5-fix-compat.patch
@@ -0,0 +1,21 @@
+--- tools/assistant/compat/compat.pro	2010-10-08 16:54:09.804000000 +0300
++++ tools/assistant/compat/compat.pro	2010-10-08 16:54:37.884000000 +0300
+@@ -14,6 +14,8 @@
+ 
+ PROJECTNAME = Assistant
+ 
++DESTDIR = ../../../bin
++
+ FORMS += helpdialog.ui \
+         mainwindow.ui \
+         tabbedbrowser.ui \
+@@ -59,6 +61,9 @@
+     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/dev-qt/qthelp/qthelp-4.8.5-r1.ebuild b/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild
index c9f90750e551..95678475231a 100644
--- a/dev-qt/qthelp/qthelp-4.8.5-r1.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.5-r2.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-r1.ebuild,v 1.1 2013/07/19 06:19:38 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-4.8.5-r2.ebuild,v 1.1 2013/07/30 18:10:30 pesa Exp $
 
 EAPI=5
 
@@ -26,6 +26,10 @@ DEPEND="
 	~dev-qt/qtcore-${PV}[aqua=,debug=]
 	~dev-qt/qtgui-${PV}[aqua=,debug=]
 	~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite]
+	compat? (
+		~dev-qt/qtdbus-${PV}[aqua=,debug=]
+		sys-libs/zlib
+	)
 "
 RDEPEND="${DEPEND}"
 
@@ -45,6 +49,10 @@ pkg_setup() {
 		src
 		tools"
 
+	use compat && QT4_TARGET_DIRECTORIES+="
+		tools/assistant/compat
+		tools/assistant/compat/lib"
+
 	qt4-build_pkg_setup
 }
 
@@ -65,7 +73,7 @@ src_unpack() {
 src_prepare() {
 	qt4-build_src_prepare
 
-	use compat && epatch "${FILESDIR}"/${PN}-4.7-fix-compat.patch
+	use compat && epatch "${FILESDIR}"/${PN}-4.8.5-fix-compat.patch
 
 	# bug 348034
 	sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
@@ -77,7 +85,7 @@ src_configure() {
 		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite2 -no-sql-odbc
 		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
 		-no-multimedia -no-opengl -no-phonon -no-svg -no-webkit -no-xmlpatterns
-		-no-nas-sound -no-dbus -no-cups -no-nis -fontconfig"
+		-no-nas-sound -no-cups -no-nis -fontconfig"
 
 	qt4-build_src_configure
 }
@@ -89,15 +97,6 @@ src_compile() {
 
 	qt4-build_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 "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
 	"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die
 
@@ -111,20 +110,7 @@ src_compile() {
 
 src_install() {
 	qt4-build_src_install
-	if use compat; then
-		# need to explicitly mangle this as we lack the toplevel makefiles
-		pushd .
-		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
-		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
 
 	# do not compress .qch files