Version bump (bug 510042). Add multilib support (bug 498010).

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!

3 files changed, 66 insertions, 23 deletions

diff --git a/dev-qt/assistant/ChangeLog b/dev-qt/assistant/ChangeLog
index e1318220bb4d..51beb32139d3 100644
--- a/dev-qt/assistant/ChangeLog
+++ b/dev-qt/assistant/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/assistant
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/assistant/ChangeLog,v 1.14 2014/10/06 09:53:19 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/assistant/ChangeLog,v 1.15 2014/11/15 02:22:22 pesa Exp $
+
+*assistant-4.8.6-r1 (15 Nov 2014)
+
+  15 Nov 2014; Davide Pesavento <pesa@gentoo.org> +assistant-4.8.6-r1.ebuild:
+  Version bump (bug 510042). Add multilib support (bug 498010).
 
   06 Oct 2014; Michael Palimaka <kensington@gentoo.org> assistant-5.3.2.ebuild:
   dev-qt/qtwebkit:5 no longer has a widgets USE flag.
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 50261bae503e..3c0823ee4cae 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -1,29 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX assistant-4.8.2+gcc-4.7.patch 500 SHA256 1e28d6035fec1ea45feef2137f9f8ff7d4ecea0d8236750f974802fb98200c83 SHA512 1948a7b47e5e15da47408af18c518762818542b42f2768a73acba698f23fca837a690be9821974be01662b45b7b3823b314577fa79472cf3f96620c0a1155a18 WHIRLPOOL 6712b21ffa4d23786780768df470dd81e90de40b775417c9ce9f9ba3b30b398ce15c932a01678331d6c4819c71a99be22cf3442360bf440aea56dc943aa1dd1c
 AUX disable-webkit.patch 872 SHA256 b6fd53493f8f663d8d23a174d20fceb5a5258275ce77eb5d6a6115322e5beddc SHA512 9c05843197aab2a5e49aefb4aaa8e1ee73b4c410ec54ede9ca958672962713b1949493447a06bf7aaa1733bf22b3a67a77f94e4063b47bb30bade1522d29830b WHIRLPOOL 13848f7cc0f8df9b05da590cc61b7872f1eff7cc09d004d77c78b459ad5c0ae6623eb229484e256a3e582d43fd6573f06dbc01ccadd3cf6cb1f0d1d84e9bc92c
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
+DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qttools-opensource-src-5.3.2.tar.xz 8993140 SHA256 5d39cdc63d43ae1f954517e517d9a5c24f2b2c91e22dab3ae6b5b81deb49983e SHA512 f250e8c309e47cd5196ccc89fb5a0d384b40bbefb243f2ad9dafc6b9096bd5fa540cd471322e3601afd0b88906eebcdf03097df079c80f3816d99d5a46b473cc WHIRLPOOL da5b6ad57dc0ecf6c67d46f91b0fca0df797a92918389b385819677abaa0d8d7866acb0b4ccdcb2a326cbf679f67f0de05fb9de497d5e8c2fa8c4ea83cbf1c68
 EBUILD assistant-4.8.5.ebuild 1598 SHA256 1cdda8bdbb8211fa9b12dae0ba56233e5f21e2f2c8b8d10eede7146d6ab10777 SHA512 aed691160820937386f7d2cf9416ebdd89bdfccef555ef92ce0d6fd82af56dcb9ce11d20be3058ee3cd8317a5fded84dd3d35cb3fa33dbef9bd043a31ad3e8e4 WHIRLPOOL 8e896db7d39b62bfb2a5a8794535c9a0385a117a8355462f83c5f9242d3738fcd3ab9bcd513aa188654d73806e802881f6341e7d98ce0c1e073d380c68157e6b
+EBUILD assistant-4.8.6-r1.ebuild 1662 SHA256 0f0dd44b13e494451c9f0a43d92de47fcf5aaffe366d78c3ba4c0cddd1757b2c SHA512 20c562dd0be51fd245883ccda076c0c447f1f1b5b81f36fae87fed26ad44c35e85624159c7adf42dd90e58324d63e4b6c9eddfe75940398f8fd78e6d84294da5 WHIRLPOOL b79810972f093c76ca9ab5306b8b0553752166bbb350b7b7d91fda7f1f3b5349839a2ec4064d227f11812aac92be35dc0b20889c323d07d287219fb50122a294
 EBUILD assistant-5.3.2.ebuild 957 SHA256 1b1b03e68a6eba62543f723b1608eed4ed747851f1f2b869cabb354124cfb393 SHA512 750223182cb6b68f476f074bb37b4f5e037ad3389d3dbf29863a0037ce40d414c43078d729744deae3419d9f9ed8f92b4c2d11db197f5ed41c990a31642bc7ba WHIRLPOOL 913671b59f37a07bfa124897a57700f8023c05ef0a3e862a2075d290fcd5039dc80be1df9c24271d67f2708cb5fa08b0cc2e86e03adbd330b0b155077191f0e9
-MISC ChangeLog 1997 SHA256 a2a903370ecbb31fe7acc8c018880750c48f1b871a18e577e0879188dcb9aaf4 SHA512 7fc56c0937a56394c666c250324b9081ee0b1c66fb629e0fa53037487e9d925b4d8b25cebf03f2d2871c49b6e39940553726d6d7c973683b39ddf321a85080b4 WHIRLPOOL ea7e56461ee1a894934605ab23e2c6fb9eb013b1267feef6fecdb4bca7cb0f3f20daa66acebb143934d4d7d056b24c7cd735b4a150898e1159f8701fa16deada
+MISC ChangeLog 2169 SHA256 f66ccf31f2dafc116c2422db1a31f0d96372535c8200abc8c6e13d313725cc95 SHA512 5b7a413030d6fb115573d4585b25d0ada7b4234d97506be5e6940293eed4e2b5c98bc55735f36991756fdb835786da4a1b098d82e83dda21e75f6d5858db101c WHIRLPOOL 954aebc3922f3316f478b42abeb89f5f6e5fd74d00799ace89463c0dc8f9c66060f3cd8d7c4c47d3920d4499ff27e48a15aa28167cd3b60feb89957c3b040a0a
 MISC metadata.xml 424 SHA256 b62b25809f9c9553196d5c5d30ee0c0743a7d61ea187a30da41f7db4e9cf2757 SHA512 fd8672a63021d6871560fadaeb1cb7d7bb29e3833d6250e57e6ed02af0e60624d1da62cb458c0a9e63452ed4b179a967575c7f557584a987c975d7106064e4d5 WHIRLPOOL ba51ec14f8145452e6e6056a6350c5adb4fd1c713aa74bfc0aabc6e49cfa8785e0e2bbc59c52df1aa87fb164e1a09eb6ea75a38c404e731e13aff7c357cb9fbb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJiBAEBCABMBQJUMmaSRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
-MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7JmID/9qldo1Lu/09k7OK7rST/A9vl0F2j1/it1qNK/fC35UEy7wWtNi3l/xpzL7
-d71c8xt1GmOe7Ew9saGyHmf9AotpC30ZrbBVI4Du3yakIrR4BCU1J/TThju1n2v1
-sgv8k4JR1gchtLZ7OqR4cOi8KB6T/xY9EWr7ihiDAWBSK3IG+/lReZoIOvhr+NJp
-70vK59OWLH6jBssU8txAx2GtMrX5whXlD3sRFFzVVP2ksA6MDSGz0tTpfBjw4B2J
-w128PjQr6sYcLotNZWrrFuyjjr0zbuaWfPzNLJbvrNHePW/AV9yD1c7pB/LQwFFp
-Fl/eHrYZrfR5j08tOxo5c1Y55ytO5rNUFtbQcW+HglX0ijKm3Ax+nRydIjjMblxj
-WGIHT1/I6eiF5cGl7Rw6I0yN8OH20cUWm8rpiEvyiQ8jFwAw1tJwdUzV5xZxIOFQ
-+RfUQMvb3V1AlJzf/xxJXWM1Bm2P8c9XVl7TSj4JnoNYRQMdpfTnzDtuQxZfyBI8
-hK8vfXqFxKdssguVuvm/q7EhfQC9C7eFO4gpxudRBY3bRDMxgy9PDzUyo4TqVUw5
-m53yquYI7B1VBKo8Wwu1FbAwtGrt56rgOcxf0f4AXP+mGx3wJuqzJkH7rCojjNI+
-5/3jelHN6Fa5uC7P4KphpQ6ts6EbKxliQaxPQffCU16xCoojVg==
-=LyWZ
------END PGP SIGNATURE-----
diff --git a/dev-qt/assistant/assistant-4.8.6-r1.ebuild b/dev-qt/assistant/assistant-4.8.6-r1.ebuild
new file mode 100644
index 000000000000..d7c369df51e9
--- /dev/null
+++ b/dev-qt/assistant/assistant-4.8.6-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/assistant/assistant-4.8.6-r1.ebuild,v 1.1 2014/11/15 02:22:22 pesa Exp $
+
+EAPI=5
+
+inherit eutils qt4-build-multilib
+
+DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
+
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+IUSE="webkit"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qthelp-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
+	~dev-qt/qtsql-${PV}[aqua=,debug=,sqlite,${MULTILIB_USEDEP}]
+	webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.8.2+gcc-4.7.patch"
+)
+
+QT4_TARGET_DIRECTORIES="tools/assistant/tools/assistant"
+
+src_prepare() {
+	# bug 401173
+	use webkit || PATCHES+=("${FILESDIR}/disable-webkit.patch")
+
+	qt4-build-multilib_src_prepare
+}
+
+multilib_src_configure() {
+	local 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
+		-fontconfig -no-multimedia -no-opengl -no-phonon -no-svg -no-xmlpatterns
+		$(qt_use webkit)
+	)
+	qt4_multilib_src_configure
+}
+
+multilib_src_install_all() {
+	qt4_multilib_src_install_all
+
+	doicon tools/assistant/tools/assistant/images/assistant.png
+	make_desktop_entry assistant Assistant assistant 'Qt;Development;Documentation'
+}