Fixed dependency, bug #344291. Revert ibus-1.2.0.20100111, bug #342903.

Package-Manager: portage-2.1.9.22/cvs/Linux x86_64

4 files changed, 24 insertions, 22 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/Manifest b/app-i18n/ibus/Manifest
index 263d1e2338fb..686781b5eadd 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -5,26 +5,26 @@ DIST ibus-1.2.0.20100111.tar.gz 1291877 RMD160 8fc210a7c876c717acaeafa656ad46dc7
 DIST ibus-1.3.7.tar.gz 1358687 RMD160 f50ddda511b6f74b522a61c834e6ffd1f3f41baa SHA1 ba5e8f0c57f6fd53af6f76a3b60deb1be3cb27c5 SHA256 b7d9bcd57578c02f9b62019061b00935030bf629ff8b113deb35116e1702a537
 DIST ibus-1.3.8.tar.gz 1379038 RMD160 c9a0d159d8810327666ddd2da18c19ef24c91106 SHA1 c1cf1c897bd24f8becfa52127d058eabbb199b8e SHA256 d8507517f5e5ba454b2663581b1133df21fdba74a077902259e18845cdd2468d
 DIST ibus-1.3.99.20101028.tar.gz 1311498 RMD160 68a3279341830bda7a6de63d53d50b7e4c22155f SHA1 ce20e090b8a34fc4ed00f1c8447c7fbb98af94ae SHA256 9f69b0a9ae8b0eec5d7511ca3a2f3cf2ea2b20e47695b6e7b095aec049fb921c
-EBUILD ibus-1.2.0.20100111.ebuild 2658 RMD160 0711f78c713a3107a5861b98ee39b269ee6b0368 SHA1 987df904f67bd283eb7a202d7804f3a1a9644e65 SHA256 5e35e92c5cb74b486b438529e72a3d8985fa666d618500be4f1d52281ede454b
+EBUILD ibus-1.2.0.20100111.ebuild 2614 RMD160 9e7ddb8d686b24c5d3d92c31bd16761810fb5d4d SHA1 2924c886b1c0edca5ff1b3798a58927dad252eb6 SHA256 06a6abae3c2a8e0355b79d44614f5816e062e8ab20dc9041f6b24796ad43fe13
 EBUILD ibus-1.3.7.ebuild 3245 RMD160 879533b81358c66646dc8991cf70cab4c4512e7c SHA1 15497acde7ee9e200ff6e5c9e56466dcea357f06 SHA256 0965c194716cdda35939eaef48bc529e5b295dc65d844106d5a7a8174de04db8
 EBUILD ibus-1.3.8.ebuild 3245 RMD160 10b35870169f43b97f7b9cb498ec0e4a76e57300 SHA1 6315c9cf85ae786ac0b409d5c70228cbfb0a2e75 SHA256 df230506cd44f04f4ef1c8f252f0e5b9dad833510e85ff7fb53b6e24c21b5416
-EBUILD ibus-1.3.99.20101028.ebuild 3255 RMD160 060e59b053b07f7ae26c1d8d487e5ee916a54da0 SHA1 0e0710813d4c01c55c795639642e53c582e6a424 SHA256 0ae681e67e5171e1005c3d87637886b9a0a57e747b6443dc0b8e2ed701d5107f
-MISC ChangeLog 11696 RMD160 bcd161c43eb99e6e82167a05734d6e6524e9c004 SHA1 16cf526009cca54f2c037d66408ecedbcf80321f SHA256 15f903fe0238f7c381cd73822506e4404d08fc97621d3d945b4df10659bb3a3c
+EBUILD ibus-1.3.99.20101028.ebuild 3255 RMD160 a07be0bf369a453b4ccd1f1eb90a73db62caa28f SHA1 03499602a7d091d8a8f8221cd98b088f489947fc SHA256 de05377b4fd6ba42810c37a5b805fb837367fa85090153ed3aa31d2bed15bf70
+MISC ChangeLog 11879 RMD160 a63ec70ccffd7fa5a113d374cb85451042377603 SHA1 e0d52ac8ac0b4caaf11e5efa5ab8e3289712f844 SHA256 62ffba671769141b9038adde4441cf2ca74b20b23dec9950ca2a70f64820087e
 MISC metadata.xml 671 RMD160 a430d2733dbeb0c98d42b3a432cfadafb5f8c87a SHA1 bfc77eafdea87e34b5ae48e6a6652508c4a70204 SHA256 4184635ca1b44311db6031a7f00c5679582289862be1a550a4faf4dd9d5e6e59
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJM1BDoAAoJECaGw+YFKA1pBTEP/RL0LvZKAfPJ4dTU8w7DoCL8
-ohR/6VUIvK8CxrXBKDNXcyVafYrrEDQRnyKnsj9VV+QjQE/TCLsXkOtTF5O80uI7
-h4tuogreNrAo2VfPj0AWwGj7Ax+hE9yMwIBjcEUVIAcELiLsC1MDs7PYr4hqhbhQ
-B4KCxEsw3zMxCZvlNAs5+HsrMSP84Vo9Cyhn/wQyOKt4uv5u0/IEQSCRcfIlw44w
-HliSUSCZC1YM3pBFRpmrmU2bDK3WjleC/qfmAazm97rRi1hGE4EY9IERO84tFuYL
-Tnj6W0b2TJcgW+NiIaSKhq6AF7pZClPMxFHa4TMI6zSurfz/w/vXf3M/0sTW9ZGr
-Mp3IpfM+YxYzDNI7w9X0O1z59XRscSR3IVhWITyi4AgNljld8vaMHFktWsSMqLHK
-YTelefsR2CXwiDZJosQnCoRTywz3vfYIWBkIm7LiYElcmvf4DTn3SssbOX33Laei
-j21caDkBlfSBmRDlPzi7bPP1XVAhiJ3IaDv/Xm14dHo0F7CaPw1kf38Hf+eumbPW
-tyL7sZRaUHuuaUD+5sjjMekoSKYO/CGE8/VvQuhIbHduH1jLSo5njlIGlSR+iu/o
-B+GgGvfO/hvvcoK/Z4tT2/FqW3Pbe43/A4jasRWr+oKEe9lhJ74GjWKnn5Z6dV98
-c5nec+4WfqzfmJ9k2DOh
-=RGi6
+iQIcBAEBAgAGBQJM3QrjAAoJECaGw+YFKA1pQ9AP/ibYP7Kx+5jUEm1ap51Catw8
+All2RD8qRA4lMPh5HTH4N1Y1HsJWs+Rn2yN+OtIghef94LoFiKHJoovgSD5unPnh
+hQrefsd+V32aGdZ200JP2fdi3cRBg2uX2TqBi+0NGVGncU8t62O6nahzBFS9I09+
+Xk+ArPF5rp04yP3XcwXoLYU+JesPBGIgllA6bFPAg/nhn+HZxJ4Cwzm8Ur4VlKAk
+xJz+fTyK11UERarpAG0qqd2xgo2k74UzSNqEpvPDJWSicSdQSyLeDZS0nIHJ5LlN
+MMkPaD2GQjTGfOLt6Mb1IyLG+6gSg0MMfH3Vl6XZtwY++4WDub9m6TN+bZm7SmwN
+7i2kbjv8/hLTrgnIzUX/aYae3gnrPMQJ33NZoGQnhCa7/V+kr/EGon6sbebvVQFY
+nP2WGpKSnfB9VipkQNbxKhjFiEEY+9YM0vY1Zht6SsqHhgESk7FPerd2WdOK70Vz
+AF2/VXQD59IlPWNtH2sNJDY6hleifcmfZEX0Ghx3X1UECstR47bvsPT1Bf/yn371
+WsI01w+s5rhRqqeTJgRa6cuWN3mgkG7OP9IjKCdzE+hxC6TeC0S4EGx27ulu9FoQ
+2IyINAYBCChki1nPz+nNHA4i83Y5cSSAdwY2uds/ERREhOyyGfkxU+0L49joPn7Q
+mSoyf2WPjVYbDa3Nd6DN
+=BZA0
 -----END PGP SIGNATURE-----
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