Add missing webkit useflags. Don't run eqmake4 when qt4 is disabled. Bug #457744

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4AFF2C2

3 files changed, 30 insertions, 24 deletions

diff --git a/app-misc/recoll/ChangeLog b/app-misc/recoll/ChangeLog
index 6358a181be9c..e4d039e64e23 100644
--- a/app-misc/recoll/ChangeLog
+++ b/app-misc/recoll/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/recoll
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/ChangeLog,v 1.14 2013/01/30 19:20:11 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/ChangeLog,v 1.15 2013/02/15 20:50:33 hwoarang Exp $
+
+  15 Feb 2013; Markos Chandras <hwoarang@gentoo.org> recoll-1.18.1.ebuild:
+  Add missing webkit useflags. Don't run eqmake4 when qt4 is disabled. Bug
+  #457744
 
 *recoll-1.18.1 (30 Jan 2013)
 
diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest
index 134b1b43aaaf..4d673f3fde78 100644
--- a/app-misc/recoll/Manifest
+++ b/app-misc/recoll/Manifest
@@ -7,23 +7,23 @@ DIST recoll-1.18.1.tar.gz 2026276 SHA256 8ea01dc64002b594b7ca08cf40c5581963bd986
 EBUILD recoll-1.16.2.ebuild 4012 SHA256 e6e944516222018253a5f6e1a358e236193b6556f40b337d6c2f32d0c882ddbe SHA512 9c508416e9515caa3e4f57839dbf406deee0453295b4f91b2979b2782142b01881a8e7f55d5c11bfa35703a6fd918c3b33992582f115690f1e26edc3d6fc1527 WHIRLPOOL e9b9afc74c2fe323b4a6ad9b05136a62af62b3ef696a9d25684b52b25f510067b2605c44fd6415cadf58521565ec84a9bc9776985fe246798d5af72529740e6e
 EBUILD recoll-1.17.3-r1.ebuild 4298 SHA256 1869d71bb1b8fd50dde62554e9284cfd0a19cc0fd0b87ea61e289275f223368c SHA512 afcac8d6efa51e1ad883f785ffd83adcfa136fe98ccdb247a3ce886ecd6d262ba8be1d7fbbdc37c4b43a2149e18de9d3607833a4bc68dcdbf927dd62a6e94acc WHIRLPOOL 5a44ff0a5b1f0304f9a2a023daf1b28420e32bd80f59e7cce649291e2bd74d87369ca0b6bcb4b988937e2ddadea7de63032c7179726bb5cd7435458790b45527
 EBUILD recoll-1.17.3.ebuild 4113 SHA256 3af0155e892f525266276acfe92450681c82690c34dda70db1dc51f750b19023 SHA512 ffd547b09712b3636347b3890fe91afa75f33e5c3c000d7414e25f2831c97b8c53036b0e29bfc9405fb4dfffed3cc446c0673c3958c40babbe25a29d76f37936 WHIRLPOOL dc54e395d6e9f59f36a1df47618da0a0c1f17e5cb31ffd6564f695e57d398d6d8ae396561102dbbce14ccfc3296846b753f50d864d5fe6255b2585f36b500953
-EBUILD recoll-1.18.1.ebuild 4768 SHA256 e0453363dcdcc477be3f5fecc7c2450db0a7e7d88d811e9f12d19298c37ebd69 SHA512 c0e2868923a07bb59658acd79d63652bd3aea9551386ec462d9582491cf241cfe1873bf05ff4765ba3adfd9e1d281511933fb5304b39e3f2eda35c52669598db WHIRLPOOL 90a69fdb9d427142aa0c9445bf7c1d1a142a3355538517a5e3f65a68c78b7b2012c6bd7c0327ac298f6d19e81d7fca9063d7184ed35fdf61d23269a0dc5e90e4
-MISC ChangeLog 2464 SHA256 05d692bde4072aea8d39cf4154478b008a6041f7797ff40b54cac5c095282180 SHA512 fb8b567e087b481c64005c1849a772ac978f68993f5357e9f4f46927c458721a3d5ac1f18cc2c385542277501c428b574d10231a9f3eda55822e62d8f4fef261 WHIRLPOOL a3c94743731255346818ae9b817de4033037ebe99d5deed6e01999590055cf6ba94065eabfbc3e6854b219f51edd3c9c0afe474e8fdd495d6a5a19cf9bcd2806
+EBUILD recoll-1.18.1.ebuild 4831 SHA256 c1b561389cdf907f078a0491c06627e6ad2308e9f4ec86a81bea51c940030942 SHA512 4d89dcd06b2e0b63aeab6e7877c75d11efbd82747544457aa9099db2abf23efa510a2432da822e14794c8beb1985342fc13897bc69160df1163892b7fb558926 WHIRLPOOL 67ab83b764cc4e2830455bd8261efb29037cd8b8838463613bbd98ec31fd71fde479037665df87c63342bdaecbf9643a4552dfa08547f0182b3a0858e67728c9
+MISC ChangeLog 2625 SHA256 808bc86dc105e32057b59493bc293447e34ad6ed26fcc79f709b4637623d40ee SHA512 5897190b7eb4cd81d45fb5bf15e20fb077b3c681f273ec651f52748866c54141de730f4ce9add818692f9ae25a6b5065e016466e176e8fa1be1f77a8da28f3ff WHIRLPOOL e2475bea40394f7f80feb678c7562945348581c4bd9ccf0c767de8a0f1ff7ca7c0546b9854e1dada3e3b724ab6072b1e1560a54324c6736e639bf5c90967c226
 MISC metadata.xml 1367 SHA256 3375e9e74dd52ce92023e548c072128aa561977395717a6d2dc6b25972154bc9 SHA512 7b4b5da5d425300c79701e57d420940850fcc0628af9827004afa2a379ab176bafe2cd9d1e0aa4ecf2e2b8ba7eebe4a596bc2fcbedec96f7fbfb6ffa37a4ff03 WHIRLPOOL b1ac460ca62f8e46503a37d32c3f81fdda359662a5bc3c2176551c9b2b26b20f8708d76596b71e3a8ec82ae3be6a0b521702bbe84aab4782838657fe4355e833
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRCXJpAAoJEPqDWhW0r/LCS9MP/RcVhoPKqZjDCISIoFDHDetj
-7wVuvg1fWSC5CRcYFVXS4/EqItq0rZVrPuLPZ2KuCofj1KaqFovHwb+NA6wjvGHh
-VAjUK1zjV+I85Bor9jLqcYXtnLvbjuLTWE0T0Yaft6pmipj2Ty+2mNO5zucN0inu
-NrP1s75WW+SlW3UqSP1FBa5rGpwIE5rBL+ypT/7YtrfCggXCHMuONc6lFv/22uZ8
-U425wyqafY0r4oo0OlB5yS2YcR+Wfv38mYf34OIWyRbPSjnIUDHDlyIvgf3giIYf
-FzicdPOFCad2UZv5SNWGjQdGS4R6PVaPSgit6SKcApgFVMlUOkXpnmqk1qoFXXq1
-Y/vbT1ZbeNoZo2g0pYL106PSl3mxwD+hv6JhW+XVpb0K8fnAFZrDl8Iuplv2eMUz
-pXTXOHjD4oWfxAVXBQD5lQhR7Lwqjps9Cpd6NlrXy304uPsSA08xOJGbyrGrtUF+
-OmtNnqf0TC6V5kQ59Np2pgaoHeg1O3+mrPm8hcUpF6lGJBfpr/VdFt/JgAIjj7+1
-j7UcWi+2TekBJ7Hx58bYytDBjtFgxL1ZdVgo6XN6LxHhyHRilL6SSzyUdd1mVG8S
-8bTTqzD+EVcnrgcdT+FkEqNRaB2lNPxH6EzwlMwAcOZIPuBJbRPSkXPkqk/4OY16
-6JGhERzbRGj2XJChbVp5
-=KHVU
+iQIcBAEBCAAGBQJRHp+aAAoJEPqDWhW0r/LC3HoP/3fC/Fz2fTcFkOWeIySxK9pU
+stWkotib5rAFTxb42csiCAPXefUWvp+zx1EFwVv79UGqR0EeCdyArdNanjiv9TpT
+ONHmcUTuqKabFjxCrBk/6+yLpioPICTtBUaD6ToFVk7xoDh519rHY/qRnDAkQ04q
++2ros9+rrIsGwBtfDe6ZU79h52X4ShgpQRNP842FQ+BWVUqB0le6I5uNc9zJ5aIA
+KPx8u7RHkTocKMUtTWeqVZrXX8ZbMrVhPyScyOljQifSDuDsHBgJbvDPA+qFOKl5
+eX4KdJHCrFVuzqz7zmB9aKac1dbW6P8Bi1z2KaIxEEna/4hwL1l3RrWKRgMtSDvT
+e99ngD5+8RxLRr2KbGEr8/hjAS9hfAd0KbmD4cn+2wvvZVJ0lxdiJffubDouEOb/
+TB7NacEc4WM3BJ62fuFbneuC1zbwCzL7sMdtUavMCMk4CEWwzqKysT/JRvAEA2rD
+Ztu0yAgDnopqzQl8IcHAcPX5q+kZVzIkVsRHzjrpxZZukN7dcrUn2Pi56kU75vn1
+zc74/JVWRjjsbYWkvDpWwULMCneNMPA1NQjFEZOJHngYX7wobp2BWRvk8N78shHq
+AE7K2eD6nVOaW4k0L++NcUH96i0cv6mwG1leBP99TzxMNReBjd8/1wzfx9VY+WaZ
+G7VpB+58HJalOzJGA90F
+=t+pv
 -----END PGP SIGNATURE-----
diff --git a/app-misc/recoll/recoll-1.18.1.ebuild b/app-misc/recoll/recoll-1.18.1.ebuild
index 1521b8660dce..7c38b141f79c 100644
--- a/app-misc/recoll/recoll-1.18.1.ebuild
+++ b/app-misc/recoll/recoll-1.18.1.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/app-misc/recoll/recoll-1.18.1.ebuild,v 1.1 2013/01/30 19:20:11 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/recoll/recoll-1.18.1.ebuild,v 1.2 2013/02/15 20:50:33 hwoarang Exp $
 
 EAPI="4"
 
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 INDEX_HELPERS="audio chm djvu dvi exif postscript ics info lyx msdoc msppt msxls pdf rtf tex wordperfect xml"
-IUSE="+spell inotify +qt4 +session camelcase xattr fam ${INDEX_HELPERS}"
+IUSE="+spell inotify +qt4 +session camelcase xattr webkit fam ${INDEX_HELPERS}"
 
 DEPEND="
 	virtual/libiconv
@@ -23,10 +23,8 @@ DEPEND="
 	sys-libs/zlib
 	spell? ( app-text/aspell )
 	!inotify? ( fam? ( virtual/fam ) )
-	qt4? (
-		x11-libs/qt-core:4[qt3support]
-		x11-libs/qt-webkit:4
-		)
+	qt4? ( x11-libs/qt-core:4[qt3support] )
+	webkit? ( x11-libs/qt-webkit:4 )
 	session? (
 		inotify? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE )
 		!inotify? ( fam? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) )
@@ -103,7 +101,9 @@ src_prepare() {
 src_configure() {
 	local qtconf
 
-	use qt4 && qtconf="QMAKEPATH=/usr/bin/qmake"
+	if use qt4 || use webkit; then
+		qtconf="QMAKEPATH=/usr/bin/qmake"
+	fi
 
 	econf \
 		$(use_with spell aspell) \
@@ -115,7 +115,9 @@ src_configure() {
 		$(use_with inotify) \
 		$(use_enable session x11mon) \
 		${qtconf}
-	cd qtgui && eqmake4 ${PN}.pro && cd ..
+	if use qt4; then
+		cd qtgui && eqmake4 ${PN}.pro && cd ..
+	fi
 }
 
 src_compile() {