Proper fix for compat bits

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

3 files changed, 22 insertions, 7 deletions

diff --git a/dev-qt/qthelp/ChangeLog b/dev-qt/qthelp/ChangeLog
index 48b38adc79b2..3948f7af10e2 100644
--- a/dev-qt/qthelp/ChangeLog
+++ b/dev-qt/qthelp/ChangeLog
@@ -1,6 +1,12 @@
 # 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.8 2013/07/19 03:20:34 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.9 2013/07/19 06:19:38 patrick Exp $
+
+*qthelp-4.8.5-r1 (19 Jul 2013)
+
+  19 Jul 2013; Patrick Lauer <patrick@gentoo.org> +qthelp-4.8.5-r1.ebuild,
+  -qthelp-4.8.5.ebuild:
+  Proper fix for compat bits
 
   19 Jul 2013; Patrick Lauer <patrick@gentoo.org> qthelp-4.8.5.ebuild:
   Adding compat bits back in that the splitting disabled #477316
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 32d51560f496..4779bf7ecb3e 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -6,6 +6,6 @@ DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 SHA256
 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.ebuild 3454 SHA256 f84445c5b6fe328e49b00468f1f23910628c95b679d8f5bf37edce3cbea301c8 SHA512 60f22d6f65036373dddc289c8f157c72685383834426c05ad47614a3b10174c64629dc3366b961d56e3e0a48d2f3ab9960c439543f8d949d18153c87728d99ae WHIRLPOOL b6a2e50e13d4c2ed5c608ba3708fd3e6a05f3364dc27893a0b1652fb2afbdfd8f1c6f7d99cdaefb6e1eac302333a797c6aa9741074148c934fcdc84c9ea5ad7f
-MISC ChangeLog 22982 SHA256 ad79e7af772cd6d20bdc64ae5f67c81e332ac6d2d6b15b2b201f8b9f94b78596 SHA512 62d700c2f8b9d5331d8a52be265122ae3d8adb8ba6e3e58b5e2789a0cf2574e4dce4362748257a93b62830c57d560c544692996f765bdddd505ec873127c8d09 WHIRLPOOL b7c91c613609cd88a26fb2c8d0b3de70e1169dc89bb51e37e7754e072f01b3272fed513e583a0f0c3e4f36f84b122f67d00e2798422613f61ac3eb362e8c73f1
+EBUILD qthelp-4.8.5-r1.ebuild 3928 SHA256 abebd24eef0b0e2fcb272fc69d8e0eb90b7df553d7efd6bad945e96297330599 SHA512 cf4ed7770bb77e5d5894cf7fb89271021be356d7306f5df2224fe968c608285998b1140cd35105d449bcda4917b4d9902083461edb540fbb3b38e51bc43a9178 WHIRLPOOL 1c73ed4dc823adeb67659141a0134d1d742548a9d6dff35efabfe8e6a18803b4bb71ab98829b376f1834292317b9aca93629f9d7d54a06abdac9adbf912ad6b7
+MISC ChangeLog 23143 SHA256 9262af7dc2d2cc746f9a66024fe06e9bd7775079decd7138f89fe1d1fc458117 SHA512 26e1afc1eb199c5a1ee01a716d2f6ffd9b9213a77f5f6f17b33c64be4f6db80588b3fb28d098619cc8188b70eb0d397eebc9a3b18d75195dbac4ee7747d0ec32 WHIRLPOOL 4c1b8d6a84cb5382f87e150f69a060619e31e79c189e909d0be061d3fbbf3acf4bed0448ee8f0a861e6eac357f1c3957ff40441e40ad5e6e5e60c6dd48674c9d
 MISC metadata.xml 1049 SHA256 a9725618619fe6cfea87bfa9cc1ed9e2539d6f3eb36efb02c82575df0f7db42c SHA512 3b8f0eb7f20ab99aa9146eca7c4be9fd58128501dad2bb044d22954509d14ba3e21a0171eeefad31fb58bcc9d3f206542379f014105298c3326bf47be6d7a6a3 WHIRLPOOL 54633e1a14619a0192033d7411abca4dedf26d5ad07bfa37ab44990cafc74ccfe1b9803af2ab3626401d1353d70247316bbfe0d730c61c377099b0491531eb9a
diff --git a/dev-qt/qthelp/qthelp-4.8.5.ebuild b/dev-qt/qthelp/qthelp-4.8.5-r1.ebuild
index aabfb48c1e98..c9f90750e551 100644
--- a/dev-qt/qthelp/qthelp-4.8.5.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.5-r1.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.ebuild,v 1.4 2013/07/19 03:20:34 patrick Exp $
+# $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 $
 
 EAPI=5
 
@@ -92,7 +92,10 @@ 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 || die
+		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
@@ -111,10 +114,16 @@ src_install() {
 	if use compat; then
 		# need to explicitly mangle this as we lack the toplevel makefiles
 		pushd .
-		cd src/plugins/accessible && "${S}"/bin/qmake || die
+		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 || die
+		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