version bump, bug #447188

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

3 files changed, 179 insertions, 22 deletions

diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index fe2a1a1b9fdc..735b0ae56018 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.118 2013/01/28 10:13:35 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.119 2013/02/05 11:03:58 yngwin Exp $
+
+*ibus-1.5.1 (05 Feb 2013)
+
+  05 Feb 2013; Ben de Groot <yngwin@gentoo.org> +ibus-1.5.1.ebuild:
+  version bump, bug #447188
 
   28 Jan 2013; Naohiro Aota <naota@gentoo.org>
   +files/ibus-1.4.1-libxslt-1.1.27.patch, ibus-1.4.1.ebuild, ibus-1.4.2.ebuild:
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index b86657ad6181..6095b744ca1c 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -1,6 +1,3 @@
------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-libxslt-1.1.27.patch 3413 SHA256 47c0135a406e450676a06e7d6de24b99a972134f9217bb174bea7b5c3e6737c9 SHA512 983e01eec74eaba037d3cde1dc3485615984ab953d4edeffcf2f1e6eefa833055780a381b772fb296f6d625cc0d94bec75e430f7d72b7e23a5cfae03b0e661fb WHIRLPOOL 8b4385f35aef20fb3489c6a45ab1f4ac9f71abacea9f47acc13fcafbe130c5d74db1522dcbabb541254ea8505009dbe438cf0c5022989ca3dd05811497ccb9b9
@@ -9,25 +6,10 @@ AUX ibus-gconf-2.m4.patch 1707 SHA256 40c54a970779f4586161f45ebd245c9db71b46ced0
 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
 DIST ibus-1.4.99.20121006.tar.gz 1889138 SHA256 45ef3b81d92f72454676697dcd967fccefa2400507256c7d29b4586fe64dbd15 SHA512 00864a83af0124594313a3c89a699c14d8982f3f655526004ed87498081545d63ec83fbd41eb23264a32920e0bd8191c6c46bea23748ddb5c37f2eae5004f2a2 WHIRLPOOL 6dc24d24e170e4722baa2044abd42c24073e8ad93c8b63b15491b6492c91ca84eb31ffcd14a8eb43db0c9a2f4498103c353d4c1eff23a6b8d8a7e0b042a5466b
+DIST ibus-1.5.1.tar.gz 1888861 SHA256 6023809ced2794b75fad07eb1b1d6288154b373920ecdcd51582a4cde4e0d017 SHA512 8fcc0a6156d8638023f8a430385abd5a278af1c6fec9127c721831d408157fe5c74a7f2a9a46749d71edd3ea419335f9edce8f095a1414707197c652bdad4404 WHIRLPOOL 01fae34b89df4959136061cca1b050b5cb8c180df897a4d5994d3c588a280632cae97fe955e637ad2fce16412a1b63c48212ec7e720d61d9e5f29c65298bc094
 EBUILD ibus-1.4.1.ebuild 4018 SHA256 1a03a32ccd2614a24a9fb30a4bc225c50a31005e1629b8487e02a7abd7a6008d SHA512 f12763429aa765b953e73a846190d0fb53fcdb2e144da2bc94142ed9bc00fb3c1d259b090b7dfb87d1732a6696874b02281e5438ebbb8a66bf196da3520b5356 WHIRLPOOL b78dc364143ecdb5d5027f69547290c33f0a7d9cee6facb830276abd0826a2c3cf069909c3d3d69b4f011d12c9cf27ddf6f8a85acca56beb0d5685f15e468f7d
 EBUILD ibus-1.4.2.ebuild 3388 SHA256 d48e09f5233209764a4f927c4d5345a4b886c3d7459e7cb7771bb21b777a7a7f SHA512 dbb20f61ffd58b88e7637b8a6b6daae72344a3c4e67605cb975d3e2a5327befdc29b8052e6f472f12bccb267842bd9ed21a61cf3d34d9f5cc49a33d7c8d1e9e3 WHIRLPOOL 5f7fca4a64a2022a101bc7791dd4053d660fc82156768096bc8bb0332e87c68d83bb7ac63ab4b9626a3f3e73f896891cafd72a07d3c3a083cc53bf2404ea16ce
 EBUILD ibus-1.4.99.20121006.ebuild 4420 SHA256 180bb06a9bb23e7b3686a987f41f768a040c04ebe316e2d674fb5055b6d3cc6c SHA512 e45a6574b3bd32e00c0fb595472351092d027119ae524b78eeac4ffe9ea0ff70012df73253ef4566501d30d1089f34b53e7fa7e01ad73ffc800db3ed53932114 WHIRLPOOL 97e71f1ee15f8f222bb03243bd8635f2a3e5825c4136d6426f42d7f0f421119baeb2977fd9c01adb453e1c5b5cfb94994402fb99f6a167d79d00d767dd5bef19
-MISC ChangeLog 18995 SHA256 17e2c0b5a79e4175c65b1fed3f4b93ecd4b5262d957d50cfc1f8ac33d5178018 SHA512 5a766f76116559e46cc44ee75c6807a0fe20fd23b650403bd9bb08875df53f53cf5b5eef231354376e7f5c3f298c00fbdcfcfee11d8774f5992dccff199117bb WHIRLPOOL b6ea4ed1b36c99a0fff01c2db26648cb7c067fd7dcea0a4a11d78b80f08ee400900bab4868db086148075f8b471448705d1a660731cae7e664c03f0cb7a7e94a
+EBUILD ibus-1.5.1.ebuild 4413 SHA256 2ee0742ec4c74f5c180e28a76c2b204a2383a11bd518cb0f9e0a6a5a4f433c24 SHA512 e416bf01c40ab88ca95b5848f57b02afd71bd4524c3197308e8a67dc1e2f977ab533e9c40cbd80e98663ac2bc0f90131e0151263fd2654b60a59ff3bdc0e5455 WHIRLPOOL 844e07ff24166c172b20bfa6c6d8d7cee89b26322ffbea1b3f36d922ab8a0497511ced6ab73cf841b86aade5751bb76d83c6683c3501e5010e4da33967c83a45
+MISC ChangeLog 19120 SHA256 e32a575d69a2a380a4ce0e89a9c6fcd4836d1339df0ad39f04b1e0d6f0b4a2db SHA512 dfa6a7b4b4c198db7f0c438d81f51df2d258bc271f3280925dd01e34f0cb0115707b8aedff003b164004f6d04b5e0b2932436fc99d22c51c24762b65d70b672f WHIRLPOOL 8dc33c4b0ee7097c866c097419745b835502c60765533a868fcb1c31c3e310bf2f071b85aadc0e5be0463bdf76db4fd49884e1df7be8b9f40450998348b8750a
 MISC metadata.xml 874 SHA256 b4601d52556db214f080e217b8ba86b0a9f9eda360fbb334d2a32f7399f432d3 SHA512 1c4ff452971777a3c64ba53b4c013aa92b8962f1e62f3ead43468da88fa8bc5e330226cfd2c5cc6e9fa0ab94b756dfff43bb0086cceea8a622a22c5dfec8cf6d WHIRLPOOL f1891ef7eb11b751d8550bc7f26d1233b1c0e589f27dc838f94242174b11501f0296c165bbdba5e005064837a079fd433aefcaab9ffe4713acdd012821425e07
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJRBz+9AAoJEDYO1FT4VRUUYlAP/3j2w0xmvYgaFRPLHUZOJfPU
-KSnQUeRWLvphCR9Ri/Y6GcxW0+49Wv/NxnpHEnCyS1m0VK9vYdQsTyP0QzLRr8TP
-PlPwr7LTPIIZYQ//oVJdU3kxJhYcsxIejnaE8Lk55mhMcZLIegcppV/t3zX8Gx82
-TFQ8sQqjdz4taD0MosLZyI0J57cVLaxST/mIiSpOYUb+JHpbxUgcXFZWUjYxyf0Z
-HXjU0fTRhcxzfuYu6UCCdy0p44KLwuCbt2ghBFeH6AMW0GBRVZTLMT1nHCs8Ng9B
-JJjzA/tm8uVHNM07b439IwPh68cF7rMEsKLhJPDo4UB/qcBhqoJRiwcVHPIhl9mB
-qm1Bl/wRZbXUR2LVWjQIvf70y9QtNQUkOcURlf1BfAArFtzNaB/q982XeWOeBYtj
-kb9TyDqlqqk2XVo53ag1juorLB5wIEvoGbU3Yk28FdT6cVUqFWMMAx/Zz5RRgHrA
-0xpxISRjihxLVa2/qASQPXIvYcb1tfOOTk31N/CwpAYvexEuqoAzJeqLKOzKxrDP
-0GI7WF4vjg3SIi5tnnKb9CRPjW/2Kz6eiQ5R/gccjC+vftzZNb/qd4QoT8/DNGHF
-LiGNSTeXExqMdZGRJXTzLFr4jItlmWfO6t0Ra5PkybYGjLyl0iv8SebSdozGiPKj
-/A5x9FyL9c8Htvbi4sYj
-=3q89
------END PGP SIGNATURE-----
diff --git a/app-i18n/ibus/ibus-1.5.1.ebuild b/app-i18n/ibus/ibus-1.5.1.ebuild
new file mode 100644
index 000000000000..6902d3ddaa1e
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.1.ebuild,v 1.1 2013/02/05 11:03:58 yngwin Exp $
+
+EAPI=4
+PYTHON_DEPEND="python? 2:2.5"
+VALA_MIN_API_VERSION="0.18"
+VALA_USE_DEPEND="vapigen"
+# Vapigen is needed for the vala binding
+# Valac is needed when building from git for the engine
+
+inherit eutils gnome2-utils multilib python vala virtualx
+
+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 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="dconf deprecated +gconf gtk +gtk3 +introspection nls +python test vala +X"
+REQUIRED_USE="|| ( gtk gtk3 X )
+	deprecated? ( python )
+	python? ( || ( deprecated ( gtk3 introspection ) ) )" #342903
+
+COMMON_DEPEND=">=dev-libs/glib-2.26:2
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	app-text/iso-codes
+
+	dconf? ( >=gnome-base/dconf-0.13.4 )
+	gconf? ( >=gnome-base/gconf-2.12:2 )
+	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 )
+	nls? ( virtual/libintl )"
+RDEPEND="${COMMON_DEPEND}
+	python? (
+		dev-python/pyxdg
+		deprecated? (
+			>=dev-python/dbus-python-0.83
+			dev-python/pygobject:2
+			dev-python/pygtk:2 )
+		gtk3? (
+			dev-python/pygobject:3
+			x11-libs/gdk-pixbuf:2[introspection]
+			x11-libs/pango[introspection]
+			x11-libs/gtk+:3[introspection] )
+	)"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5.8.1
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.16.1 )
+	vala? ( $(vala_depend) )"
+
+# stress test in bus/ fails
+# IBUS-CRITICAL **: bus_test_client_init: assertion `ibus_bus_is_connected (_bus)' failed
+RESTRICT="test"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# We run "dconf update" in pkg_postinst/postrm to avoid sandbox violations
+	sed -e 's/dconf update/$(NULL)/' \
+		-i data/dconf/Makefile.{am,in} || die
+	use python && python_clean_py-compile_files
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local python_conf
+	if use python; then
+		# We cannot call $(PYTHON) if we haven't called python_pkg_setup
+		python_conf="PYTHON=$(PYTHON)
+			$(use_enable deprecated python-library)
+			$(use_enable gtk3 setup)"
+	else
+		python_conf="--disable-python-library --disable-setup"
+	fi
+	econf \
+		$(use_enable dconf) \
+		$(use_enable introspection) \
+		$(use_enable gconf) \
+		$(use_enable gtk gtk2) \
+		$(use_enable gtk xim) \
+		$(use_enable gtk3) \
+		$(use_enable gtk3 ui) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable vala) \
+		$(use_enable X xim) \
+		${python_conf}
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die
+}
+
+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() {
+	if use dconf; then
+		ebegin "Updating dconf system databases"
+		dconf update
+		eend $?
+	fi
+	use gconf && gnome2_gconf_install
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	use deprecated && python_mod_optimize ${PN}
+	use python && use gtk3 && 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() {
+	if use dconf; then
+		ebegin "Updating dconf system databases"
+		dconf update
+		eend $?
+	fi
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	use deprecated && python_mod_cleanup ${PN}
+	use python && use gtk3 && python_mod_cleanup /usr/share/${PN}
+	gnome2_icon_cache_update
+}