Version bump. Assistant and pixeltool are now packaged separately; qttracereplay has been moved into dev-qt/qtgui.

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

3 files changed, 141 insertions, 5 deletions

diff --git a/dev-qt/qthelp/ChangeLog b/dev-qt/qthelp/ChangeLog
index 7953c669d0c7..86b5e1033b27 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.4 2013/06/17 16:09:59 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.5 2013/07/09 10:43:21 pesa Exp $
+
+*qthelp-4.8.5 (09 Jul 2013)
+
+  09 Jul 2013; Davide Pesavento <pesa@gentoo.org> +qthelp-4.8.5.ebuild:
+  Version bump. Assistant and pixeltool are now packaged separately;
+  qttracereplay has been moved into dev-qt/qtgui.
 
   17 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> qthelp-4.8.4.ebuild:
   Keyword amd64-linux and x86-linux
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 5de9964adb1f..265c28b3864c 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -7,13 +7,25 @@ AUX qthelp-4.8.2+gcc-4.7.patch 500 SHA256 1e28d6035fec1ea45feef2137f9f8ff7d4ecea
 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
-MISC ChangeLog 22360 SHA256 10c61805c93cac417c311afd331197c19cce3e67a552152d12006d67c972a5b6 SHA512 43ccf8483c2e529d96f4b9b424c5f5e55e4e90589d4cf8fcd81865aa8925a402fca5ef7b6107f60a66bf2b02f84896ef04fa22813e72af1c9c638aa0774654bf WHIRLPOOL d3619479aa94b5b9a4b973c49fc5d0e7c2910406d80d7cdd1d460a692e54c23072774a5c9b2bb34934c1108372531be109f978ea5f1d2562083adcc94b69532b
+EBUILD qthelp-4.8.5.ebuild 2999 SHA256 4e677e0937bad5983a8c36bd2ebac4a58ee22999f6193c5ec45b091de2ca706b SHA512 ad5641718fbb277ade80d01d4c0c88d8d63ea0c199634a15d0a19c149fda96dfd53f1d71f78d20fc00715d6462af5ab996fd26f3f43b97eee5f5515da01037c1 WHIRLPOOL 759f3feff72610cfae8258b5adf31435a7dbdfb4f433ab8fed3f9132008f8777c082ed13f2209e9aafd6cece45989c0559949dc4a4d74a7c94c551bb8ed8d005
+MISC ChangeLog 22577 SHA256 82434146d1bbbbbe2d7041ea2996b074cc1d9142226d1fac695b8cf6f19b0fe2 SHA512 0a89a7e80b5929ef1de9a800cf5e9c34eb87c88952d717ab7a4063627ce294acd7e0de0a31a619576bc286abb891576af3e449a78f9c1ebdf5be745e91fc37b0 WHIRLPOOL 20ae96f45c8b0a18dbf295764c078c03086f02cb635cc565e73091de0dfbb51677d6a60453efc24f4eec035bf5c2179f024e9ae1c03e549b53b8c1935be2bb7c
 MISC metadata.xml 1049 SHA256 a9725618619fe6cfea87bfa9cc1ed9e2539d6f3eb36efb02c82575df0f7db42c SHA512 3b8f0eb7f20ab99aa9146eca7c4be9fd58128501dad2bb044d22954509d14ba3e21a0171eeefad31fb58bcc9d3f206542379f014105298c3326bf47be6d7a6a3 WHIRLPOOL 54633e1a14619a0192033d7411abca4dedf26d5ad07bfa37ab44990cafc74ccfe1b9803af2ab3626401d1353d70247316bbfe0d730c61c377099b0491531eb9a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlG/NNkACgkQ1ycZbhPLE2AW8wCcD+P8gkeGboQg/MpfXVfuWfOZ
-QiwAn1UHDyFfis6sNHLKqWIu/5ePDlis
-=ZOt5
+iQIcBAEBCAAGBQJR2+lqAAoJENXLsxwXqFxyYCYP+wRpx8j61YEOTmzivJUVYHyE
+FeiiDrdlJetgonZ5zcTB18Dx1g02gRDTfKLwyyv6czcMsQ2Ye/yZdGOu0e6j/SSn
+oHTlkzkaMnay48MxyhvURlHnpSpd2ag6oRB4Bt715Eh9JRwh5TQmA4AYD5yL6DNM
+hCIg58ML5yH8Momp+r7ygslVOcXKf2cCmGZemdGKRl8fPdv5wsPDy2rnEJulSw4M
+p35A6Vc1gFv71owO1VjuebLrwUPI/lLAcFT1eumItqibN+XyF6MJs1WxXzAiI2Y9
+vBfbyam4BzANFtzp4cSMA5lmNCm6qyD5d0jNkCtfq+EkHeodLifTJzRu0sC5x4Za
+UtLQqGoDvVKIcZNKS4vbi5KVsLPIBYhvRG8ZicbG74UKH/MiYKLiUvpmOmvBLhOR
+QfcEDgk7KO7iAjHLG3xnl0GZfSyLppWo9JTKUyFqBPYIP09qi9hY5p4VQ375Mwrs
+/St8y1Wp1bg/di1stWMh1YghU294j1GAfnWEZSVs0euq2alhPFw1C8LxrPYuq9JK
+Kf3BPrzPF1F9rsYf6WLIxGdL807bBdxykjEvfCmJ5I1qM9bWaJUOA1K8PcE86jyY
+2SWpSXY/t2gc9P3kUxnGbRoGXMVaMDhM+marAGGF8zULRdGOuZLb8dWoSYOv6Vmk
+rsIrdRfd2qWq+5EvdFBx
+=aMMQ
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qthelp/qthelp-4.8.5.ebuild b/dev-qt/qthelp/qthelp-4.8.5.ebuild
new file mode 100644
index 000000000000..71d07c8cbc2e
--- /dev/null
+++ b/dev-qt/qthelp/qthelp-4.8.5.ebuild
@@ -0,0 +1,118 @@
+# 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.1 2013/07/09 10:43:21 pesa Exp $
+
+EAPI=5
+
+inherit eutils qt4-build
+
+DESCRIPTION="The Help module for the Qt toolkit"
+SRC_URI+="
+	compat? (
+		ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz
+		http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz
+	)"
+
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-linux"
+fi
+
+IUSE="compat doc"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=]
+	~dev-qt/qtgui-${PV}[aqua=,debug=]
+	~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite]
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		tools/assistant/lib
+		tools/assistant/qhelpgenerator
+		tools/assistant/qcollectiongenerator
+		tools/assistant/qhelpconverter
+		tools/qdoc3"
+	QT4_EXTRACT_DIRECTORIES="
+		demos
+		doc
+		examples
+		include
+		src
+		tools"
+
+	qt4-build_pkg_setup
+}
+
+src_unpack() {
+	qt4-build_src_unpack
+
+	# compat version
+	# http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
+	if use compat; then
+		unpack qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz \
+			qt-assistant-compat-headers-4.7.tar.gz
+		mv "${WORKDIR}"/qt-assistant-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
+
+	use compat && epatch "${FILESDIR}"/${PN}-4.7-fix-compat.patch
+
+	# bug 348034
+	sed -i -e '/^sub-qdoc3\.depends/d' doc/doc.pri || die
+}
+
+src_configure() {
+	myconf+="
+		-system-libpng -system-libjpeg -system-zlib
+		-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"
+
+	qt4-build_src_configure
+}
+
+src_compile() {
+	# help libQtHelp find freshly built libQtCLucene (bug #289811)
+	export LD_LIBRARY_PATH="${S}/lib:${QTLIBDIR}"
+	export DYLD_LIBRARY_PATH="${S}/lib:${S}/lib/QtHelp.framework"
+
+	qt4-build_src_compile
+
+	# ugly hack to build docs
+	"${S}"/bin/qmake "LIBS+=-L${QTLIBDIR}" "CONFIG+=nostrip" || die
+
+	if use doc; then
+		emake docs
+	elif [[ ${QT4_BUILD_TYPE} == release ]]; then
+		# live ebuild cannot build qch_docs, it will build them through emake docs
+		emake qch_docs
+	fi
+}
+
+src_install() {
+	qt4-build_src_install
+
+	emake INSTALL_ROOT="${D}" install_qchdocs
+
+	# do not compress .qch files
+	docompress -x "${QTDOCDIR}"/qch
+
+	if use doc; then
+		emake INSTALL_ROOT="${D}" install_htmldocs
+	fi
+
+	if use compat; then
+		insinto "${QTDATADIR#${EPREFIX}}"/mkspecs/features
+		doins tools/assistant/compat/features/assistant.prf
+	fi
+}