Version bumped. Fixed dependency, bug #205051.

(Portage version: 2.1.3.19)

10 files changed, 29 insertions, 112 deletions

diff --git a/app-i18n/fcitx/ChangeLog b/app-i18n/fcitx/ChangeLog
index e412eabf7875..db1c2aad3b52 100644
--- a/app-i18n/fcitx/ChangeLog
+++ b/app-i18n/fcitx/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-i18n/fcitx
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.20 2007/07/22 09:11:42 calchan Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.21 2008/01/19 01:13:34 matsuu Exp $
+
+*fcitx-3.5_pre070703 (19 Jan 2008)
+
+  19 Jan 2008; MATSUU Takuto <matsuu@gentoo.org> fcitx-3.1.1.ebuild,
+  -fcitx-3.2.1.ebuild, -fcitx-3.4.ebuild, fcitx-3.4.2.ebuild,
+  -fcitx-3.5_pre070403.ebuild, +fcitx-3.5_pre070703.ebuild:
+  Version bumped.
+  Fixed dependency, bug #205051.
+  Removed old versions.
 
   22 Jul 2007; Denis Dupeyron <calchan@gentoo.org> fcitx-3.1.1.ebuild,
   fcitx-3.2.1.ebuild, fcitx-3.4.ebuild:
diff --git a/app-i18n/fcitx/fcitx-3.1.1.ebuild b/app-i18n/fcitx/fcitx-3.1.1.ebuild
index 24266df4a5b1..ad5dbfa96de0 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-2007 Gentoo Foundation
+# 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.1.1.ebuild,v 1.8 2007/07/22 09:11:42 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-3.1.1.ebuild,v 1.9 2008/01/19 01:13:34 matsuu Exp $
 
 DESCRIPTION="Free Chinese Input Toy for X. Another Chinese XIM Input Method"
 HOMEPAGE="http://www.fcitx.org/"
@@ -12,6 +12,7 @@ KEYWORDS="~ppc x86"
 IUSE="truetype"
 
 RDEPEND="x11-libs/libX11
+	x11-libs/libXpm
 	x11-libs/libXrender
 	x11-libs/libXt
 	truetype? ( || ( x11-libs/libXft virtual/xft ) )"
diff --git a/app-i18n/fcitx/fcitx-3.2.1.ebuild b/app-i18n/fcitx/fcitx-3.2.1.ebuild
deleted file mode 100644
index f983b906ca42..000000000000
--- a/app-i18n/fcitx/fcitx-3.2.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-3.2.1.ebuild,v 1.4 2007/07/22 09:11:42 calchan Exp $
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="truetype"
-
-DEPEND="x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/libXt
-	truetype? ( || ( x11-libs/libXft virtual/xft ) )"
-
-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 doc/fcitx3.pdf
-	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 ""
-	elog "Note that fcitx only works in the zh_CN locale."
-}
diff --git a/app-i18n/fcitx/fcitx-3.4.2.ebuild b/app-i18n/fcitx/fcitx-3.4.2.ebuild
index 341599a67717..bb7012ecac48 100644
--- a/app-i18n/fcitx/fcitx-3.4.2.ebuild
+++ b/app-i18n/fcitx/fcitx-3.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.1 2007/04/27 16:53:30 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-3.4.2.ebuild,v 1.2 2008/01/19 01:13:34 matsuu Exp $
 
 DESCRIPTION="Free Chinese Input Toy for X. Another Chinese XIM Input Method"
 HOMEPAGE="http://www.fcitx.org/"
@@ -11,10 +11,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="truetype"
 
-DEPEND="x11-libs/libX11
+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"
diff --git a/app-i18n/fcitx/fcitx-3.4.ebuild b/app-i18n/fcitx/fcitx-3.4.ebuild
deleted file mode 100644
index 83dea6e71899..000000000000
--- a/app-i18n/fcitx/fcitx-3.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-3.4.ebuild,v 1.3 2007/07/22 09:11:42 calchan Exp $
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="truetype"
-
-DEPEND="x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/libXt
-	truetype? ( || ( x11-libs/libXft virtual/xft ) )"
-
-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_pre070403.ebuild b/app-i18n/fcitx/fcitx-3.5_pre070703.ebuild
index cb8544deb655..2e61927ae85f 100644
--- a/app-i18n/fcitx/fcitx-3.5_pre070403.ebuild
+++ b/app-i18n/fcitx/fcitx-3.5_pre070703.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.5_pre070403.ebuild,v 1.1 2007/04/27 16:53:30 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-3.5_pre070703.ebuild,v 1.1 2008/01/19 01:13:34 matsuu Exp $
 
 DESCRIPTION="Free Chinese Input Toy for X. Another Chinese XIM Input Method"
 HOMEPAGE="http://www.fcitx.org/"
@@ -11,10 +11,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="truetype"
 
-DEPEND="x11-libs/libX11
+RDEPEND="x11-libs/libX11
+	x11-libs/libXpm
 	x11-libs/libXrender
 	x11-libs/libXt
 	truetype? ( x11-libs/libXft )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 S="${WORKDIR}/${P/_pre*}"
 
diff --git a/app-i18n/fcitx/files/digest-fcitx-3.2.1 b/app-i18n/fcitx/files/digest-fcitx-3.2.1
deleted file mode 100644
index 2a3a32580139..000000000000
--- a/app-i18n/fcitx/files/digest-fcitx-3.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 07be1eaabfb52ad5ce2386e89d4160ae fcitx-3.2.1.tar.bz2 3089016
-RMD160 bacf04d7bdab5e73d13ad0e73e187e5fa678acc9 fcitx-3.2.1.tar.bz2 3089016
-SHA256 f77eacf1326c7764fd2773b18cf64f577a8de41fbbc336da9b5da39e90327325 fcitx-3.2.1.tar.bz2 3089016
diff --git a/app-i18n/fcitx/files/digest-fcitx-3.4 b/app-i18n/fcitx/files/digest-fcitx-3.4
deleted file mode 100644
index 04ad19fa0a0d..000000000000
--- a/app-i18n/fcitx/files/digest-fcitx-3.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f0a8563c15190d5ef4d04625a82df089 fcitx-3.4.tar.bz2 3155926
-RMD160 207018b661840a140637111328e4b6a0a68a1118 fcitx-3.4.tar.bz2 3155926
-SHA256 5780e417fd921b6532d5dd9a4711f6e27bb7d0ff539d83b89887da4580712521 fcitx-3.4.tar.bz2 3155926
diff --git a/app-i18n/fcitx/files/digest-fcitx-3.5_pre070403 b/app-i18n/fcitx/files/digest-fcitx-3.5_pre070403
deleted file mode 100644
index be2c6c9e2876..000000000000
--- a/app-i18n/fcitx/files/digest-fcitx-3.5_pre070403
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1acf177eef8ad4ba46417350f4c6bb74 fcitx-3.5-070403.tar.bz2 3900539
-RMD160 cf8b46ef7dc8af194c42c171a2d54caefcfccd79 fcitx-3.5-070403.tar.bz2 3900539
-SHA256 2661f133094dd3f963a6ea7d3998f713b9fd043b805aa60cc2b6a181f645491c fcitx-3.5-070403.tar.bz2 3900539
diff --git a/app-i18n/fcitx/files/digest-fcitx-3.5_pre070703 b/app-i18n/fcitx/files/digest-fcitx-3.5_pre070703
new file mode 100644
index 000000000000..03e3fc058ef0
--- /dev/null
+++ b/app-i18n/fcitx/files/digest-fcitx-3.5_pre070703
@@ -0,0 +1,3 @@
+MD5 1023b3febc5660101d75eb57b8948f69 fcitx-3.5-070703.tar.bz2 4711773
+RMD160 28b78b57c4afc9a73f6f30ad009a2ff720494184 fcitx-3.5-070703.tar.bz2 4711773
+SHA256 4101461a86e4af16bdc238ef06cca17efc176bd599dca5765f8606eb7973076f fcitx-3.5-070703.tar.bz2 4711773