diff options
author | Naohiro Aota <naota@gentoo.org> | 2012-10-13 23:49:33 +0000 |
---|---|---|
committer | Naohiro Aota <naota@gentoo.org> | 2012-10-13 23:49:33 +0000 |
commit | 213ff8cb4de5637b7a4a0d2c286337342268119b (patch) | |
tree | ce6af6f407c680014da5f90fc5c2db96629fec15 /app-i18n | |
parent | Linux patch 3.5.7 (diff) | |
download | historical-213ff8cb4de5637b7a4a0d2c286337342268119b.tar.gz historical-213ff8cb4de5637b7a4a0d2c286337342268119b.tar.bz2 historical-213ff8cb4de5637b7a4a0d2c286337342268119b.zip |
Add unstable version of ibus: ibus-1.4.99.20121006, which is required by gnome-3.6. #437794
Package-Manager: portage-2.2.0_alpha137/cvs/Linux x86_64
Diffstat (limited to 'app-i18n')
-rw-r--r-- | app-i18n/ibus/ChangeLog | 8 | ||||
-rw-r--r-- | app-i18n/ibus/Manifest | 32 | ||||
-rw-r--r-- | app-i18n/ibus/ibus-1.4.99.20121006.ebuild | 170 | ||||
-rw-r--r-- | app-i18n/ibus/metadata.xml | 1 |
4 files changed, 195 insertions, 16 deletions
diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog index 6718286ba248..86eeb5de7949 100644 --- a/app-i18n/ibus/ChangeLog +++ b/app-i18n/ibus/ChangeLog @@ -1,6 +1,12 @@ # 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.113 2012/10/08 01:05:22 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.114 2012/10/13 23:49:23 naota Exp $ + +*ibus-1.4.99.20121006 (13 Oct 2012) + + 13 Oct 2012; <naota@gentoo.org> +ibus-1.4.99.20121006.ebuild, metadata.xml: + Add unstable version of ibus: ibus-1.4.99.20121006, which is required by + gnome-3.6. #437794 08 Oct 2012; <naota@gentoo.org> ibus-1.4.1.ebuild, ibus-1.4.2.ebuild: Drop needless "use gconf ||" line. diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest index 61ff3fbdcf8d..6e1bcee24dda 100644 --- a/app-i18n/ibus/Manifest +++ b/app-i18n/ibus/Manifest @@ -7,24 +7,26 @@ AUX ibus-1.4.1-no-gconf.patch 1002 SHA256 7f136de585b41d4ae47e1d9cb58a982f8ab70d 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 +DIST ibus-1.4.99.20121006.tar.gz 1889138 SHA256 45ef3b81d92f72454676697dcd967fccefa2400507256c7d29b4586fe64dbd15 SHA512 00864a83af0124594313a3c89a699c14d8982f3f655526004ed87498081545d63ec83fbd41eb23264a32920e0bd8191c6c46bea23748ddb5c37f2eae5004f2a2 WHIRLPOOL 6dc24d24e170e4722baa2044abd42c24073e8ad93c8b63b15491b6492c91ca84eb31ffcd14a8eb43db0c9a2f4498103c353d4c1eff23a6b8d8a7e0b042a5466b EBUILD ibus-1.4.1.ebuild 3967 SHA256 eaf0071ab5bdda1f5480f34bb6518ce866939f013764fb36e4ed2c2ff3929bb7 SHA512 d435805de8e42d500aebfa16c67bca7595bfa9792e5e1d2cf1ec530049d447b0f024c1e4000f15ecdaed8066ccc17b2d410cbb082e2d21ff86a1635f4b4e78df WHIRLPOOL 730cb390b69e31f296e40336a3247ae9cb0a83f8c7356aebe51c5e9c7235b35c1944def682e19536921833952794f42911502f7d5ec71161d2e92dba37d238d5 EBUILD ibus-1.4.2.ebuild 3326 SHA256 e8d6db99718f2d078e2338007d6afb39067468c36322c733826f5a42243e8af7 SHA512 b4a9b48a5e28683f5ecee8e0ea4d69efc87aab7513e36dc052237013de5583e3a81fb5c540c2f9d7278a82b687d3d031830e58a8d832a7b726428ad6db2cd73f WHIRLPOOL d7e73c789fe084b7f761e8901455892115ef5968241cce257a99c10063562986c57321e7f466bc005478f8c9232fc56adbfc17cd11d89b892bdb84429b17d55f -MISC ChangeLog 18300 SHA256 018bd1cca310c4473fc9a77e8f7278dcdf65d4eb28ab2662c2aaadd21ac9134e SHA512 8274af096fe253d51bdd7e81f481150b2ce2b47b2eac45c56aa16ceaeb84aa19ab6b24ac27a47d26c6cf5ecc88679e4045d2e19bc10e512a21712e95e51cd51e WHIRLPOOL 16eb2c54287438398940fb9e15021232630317c41aa0f28e799544b6cd8fa0f1b969ee78152196a468ffcc560778b757e788c8f14b7629ea1acc872aaa5957a7 -MISC metadata.xml 798 SHA256 f8cfd5b99a00d0b8cef1a903818e00a957cebb4612dc482b4cb34ed19d73958d SHA512 b85cdaafe978c30a277a5aab42132a9f8e85e4c0ff2ab701ada63b1c697080129b6a25ce245501d2770674cc70a2e341a85d242fbc24b7b425496c733a936c05 WHIRLPOOL a0297164f8b03565d0fd6a0dc4d2046ea22a4dba53afe1012c5dacfafeb43606b4b35678ece4e1c266042cbbc0425b9f24d34f6d979c6739ab99518cef63077d +EBUILD ibus-1.4.99.20121006.ebuild 4402 SHA256 855f8d472408facbabad9f129e4da08e942c7b634439658501cffc7ba7dbe5a9 SHA512 34b0a6c1cd418f51b1f9396ab93379755f406c1bd3330ec1c65ee633faf2da0daf3660edeafd22fac3b8199d52fbc9c205f4b0bd1bdb9b41fd5c063d098bc9e4 WHIRLPOOL f69d254b261b28b3bca5f60c8e9bde400492bf59092c0780c893dd9378abadf3e4b19d90aa03f4faa0fb6b7f28b31dd46358cafecc0778fa08ab189aee8c9ca6 +MISC ChangeLog 18513 SHA256 f143a2d92283f8e2d34e4d48464faea46f15ea4493ba15a8a068f77be94f746c SHA512 af4bdb35c9ae32013de3095ed9a5477ac54ba6729b300bbb9629e10c88c22cf265609e14f981d574502fdbed5d4ecad1ad71086a1d8268b8871d7ce5153b8eca WHIRLPOOL 0004d9d31cefae51c23765ccbba4082a3f036efbca23871a33b617994a4fd5744ff40fc10ffeaca8b49530138d760503769a1af4abe1ccba61f4d72b9ddc286a +MISC metadata.xml 874 SHA256 b4601d52556db214f080e217b8ba86b0a9f9eda360fbb334d2a32f7399f432d3 SHA512 1c4ff452971777a3c64ba53b4c013aa92b8962f1e62f3ead43468da88fa8bc5e330226cfd2c5cc6e9fa0ab94b756dfff43bb0086cceea8a622a22c5dfec8cf6d WHIRLPOOL f1891ef7eb11b751d8550bc7f26d1233b1c0e589f27dc838f94242174b11501f0296c165bbdba5e005064837a079fd433aefcaab9ffe4713acdd012821425e07 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCAAGBQJQcibUAAoJEDYO1FT4VRUU8YMP/jMDKFAGgfEVGjQZ1ScsTgSM -w85RoXu4lrssktJsygTHF3kOoGOeGRsSRpYiMK0djsUM6eBGBkDhXkxXcBWLatMD -VO8l5IU1DSfOa2PIpj5yosb3Kr87YpT+tZPyAVUo7MtD94KGiHacgftaKzEGi59r -MNDt5CE0ZOgAzV+QL3voddhQZ2B0C0LA4hb3gzKTfBWyzlAoBrRjVOwdhmlexI6G -TESjwqs8JdXUR4bAcOyVM6FtDbOZFI9ZmldVDtdVQhG0duqDs/4atxLCumTQ+Hba -ILm4ZgI7jIm7lviv2Wd6oRpA9eyYXQNe9HoD+I/Mp5rk96E6FE/+mRqWoA0uWDf+ -e1I6nAUQ8xix5rh1SgPRAAlTcBv25G5PfE94i67fThEOnlLs5rLXr/4L5tTRodfZ -uu6LRH8kEaeITOFYiLTRf7tmBgQRTWZn5Kb6jZnRZdftUNFaY36sZYhoAjLE0NEn -705o5o1DRGXTFkiDPVhvAbum/RJNjZXnY/WrbtUTSSsyulW++2nzEXkQIMxR4XKK -oqJtRQ8Mai83pglp1EG2+bgcTSYJswwXdfFxJiDhNCeVxALkAUYPnPIMx39erzjC -p+dhdrQvMb8HzMiS0UQ00DyQwN6not/HCv7Is1wY0s1gIe/z0rforpk3eVVMQsxI -nmjy4s7dztI+lLGcBZWV -=ckwk +iQIcBAEBCAAGBQJQef34AAoJEDYO1FT4VRUUftoQAJeccpdmKZkl1Q7uTd7G2WOH +8DYWyEohJ3oFoW7mPHSP8tM+hr+yJQZq/GLjKHUVmPcstC8Bn/RYMcC2dKg0ZpQ9 +msVC4x1FbqpZFGFiUhT2RMFdGR7eBKFvVjwMXY46bg5JlSqYidXE+HePLPYM7I20 +bUTJBLCXhOykUwvpskn6ClORqAJVetvCgXaIR34PFN+YcIURIccIHA8QuARbjv/E +kDwgQFFJ4hZuTgKKIUcZVqpx4U34ePBeRzSQ9mdB5xFSqyzFin8HbVFKCcBpbLub +APPV2Zv5g4GL2+znQ+PTz3EoSoy/6AQMi52nBdqQJ5MAp3nnTXSDOhkgxkoPK6Ad +fzt/CXTzhXhRpA+8wB3StIocZxsuqIfUuXnTNm3g9h0fhbKV/Q+oG50rzPAWdyd/ +yPmd34ptnXI6dmOHgflfIPoEV4TEFbhlCDU5JbOz1F/vRb8XPbSDEq9jny7cz8zB ++dBaNdJebxkMqL/F38G6+pMeE63RA7LCPvN1QJblLUt/GLSge58vs+V8QiWq7XyB +1X60L/Q2SWvDgczN38qv1QCqvfQpZEIbOY27ezNizVdqIHTggAIA9GvaRgUYWVBi +ZB62mrC5F7JGbN7qmlReFhJK3ZkshyDDsXUd4k3bfzf+As75m0cZzzDV78Ewz4fd +vyeUEVpwyzm+CuLiMjx7 +=XYhl -----END PGP SIGNATURE----- diff --git a/app-i18n/ibus/ibus-1.4.99.20121006.ebuild b/app-i18n/ibus/ibus-1.4.99.20121006.ebuild new file mode 100644 index 000000000000..811271257035 --- /dev/null +++ b/app-i18n/ibus/ibus-1.4.99.20121006.ebuild @@ -0,0 +1,170 @@ +# 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.99.20121006.ebuild,v 1.1 2012/10/13 23:49:23 naota 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="~amd64 ~arm ~ppc ~ppc64 ~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 +} diff --git a/app-i18n/ibus/metadata.xml b/app-i18n/ibus/metadata.xml index a8aa1809c443..ce8c3da74469 100644 --- a/app-i18n/ibus/metadata.xml +++ b/app-i18n/ibus/metadata.xml @@ -13,5 +13,6 @@ developers to develop input method easily. <flag name='gtk3'>Enable support for gtk+3</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> + <flag name='deprecated'>install the deprecated ibus python library</flag> </use> </pkgmetadata> |