Fixed to work with >=app-i18n/ibus-1.3.99. Removed old versions.

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

7 files changed, 193 insertions, 74 deletions

diff --git a/app-i18n/ibus-hangul/ChangeLog b/app-i18n/ibus-hangul/ChangeLog
index fbfeb53d9218..c629cce36a65 100644
--- a/app-i18n/ibus-hangul/ChangeLog
+++ b/app-i18n/ibus-hangul/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/ibus-hangul
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-hangul/ChangeLog,v 1.13 2011/04/02 02:24:38 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-hangul/ChangeLog,v 1.14 2011/05/25 00:04:59 matsuu Exp $
+
+*ibus-hangul-1.3.1-r1 (25 May 2011)
+
+  25 May 2011; MATSUU Takuto <matsuu@gentoo.org>
+  -ibus-hangul-1.1.0.20090328.ebuild, ibus-hangul-1.2.0.20100102.ebuild,
+  -ibus-hangul-1.3.0.20100329.ebuild, ibus-hangul-1.3.1.ebuild,
+  +ibus-hangul-1.3.1-r1.ebuild, +files/ibus-hangul-ibus-1.4.patch:
+  Fixed to work with >=app-i18n/ibus-1.3.99. Removed old versions.
 
 *ibus-hangul-1.3.1 (02 Apr 2011)
 
diff --git a/app-i18n/ibus-hangul/Manifest b/app-i18n/ibus-hangul/Manifest
index dd1b8eaf86ed..41fb4d907bde 100644
--- a/app-i18n/ibus-hangul/Manifest
+++ b/app-i18n/ibus-hangul/Manifest
@@ -1,30 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST ibus-hangul-1.1.0.20090328.tar.gz 450491 RMD160 30f4de6de0c93846acfc5f24e472a1883d4605a1 SHA1 ad4e6fc72ccab44ab3ad55eeb76bcccc6b8cebbf SHA256 7a00a5d706282d1732ca655968a3079e35021d3fed86e1e3492175b2b19767ac
+AUX ibus-hangul-ibus-1.4.patch 5861 RMD160 47122d2cea73c7527006646aae675b7453ea0e1f SHA1 ebeba3463897b2994fc9999e79f9cda5066a6d7e SHA256 d2e6ac38bb173925ac259098f2db9a25c66109a1943794105ba141a3dd76a7e3
 DIST ibus-hangul-1.2.0.20100102.tar.gz 424000 RMD160 3d8bd1ae193bd3c647aeadb5dbda21e5416070a3 SHA1 7483377b7a2108115e9eb3d2c39100971b47b1bb SHA256 4f146655cf75fa978e939708bb9c2a3329480ffd38b39ec738e33bd19b2944db
-DIST ibus-hangul-1.3.0.20100329.tar.gz 424537 RMD160 cc1cccaf0ba30313cd366900a7e1ef67e33cf36f SHA1 3f681270288deb26bfc961bdcd85a02694d3220d SHA256 0d00a4e05a109aece9c54364e8c8bb2013cfeed6a4bddb7685f2c36a1bce2d61
 DIST ibus-hangul-1.3.1.tar.gz 431214 RMD160 996172fb00854ae2000b3197707269ebd8d6808e SHA1 e1fb0e0560d8987c3106992693638a298bd2ea1c SHA256 1e5530c1d7add8970f3a98a76a0a2feda06a08d65af56fbba5329a6645915afc
-EBUILD ibus-hangul-1.1.0.20090328.ebuild 1133 RMD160 f8c4bc7fa503c481fe7073b51883a313e6db8357 SHA1 517a170e5f07498ea52041e47709f52e2e3add49 SHA256 68dd025c46305e3df6fb437e449cc6fea7292081bfb3c09910d72494057d27af
-EBUILD ibus-hangul-1.2.0.20100102.ebuild 952 RMD160 33b476f9cd46ad5ec995e37d1000f0ae69fef5f0 SHA1 043655fb7c5fc26d7f892e33b04e8ee5f44dd153 SHA256 23c7650d185b7b3df9b83f3a6357148b642ef662b2bac8f803338b28358c201c
-EBUILD ibus-hangul-1.3.0.20100329.ebuild 918 RMD160 62d6a4cdaf8388f2147f0ceceb14c01704c13e6e SHA1 45787d23634a5df08500defc15ffdb28d9ced71b SHA256 05fcadc961384e496c2237df834f211e590be0d12b08f24ba90d4c4e1206eb85
-EBUILD ibus-hangul-1.3.1.ebuild 906 RMD160 a0e0f9edc9090449f1c4570077c7fa750451e6c2 SHA1 83c73a01e27b5cc8d3ce3f748bc584497cc30c45 SHA256 919c53c34669055ac0fb96d59a5cdc38bc625b994ed8a6bb4b07565892553361
-MISC ChangeLog 2547 RMD160 5b31111244d73e7f13f84a46b784a5260ac7a86d SHA1 da774d43dc458d409cf513c58866d98bdabee228 SHA256 de6af096fbf1d46b281cca0fd6c3c125f6fbd0115ba58ae6f55cce67a1af5e22
+EBUILD ibus-hangul-1.2.0.20100102.ebuild 977 RMD160 878c08ed93c3967ec875e5fa2ae29680280c4967 SHA1 1beba0c204ede910d8650355d7dbf15459a8ec31 SHA256 e56695e2e55a5575c0ea210eb455e91fe3c555c1ebe1f2a8ab803503867540f1
+EBUILD ibus-hangul-1.3.1-r1.ebuild 1025 RMD160 1ae10a0324982096863409c1b441e68ed735420f SHA1 50ac33eefdd01324269be9177fd76b244758b79d SHA256 206b820bdb9412b7f86564a699824a9472bd8eed1c37e2f7601d3a849b8083be
+EBUILD ibus-hangul-1.3.1.ebuild 931 RMD160 49aed453b5035b75b2fe581cec811e1bb954a58a SHA1 8ebe4ac6717078a28897de67c93232b5e3ed6357 SHA256 9dffc6dd120051f314bf7d4c670f97687dfa4bb25e88033dc7b1a764f9564afa
+MISC ChangeLog 2905 RMD160 8858ce86b8d388d8bab0dd6ba6645ed93ec67217 SHA1 5526102a6f5e6c0c3ab0fe92bd431ac2e74e9e7c SHA256 8b83eb57b4303cac71f0268c6df8db3849ea287746b4febd75450e66f87c9f34
 MISC metadata.xml 289 RMD160 b04f57fc9299b32b0a9f82fc920ecaf25fcd14c2 SHA1 38d9f652aae84d8e7b51e6005c314787f8e051c5 SHA256 2d3584ad2ac1f8e9cd6fdd12f9c8874f2d80283aad221b287808a36deaae5e35
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNlojtAAoJECaGw+YFKA1pjVsP/3HRL5hJiulAG69tywwpr0tE
-awsxzyc7OzAhcgFysFgkCv5xg0nvzs2ZKMarBabu1gKED7GTKuD/gi+HFyjHD5XH
-FlnNm6Vita3dcKAcJMFWCV1nGBdlaiQOK0vyhBfPmeP+0OhB6u1E7PjD/xCBv8XQ
-MM2mpAAZuz5HbaJ7WbUJirp1pjsRIE4xBVaORKJ1l3xf0UEXNXmdJAjoImitrxCi
-RYiUkMorzhRb9O7tH9hyxl/nZ4wqmTjCtDxA9zl2Ld5cUKHs8YSZYwrC6V0WqsIA
-1dKKqJ8ha4jlIYZVwbZxXbL2YHNEF55LPg99GmUpk+G3X5Zkcq9yb8H9s2gZD1fx
-M1trjBdYL2OsrkC/L8evRZqzoTi+Rp9UPEup3vaYA+nOG8RKROoTywiQhInL1UI1
-91uSmtENOjERoXlCRHGNN5K5+9YLxNx40BOSl2uHe2avcsVR3Q+ViHWS+qzK+0KT
-VZ6fvMejFpqihT6jcB911spvzrdCdeQjl6sIjVtezwLvc4yiKyDc6mEvKKxhTjdi
-BRmknCsf9rc01UFO6uJ5xxZC73FfYzztOHo8nAyoMUXLTLst5N/zPxJLrq4PicOj
-n2rNR73EkVxn9hvdXdQuvkNfhFYmh3D/XmEo+/TmY7kGMgZ5xH4R/UslPROpjlrI
-PmyKEvHoy2RJ/4zCmXQP
-=ffCv
+iQIcBAEBAgAGBQJN3Ee0AAoJECaGw+YFKA1plMsQAInAfWX5ZqfA/Nis7byovBpj
+gikc2sw/ZzarRG7saGhIcHl55/tcUMiKM/Ohqygoq90zuCn5feMq0KZS426A4AgI
+Ni+lAGzzvEieI83JCdAFS47SSFpHzgSwaV/EuLUaHVUynSLKLkYGtYapXE5SpQjv
+tThJPrsybA1LhC0zJ6zy1f/G8Lx9A5Oj7BcQE8ehzyIdPVdgKIWnxX6joA08XOw6
+u/6zKe8d2KeWlvGehc/P76DhPGl6oybUOX7qVoMs4w2+P48MpeO57Qg1sKK0HBDt
+/9IQ6vQvuYieYjOJM+QifNes7Go5tIvUtZaWRAbw2GtnCizRzc3lhCs5bwtB71AN
+7iZbVAAgkvGNtd1dzWahOschkIdlhm9kcIqxt7j7qaJ0Nl3QjqUcLwCaYcgbkAMZ
+nVdO6Xdu5J1dcCExHvufLPOL69wH4pVAueRz7UP+A+WJiScTWtLVniw5XR14WoCv
+L0Z6S4DSEoMlo8Y8/wKe8VoxTclGpy6oz9WbSQUKgI446CCcggodmLc5uCYRtycW
+cQ2sRguX4IzIW/hWIva6zHwmuykNzl89uOnz4vFPQsVgIM/lZM871M0vYsiIoxRu
+H6T/7yw6uv9w2NffuZypEaBYwJk02AzWQ7nriPYcoe4jnqg8d3xFDgw4VblkW/mi
+FoIUG2aJAMeBGI9X4qiH
+=pyFF
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/ibus-hangul/files/ibus-hangul-ibus-1.4.patch b/app-i18n/ibus-hangul/files/ibus-hangul-ibus-1.4.patch
new file mode 100644
index 000000000000..25a6f1238cac
--- /dev/null
+++ b/app-i18n/ibus-hangul/files/ibus-hangul-ibus-1.4.patch
@@ -0,0 +1,155 @@
+From 6ce58d1d79e5b175865ee26794e9fc7ce576ce56 Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno@unixuser.org>
+Date: Mon, 8 Nov 2010 14:12:35 +0900
+Subject: [PATCH] Fix build with ibus-1.4.
+
+This patch adds compatibility code for the API changes of IBusConfig and
+IBusEngineDesc in ibus-1.3 -> ibus-1.4.
+---
+ src/engine.c |   75 ++++++++++++++++++++++++++++++++++++++++++++++++---------
+ 1 files changed, 63 insertions(+), 12 deletions(-)
+
+diff --git a/src/engine.c b/src/engine.c
+index 79db70f..a297e4d 100644
+--- a/src/engine.c
++++ b/src/engine.c
+@@ -111,7 +111,11 @@ static void ibus_hangul_engine_update_lookup_table
+ static void ibus_config_value_changed       (IBusConfig             *config,
+                                              const gchar            *section,
+                                              const gchar            *name,
++#if IBUS_CHECK_VERSION(1,3,99)
++                                             GVariant               *value,
++#else
+                                              GValue                 *value,
++#endif  /* !IBUS_CHECK_VERSION(1,3,99) */
+                                              gpointer                user_data);
+ 
+ static void        lookup_table_set_visible (IBusLookupTable        *table,
+@@ -136,6 +140,11 @@ static gboolean hanja_key_list_match        (HanjaKeyList           *list,
+ static gboolean hanja_key_list_has_modifier (HanjaKeyList           *list,
+                                              guint                   keyval);
+ 
++static gboolean config_get_string           (IBusConfig             *config,
++                                             const gchar            *section,
++                                             const gchar            *name,
++                                             gchar                 **result);
++
+ static IBusEngineClass *parent_class = NULL;
+ static HanjaTable *hanja_table = NULL;
+ static HanjaTable *symbol_table = NULL;
+@@ -176,7 +185,7 @@ void
+ ibus_hangul_init (IBusBus *bus)
+ {
+     gboolean res;
+-    GValue value = { 0, };
++    gchar *str;
+ 
+     hanja_table = hanja_table_load (NULL);
+ 
+@@ -187,22 +196,20 @@ ibus_hangul_init (IBusBus *bus)
+         g_object_ref_sink (config);
+ 
+     hangul_keyboard = g_string_new_len ("2", 8);
+-    res = ibus_config_get_value (config, "engine/Hangul",
+-                                         "HangulKeyboard", &value);
++    str = NULL;
++    res = config_get_string (config, "engine/Hangul", "HangulKeyboard", &str);
+     if (res) {
+-        const gchar* str = g_value_get_string (&value);
+         g_string_assign (hangul_keyboard, str);
+-        g_value_unset(&value);
++        g_free (str);
+     }
+ 
+     hanja_key_list_init(&hanja_keys);
+ 
+-    res = ibus_config_get_value (config, "engine/Hangul",
+-                                         "HanjaKeys", &value);
++    str = NULL;
++    res = config_get_string (config, "engine/Hangul", "HanjaKeys", &str);
+     if (res) {
+-        const gchar* str = g_value_get_string (&value);
+         hanja_key_list_set_from_string(&hanja_keys, str);
+-        g_value_unset(&value);
++        g_free (str);
+     } else {
+ 	hanja_key_list_append(&hanja_keys, IBUS_Hangul_Hanja, 0);
+ 	hanja_key_list_append(&hanja_keys, IBUS_F9, 0);
+@@ -963,27 +970,71 @@ ibus_hangul_engine_property_activate (IBusEngine    *engine,
+     }
+ }
+ 
++static gboolean
++config_get_string (IBusConfig  *config,
++                   const gchar *section,
++                   const gchar *name,
++                   gchar      **result)
++{
++#if IBUS_CHECK_VERSION(1,3,99)
++    GVariant *value = NULL;
++
++    g_return_val_if_fail (result != NULL, FALSE);
++
++    value = ibus_config_get_value (config, section, name);
++    if (value) {
++        *result = g_strdup (g_variant_get_string (value, NULL));
++        g_variant_unref (value);
++        return TRUE;
++    }
++    return FALSE;
++#else
++    GValue value = { 0 };
++
++    g_return_val_if_fail (result != NULL, FALSE);
++
++    if (ibus_config_get_value (config, section, name, &value)) {
++        *result = g_strdup (g_value_get_string (&value));
++        g_value_unset (&value);
++        return TRUE;
++    }
++    return FALSE;
++#endif  /* !IBUS_CHECK_VERSION(1,3,99) */
++}
++
++#if IBUS_CHECK_VERSION(1,3,99)
++#define _g_variant_get_string g_variant_get_string
++#define _g_variant_get_int32 g_variant_get_int32
++#else
++#define _g_variant_get_string(value, length) g_value_get_string(value)
++#define _g_variant_get_int32 g_value_get_int
++#endif  /* !IBUS_CHECK_VERSION(1,3,99) */
++
+ static void
+ ibus_config_value_changed (IBusConfig   *config,
+                            const gchar  *section,
+                            const gchar  *name,
++#if IBUS_CHECK_VERSION(1,3,99)
++                           GVariant     *value,
++#else
+                            GValue       *value,
++#endif  /* !IBUS_CHECK_VERSION(1,3,99) */
+                            gpointer      user_data)
+ {
+     IBusHangulEngine *hangul = (IBusHangulEngine *) user_data;
+ 
+     if (strcmp(section, "engine/Hangul") == 0) {
+         if (strcmp(name, "HangulKeyboard") == 0) {
+-            const gchar *str = g_value_get_string (value);
++            const gchar *str = _g_variant_get_string (value, NULL);
+             g_string_assign (hangul_keyboard, str);
+             hangul_ic_select_keyboard (hangul->context, hangul_keyboard->str);
+         } else if (strcmp(name, "HanjaKeys") == 0) {
+-            const gchar* str = g_value_get_string (value);
++            const gchar* str = _g_variant_get_string (value, NULL);
+ 	    hanja_key_list_set_from_string(&hanja_keys, str);
+         }
+     } else if (strcmp(section, "panel") == 0) {
+         if (strcmp(name, "lookup_table_orientation") == 0) {
+-            lookup_table_orientation = g_value_get_int (value);
++            lookup_table_orientation = _g_variant_get_int32 (value);
+         }
+     }
+ }
+-- 
+1.7.5.1
+
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.1.0.20090328.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.1.0.20090328.ebuild
deleted file mode 100644
index 86ea326759bc..000000000000
--- a/app-i18n/ibus-hangul/ibus-hangul-1.1.0.20090328.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-hangul/ibus-hangul-1.1.0.20090328.ebuild,v 1.2 2009/06/18 15:40:05 matsuu Exp $
-
-DESCRIPTION="The Hangul engine for IBus input platform"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND=">=dev-lang/python-2.5
-	>=app-i18n/ibus-1.1
-	app-i18n/libhangul
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( >=sys-devel/gettext-0.16.1 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	mv py-compile py-compile.orig || die
-	ln -s "$(type -P true)" py-compile || die
-}
-
-src_compile() {
-	econf $(use_enable nls) || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	ewarn "This package is very experimental, please report your bugs to"
-	ewarn "http://ibus.googlecode.com/issues/list"
-	elog
-	elog "You should run ibus-setup and enable IM Engines you want to use!"
-	elog
-}
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.2.0.20100102.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.2.0.20100102.ebuild
index 1cac704cabbb..7bed536ffd76 100644
--- a/app-i18n/ibus-hangul/ibus-hangul-1.2.0.20100102.ebuild
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.2.0.20100102.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-hangul/ibus-hangul-1.2.0.20100102.ebuild,v 1.5 2011/04/02 02:24:38 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-hangul/ibus-hangul-1.2.0.20100102.ebuild,v 1.6 2011/05/25 00:04:59 matsuu Exp $
 
 PYTHON_DEPEND="2:2.5"
 inherit python
@@ -16,6 +16,7 @@ IUSE="nls"
 
 RDEPEND=">=dev-lang/python-2.5
 	>=app-i18n/ibus-1.2
+	!>=app-i18n/ibus-1.3.99
 	>=app-i18n/libhangul-0.0.10
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.3.0.20100329.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.3.1-r1.ebuild
index b0089ff805db..3784eb3d09bf 100644
--- a/app-i18n/ibus-hangul/ibus-hangul-1.3.0.20100329.ebuild
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.3.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-hangul/ibus-hangul-1.3.0.20100329.ebuild,v 1.2 2010/04/03 06:03:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-hangul/ibus-hangul-1.3.1-r1.ebuild,v 1.1 2011/05/25 00:04:59 matsuu Exp $
 
-EAPI="2"
+EAPI="3"
 PYTHON_DEPEND="2:2.5"
-inherit python
+inherit eutils python
 
 DESCRIPTION="The Hangul engine for IBus input platform"
 HOMEPAGE="http://code.google.com/p/ibus/"
@@ -16,13 +16,15 @@ KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND=">=app-i18n/ibus-1.2.99
-	>=app-i18n/libhangul-0.0.10
+	>=app-i18n/libhangul-0.0.12
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( >=sys-devel/gettext-0.17 )"
 
 src_prepare() {
+	# http://pkgs.fedoraproject.org/gitweb/?p=ibus-hangul.git
+	epatch "${FILESDIR}/${PN}-ibus-1.4.patch" || die
 	mv py-compile py-compile.orig || die
 	ln -s "$(type -P true)" py-compile || die
 }
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.3.1.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.3.1.ebuild
index efab0b91d874..c525daed3dfe 100644
--- a/app-i18n/ibus-hangul/ibus-hangul-1.3.1.ebuild
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-hangul/ibus-hangul-1.3.1.ebuild,v 1.1 2011/04/02 02:24:38 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-hangul/ibus-hangul-1.3.1.ebuild,v 1.2 2011/05/25 00:04:59 matsuu Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.5"
@@ -16,6 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND=">=app-i18n/ibus-1.2.99
+	!>=app-i18n/ibus-1.3.99
 	>=app-i18n/libhangul-0.0.12
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}