Permalink
Browse files

FL-770: unfork app-i18n/ibus

  • Loading branch information...
1 parent ba3f943 commit bd81af0c5cfce4eba4ced80f54af8b6473f46d92 @danielrobbins danielrobbins committed Sep 25, 2013
View
@@ -1,4 +0,0 @@
-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
@@ -1,19 +0,0 @@
-http://cgit.freedesktop.org/dbus/dbus/commit/dbus/dbus-sysdeps-unix.c?id=66e52541d5bdd4927a5c702963749760643313f4
-
-http://bugs.gentoo.org/390463
-
---- src/ibusshare.c
-+++ src/ibusshare.c
-@@ -41,7 +41,11 @@ ibus_get_local_machine_id (void)
-
- if (machine_id == NULL) {
- GError *error = NULL;
-- if (!g_file_get_contents ("/var/lib/dbus/machine-id",
-+ if (!g_file_get_contents ("/etc/machine-id",
-+ &machine_id,
-+ NULL,
-+ NULL) &&
-+ !g_file_get_contents ("/var/lib/dbus/machine-id",
- &machine_id,
- NULL,
- &error)) {
@@ -1,11 +0,0 @@
---- src/Makefile.am.orig
-+++ src/Makefile.am
-@@ -170,7 +170,7 @@ introspection_files = \
- ibusenumtypes.h \
- $(NULL)
- IBus-1.0.gir: $(libibus) Makefile
--IBus_1_0_gir_SCANNERFLAGS = --pkg=ibus-1.0 $(IBUS_GIR_SCANNERFLAGS)
-+IBus_1_0_gir_SCANNERFLAGS = --pkg-export=ibus-1.0 $(IBUS_GIR_SCANNERFLAGS)
- IBus_1_0_gir_INCLUDES = GLib-2.0 GObject-2.0 Gio-2.0
- IBus_1_0_gir_LIBS = $(libibus)
- IBus_1_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files))
@@ -1,29 +0,0 @@
-diff -Naur ibus-1.4.1.orig/configure.ac ibus-1.4.1/configure.ac
---- ibus-1.4.1.orig/configure.ac 2012-02-05 23:04:15.000000000 +0900
-+++ ibus-1.4.1/configure.ac 2012-02-06 01:20:18.303186786 +0900
-@@ -259,23 +259,8 @@
- )
- AM_CONDITIONAL([ENABLE_GCONF], [test x"$enable_gconf" = x"yes"])
-
--if test x"$enable_gconf" = x"yes"; then
-- # check gconf
-- PKG_CHECK_MODULES(GCONF,
-- [gconf-2.0 >= 2.12],
-- )
--
-- AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
-- if test x"$GCONFTOOL" = xno; then
-- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
-- fi
--
-- AM_GCONF_SOURCE_2
-- # GCONF_SCHEMAS_INSTALL should be set in macro AM_GCONF_SOURCE_2
--else
-- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
-- enable_gconf="no (disabled, use --enable-gconf to enable)"
--fi
-+AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
-+enable_gconf="no (disabled, use --enable-gconf to enable)"
-
- # --enable-memconf option.
- AC_ARG_ENABLE(memconf,
@@ -1,49 +0,0 @@
-http://bugs.gentoo.org/395239
-
---- m4/gconf-2.m4
-+++ m4/gconf-2.m4
-@@ -0,0 +1,44 @@
-+dnl AM_GCONF_SOURCE_2
-+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-+dnl (i.e. pass to gconftool-2
-+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-+dnl you should install foo.schemas files
-+dnl
-+
-+AC_DEFUN([AM_GCONF_SOURCE_2],
-+[
-+ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-+ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-+ else
-+ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-+ fi
-+
-+ AC_ARG_WITH([gconf-source],
-+ AC_HELP_STRING([--with-gconf-source=sourceaddress],
-+ [Config database for installing schema files.]),
-+ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
-+
-+ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-+ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-+
-+ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-+ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-+ fi
-+
-+ AC_ARG_WITH([gconf-schema-file-dir],
-+ AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
-+ [Directory for installing schema files.]),
-+ [GCONF_SCHEMA_FILE_DIR="$withval"],)
-+
-+ AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-+ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-+
-+ AC_ARG_ENABLE(schemas-install,
-+ AC_HELP_STRING([--disable-schemas-install],
-+ [Disable the schemas installation]),
-+ [case ${enableval} in
-+ yes|no) ;;
-+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
-+ esac])
-+ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
-+])
@@ -1,158 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-
-update_gtk_immodules() {
- local GTK2_CONFDIR="/etc/gtk-2.0"
- # bug #366889
- if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
- GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
- fi
- mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
-
- if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
- "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
- fi
-}
-
-update_gtk3_immodules() {
- if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
- "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
- fi
-}
-
-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 \
- "${FILESDIR}"/${PN}-1.4.0-machine-id-fallback.patch \
- "${FILESDIR}"/${PN}-1.4.1-gir.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 && update_gtk_immodules
- use gtk3 && update_gtk3_immodules
- use python && python_mod_cleanup /usr/share/${PN}
- gnome2_icon_cache_update
-}
Oops, something went wrong.

0 comments on commit bd81af0

Please sign in to comment.