Version bump. #432580

Package-Manager: portage-2.2.0_alpha123/cvs/Linux x86_64

3 files changed, 170 insertions, 3 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 53a2501aec93..0035d2e3d983 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.110 2012/06/18 13:39:14 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.111 2012/08/29 10:30:59 naota Exp $
+
+*ibus-1.4.2 (29 Aug 2012)
+
+  29 Aug 2012; Naohiro Aota <naota@gentoo.org> +ibus-1.4.2.ebuild:
+  Version bump. #432580
 
   18 Jun 2012; Ben de Groot <yngwin@gentoo.org> ibus-1.4.1.ebuild:
   Enable X useflag by default to fix bug #421767
@@ -584,4 +589,3 @@
   05 Sep 2008; MATSUU Takuto <matsuu@gentoo.org> +metadata.xml,
   +ibus-0.1.1.20080901.ebuild:
   Initial import. Submitted by Hong Hao, bug 236277.
-
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 418a2ce6bfd4..0fa44c8952e1 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,8 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ibus-1.4.0-machine-id-fallback.patch 750 SHA256 ad1b7538e324a29fd779d7545860e06f22904974bae931fa3cda045ae74af8ed SHA512 7ed7d36ad3bd369d68aa628a364a6b78421489834d70bb76cbb9f8630b69d0bf58b6cf88c409ebbc100201054efd956aa0199d3395f396bf8932e96159f8d221 WHIRLPOOL 4e8495e611f92b0321c11c6343dcabfe5652e4c1e7613b4f315b8a72d88b58c76a1eec31960bbb709fcf639bf5b26890c53d4de44a6e25e1d0e02d050b2d9b0a
 AUX ibus-1.4.1-gir.patch 482 SHA256 802581c7c4293dd34c5fda9143d8b46d6a2e65dda82836643fbb4122f1b5b275 SHA512 bec6b63bc5e518fa83c077684365354df9402e70ed7b9c7757b56cd778e0f64b9fa391a7cc6c3e22a2197e6389c58232c3748616758f98bd477f665912674f0c WHIRLPOOL 9261329877eb1221c63eb6568b0e075bc8e7fe188164e06ccfa3ece8ad0c190ff31a2ee5e528550b9c3ad65416a72ceae90ec53d17470c9d54e8a63ffd1c21d1
 AUX ibus-1.4.1-no-gconf.patch 1002 SHA256 7f136de585b41d4ae47e1d9cb58a982f8ab70dc142eb579702e60f67f7f093f2 SHA512 168fefe6d5bb5efdf5e6212ca2ac72ab8a58789cf813c0c280dbbc3788cb70a0d344f9d837e8903b04fed57cdfa98e36f7ca40961b405b969554c384e783a6dd WHIRLPOOL 1fb6f44d7cb24aeaf215c0064bf527af19cd4cf8b0fd767f8ed939103ba3ed1904fd70c591f8f533ec4cc1bc6b6313faf5de7387ec703259639306458fff5206
 AUX ibus-gconf-2.m4.patch 1707 SHA256 40c54a970779f4586161f45ebd245c9db71b46ced0d7deda22f47de851c02954 SHA512 5310d371ae53c31551824e01c9fc3ee815b64c5595c778b956f807973be57ba26efa72977b3f3798347ecf25551f7da95f11bb545def761968b96edd81575985 WHIRLPOOL 74337f038a655689911c0fa3d219747b64c440453d62a1c9597f7cd9e8b45f6b3119e81e8daa8f7dd0eff4a74f2e78bef8ed16ea3c41ebad5cb10b0c7b2d9952
 DIST ibus-1.4.1.tar.gz 1479412 SHA256 2f46de279ef3c0a48d3f52061794cfc6544ad8cfe3f04d9d12b251d119a180d6 SHA512 465f5d099ca60612e9d28c77da6a8da2435cc50c3f2f9b93c4c9258d18bb963d85b84ed9d7f9c58e90dc07a4898dc9668a6e2a3484b69074a1777761389ba468 WHIRLPOOL 800e68481202dfd6f4cef0de692f4fa3ceb9e570d34b632f9547605a9ed9688be75a69402ff5df3df71fed12f463502d6e8041862dd065e725e6fa16ec968bcf
+DIST ibus-1.4.2.tar.gz 1489482 SHA256 2418d9960d177c0ce7d3dc5ef8ab75cfc00e30f5e2c730b7d82f4f22666a04d7 SHA512 0070f7d0a4bc6510692851f60e06e487f75fdbe47f50a2371f62dd06b89f20950161b5f1bb91e025dd8dced654d9e90eb910bb5be8e8923869e96e5048f8316d WHIRLPOOL c480ef6fabfe24f2350a0222945860e3b890b32373e159032cc4a9bb1a1df2ad22b6ce11fb9845c5ebacdb7662b9dd26bffb7dd8f6d366551e9ec226e2b14d8d
 EBUILD ibus-1.4.1.ebuild 4024 SHA256 85add3b99e0b2871c1c3ac8211746b912d8592a90287da4af19f0a57b10557da SHA512 c267629c053d9bee3c6947d1b3290367f84fb64936b469166a9d90495fc617cbae9d50868430b679180e8dc569cb4a6465a6416a4fcfa712e5196e0614197fdc WHIRLPOOL 5c589453e3557eb141cf098be73761229fc0616d4f15042eac772fac9564a77eceac94acd4bbad399379435c33862bcfca1a8e579eadbba0b6dcfe9aea5b60f2
-MISC ChangeLog 17978 SHA256 ef4c59b17db80b3315c763193e0858aec8e31728a4078dfe05ce83907a2416aa SHA512 4f84b02f269f2938b556bc2aaee1abb86cfe423704ed9a503d2599b44b9a7b4fbec6c4c44fcc347e5c38395719ecc772d7722dc1f22e8a01d497dc107e75957f WHIRLPOOL 68657de8cfc760c9813f36b1fe604a0019920edc51bd3f7839621af458fcc082dbb2f464ea449e1f7e01489e7550f590b165b76d947a5a7be8dc822ba5be3bb4
+EBUILD ibus-1.4.2.ebuild 3382 SHA256 7bc96753cff904af8ce4c08abea5c31fcf8aef6bcdaae9d1baa99168b523b077 SHA512 57e1c1535ed61bcaf34e31b69e9dfadb2cbace9ac73daa15946efec4219c2eaf2aa9c42eb04c35ac165668bba861b50d32385ddb6cbd4dba8f79172782e56f0c WHIRLPOOL f64cea18276daf33ae7be864fae7854bbc4b5fa60639f87595b1209e46effea73bc736ab9d7e9da33111bb53f4a756c4f7374cb63ce1d2c9f93220def983f355
+MISC ChangeLog 18095 SHA256 d4f01bfc5f45dffe28e8ea906566b877a41bcc9d3aa67912aa3e18b759f9e6d9 SHA512 a9915489ec2ec316455af66a6c2c2e9b1936206c0b63efb401a38ab0c66660df5e7fbe08221e2d2d926f6f189496a9e06c98453b75104826996e3f7e6c167dca WHIRLPOOL 7ad527f2eec69c2484f572058673217016581af011660bce019b83920365d63087508ff292da135735ca6695006aa495e7679b8de7ddbc634538968e823c573c
 MISC metadata.xml 798 SHA256 f8cfd5b99a00d0b8cef1a903818e00a957cebb4612dc482b4cb34ed19d73958d SHA512 b85cdaafe978c30a277a5aab42132a9f8e85e4c0ff2ab701ada63b1c697080129b6a25ce245501d2770674cc70a2e341a85d242fbc24b7b425496c733a936c05 WHIRLPOOL a0297164f8b03565d0fd6a0dc4d2046ea22a4dba53afe1012c5dacfafeb43606b4b35678ece4e1c266042cbbc0425b9f24d34f6d979c6739ab99518cef63077d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQPe9MAAoJEDYO1FT4VRUUp4EP+wXqZiWU8+CY2XAsm2bZi89C
+jHWfxazo2SMxey+R+gZZ5zMIPqWz5NYBc8tl7SjtrOJVMLxPb6ZEiJa9e0qlj5w8
+HMFB/t3uLsYF6hGccqe8qTueORw9PGSHBKwEmXvE5OxOQS3CXkA1qaq9UacGZ/bx
+xDHaH5tVnzZRe/zTZW7Gh1wuPr4Db9vcjNJz6KcTmj4EYFInk5+fkDgvhvUmmEfY
+9BJmHKIEZH8i+fL/RKnLnA7/9a20CVe+XrdgrUyI76W2ECQOC9EWHS5jKfg6Hk+l
+xh/THF/tJHadTL37x1jzdI/nrQd+NRtwS4V32QL/T4imifQJWwBRfeUqRVqupAKY
+vZHHPZi64+vRZdLMKUffiQvBNX8WiN9h0Te562Dqx/NI9ySxoOWEPYoljoTOfVWu
+qk9niVyW1lL7gRBxYUk/9SLZDp/OhzM4CoyMx+2wwHFoUgmyyfWmUm89auaBf35x
+o87ZWDcNsotf577PQUiXE4rwiF3D++XyaHStxYSmqVR8z9PW1sAsv6C6VRIHezkd
+Q34C41SHiGUbeaXTNfbow/7fP0vwdv8Vf9uIiaWktqV00zrS2rSlnhcUunHVGkEU
+OgqLbXA1X0d3cQYgO6/AIbXEuoKyhQwX45bxbfSkrjE6zi+/TAmr10LIoi+jkvbo
+nIvo7CK2xrUPpc3vX/rZ
+=9TwQ
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus/ibus-1.4.2.ebuild b/app-i18n/ibus/ibus-1.4.2.ebuild
new file mode 100644
index 000000000000..9a4a3684345a
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.4.2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.4.2.ebuild,v 1.1 2012/08/29 10:30:59 naota Exp $
+
+EAPI=4
+PYTHON_DEPEND="python? 2:2.5"
+
+inherit eutils gnome2-utils multilib python autotools
+
+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 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="dconf doc +gconf gtk gtk3 +introspection nls +python vala +X"
+REQUIRED_USE="|| ( gtk gtk3 X )" #342903
+
+RDEPEND=">=dev-libs/glib-2.26
+	dconf? ( >=gnome-base/dconf-0.7.5 )
+	gconf? ( >=gnome-base/gconf-2.12:2 )
+	gnome-base/librsvg
+	sys-apps/dbus[X?]
+	app-text/iso-codes
+	gtk? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	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 )"
+#	X? ( x11-libs/libX11 )
+#	gtk? ( x11-libs/gtk+:2 x11-libs/gtk+:3 )
+#	vala? ( dev-lang/vala )
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5.8.1
+	dev-util/intltool
+	virtual/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"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	>py-compile #397497
+	echo ibus/_config.py >> po/POTFILES.skip
+
+	epatch \
+		"${FILESDIR}"/${PN}-gconf-2.m4.patch
+
+	use gconf || epatch "${FILESDIR}"/${P}-no-gconf.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	# We cannot call $(PYTHON) if we haven't called python_pkg_setup
+	use python && PYTHON=$(PYTHON) || PYTHON=
+	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) \
+		PYTHON="${PYTHON}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-ibus ibus.conf
+
+	keepdir /usr/share/ibus/{engine,icons} #289547
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+	gnome2_icon_savelist
+}
+
+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
+
+	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"
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immmodules_gtk2
+	use gtk3 && gnome2_query_immmodules_gtk3
+	use python && python_mod_cleanup /usr/share/${PN}
+	gnome2_icon_cache_update
+}