Version bumped, bug #301795. Removed old versions and unused files, bug #342539.

(Portage version: 2.1.9.24/cvs/Linux x86_64)

6 files changed, 76 insertions, 47 deletions

diff --git a/app-i18n/fcitx/ChangeLog b/app-i18n/fcitx/ChangeLog
index 278e381e92a3..04fe6e82aa22 100644
--- a/app-i18n/fcitx/ChangeLog
+++ b/app-i18n/fcitx/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-i18n/fcitx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.30 2010/02/14 04:35:54 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.31 2010/11/27 07:05:07 matsuu Exp $
+
+*fcitx-4.0.0 (27 Nov 2010)
+*fcitx-3.6.4 (27 Nov 2010)
+
+  27 Nov 2010; MATSUU Takuto <matsuu@gentoo.org>
+  -files/fcitx-3.5_pre070703-asneeded.patch, -fcitx-3.6.2.ebuild,
+  -files/fcitx-3.6.2-asneeded.patch, +fcitx-3.6.4.ebuild, +fcitx-4.0.0.ebuild:
+  Version bumped, bug #301795. Removed old versions and unused files, bug
+  #342539.
 
 *fcitx-3.6.3 (14 Feb 2010)
 
diff --git a/app-i18n/fcitx/fcitx-3.6.2.ebuild b/app-i18n/fcitx/fcitx-3.6.4.ebuild
index 41ddf3d09235..9c2a26010856 100644
--- a/app-i18n/fcitx/fcitx-3.6.2.ebuild
+++ b/app-i18n/fcitx/fcitx-3.6.4.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-3.6.2.ebuild,v 1.2 2010/02/06 15:36:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-3.6.4.ebuild,v 1.1 2010/11/27 07:05:07 matsuu 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://www.fcitx.org/download/${P}.tar.bz2"
+SRC_URI="http://fcitx.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
+IUSE="dbus"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
@@ -20,19 +20,21 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libXtst
 	x11-libs/libXext
-	x11-libs/libXft"
+	x11-libs/libXft
+	dbus? ( >=sys-apps/dbus-0.2 )"
 DEPEND="${RDEPEND}
+	x11-proto/xproto
 	dev-util/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-asneeded.patch
+	epatch "${FILESDIR}"/${PN}-3.6.3-asneeded.patch
 	eautoreconf
 }
 
 src_configure() {
 	# --disable-xft doesn't work
 	# econf $(use_enable xft) || die
-	econf || die
+	econf $(use_enable dbus) || die
 }
 
 src_install() {
diff --git a/app-i18n/fcitx/fcitx-4.0.0.ebuild b/app-i18n/fcitx/fcitx-4.0.0.ebuild
new file mode 100644
index 000000000000..0d21a9b90f3e
--- /dev/null
+++ b/app-i18n/fcitx/fcitx-4.0.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.0.0.ebuild,v 1.1 2010/11/27 07:05:07 matsuu Exp $
+
+EAPI="3"
+
+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 ~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
+	dev-util/pkgconfig"
+
+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/files/fcitx-3.5_pre070703-asneeded.patch b/app-i18n/fcitx/files/fcitx-3.5_pre070703-asneeded.patch
deleted file mode 100644
index b1c012b1546b..000000000000
--- a/app-i18n/fcitx/files/fcitx-3.5_pre070703-asneeded.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: fcitx-3.5/src/Makefile.am
-===================================================================
---- fcitx-3.5.orig/src/Makefile.am
-+++ fcitx-3.5/src/Makefile.am
-@@ -32,5 +32,4 @@ fcitx_SOURCES = IC.c IC.h \
- 		fcitx.h extra.c extra.h \
- 		internalVersion.c
- 		
--fcitx_LDADD = ../lib/libXimd.a
--fcitx_LDFLAGS = -lXpm
-+fcitx_LDADD = ../lib/libXimd.a -lXpm
diff --git a/app-i18n/fcitx/files/fcitx-3.6.2-asneeded.patch b/app-i18n/fcitx/files/fcitx-3.6.2-asneeded.patch
deleted file mode 100644
index d83f4773d58d..000000000000
--- a/app-i18n/fcitx/files/fcitx-3.6.2-asneeded.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=276302
-
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -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
-@@ -34,5 +34,4 @@
- 		fcitx.h extra.c extra.h \
- 		internalVersion.c
- 		
--fcitx_LDADD = ../lib/libXimd.a
--fcitx_LDFLAGS = -lXpm -lXtst
-+fcitx_LDADD = ../lib/libXimd.a -lXpm -lXtst -lXext
---- lib/Makefile.am
-+++ lib/Makefile.am
-@@ -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 --git a/app-i18n/fcitx/metadata.xml b/app-i18n/fcitx/metadata.xml
index 2d5852c16c60..097e29a576a7 100644
--- a/app-i18n/fcitx/metadata.xml
+++ b/app-i18n/fcitx/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>cjk</herd>
+<use>
+  <flag name='pango'>Enable support for <pkg>x11-libs/pango</pkg></flag>
+</use>
 </pkgmetadata>