Fix build failure when Qt4 is not installed (bug 537228). This is made optional by toggling the dictmanager USE flag, which requires dev-qt/qtwebkit:4.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

4 files changed, 45 insertions, 23 deletions

diff --git a/app-i18n/fcitx-libpinyin/ChangeLog b/app-i18n/fcitx-libpinyin/ChangeLog
index 64237c12e275..52ca572c99c3 100644
--- a/app-i18n/fcitx-libpinyin/ChangeLog
+++ b/app-i18n/fcitx-libpinyin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/fcitx-libpinyin
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-libpinyin/ChangeLog,v 1.7 2014/06/01 20:55:58 naota Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-libpinyin/ChangeLog,v 1.8 2015/02/03 07:16:06 yngwin Exp $
+
+  03 Feb 2015; Ben de Groot <yngwin@gentoo.org> fcitx-libpinyin-0.3.1.ebuild,
+  metadata.xml:
+  Fix build failure when Qt4 is not installed (bug 537228). This is made
+  optional by toggling the dictmanager USE flag, which requires dev-
+  qt/qtwebkit:4.
 
   01 Jun 2014; Naohiro Aota <naota@gentoo.org> fcitx-libpinyin-0.2.1.ebuild:
   Update libpinyin dependency #504162
diff --git a/app-i18n/fcitx-libpinyin/Manifest b/app-i18n/fcitx-libpinyin/Manifest
index adb33d26ff9d..ada3b1ead2cd 100644
--- a/app-i18n/fcitx-libpinyin/Manifest
+++ b/app-i18n/fcitx-libpinyin/Manifest
@@ -4,23 +4,25 @@ Hash: SHA256
 DIST fcitx-libpinyin-0.2.1_dict.tar.xz 10007544 SHA256 1ec33b2c56f98079fa5383b5fffcbe095ec64ffaa07eefebbc5d609136a2fab8 SHA512 7e446ac1e07301d6671f3de1059d099237aeeb46fdb9f68fce40a205cdcb17542345334b13f45b19f356743f92601492d178e6e2d578567c2506bed9c808ccbd WHIRLPOOL 598341a001d4cbb544bf3e3fc4449b1a323fc9ae6d3fc5fe8217b9a15bc2db22fb937e61bae32b3420a6b33d235368d6bd31fecfd1a845d1edd3acda320cb6f3
 DIST fcitx-libpinyin-0.3.1_dict.tar.xz 15143832 SHA256 0b553c90d37c36e82ad692803519cb3cf82ae3597ed2f74b1f5251e942c272ae SHA512 3b7501a75dab2f5b83541c71ccac93709f3354f390f322d7b95e4b94e0c4dc6963522759ab52eb77203d787d6d14d3ce1c838dd92ecd0db041a3b7a25008eaa4 WHIRLPOOL 1f655dc2a4439b8ff0583fa88f3d75f2472a8abdeff9132a98d242f2007d3abaf582f8ae31ec18ef693754bdf29788a37f4dda96bd1777d6a43eb1ac8eb6c194
 EBUILD fcitx-libpinyin-0.2.1.ebuild 693 SHA256 fcb49dfd6b206b6f1e50f8f88d3d28137d6d825af419660d7d0a9b69143ba35a SHA512 2cc63b3d00aad9cb37bd8bc60f626071e887ace330f18694aacd9a8fc8143aa774f1fc24687d37e7e662e36e99ef544f3d9567aa9efdda6c60a5975697caef75 WHIRLPOOL 39ef9c7fe25d0ec5671adfc6762bcccb730b89fad7e4b62e2b0bb23d95e90208717ce3a0dee97455af79d0c0378a38725f993c61ac104d640be9ef98f0342df8
-EBUILD fcitx-libpinyin-0.3.1.ebuild 684 SHA256 3621568773bd33a7fcc2b708fdf83b4f3ba106876065e3d435ce3c9e3620ea3d SHA512 bd661654aa2c582a1e7dd2f105bf1139a746adc5eeaa5d43c502dce1db72e5521c11b64ed0bbe9cdd52074d0b9aff390df7c6e2d5376c1856bd691d347926435 WHIRLPOOL 1cf0c026c561d9127f589c578dd89dc5bf86cb40fae6af9aba2fc93ba1481dec4ad505526498b55cd5585f322e9fca9e48271d41421088914558aaedfdb0da72
-MISC ChangeLog 1130 SHA256 d71b02e05ff6457e69ed29acee05ae33abf9499988d7832c846c6b94b95944a1 SHA512 2e0cc44dac37bafecc2ec3c4b5451831f45137efb22d516817e521675f83aea0bb6bf16284c55848b0384076bf0300c0df3e64ad48f7db9466b251af2947be9c WHIRLPOOL 6c1d736967ebbbd87acdf7c078e47a6c39630d0b32b924ae2c7d13e0d7f2436e3b106d8beb5db6a6a433e457b13464d527049896e5a6b063a7fb9919efa7ba76
-MISC metadata.xml 158 SHA256 18d71c580f82a389887f4970802b5f40e0a2e4c6019117e64268e008dfb81fc8 SHA512 6198c41a4d69a5ca0029aa9a593cc0ea553dc957fc0bdcd7bcd3bd1af7f84c5feaaf785160b60b8ed75282987818a6367f6092523cacd45f0c35494036043550 WHIRLPOOL 478bed9e1c3fbbcb13f17ffeebc2b9da5f3c48368e8a95c2802a88dbef4773f992fa254e4dc460248d5669021fe4e37b37be522d186da9d97321a58437679662
+EBUILD fcitx-libpinyin-0.3.1.ebuild 907 SHA256 49194066d8ddf668e0e9a45a0f4139c2363b0b0c59803b0e12c18d8acfd53419 SHA512 558d28b04446a0310fd9514324937db3e6a5efe49b73b2417176a6a836c6a64ac6b1294daeafe4085dded6e14d0b158f854d562508e261f375e1c5d3e891dd89 WHIRLPOOL 8d172b6e32acddc28dbea1fa224535a912beed205352b1b8d1dc0eb7cabfa558458c3d4bc7042b12c10183365227a64e4e4550a79f6755b58d30557ac76c7feb
+MISC ChangeLog 1385 SHA256 297833ff7f1fdec678781f0a713b74883cad3ef7221a2a25be65d7a713d8fa15 SHA512 06248beeb51df1058351b3a906766e9677beec644d70c755ea333e7b2b4afc65348f8feabc8d0ea0dc2357d73fbcade0b00d15543b3aed90368861cfac4df528 WHIRLPOOL 5d4e5fd22be0fa6e31cc7fd568d5e68f5fb16201b445f1397070d97bc0c60caed865b1fac7c3e6b676f6048a767ec381fbd8e527984fce4fedc1b0773dad461f
+MISC metadata.xml 287 SHA256 dd4851482201ce48a4bf145b27cdc3f0e31e3dc75b89ebcc319442b507b7a8fd SHA512 7f38ed2169ae4dc488f42fcfd413144145de6f93a1d9d26fbbed1f5930aa27438faf0417fa0ea3f7b01f47b21a1927d4bea5df98b5088fc9396ad7a186d01b4a WHIRLPOOL fab0049c6630149a59e0bb7891b3ef6408d23c1df7fd66900bde1205aeac2c366d6784de6376b19872f294ef5b92c0a9630202227a926e584b7baa99df62ffdf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJTi5NCAAoJEDYO1FT4VRUUW08P/j8LBbjrspWleI731OS8DZJ5
-IINUCI9dssvET2KpJIhkMAo6M+Jd8F7Jaht1oRF2at4+tIhkUe8EA3M2LsXjDsXu
-GTE9hoZUiCrvzc3F4MD1TxyCaQvOoBHezeiJ/nV4IH39HMxN8ihKhhxZZzr0FITF
-s++um083WlU2gu/qmu6ldZUMILGYVib9ME8JgX0H2sj6n09qxXQioohcoWZj8li7
-S57Hbsy1tWbxBM4ByvjnYiiwqSVirSxl8BmH55nAYpoEbYgYJXTi2JjKK7giWgZa
-S3YbZO1fY6wYytsLNaLAJJxAxACNn7oFBqdpCIEgjCd7dR+3A0sPbDbzdxOdlQwl
-G0Xqhye7bYM+XMDVGrnEF1V0IH+E95GPtN49URWf8X4laKOYEqM4EYJg9pYNDVyv
-WLbsfH7KLSSX0faIFhT+vRTjAcpoBe5X5Qy7fz1GC1HQn6z/q8NHVAh3LTC5OVIf
-bNKk3GRZiAkE2ykI1FnX9qBshORSW8BZpf27S5VJj0vbEdmKCt2zIw+DxZMc16Uw
-p7xoiLSms/bIFuFUZ7O3JJa3GpE6lEDQ6UdTZjThVhYE8hOC9tnlGfq2gdmrcLyK
-y3FSOEYVfxFK/Ql75zwt09aBPDbkx1fdVS6sc2piLTzlrEMcWOui/XGJAjUZSTJh
-wgOQfhM0KCCJsmv24I6x
-=AnQo
+iQJ8BAEBCABmBQJU0HW3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFO+hYP/jRA6ZOcHozSR9lkA00Dyz+K
+WSlIew0tCRY/DWC8inMt57GSorlI1p6EGORrwqmciqJDgeCz7BU27FUXzViE7C+U
+VUQP4zM9anuBb4CcA5LG/DzAR0Q+/xxXTLe3DOYq6aOTzV3Wcl94lSoEffP7pVyl
+nBAMvLlXPhzlbeNalLvq8FbC6xrvA4BTMrjt1wTQh1/TZmyRq3FRL0SojwGM+wto
+Ib2Da5lZ4XASUI2UUsmy9Cw+94LqmTYeu4GaABPcNdMBSHlikpcSl8Ccac7VBHJ5
+FIifYPbOrDlMMQGiDsLlQgNPYtMtMs268rdrL8UyC423SsGm+CCucQCvzVJJ8TU9
+GivCCF3nyg8ir4EnKemYuh7RGZzIhEAO4JcuaFCRU9KXGurIPSka/8Jp3Lt8TQNn
+3/w9EuQ+y5IjSpeeFE7yyKFcMEtYsDfbtMfM6zVjFG9Peh0DShCjK4gNTiBbnEVO
+tC73FHzxCXEJaARthe9vpEjM2EK9gnP5W4jhQviUMgTbVv/CDtdUKZ0sWASmyAik
+IvYK8xD+0G2BBkO+jwa+RBq++xfEjymex9rCVJgBfh2QIPVFk0ypVe1ga5Ul8h5a
+sV2PGmyTLyoMs7/xeTMcvxroCJ8TURXd0kMD7gaGX7bC8SvNQB2B7C+S1ko9lxZ3
+ZkQSMUNOmR0r7Dl9Oxki
+=Muos
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild
index 493728345676..6ceab4f28654 100644
--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild
+++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild,v 1.2 2014/03/08 12:03:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.3.1.ebuild,v 1.3 2015/02/03 07:16:06 yngwin Exp $
 
 EAPI=5
 inherit cmake-utils gnome2-utils
@@ -12,15 +12,24 @@ SRC_URI="http://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE=""
+IUSE="dictmanager"
 
 RDEPEND=">=app-i18n/fcitx-4.2.8
 	app-i18n/libpinyin
-	dev-libs/glib:2"
+	dev-libs/glib:2
+	dictmanager? ( >=app-i18n/fcitx-4.2.8[qt4]
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtwebkit:4 )"
 DEPEND="${RDEPEND}
 	virtual/libintl
 	virtual/pkgconfig"
 
+src_configure() {
+	local mycmakeargs="$(cmake-utils_use_enable dictmanager QT)"
+	cmake-utils_src_configure
+}
+
 pkg_postinst() {
 	gnome2_icon_cache_update
 }
diff --git a/app-i18n/fcitx-libpinyin/metadata.xml b/app-i18n/fcitx-libpinyin/metadata.xml
index cb36a2fd8c76..c4a4afa65549 100644
--- a/app-i18n/fcitx-libpinyin/metadata.xml
+++ b/app-i18n/fcitx-libpinyin/metadata.xml
@@ -2,4 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>cjk</herd>
+  <use>
+    <flag name='dictmanager'>
+      Enable dictionary manager. Requires <pkg>dev-qt/qtwebkit</pkg>.
+    </flag>
+  </use>
 </pkgmetadata>