Version bump for fcitx-4.2.2

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

4 files changed, 146 insertions, 10 deletions

diff --git a/app-i18n/fcitx-configtool/Manifest b/app-i18n/fcitx-configtool/Manifest
index 8a9625b5855d..d5d0089653c1 100644
--- a/app-i18n/fcitx-configtool/Manifest
+++ b/app-i18n/fcitx-configtool/Manifest
@@ -1,21 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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.0.tar.bz2 32124 RMD160 1d9b2983870e0b5314757a8c289027b2ad4259c9 SHA1 18636ad077e71533b0436a42db1dab4dcde4db9a SHA256 580a531838c27a1446d1b8ad33d84e44fa729c1b178deff4b9736d316d754640
 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
 EBUILD fcitx-configtool-0.1.4.ebuild 624 RMD160 4bdcd1e16b658681b3e12af89a5b28f34054289b SHA1 fb59f761f6de5a59835ac66202b65f45ee265650 SHA256 85da4ac7c19b4caa88b513877e00ba7c429c4ea4adb10f1aa033f5a73a3ea520
 EBUILD fcitx-configtool-0.2.0.ebuild 706 RMD160 a1307fae37af10631fdbbcf1be1900fd500ffae5 SHA1 f1710dc95cad769efaa4d2a83d0784924eb7316b SHA256 6e8e73218f367f7f63ee74da51e5b2692c0f3cb310153ed3e847b98b443fa149
 EBUILD fcitx-configtool-0.4.0.ebuild 641 RMD160 28b13a9cc4e30302c07ab250b9e5c5c23c7a7200 SHA1 1510a7e187cd207ccc87f548a25bde54996ef3de SHA256 6621804af0a3afe2e8f19096a34e3520312b11b0490325e53495d9f15635d817
 EBUILD fcitx-configtool-0.4.1.ebuild 812 RMD160 3a4b2d5f1aba98b2ab18edb765f2b4cd2fedb59c SHA1 5e67c08c036954a27cd4d4f885fb996b262c3b13 SHA256 2fdb63a0b5fb4a9f0d81e9e239d6651edce37eb3404bff0e7fa995120a79dac1
-MISC ChangeLog 1164 RMD160 3b694d6724600379ff8245d18ee97dc29ceee938 SHA1 8479e71b0db26d2e74e321cf7b7bbdc0d087f09c SHA256 853426fbc29a9b4dcf5f26549ed9d13c5e7bc6ab62775a6b7b4269e0f2aec592
+EBUILD fcitx-configtool-0.4.2.ebuild 812 RMD160 4ff556c0e8526ecb59e1e4a8374ce32c1d3d54b1 SHA1 395422e92dff679d2bcf5f743e3dc192d56f00d7 SHA256 dbd270cf5c6c5e2e89973ebbed60f82ea70092dc03e39ff058e109e6b950cb16
+MISC ChangeLog 1322 RMD160 5e56a895ddb742c35cca48b44b76b845b03adde6 SHA1 38ec806bb07aa3c215e2adcb1ad55ec1ac5b10a1 SHA256 003697b7d491b690045de35b3cbc54b55e0796f2829e06953a85bda88cbe0ac0
 MISC metadata.xml 385 RMD160 08b084d61c97f86a41f57fc1dd8d629f0434ae86 SHA1 b009918cbf8a799aa89038678db9633b24322d67 SHA256 6fed6399d83cd90ffe215448358fa1bf2f07e21146889d756ac2fb3a7523b480
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk93P4kACgkQuUQtlDBCeQKJbgCePR4ZPC2FIwWCi9LgVWufXLpt
-m0gAn23o2DiEqfY/aBjEHaMl4B+Ci0TG
-=e5x7
+iQEcBAEBAgAGBQJPlS4yAAoJEDCzDeQXsVfpgEsIAJXV2jw1UtArF/iapLMBcBn9
+NGCvRAhbpE2dZgyOri2SYD9sClMZCTk7wztGopFW6EHAm/ZCP4HUnq0TecNLcv2N
+6GdvzvzpsRv+zlrPVlzKlZ5BfnRDvA/nqXGq/85AlSYnK6/Jhqvro7YwUo+p/gD1
+NpzddtWbwQXGuWHtcRqOT0//bCj/FdvD3CpRegNrmw1I1KJ/HhkYbBHfwO/ykQCI
+1kRwNmi9cLj6bCYIqLJHITbzDQg8emgEtEgX5V4CioHrzT5/WwSNCbzB8eVnUSnT
+dqBLbnpVr6swMLycceNDSCkRiwRdvvnhLWftCQrvh/yUql6McDFIu4LpHWT8y1c=
+=JyPE
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/fcitx/ChangeLog b/app-i18n/fcitx/ChangeLog
index e4e5816ff4cb..f6962f9e1eee 100644
--- a/app-i18n/fcitx/ChangeLog
+++ b/app-i18n/fcitx/ChangeLog
@@ -1,6 +1,13 @@
 # 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.44 2012/04/18 18:39:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.45 2012/04/23 10:21:28 qiaomuf Exp $
+
+*fcitx-4.2.2 (23 Apr 2012)
+
+  23 Apr 2012; Mu Qiao <qiaomuf@gentoo.org> +fcitx-4.2.2.ebuild:
+  Version bump for fcitx-4.2.2
+
+  The ebuild is updated according to the one from gentoo-zh.
 
   18 Apr 2012; Markus Meier <maekke@gentoo.org> fcitx-4.2.1.ebuild:
   x86 stable, bug #409403
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index 4c4c1a4a41f4..a8169c83faa4 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -10,18 +10,26 @@ DIST fcitx-4.0.0_all.tar.gz 7127889 RMD160 4e8640703db0ebd94e55270fcce1e21f60cda
 DIST fcitx-4.0.1_all.tar.gz 6917877 RMD160 1f27f7037aa7df02bbdb63a0cc7cabf8a37b6326 SHA1 455a46c0ab04efe5a487134c2c863ce31ab1b1a8 SHA256 5a5ab150b0074988053c11daeb0291ab8fb344c5133c1d8d2a0a7de16a7cdb41
 DIST fcitx-4.2.0.tar.bz2 785160 RMD160 1530b3f8515ca517a9ba89c028422f462c031f59 SHA1 b3c09f1eda7fb71208d348c34389dc824d6b2a80 SHA256 1410141f91321ec0c2514b8a9b3ff13ce3af82841036264f5a8b7ad005b139e5
 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 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 1563 RMD160 83cdd503486c77598ce10172ae1575c0884dd259 SHA1 189ce3007be61209e8f6e3426e1d0bab0e7d0c60 SHA256 2738cf072a9338e1c63504318fd4a7f6db6440a7c004d7d48a8cb8eb7115559d
 EBUILD fcitx-3.6.4.ebuild 1573 RMD160 946658fe1ba68379152c07eafa47bceada90712b SHA1 9a54adca3b1bfca9a78ee6dbeffb37760386a4e8 SHA256 655d31389c09e1d09d548a68c0d33bc091f78a457a887b5579b994a828771a40
 EBUILD fcitx-4.0.0.ebuild 1428 RMD160 cb653df44dba78cfafc0980ca80a4c7c85f2c982 SHA1 66e943bc446537c1326b4288106aaf3a555e1397 SHA256 a98ca28dbe284e4b1dae2c54ef9cb39c56e5e268ae0eb823d50bd7dd98b72e57
 EBUILD fcitx-4.0.1.ebuild 1548 RMD160 5bf70b3f0e7a2a0332ed4d5c8eef5e09e55c4ffc SHA1 74e3c46ec6f88252df59705fcf9ac3471bc250ef SHA256 00993c64fe2af869264fb18131487b306f2e66f0bcc287c7c1e72e4d711fc030
 EBUILD fcitx-4.2.0-r2.ebuild 2470 RMD160 8a299a53a3868f3f7d6176a7156d7ce40ef6fc78 SHA1 ae1b06dd2d80064fc0f562a0a01c5d436dbb3085 SHA256 410c183722750b7a49ee807c80b47ec39007f4e8b2d1444ac3661796e2acb45d
 EBUILD fcitx-4.2.1.ebuild 2445 RMD160 b3be9955045c33bb81536d50195e7e373a719937 SHA1 afdf2856602ea7cf1360e4186e83daca54d770ad SHA256 3dcce6a5c1fd6dbce4381d14664f09cf51745a8967aa697b3620c3d101b076a8
-MISC ChangeLog 6952 RMD160 045472686d8a4a46bc248afa2d89a3fa36e9b877 SHA1 0971bacffb668cbc973b9f5d93a895d54aba6756 SHA256 27bc6b6ca1c0b945b866ce25967689495b1b928d78c19c540403a1cd37e2efea
+EBUILD fcitx-4.2.2.ebuild 2989 RMD160 305cfdad56d3705c7f14e7b85390cf48d12c4de9 SHA1 6bdb8e05bd2e2ba54433d10418789df6988fdb07 SHA256 b6c09d9b4e98acb48c518c01c0e0d2dcdddaaa63bd747848201305be5987f334
+MISC ChangeLog 7140 RMD160 599475d4b2c9717faec07eaefad5c626ee7209ff SHA1 41f5653cc9e7746444e3459519a766dcca02aa31 SHA256 889d3a94d485d63189f1bfedd5ca8e0e5a8e2c553ff9d16be35ac6dba4af765f
 MISC metadata.xml 537 RMD160 bf063ed6cd5e7000cc67cca62adde0f675e81511 SHA1 c23592b3a69f98d7511cca94ed40763f53489e17 SHA256 cdd460db735648aea2a935febad9160fcca6ae379c4704d04ec357444ae56f86
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk+PCwoACgkQkKaRLQcq0GJTlQCdFq68n60L7bmflOnR0uGXrQr9
-114AniZFD68z34GWRGSn513WW8drAJw8
-=LtXj
+iQEcBAEBAgAGBQJPlS0zAAoJEDCzDeQXsVfpB7YIAL+vkZ6063B4qBX/ZBUXuebQ
+ASzmYkvuwodEs2AgS4DXOvIlv87bPiAdGSGtchi6ZyzpTlAeQZttj+bRy12u2uVb
+opAho/MPj1dSafQSfONig/D0vnjIet7b3EY/o90PNAVDX/3KEoy4UUaE8XhMHukH
+znBm7gnuuUCZ9F8BPyW7rconRvnAtZJsDHzdEfEXiWUtYC6saWS2rG4PcUMi+JRT
+fWo4Zx+WQye6IgCThM48+PhK84WCvntY700Zsol0js6lnuOILHfsx2xtZEMJYvw5
+YqNqsRDUuwYZKjtdNYNH8ALUNab10flESU0H42lrur/6EzbaArPMv1+946+pAoU=
+=ThzE
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/fcitx/fcitx-4.2.2.ebuild b/app-i18n/fcitx/fcitx-4.2.2.ebuild
new file mode 100644
index 000000000000..5c1bacbea04a
--- /dev/null
+++ b/app-i18n/fcitx/fcitx-4.2.2.ebuild
@@ -0,0 +1,115 @@
+# 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.2.ebuild,v 1.1 2012/04/23 10:21:28 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 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
+	)
+	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
+	dev-util/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
+}
+
+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 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
+}