summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-i18n/fcitx')
-rw-r--r--app-i18n/fcitx/ChangeLog10
-rw-r--r--app-i18n/fcitx/fcitx-3.1.1.ebuild8
-rw-r--r--app-i18n/fcitx/fcitx-3.4.2.ebuild48
-rw-r--r--app-i18n/fcitx/fcitx-3.5.ebuild10
-rw-r--r--app-i18n/fcitx/fcitx-3.6.0_rc.ebuild (renamed from app-i18n/fcitx/fcitx-3.5_pre070703.ebuild)30
5 files changed, 34 insertions, 72 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/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
}