Version bumped, bug #253962. Replaced use flag from truetype to xft, bug #253910.

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.28-gentoo x86_64

6 files changed, 39 insertions, 89 deletions

diff --git a/app-i18n/fcitx/ChangeLog b/app-i18n/fcitx/ChangeLog
index 6253c57d5a61..a56b7b347d3c 100644
--- a/app-i18n/fcitx/ChangeLog
+++ b/app-i18n/fcitx/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/fcitx
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.24 2009/01/04 22:34:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.25 2009/01/06 17:16:19 matsuu Exp $
+
+*fcitx-3.6.0_rc (06 Jan 2009)
+
+  06 Jan 2009; MATSUU Takuto <matsuu@gentoo.org> fcitx-3.1.1.ebuild,
+  -fcitx-3.4.2.ebuild, -fcitx-3.5_pre070703.ebuild, fcitx-3.5.ebuild,
+  +fcitx-3.6.0_rc.ebuild:
+  Version bumped, bug #253962. Replaced use flag from truetype to xft, bug
+  #253910. Removed old versions.
 
   04 Jan 2009; Ulrich Mueller <ulm@gentoo.org> fcitx-3.1.1.ebuild:
   Change virtual/xft dependency to x11-libs/libXft, bug 253771.
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index f7127f4b0464..f65118c0f482 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,21 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fcitx-3.5_pre070703-asneeded.patch 359 RMD160 fb2de1bb3d20bd1a72b50caae2344616f33f9fb2 SHA1 e1a31ec925f6e14d2c4f43e38ab84008d239fd4f SHA256 ed671bac0442310f26c2756f21df665a9206f225ad06c643c00f660f0ca9979b
 DIST fcitx-3.1.1.tar.bz2 2920856 RMD160 229155ec71deb189ffc52851ee9a242ba9192a5b SHA1 3d23a0786edd6ff6e69d353692849d9041442038 SHA256 011863a2964e64b89f2eabf1f98bed2caf8201e4a998847ffff55098dc7dadaa
-DIST fcitx-3.4.2.tar.bz2 3155032 RMD160 dcefea101b3674cf5d3e20630b352127a4a15116 SHA1 314d5b7efc5d2144fc958b98c1fc7407d206ab55 SHA256 64d8f4183593c7c3a855b4b1d07afe605d9548cefdbfc07b1d0f79fc3f4c02ed
-DIST fcitx-3.5-070703.tar.bz2 4711773 RMD160 28b78b57c4afc9a73f6f30ad009a2ff720494184 SHA1 aecae215582b84757a15d7bb8a2e4316e3bd1c6f SHA256 4101461a86e4af16bdc238ef06cca17efc176bd599dca5765f8606eb7973076f
 DIST fcitx-3.5-BlackFri.tar.bz2 5719492 RMD160 24f3494247651e21fb9f48fc618ec2d8306090ea SHA1 9ed191dcab5c0877654e0c3adad77ffe0e8ba47f SHA256 07dfb11655097a15be57f38d33ef04c5db98adb7eb5c3326d9ed1acdf3bc80be
-EBUILD fcitx-3.1.1.ebuild 1437 RMD160 ee0d6df473af9cd4930b3cd5d7dad0c84a9fd170 SHA1 7c52f94e978a4b9da1c5d3c98896d8eb85ce1a5c SHA256 0363f80de05ebc537f3c60ec90f039ad6ce0d622c33f831447f9202da373d502
-EBUILD fcitx-3.4.2.ebuild 1302 RMD160 317141ac47fbc70c314e9db53dcac90702f5326e SHA1 4e71d9db5a9ff462365f0f7e11dff53349dd3cc0 SHA256 7cf92f83f8230d754ea2986fece6745c947527d6690d4731e4a7272023786c1d
-EBUILD fcitx-3.5.ebuild 1461 RMD160 a2b61f06f19853ea9a7fe01fcd2d0a14a4f35c38 SHA1 1d4dc86d4451cd96f55efbd4c7c5d2ef9216301f SHA256 ea2beea8259b784b1b55c86bcdc9e3838ca046ba16aae3ef25cc4eb1bfb9d2e2
-EBUILD fcitx-3.5_pre070703.ebuild 1459 RMD160 2c96114ff5b593fb37aa27b89eb6863db84584d2 SHA1 2c1fd8e62d91f6bccf1f1deba1a0be3d2e948fdb SHA256 957dcdfd893d58909eb4e3075c0c4d391d356265584240d4de0c5075e51c8927
-MISC ChangeLog 3655 RMD160 68ac1024c90babeffec1017f93ab7678a19bc00c SHA1 f08c1bad70da8d2c8f330841d64538847b75f7b8 SHA256 e4c3841aa6e37930e21275a09e6dc06f19d8328945a96303c64d0af766024c00
+DIST fcitx-3.6.0-rc.tar.bz2 5989814 RMD160 9a3fc21134967cf22d60ad00660470994d3ebd6e SHA1 55c4c5dfcca3566bff39445174f59e35a1b0be7c SHA256 f13cc325d925dea582d821d1e324505b7eb7964fde4cda72387cb84f6154079a
+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.0_rc.ebuild 1494 RMD160 010000325948eff53cabadaadced84c24ac41485 SHA1 844db9fb89a7d88158542b42c5a3bb9567fa3907 SHA256 837a6209b5c97517c7339395f489f432d522b4472408f92280be5df28a7cc11c
+MISC ChangeLog 3963 RMD160 d2bf03628fc28cf28c0ea1c708962f1664572179 SHA1 97eb72367bd94d621cd14bf99dbcc77e91576094 SHA256 29681492ba369cc13112c3506d3690e2247c38c647f06db57fa3f8d360edf503
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEARECAAYFAklhOasACgkQOeoy/oIi7uw65wCfanvYI7lFB/Nh0bw4pIJs7iJp
-ZqIAoInlhGC5RqDWSbwNuPktsK0QSX9s
-=Bs80
------END PGP SIGNATURE-----
diff --git a/app-i18n/fcitx/fcitx-3.1.1.ebuild b/app-i18n/fcitx/fcitx-3.1.1.ebuild
index 781ea0f1b9cd..4ed5a5262d00 100644
--- a/app-i18n/fcitx/fcitx-3.1.1.ebuild
+++ b/app-i18n/fcitx/fcitx-3.1.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.1.ebuild,v 1.11 2009/01/04 22:34:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-3.1.1.ebuild,v 1.12 2009/01/06 17:16:19 matsuu Exp $
 
 DESCRIPTION="Free Chinese Input Toy for X. Another Chinese XIM Input Method"
 HOMEPAGE="http://fcitx.net/"
@@ -9,18 +9,18 @@ SRC_URI="http://mirrors.redv.com/fcitx/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc x86"
-IUSE="truetype"
+IUSE="xft"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
 	x11-libs/libXrender
 	x11-libs/libXt
-	truetype? ( x11-libs/libXft )"
+	xft? ( x11-libs/libXft )"
 
 DEPEND="${RDEPEND}"
 src_compile() {
 	myconf=
-	if use truetype ; then
+	if use xft ; then
 		myconf=" --with-xft "
 	else
 		myconf=" --disable-xft "
diff --git a/app-i18n/fcitx/fcitx-3.4.2.ebuild b/app-i18n/fcitx/fcitx-3.4.2.ebuild
deleted file mode 100644
index 71ad017a6b21..000000000000
--- a/app-i18n/fcitx/fcitx-3.4.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-3.4.2.ebuild,v 1.3 2008/08/08 23:23:54 matsuu Exp $
-
-DESCRIPTION="Free Chinese Input Toy for X. Another Chinese XIM Input Method"
-HOMEPAGE="http://fcitx.net/"
-SRC_URI="http://mirrors.redv.com/fcitx/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="truetype"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXrender
-	x11-libs/libXt
-	truetype? ( x11-libs/libXft )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-	econf $(use_enable truetype 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.5.ebuild b/app-i18n/fcitx/fcitx-3.5.ebuild
index 265a459de5db..70a876d8f38a 100644
--- a/app-i18n/fcitx/fcitx-3.5.ebuild
+++ b/app-i18n/fcitx/fcitx-3.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.1 2008/08/08 23:23:54 matsuu Exp $
+# $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
 
@@ -11,13 +11,13 @@ SRC_URI="http://mirrors.redv.com/fcitx/${P}-BlackFri.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="truetype"
+IUSE="xft"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
 	x11-libs/libXrender
 	x11-libs/libXt
-	truetype? ( x11-libs/libXft )"
+	xft? ( x11-libs/libXft )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
@@ -32,7 +32,7 @@ src_unpack() {
 }
 
 src_compile() {
-	econf $(use_enable truetype xft) || die "configure failed"
+	econf $(use_enable xft) || die "configure failed"
 	emake || die "make failed"
 }
 
diff --git a/app-i18n/fcitx/fcitx-3.5_pre070703.ebuild b/app-i18n/fcitx/fcitx-3.6.0_rc.ebuild
index 6da74311b43a..5526a05dbf78 100644
--- a/app-i18n/fcitx/fcitx-3.5_pre070703.ebuild
+++ b/app-i18n/fcitx/fcitx-3.6.0_rc.ebuild
@@ -1,38 +1,37 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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_pre070703.ebuild,v 1.3 2008/08/08 23:23:54 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-3.6.0_rc.ebuild,v 1.1 2009/01/06 17:16:19 matsuu Exp $
 
 inherit autotools
 
+MY_P="${P/_/-}"
 DESCRIPTION="Free Chinese Input Toy for X. Another Chinese XIM Input Method"
-HOMEPAGE="http://fcitx.net/"
-SRC_URI="http://mirrors.redv.com/fcitx/${P/_pre/-}.tar.bz2"
+HOMEPAGE="http://fcitx.googlecode.com"
+SRC_URI="http://fcitx.googlecode.com/files/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="truetype"
+IUSE="xft"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXpm
 	x11-libs/libXrender
 	x11-libs/libXt
-	truetype? ( x11-libs/libXft )"
+	xft? ( x11-libs/libXft )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-S="${WORKDIR}/${P/_pre*}"
+S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-	eautomake
+	eautoreconf
 }
 
 src_compile() {
-	econf $(use_enable truetype xft) || die "configure failed"
+	econf $(use_enable xft) || die "configure failed"
 	emake || die "make failed"
 }
 
@@ -41,20 +40,23 @@ src_install() {
 
 	dodoc AUTHORS ChangeLog README THANKS TODO
 
+	# 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
 }
 
 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 or ErBi"
+	elog
+	elog "If you want to use WuBi ,ErBi or something else."
 	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 ""
+	elog
 }