9 files changed, 19 insertions, 142 deletions
diff --git a/app-i18n/fcitx/ChangeLog b/app-i18n/fcitx/ChangeLog
index 85ec7e6e3744..a44a9c2fbf37 100644
--- a/app-i18n/fcitx/ChangeLog
+++ b/app-i18n/fcitx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/fcitx
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.11 2005/04/30 09:50:38 dholm Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.12 2006/02/10 18:40:02 liquidx Exp $
+
+  10 Feb 2006; Alastair Tse <liquidx@gentoo.org> -fcitx-1.8.5.ebuild,
+  -fcitx-2.1.0_rc.ebuild, -fcitx-3.0.4.ebuild, fcitx-3.1.1.ebuild:
+  modular X deps. cleanup
 
   30 Apr 2005; David Holm <dholm@gentoo.org> fcitx-3.1.1.ebuild:
   Readded to ~ppc
diff --git a/app-i18n/fcitx/fcitx-1.8.5.ebuild b/app-i18n/fcitx/fcitx-1.8.5.ebuild
deleted file mode 100644
index fd0efb6749f8..000000000000
--- a/app-i18n/fcitx/fcitx-1.8.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-1.8.5.ebuild,v 1.7 2005/01/01 14:27:48 eradicator Exp $
-
-DESCRIPTION="Free Chinese Input Toy for X. Another Chinese XIM Input Method"
-HOMEPAGE="http://www.fcitx.org/"
-SRC_URI="http://www.fcitx.org/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="truetype"
-
-DEPEND="virtual/x11
-	truetype? ( virtual/xft )"
-
-src_compile() {
-	if use truetype; then
-		make -f Makefile.xft || die "xft make failed"
-	else
-		make || die "make failed"
-	fi
-}
-
-src_install() {
-	dobin fcitx
-	insinto /usr/share/fcitx
-	doins data/*.mb
-
-	dodoc doc/ChangLog.txt doc/cjkvinput.txt
-	dohtml doc/*.htm
-}
-
diff --git a/app-i18n/fcitx/fcitx-2.0.1.ebuild b/app-i18n/fcitx/fcitx-2.0.1.ebuild
index 8de7493042bd..c4acb967da1b 100644
--- a/app-i18n/fcitx/fcitx-2.0.1.ebuild
+++ b/app-i18n/fcitx/fcitx-2.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-2.0.1.ebuild,v 1.5 2005/01/01 14:27:48 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-2.0.1.ebuild,v 1.6 2006/02/10 18:40:02 liquidx Exp $
 
 DESCRIPTION="Free Chinese Input Toy for X. Another Chinese XIM Input Method"
 HOMEPAGE="http://www.fcitx.org/"
@@ -11,8 +11,11 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE="truetype"
 
-DEPEND="virtual/x11
-	truetype? ( virtual/xft )"
+RDEPEND="|| ( ( x11-libs/libX11 x11-libs/libXrender x11-libs/libXt )
+		     virtual/x11 )
+	truetype? ( || ( x11-libs/Xft virtual/xft ) )"
+
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-i18n/fcitx/fcitx-2.1.0_rc.ebuild b/app-i18n/fcitx/fcitx-2.1.0_rc.ebuild
deleted file mode 100644
index f9687c446032..000000000000
--- a/app-i18n/fcitx/fcitx-2.1.0_rc.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-2.1.0_rc.ebuild,v 1.4 2005/01/01 14:27:48 eradicator 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="~x86 ~ppc"
-IUSE="truetype"
-
-DEPEND="virtual/x11
-	truetype? ( virtual/xft )"
-
-S="${WORKDIR}/${P/_/}"
-
-src_compile() {
-	econf $(use_with truetype xft) || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc doc/*.txt AUTHORS ChangeLog THANKS
-	dohtml doc/*.htm
-}
-
-pkg_postinst() {
-	einfo "You should export the following variables to use fcitx"
-	einfo " export XMODIFIERS=@im=fcitx"
-	einfo " export XIM=fcitx"
-	einfo " export XIM_PROGRAM=fcitx"
-	einfo " "
-	einfo "Note that fcitx only works in the zh_CN locale."
-}
diff --git a/app-i18n/fcitx/fcitx-3.0.4.ebuild b/app-i18n/fcitx/fcitx-3.0.4.ebuild
deleted file mode 100644
index 5e7502a80a82..000000000000
--- a/app-i18n/fcitx/fcitx-3.0.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-3.0.4.ebuild,v 1.1 2005/03/01 11:28:08 usata 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"
-
-# The HOMEPAGE and SRC_URI cannot be accessed from outside China :-(
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="truetype"
-
-DEPEND="virtual/x11
-	truetype? ( virtual/xft )"
-
-src_compile() {
-	myconf=
-	if use truetype ; then
-		myconf=" --with-xft "
-	else
-		myconf=" --disable-xft "
-	fi
-	econf ${myconf} || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install()
-{
-	dobin src/fcitx
-	insinto /usr/share/fcitx/data
-	doins data/*.mb
-	doins data/*.dat
-	doins data/*.conf
-	insinto /usr/share/fcitx/xpm
-	doins xpm/*.xpm
-	insinto /usr/share/fcitx/doc
-	doins doc/*.txt
-	doins doc/*.htm
-}
-
-pkg_postinst()
-{
-	einfo "You should export the following variables to use fcitx"
-	einfo " export XMODIFIERS=\"@im=fcitx\""
-	einfo " export XIM=fcitx"
-	einfo " export XIM_PROGRAM=fcitx"
-	einfo ""
-	einfo "If you want to use WuBi or ErBi"
-	einfo " cp /usr/share/fcitx/data/wbx.mb ~/.fcitx"
-	einfo " cp /usr/share/fcitx/data/erbi.mb ~/.fcitx"
-	einfo " cp /usr/share/fcitx/data/tables.conf ~/.fcitx"
-	einfo ""
-	einfo "Note that fcitx only works in the zh_CN locale."
-}
diff --git a/app-i18n/fcitx/fcitx-3.1.1.ebuild b/app-i18n/fcitx/fcitx-3.1.1.ebuild
index 5976928aa3c1..29f06d04d201 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-2005 Gentoo Foundation
+# Copyright 1999-2006 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.2 2005/04/30 09:50:38 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-3.1.1.ebuild,v 1.3 2006/02/10 18:40:02 liquidx Exp $
 
 DESCRIPTION="Free Chinese Input Toy for X. Another Chinese XIM Input Method"
 HOMEPAGE="http://www.fcitx.org/"
@@ -14,9 +14,11 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE="truetype"
 
-DEPEND="virtual/x11
-	truetype? ( virtual/xft )"
+RDEPEND="|| ( ( x11-libs/libX11 x11-libs/libXrender x11-libs/libXt )
+		     virtual/x11 )
+	truetype? ( || ( x11-libs/Xft virtual/xft ) )"
 
+DEPEND="${RDEPEND}"
 src_compile() {
 	myconf=
 	if use truetype ; then
diff --git a/app-i18n/fcitx/files/digest-fcitx-1.8.5 b/app-i18n/fcitx/files/digest-fcitx-1.8.5
deleted file mode 100644
index c9966bd44595..000000000000
--- a/app-i18n/fcitx/files/digest-fcitx-1.8.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c2b7c48b906c4812f305fc9f5a605458 fcitx-1.8.5.tar.bz2 948478
diff --git a/app-i18n/fcitx/files/digest-fcitx-2.1.0_rc b/app-i18n/fcitx/files/digest-fcitx-2.1.0_rc
deleted file mode 100644
index 3d47d21e7119..000000000000
--- a/app-i18n/fcitx/files/digest-fcitx-2.1.0_rc
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a6275dc27cb9a23b665d4784db069c18 fcitx-2.1.0rc.tar.bz2 1902399
diff --git a/app-i18n/fcitx/files/digest-fcitx-3.0.4 b/app-i18n/fcitx/files/digest-fcitx-3.0.4
deleted file mode 100644
index c819e6c25f46..000000000000
--- a/app-i18n/fcitx/files/digest-fcitx-3.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e139aebeb9eb45fb61204be18ed40114 fcitx-3.0.4.tar.bz2 2581392