dlan        14/11/12 14:31:12

  Modified:             ibus-1.5.5.ebuild metadata.xml ChangeLog
                        ibus-1.5.8-r1.ebuild
  Added:                ibus-1.5.9.ebuild
  Removed:              ibus-1.4.1.ebuild ibus-1.4.2.ebuild
  Log:
  drop old versions, bump 1.5.9; increase vala version to fix dep warning
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 
0xAABEFD55)

Revision  Changes    Path
1.8                  app-i18n/ibus/ibus-1.5.5.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ibus-1.5.5.ebuild?rev=1.8&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ibus-1.5.5.ebuild?rev=1.8&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ibus-1.5.5.ebuild?r1=1.7&r2=1.8

Index: ibus-1.5.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.5.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ibus-1.5.5.ebuild   1 Aug 2014 08:28:40 -0000       1.7
+++ ibus-1.5.5.ebuild   12 Nov 2014 14:31:12 -0000      1.8
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.5.ebuild,v 1.7 
2014/08/01 08:28:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.5.ebuild,v 1.8 
2014/11/12 14:31:12 dlan Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
-VALA_MIN_API_VERSION="0.18"
+VALA_MIN_API_VERSION="0.20"
 VALA_USE_DEPEND="vapigen"
 # Vapigen is needed for the vala binding
 # Valac is needed when building from git for the engine



1.11                 app-i18n/ibus/metadata.xml

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/metadata.xml?rev=1.11&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/metadata.xml?rev=1.11&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/metadata.xml?r1=1.10&r2=1.11

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-i18n/ibus/metadata.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- metadata.xml        30 Jul 2013 03:15:38 -0000      1.10
+++ metadata.xml        12 Nov 2014 14:31:12 -0000      1.11
@@ -8,7 +8,6 @@
 developers to develop input method easily.
 </longdescription>
   <use>
-    <flag name="dconf">Enable support for <pkg>gnome-base/dconf</pkg></flag>
     <flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag>
     <flag name="gtk3">Enable support for gtk+3</flag>
     <flag name="vala">Enable support for <pkg>dev-lang/vala</pkg></flag>



1.151                app-i18n/ibus/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ChangeLog?rev=1.151&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ChangeLog?rev=1.151&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ChangeLog?r1=1.150&r2=1.151

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- ChangeLog   18 Aug 2014 08:33:51 -0000      1.150
+++ ChangeLog   12 Nov 2014 14:31:12 -0000      1.151
@@ -1,6 +1,18 @@
 # ChangeLog for app-i18n/ibus
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.150 2014/08/18 
08:33:51 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.151 2014/11/12 
14:31:12 dlan Exp $
+
+*ibus-1.5.9 (12 Nov 2014)
+
+  12 Nov 2014; Yixun Lan <[email protected]> -ibus-1.4.1.ebuild,
+  -ibus-1.4.2.ebuild, ibus-1.5.5.ebuild, ibus-1.5.8-r1.ebuild,
+  +ibus-1.5.9.ebuild, -files/ibus-1.4.0-machine-id-fallback.patch,
+  -files/ibus-1.4.1-gir.patch, -files/ibus-1.4.1-libxslt-1.1.27.patch,
+  -files/ibus-1.4.1-no-gconf.patch, -files/ibus-1.5.1-queue-events.patch,
+  -files/ibus-1.5.1-setup.patch,
+  -files/ibus-1.5.1-use-system-keyboard-layout.patch,
+  -files/ibus-gconf-2.m4.patch, metadata.xml:
+  drop old versions, bump 1.5.9; increase vala version to fix dep warning
 
   18 Aug 2014; Yixun Lan <[email protected]> ibus-1.5.8-r1.ebuild:
   rework dconf sed operation



1.3                  app-i18n/ibus/ibus-1.5.8-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ibus-1.5.8-r1.ebuild?rev=1.3&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ibus-1.5.8-r1.ebuild?rev=1.3&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ibus-1.5.8-r1.ebuild?r1=1.2&r2=1.3

Index: ibus-1.5.8-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.8-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ibus-1.5.8-r1.ebuild        18 Aug 2014 08:33:51 -0000      1.2
+++ ibus-1.5.8-r1.ebuild        12 Nov 2014 14:31:12 -0000      1.3
@@ -1,11 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.8-r1.ebuild,v 1.2 
2014/08/18 08:33:51 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.8-r1.ebuild,v 1.3 
2014/11/12 14:31:12 dlan Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
-VALA_MIN_API_VERSION="0.18"
+VALA_MIN_API_VERSION="0.20"
 VALA_USE_DEPEND="vapigen"
 # Vapigen is needed for the vala binding
 # Valac is needed when building from git for the engine



1.1                  app-i18n/ibus/ibus-1.5.9.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ibus-1.5.9.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ibus-1.5.9.ebuild?rev=1.1&content-type=text/plain

Index: ibus-1.5.9.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.9.ebuild,v 1.1 
2014/11/12 14:31:12 dlan Exp $

EAPI=5

PYTHON_COMPAT=( python2_7 )
VALA_MIN_API_VERSION="0.20"
VALA_USE_DEPEND="vapigen"
# Vapigen is needed for the vala binding
# Valac is needed when building from git for the engine

inherit bash-completion-r1 eutils gnome2-utils multilib python-single-r1 
readme.gentoo vala virtualx

DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
HOMEPAGE="http://code.google.com/p/ibus/";
SRC_URI="https://github.com/ibus/ibus/releases/download/${PV}/${P}.tar.gz";

LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland 
+X"
REQUIRED_USE="|| ( gtk gtk3 X )
        deprecated? ( python )
        python? (
                ${PYTHON_REQUIRED_USE}
                || ( deprecated ( gtk3 introspection ) ) )" #342903

COMMON_DEPEND="
        >=dev-libs/glib-2.26:2
        gnome-base/librsvg:2
        sys-apps/dbus[X?]
        app-text/iso-codes
        >=gnome-base/dconf-0.13.4
        x11-libs/libnotify

        gconf? ( >=gnome-base/gconf-2.12:2 )
        gtk? ( x11-libs/gtk+:2 )
        gtk3? ( x11-libs/gtk+:3 )
        python? ( ${PYTHON_DEPS} )
        X? (
                x11-libs/libX11
                x11-libs/gtk+:2 )
        introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
        nls? ( virtual/libintl )
        wayland? ( dev-libs/wayland )"
RDEPEND="${COMMON_DEPEND}
        x11-apps/setxkbmap
        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) )
        gnome-base/gconf"

# 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"

DISABLE_AUTOFORMATTING="yes"
DOC_CONTENTS="To use ibus, you should:
1. Get input engines from sunrise overlay.
Run \"emerge -s ibus-\" in your favorite terminal
for a list of packages we already have.

2. Setup ibus:
$ ibus-setup

3. Set the following in your user startup scripts
such as .xinitrc, .xsession or .xprofile:

export XMODIFIERS=\"@im=ibus\"
export GTK_IM_MODULE=\"ibus\"
export QT_IM_MODULE=\"xim\"
ibus-daemon -d -x
"

pkg_setup() {
        use python && python-single-r1_pkg_setup
}

src_prepare() {
        # We run "dconf update" in pkg_postinst/postrm to avoid sandbox 
violations
        sed -e 's/dconf update/:/' \
                -i data/dconf/Makefile.{am,in} || die
        use vala && vala_src_prepare
}

src_configure() {
        local python_conf
        if use python; then
                python_conf="PYTHON=${PYTHON}
                        $(use_enable deprecated python-library)
                        $(use_enable gtk3 setup)"
        else
                python_conf="--disable-python-library --disable-setup"
        fi
        econf \
                --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 X xim) \
                $(use_enable vala) \
                $(use_enable wayland) \
                ${python_conf}
}

src_test() {
        unset DBUS_SESSION_BUS_ADDRESS
        Xemake check || die
}

src_install() {
        default

        prune_libtool_files --all

        mv "${ED}"/usr/share/bash-completion/completions/ibus.bash "${T}"
        rm -rf "${ED}"/usr/share/bash-completion || die
        newbashcomp "${T}"/ibus.bash ${PN}
        insinto /etc/X11/xinit/xinput.d
        newins xinput-ibus ibus.conf

        keepdir /usr/share/ibus/{engine,icons} #289547

        use deprecated && python_optimize
        use python && use gtk3 && python_optimize

        readme.gentoo_create_doc
}

pkg_preinst() {
        use gconf && gnome2_gconf_savelist
        gnome2_schemas_savelist
        gnome2_icon_savelist
}

pkg_postinst() {
        use gconf && gnome2_gconf_install
        use gtk && gnome2_query_immodules_gtk2
        use gtk3 && gnome2_query_immodules_gtk3
        gnome2_schemas_update
        gnome2_icon_cache_update
        readme.gentoo_print_elog
}

pkg_postrm() {
        use gtk && gnome2_query_immodules_gtk2
        use gtk3 && gnome2_query_immodules_gtk3
        use gconf && gnome2_schemas_update
        gnome2_schemas_savelist
        gnome2_icon_cache_update
}




Reply via email to