Version bump for fcitx-4.2.3

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

5 files changed, 224 insertions, 3 deletions

diff --git a/app-i18n/fcitx-configtool/Manifest b/app-i18n/fcitx-configtool/Manifest
index 028c4e6bcf72..0761f392ffe8 100644
--- a/app-i18n/fcitx-configtool/Manifest
+++ b/app-i18n/fcitx-configtool/Manifest
@@ -1,11 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fcitx-configtool-0.2.0-fix-gtk.patch 1137 RMD160 1190b0016f1b476d1b9955d8f727943ba3814d32 SHA1 59da0780a9326034e0cbb3578caab2b2de8a28a7 SHA256 f2bf4bcd51cbcc6b7f4cb4eb6d0d8e8b276858217ad4ea3b254e4bd171ba5405
 DIST fcitx-configtool-0.1.4.tar.gz 234329 RMD160 3baa5dd74f5d331f2183f9444ac050d97f72f63f SHA1 01de43eb9fb8b7869e273205977d501b924b7c98 SHA256 9b69fa0a3fae57573729a3dde666baf03144fa3582c620f56f4bb0074bc717c3
 DIST fcitx-configtool-0.2.0.tar.gz 37435 RMD160 e40e9563160f9b8c9accc0da3b1b48411a58a184 SHA1 b670a171f49ed149098589f10db3bbf7dd546af5 SHA256 2c309f2df500cf7c1b0d13b446a69e3513a11588025a2f648b18b684cc2320fe
 DIST fcitx-configtool-0.4.1.tar.xz 33608 RMD160 d67837b2b6a81fbbd71e053b82f31d3dce65a52d SHA1 1c11a350536afe66233b8bc6f1c16acb82292b42 SHA256 7135d8ec94589f7c55741908a3292c8cf89c097479061b3a47ce4154d3a305c9
 DIST fcitx-configtool-0.4.2.tar.xz 33724 RMD160 7522fa0f6024c1c7449d94b3e62b801c38a1ed1b SHA1 0fa6fe445fa21acfbd1b8e5408319724b35182c9 SHA256 98e1c14c3737e13a6340eb093f7f5391e4cd973e147aec8c9e49f41b3a1904b7
+DIST fcitx-configtool-0.4.3.tar.xz 34792 RMD160 a1c80a6306c0a9812b969399feceb5f982078b23 SHA1 8dd49c8670c6da06c9df9e4476271357593242d4 SHA256 0b8722da441acd3deb841f6b389b02499bc99f61a711ce57ad0cccae359a53b9
 EBUILD fcitx-configtool-0.1.4.ebuild 622 RMD160 f251a5a61af430abdafde30529940d14e8855830 SHA1 9a02994652e80aa83598608948acdc637f31c47b SHA256 64abb2299792f9454cae7a5dda5ef0eb4bbdc875935d8e140d17e683a5e94d85
 EBUILD fcitx-configtool-0.2.0.ebuild 704 RMD160 b43a08c3a85dc5554ec7a515173fcb62542297a3 SHA1 189afea661a5cc6677d277338c4ee8aaa94ee429 SHA256 cfc72d4e5eed367afe472f09e4b3c50b35fc7795dadf01ab56b4395b7a6d7e92
 EBUILD fcitx-configtool-0.4.1.ebuild 810 RMD160 ec249126bc57ed31b6a6cccd13b06b8f43675a4a SHA1 1abe854337af8c6e7c4ce3fb4c1bdf62e2d65326 SHA256 3235ceeff507640e91c81165cbe62555b02b90e18777d49b9dde19c505c63fde
 EBUILD fcitx-configtool-0.4.2.ebuild 810 RMD160 ab07f09a856efa7eb773e72b66014d27789cdcfe SHA1 617ce96cef4d820df42722fb3b5d0887ef219888 SHA256 505ca06f0751ac54a6bb2f2d77d3017379b368e010613f9bb74e90c2cbbfc419
-MISC ChangeLog 1541 RMD160 b008997773191e0fcf2a8dca21b121254d9e0d21 SHA1 79ba7181366c119fe9a8484b3f9318341cabbc15 SHA256 5628c55af3d2924d8e14760c58ec1ceb4f7de72dabbb6a990ec0a2268d3b5c2d
+EBUILD fcitx-configtool-0.4.3.ebuild 811 RMD160 b56c2e539cd71a1b093070046868f8f891a678dc SHA1 7302b4e5af918e81e99746308d0ea8d56c28342a SHA256 f210f3b412f8a6a5384d9a5e6ac7124571b9d3aac7da562780cf969ef9e87c94
+MISC ChangeLog 1701 RMD160 d57c24a36b220a2a8716dca227ca7119affd8adf SHA1 a9a0ad7743acbdf5d46eb47b355bb3fd14ceecbe SHA256 4c58c237da29137bfa731d1c5ed397384c79c54f4599a90da1f0719808499c64
 MISC metadata.xml 385 RMD160 08b084d61c97f86a41f57fc1dd8d629f0434ae86 SHA1 b009918cbf8a799aa89038678db9633b24322d67 SHA256 6fed6399d83cd90ffe215448358fa1bf2f07e21146889d756ac2fb3a7523b480
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPsbklAAoJEDCzDeQXsVfpbs8IAKQOUCyuZOcOd5CxaRK6cNmL
+9Pote/bP+LR3ROmompL+4NVaXwpb5HCnUJjJc9PcupTaFobzd4wEgBzUYX45MfLv
+tJfhhRDw4OssznVlciqkdbmnqyMOmdGdwNM84biC+NUw4+UfhQ2urlY4cv+sQppf
+NQnwsozoiAsROKWD8OgZP1y77NfnTz/x8n3JbgGcxxRFabknLOwWFG1XYNPAa+PB
+Z04JU+g2RqgZUe4hm0JwP7QjO74nvSDhtz0R6w2H7tU/rlKM6ku6wTzRfnC1U4fO
+kzAJI22mhSUyrcNzC8h0WbTjnJoZD9Un+1pDOU0kIgYwyYDGRTNNspJ7tAvY7LU=
+=DpWL
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/fcitx/ChangeLog b/app-i18n/fcitx/ChangeLog
index 28aaed6b30fd..91aae4500017 100644
--- a/app-i18n/fcitx/ChangeLog
+++ b/app-i18n/fcitx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/fcitx
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.46 2012/05/03 19:24:26 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.47 2012/05/15 01:57:23 qiaomuf Exp $
+
+*fcitx-4.2.3 (15 May 2012)
+
+  15 May 2012; Mu Qiao <qiaomuf@gentoo.org> +fcitx-4.2.3.ebuild:
+  Version bump for fcitx-4.2.3
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> fcitx-3.6.3.ebuild,
   fcitx-3.6.4.ebuild, fcitx-4.0.0.ebuild, fcitx-4.0.1.ebuild,
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index eb5a5d52954c..74605c11d76b 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,12 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fcitx-3.6.3-asneeded.patch 1138 RMD160 952408d89d1b7e25a5c6504ed9e32b8b8124f9af SHA1 64b1b93282e844805e4a7ed7709dbedf10582eb2 SHA256 67a1649517a02ac1d3a04187ba7cde5d09f363d12556e9b61d364fe04d44a8ca
 AUX fcitx-4.0.1-fix-pango.patch 339 RMD160 1f80cd6107e44bf73381ba2bb6322320056f4a74 SHA1 c111c500c710c41877e7afa7741410e25804dd02 SHA256 4aa3568a48a95d48c1a3cb9b911c9df8e1abf62629e3f3e21654b2cbceaec8e9
 AUX fcitx-4.2.0-fix-pango.patch 447 RMD160 902ee900fa9b83c015789ff77566133b2db4ec73 SHA1 f4196a816d8b3ce7ca6d5dcb5341e06679aa05eb SHA256 df83ef045c759518ff67b5a344667a5587c015d8c7a3ae088f42c340e5c0a2ed
+AUX fcitx-4.2.3-fix-lua.patch 1754 RMD160 f0c7426bd60f7ff638dd7ca20488be3c8399488e SHA1 ee8ce1d09a65dfd45fc54a8c73dce901ee42c887 SHA256 1cbed7641cb61732519b9070d2553cfb999a0301d9fe41557ad258f22c04d0ff
 DIST fcitx-3.6.3.tar.bz2 6385159 RMD160 f4fc3033da09a9fb1ca6d1c4ee06dcc9d169d5ad SHA1 ab3af3cdaba32ac9ff054b1964a483ca07b427dd SHA256 e986f1223d758d57b87e74b75dd9b635366ee4bf6ea90779f5a48e44498de5b5
 DIST fcitx-3.6.4.tar.gz 5957000 RMD160 737606d4550bfd96ac8adcdd3fbb658fa1e62a62 SHA1 136e44bcd05d7753377a2809ae28fd78969228dc SHA256 850a13a3d81ba218d02ec9ce508a6378bd874fb8f10f660eb587b2104f34919b
 DIST fcitx-4.0.0_all.tar.gz 7127889 RMD160 4e8640703db0ebd94e55270fcce1e21f60cda81a SHA1 33bab6528fb0cfd6b94ddf96bffed66b4f1a3355 SHA256 28740bafbb76a904a4edb491a8b81bb5a8f2281bbbaff21fdfbc4c44c34ea441
 DIST fcitx-4.0.1_all.tar.gz 6917877 RMD160 1f27f7037aa7df02bbdb63a0cc7cabf8a37b6326 SHA1 455a46c0ab04efe5a487134c2c863ce31ab1b1a8 SHA256 5a5ab150b0074988053c11daeb0291ab8fb344c5133c1d8d2a0a7de16a7cdb41
 DIST fcitx-4.2.1.tar.xz 569824 RMD160 a9f698bb2a1055e1e0a0230f8a38222607a19570 SHA1 74ad009cde48fb1efd48f8d2490fa36ddf36d215 SHA256 5f8b1972ae179ca6fb1febe5becd27adb71696fa9ee056839991378e6ed18372
 DIST fcitx-4.2.2.tar.xz 585936 RMD160 3badb53484497385da7adcebd4cfcddf15bb3956 SHA1 09d2e7110f652027ea7c285c5845070f8a353f38 SHA256 1d18096232a700ddcf059e737b6acb2b292e5a4ae5d4bc2714e4f599e4e6daa6
+DIST fcitx-4.2.3.tar.xz 612028 RMD160 54371c2efe6a40157002e6d20f128b2556ab2fce SHA1 8cd33487d1d6ad9c9c63743af8d76e667de4b859 SHA256 4b7d22ada50f7e375096094c2abcf09ad114ffb68521ccf0de37d71e1014183c
 DIST pinyin.tar.gz 1608886 RMD160 7d3be5535cb111cc5d8a64ce50150c9767608ec3 SHA1 af6f6fceed89a2b533b39a73e277675361298745 SHA256 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1
 DIST table.tar.gz 4144686 RMD160 b678c943b232b8aba2c462c7b81b2f99f27ecd07 SHA1 b7e89f95ce2da991821acd270a1220a4cd4cb65a SHA256 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7
 EBUILD fcitx-3.6.3.ebuild 1562 RMD160 16458118e4f8a7a7dc662f8e5e10212b1a853428 SHA1 9244af21168658134a0265609de1798bc35e9999 SHA256 25ee7fc880b25d71845f78be451bf6fe5af5361d8d0f1cc61f6303a25304037a
@@ -15,5 +20,17 @@ EBUILD fcitx-4.0.0.ebuild 1426 RMD160 5fc2f73c98b31f9870c1c81f8d0c2f2078d017e6 S
 EBUILD fcitx-4.0.1.ebuild 1546 RMD160 1ad7c30616fce4d41bde04551a85d1e097b41677 SHA1 8f6c9168eb6651e52b4709c6351cb545161d998b SHA256 6e4e8bd4c46f1395b35b4c1414fc962e009c8c98009b2d5ad3e07adaffe74ceb
 EBUILD fcitx-4.2.1.ebuild 2444 RMD160 26bf5e0cec0132268ddf4a31ae95fc1a5e0cbbc6 SHA1 7fba06a74979f5dfa76868d3d3c6f4d1e7166741 SHA256 9fd8fda3320b4dcf6f46e1adb776a34f88f424b4a9e6a604fd7e46223c5ccc59
 EBUILD fcitx-4.2.2.ebuild 2987 RMD160 72fd80dbef58ecddf8dd5ff0642946974d74ddf8 SHA1 41dee35e9bce968783d5aa8e8a71341d940ae441 SHA256 e395fc448d3ce08ae5134ddbf9b6b4702310a7672a02416fa3fac595a45aaadb
-MISC ChangeLog 7355 RMD160 2fc542a746f64428161821ee8015d6b4773543bf SHA1 0f387f5f75e3195510a8ec20d18b4317ccb66700 SHA256 70fd21f40ae4a98efef6f615ab499f4f4d8eb8f45716b784862232a31c073b3a
+EBUILD fcitx-4.2.3.ebuild 3093 RMD160 650933fa8e262efeabae071d348514cf2c234236 SHA1 7e141e7894ce8bb3fdb7eb9fd56e1f7ca78e34ab SHA256 9fd8a2a0ae891114674d2b5a46db355429f8b65e95c5f3e0edca9fad5f17faf5
+MISC ChangeLog 7481 RMD160 7753313ed055a7e6685b933b7f3b9d407ef5ee33 SHA1 191d58d912876fa2c8ba86f896ee0981f73abf65 SHA256 62c0dbbd5b3e2aff12e3a1ce8b7d2856aaae8e67164e3914d3b8a4ef93d9786f
 MISC metadata.xml 537 RMD160 bf063ed6cd5e7000cc67cca62adde0f675e81511 SHA1 c23592b3a69f98d7511cca94ed40763f53489e17 SHA256 cdd460db735648aea2a935febad9160fcca6ae379c4704d04ec357444ae56f86
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPsbgMAAoJEDCzDeQXsVfpdoQH/2b6PPAcTUSqvF9W61DLhnRT
+ifKqzTNzqD/TNMUnGyDtMk3PUXF1+0y8zm6I81HadAXr8qMdFTu+oo5v069zZ62g
+9RV4kTTZknZB5Tpg/F8AHTPIU1bQot7D2BhxZiVMpy4Rp/fwKBXu7XAYXQNLgLad
+SBrfYO7lWKAexscpOLBEVNUTdXAsOykGt4sKbOP4WXt/ee1dcJ8lF4kKk+Nbw5Zq
+FK3skUlgDYnBlB+6DsQumnIYVszJsWYj5I4Dg0t0Of8p1swPjlDotCGwNiSWtn3H
+tYDRpSnb473DDwHBbn1AA4Dv3H9Gllr6teMnS0JT2GXjLQU1GjuoCc6suMbiXsk=
+=WChC
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/fcitx/fcitx-4.2.3.ebuild b/app-i18n/fcitx/fcitx-4.2.3.ebuild
new file mode 100644
index 000000000000..19a1d2b7bd59
--- /dev/null
+++ b/app-i18n/fcitx/fcitx-4.2.3.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.3.ebuild,v 1.1 2012/05/15 01:57:23 qiaomuf Exp $
+
+EAPI="3"
+
+inherit multilib cmake-utils eutils
+
+DESCRIPTION="Free Chinese Input Toy for X. Another Chinese XIM Input Method"
+HOMEPAGE="http://www.fcitx.org/"
+SRC_URI="http://fcitx.googlecode.com/files/${P}.tar.xz
+		http://fcitx.googlecode.com/files/pinyin.tar.gz
+		table? ( http://fcitx.googlecode.com/files/table.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cairo debug gtk gtk3 lua opencc +pango qt static-libs +table test"
+
+RDEPEND="
+	cairo? (
+		x11-libs/cairo[X]
+		pango? ( x11-libs/pango[X] )
+		!pango? ( media-libs/fontconfig )
+	)
+	gtk? (
+		x11-libs/gtk+:2
+		dev-libs/glib:2
+		dev-libs/dbus-glib
+	)
+	gtk3? (
+		x11-libs/gtk+:3
+		dev-libs/glib:2
+		dev-libs/dbus-glib
+	)
+	lua? ( dev-lang/lua )
+	opencc? ( app-i18n/opencc )
+	qt? (
+		x11-libs/qt-gui:4
+		x11-libs/qt-dbus:4
+	)
+	sys-apps/dbus
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	dev-util/intltool
+	virtual/pkgconfig
+	x11-proto/xproto"
+
+update_gtk_immodules() {
+	local GTK2_CONFDIR="/etc/gtk-2.0"
+	# bug #366889
+	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
+		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
+	fi
+	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
+
+	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
+		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
+	fi
+}
+
+update_gtk3_immodules() {
+	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
+		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
+	fi
+}
+
+src_prepare() {
+	cp "${DISTDIR}/pinyin.tar.gz" "${S}/data" || die "pinyin.tar.gz is not found"
+	if use table ; then
+		cp "${DISTDIR}/table.tar.gz" "${S}/data/table" || die "table.tar.gz is not found"
+	fi
+
+	epatch "${FILESDIR}"/${P}-fix-lua.patch
+}
+
+src_configure() {
+	local mycmakeargs="
+		-DLIB_INSTALL_DIR=/usr/$(get_libdir)
+		$(cmake-utils_use_enable cairo CARIO)
+		$(cmake-utils_use_enable debug DEBUG)
+		$(cmake-utils_use_enable gtk GTK2_IM_MODULE)
+		$(cmake-utils_use_enable gtk3 GTK3_IM_MODULE)
+		$(cmake-utils_use_enable lua LUA)
+		$(cmake-utils_use_enable opencc OPENCC)
+		$(cmake-utils_use_enable pango PANGO)
+		$(cmake-utils_use_enable qt QT_IM_MODULE)
+		$(cmake-utils_use_enable static-libs STATIC)
+		$(cmake-utils_use_enable table TABLE)
+		$(cmake-utils_use_enable test TEST)"
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	dodoc AUTHORS ChangeLog README THANKS TODO || die
+
+	rm -rf "${ED}"/usr/share/fcitx/doc/ || die
+	dodoc doc/pinyin.txt doc/cjkvinput.txt || die
+	dohtml doc/wb_fh.htm || die
+}
+
+pkg_postinst() {
+	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
+	elog
+	elog "You should export the following variables to use fcitx"
+	elog " export XMODIFIERS=\"@im=fcitx\""
+	elog " export XIM=fcitx"
+	elog " export XIM_PROGRAM=fcitx"
+	elog
+}
+
+pkg_postrm() {
+	use gtk && update_gtk_immodules
+	use gtk3 && update_gtk3_immodules
+}
diff --git a/app-i18n/fcitx/files/fcitx-4.2.3-fix-lua.patch b/app-i18n/fcitx/files/fcitx-4.2.3-fix-lua.patch
new file mode 100644
index 000000000000..d08b636c639b
--- /dev/null
+++ b/app-i18n/fcitx/files/fcitx-4.2.3-fix-lua.patch
@@ -0,0 +1,64 @@
+commit e8e378f7e12f1a755a0912dff15e9f84ad8dbd7f
+Author: Weng Xuetian <wengxt@gmail.com>
+Date:   Mon May 7 14:06:25 2012 +0800
+
+    fix compile
+
+diff --git a/src/module/lua/luawrap.c b/src/module/lua/luawrap.c
+index 67883a7..417a1c9 100644
+--- a/src/module/lua/luawrap.c
++++ b/src/module/lua/luawrap.c
+@@ -58,13 +58,13 @@ typedef struct _ConverterItem {
+     UT_hash_handle hh;
+ } ConverterItem;
+ 
+-typedef struct _LuaExtension {
++struct _LuaExtension {
+     char *name;
+     lua_State *lua;
+     UT_hash_handle hh;
+-} LuaExtension;
++};
+ 
+-typedef struct _LuaModule {
++struct _LuaModule {
+     FcitxInstance *fcitx;
+     LuaExtension *extensions;
+     CommandItem *commands;
+@@ -73,7 +73,7 @@ typedef struct _LuaModule {
+     ConverterItem *converters;
+     ConverterItem *current_converter;
+     size_t shortest_input_trigger_key_length;
+-} LuaModule;
++};
+ 
+ typedef void (*LuaResultFn)(LuaModule *luamodule, const char *in, const char *out);
+ 
+diff --git a/src/module/lua/luawrap.h b/src/module/lua/luawrap.h
+index 152d835..592b275 100644
+--- a/src/module/lua/luawrap.h
++++ b/src/module/lua/luawrap.h
+@@ -21,18 +21,18 @@
+ #ifndef _LUA_WRAP_H_
+ #define _LUA_WRAP_H_
+ 
+-typedef struct lua_State lua_State;
+-typedef struct _LuaModule LuaModule;
+-typedef struct _LuaExtension LuaExtension;
+-typedef struct _FcitxInstance FcitxInstance;
++#include <lua.h>
+ 
+ typedef struct _LuaResultItem {
+     char *result;
+     char *help;
+ } LuaResultItem;
+ 
++typedef struct _LuaModule LuaModule;
++typedef struct _LuaExtension LuaExtension;
++
+ // alloc/free luamodule
+-LuaModule * LuaModuleAlloc(FcitxInstance *fcitx);
++LuaModule * LuaModuleAlloc(struct _FcitxInstance *fcitx);
+ void LuaModuleFree(LuaModule *luamodule);
+ FcitxInstance *GetFcitx(LuaModule *luamodule);
+