summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatsuu Takuto <matsuu@gentoo.org>2010-11-12 09:37:29 +0000
committerMatsuu Takuto <matsuu@gentoo.org>2010-11-12 09:37:29 +0000
commit64c10cdb54f3ab71bed2f1fc6d90290774dfb5fe (patch)
tree839339c2d2dd8925ba967f1b2232cca06f72258f
parentRevision bump and remove old. Fix aspell automagic dependency (bug #344329 by... (diff)
downloadgentoo-2-64c10cdb54f3ab71bed2f1fc6d90290774dfb5fe.tar.gz
gentoo-2-64c10cdb54f3ab71bed2f1fc6d90290774dfb5fe.tar.bz2
gentoo-2-64c10cdb54f3ab71bed2f1fc6d90290774dfb5fe.zip
Fixed dependency, bug #344291. Revert ibus-1.2.0.20100111, bug #342903.
(Portage version: 2.1.9.22/cvs/Linux x86_64)
-rw-r--r--app-i18n/ibus/ChangeLog6
-rw-r--r--app-i18n/ibus/ibus-1.2.0.20100111.ebuild4
-rw-r--r--app-i18n/ibus/ibus-1.3.99.20101028.ebuild4
3 files changed, 8 insertions, 6 deletions
diff --git a/app-i18n/ibus/ChangeLog b/app-i18n/ibus/ChangeLog
index 7653d82d3a42..2cb51e361fd3 100644
--- a/app-i18n/ibus/ChangeLog
+++ b/app-i18n/ibus/ChangeLog
@@ -1,6 +1,10 @@
# 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.71 2010/11/05 14:11:27 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ChangeLog,v 1.72 2010/11/12 09:37:29 matsuu Exp $
+
+ 12 Nov 2010; MATSUU Takuto <matsuu@gentoo.org> ibus-1.2.0.20100111.ebuild,
+ ibus-1.3.99.20101028.ebuild:
+ Fixed dependency, bug #344291. Revert ibus-1.2.0.20100111, bug #342903.
*ibus-1.3.99.20101028 (05 Nov 2010)
diff --git a/app-i18n/ibus/ibus-1.2.0.20100111.ebuild b/app-i18n/ibus/ibus-1.2.0.20100111.ebuild
index 96ed449ae357..e363c896021b 100644
--- a/app-i18n/ibus/ibus-1.2.0.20100111.ebuild
+++ b/app-i18n/ibus/ibus-1.2.0.20100111.ebuild
@@ -1,6 +1,6 @@
# 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.6 2010/11/05 14:11:27 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.2.0.20100111.ebuild,v 1.7 2010/11/12 09:37:29 matsuu Exp $
EAPI="1"
inherit confutils eutils gnome2-utils multilib python
@@ -39,8 +39,6 @@ RDEPEND="${RDEPEND}
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/}
diff --git a/app-i18n/ibus/ibus-1.3.99.20101028.ebuild b/app-i18n/ibus/ibus-1.3.99.20101028.ebuild
index cd29c59148eb..4241e1202e4c 100644
--- a/app-i18n/ibus/ibus-1.3.99.20101028.ebuild
+++ b/app-i18n/ibus/ibus-1.3.99.20101028.ebuild
@@ -1,6 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.3.99.20101028.ebuild,v 1.2 2010/11/12 09:37:29 matsuu Exp $
EAPI="2"
PYTHON_DEPEND="python? 2:2.5"
@@ -15,7 +15,7 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="doc +gconf gtk introspection nls +python vala X"
-RDEPEND=">=dev-libs/glib-2.18
+RDEPEND=">=dev-libs/glib-2.26
gconf? ( >=gnome-base/gconf-2.12 )
>=gnome-base/librsvg-2
sys-apps/dbus