Do not depend on gconf unconditionally

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

3 files changed, 26 insertions, 23 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 12f4f13b30d7..d10a722fd7f9 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-i18n/ibus
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.154 2014/12/24 01:52:20 dlan Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.155 2015/01/02 10:10:04 yngwin Exp $
+
+  02 Jan 2015; Ben de Groot <yngwin@gentoo.org> ibus-1.5.9-r1.ebuild:
+  Do not depend on gconf unconditionally
 
 *ibus-1.5.9-r1 (24 Dec 2014)
 
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 17acbfd6ccba..31de3767d3ac 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -7,24 +7,26 @@ DIST ibus-1.5.9-upstream-patches-0.tar.xz 30380 SHA256 9efe631008cfad1d59db01a83
 DIST ibus-1.5.9.tar.gz 2128459 SHA256 ad41014aa3cb961854ee0aa392a5abd7452fab2c6b77d8ff2d736b7405b48ac6 SHA512 8a21303abceb38f1e5903342590c229a243db1497503fa08d547e1029bc25b90a2031f0386e57ddfcb897a14819d202289fcac1e3c8bad059698b04501a7ede9 WHIRLPOOL 88135818669cb3c189ce02a7caba3ec262bd95ffa6d139e8f76113ca91fc778f5f7703cfbfb1f5d5dd3cbb6948ba14d9c326f318b0286381caec45db3b453221
 EBUILD ibus-1.5.5.ebuild 4427 SHA256 965b1ebdda67881f6f153401bacba5014bd126e53a040188dcb66f02775b816d SHA512 3d0b03e98220c652a9e5219d8844b4c4871d64fa1b8c5b96b1f3940699bc623e0fbb2a88251bc42e2dff3c1e29bc9ec2df714085f5d19996cefafef012e18030 WHIRLPOOL b8dad8962180fcdaf1f9eb5580004f78aafe1c9503174c5a8f35bd35bcda29087e139a7fbb6bc86b5d8eb5c5c850c0b6bd74631119cb06976a94b5fce7626d7d
 EBUILD ibus-1.5.8-r1.ebuild 4363 SHA256 621c0763552dc28fecd2cb5912ef8d3d13a4885ab0f39f209f36e31648533c44 SHA512 053c147844559354a5d841fe5fced2d5082cfc0f9a06273074c6dc84d6b0f28de1d3709e663021093a863b56b38782151937fd69334bedaab70e118e542bb3ee WHIRLPOOL e96973d988a25df48f31a49326a3e7c52a8d80511afe03ff25427179d989d2b87767c6598e84f403a5ddfae4ad9ffbde6d1e3dcb55bc72ece7055018b6c04c80
-EBUILD ibus-1.5.9-r1.ebuild 4717 SHA256 87b81b1428fd49b47a080a36f4a07e4b71309594e8a7f56ca6f4d9e6c22d4045 SHA512 29c89e0aeec5a874cc9662fe5336bcaa9ab620a414c5b612fe03af0fe3a951113c93ac71e09eb5acaf881c78c611f3c213262ed038856cc4c99d60522f0473ee WHIRLPOOL 7e02bfdab29258600fdfb930df4e7992821e271004154af57ce6e41746399d443f2222ad851f28ce8e3f4d0c35920763bf051bc2e311c1d6d7ef27ba0dbed5e2
+EBUILD ibus-1.5.9-r1.ebuild 4700 SHA256 17ec478eca64f0ec79c06eeda55e70fe49578e33bdc6f23ed30445d91647a9f7 SHA512 5343cca573751d50a48ee75d0f9a0ef860aa016eafc7ef37a8243793e029d5a3c1c33875b69e7e89a93c391d02f1d4b10d0fb9c53bf9897f78926f32f7c3a48a WHIRLPOOL a74244d9d090f06cea98756106e067d33c7e3f9b786f1b876b362163b0941b827dab21f2d0d433d7c1dc0fe4ad7eb782569c94ddf3c13efa3ec08879f0a96456
 EBUILD ibus-1.5.9.ebuild 4360 SHA256 dc6e53fb76f217ae6822aca80ccd072c595b978825f983adc09116f76bae16ab SHA512 d6b3436aad5fa1972b2b1ca21a05b6974c70615d579735a8649025a9733a542304627d045343024d0f27eca9c1e8d327d96e44e6f5b7d4a665687e6be453d584 WHIRLPOOL 9f3e2a55fd9f51fc1eaf5b6682b5396288b268a469dba54b0b510de69853762d0e36797bdf88d623486afee78d7d146b851964de5756ffbf3b93173902939f98
-MISC ChangeLog 23995 SHA256 fcd917d0c74afb4e7626c182d0da54e998b8fd9feca5d8b04b0a1d7edf253025 SHA512 b3465e99f59f1dc18539ea9a7525fb0a719292f0efe994603a2456d8866438a447fd484771f24ce9902afeaa9d12d0af1c62ee85d97126072061af98c2d93cf7 WHIRLPOOL 95c453b2cfecb5087073e470cbf1a93637fb354a1f50299f6d09f5b13cd4dc63cd641ebe1bd6e6410a2ef008d3e0129a7d8ade05b4cec97979c6d7f249186780
+MISC ChangeLog 24109 SHA256 7e1d7e7ab1a003b2f4dd71f848358b6afb375c35f2c33778876831aa4e4028ee SHA512 7598d7dddbbb92d39f5a8f3e2007b34f76fcedc2256e6479297bb45e7fb45ffcfadb821f7e3bd867b7d04474e4043f01e7576bd5e8b265b7e868de6ffccb2e00 WHIRLPOOL 74538552842f355b538b9fe040bbbb7facd801e20561af63f20a3e0dd995979ef67190d22b61713fae97ad6fea15a06357f2e543e767c1cb05871f703509574a
 MISC metadata.xml 907 SHA256 568c340b720f7300fc7fe240c3e374333315a56875fafd73f02a387709bfeaa7 SHA512 db257d82bf2f810da847b74f1770137288b89c8d6b827e46181d5d2ac8798c5acbdb1bb5ab0d82204f421426242abca912c6ab8ac0c1a4049a8c5944b2c7dd8b WHIRLPOOL 7f5f53519558eb5ee3d2f3db3bf08d1e490c1b5d84d5d76965fda838158facfe18168a32e95eaff1574ca62fde44f6ca95a1bfce3a86af200c8d4d5679054ddd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUmhxjAAoJEJIMDbyqvv1V4YYQALFRz5VCehju2l/UIWTbat6N
-+Gq4W6vAJKFM6CyyR+2T49jcnklapmAL5/gJ39vF0vaJYm/QWkCroecf9M+LY5dF
-BqRL+hcqsGeZ7jyBZgQjUDM0u+S+YmhwD+sCzuUCwq145giY35qOTLNXXuii5r/Y
-krGKgeUwByEJ2gVuLf9OIKdCO4702G8t9e9rDu2vmLi2MnKBA3ENAi5VopEncQAv
-4HSth4gWpnEUvNqqio3Bsw0G8mWdsBl2PQ5+0yF7rvRZEPiIS0mSIRvgajOK2RoD
-L4OhfZwq1UuRIcy0qRjYebzEsojUqAc4NNw8vPNboF+MoUKXz2au7vWQJVFAj+k9
-cRCKLryNLN1RZ1aXaeVdDQnXkDL5IzMVOw2mCvzIdvHqXuW99DV8L4QHHtzIoORy
-IYcBOmY62eJnzfQyTBK2fj85/rVbcWAyyJIdeMWbWRBrBkTRXiDiYDoznezUYN0M
-O2erf/jsRiJym5qZOkTFRjxkbXtO1ZPN6MO/9JvsBRNoLk19AZv7xdjIg4Qgi4uN
-f+XsCyC5SJhrcSeQsbI9paDLi+NqFnEE+hRQ62Wu4gJ0sdJj35sDwcHEXOcYxgLZ
-KI3qwpzJH2Q8xw5XJCncZZpl1lHyWkPTG8+pyKfFIB7pcxQ1jOrHEh9TK1PwQg5v
-lCeIBxON24oyXWwTZrPE
-=Cy5l
+iQJ8BAEBCABmBQJUpm6FXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOTZFRkUxOEEyRDM1Qzc2QTY0M0Y2QjQw
+RjlDNTkwQjdGRjMyNEY2AAoJEA+cWQt/8yT2dd8P/0OMGT46gX1dByrpEY63inWP
+r7JfAx2BZWBsV8fD2ZRSxrZXdWrEXuOBDpts/519XLFh3Jw3ZM38Q4BZlfwfyN12
+sIAorDkBr3bXFBoJhFmllPupT01boWJzhsl+Dnx9BQMv13V/z3meq/C4O+AD2pk+
+Ux6sw7Zu8nO7NW1dQLKgV9WueqXqS1QYmXzpsS6TT1jCX+OZ3EvYg+QKpIlIVXuS
+FryPnGWSLc0PQ1iUoxL0DUxWo7cWPSPF7qx64CRN4koQ5g8/rfBFM7fpP9ehoNlX
+SPY6chMjXteQnha1cT0lhlRXvoHGlpfWClmEGJta1bVqTV55rcw+rVJkxja+qWbs
+3+uJy3PKdaCuPPHyjmKwSrFaLvaUO+lfvVYH3Z4qNlbV1trfENL06c3q7pVDADFp
+wYI3gPZ9f8PQL5Xl+PuXbL7G18qhGpLAJzQyZ6jkwwq+fF9Od235oy/PxRoGEkMj
+2ikEzqSX04qUxuPFlxxg+ieZkTeZVGPektQDVqAxj+U2+dxff0fwpDWFrlDpbwaQ
+zCTkmLQ9FUi/DEGePMbKeOaDmnMpdlSfb9OGF+Dm8X225OfoNzpNSzsX0yuYPu2e
+DMBkOa34pk+2daO69AXvh/rWsu+Fj6nycPFZMWtlSs3RAKtvjN/4d7AHSgCWep3l
+pLdvNuNSwbaDAn1reaHy
+=Z+Gs
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus/ibus-1.5.9-r1.ebuild b/app-i18n/ibus/ibus-1.5.9-r1.ebuild
index c1fc195e3937..e1b045ae2ce2 100644
--- a/app-i18n/ibus/ibus-1.5.9-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.9-r1.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/ibus/ibus-1.5.9-r1.ebuild,v 1.1 2014/12/24 01:52:20 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.9-r1.ebuild,v 1.2 2015/01/02 10:10:04 yngwin Exp $
 
 EAPI=5
 
@@ -39,7 +39,6 @@ COMMON_DEPEND="
 	app-text/iso-codes
 	>=gnome-base/dconf-0.13.4
 	x11-libs/libnotify
-
 	gconf? ( >=gnome-base/gconf-2.12:2 )
 	gtk? ( x11-libs/gtk+:2 )
 	gtk3? ( x11-libs/gtk+:3 )
@@ -70,8 +69,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
 	nls? ( >=sys-devel/gettext-0.16.1 )
-	vala? ( $(vala_depend) )
-	gnome-base/gconf"
+	vala? ( $(vala_depend) )"
 
 # stress test in bus/ fails
 # IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed