Version bumped, Removed old versions.

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

5 files changed, 85 insertions, 79 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/Manifest b/app-i18n/fcitx/Manifest
index f66a62d9fbea..83f60b3205de 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,12 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fcitx-3.5_pre070703-asneeded.patch 359 RMD160 fb2de1bb3d20bd1a72b50caae2344616f33f9fb2 SHA1 e1a31ec925f6e14d2c4f43e38ab84008d239fd4f SHA256 ed671bac0442310f26c2756f21df665a9206f225ad06c643c00f660f0ca9979b
 AUX fcitx-3.6.2-asneeded.patch 831 RMD160 63033110b1f779d951d7dcfa0ccc20a07ae65fdc SHA1 e63fdec28dc860f6c45ae0a243814aec9e267692 SHA256 ffe6a448bfc4d473f68b01eb0fa7a3f49594f100ab5fc820cb004d308e92c92e
+AUX fcitx-3.6.3-asneeded.patch 1138 RMD160 952408d89d1b7e25a5c6504ed9e32b8b8124f9af SHA1 64b1b93282e844805e4a7ed7709dbedf10582eb2 SHA256 67a1649517a02ac1d3a04187ba7cde5d09f363d12556e9b61d364fe04d44a8ca
 DIST fcitx-3.1.1.tar.bz2 2920856 RMD160 229155ec71deb189ffc52851ee9a242ba9192a5b SHA1 3d23a0786edd6ff6e69d353692849d9041442038 SHA256 011863a2964e64b89f2eabf1f98bed2caf8201e4a998847ffff55098dc7dadaa
-DIST fcitx-3.5-BlackFri.tar.bz2 5719492 RMD160 24f3494247651e21fb9f48fc618ec2d8306090ea SHA1 9ed191dcab5c0877654e0c3adad77ffe0e8ba47f SHA256 07dfb11655097a15be57f38d33ef04c5db98adb7eb5c3326d9ed1acdf3bc80be
-DIST fcitx-3.6.1.tar.bz2 6347872 RMD160 e60e398c3db0de795e48fee0b8ba27f0f2817b30 SHA1 a01b9e7c19855da149b019acf7cd84b3b8a48931 SHA256 0b8a4de36d44ea28f31008c6f997843e1dc56be25246264f3a3dcf79a3ade22a
 DIST fcitx-3.6.2.tar.bz2 6347362 RMD160 e7dde0ab977c0e27d30430a442afde8da28ff675 SHA1 3772b0883725c0fc3a9fe189db2dc7ff3b2de89c SHA256 8f757cfb7e1611546f6e736424826c45c5811492d5fc1920ec9cbc6735210e08
+DIST fcitx-3.6.3.tar.bz2 6385159 RMD160 f4fc3033da09a9fb1ca6d1c4ee06dcc9d169d5ad SHA1 ab3af3cdaba32ac9ff054b1964a483ca07b427dd SHA256 e986f1223d758d57b87e74b75dd9b635366ee4bf6ea90779f5a48e44498de5b5
 EBUILD fcitx-3.1.1.ebuild 1425 RMD160 a9b6c39ec2cc01c3fb0a484b18aca74ac055ddf5 SHA1 b353a37e751f3a17f45649b51e728c8e66501614 SHA256 f1c7ccb3acd095227284c074a0817529fc66472f968815d031f4aedbc64498df
-EBUILD fcitx-3.5.ebuild 1442 RMD160 302d424e374bede65a58e99240440d657754e411 SHA1 41aec05fb8a5ee09bf168371f3e3ca39fc1afabe SHA256 0516ca6fc217297653d148cb9c65a0c16468c931ea51e19cc04094b76075e933
-EBUILD fcitx-3.6.1.ebuild 1391 RMD160 71ebb6fcc2c38a6d95954796d842eab440588fd6 SHA1 9b7dfea9028a8962a4400fd8e1654c8dd22dc062 SHA256 dcae83c5af3c732ec207e2aff5316916ad91850c63ae87dbbbbfc0eb4e281e9f
 EBUILD fcitx-3.6.2.ebuild 1494 RMD160 75f6542a7dc9d4772c2b1771559a4926cde2ad49 SHA1 1fa49cbe30fb5a1e74698cd4194a52891a5add42 SHA256 bc3f2146dc3393f68f0bb00e90fa6078ca2c7c3d018e3a87578079cc5c4286d8
-MISC ChangeLog 4476 RMD160 a670751c36c16aca54aa306776d53e20f7924525 SHA1 a07129eaf5fed3d3dadaf1936bfea688e7aa7d15 SHA256 dc9048811908d1de6f450979715d1af4b90a1fbc7ad2246cf0e97f5060bd3ce9
+EBUILD fcitx-3.6.3.ebuild 1563 RMD160 83cdd503486c77598ce10172ae1575c0884dd259 SHA1 189ce3007be61209e8f6e3426e1d0bab0e7d0c60 SHA256 2738cf072a9338e1c63504318fd4a7f6db6440a7c004d7d48a8cb8eb7115559d
+MISC ChangeLog 4691 RMD160 223280e6a86ea7366089c69d2b79c1c4fa1e8596 SHA1 009b9bf0d4f0686a898eb19badd35859e90754e4 SHA256 285c244aeb34e14df026bec9c5a4ebb4e79340d6e11badc87345cbd6df1b88f2
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAEBAgAGBQJLd324AAoJECaGw+YFKA1pTM8P/2WeqsgE0kMFZ4cwVjP+IuV+
+V1D67ckV99youFeMdgaPeLF/cDY4ZGU0b5Mc4W/y7n9GmVCTYpHyKBf3YRzHUV6s
+nSazVUNADiBr5UwZ8UxJErrCEXDsyxbUBWqTKMyJJn4lUu3ds+NCUi+cFcayZqFI
+qxx7KMV71IorQCyeaBRvi7nwMB58GmOHVU96ExrY2lS0A4A3CbOLEp/cbtX13KnN
+cdNq2zNRG3DgVx8SBkOQ48y4w0UUg+DHyEeHAOOtWPMEJd9r9rhUZko40pYhD3SV
+QMKb8dv8j9gC/gGyhH/rf90gPtMPPsux7O4xip5My4SN1C3qjcnyqthOFa4oZnDY
+XrOFA4HvoqUvm/NlzYVP4MZa3MgEAsGvAgY/8uvcKVUUubWOaq0iAhgawEQAxFYT
+4JfaB8MdQysBfmzy6nec7fWNgFfP1IhEnzktdJfPrQbNRhBd6wiWTT+AX5dIUkIi
+ozOHxMaE9QWPIDXUK5dTWKhgBeEneJY2d+rssEw3tiA1ivYkswz8DC7tae75mu2i
+5NHZUGzv3a0JLxgDuqghUD2jBLZuxVcfmpQ+Or9XdNcuyWosalsvlXesmedGhjKP
+cqS0kHN+0Xq26YT/1okiOVykJvF4aqv26atx+JyMLV8tFFpSsvgzj0osfrJKtSoE
+9sdAqMthKcVyIaBh2O1L
+=VM2q
+-----END PGP SIGNATURE-----
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