* [gentoo-commits] gentoo-x86 commit in app-i18n/ibus: ibus-1.3.8.ebuild ibus-1.2.0.20100111.ebuild ChangeLog metadata.xml ibus-1.3.7.ebuild ibus-1.3.99.20101028.ebuild
@ 2010-11-05 14:11 Matsuu Takuto (matsuu)
0 siblings, 0 replies; only message in thread
From: Matsuu Takuto (matsuu) @ 2010-11-05 14:11 UTC (permalink / raw
To: gentoo-commits
matsuu 10/11/05 14:11:27
Modified: ibus-1.3.8.ebuild ibus-1.2.0.20100111.ebuild
ChangeLog metadata.xml ibus-1.3.7.ebuild
Added: ibus-1.3.99.20101028.ebuild
Log:
Version bumped. Added introspection USE flag. Fixed X and gtk USE flags issue, bug #342903.
(Portage version: 2.1.9.22/cvs/Linux x86_64)
Revision Changes Path
1.2 app-i18n/ibus/ibus-1.3.8.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ibus-1.3.8.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ibus-1.3.8.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ibus-1.3.8.ebuild?r1=1.1&r2=1.2
Index: ibus-1.3.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.8.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ibus-1.3.8.ebuild 25 Oct 2010 16:13:55 -0000 1.1
+++ ibus-1.3.8.ebuild 5 Nov 2010 14:11:27 -0000 1.2
@@ -1,10 +1,10 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.8.ebuild,v 1.1 2010/10/25 16:13:55 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.8.ebuild,v 1.2 2010/11/05 14:11:27 matsuu Exp $
EAPI="2"
PYTHON_DEPEND="python? 2:2.5"
-inherit eutils gnome2-utils multilib python
+inherit confutils eutils gnome2-utils multilib python
DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
HOMEPAGE="http://code.google.com/p/ibus/"
@@ -13,7 +13,7 @@
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc +gconf gtk nls +python vala X"
+IUSE="doc +gconf gtk introspection nls +python vala X"
RDEPEND=">=dev-libs/glib-2.18
gconf? ( >=gnome-base/gconf-2.12 )
@@ -27,6 +27,7 @@
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
@@ -60,6 +61,8 @@
}
pkg_setup() {
+ # bug #342903
+ confutils_require_any X gtk
python_set_active_version 2
}
@@ -74,6 +77,7 @@
econf \
$(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) \
1.6 app-i18n/ibus/ibus-1.2.0.20100111.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ibus-1.2.0.20100111.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ibus-1.2.0.20100111.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ibus-1.2.0.20100111.ebuild?r1=1.5&r2=1.6
Index: ibus-1.2.0.20100111.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.2.0.20100111.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ibus-1.2.0.20100111.ebuild 11 Aug 2010 18:15:25 -0000 1.5
+++ ibus-1.2.0.20100111.ebuild 5 Nov 2010 14:11:27 -0000 1.6
@@ -1,9 +1,9 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.2.0.20100111.ebuild,v 1.5 2010/08/11 18:15:25 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.2.0.20100111.ebuild,v 1.6 2010/11/05 14:11:27 matsuu Exp $
EAPI="1"
-inherit eutils gnome2-utils multilib python
+inherit confutils eutils gnome2-utils multilib python
DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
HOMEPAGE="http://code.google.com/p/ibus/"
@@ -39,6 +39,8 @@
RESTRICT="test"
pkg_setup() {
+ # bug #342903
+ confutils_require_any X gtk
# An arch specific config directory is used on multilib systems
has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
1.71 app-i18n/ibus/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ChangeLog?rev=1.71&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ChangeLog?rev=1.71&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ChangeLog?r1=1.70&r2=1.71
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- ChangeLog 25 Oct 2010 16:13:55 -0000 1.70
+++ ChangeLog 5 Nov 2010 14:11:27 -0000 1.71
@@ -1,6 +1,14 @@
# ChangeLog for app-i18n/ibus
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.70 2010/10/25 16:13:55 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.71 2010/11/05 14:11:27 matsuu Exp $
+
+*ibus-1.3.99.20101028 (05 Nov 2010)
+
+ 05 Nov 2010; MATSUU Takuto <matsuu@gentoo.org> ibus-1.2.0.20100111.ebuild,
+ ibus-1.3.7.ebuild, ibus-1.3.8.ebuild, +ibus-1.3.99.20101028.ebuild,
+ metadata.xml:
+ Version bumped. Added introspection USE flag. Fixed X and gtk USE flags
+ issue, bug #342903.
*ibus-1.3.8 (25 Oct 2010)
1.5 app-i18n/ibus/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/metadata.xml?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/metadata.xml?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/metadata.xml?r1=1.4&r2=1.5
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-i18n/ibus/metadata.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- metadata.xml 15 Jun 2010 17:58:35 -0000 1.4
+++ metadata.xml 5 Nov 2010 14:11:27 -0000 1.5
@@ -10,5 +10,6 @@
<use>
<flag name='gconf'>Enable support for <pkg>gnome-base/gconf</pkg></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>
</use>
</pkgmetadata>
1.4 app-i18n/ibus/ibus-1.3.7.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ibus-1.3.7.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ibus-1.3.7.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ibus-1.3.7.ebuild?r1=1.3&r2=1.4
Index: ibus-1.3.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.7.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ibus-1.3.7.ebuild 18 Sep 2010 17:43:44 -0000 1.3
+++ ibus-1.3.7.ebuild 5 Nov 2010 14:11:27 -0000 1.4
@@ -1,10 +1,10 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.7.ebuild,v 1.3 2010/09/18 17:43:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.7.ebuild,v 1.4 2010/11/05 14:11:27 matsuu Exp $
EAPI="2"
PYTHON_DEPEND="python? 2:2.5"
-inherit eutils gnome2-utils multilib python
+inherit confutils eutils gnome2-utils multilib python
DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
HOMEPAGE="http://code.google.com/p/ibus/"
@@ -13,7 +13,7 @@
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc +gconf gtk nls +python vala X"
+IUSE="doc +gconf gtk introspection nls +python vala X"
RDEPEND=">=dev-libs/glib-2.18
gconf? ( >=gnome-base/gconf-2.12 )
@@ -27,6 +27,7 @@
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
@@ -60,6 +61,8 @@
}
pkg_setup() {
+ # bug #342903
+ confutils_require_any X gtk
python_set_active_version 2
}
@@ -74,6 +77,7 @@
econf \
$(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) \
1.1 app-i18n/ibus/ibus-1.3.99.20101028.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ibus-1.3.99.20101028.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-i18n/ibus/ibus-1.3.99.20101028.ebuild?rev=1.1&content-type=text/plain
Index: ibus-1.3.99.20101028.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.99.20101028.ebuild,v 1.1 2010/11/05 14:11:27 matsuu Exp $
EAPI="2"
PYTHON_DEPEND="python? 2:2.5"
inherit confutils eutils gnome2-utils multilib python
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 ~ppc ~ppc64 ~sparc ~x86"
IUSE="doc +gconf gtk introspection nls +python vala X"
RDEPEND=">=dev-libs/glib-2.18
gconf? ( >=gnome-base/gconf-2.12 )
>=gnome-base/librsvg-2
sys-apps/dbus
app-text/iso-codes
gtk? (
x11-libs/gtk+:2
)
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 )
vala? ( dev-lang/vala )"
# X? ( x11-libs/libX11 )
# gtk? ( x11-libs/gtk+:2 x11-libs/gtk+:3 )
DEPEND="${RDEPEND}
>=dev-lang/perl-5.8.1
dev-perl/XML-Parser
dev-util/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"
update_gtk_immodules() {
if [ -x /usr/bin/gtk-query-immodules-2.0 ] ; then
GTK2_CONFDIR="/etc/gtk-2.0"
# An arch specific config directory is used on multilib systems
has_multilib_profile && GTK2_CONFDIR="${GTK2_CONFDIR}/${CHOST}"
mkdir -p "${ROOT}${GTK2_CONFDIR}"
gtk-query-immodules-2.0 > "${ROOT}${GTK2_CONFDIR}/gtk.immodules"
fi
}
pkg_setup() {
# bug #342903
confutils_require_any X gtk
python_set_active_version 2
}
src_prepare() {
mv py-compile py-compile.orig || die
ln -s "$(type -P true)" py-compile || die
echo "ibus/_config.py" >> po/POTFILES.skip || die
sed -i -e "s/python/python2/" setup/ibus-setup.in ui/gtk/ibus-ui-gtk.in || die
}
src_configure() {
econf \
$(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 nls) \
$(use_enable python) \
$(use_enable vala) \
$(use_enable X xim) || die
#$(use_enable gtk gtk3) \
}
src_install() {
emake DESTDIR="${D}" install || die
# bug 289547
keepdir /usr/share/ibus/{engine,icons} || die
dodoc AUTHORS ChangeLog NEWS README || die
}
pkg_postinst() {
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"
use gtk && update_gtk_immodules
use python && python_mod_optimize /usr/share/${PN}
gnome2_icon_cache_update
}
pkg_postrm() {
use gtk && update_gtk_immodules
use python && python_mod_cleanup /usr/share/${PN}
gnome2_icon_cache_update
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-11-05 14:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-05 14:11 [gentoo-commits] gentoo-x86 commit in app-i18n/ibus: ibus-1.3.8.ebuild ibus-1.2.0.20100111.ebuild ChangeLog metadata.xml ibus-1.3.7.ebuild ibus-1.3.99.20101028.ebuild Matsuu Takuto (matsuu)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox