[gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx/, app-i18n/fcitx/files/

[Mike Gilbert]

commit:     af049eaa17f978c830c05745e3667a05056805a5
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Apr 28 20:15:56 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 21:06:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af049eaa

app-i18n/fcitx: Delete old version.

 app-i18n/fcitx/Manifest                            |   1 -
 app-i18n/fcitx/fcitx-4.2.7.ebuild                  | 125 ---------------------
 .../fcitx/files/fcitx-4.2.7-gcc46-compatible.patch |  43 -------
 app-i18n/fcitx/metadata.xml                        |   1 -
 4 files changed, 170 deletions(-)

diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index 8e7d3bf..58b4baf 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,4 +1,3 @@
-DIST fcitx-4.2.7_dict.tar.xz 8546416 SHA256 0c902617581f04eb0d337634b0bf2b39956abbcc949512cc79d4ee24cfc9dbb5 SHA512 e5d8eb55f644250197e69315ad02b9f6bc84e697b23c20c01a731f98ce8b1a16d764a58b1e1047d45b8decb6be33144707c2a52fc427e6338d8b8186cd4da074 WHIRLPOOL e344bc92a84940d3c885d1ae87a2fc83c95d6cb0f0e95eed76078e996c4a00df82a0c09c4540771f628928db1716f90d50d04469f2c0f2d5c17b5048fbf2d482
 DIST fcitx-4.2.8.5_dict.tar.xz 8696468 SHA256 fe3d6f57805fc61130f8254f19a86fe3baa0f405406414ca2e94bcf86d3d1b72 SHA512 ee6612a34087135065537fa14f09078bad9f029f69b636fb2221193f23d86c5431a9d8a848b264bdcb259680f6bda41d08d58dcf67d19e5a200cb11fa4a26ffe WHIRLPOOL 0a394d5aaa53819bbab66b32e7ae5896187bc45fad146c7eef4ab75640e5c6670cf811bec87e482bb3516b30e1ce28f2cefa91c10838092f9329b1101b5c70db
 DIST fcitx-4.2.8.6_dict.tar.xz 8694328 SHA256 91034e9ef976bbe2649a96b67adf0c133d64e2c0d53be440cc40a4370569d597 SHA512 822e448932e735fe3087384eaf91c6b029b06d3461aa3798501bfbf8f79b8ebc5ea3ac57f01ec32674cc3cb74fcb34b6e285ef265bb49be54543f34dcaf624e4 WHIRLPOOL df24b3b6bbe18a8498732b27817caef6c28278bddd6acfbe49edd9a63d8f33b09ba93ff0bd144e1c1d3b9b9c8079a35a8a047ebf9b361b4f173ec9b23138042e
 DIST fcitx-4.2.9.1_dict.tar.xz 8684772 SHA256 5337c8226417a1d4e6f88b3b1048aa73695d281ed483568a7b6a9ee849ad6c77 SHA512 5d3b669ed97423f976116385571d07f832e9e18007e6a3c2aef12957219739a81fbf2343825fea4a1b01a83a6bf9e40e9ffa88466c651876602517c6da1fb25d WHIRLPOOL 02b2ff1b0c33b1f2c0461988bc3323ca27ba565a0d8a1f49b96aaceac857c07365aaaee0048d470dea82e60857bedf59ef8c60d3cdfa14a2ff074216d5cdc16d

diff --git a/app-i18n/fcitx/fcitx-4.2.7.ebuild b/app-i18n/fcitx/fcitx-4.2.7.ebuild
deleted file mode 100644
index dfff4f9..0000000
--- a/app-i18n/fcitx/fcitx-4.2.7.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils eutils gnome2-utils fdo-mime multilib readme.gentoo
-
-DESCRIPTION="Flexible Contect-aware Input Tool with eXtension support"
-HOMEPAGE="http://fcitx-im.org/"
-SRC_URI="https://fcitx.googlecode.com/files/${P}_dict.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="+X +autostart +cairo +dbus debug +enchant gtk gtk3 icu introspection lua
-nls opencc +pango qt4 snooper static-libs +table test +xml"
-
-RDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libXinerama
-	)
-	cairo? (
-		x11-libs/cairo[X]
-		pango? ( x11-libs/pango[X] )
-		!pango? ( media-libs/fontconfig )
-	)
-	dbus? ( sys-apps/dbus )
-	enchant? ( app-text/enchant )
-	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
-	)
-	icu? ( dev-libs/icu:= )
-	introspection? ( dev-libs/gobject-introspection )
-	lua? ( dev-lang/lua )
-	opencc? ( app-i18n/opencc )
-	qt4? (
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4[glib]
-	)
-	xml? (
-		app-text/iso-codes
-		dev-libs/libxml2
-		x11-libs/libxkbfile
-	)"
-DEPEND="${RDEPEND}
-	virtual/libintl
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog README THANKS TODO
-	doc/pinyin.txt doc/cjkvinput.txt doc/API.txt doc/Develop_Readme )
-HTML_DOCS=( doc/wb_fh.htm )
-
-src_prepare() {
-	use autostart && DOC_CONTENTS="You have enabled the autostart USE flag,
-	which will let fcitx start automatically on XDG compatible desktop
-	environments, such as Gnome, KDE, LXDE, Razor-qt and Xfce. If you use
-	~/.xinitrc to configure your desktop, make sure to include the fcitx
-	command to start it."
-	epatch "${FILESDIR}/${P}-gcc46-compatible.patch"
-	epatch_user
-}
-
-src_configure() {
-	local mycmakeargs="
-		-DLIB_INSTALL_DIR=/usr/$(get_libdir)
-		$(cmake-utils_use_enable X X11)
-		$(cmake-utils_use_enable autostart XDGAUTOSTART)
-		$(cmake-utils_use_enable cairo CAIRO)
-		$(cmake-utils_use_enable dbus DBUS)
-		$(cmake-utils_use_enable debug DEBUG)
-		$(cmake-utils_use_enable enchant ENCHANT)
-		$(cmake-utils_use_enable gtk GTK2_IM_MODULE)
-		$(cmake-utils_use_enable gtk3 GTK3_IM_MODULE)
-		$(cmake-utils_use_enable icu ICU)
-		$(cmake-utils_use_enable introspection GIR)
-		$(cmake-utils_use_enable lua LUA)
-		$(cmake-utils_use_enable nls GETTEXT)
-		$(cmake-utils_use_enable opencc OPENCC)
-		$(cmake-utils_use_enable pango PANGO)
-		$(cmake-utils_use_enable qt4 QT)
-		$(cmake-utils_use_enable qt4 QT_IM_MODULE)
-		$(cmake-utils_use_enable qt4 QT_GUI)
-		$(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_use_enable xml LIBXML2)"
-	if use gtk || use gtk3 || use qt4 ; then
-		mycmakeargs+=" -DENABLE_GLIB2=ON "
-	fi
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	rm -rf "${ED}"/usr/share/doc/${PN} || die
-	use autostart && readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	use autostart && readme.gentoo_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	use gtk && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-}

diff --git a/app-i18n/fcitx/files/fcitx-4.2.7-gcc46-compatible.patch b/app-i18n/fcitx/files/fcitx-4.2.7-gcc46-compatible.patch
deleted file mode 100644
index 218f0e8..0000000
--- a/app-i18n/fcitx/files/fcitx-4.2.7-gcc46-compatible.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 4c703e395b55e939f3ac1e4a4bf5cd36aa5b0abc Mon Sep 17 00:00:00 2001
-From: Weng Xuetian <wengxt@×××××.com>
-Date: Sat, 26 Jan 2013 14:40:00 -0500
-Subject: [PATCH] [fcitx] fix compatible with gcc 4.6
-
----
- src/lib/fcitx/module.h |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/lib/fcitx/module.h b/src/lib/fcitx/module.h
-index 28de64f..bae6601 100644
---- a/src/lib/fcitx/module.h
-+++ b/src/lib/fcitx/module.h
-@@ -109,7 +109,7 @@
-     void* FcitxModuleInvokeFunction(FcitxAddon* addon, int functionId, FcitxModuleFunctionArg args);
- #define FcitxModuleInvokeVaArgs(addon, functionId, ARGV...)             \
-     (FcitxModuleInvokeFunction(addon, functionId,                       \
--                               (FcitxModuleFunctionArg){ .args = {ARGV} }))
-+                               (FcitxModuleFunctionArg){ {ARGV} }))
- 
-     /**
-      * invoke inter module function with addon name, returns NULL when fails (the function itself can also return NULL)
-@@ -133,7 +133,7 @@
- #define InvokeVaArgs(INST, MODULE, FUNC, ARGV...)                       \
-     ((MODULE##_##FUNC##_RETURNTYPE)FcitxModuleInvokeFunctionByName(     \
-         INST, MODULE##_NAME, MODULE##_##FUNC,                           \
--        (FcitxModuleFunctionArg){ .args = {ARGV} }))
-+        (FcitxModuleFunctionArg){ {ARGV} }))
- 
- /** add a function to a addon */
- #define AddFunction(ADDON, Realname)                                    \
-@@ -215,7 +215,7 @@
-     }
- 
- #define FCITX_DEF_MODULE_ARGS(var, ARGV...)             \
--    FcitxModuleFunctionArg var = { .args = {ARGV} }
-+    FcitxModuleFunctionArg var = { {ARGV} }
-     /* void *__##var##_array[] = {ARGV};                                   \ */
-     /* size_t __##var##_length = sizeof(__##var##_array) / sizeof(void*);  \ */
-     /* FcitxModuleFunctionArg var[] = { { .n = __##var##_length,           \ */
--- 
-1.7.10
-

diff --git a/app-i18n/fcitx/metadata.xml b/app-i18n/fcitx/metadata.xml
index 11e641c..57a8af8 100644
--- a/app-i18n/fcitx/metadata.xml
+++ b/app-i18n/fcitx/metadata.xml
@@ -18,7 +18,6 @@
 		<flag name="opencc">Enable OpenCC engine (using <pkg>app-i18n/opencc</pkg>) for converter between Simplified Chinese and Traditional Chinese</flag>
 		<flag name="pango">Enable support for <pkg>x11-libs/pango</pkg></flag>
 		<flag name="qt4">Install input method module for Qt 4</flag>
-		<flag name="snooper">Enable key snooper for GTK+ applications</flag>
 		<flag name="table">Install table input methods for Simplified Chinese</flag>
 	</use>
 </pkgmetadata>