Version bump. Upgrade to EAPI=4.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 131 insertions, 3 deletions

diff --git a/app-i18n/fcitx/ChangeLog b/app-i18n/fcitx/ChangeLog
index 7901d760c49e..3ef9c20c16d0 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.49 2012/06/07 06:28:17 qiaomuf Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.50 2012/07/19 07:43:11 yngwin Exp $
+
+*fcitx-4.2.5 (19 Jul 2012)
+
+  19 Jul 2012; Ben de Groot <yngwin@gentoo.org> +fcitx-4.2.5.ebuild:
+  Version bump. Upgrade to EAPI=4.
 
 *fcitx-4.2.4 (07 Jun 2012)
 
@@ -234,4 +239,3 @@
 
   25 May 2003; Alastair Tse <liquidx@gentoo.org> fcitx-1.8.5.ebuild:
   New ebuild for Chinese Input for X
-
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index 09378150059c..996c87dc34af 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -8,6 +8,7 @@ DIST fcitx-4.0.0_all.tar.gz 7127889 SHA256 28740bafbb76a904a4edb491a8b81bb5a8f22
 DIST fcitx-4.0.1_all.tar.gz 6917877 SHA256 5a5ab150b0074988053c11daeb0291ab8fb344c5133c1d8d2a0a7de16a7cdb41 SHA512 9dd1208117f82e2e0e21885ef5e1f3c3dfa938738063f19b42e807524759e75a2af881255b6c23e8d268d69c2d7e04e103f5bc8e76071faf9a484c1a4d23a58f WHIRLPOOL 0c127cf3b928c02acf38fd522a2fe0cd27c60e95cfa428bfe1f9a53442f1d9441b8d5a13fe25f00744783f400e51be10aa09925a03ccf7cf43d8a917ff180537
 DIST fcitx-4.2.1.tar.xz 569824 SHA256 5f8b1972ae179ca6fb1febe5becd27adb71696fa9ee056839991378e6ed18372 SHA512 464ae65d1b99e0972463e9bbbf872aef46059df0e76f516cd83b452b420cbc19aa9be7bf75c86cd535a5750519477a4ed9724f8391c9f9e715aee5f0b044ea4f WHIRLPOOL 5eef2e88cd4cac1b3931a4e1eade48ab26c2b18cf3ec0ebcf11ddd1b651238b478e175f24bcb8595207de7a8c9ab1eec378460d9dc56c1149f76e1cbc6013303
 DIST fcitx-4.2.4.tar.xz 644884 SHA256 3843181b151161e9a0c2143c160676b89fc9d55d382c3695d655c546ea93aad6 SHA512 d0904b1b89aedc3867b91b2e4cf8a1146a0fe3ad6abfd08c904ebe1af242e83299ced1db29e891a9922f5e2cc4b3b00bfcaecb65044b3a74425a0ba2765f48b6 WHIRLPOOL 0b863a67ceeae2cdb211d7f94483a53c07d2baf494995d2cb3216e0490771e83f26b07f4cf7ac8d5646a68cfa73a7625d6700a61139f671af4557c434276a97e
+DIST fcitx-4.2.5.tar.xz 1413724 SHA256 478d311d3427e255729671f3a461762348bf5d83ed694d78021012778047140a SHA512 036e987ac57ca80a34822ef1235538caf232537b6062bb6f749882de031756eef0275ff7a2053a8ffd52c524662efefbf3237051bba362aca9ead3d5fd614725 WHIRLPOOL 06561d9a20b857f07e89130dcf291620e19fe5fadac3e5db9126ea0c0ac0ef2a4e29a559f87e9dc2832dda2bda976f74891ed6211e72294acde1e08a60b3dec2
 DIST pinyin.tar.gz 1608886 SHA256 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1 SHA512 1ee19eed3ee58be6cd6562ec363fe3bf630fff5e8820b3bfdd6d4618fceb082695e888dec5366a3685d58706f720e19319d891c223227237aed12674ea982131 WHIRLPOOL c5584213cab5b3729c159759909819bef42d4dba899e58df331aa12b47f5544545d9ba3f8ac7291835cb80c5e180a3a8b31360e9b9e43e4f38387b0eeee74b46
 DIST table.tar.gz 4144686 SHA256 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7 SHA512 99e1d69c679355fcf3e117a1ef39b131cbd3af841387d2335757247d840b90ff6b7323e16fca98cf7a043033faf250d2e9c6d47b96845d18c278a0cf6f30fec9 WHIRLPOOL 465997dc17e88fb3130abb60e0c73564fbdb50a10de1587f5efaac4859a001b7b4aea1f0f4f6efe01ada5e8751351b7b6106a130f46d550e5dd0081dfaa780e5
 EBUILD fcitx-3.6.3.ebuild 1562 SHA256 25ee7fc880b25d71845f78be451bf6fe5af5361d8d0f1cc61f6303a25304037a SHA512 0e8bd81fbd6eeff3003855b6240461caf03f3a3591883d0363efc96f7d4b989bbabe4b469f714ffff9cf0e176aa88895a87609b355091bab3150338b88f0ee51 WHIRLPOOL 231b899ab2377f6edbeaf68d5e0aa1afdbb1886d78bea4682e2aa1074acd53fdf634472eb9f5b0d9c58b4a7c6cf1e2a407ee4028773d45826e3db165996f3e45
@@ -16,5 +17,6 @@ EBUILD fcitx-4.0.0.ebuild 1433 SHA256 adf2cd5932411353b84eb84c92f2e7899b786d53c9
 EBUILD fcitx-4.0.1.ebuild 1553 SHA256 cf44fa0ee37e43597ccc1ab5244bdcccd0d242defa003287a3e2701ac5cbcfe2 SHA512 99360f9806237b2c700bbbe94503a157e639381d7285533274b67fe1c61163acf6e5f2ed18446622b8ec86d81fe9eee1c33e23a46a68113940981da5b5511b42 WHIRLPOOL 7c5a711f0902f31134c695f7965af74b8ebb9def633e08ce463eb48aacc90821ead5e5c2d34a260017f342bd81c4a29335d733cc7b7ebf8b3bc474da9e25a411
 EBUILD fcitx-4.2.1.ebuild 2459 SHA256 2bca3911a05a29d9abd485e2ed5667790a1ba7c3aa8945b05b271ba687538c35 SHA512 44c2ecc46481179e8df8644aa429100cec6c5a0f3fd3e3e6ae05e9becf454116ea3e53499a5c1149493d679c93552072f3ef26ade85df2290139ab65684dfeb7 WHIRLPOOL 4db0d3777cc8e66307266e11973906830fea36858c2b031559b4565280eded57d6bbe873f24272a8bd5ea4df45714d94c4a94615afaeee71e935048d68c47729
 EBUILD fcitx-4.2.4.ebuild 3302 SHA256 fe7a53c41e01be5a4f173bc76a93e875d2d10e376658389c39f8e00629e213bb SHA512 90df7e4efd2de2b9e68d70dbd90b5edeffd16e9fe728227643928fa95f3f6c3f79a0ad4c858d49bcb3a60d619105a5939c767dbb6c754e1a556604a64061d21e WHIRLPOOL 05acc0a37479376236d7d55769812f9d5e7c7d92f21070acd5c7f4f8b8f8a074436ef59c01fe2de434e5f8b5bdcc93064f14a4f60de7e9a9e77779e723ba1688
-MISC ChangeLog 7773 SHA256 54ee50cf6dafccbf0fb3ce370efc32154b80cb3be4917e75f6d92aaa9785143f SHA512 0f03fa9e8a342582a4d9f17a637dd09b97ad32acc6fa1200c94681afb9a31494b9e74673d347963439a7b2b0eb7a0d5f0844c981add0ec7fc348e594cd23fa15 WHIRLPOOL 4f57cfdcd906565cbced539324f466d9efe46554d4b510f0b0641fd37c52b2f01bb43fc6bb9586d47b7385964865791d9754897e8969248b527e0eb813dabbd0
+EBUILD fcitx-4.2.5.ebuild 3259 SHA256 48293971b920414908fa1e153650f1e268eed82ac28ca310c12e96d96cc543ea SHA512 563dbd5f9f88ff9f50f75109cf716f5c1ac6b6e673f54cdb24c8287db06d90d1197cbc3e8b40ce278c51edc47a120e56e57361527ed350950c68bebb00d55780 WHIRLPOOL d424585161804344546a165f61fe17ca32218c0dc5e486b3a5c1a1d7ad33af625839f542b9fe0d7347563c742cf70bb1f2ccc80bd93e1d4b979bc740185c028e
+MISC ChangeLog 7904 SHA256 1eb500ffbb172ea6f51e2c283fe5c46d65095e29bbf25354126648f1e4426031 SHA512 a6436eef2e6c59d3e6d42a974449173d0d4d45a7ca718a84a2f83b30b25b628f3e57aaffff4d73a9f0a6cf2a94f63163d5d1443a7c59d4a6aaa032d7769c679c WHIRLPOOL 4d0b2773974168ff67cda6e02dcc933786da211cda320555c9ba47781ced93934dd4b17e6f1fbca8b0413a8c8ed4fc6ca904927e12a6b31f80ef563fdc8d56b7
 MISC metadata.xml 618 SHA256 cc3e44515dce8822a4469f22fb48203e6a373dbe5fae4e27072719a2bd108839 SHA512 92d6efbee00084b13a675d94ccbbbf6cc3b248d5c3c7989a59cbee5666b05222612b60f3a046f47710fd72bb2bfabb0066770a3e5f27e9555e692477a1e21026 WHIRLPOOL 4a9f104f62d237f59bd37bb5f327fa854f3b27644d91129e526ee45d022c3eb5ddad58274ba4f2380e91fc3cd0b04dfdf087fe5e9775cecd73918dd18fb8a1a5
diff --git a/app-i18n/fcitx/fcitx-4.2.5.ebuild b/app-i18n/fcitx/fcitx-4.2.5.ebuild
new file mode 100644
index 000000000000..9399fb080b7f
--- /dev/null
+++ b/app-i18n/fcitx/fcitx-4.2.5.ebuild
@@ -0,0 +1,122 @@
+# 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.5.ebuild,v 1.1 2012/07/19 07:43:11 yngwin Exp $
+
+EAPI=4
+
+inherit multilib cmake-utils eutils
+
+DESCRIPTION="An input method framework with extension support"
+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 ~ppc ~ppc64 ~x86"
+IUSE="+cairo debug gtk gtk3 introspection lua opencc +pango qt4 snooper 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
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	lua? ( dev-lang/lua )
+	opencc? ( app-i18n/opencc )
+	qt4? (
+		x11-libs/qt-gui:4
+		x11-libs/qt-dbus:4
+	)
+	sys-apps/dbus
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	app-text/enchant
+	app-text/iso-codes
+	dev-libs/icu
+	dev-util/intltool
+	virtual/pkgconfig
+	x11-libs/libxkbfile
+	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 introspection GIR)
+		$(cmake-utils_use_enable lua LUA)
+		$(cmake-utils_use_enable opencc OPENCC)
+		$(cmake-utils_use_enable pango PANGO)
+		$(cmake-utils_use_enable qt4 QT_IM_MODULE)
+		$(cmake-utils_use_enable snooper SNOOPER)
+		$(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
+
+	rm -rf "${ED}"/usr/share/doc/${PN} || die
+	dodoc AUTHORS ChangeLog README THANKS TODO doc/pinyin.txt doc/cjkvinput.txt
+	dohtml doc/wb_fh.htm
+}
+
+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
+}