Version bumped, Removed old versions.

(Portage version: 2.1.7.17/cvs/Linux x86_64)

4 files changed, 61 insertions, 74 deletions

diff --git a/app-i18n/fcitx/ChangeLog b/app-i18n/fcitx/ChangeLog
index 23eb44b7b1d5..278e381e92a3 100644
--- a/app-i18n/fcitx/ChangeLog
+++ b/app-i18n/fcitx/ChangeLog
@@ -1,6 +1,13 @@
 # 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.29 2010/02/06 15:36:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.30 2010/02/14 04:35:54 matsuu Exp $
+
+*fcitx-3.6.3 (14 Feb 2010)
+
+  14 Feb 2010; MATSUU Takuto <matsuu@gentoo.org> -fcitx-3.5.ebuild,
+  -fcitx-3.6.1.ebuild, +fcitx-3.6.3.ebuild,
+  +files/fcitx-3.6.3-asneeded.patch:
+  Version bumped, Removed old versions.
 
   06 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> fcitx-3.6.2.ebuild,
   +files/fcitx-3.6.2-asneeded.patch:
diff --git a/app-i18n/fcitx/fcitx-3.5.ebuild b/app-i18n/fcitx/fcitx-3.5.ebuild
deleted file mode 100644
index 70a876d8f38a..000000000000
--- a/app-i18n/fcitx/fcitx-3.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-3.5.ebuild,v 1.2 2009/01/06 17:16:19 matsuu Exp $
-
-inherit autotools
-
-DESCRIPTION="Free Chinese Input Toy for X. Another Chinese XIM Input Method"
-HOMEPAGE="http://fcitx.net/"
-SRC_URI="http://mirrors.redv.com/fcitx/${P}-BlackFri.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="xft"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXrender
-	x11-libs/libXt
-	xft? ( x11-libs/libXft )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${P/_pre*}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}_pre070703-asneeded.patch
-	eautomake
-}
-
-src_compile() {
-	econf $(use_enable xft) || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog README THANKS TODO
-
-	rm -rf "${D}"/usr/share/fcitx/doc/
-	dodoc doc/pinyin.txt doc/cjkvinput.txt
-	dohtml doc/wb_fh.htm
-}
-
-pkg_postinst() {
-	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 or ErBi"
-	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-3.6.1.ebuild b/app-i18n/fcitx/fcitx-3.6.3.ebuild
index 98a89e97c67c..174137e328f3 100644
--- a/app-i18n/fcitx/fcitx-3.6.1.ebuild
+++ b/app-i18n/fcitx/fcitx-3.6.3.ebuild
@@ -1,6 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.1.ebuild,v 1.1 2009/09/16 17:36:33 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-3.6.3.ebuild,v 1.1 2010/02/14 04:35:54 matsuu Exp $
+
+EAPI=2
+inherit autotools eutils
 
 DESCRIPTION="Free Chinese Input Toy for X. Another Chinese XIM Input Method"
 HOMEPAGE="http://www.fcitx.org/"
@@ -9,31 +12,39 @@ SRC_URI="http://www.fcitx.org/download/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="xft"
+IUSE="dbus"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
 	x11-libs/libXrender
 	x11-libs/libXt
-	xft? ( x11-libs/libXft )"
+	x11-libs/libXtst
+	x11-libs/libXext
+	x11-libs/libXft
+	dbus? ( >=sys-apps/dbus-0.2 )"
 DEPEND="${RDEPEND}
+	x11-proto/xproto
 	dev-util/pkgconfig"
 
-src_compile() {
-	econf $(use_enable xft) || die "configure failed"
-	emake || die "make failed"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-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
+	dodoc AUTHORS ChangeLog README THANKS TODO || die
 
-	# Remove empty directory
-	rmdir "${D}"/usr/share/fcitx/xpm
-	rm -rf "${D}"/usr/share/fcitx/doc/
-	dodoc doc/pinyin.txt doc/cjkvinput.txt
-	dohtml doc/wb_fh.htm
+	rm -rf "${D}"/usr/share/fcitx/doc/ || die
+	dodoc doc/pinyin.txt doc/cjkvinput.txt || die
+	dohtml doc/wb_fh.htm || die
 }
 
 pkg_postinst() {
diff --git a/app-i18n/fcitx/files/fcitx-3.6.3-asneeded.patch b/app-i18n/fcitx/files/fcitx-3.6.3-asneeded.patch
new file mode 100644
index 000000000000..fe2dcedfb984
--- /dev/null
+++ b/app-i18n/fcitx/files/fcitx-3.6.3-asneeded.patch
@@ -0,0 +1,29 @@
+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