Removed X use flag, bug #324339.

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

3 files changed, 145 insertions, 15 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 537e61470cb5..b297535bd479 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,11 @@
 # 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.63 2010/06/15 17:58:35 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.64 2010/06/17 13:30:19 matsuu Exp $
+
+*ibus-1.3.5-r1 (17 Jun 2010)
+
+  17 Jun 2010; MATSUU Takuto <matsuu@gentoo.org> +ibus-1.3.5-r1.ebuild:
+  Removed X use flag, bug #324339.
 
 *ibus-1.3.5 (15 Jun 2010)
 
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 140a3f1dd40a..c819c2084e2b 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -8,23 +8,24 @@ DIST ibus-1.3.5.tar.gz 1323214 RMD160 2d747e63ca93b5b4f7828eea3427bf5f8c03a233 S
 EBUILD ibus-1.2.0.20100111.ebuild 2587 RMD160 23a53da21cde5d48927eac1871f09bbeede594af SHA1 a8ad2777c9f61b81a23c602c7b81347deb015630 SHA256 8c74b19604d293719882b3a7ec3fa61a1eeec297181504c8ee74e64ac07c42a6
 EBUILD ibus-1.2.1-r1.ebuild 2544 RMD160 d5830d0821d12decd9e2bbf646d6154ce43c08ab SHA1 7aabc8069fcf25574e3b463f600be5e00998f0bb SHA256 627b6d1d6fb57f6035dc02a1d01c6c257b6e87617e6380fb1ad84100ac51431c
 EBUILD ibus-1.3.4.ebuild 2733 RMD160 d4f312e4155882a299c2ec62a76e7baf8ae619bc SHA1 b3d6f4a6f59f4f0bd1256718690f6bf069a5712e SHA256 6314adc29c0f83644132aac2183d82077e6568c5579b313dd2a553763f9fd6ac
+EBUILD ibus-1.3.5-r1.ebuild 3057 RMD160 f7338a66c4731f1b0f3b2ea2ba63e3d48124e473 SHA1 37122dc788cb2cd456ed2f8cbaa9975a9dfd4d90 SHA256 b9644b0cfbd4f914ca31aa2078919d3e7a4ff40dec2fdf685567b47a060b952a
 EBUILD ibus-1.3.5.ebuild 2894 RMD160 a0f679c69783371379eb88a0dba21f51442bdb9b SHA1 13b0738ab6a831b268f62f373cc661593945d448 SHA256 9667206dc07a49bf63ebfcd90efdb248966359e41d7168893195f251b862295e
-MISC ChangeLog 10526 RMD160 fd392dbfc06d3ea475aff5b315146ca4513ff60b SHA1 9d7baae845bc1602f2464de0f07ba8708a5f0988 SHA256 f87baaa5769ca175be21e6ccba5f537acb9f693892219b9d0fe500e1a2b2221b
+MISC ChangeLog 10664 RMD160 efc6196851c66e95aae633f4d6dd5a1eceb11102 SHA1 014b2abf5eecbb028ae139f3149f5c267b46ff75 SHA256 5025691f606a104f4b8fb16a923f5fab67c112992fa3ba18b0efaf41ebbfa27d
 MISC metadata.xml 571 RMD160 7e15a8e54ee27330bfbff88820f71dfbaafdc493 SHA1 2a83f073755d94ffc6becd86ec4a4500ace8f40f SHA256 610811c591a4dc528132ad73cea639ff5f35e5fbe83ce8e8e0ca9485c6afd182
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iQIcBAEBAgAGBQJMF79UAAoJECaGw+YFKA1py3gP/0uexvPlK46P+6UAk7+oOQQn
-KjzSbqQR5pj4c5ptEmTMCdljXtZOx+I2qUJCNEdiqKdu4O/jiXssjOBgGTojsUWc
-y9DPhHIzjO3DlhZwmTxmM9Yg11dUzuh7R3vrkOQj28pQSjMN1X7PnkxYreEzn3cA
-0l88y0s3IaqFo2ee8rektj6YxtJrJKgn4H+/d4i/J2uhznZw/THm+r7i1j6lY7t0
-O1mDWwztNyds9JgRh9J8ugkCnqRK3ERTlaWjRWC+P/rbt8LRQ9AltJuPflVgHctL
-q3bM3U1IO+z4XYRFtx7NRDK2+3ibO6LIMh+jyyk0ykggKaHNfhGhfjhkINEA/q0z
-5ZO18IF51vEkadfSqBMyJTmoP2ZH5/llB4gPh6IbKGcZQeziCfaCDl9A8WsYPaD3
-uw7DmzU4BWLtJRuFqjmiBR/i+GgdObI33+uvPJrYCp+AxnNMA7woV3SHnljT+LtR
-hzTpVnDib7HYyGK3J3K2hHKmGiRc7zUItFjyakgprATHr6tpjv0BkmCuQg8a8KhM
-ktKR37O4w0/BTqmWPthO6G7wRfpYeUfnZowjomQllA8fpOagjXIVjcj2+T1osjth
-ZyEwhSpUhZxBJIlZYkIMabIKUjXXeoy+4JwYceQfkqo2uhmSH/F4YZ/AZMTsro3h
-3P2/5W0CG9PcUfXIHVWG
-=ptky
+iQIcBAEBAgAGBQJMGiN1AAoJECaGw+YFKA1pySQP+QFGDmQj+Buhrb7NJg8ncnIH
+KXLZD1Ekj6KFeBHD3rX4xJ1rvlZE/TqmsaCMyEsg7eY+ITBVhN+49jj+4bQvZx3U
+p9yedk/WCeip6aOILcqLg8m1cch6oEI9QEKM82DWzqJI1DrTzjgN1KKn7BmcJSgM
+/MMVLn4zCWyxCurLw6ylukoQOmefPiVqQPHwZOxmHyGs9iRASPM3kJCvtIkHviQB
+sXx293mwLJVCzQF7HAibu6bl9EszEPo/pwJDCa5Yqv7ZBaBW2PblpAsAgG3EUF3v
+Egpz1PLCKeQwu9vwxoCIYojM8yclooYjLuXw9SzYBKcsdsTs7kdADhY885lO81O+
+APpiYUSk1ltrnxz0zyTSM7ZGUiYxhYdHQpMo5CHgTIAg243jbIuAsuEfkeUCsJm5
+lXmGlGRXBnhIG7kogIUovQYHZaDdaP2yP3iRQT5/IiF6C4oM7xbxemq/5xStkK/J
+ZXOQ90fMTha5jBoXBA7MEVTIysccBSFSR/+sdKnxIcl787A40thayuZYsIWMPWJ/
+h3mEGwchxLy32C81kDw9mAaE57BjQqTGe6hSy1yVnNiNP1YbJgNHHrR2sbnn1kmZ
+ndEJC614AtbLlU9c08OwSOHv+vZ7MQGnDvs1Uu52QJgATtVRws7J9G5Y58M/rqeG
+Ja6Y9hzo7CzyXuTyj5KV
+=vXfN
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus/ibus-1.3.5-r1.ebuild b/app-i18n/ibus/ibus-1.3.5-r1.ebuild
new file mode 100644
index 000000000000..1d62227b8fc7
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.3.5-r1.ebuild
@@ -0,0 +1,124 @@
+# 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.5-r1.ebuild,v 1.1 2010/06/17 13:30:19 matsuu Exp $
+
+EAPI="2"
+PYTHON_DEPEND="python? 2:2.5"
+inherit 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="~amd64 ~x86"
+#IUSE="doc +gconf gtk nls +python vala X"
+IUSE="doc +gconf gtk nls +python vala"
+
+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/libX11
+		x11-libs/gtk+:2
+	)
+	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() {
+	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 gconf) \
+		$(use_enable gtk gtk2) \
+		$(use_enable gtk xim) \
+		$(use_enable nls) \
+		$(use_enable python) \
+		$(use_enable vala) || die
+		# Bug 324339
+		#$(use_enable X xim) \
+		#$(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
+}