Version bumped. Added dconf local USE flag. Removed old version.

Package-Manager: portage-2.1.10.18/cvs/Linux x86_64

5 files changed, 66 insertions, 41 deletions

diff --git a/app-i18n/ibus-skk/Manifest b/app-i18n/ibus-skk/Manifest
index 9a603219de31..e04676961e28 100644
--- a/app-i18n/ibus-skk/Manifest
+++ b/app-i18n/ibus-skk/Manifest
@@ -2,31 +2,27 @@
 Hash: SHA1
 
 DIST ibus-skk-0.0.4.tar.gz 384329 RMD160 dc754c1b5286be68630368e917c67da254fd705e SHA1 3c873b97b7b0ffdb19992250f6eef666cf9ddc7e SHA256 8acc152d072a9fbabb3a6414e39f308538c0f7d0cf40a58c95e1e12f5a295634
-DIST ibus-skk-1.3.5.tar.gz 433203 RMD160 c5fd7629a954a62288181ab09dbd119ea01ae2a0 SHA1 4a9ce7ed10add1917133b44fd607acfd73d5a24b SHA256 8f8a2d8518c9c10eea0b14f635dcd651d75cb61af7e3f818fc1ce51c98901961
-DIST ibus-skk-1.3.6.tar.gz 455572 RMD160 e98730b4a288343d9f9dd9e837db7376735c44e5 SHA1 37ddc0674d7a6267aa3190111e2127cf0b501222 SHA256 3ad9a1943412ec478f898908354235c0bf450f858eb47f0f2f420d296f6bcfd1
-DIST ibus-skk-1.3.7.tar.gz 455971 RMD160 cca5c9f815cf9b51d3dfc78677926b34eb0ab9da SHA1 f459930891080f9936a749016919d3e8d5734ed0 SHA256 41ddce4c7513a61070767a9c518740be30c900852e745bb6ea6b6a6a77765cb6
 DIST ibus-skk-1.3.8.tar.gz 459822 RMD160 4bc5672cf600a11fd569aab5bfc4e02a156b7a09 SHA1 26b2337a8e3d9645df7fa783f6ccc332b5c0ff65 SHA256 67b2574cff2f0c4d7a74a7e80164974600875683d3c909c039c3fedece9144c7
+DIST ibus-skk-1.3.9.tar.gz 459987 RMD160 bda76e1444b5d40e112e6129a5e882c161fe4e6e SHA1 ca47b55648115c034a46ff23a9653a7d5ec53a7a SHA256 67c615f6e070673e312da50e1125f2f0637b40e0eca4f6ea34325f41322b4ba6
 EBUILD ibus-skk-0.0.4.ebuild 1032 RMD160 a1cf4bba229d70d0467fb0aacebea9228430c88c SHA1 a7b8cc200d0bb96834b53dcc6bf41fb0eaec9ebb SHA256 c0478f471807a623105ab8640e575f35751ff5d84fceeddd724db36fe538411f
-EBUILD ibus-skk-1.3.5.ebuild 1102 RMD160 c445444279179fbc6fc4031cf1a28fd6064e24c6 SHA1 d26b95c048197d4501c3f53a0e5dc59575660b5e SHA256 3fbd8fab9aa504fec414a3de6a1389ca50ddeca49ce051218510615cb00deb03
-EBUILD ibus-skk-1.3.6.ebuild 1100 RMD160 f238550aa3c0f0e5a8fc241f0c253aec44ad21aa SHA1 3a2f54632ad38d7534015935876bb00a52ba9406 SHA256 2a6628a632467586809ce60a2c630c808839966e2a40299844f4132caa171cb6
-EBUILD ibus-skk-1.3.7.ebuild 1100 RMD160 69ec3e8daf7441dd2a1cd7a2986c8751898b9427 SHA1 a1bcd261439504e8bdc58bb3f2f3474790700db7 SHA256 c45a29603db724d8cfae7720a4259f9a3a5ad0172299b25d66260ce4e7c145c2
 EBUILD ibus-skk-1.3.8.ebuild 1100 RMD160 493a664796401fe4ca4243fe81ef4ecaa06adbef SHA1 4bc9e1f3d318362f7dd43b6f52c32b621d0b7841 SHA256 dcc12b564803a078b4970cff0bbab524526897dd04980c079d7bcd7047798d28
-MISC ChangeLog 3001 RMD160 c67ce9833daa1995f5397f2cf4de0b591ed9d168 SHA1 8a45a113c6538ade9c9ef88ead8583c3eb4f3dfd SHA256 9261805c8b4048c958c1f0fd71a66deb680bb62199cb861793dc105d7084ac90
+EBUILD ibus-skk-1.3.9.ebuild 1082 RMD160 d6d8085c42fc0862b4194f2abffeff04783584f2 SHA1 5b4f6ff57f630406bd8e835e4df85ec56360e1ef SHA256 97b8eed84651c691c805a9faed054b88c4c40f1729f8d7e74a67d05bad8a7d1c
+MISC ChangeLog 3220 RMD160 659075afc7f631764420358c1a3bdba487db4cd9 SHA1 582d5eb47249bac8333f7b6859e9906582f7488a SHA256 087596856545d9db1cf182ba51d28250bf7732536170260c7168f193a30f107d
 MISC metadata.xml 262 RMD160 605dc09048ed7a42e7097b0b93d4097770797585 SHA1 8dfa050c556004ea54c9ac71932a2eececf0257e SHA256 695292fff6e9312cfef529fa3e499736737cf93066d4ef5d63215d45cb4f50bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOXjzZAAoJECaGw+YFKA1pu3cP/imtLWxRi4bNRD9GAzpRUwBV
-G/sakNMusS3oMOf9Dq5Sb4AjQ8XVTaYc3hpt2bD34u4KD05Jw7YQO+BD5TPlJ2KW
-Z/mO0fQnw1s4WeV73PwFhz3k456UAjj8nh/1vYihAquJaKAUen/igkpmskO9IT3L
-qZUIpjrhr/WtYBSdZZxTFmYNReXZdQ8/eJ0NEm3Gz04hAbF33TILLN8sOCR21ipY
-tT+sX7aW6AJ7QLooENlXrSH1uKzwLhoIT4QdLoJzJ2Y5C53ZGFjC2+Da1Z/L9P3w
-y+IuYHf9znTUotSevjrRv5cxgtFtxY5jUhrZaiblVEwcsAZXH6doChUDDZ/YLVah
-fCFQGaoCr6KOLY8KWXd054UqZ5d6vQnvAsihwUAO6WGQ8R8hirr4XmT3WV3mVU+7
-HD7JH+uitmETh9sBA+3xpvhh1s9cJZaqsoAm/tQmK0MjIKMs/mcM+krXbTB1PZJL
-ugRlWf3ac0qVljhlSVFpb9BYAcKODHesmTyban51SI9yrIRmhUWmb6OROJit8vzV
-T6LW1ueLberbZo8E4ZaDAzdzJ4M7bLANkpNuKoItGWBHwjXwUSN8wS3KUfyPVnuP
-VUFIAMfEprTLcsMwFPuYxSvN/zTXlL/Zmewn9F3/XTsMlkW7WO/VTI81o5epYy68
-Wf6pd1LkTRCWEcJqcWY4
-=2LUh
+iQIcBAEBAgAGBQJOfLA7AAoJECaGw+YFKA1pMrgP/RIYmLjM2kr29cq0K2ENkYvl
+yzDhGwW/RlMdfTwhtGm4JSxMQ98trT+8Ci0XwdoXlHe6xUQ5Inwph6rxCydeSzcr
+UuQrOaCS/ytKxY0aF9I6fw6gnEwkY7Y3qrLdVZca2Su2gwblmVPiEA6ew06uehkh
+YivU+cYmbrHSGkGoaYwXJ2qAtElZHivsJn3J0o90wx22ifKoDTKySwP7e0jYeux1
+j9fhLZENbuqhLotuWvRYOzeExPzkRTAt4sBdj3UTh15oBMJJDWVQW+tigAXFf+fA
+7+dMHzO7Dv+Rg29dLsyEEO3OyQ9jGlimnOg4NOpJny6frprZzpsVVjSs/sf0UGZi
+8cNm336C5uy04oNM+vD+xviBtbo7jhMcAIEu4X2mK2eJva1wFVZNCSwE/omEWcZP
+Pdq9Ot6MLA+UYv6BACfWPbvzVhGyyuMa9fHy/gAkfpIC7OQwLgrQNjHkc2SWdVub
+YtLEYO01V8wYUsZTx7N5RSCbI2KAI8jAJ6j0Hu4gqgWBWH7ZOV+eu2Ancj/asf3/
+bue5clPFrTyzRO9luFLu1XnoeqCz825PUg/5PvFEF4F9XAhR4uzVVx6s1tNUFoN9
+JkRdNPkhYn9a8Cxjb0Xs6DQH7TF1ZtC3rueBeU8ndDRMRliZ8vL7iT8TNFUoalGp
+9LS4TeB02S+7K0aWRRMi
+=nZ9o
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 957fc2a10d36..27e6086a99bc 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.90 2011/09/05 08:41:20 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.91 2011/09/23 16:10:26 matsuu Exp $
+
+*ibus-1.4.0 (23 Sep 2011)
+
+  23 Sep 2011; MATSUU Takuto <matsuu@gentoo.org> -ibus-1.3.9-r1.ebuild,
+  +ibus-1.4.0.ebuild, metadata.xml:
+  Version bumped. Added dconf local USE flag. Removed old version.
 
   05 Sep 2011; Naohiro Aota <naota@gentoo.org> -ibus-1.3.99.20110419-r1.ebuild,
   -ibus-1.3.99.20110419-r2.ebuild:
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 36e6293d89fb..6a6dfad537c5 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -5,18 +5,28 @@ AUX ibus-1.3.9-remove-unused-build.patch 367 RMD160 ff8c355dc1eb3b70cb1efeac4008
 DIST ibus-1.2.0.20100111.tar.gz 1291877 RMD160 8fc210a7c876c717acaeafa656ad46dc7a2cbbf3 SHA1 8c603844fff37194e835832a7606d240163abb9c SHA256 41f23f1f8bf2746366e2faa57c8bec985098f5770a52c3d56899d33fc5f38384
 DIST ibus-1.3.9.tar.gz 1380081 RMD160 8cf8712d29369bb1934c0d9d66ce5f15953a60d0 SHA1 3eaa95bd2a86c9fae23fdc80dd70d27f0efb7138 SHA256 b2784a668666efa8ae04e6f1cff5749917cd18add0a39a1d020ecc9f3df5285d
 DIST ibus-1.3.99.20110817.tar.gz 1470606 RMD160 3b56578153ffd27080d6f2a136823ef00e1c00bf SHA1 c2b941b17deba1b2ff43b6e4c68ea1854b2b09ac SHA256 5bb66690da0c675bee340388ef26c6ac9558d8480d2b65be0e280cd024a95b32
+DIST ibus-1.4.0.tar.gz 1452055 RMD160 0583a9690ee5a7bb44ce1cebc189c3a644501ca3 SHA1 c46ea0be728ffd4e431d4a18c6bd1e51ceaf045e SHA256 9e5a17d910eae932dd0cd185d0a102b56ad4a2bf79d54b1e53f70174cd2c2a3f
 EBUILD ibus-1.2.0.20100111.ebuild 2559 RMD160 efd0b291781b1b82bca04f9f1eac8104ca151e0c SHA1 6a449de6e9668b6129ae764a04305d39ec4a170e SHA256 d078fe38c54256397eab0599d6d61f3d27f92ca7b1e3b5cda02f412e5f1f6212
-EBUILD ibus-1.3.9-r1.ebuild 3515 RMD160 553ffc0c4c0cb67b74bfa59bf88f0fc3014fe24f SHA1 71080b7a4b89adc494c7474adc7d39721b304bbc SHA256 24da59e66fac042d2de931a3fa49d5e97447915b92ab00f838effa5844229600
 EBUILD ibus-1.3.9-r2.ebuild 3921 RMD160 a0c71f1ca1787f93ee88c3706f973b80f9cd3e82 SHA1 a13b48e3f2a207c4f2e8b404987a38a2e88a29f7 SHA256 8d1f2935f53dca993f79a66fcea81209c86f224412d4a87ef3c6c347f823cc30
 EBUILD ibus-1.3.9.ebuild 3338 RMD160 2dc56af1d32eaf49e033ac27193edfdaea81ca12 SHA1 e95792766471b7ab14d45513dfb2275a7efe9b75 SHA256 474cd7ad087f1f06526c73bc9ba2f94f24cfa4ab1bf1d4f994248b7fccd77e43
 EBUILD ibus-1.3.99.20110817.ebuild 3853 RMD160 6a444a666d171c5113f53baceb4560992b6f94e6 SHA1 e8fd3cf9221e7786688078923bd8288c8ac4521e SHA256 42dc633c932b60b9a47a80b5273f4e1d61b367a6f8a49d463622d67648398f0f
-MISC ChangeLog 14911 RMD160 78277a4a9abe005b405e087bdbdf9b033397adc0 SHA1 49e7d1e14f1235caf3a8007c61dcf7b716c111c2 SHA256 13d1dc298c58f9898c52d4eee6b8c2f5c47965f40a45886c7852a80f72c6806b
-MISC core 94908416 RMD160 d6dddcbbeb29ced93ecb97ce550d0f76ca74156e SHA1 e196d3a3a6415fda6466f27a2afe1518dcb7f8e4 SHA256 a27cd9ee43471cbe0d533b7363f7e01bd60d9b2f2d14eb4326d26310e04f7798
-MISC metadata.xml 723 RMD160 d31d47e723adafe801a851aeacc97195bf133988 SHA1 90a3dfcb261747eb663fc8e6ad3612f919d3033e SHA256 4cbc8c17e6b95b36d48ad63e5fab15b0a52f1ef78bcc6f67044ab722fcef3156
+EBUILD ibus-1.4.0.ebuild 3896 RMD160 414d805ba9cb9218ed670a4ab9378a44be01c33c SHA1 82cd6ab060294cc52618687bf02f6eb9c08225aa SHA256 b9374e07a39d6074ea650b837daa66e674277c0f0e811b96067794b09ddf09ee
+MISC ChangeLog 15115 RMD160 8ccfa9175384949bb60edf910ec208ac815ec900 SHA1 666068b3539d3fe284a8dc5aa8ab4d7016f7072f SHA256 62abca344aee4747123de147e6e708fd3f008a6c29dc9d0f670841fff9eaebe1
+MISC metadata.xml 798 RMD160 00aebf0dab958b7d9a13d7456d9f19c07d247641 SHA1 9208222da6f4015ba64ce30f59ccf20069507159 SHA256 f8cfd5b99a00d0b8cef1a903818e00a957cebb4612dc482b4cb34ed19d73958d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5kiz4ACgkQGpDnPLSHuMBQwgCgtS/GSTTAXzsBfRoW4TrFmeqe
-xMEAniaPvGEM3JlID6UGQB1hWUc/6wh5
-=9lYG
+iQIcBAEBAgAGBQJOfK97AAoJECaGw+YFKA1pcxkQAJi/mGW55awYwc35zecEyk4A
+eIKRo4AR9EUKXXframqiIu5AvqBH34yphCRnZ0PUiRU40zJqfzlYmhkWCeb55h+8
+7LylyTebtlaACyFNQNUh1sI8HlFquU9bvIl8dvcOm086s/SGwdI38MW65wEZpy+o
+8KTC2hunk+4/NSl+oksxROH9Wve5WoRMaTtIuzvsvfX9FFsNVYwvNZqv7hlAHLSt
+e+2XlXbSEML9xLEKnkhDyf1bmb1z6HDhqlTAll/fhGG/cqKOvsTDlrkKHsyeteYO
+WTqCRdeQPP4KbPLcbyccimkR7M4vtI8Ue/R73VvvRRODtwYtDR7uflJZbcI+caX3
+N1BTTN89fiSi0TPndC0LlHjsEVsi9wpLwHycRIPZ7HiEbbJ/4KLc1QpKoQrvlmEN
+oAop5lg6whikuCScwLsg+uTyc1LvHnw8dnX0U4Z2ymbDGtoxDaFLMAyUm3TI9dKV
+877rUVpVJrLsGpNClV/MByY2oZNPfFbnSidtenL9vaNu+5clE0L3jrcsAQsdzNcN
+nSWYJghXjzCVxUjUaqfG1C/ShR28ipvgaYrW/r730uwUoaUn6oUVKWktJ9FzYXxX
+ShChqG/tn+LfoB8q8GMEn5Uhf3MrCoMoPecZbJLlQ71ctI/emxVGMyfU4GUBfOLx
+BibhQ9jP6NSwANw2gZRZ
+=InB5
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus/ibus-1.3.9-r1.ebuild b/app-i18n/ibus/ibus-1.4.0.ebuild
index 203ef63e6af5..5b94f2a5806e 100644
--- a/app-i18n/ibus/ibus-1.3.9-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.9-r1.ebuild,v 1.6 2011/09/05 08:38:15 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.4.0.ebuild,v 1.1 2011/09/23 16:10:26 matsuu Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -13,18 +13,17 @@ SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc +gconf gtk introspection nls +python vala X"
+IUSE="dconf doc +gconf gtk gtk3 introspection nls +python vala X"
 
-RDEPEND=">=dev-libs/glib-2.18:2
+RDEPEND=">=dev-libs/glib-2.26:2
+	dconf? ( >=gnome-base/dconf-0.7.5 )
 	gconf? ( >=gnome-base/gconf-2.12:2 )
 	gnome-base/librsvg:2
-	sys-apps/dbus
+	sys-apps/dbus[X?]
 	app-text/iso-codes
-	gtk? (
-		x11-libs/gtk+:2
-	)
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
 	X? (
-		sys-apps/dbus[X]
 		x11-libs/libX11
 		x11-libs/gtk+:2
 	)
@@ -53,8 +52,10 @@ RESTRICT="test"
 
 update_gtk_immodules() {
 	local GTK2_CONFDIR="/etc/gtk-2.0"
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="${GTK2_CONFDIR}/${CHOST}"
+	# bug #366889
+	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
+		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
+	fi
 	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
 
 	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
@@ -62,9 +63,15 @@ update_gtk_immodules() {
 	fi
 }
 
+update_gtk3_immodules() {
+	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
+		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
+	fi
+}
+
 pkg_setup() {
 	# bug #342903
-	confutils_require_any X gtk
+	confutils_require_any X gtk gtk3
 	if use python; then
 		python_set_active_version 2
 		python_pkg_setup
@@ -80,22 +87,25 @@ src_prepare() {
 
 src_configure() {
 	econf \
+		$(use_enable dconf) \
 		$(use_enable doc gtk-doc) \
 		$(use_enable doc gtk-doc-html) \
 		$(use_enable introspection) \
 		$(use_enable gconf) \
 		$(use_enable gtk gtk2) \
 		$(use_enable gtk xim) \
+		$(use_enable gtk3) \
 		$(use_enable nls) \
 		$(use_enable python) \
 		$(use_enable vala) \
-		$(use_enable X xim)
-		#$(use_enable gtk gtk3) \
+		$(use_enable X xim) || die
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
 
+	find "${ED}" -name '*.la' -type f -delete || die
+
 	insinto /etc/X11/xinit/xinput.d
 	newins xinput-ibus ibus.conf || die
 
@@ -113,6 +123,7 @@ pkg_preinst() {
 pkg_postinst() {
 	use gconf && gnome2_gconf_install
 	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
 	use python && python_mod_optimize /usr/share/${PN}
 	gnome2_icon_cache_update
 
@@ -136,6 +147,7 @@ pkg_postinst() {
 
 pkg_postrm() {
 	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
 	use python && python_mod_cleanup /usr/share/${PN}
 	gnome2_icon_cache_update
 }
diff --git a/app-i18n/ibus/metadata.xml b/app-i18n/ibus/metadata.xml
index 9984e3072cc8..a8aa1809c443 100644
--- a/app-i18n/ibus/metadata.xml
+++ b/app-i18n/ibus/metadata.xml
@@ -8,6 +8,7 @@ full featured and user friendly input method user interface. It also may help
 developers to develop input method easily.
 </longdescription>
 <use>
+  <flag name='dconf'>Enable support for <pkg>gnome-base/dconf</pkg></flag>
   <flag name='gconf'>Enable support for <pkg>gnome-base/gconf</pkg></flag>
   <flag name='gtk3'>Enable support for gtk+3</flag>
   <flag name='vala'>Enable support for <pkg>dev-lang/vala</pkg></flag>