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

Package-Manager: portage-2.2.0_alpha190/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

4 files changed, 65 insertions, 29 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/Manifest b/dev-qt/qthelp/Manifest
index 4779bf7ecb3e..8140f5121df8 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -1,11 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX disable-webkit.patch 872 SHA256 b6fd53493f8f663d8d23a174d20fceb5a5258275ce77eb5d6a6115322e5beddc SHA512 9c05843197aab2a5e49aefb4aaa8e1ee73b4c410ec54ede9ca958672962713b1949493447a06bf7aaa1733bf22b3a67a77f94e4063b47bb30bade1522d29830b WHIRLPOOL 13848f7cc0f8df9b05da590cc61b7872f1eff7cc09d004d77c78b459ad5c0ae6623eb229484e256a3e582d43fd6573f06dbc01ccadd3cf6cb1f0d1d84e9bc92c
 AUX qthelp-4.7-fix-compat.patch 2987 SHA256 eefa0a24d8dd708b86655f67179182e479fc67f0e58b7a789701428e5ad5f9bc SHA512 db10e2ba5fa7c513b39faef25dd160bc9cef8f28b6b11e879b66dadbc7bb9fbc2bfb1b25363c0d0d9c09cd97fba8734898ad6edef4a311234be65571c74c63ce WHIRLPOOL c4faaf70e3c836164abcafb3c1e6ec830e6e1871952291c11e3b8573dc51c8c6cb268c8455425cc6982e709f8f7cdc9a71865cf96165c504b9555776d884023e
 AUX qthelp-4.8.2+gcc-4.7.patch 500 SHA256 1e28d6035fec1ea45feef2137f9f8ff7d4ecea0d8236750f974802fb98200c83 SHA512 1948a7b47e5e15da47408af18c518762818542b42f2768a73acba698f23fca837a690be9821974be01662b45b7b3823b314577fa79472cf3f96620c0a1155a18 WHIRLPOOL 6712b21ffa4d23786780768df470dd81e90de40b775417c9ce9f9ba3b30b398ce15c932a01678331d6c4819c71a99be22cf3442360bf440aea56dc943aa1dd1c
+AUX qthelp-4.8.5-fix-compat.patch 537 SHA256 625a9f9e1a0dd4c9e44ec40c119a88922f387028c988dce5ecca6dca848799ac SHA512 2de58b8830d82ee35d2d74c2809930c0a5e2df8be14eee73464c875100b9106249cbaefc7f4218f46a298908755312d6a1fd58013f089bbf105c931f93728b39 WHIRLPOOL d27b279fcfefcdf75b863f1ecab68d051c626eb2ff0d994545ec596133ffd528fe5aa5e94442f699f5fb1bb438e46d7b1d06daf295a97e475eab12a315421340
 DIST qt-assistant-compat-headers-4.7.tar.gz 448 SHA256 73ae604834cc89d6c67bafc65bb5d3cadaec23076d02711fc0c30a85df3d8580 SHA512 da14cb9904591f4389862cf1e1c96f923e72b7b904d57787d68feae2c90d52bf713e930442aa3abd4b457c3cc66c88b94e23df5fc25e33e01f1ed4d3093460bb WHIRLPOOL 26c42c101aab36a8d0355f1243226f6b8bd5a477c5aafece7e036f18a9fcfe98ae016042befe494fca0c42b825e29539825466c1ddb720102fa6c65e9cbaec61
 DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 SHA256 e698be8fc0d32c5f0b5b46cafcb8f615accaed524b864e58b99b64b7b5549c2d SHA512 a4050d93e448d29004d71d5ea670e60242f1272399f65db084dd928150f26404d37544d011d75bbb1c62f227752f92b86a4f4382dc54f0681a3df6da738af106 WHIRLPOOL 9c2822ae2f1ee7c4f63236cc95eb0cb025f088e1f13e0a154fabdad5af6209b0e4cdda86d23061bf35fe5919a1909ed162bbc4835da79fdf1b187461aa948a1b
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 EBUILD qthelp-4.8.4.ebuild 3575 SHA256 db5ccfa61f95ce4bc49817da4d102dc38aade57dca0f51bc18fffa46833a62cd SHA512 7617222713ba7be74271469b483c98b7478673d2c89a3dbba1ad7e9bc4405733a6f02efa7f01243b5f54da8bf70ce4a76fb345ead413a088a76612fe9b4300e7 WHIRLPOOL 44c1a0c10dae94aca721ad280247f97db3a0b8b2bebbcc6841c11fe70e4391c6b6592fac138d2945548813efa59289ad1088d151405b72c3eab9e138930b3856
-EBUILD qthelp-4.8.5-r1.ebuild 3928 SHA256 abebd24eef0b0e2fcb272fc69d8e0eb90b7df553d7efd6bad945e96297330599 SHA512 cf4ed7770bb77e5d5894cf7fb89271021be356d7306f5df2224fe968c608285998b1140cd35105d449bcda4917b4d9902083461edb540fbb3b38e51bc43a9178 WHIRLPOOL 1c73ed4dc823adeb67659141a0134d1d742548a9d6dff35efabfe8e6a18803b4bb71ab98829b376f1834292317b9aca93629f9d7d54a06abdac9adbf912ad6b7
-MISC ChangeLog 23143 SHA256 9262af7dc2d2cc746f9a66024fe06e9bd7775079decd7138f89fe1d1fc458117 SHA512 26e1afc1eb199c5a1ee01a716d2f6ffd9b9213a77f5f6f17b33c64be4f6db80588b3fb28d098619cc8188b70eb0d397eebc9a3b18d75195dbac4ee7747d0ec32 WHIRLPOOL 4c1b8d6a84cb5382f87e150f69a060619e31e79c189e909d0be061d3fbbf3acf4bed0448ee8f0a861e6eac357f1c3957ff40441e40ad5e6e5e60c6dd48674c9d
+EBUILD qthelp-4.8.5-r2.ebuild 3214 SHA256 841326033484e76a0cb321fd876a4fc99eb1d75bd49f597d8024a898c710b140 SHA512 f1544404f95d3d115052da2d200d7ef605647480d79d794c9f87a80efcf253cc5f57c4e05015ecc87fa11d75e49337a0287d0e27f82c8c29eb9468e9d617b401 WHIRLPOOL 29af6a81f1170534f597b0cd42e217a4a8e9638f4a6b2b051ddede3c01d3e1042f51ba4787121df9c58698c52ecfcfcb77795a8d18d5a6913b7809c9a0c1f7d7
+MISC ChangeLog 23410 SHA256 afc7ed00641fa1b985b2f02a5d93695f8c5625087859fe81970db06df2b42315 SHA512 8b5a7a51159c71e8fe9ec2e7a77508cf5c46b6006b4c8810732054af5bd06eb47a58d0b0343b16a8cbe34723a7c5decae0dcebe59f42dfa441686db46cafaec4 WHIRLPOOL 1b91cf4bf5e446799e5042d79fb4e694efb1be3858cbe528304a238ff481277995705832266702faf9d2f8f160dad485e9dba77926b9d0974fc4efaa4a7f1350
 MISC metadata.xml 1049 SHA256 a9725618619fe6cfea87bfa9cc1ed9e2539d6f3eb36efb02c82575df0f7db42c SHA512 3b8f0eb7f20ab99aa9146eca7c4be9fd58128501dad2bb044d22954509d14ba3e21a0171eeefad31fb58bcc9d3f206542379f014105298c3326bf47be6d7a6a3 WHIRLPOOL 54633e1a14619a0192033d7411abca4dedf26d5ad07bfa37ab44990cafc74ccfe1b9803af2ab3626401d1353d70247316bbfe0d730c61c377099b0491531eb9a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQIcBAEBCAAGBQJR+AG8AAoJENXLsxwXqFxyt7EP/jFAyVOfDUo3NA9+CQoOlQ04
+i5R+1KW63ZTSvwgILhyw5hjLCERYDx1uEsPeWk2pEFmnrAgvtp+WtdK75jDDdkEt
+jgCfJNFGICB305Aeq5TOWR9vWiL5nzbJRGMwM7LTKEUVFOQWMXeuqn8ePsM9o+XD
+J4FfRBjXOkVdiLXjhlA8w3i6TFj81HvkG8EbeEVzAcgAUXcDpVbVCzPmc2htSRNz
+OA59eD2wjd8PrXXnenQEDFyoeat6IOF8AiXk3xRdIR9ID1E/M5wghwYrJzIHfRNb
+mz6I7bR5/pfJbRz2nr6YifsZjXpQg2IfH9GhfeHDuV8BlUqxphrbJL1uojBeh0fe
+qAwQdhik/H5sF52Vlf0xbWGYmLIryAQrg7qTDeoGdtge8PYhM0JEooZytEnk/Mlx
+MP7VtXwFlbmeu+Ef6H41OT5VIdrpHVbdIXal0npy3PvlBNs5dV+3XlS29/lHAKf1
+XyDVSe3HrcO5QftDAc5oGBA4XhzcaYSOJAfRelyaVsPxDJI5hPMFJslu1443Ou92
+7uAWiQ2Iog3WAfyALv64OMim+w3hyHPbv3JyNbt1dos0iQly/AzGw+8BREsc4Od+
+G7vQrCajIeclZ3zlWlWr1ICc6sqsckOA6wIr/sQuO1z5FcdrW3BqCTJcw6yczRHE
+cEOdXHd4egpG0tkZRh9O
+=SEW1
+-----END PGP SIGNATURE-----
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