summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatsuu Takuto <matsuu@gentoo.org>2010-11-27 07:05:07 +0000
committerMatsuu Takuto <matsuu@gentoo.org>2010-11-27 07:05:07 +0000
commitecebc18c793fc9cb132abe672b2dec3ab8996d82 (patch)
treec30839c4532b4b087b87e0860f9dcc717274560e /app-i18n/fcitx
parentAdd a patch to fix compilation on ARMv5. Adding to stable candidate and 2 mos... (diff)
downloadhistorical-ecebc18c793fc9cb132abe672b2dec3ab8996d82.tar.gz
historical-ecebc18c793fc9cb132abe672b2dec3ab8996d82.tar.bz2
historical-ecebc18c793fc9cb132abe672b2dec3ab8996d82.zip
Version bumped, bug #301795. Removed old versions and unused files, bug #342539.
Package-Manager: portage-2.1.9.24/cvs/Linux x86_64
Diffstat (limited to 'app-i18n/fcitx')
-rw-r--r--app-i18n/fcitx/ChangeLog11
-rw-r--r--app-i18n/fcitx/Manifest40
-rw-r--r--app-i18n/fcitx/fcitx-3.6.4.ebuild (renamed from app-i18n/fcitx/fcitx-3.6.2.ebuild)14
-rw-r--r--app-i18n/fcitx/fcitx-4.0.0.ebuild55
-rw-r--r--app-i18n/fcitx/files/fcitx-3.5_pre070703-asneeded.patch11
-rw-r--r--app-i18n/fcitx/files/fcitx-3.6.2-asneeded.patch29
-rw-r--r--app-i18n/fcitx/metadata.xml3
7 files changed, 96 insertions, 67 deletions
diff --git a/app-i18n/fcitx/ChangeLog b/app-i18n/fcitx/ChangeLog
index 278e381e92a3..04fe6e82aa22 100644
--- a/app-i18n/fcitx/ChangeLog
+++ b/app-i18n/fcitx/ChangeLog
@@ -1,6 +1,15 @@
# 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.30 2010/02/14 04:35:54 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.31 2010/11/27 07:05:07 matsuu Exp $
+
+*fcitx-4.0.0 (27 Nov 2010)
+*fcitx-3.6.4 (27 Nov 2010)
+
+ 27 Nov 2010; MATSUU Takuto <matsuu@gentoo.org>
+ -files/fcitx-3.5_pre070703-asneeded.patch, -fcitx-3.6.2.ebuild,
+ -files/fcitx-3.6.2-asneeded.patch, +fcitx-3.6.4.ebuild, +fcitx-4.0.0.ebuild:
+ Version bumped, bug #301795. Removed old versions and unused files, bug
+ #342539.
*fcitx-3.6.3 (14 Feb 2010)
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index 83f60b3205de..21b68f775a03 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,31 +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.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
+DIST fcitx-3.6.4.tar.gz 5957000 RMD160 737606d4550bfd96ac8adcdd3fbb658fa1e62a62 SHA1 136e44bcd05d7753377a2809ae28fd78969228dc SHA256 850a13a3d81ba218d02ec9ce508a6378bd874fb8f10f660eb587b2104f34919b
+DIST fcitx-4.0.0_all.tar.gz 7127889 RMD160 4e8640703db0ebd94e55270fcce1e21f60cda81a SHA1 33bab6528fb0cfd6b94ddf96bffed66b4f1a3355 SHA256 28740bafbb76a904a4edb491a8b81bb5a8f2281bbbaff21fdfbc4c44c34ea441
EBUILD fcitx-3.1.1.ebuild 1425 RMD160 a9b6c39ec2cc01c3fb0a484b18aca74ac055ddf5 SHA1 b353a37e751f3a17f45649b51e728c8e66501614 SHA256 f1c7ccb3acd095227284c074a0817529fc66472f968815d031f4aedbc64498df
-EBUILD fcitx-3.6.2.ebuild 1494 RMD160 75f6542a7dc9d4772c2b1771559a4926cde2ad49 SHA1 1fa49cbe30fb5a1e74698cd4194a52891a5add42 SHA256 bc3f2146dc3393f68f0bb00e90fa6078ca2c7c3d018e3a87578079cc5c4286d8
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
+EBUILD fcitx-3.6.4.ebuild 1573 RMD160 946658fe1ba68379152c07eafa47bceada90712b SHA1 9a54adca3b1bfca9a78ee6dbeffb37760386a4e8 SHA256 655d31389c09e1d09d548a68c0d33bc091f78a457a887b5579b994a828771a40
+EBUILD fcitx-4.0.0.ebuild 1427 RMD160 31a3f030da0d65d3f6dfc8ea8d773749f124a942 SHA1 1264f814ada2521e01de7130795cb21444349e87 SHA256 869d195c6a459fede2fd7138cd9dcadcea72f5370452ab8e57c21481d51ab027
+MISC ChangeLog 5026 RMD160 19a3385a614144eaa5244e85f5adcaa77d49ad13 SHA1 a3185c11975e229338280dcd4c340d9bba4ed1aa SHA256 871fad253cb3de2b1b9409b554616cb7e7c48dc47ec18b871bbcd28d2b22779d
+MISC metadata.xml 242 RMD160 da11fce10650fd8aaf5679b98e2ac9a1d00fdbc7 SHA1 fdd51cbe9ab74787fc91588a574118f813d022f1 SHA256 15878dfc72e04cd5dd3b4da844cd67c6b0036eeaa5022607af885e96b24ed59c
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.16 (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
+iQIcBAEBAgAGBQJM8K4RAAoJECaGw+YFKA1pIBkP/Rx0LDl8BZhLNj/tzoUu4vCJ
+FmyMYNECb+me3d8hSqVHbXjEki6ogkbAD6GXYdHq9Pk/3k6DMIo02hikl3rkx2rz
+WhAwQVW8xfnKKVID4N8xUh2/YZth4JjSdwECo5L5uW7FT16ANECoohFnj2XetRWL
+5p9QhRdLmwHrx3dtQxGKOWGi/KvT73F/+ucrSh9naMkWjrtMQpFFq6RMUK75TWOV
+V4txWfOxQPwrZbiMxWyqrp54W9V8XeGCa3/+YRX76AjV4Z1vnEVyipeN+xyJBywo
+XvyMzBgDcWZwVAf3u8iuMZVSClE8ZxseiEJmgCXDJrxJsjy5C3+iDJkRshKgyO/H
+pEPoNZP6RYhzniY2phDxVnbEPdJLTyDWtU2xTtEaAiOVjAmZf0EId9K0ZPXBA57E
+7CEdyQtP7A6p41BYiACh+vvaafeBXOCSRssgE+1VBZ137zpUiKspeRNICNvt8pn+
+5Dcb72hWa5OCBn40wnsbZEvrK8FKmPXl1FMHWhGRVPYndsFnBSSufYxkioh8Mi+m
+30WQsRvXOBYCyaOAwzAqJjhxIl7gdFiGyo/v+EVzEtO4iMF7L+GSzgdqDmM5Ohke
+smj6CzSejWSmhEegnIo7nBgOytvSDOGhdFKTkKRm3bYSzQDNO/IdUCRsTPwShPrT
+F7zUgcBEa7DVY3Y1Xsox
+=ge8d
-----END PGP SIGNATURE-----
diff --git a/app-i18n/fcitx/fcitx-3.6.2.ebuild b/app-i18n/fcitx/fcitx-3.6.4.ebuild
index 41ddf3d09235..9c2a26010856 100644
--- a/app-i18n/fcitx/fcitx-3.6.2.ebuild
+++ b/app-i18n/fcitx/fcitx-3.6.4.ebuild
@@ -1,18 +1,18 @@
# 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.2.ebuild,v 1.2 2010/02/06 15:36:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-3.6.4.ebuild,v 1.1 2010/11/27 07:05:07 matsuu Exp $
EAPI=2
inherit autotools eutils
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"
+SRC_URI="http://fcitx.googlecode.com/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
+IUSE="dbus"
RDEPEND="x11-libs/libX11
x11-libs/libXpm
@@ -20,19 +20,21 @@ RDEPEND="x11-libs/libX11
x11-libs/libXt
x11-libs/libXtst
x11-libs/libXext
- x11-libs/libXft"
+ x11-libs/libXft
+ dbus? ( >=sys-apps/dbus-0.2 )"
DEPEND="${RDEPEND}
+ x11-proto/xproto
dev-util/pkgconfig"
src_prepare() {
- epatch "${FILESDIR}"/${P}-asneeded.patch
+ epatch "${FILESDIR}"/${PN}-3.6.3-asneeded.patch
eautoreconf
}
src_configure() {
# --disable-xft doesn't work
# econf $(use_enable xft) || die
- econf || die
+ econf $(use_enable dbus) || die
}
src_install() {
diff --git a/app-i18n/fcitx/fcitx-4.0.0.ebuild b/app-i18n/fcitx/fcitx-4.0.0.ebuild
new file mode 100644
index 000000000000..0d21a9b90f3e
--- /dev/null
+++ b/app-i18n/fcitx/fcitx-4.0.0.ebuild
@@ -0,0 +1,55 @@
+# 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-4.0.0.ebuild,v 1.1 2010/11/27 07:05:07 matsuu Exp $
+
+EAPI="3"
+
+DESCRIPTION="Free Chinese Input Toy for X. Another Chinese XIM Input Method"
+HOMEPAGE="http://www.fcitx.org/"
+SRC_URI="http://fcitx.googlecode.com/files/${P}_all.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dbus pango"
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXrender
+ x11-libs/cairo[X]
+ media-libs/fontconfig
+ pango? ( x11-libs/pango )
+ dbus? ( >=sys-apps/dbus-0.2 )"
+DEPEND="${RDEPEND}
+ x11-proto/xproto
+ dev-util/pkgconfig"
+
+src_configure() {
+ econf \
+ $(use_enable dbus) \
+ $(use_enable pango) || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+
+ dodoc AUTHORS ChangeLog README THANKS TODO || die
+
+ rm -rf "${ED}"/usr/share/fcitx/doc/ || die
+ dodoc doc/pinyin.txt doc/cjkvinput.txt || die
+ dohtml doc/wb_fh.htm || die
+}
+
+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 ,ErBi or something else."
+ elog " mkdir -p ~/.fcitx"
+ 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/files/fcitx-3.5_pre070703-asneeded.patch b/app-i18n/fcitx/files/fcitx-3.5_pre070703-asneeded.patch
deleted file mode 100644
index b1c012b1546b..000000000000
--- a/app-i18n/fcitx/files/fcitx-3.5_pre070703-asneeded.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: fcitx-3.5/src/Makefile.am
-===================================================================
---- fcitx-3.5.orig/src/Makefile.am
-+++ fcitx-3.5/src/Makefile.am
-@@ -32,5 +32,4 @@ fcitx_SOURCES = IC.c IC.h \
- fcitx.h extra.c extra.h \
- internalVersion.c
-
--fcitx_LDADD = ../lib/libXimd.a
--fcitx_LDFLAGS = -lXpm
-+fcitx_LDADD = ../lib/libXimd.a -lXpm
diff --git a/app-i18n/fcitx/files/fcitx-3.6.2-asneeded.patch b/app-i18n/fcitx/files/fcitx-3.6.2-asneeded.patch
deleted file mode 100644
index d83f4773d58d..000000000000
--- a/app-i18n/fcitx/files/fcitx-3.6.2-asneeded.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=276302
-
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -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
-@@ -34,5 +34,4 @@
- fcitx.h extra.c extra.h \
- internalVersion.c
-
--fcitx_LDADD = ../lib/libXimd.a
--fcitx_LDFLAGS = -lXpm -lXtst
-+fcitx_LDADD = ../lib/libXimd.a -lXpm -lXtst -lXext
---- lib/Makefile.am
-+++ lib/Makefile.am
-@@ -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 --git a/app-i18n/fcitx/metadata.xml b/app-i18n/fcitx/metadata.xml
index 2d5852c16c60..097e29a576a7 100644
--- a/app-i18n/fcitx/metadata.xml
+++ b/app-i18n/fcitx/metadata.xml
@@ -2,4 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>cjk</herd>
+<use>
+ <flag name='pango'>Enable support for <pkg>x11-libs/pango</pkg></flag>
+</use>
</pkgmetadata>