Version bumped. Added introspection USE flag. Fixed X and gtk USE flags issue, bug #342903.

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

7 files changed, 178 insertions, 27 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 24c8ff8285b8..7653d82d3a42 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.70 2010/10/25 16:13:55 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.71 2010/11/05 14:11:27 matsuu Exp $
+
+*ibus-1.3.99.20101028 (05 Nov 2010)
+
+  05 Nov 2010; MATSUU Takuto <matsuu@gentoo.org> ibus-1.2.0.20100111.ebuild,
+  ibus-1.3.7.ebuild, ibus-1.3.8.ebuild, +ibus-1.3.99.20101028.ebuild,
+  metadata.xml:
+  Version bumped. Added introspection USE flag. Fixed X and gtk USE flags
+  issue, bug #342903.
 
 *ibus-1.3.8 (25 Oct 2010)
 
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 520a9b7505a7..263d1e2338fb 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -4,25 +4,27 @@ Hash: SHA1
 DIST ibus-1.2.0.20100111.tar.gz 1291877 RMD160 8fc210a7c876c717acaeafa656ad46dc7a2cbbf3 SHA1 8c603844fff37194e835832a7606d240163abb9c SHA256 41f23f1f8bf2746366e2faa57c8bec985098f5770a52c3d56899d33fc5f38384
 DIST ibus-1.3.7.tar.gz 1358687 RMD160 f50ddda511b6f74b522a61c834e6ffd1f3f41baa SHA1 ba5e8f0c57f6fd53af6f76a3b60deb1be3cb27c5 SHA256 b7d9bcd57578c02f9b62019061b00935030bf629ff8b113deb35116e1702a537
 DIST ibus-1.3.8.tar.gz 1379038 RMD160 c9a0d159d8810327666ddd2da18c19ef24c91106 SHA1 c1cf1c897bd24f8becfa52127d058eabbb199b8e SHA256 d8507517f5e5ba454b2663581b1133df21fdba74a077902259e18845cdd2468d
-EBUILD ibus-1.2.0.20100111.ebuild 2604 RMD160 88e29c5d37b4e5c2a5468d944f7d273559ed0af9 SHA1 0d0e6b4c81862688695068f34ad38d9bcf69269a SHA256 184033cf903578d717164518ba2320c2fda0c60e55918d3be67a8194f75c3a99
-EBUILD ibus-1.3.7.ebuild 3087 RMD160 c63532b471437fec01cc2de4c38c4abe93fc7820 SHA1 32634ad36ffc62e0c346a5cfffff4c1b6a12549e SHA256 90ea7ea39b68ab6dcf2b863e35331a2db8082adf27bbc7ba25b1ff158cda616d
-EBUILD ibus-1.3.8.ebuild 3086 RMD160 eea9f7ee91cd7c9de18ec843816f34c0cef3d323 SHA1 5207429ac7fcff8f7defd44b5d999e9bad288215 SHA256 55fa18f72639a648e9cd7d294eb4e047792ad3be8ef6f127c7bfc788ea896b92
-MISC ChangeLog 11399 RMD160 e246d72740cb732ea06563c2ed1e6ac30ec9d625 SHA1 7b9f3695aac3fed2c44a686d18c34254f2e8a694 SHA256 518cd059524c20db4f0100ca61f5fd1eb7d1de5a03bc9fc55aa6ab418bcfcef2
-MISC metadata.xml 571 RMD160 7e15a8e54ee27330bfbff88820f71dfbaafdc493 SHA1 2a83f073755d94ffc6becd86ec4a4500ace8f40f SHA256 610811c591a4dc528132ad73cea639ff5f35e5fbe83ce8e8e0ca9485c6afd182
+DIST ibus-1.3.99.20101028.tar.gz 1311498 RMD160 68a3279341830bda7a6de63d53d50b7e4c22155f SHA1 ce20e090b8a34fc4ed00f1c8447c7fbb98af94ae SHA256 9f69b0a9ae8b0eec5d7511ca3a2f3cf2ea2b20e47695b6e7b095aec049fb921c
+EBUILD ibus-1.2.0.20100111.ebuild 2658 RMD160 0711f78c713a3107a5861b98ee39b269ee6b0368 SHA1 987df904f67bd283eb7a202d7804f3a1a9644e65 SHA256 5e35e92c5cb74b486b438529e72a3d8985fa666d618500be4f1d52281ede454b
+EBUILD ibus-1.3.7.ebuild 3245 RMD160 879533b81358c66646dc8991cf70cab4c4512e7c SHA1 15497acde7ee9e200ff6e5c9e56466dcea357f06 SHA256 0965c194716cdda35939eaef48bc529e5b295dc65d844106d5a7a8174de04db8
+EBUILD ibus-1.3.8.ebuild 3245 RMD160 10b35870169f43b97f7b9cb498ec0e4a76e57300 SHA1 6315c9cf85ae786ac0b409d5c70228cbfb0a2e75 SHA256 df230506cd44f04f4ef1c8f252f0e5b9dad833510e85ff7fb53b6e24c21b5416
+EBUILD ibus-1.3.99.20101028.ebuild 3255 RMD160 060e59b053b07f7ae26c1d8d487e5ee916a54da0 SHA1 0e0710813d4c01c55c795639642e53c582e6a424 SHA256 0ae681e67e5171e1005c3d87637886b9a0a57e747b6443dc0b8e2ed701d5107f
+MISC ChangeLog 11696 RMD160 bcd161c43eb99e6e82167a05734d6e6524e9c004 SHA1 16cf526009cca54f2c037d66408ecedbcf80321f SHA256 15f903fe0238f7c381cd73822506e4404d08fc97621d3d945b4df10659bb3a3c
+MISC metadata.xml 671 RMD160 a430d2733dbeb0c98d42b3a432cfadafb5f8c87a SHA1 bfc77eafdea87e34b5ae48e6a6652508c4a70204 SHA256 4184635ca1b44311db6031a7f00c5679582289862be1a550a4faf4dd9d5e6e59
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJMxbA1AAoJECaGw+YFKA1poIgP/3KadaqB89aA5klza09ud23F
-NV0fXZgzEqyF+GU9FRwYCgUgWFj/Xqhaph71FHGSKjOVQzdMGt+YnmReRRAeGtQl
-W6k//We/u5vXIVPRXgtsG1XsfwJUplpRFSSKGGtzrERKUV3tTh/fCql8/+KpJSZK
-o04E3uyGKkW/Kwp10wejCBxRdy2+2Ff86ZFntiHJCJ2vf8xyQ6nPmUPy1LolwMN4
-qz9DkwYAJZMV3uDiL92Y16rQ0xV73FsXOIUZ8dcIqrboVCHw9K2de/ahlRukcJJ6
-9KbQc7ctiLWzh+qrg7abxFzw/H7/2Jz/dlZK8xymB7BsFj+nRm/efb9BTPceiEE7
-ZoRGatC31KBpvtKDTSuBuD5jFBkGPaKcItFEcJtPLh6goqSI9FbvszdvGVvfeF4T
-AFA9prNfCYG2ibuKsXURJSBLzY1QEuYzBSPrY5wW472IHsWCkkp009ol+mDA/qI+
-xg95hU+ISJtdjJRxIBfCrMEovmq1ULRieuxWwIVKUY840NuHPl09eR3GXg+oqOsV
-aN3fXEOhJ4JM4n8sHoG8kI/J0TacaLzAICk/r9iRCZWdW1ZGo42A2fzWR5bb2RZg
-rSSQN/4NF31+lJGcfq0PlO3c1PIuzxlF8j7SbPpfmRam0YfNrtBgNxX+Bs100Z75
-x6IOziZ76NuDYL7KaUYo
-=PVx6
+iQIcBAEBAgAGBQJM1BDoAAoJECaGw+YFKA1pBTEP/RL0LvZKAfPJ4dTU8w7DoCL8
+ohR/6VUIvK8CxrXBKDNXcyVafYrrEDQRnyKnsj9VV+QjQE/TCLsXkOtTF5O80uI7
+h4tuogreNrAo2VfPj0AWwGj7Ax+hE9yMwIBjcEUVIAcELiLsC1MDs7PYr4hqhbhQ
+B4KCxEsw3zMxCZvlNAs5+HsrMSP84Vo9Cyhn/wQyOKt4uv5u0/IEQSCRcfIlw44w
+HliSUSCZC1YM3pBFRpmrmU2bDK3WjleC/qfmAazm97rRi1hGE4EY9IERO84tFuYL
+Tnj6W0b2TJcgW+NiIaSKhq6AF7pZClPMxFHa4TMI6zSurfz/w/vXf3M/0sTW9ZGr
+Mp3IpfM+YxYzDNI7w9X0O1z59XRscSR3IVhWITyi4AgNljld8vaMHFktWsSMqLHK
+YTelefsR2CXwiDZJosQnCoRTywz3vfYIWBkIm7LiYElcmvf4DTn3SssbOX33Laei
+j21caDkBlfSBmRDlPzi7bPP1XVAhiJ3IaDv/Xm14dHo0F7CaPw1kf38Hf+eumbPW
+tyL7sZRaUHuuaUD+5sjjMekoSKYO/CGE8/VvQuhIbHduH1jLSo5njlIGlSR+iu/o
+B+GgGvfO/hvvcoK/Z4tT2/FqW3Pbe43/A4jasRWr+oKEe9lhJ74GjWKnn5Z6dV98
+c5nec+4WfqzfmJ9k2DOh
+=RGi6
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus/ibus-1.2.0.20100111.ebuild b/app-i18n/ibus/ibus-1.2.0.20100111.ebuild
index 28fb11215e92..96ed449ae357 100644
--- a/app-i18n/ibus/ibus-1.2.0.20100111.ebuild
+++ b/app-i18n/ibus/ibus-1.2.0.20100111.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.2.0.20100111.ebuild,v 1.5 2010/08/11 18:15:25 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.2.0.20100111.ebuild,v 1.6 2010/11/05 14:11:27 matsuu Exp $
 
 EAPI="1"
-inherit eutils gnome2-utils multilib python
+inherit confutils eutils gnome2-utils multilib python
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="http://code.google.com/p/ibus/"
@@ -39,6 +39,8 @@ RDEPEND="${RDEPEND}
 RESTRICT="test"
 
 pkg_setup() {
+	# bug #342903
+	confutils_require_any X gtk
 	# An arch specific config directory is used on multilib systems
 	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
 	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
diff --git a/app-i18n/ibus/ibus-1.3.7.ebuild b/app-i18n/ibus/ibus-1.3.7.ebuild
index 977683e99ee2..49ddd21d2fc2 100644
--- a/app-i18n/ibus/ibus-1.3.7.ebuild
+++ b/app-i18n/ibus/ibus-1.3.7.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.7.ebuild,v 1.3 2010/09/18 17:43:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.7.ebuild,v 1.4 2010/11/05 14:11:27 matsuu Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? 2:2.5"
-inherit eutils gnome2-utils multilib python
+inherit confutils eutils gnome2-utils multilib python
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="http://code.google.com/p/ibus/"
@@ -13,7 +13,7 @@ SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc +gconf gtk nls +python vala X"
+IUSE="doc +gconf gtk introspection nls +python vala X"
 
 RDEPEND=">=dev-libs/glib-2.18
 	gconf? ( >=gnome-base/gconf-2.12 )
@@ -27,6 +27,7 @@ RDEPEND=">=dev-libs/glib-2.18
 		x11-libs/libX11
 		x11-libs/gtk+:2
 	)
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
 	python? (
 		dev-python/notify-python
 		>=dev-python/dbus-python-0.83
@@ -60,6 +61,8 @@ update_gtk_immodules() {
 }
 
 pkg_setup() {
+	# bug #342903
+	confutils_require_any X gtk
 	python_set_active_version 2
 }
 
@@ -74,6 +77,7 @@ src_configure() {
 	econf \
 		$(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) \
diff --git a/app-i18n/ibus/ibus-1.3.8.ebuild b/app-i18n/ibus/ibus-1.3.8.ebuild
index 4043f8173ef7..506c4e070f17 100644
--- a/app-i18n/ibus/ibus-1.3.8.ebuild
+++ b/app-i18n/ibus/ibus-1.3.8.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.8.ebuild,v 1.1 2010/10/25 16:13:55 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.8.ebuild,v 1.2 2010/11/05 14:11:27 matsuu Exp $
 
 EAPI="2"
 PYTHON_DEPEND="python? 2:2.5"
-inherit eutils gnome2-utils multilib python
+inherit confutils eutils gnome2-utils multilib python
 
 DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
 HOMEPAGE="http://code.google.com/p/ibus/"
@@ -13,7 +13,7 @@ SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc +gconf gtk nls +python vala X"
+IUSE="doc +gconf gtk introspection nls +python vala X"
 
 RDEPEND=">=dev-libs/glib-2.18
 	gconf? ( >=gnome-base/gconf-2.12 )
@@ -27,6 +27,7 @@ RDEPEND=">=dev-libs/glib-2.18
 		x11-libs/libX11
 		x11-libs/gtk+:2
 	)
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
 	python? (
 		dev-python/notify-python
 		>=dev-python/dbus-python-0.83
@@ -60,6 +61,8 @@ update_gtk_immodules() {
 }
 
 pkg_setup() {
+	# bug #342903
+	confutils_require_any X gtk
 	python_set_active_version 2
 }
 
@@ -74,6 +77,7 @@ src_configure() {
 	econf \
 		$(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) \
diff --git a/app-i18n/ibus/ibus-1.3.99.20101028.ebuild b/app-i18n/ibus/ibus-1.3.99.20101028.ebuild
new file mode 100644
index 000000000000..cd29c59148eb
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.3.99.20101028.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.99.20101028.ebuild,v 1.1 2010/11/05 14:11:27 matsuu Exp $
+
+EAPI="2"
+PYTHON_DEPEND="python? 2:2.5"
+inherit confutils eutils gnome2-utils multilib python
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="http://code.google.com/p/ibus/"
+SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc +gconf gtk introspection nls +python vala X"
+
+RDEPEND=">=dev-libs/glib-2.18
+	gconf? ( >=gnome-base/gconf-2.12 )
+	>=gnome-base/librsvg-2
+	sys-apps/dbus
+	app-text/iso-codes
+	gtk? (
+		x11-libs/gtk+:2
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/gtk+:2
+	)
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
+	python? (
+		dev-python/notify-python
+		>=dev-python/dbus-python-0.83
+	)
+	nls? ( virtual/libintl )
+	vala? ( dev-lang/vala )"
+#	X? ( x11-libs/libX11 )
+#	gtk? ( x11-libs/gtk+:2 x11-libs/gtk+:3 )
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5.8.1
+	dev-perl/XML-Parser
+	dev-util/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.9 )
+	nls? ( >=sys-devel/gettext-0.16.1 )"
+RDEPEND="${RDEPEND}
+	python? (
+		dev-python/pygtk
+		dev-python/pyxdg
+	)"
+
+RESTRICT="test"
+
+update_gtk_immodules() {
+	if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then
+		GTK2_CONFDIR="/etc/gtk-2.0"
+		# An arch specific config directory is used on multilib systems
+		has_multilib_profile && GTK2_CONFDIR="${GTK2_CONFDIR}/${CHOST}"
+		mkdir -p "${ROOT}${GTK2_CONFDIR}"
+		gtk-query-immodules-2.0 > "${ROOT}${GTK2_CONFDIR}/gtk.immodules"
+	fi
+}
+
+pkg_setup() {
+	# bug #342903
+	confutils_require_any X gtk
+	python_set_active_version 2
+}
+
+src_prepare() {
+	mv py-compile py-compile.orig || die
+	ln -s "$(type -P true)" py-compile || die
+	echo "ibus/_config.py" >> po/POTFILES.skip || die
+	sed -i -e "s/python/python2/" setup/ibus-setup.in ui/gtk/ibus-ui-gtk.in || die
+}
+
+src_configure() {
+	econf \
+		$(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 nls) \
+		$(use_enable python) \
+		$(use_enable vala) \
+		$(use_enable X xim) || die
+		#$(use_enable gtk gtk3) \
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	# bug 289547
+	keepdir /usr/share/ibus/{engine,icons} || die
+
+	dodoc AUTHORS ChangeLog NEWS README || die
+}
+
+pkg_postinst() {
+
+	elog "To use ibus, you should:"
+	elog "1. Get input engines from sunrise overlay."
+	elog "   Run \"emerge -s ibus-\" in your favorite terminal"
+	elog "   for a list of packages we already have."
+	elog
+	elog "2. Setup ibus:"
+	elog
+	elog "   $ ibus-setup"
+	elog
+	elog "3. Set the following in your user startup scripts"
+	elog "   such as .xinitrc, .xsession or .xprofile:"
+	elog
+	elog "   export XMODIFIERS=\"@im=ibus\""
+	elog "   export GTK_IM_MODULE=\"ibus\""
+	elog "   export QT_IM_MODULE=\"xim\""
+	elog "   ibus-daemon -d -x"
+
+	use gtk && update_gtk_immodules
+
+	use python && python_mod_optimize /usr/share/${PN}
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	use gtk && update_gtk_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 5ec6adab3420..2f6ee4e46e09 100644
--- a/app-i18n/ibus/metadata.xml
+++ b/app-i18n/ibus/metadata.xml
@@ -10,5 +10,6 @@ developers to develop input method easily.
 <use>
   <flag name='gconf'>Enable support for <pkg>gnome-base/gconf</pkg></flag>
   <flag name='vala'>Enable support for <pkg>dev-lang/vala</pkg></flag>
+  <flag name='introspection'>Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
 </use>
 </pkgmetadata>