app-i18n/fcitx: Version bump (4.2.9.3).

3 files changed, 161 insertions, 0 deletions

diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index 999afcc2b9c3..8392668a8fb2 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,5 +1,6 @@
 DIST fcitx-4.2.9.1_dict.tar.xz 8684772 SHA256 5337c8226417a1d4e6f88b3b1048aa73695d281ed483568a7b6a9ee849ad6c77 SHA512 5d3b669ed97423f976116385571d07f832e9e18007e6a3c2aef12957219739a81fbf2343825fea4a1b01a83a6bf9e40e9ffa88466c651876602517c6da1fb25d WHIRLPOOL 02b2ff1b0c33b1f2c0461988bc3323ca27ba565a0d8a1f49b96aaceac857c07365aaaee0048d470dea82e60857bedf59ef8c60d3cdfa14a2ff074216d5cdc16d
 DIST fcitx-4.2.9.2_dict.tar.xz 8735848 SHA256 2cdd7c138163f717aacca8eabb18a4a823c808a408e4b0770f5be2e3e892de20 SHA512 9228fc4629479e2c518e0d0a7dbe604f6e56e864b41927d120e1f0b7a277ff53ff1b393870480bc1660662751a31885ddc1ddf43133a11edc2e96cbc7701daee WHIRLPOOL 8f19cd9f34a3957ff42e94ca7a5e28db5feecf658e9ca2535430fe6dd7a269ba9833e9273e8fd87d00a426027aebd97741c3fe909d9a0b0577ae6f64a8f4ba75
+DIST fcitx-4.2.9.3_dict.tar.xz 8737864 SHA256 543cc301f274367429880cb80c53349ed44435e7c64d757cca9b0d1844e2a91e SHA512 813b55c4b13e9d36bdaed6e4d072a841aa7f067f937b46d1fdbc03e8176b76ce83b056e24e2c0fe944f1347c5fe6a8d9bfdd6b0b2ed054e3017f3926fa36bcdd WHIRLPOOL b54c52025a48350c37712a64048ae2cec4e891c75607ded8ce35940252d2c242430e6ff0e64c86e1319b89b57b388c05760728a861cd58af0c99edd634f20c97
 DIST fcitx-data-en_dict-20121020.tar.gz 630491 SHA256 c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb SHA512 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2 WHIRLPOOL 858b51723035e24756c0ece15ee28f9d25dbc86ca447c50e070f085e47b864f26201a100d3d968bcecf5711e76f99c7908eeabe7bc6d5b3b17d6cf2c53c3204b
 DIST fcitx-data-pinyin.tar.gz 1608886 SHA256 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1 SHA512 1ee19eed3ee58be6cd6562ec363fe3bf630fff5e8820b3bfdd6d4618fceb082695e888dec5366a3685d58706f720e19319d891c223227237aed12674ea982131 WHIRLPOOL c5584213cab5b3729c159759909819bef42d4dba899e58df331aa12b47f5544545d9ba3f8ac7291835cb80c5e180a3a8b31360e9b9e43e4f38387b0eeee74b46
 DIST fcitx-data-py_stroke-20121124.tar.gz 445601 SHA256 8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248 SHA512 d80ff9a3549e07c7a6935e686785f9a076c58f1a782a832ae28ee65e2a213d67f089f450ce09bed87ec2a141c32b9c1fcb83c221ddcab436858fa9009f161fb3 WHIRLPOOL 3b09c21b8f948538b10218bd52ed12235f8d8a1986db7c09a35de5454c89305d5ada27177c8501b6bf72324aa1824a384822a7fbb440d63ce081265b1fa34c65
diff --git a/app-i18n/fcitx/fcitx-4.2.9.3.ebuild b/app-i18n/fcitx/fcitx-4.2.9.3.ebuild
new file mode 100644
index 000000000000..6a1c4258963d
--- /dev/null
+++ b/app-i18n/fcitx/fcitx-4.2.9.3.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils gnome2-utils xdg-utils
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fcitx/fcitx"
+fi
+
+DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz
+		https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz
+		https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> fcitx-data-py_stroke-20121124.tar.gz
+		https://download.fcitx-im.org/data/py_table-20121124.tar.gz -> fcitx-data-py_table-20121124.tar.gz
+		https://download.fcitx-im.org/data/en_dict-20121020.tar.gz -> fcitx-data-en_dict-20121020.tar.gz"
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz"
+fi
+
+LICENSE="GPL-2+ LGPL-2+ MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+X +autostart +cairo debug +enchant gtk2 gtk3 +introspection lua nls opencc +pango qt4 static-libs +table test +xml"
+REQUIRED_USE="cairo? ( X ) pango? ( cairo ) qt4? ( X )"
+
+RDEPEND="dev-libs/glib:2
+	sys-apps/dbus
+	virtual/libiconv
+	virtual/libintl
+	x11-libs/libxkbcommon
+	X? (
+		x11-libs/libX11
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrender
+		xml? (
+			x11-libs/libxkbfile
+			x11-misc/xkeyboard-config
+		)
+	)
+	cairo? (
+		x11-libs/cairo[X]
+		x11-libs/libXext
+		pango? ( x11-libs/pango )
+		!pango? ( media-libs/fontconfig )
+	)
+	enchant? ( app-text/enchant:0= )
+	gtk2? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	introspection? ( dev-libs/gobject-introspection )
+	lua? ( dev-lang/lua:= )
+	nls? ( sys-devel/gettext )
+	opencc? ( app-i18n/opencc:= )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+	)
+	xml? (
+		app-text/iso-codes
+		dev-libs/libxml2
+	)"
+DEPEND="${RDEPEND}
+	kde-frameworks/extra-cmake-modules:5
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-restart.patch"
+)
+
+DOCS=(AUTHORS ChangeLog THANKS)
+
+src_prepare() {
+	if [[ "${PV}" == "9999" ]]; then
+		ln -s "${DISTDIR}/fcitx-data-pinyin.tar.gz" src/im/pinyin/data/pinyin.tar.gz || die
+		ln -s "${DISTDIR}/fcitx-data-table.tar.gz" src/im/table/data/table.tar.gz || die
+		ln -s "${DISTDIR}/fcitx-data-py_stroke-20121124.tar.gz" src/module/pinyin-enhance/data/py_stroke-20121124.tar.gz || die
+		ln -s "${DISTDIR}/fcitx-data-py_table-20121124.tar.gz" src/module/pinyin-enhance/data/py_table-20121124.tar.gz || die
+		ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz" src/module/spell/dict/en_dict-20121020.tar.gz || die
+	fi
+
+	# https://github.com/fcitx/fcitx/issues/250
+	sed \
+		-e "/find_package(XkbFile REQUIRED)/i\\    if(ENABLE_X11)" \
+		-e "/find_package(XkbFile REQUIRED)/s/^/    /" \
+		-e "/find_package(XkbFile REQUIRED)/a\\    endif(ENABLE_X11)" \
+		-i CMakeLists.txt
+
+	cmake-utils_src_prepare
+	xdg_environment_reset
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+		-DSYSCONFDIR="${EPREFIX}/etc"
+		-DENABLE_CAIRO=$(usex cairo)
+		-DENABLE_DEBUG=$(usex debug)
+		-DENABLE_ENCHANT=$(usex enchant)
+		-DENABLE_GETTEXT=$(usex nls)
+		-DENABLE_GIR=$(usex introspection)
+		-DENABLE_GTK2_IM_MODULE=$(usex gtk2)
+		-DENABLE_GTK3_IM_MODULE=$(usex gtk3)
+		-DENABLE_LIBXML2=$(usex xml)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_OPENCC=$(usex opencc)
+		-DENABLE_PANGO=$(usex pango)
+		-DENABLE_QT=$(usex qt4)
+		-DENABLE_QT_GUI=$(usex qt4)
+		-DENABLE_QT_IM_MODULE=$(usex qt4)
+		-DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo yes; else echo no; fi)
+		-DENABLE_STATIC=$(usex static-libs)
+		-DENABLE_TABLE=$(usex table)
+		-DENABLE_TEST=$(usex test)
+		-DENABLE_X11=$(usex X)
+		-DENABLE_XDGAUTOSTART=$(usex autostart)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	rm -r "${ED}usr/share/doc/${PN}"
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	use gtk2 && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+}
diff --git a/app-i18n/fcitx/files/fcitx-4.2.9.3-restart.patch b/app-i18n/fcitx/files/fcitx-4.2.9.3-restart.patch
new file mode 100644
index 000000000000..b71bdac9461a
--- /dev/null
+++ b/app-i18n/fcitx/files/fcitx-4.2.9.3-restart.patch
@@ -0,0 +1,13 @@
+https://github.com/fcitx/fcitx/issues/362
+https://github.com/fcitx/fcitx/commit/82202f6b81361263693f07ae17c55c8ce048b220
+
+--- /src/lib/fcitx/instance.c
++++ /src/lib/fcitx/instance.c
+@@ -365,6 +365,7 @@
+         setjmp(FcitxRecover);
+ 
+         if (instance->destroy || instance->restart) {
++            FcitxInstanceEnd(instance);
+             FcitxInstanceRealEnd(instance);
+             break;
+         }