Add missing dep on qthelp with USE=doc (bug 509476)

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

3 files changed, 43 insertions, 26 deletions

diff --git a/dev-qt/qt-mobility/ChangeLog b/dev-qt/qt-mobility/ChangeLog
index f6e23b35f4b9..1c36a0fc6592 100644
--- a/dev-qt/qt-mobility/ChangeLog
+++ b/dev-qt/qt-mobility/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-qt/qt-mobility
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-mobility/ChangeLog,v 1.5 2014/05/04 12:14:52 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-mobility/ChangeLog,v 1.6 2014/05/23 13:03:55 pesa Exp $
+
+  23 May 2014; Davide Pesavento <pesa@gentoo.org>
+  qt-mobility-1.2.2_p20130703.ebuild:
+  Add missing dep on qthelp with USE=doc (bug 509476)
 
   04 May 2014; Markus Meier <maekke@gentoo.org>
   qt-mobility-1.2.2_p20130703.ebuild:
diff --git a/dev-qt/qt-mobility/Manifest b/dev-qt/qt-mobility/Manifest
index c6af9a42cf68..7c6285358f1b 100644
--- a/dev-qt/qt-mobility/Manifest
+++ b/dev-qt/qt-mobility/Manifest
@@ -2,13 +2,25 @@
 Hash: SHA256
 
 DIST qt-mobility-1.2.2_p20130703.tar.xz 16748672 SHA256 c4f1578a8384a520744ece9c19639600029d1fac2b55e0f110ec5700911aad44 SHA512 51e960dbcab3641906043c0e3dc6c44da2a66d11a15f5ec255776cef299d1403eeb0df55ee953567fdafd4c2a88a6514dcf1e2f8ba0af574c44e02e809f42287 WHIRLPOOL 4e7ee4039fbb4e8f8cfd7f720d232ddf79d61c3cd62ad5851e490c9284badf3431852eb56dfea18e3caf350e2e0ccd50f3244abc04bd68ffc6f6de67e644d3c4
-EBUILD qt-mobility-1.2.2_p20130703.ebuild 3944 SHA256 aa90f99a251be542d6a94660d713cc3b3350e042dc3d8e2be8dfceee6ff3f783 SHA512 a59246980036a35847edc5c550954d3770808db9791f015db46210c07fdafb494bb2e3d9238c23e52e673a3a68ce93b784626cfd6dcb908c703a15827482b5b7 WHIRLPOOL 6c763c05ea53ea3062253c217f6073d64383294f0a3fd09790abb7b04131c097bb4c702db58c850c38dcf7adcfca5770d9f8ce0606a3704de6b13d6d60b892b8
-MISC ChangeLog 2813 SHA256 d77b90249623f6746492ef15bc2792bbd7d42197086e7e007dff04042f1e140c SHA512 59c49b8b85b1e76f3d8f78b4ef597378718789bb4af5db025fa9c05e2a22ff5a4eee97fbedff58f8c6614616f32dc520da223dd65e625fb6199e8557fea18700 WHIRLPOOL fb5f88b374f0ed7dd3da9f58915fb790e239762afb2e1a1e6cf18b3a3c7f647ee01fb06a2d1c8814e9236dc8903dc849c71a6b15ac1c12dd742c445ed2764986
+EBUILD qt-mobility-1.2.2_p20130703.ebuild 3952 SHA256 c330d09904e8276805080065fc7b21793f312b5fcb06e1508c0333d751d47de0 SHA512 13d731ce11fee3c572c9f400cb4d359ec17da631a6d6ac5f972af59a812b616350d0350b1348ac6938028989efafa7825084687e1d9adea5dd1ce8eed6316332 WHIRLPOOL e317ac202f132d912ad49af53142d04e4221b8bb39a507a3e0cfcfd838414148652cf1cbda5a2a32a1f231bbaee899ae40621ba2d10662bd2d935adcbd5b72ce
+MISC ChangeLog 2954 SHA256 34a18d71af581a0759dfff672a57d319f61d1f512a8d3129e530957cb8064a33 SHA512 390855bf4da5e5f9dcdb685810716da8586aaab0e8098ed6b433810f0da33ffbb9fa2e5728541d243921589d403adc3b3a04a9c0d593367d9c0bf079a22ea58e WHIRLPOOL 331a6932060c3eee01982b8307cdee086f84eff6951250cca577db310d7be57a3973712b0fb9db43e2815b389c7b39bce30e53a02f18f772241b8b1f7d769258
 MISC metadata.xml 1592 SHA256 8ec9afd91308148afcd0a18478b0e73db41f74b023fa44a19628b433a30709d0 SHA512 2df264ec0dfa38960e379f7dd096aaa9b934315c0867844d5aa1f39578adc06c188541b57c920a1cf1d7623edc0c5f1985719616381c50c67b51f4585494bf3f WHIRLPOOL e636439f495841539fdf339a312d0cf55bf35ed1527402649675721a5c2de523facddedd941382a486769cf8d362943c2aead7dbb5700d04d178e79d22dcd901
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNmMSMACgkQkKaRLQcq0GLzNgCcCxobTKCNl8d0ke1B/Di5YYxq
-kMYAnAhdmDopWyxqySBNk5ZvvPjy4WsS
-=QeUQ
+iQJ8BAEBCABmBQJTf0dAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9pWoQALChAqvT1qYlVqiIBFQyc861
+fk3R4/70gHqwsnYBnP7KTWNPOKKvdGdNc0XkTP6qjLJWVDC6DV/bst70xhOaBr0M
+Y+9xc/3yhzB33OkLPgNWXti32BZOmHA7LcHtjK0Q/HS4SWpVTigfCxzAw9kHbJwP
+UqGdxobrQSNSn74HUlq78o2tTyM+hmStd0YQtyHSiXzDJRkI+/tYCGiXtlfE8DK7
+aKm9Mbaha7xGD4MI2TBV3BvOqB7G4AZcxD9XKaKoh+kAa3P3Xie42kIljwVz3Pmw
+TEv56Eeg1YJ4eRT5xMEcyRKYTUXzLUYrZ0GFNcZuSKhGzK0O64r3xvTeVFby0lYv
+yarCz2FTx+nVUYv8TNGwZb0OffAa4CHGgK6U90Qy6vrVw7YMrWTp0coD27q0b7wn
+4KJKvmPcj9hI3D3Lzm8JLqGOJmdl/S8kFGc3wGyguH4Da+VZKnChx4NcBzgOmUC6
+Hm8ZPBb0ch88Bx96grUZm8ad0JggyKMzBuyXikRXFEgkjgP7sIVhIcJ24McqlnD3
+yFoQvIsV42/9HHKp/zE6bbZXAxA9tF/yS2upz6yyFaJojtVSfFQbDiF8PLBBM14s
+r1HVzobt8BE6aMdKHnM8YE8kB5/8Vqb5Lu6D7NtTrmsESetDOxjt8DZEfHfVXav0
+dTK+EHB0jDYMoTlKCqMv
+=UySs
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qt-mobility/qt-mobility-1.2.2_p20130703.ebuild b/dev-qt/qt-mobility/qt-mobility-1.2.2_p20130703.ebuild
index 1371a2463984..679ae813ffa5 100644
--- a/dev-qt/qt-mobility/qt-mobility-1.2.2_p20130703.ebuild
+++ b/dev-qt/qt-mobility/qt-mobility-1.2.2_p20130703.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-mobility/qt-mobility-1.2.2_p20130703.ebuild,v 1.4 2014/05/04 12:14:52 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-mobility/qt-mobility-1.2.2_p20130703.ebuild,v 1.5 2014/05/23 13:03:55 pesa Exp $
 
-EAPI=4
+EAPI=5
 
-inherit multilib qt4-r2 toolchain-funcs
+inherit multilib qt4-r2
 
 DESCRIPTION="Additional Qt APIs for mobile devices and desktop platforms"
 HOMEPAGE="http://qt-project.org/wiki/Category:Developing_with_Qt::QtMobility"
@@ -25,25 +25,25 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-qt/qtcore-4.7.0:4
+	>=dev-qt/qtcore-4.8.0:4
 	bearer? (
 		networkmanager? (
 			net-misc/networkmanager
-			>=dev-qt/qtdbus-4.7.0:4
+			>=dev-qt/qtdbus-4.8.0:4
 		)
 	)
 	connectivity? (
-		>=dev-qt/qtdbus-4.7.0:4
+		>=dev-qt/qtdbus-4.8.0:4
 		bluetooth? ( net-wireless/bluez )
 	)
-	contacts? ( >=dev-qt/qtgui-4.7.0:4 )
-	gallery? ( >=dev-qt/qtdbus-4.7.0:4 )
+	contacts? ( >=dev-qt/qtgui-4.8.0:4 )
+	gallery? ( >=dev-qt/qtdbus-4.8.0:4 )
 	location? (
-		>=dev-qt/qtdeclarative-4.7.0:4
-		>=dev-qt/qtgui-4.7.0:4
-		>=dev-qt/qtsql-4.7.0:4[sqlite]
+		>=dev-qt/qtdeclarative-4.8.0:4
+		>=dev-qt/qtgui-4.8.0:4
+		>=dev-qt/qtsql-4.8.0:4[sqlite]
 	)
-	messaging? ( >=net-libs/qmf-2.0_p201209 )
+	messaging? ( >=net-libs/qmf-4.0 )
 	multimedia? (
 		media-libs/alsa-lib
 		media-libs/gstreamer:0.10
@@ -57,28 +57,29 @@ RDEPEND="
 		pulseaudio? ( media-sound/pulseaudio[alsa] )
 	)
 	publishsubscribe? (
-		tools? ( >=dev-qt/qtgui-4.7.0:4 )
+		tools? ( >=dev-qt/qtgui-4.8.0:4 )
 	)
-	qml? ( >=dev-qt/qtdeclarative-4.7.0:4 )
+	qml? ( >=dev-qt/qtdeclarative-4.8.0:4 )
 	serviceframework? (
-		>=dev-qt/qtdbus-4.7.0:4
-		>=dev-qt/qtsql-4.7.0:4[sqlite]
-		tools? ( >=dev-qt/qtgui-4.7.0:4 )
+		>=dev-qt/qtdbus-4.8.0:4
+		>=dev-qt/qtsql-4.8.0:4[sqlite]
+		tools? ( >=dev-qt/qtgui-4.8.0:4 )
 	)
 	systeminfo? (
 		sys-apps/util-linux
 		virtual/udev
 		x11-libs/libX11
 		x11-libs/libXrandr
-		>=dev-qt/qtdbus-4.7.0:4
-		>=dev-qt/qtgui-4.7.0:4
+		>=dev-qt/qtdbus-4.8.0:4
+		>=dev-qt/qtgui-4.8.0:4
 		bluetooth? ( net-wireless/bluez )
 		networkmanager? ( net-misc/networkmanager )
 	)
-	versit? ( >=dev-qt/qtgui-4.7.0:4 )
+	versit? ( >=dev-qt/qtgui-4.8.0:4 )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
+	doc? ( >=dev-qt/qthelp-4.8.0:4 )
 	multimedia? (
 		sys-kernel/linux-headers
 		x11-proto/videoproto