Remove old versions; enable snooper by default when gtk and/or gtk3 is enabled as per upstream recommendation

(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 0x2B2474AD43CE296E!)

12 files changed, 18 insertions, 494 deletions

diff --git a/app-i18n/fcitx/ChangeLog b/app-i18n/fcitx/ChangeLog
index 6e0812d8cbf4..a011e7e3f0a4 100644
--- a/app-i18n/fcitx/ChangeLog
+++ b/app-i18n/fcitx/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-i18n/fcitx
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.66 2013/07/24 09:04:59 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.67 2013/07/24 10:04:25 yngwin Exp $
+
+  24 Jul 2013; Ben de Groot <yngwin@gentoo.org> -fcitx-3.6.4.ebuild,
+  -fcitx-4.0.1.ebuild, -fcitx-4.2.5.ebuild, -fcitx-4.2.6.1.ebuild,
+  -files/fcitx-3.6.3-asneeded.patch, -files/fcitx-4.0.1-fix-pango.patch,
+  -files/fcitx-4.2.0-fix-pango.patch, -files/fcitx-4.2.3-fix-lua.patch,
+  -files/fcitx-4.2.6.1-offline.patch, fcitx-4.2.7-r1.ebuild,
+  fcitx-4.2.8.1.ebuild:
+  Remove old versions; enable snooper by default when gtk and/or gtk3 is enabled
+  as per upstream recommendation
 
 *fcitx-4.2.8.1 (24 Jul 2013)
 
diff --git a/app-i18n/fcitx/fcitx-3.6.4.ebuild b/app-i18n/fcitx/fcitx-3.6.4.ebuild
deleted file mode 100644
index ce4adbdb1b4a..000000000000
--- a/app-i18n/fcitx/fcitx-3.6.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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-3.6.4.ebuild,v 1.2 2012/05/03 19:24:26 jdhore Exp $
-
-EAPI=2
-inherit autotools 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.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="dbus"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXtst
-	x11-libs/libXext
-	x11-libs/libXft
-	dbus? ( >=sys-apps/dbus-0.2 )"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.6.3-asneeded.patch
-	eautoreconf
-}
-
-src_configure() {
-	# --disable-xft doesn't work
-	# econf $(use_enable xft) || die
-	econf $(use_enable dbus) || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog README THANKS TODO || die
-
-	rm -rf "${D}"/usr/share/fcitx/doc/ || die
-	dodoc doc/pinyin.txt doc/cjkvinput.txt || die
-	dohtml doc/wb_fh.htm || die
-}
-
-pkg_postinst() {
-	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
-	elog "If you want to use WuBi ,ErBi or something else."
-	elog " mkdir -p ~/.fcitx"
-	elog " cp /usr/share/fcitx/data/wbx.mb ~/.fcitx"
-	elog " cp /usr/share/fcitx/data/erbi.mb ~/.fcitx"
-	elog " cp /usr/share/fcitx/data/tables.conf ~/.fcitx"
-	elog
-}
diff --git a/app-i18n/fcitx/fcitx-4.0.1.ebuild b/app-i18n/fcitx/fcitx-4.0.1.ebuild
deleted file mode 100644
index a75332a51f59..000000000000
--- a/app-i18n/fcitx/fcitx-4.0.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.0.1.ebuild,v 1.5 2012/05/18 14:21:32 josejx Exp $
-
-EAPI="3"
-
-inherit 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}_all.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="dbus pango"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/cairo[X]
-	media-libs/fontconfig
-	pango? ( x11-libs/pango )
-	dbus? ( >=sys-apps/dbus-0.2 )"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	virtual/pkgconfig"
-
-src_prepare() {
-	# fix a bug when compiling without pango
-	epatch "${FILESDIR}/${P}-fix-pango.patch"
-}
-
-src_configure() {
-	econf \
-		$(use_enable dbus) \
-		$(use_enable pango) || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	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() {
-	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
-	elog "If you want to use WuBi ,ErBi or something else."
-	elog " mkdir -p ~/.fcitx"
-	elog " cp /usr/share/fcitx/data/wbx.mb ~/.fcitx"
-	elog " cp /usr/share/fcitx/data/erbi.mb ~/.fcitx"
-	elog " cp /usr/share/fcitx/data/tables.conf ~/.fcitx"
-	elog
-}
diff --git a/app-i18n/fcitx/fcitx-4.2.5.ebuild b/app-i18n/fcitx/fcitx-4.2.5.ebuild
deleted file mode 100644
index a415e218ee67..000000000000
--- a/app-i18n/fcitx/fcitx-4.2.5.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2013 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.4 2013/04/21 10:04:51 lxnay Exp $
-
-EAPI=4
-
-inherit multilib cmake-utils gnome2-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? (
-		dev-qt/qtgui:4
-		dev-qt/qtdbus: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"
-
-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 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	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 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-}
diff --git a/app-i18n/fcitx/fcitx-4.2.6.1.ebuild b/app-i18n/fcitx/fcitx-4.2.6.1.ebuild
deleted file mode 100644
index e20bf431777f..000000000000
--- a/app-i18n/fcitx/fcitx-4.2.6.1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.6.1.ebuild,v 1.5 2013/04/21 10:04:51 lxnay Exp $
-
-EAPI=4
-
-inherit multilib cmake-utils gnome2-utils eutils
-
-_en_dict_version=20121020  # see https://code.google.com/p/fcitx/downloads/list
-
-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
-		http://fcitx.googlecode.com/files/en_dict-${_en_dict_version}.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 icu introspection lua opencc +pango qt4 snooper static-libs +table test +xml"
-
-RDEPEND="sys-apps/dbus
-	x11-libs/libX11
-	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
-	)
-	icu? ( dev-libs/icu )
-	introspection? ( dev-libs/gobject-introspection )
-	lua? ( dev-lang/lua )
-	opencc? ( app-i18n/opencc )
-	qt4? (
-		dev-qt/qtgui:4
-		dev-qt/qtdbus:4
-	)
-	xml? (
-		app-text/iso-codes
-		dev-libs/libxml2
-		x11-libs/libxkbfile
-	)"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	app-text/enchant
-	dev-util/intltool
-	virtual/pkgconfig
-	x11-proto/xproto"
-
-src_prepare() {
-	cp "${DISTDIR}/pinyin.tar.gz" "${S}/data" || die "pinyin data file is not found"
-	cp "${DISTDIR}/en_dict-${_en_dict_version}.tar.gz" "${S}/data" \
-		|| die "en_dict-${_en_dict_version} data file is not found"
-	if use table ; then
-		cp "${DISTDIR}/table.tar.gz" "${S}/data/table" \
-			|| die "table data file is not found"
-	fi
-	epatch "${FILESDIR}/${P}-offline.patch"
-	sed -e "s/20120815/${_en_dict_version}/" -i data/CMakeLists.txt || die 'sed failed'
-	epatch_user
-}
-
-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 icu ICU)
-		$(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_use_enable xml LIBXML2)"
-	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 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-	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 && gnome2_query_immodules_gtk2
-	use gtk3 && gnome2_query_immodules_gtk3
-}
diff --git a/app-i18n/fcitx/fcitx-4.2.7-r1.ebuild b/app-i18n/fcitx/fcitx-4.2.7-r1.ebuild
index 9c4bfc8561f3..691110974f59 100644
--- a/app-i18n/fcitx/fcitx-4.2.7-r1.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.7-r1.ebuild,v 1.2 2013/07/10 04:46:31 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.7-r1.ebuild,v 1.3 2013/07/24 10:04:25 yngwin Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ 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"
+nls opencc +pango qt4 static-libs +table test +xml"
 
 RDEPEND="
 	X? (
@@ -83,7 +83,9 @@ src_configure() {
 		$(cmake-utils_use_enable debug DEBUG)
 		$(cmake-utils_use_enable enchant ENCHANT)
 		$(cmake-utils_use_enable gtk GTK2_IM_MODULE)
+		$(cmake-utils_use_enable gtk SNOOPER)
 		$(cmake-utils_use_enable gtk3 GTK3_IM_MODULE)
+		$(cmake-utils_use_enable gtk3 SNOOPER)
 		$(cmake-utils_use_enable icu ICU)
 		$(cmake-utils_use_enable introspection GIR)
 		$(cmake-utils_use_enable lua LUA)
@@ -93,7 +95,6 @@ src_configure() {
 		$(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)
diff --git a/app-i18n/fcitx/fcitx-4.2.8.1.ebuild b/app-i18n/fcitx/fcitx-4.2.8.1.ebuild
index 8ce57885aa88..cca7fcfaeecc 100644
--- a/app-i18n/fcitx/fcitx-4.2.8.1.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.8.1.ebuild,v 1.1 2013/07/24 09:04:59 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.8.1.ebuild,v 1.2 2013/07/24 10:04:25 yngwin Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ 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"
+nls opencc +pango qt4 static-libs +table test +xml"
 
 RDEPEND="
 	X? (
@@ -79,7 +79,9 @@ src_configure() {
 		$(cmake-utils_use_enable debug DEBUG)
 		$(cmake-utils_use_enable enchant ENCHANT)
 		$(cmake-utils_use_enable gtk GTK2_IM_MODULE)
+		$(cmake-utils_use_enable gtk SNOOPER)
 		$(cmake-utils_use_enable gtk3 GTK3_IM_MODULE)
+		$(cmake-utils_use_enable gtk3 SNOOPER)
 		$(cmake-utils_use_enable icu ICU)
 		$(cmake-utils_use_enable introspection GIR)
 		$(cmake-utils_use_enable lua LUA)
@@ -89,7 +91,6 @@ src_configure() {
 		$(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)
diff --git a/app-i18n/fcitx/files/fcitx-3.6.3-asneeded.patch b/app-i18n/fcitx/files/fcitx-3.6.3-asneeded.patch
deleted file mode 100644
index fe2dcedfb984..000000000000
--- a/app-i18n/fcitx/files/fcitx-3.6.3-asneeded.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur fcitx-3.6.3.orig/lib/Makefile.am fcitx-3.6.3/lib/Makefile.am
---- fcitx-3.6.3.orig/lib/Makefile.am	2004-01-31 05:43:30.000000000 +0900
-+++ fcitx-3.6.3/lib/Makefile.am	2010-02-14 13:22:28.000000000 +0900
-@@ -1,5 +1,5 @@
- noinst_LIBRARIES = libXimd.a
--AM_CFLAGS = -c -O2 -fno-strength-reduce -fno-strict-aliasing
-+AM_CFLAGS = -fno-strength-reduce -fno-strict-aliasing
- libXimd_a_SOURCES = \
-   FrameMgr.c FrameMgr.h i18nAttr.c i18nClbk.c i18nIc.c \
-   i18nIMProto.c i18nMethod.c i18nPtHdr.c i18nUtil.c i18nX.c \
-diff -Naur fcitx-3.6.3.orig/src/Makefile.am fcitx-3.6.3/src/Makefile.am
---- fcitx-3.6.3.orig/src/Makefile.am	2010-01-16 15:17:12.000000000 +0900
-+++ fcitx-3.6.3/src/Makefile.am	2010-02-14 13:23:28.000000000 +0900
-@@ -1,7 +1,7 @@
- DEFS = -DPKGDATADIR=\"$(pkgdatadir)\"
- 
- INCLUDES = -I. -I$(top_srcdir)/lib -I$(top_srcdir)/xpm
--AM_CFLAGS = -O2 -fno-strength-reduce
-+AM_CFLAGS = -fno-strength-reduce
- 
- 
- bin_PROGRAMS = fcitx
-@@ -36,5 +36,4 @@
- 		internalVersion.c \
- 		ImeRemote.c
- 		
--fcitx_LDADD = ../lib/libXimd.a
--fcitx_LDFLAGS = -lXpm -lXtst -lpthread
-+fcitx_LDADD = ../lib/libXimd.a -lXpm -lXtst -lXext -lpthread
diff --git a/app-i18n/fcitx/files/fcitx-4.0.1-fix-pango.patch b/app-i18n/fcitx/files/fcitx-4.0.1-fix-pango.patch
deleted file mode 100644
index 280f8f5bc197..000000000000
--- a/app-i18n/fcitx/files/fcitx-4.0.1-fix-pango.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- fcitx-4.0.1/src/ui/ui.c	2010-12-17 12:20:02.000000000 +0800
-+++ fcitx-4.0.1-patched/src/ui/ui.c	2010-12-19 10:24:26.646000021 +0800
-@@ -986,6 +986,8 @@
-     return desc;
- }
- 
-+#endif
-+
- Visual * FindARGBVisual (Display *dpy, int scr)
- {
-     XVisualInfo *xvi;
-@@ -1018,6 +1020,3 @@
-     XFree (xvi);
-     return visual;
- }
--
--
--#endif
diff --git a/app-i18n/fcitx/files/fcitx-4.2.0-fix-pango.patch b/app-i18n/fcitx/files/fcitx-4.2.0-fix-pango.patch
deleted file mode 100644
index 97b1b69413a1..000000000000
--- a/app-i18n/fcitx/files/fcitx-4.2.0-fix-pango.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/ui/cairostuff/cairostuff.c b/src/ui/cairostuff/cairostuff.c
-index 3c70d99..174b67a 100644
---- a/src/ui/cairostuff/cairostuff.c
-+++ b/src/ui/cairostuff/cairostuff.c
-@@ -80,7 +80,7 @@ StringSizeWithContextReal(cairo_t * c, const char *str, int* w, int* h)
-         if (h) *h = 0;
-         return;
-     }
--    if (!utf8_check_string(str)) {
-+    if (!fcitx_utf8_check_string(str)) {
-         if (w) *w = 0;
-         if (h) *h = 0;
- 
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
deleted file mode 100644
index d08b636c639b..000000000000
--- a/app-i18n/fcitx/files/fcitx-4.2.3-fix-lua.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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);
- 
diff --git a/app-i18n/fcitx/files/fcitx-4.2.6.1-offline.patch b/app-i18n/fcitx/files/fcitx-4.2.6.1-offline.patch
deleted file mode 100644
index 0f27a209809d..000000000000
--- a/app-i18n/fcitx/files/fcitx-4.2.6.1-offline.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- data/CMakeLists.txt.orig	2012-10-29 16:15:27.836112518 +0800
-+++ data/CMakeLists.txt	2012-10-29 16:15:57.249433574 +0800
-@@ -46,7 +46,6 @@
- add_custom_target(pinyin_data ALL DEPENDS ${PY_DATA})
- 
- add_custom_command(OUTPUT ${PY_ORGDATA}
--                   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/download.sh "${WGET}" "${PY_URL}" "${PY_TAR}"
-                    COMMAND ${TAR} xzmvf ${PY_TAR})
- add_custom_command(OUTPUT ${PY_DATA}
-                    DEPENDS ${PY_ORGDATA}
-@@ -80,8 +79,6 @@
- add_custom_target(spell_en_dict ALL DEPENDS ${SPELL_EN_DICT})
- add_custom_command(
-   OUTPUT ${SPELL_EN_DICT_SRC}
--  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/download.sh "${WGET}"
--  "${SPELL_EN_DICT_URL}" "${SPELL_EN_DICT_TAR}"
-   COMMAND "${TAR}" xzmvf "${SPELL_EN_DICT_TAR}")
- 
- set(COMP_SPELL_DICT