Version bump.

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

3 files changed, 79 insertions, 6 deletions

diff --git a/dev-qt/assistant/ChangeLog b/dev-qt/assistant/ChangeLog
index 4b361e46662e..741f89f43b83 100644
--- a/dev-qt/assistant/ChangeLog
+++ b/dev-qt/assistant/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/assistant
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/assistant/ChangeLog,v 1.28 2015/05/16 11:24:19 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/assistant/ChangeLog,v 1.29 2015/05/26 18:16:12 pesa Exp $
+
+*assistant-4.8.7 (26 May 2015)
+
+  26 May 2015; Davide Pesavento <pesa@gentoo.org> +assistant-4.8.7.ebuild:
+  Version bump.
 
   16 May 2015; Pacho Ramos <pacho@gentoo.org> assistant-4.8.6-r1.ebuild:
   ppc stable wrt bug #530238
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index f53eb6e84829..c559c6e14a32 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -5,16 +5,30 @@ AUX assistant-4.8.2+gcc-4.7.patch 500 SHA256 1e28d6035fec1ea45feef2137f9f8ff7d4e
 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 qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 DIST qttools-opensource-src-5.4.1.tar.xz 9262024 SHA256 11de0f8573843194b134e32af49594514498fadc4fc0b3b0333540fe1f671f72 SHA512 1e1dce0d6d587bdfa8d3ed20db0dbf3c1db3c1ffea4ea34741a9069ca08f3ab478e39245b26bf9f1c97c28650beb396e433e8b54a7f0b6cc5e93e3000e39e7d8 WHIRLPOOL bb8672cb64d39d3786f3db64f5d215d122ee62144406d970a2e37b019fd64ed08f2109e8dd64f23b6926e1bb9f21839805149bec3e5fff200b465e59ecceb286
 EBUILD assistant-4.8.5.ebuild 1598 SHA256 1cdda8bdbb8211fa9b12dae0ba56233e5f21e2f2c8b8d10eede7146d6ab10777 SHA512 aed691160820937386f7d2cf9416ebdd89bdfccef555ef92ce0d6fd82af56dcb9ce11d20be3058ee3cd8317a5fded84dd3d35cb3fa33dbef9bd043a31ad3e8e4 WHIRLPOOL 8e896db7d39b62bfb2a5a8794535c9a0385a117a8355462f83c5f9242d3738fcd3ab9bcd513aa188654d73806e802881f6341e7d98ce0c1e073d380c68157e6b
 EBUILD assistant-4.8.6-r1.ebuild 1668 SHA256 aa545a7a2eab61c1bb761d68bf7ec6797309158d336cce7c67daee8d7e835395 SHA512 074eabd38393271bf74fc779ec8ea1b65c51c1559680f89214ce96ffbb7cb809a0ad460008f2e214ba8978d5594b7274d5d25072577f4c172edcf694e68cdab7 WHIRLPOOL 67e1096c82b44c7263af060a8a1cc36a2e23da709614de779c7dfa1cd0ea0d43a27ab750ab2ff9753eb925ec1c5533e46c2151c3bd66d7d366f7f649d1cfa9c3
+EBUILD assistant-4.8.7.ebuild 1643 SHA256 ffad2775a6476802bc6501762db76704e00034565238ad1fea12ef2070d6d47a SHA512 df8dba6c60a7d066ea022ab89ee4186e65ed20a4b80d41f7bb6af2c5e8cfafc42e86b660f38112e49c79100c181c993e21b07fbd83eac9a823fcf869a78ac8d6 WHIRLPOOL d54b150c0ed5c681741de268ffeec30f500d41f9e368b32d530b5c8dc3a9d09d393e2f7b128d44ca616df9accce6440a24d1db1452c02ad7ea5ae89661295ac4
 EBUILD assistant-5.4.1.ebuild 974 SHA256 84798ca9d998c2bd1790304b6d43986b8b20bcbc91c9357ae4964ba78b5d1cac SHA512 e355f40e1e7257dd696d89d8a97fd55786147657b77720d7cedfdf8338c3902eb99d5734a02f31b791d99e693721184e235db7ec6ec711475a4db055ef840387 WHIRLPOOL 52b831948325c9678fb311a1088b23371d1dcca3d39881eca5bd7831a7be814610401eda43b21655030b3fcab7f4a7fd4a1c8089852ef145a1cef5072d51feac
-MISC ChangeLog 3562 SHA256 c755efa532837da154b9545ce028ca4dd8d8cf1fdad927fdd31d9fd71299f7c5 SHA512 760c00f4c2bae6291eb03ee3888634178a94903d009aeb0a3c50de3c775793cd220fc67f8c29a607fa27fb7018851a957a176adb24dd0a49cee4e76dbb051943 WHIRLPOOL 6cfdaf412b890fbb042b31f4528c5452f21d0ccc995e2221c7a0ba01678f263940e79cf04fbc729fe39732809b0b54fd5f1cd95710264953ae6ffc6cab38ee25
+MISC ChangeLog 3685 SHA256 2eb22e489380a8163499bfdeb5a9a3fad87da3e16946d7959742533d11c03a4a SHA512 8a74084d892343d578c66675003dbb09fe94fa2d17439f29ebf4838747255a745f76ec92cc1d8b169d2898405eab17873495959f2de3ead8c3d1b69921530814 WHIRLPOOL 13ad28d3e98f90c7c1fe3786eb6342a502458b3a5f9b98ae7fc0d02d9f3789dfc453ed7c675203a2d7334149cadc738d402891e084eed0ea49e0730786fcb5cc
 MISC metadata.xml 415 SHA256 fec2eeff3a64eeaa82d79ad5efa721bb975f8073c182f9dcacd2c72009e9f8b9 SHA512 9aa9a89b39c3acffbd34f25beca742c89ff7f1b6a06e1fe95d800369e6ea2a4629eaad1884c6a601b39b9ae12230580cec2f44ceb51c0fad93a512153a302d3e WHIRLPOOL a64dfbcbc44161555ff6a6461189abc47cf4e34b705a6376d3937c26099eecc9f7228812e1fe3514afbcb3cbe1ec24e5abcc941f13b48053ea57aeb0429a18ba
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXKOUACgkQCaWpQKGI+9RRSQCeOYB79VvP67z74KX+dJBXs9y5
-Kl0Anjb9inJNJTX6X9eIImmtrNh7kYKm
-=JM15
+iQJ8BAEBCABmBQJVZLhtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV96DAP/ixwKfHmAynVmqjWFtw3hRvQ
+3gMpWIBuFBuR1Z/oVbWWyUwLzfReHPz/8LbqdNCRlNf0/oGJMygaPZ0V3y1dVbbB
+N74E0OcqqnBclnSXflc0FVwCXRWR5bLLULGUcpVvU6X89hZONAwsTxUGmSSx1BtV
+vQQ4eWnMaP1cwyZP/K4geuY2jwzohSClJ2O8GvflFCdzu1vtAh61HXu5dcdqpLvV
+Fl0x6rRv17ogETlNMJGjyj20HNoQeUjeAOGJVFMM6nBnypbYEsq1KxPaNA8vz5p9
+zwDxoAGr+LXzUKvren7t6mAKRc1L6zZRnWoCepBCqEF6mUW9GITvaQ6Rh/zy69mt
+69Nq05jY8o+jkZpgoeDrDgt65nBxlpQsmkwxLxutELOB5yfdSVjItKMgRP9nFmuJ
+n4WYY1TefKze4bW6dWDAafdh+XEg6eWrGz9IpWBdjHocgY7Y/+v3j4EJ5uEgl/ir
+dErAx9bJ5e8HMTSAA6qqxLdYCFdVVUyzGO3qYc2pP5Arex+lkHScoOkWb3b45CG4
+yliqiqa50p1e+b+/H0cqDYGU5V5huma20MXpky733aE1+MtuojIPUUU5LUL1qD/D
+piltGFJ+l+K/ydNJn0N6phfoTpnCyxvH8r3gpGW0vVcuGWOVSvbU4nzRoVu/QWSb
+qV1K6sHsYI3rjzFSXpML
+=eHm7
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/assistant/assistant-4.8.7.ebuild b/dev-qt/assistant/assistant-4.8.7.ebuild
new file mode 100644
index 000000000000..d2cbfce26d55
--- /dev/null
+++ b/dev-qt/assistant/assistant-4.8.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/assistant/assistant-4.8.7.ebuild,v 1.1 2015/05/26 18:16:12 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} == release ]]; then
+	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'
+}