summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hüttel <dilfridge@gentoo.org>2012-04-04 20:12:20 +0000
committerAndreas Hüttel <dilfridge@gentoo.org>2012-04-04 20:12:20 +0000
commit8d05936a83a68ea20defcb3a363fd66ff3de5806 (patch)
tree72ddb665760618db253d61df2f6e2139fa1d0ebb /app-i18n/fcitx
parentmarked x86 per bug 398753 (diff)
downloadhistorical-8d05936a83a68ea20defcb3a363fd66ff3de5806.tar.gz
historical-8d05936a83a68ea20defcb3a363fd66ff3de5806.tar.bz2
historical-8d05936a83a68ea20defcb3a363fd66ff3de5806.zip
Fix multilib-strict, bug 410797; add missing intltool depend. Acked by naota.
Package-Manager: portage-2.1.10.54/cvs/Linux x86_64
Diffstat (limited to 'app-i18n/fcitx')
-rw-r--r--app-i18n/fcitx/ChangeLog5
-rw-r--r--app-i18n/fcitx/Manifest24
-rw-r--r--app-i18n/fcitx/fcitx-4.2.1.ebuild10
3 files changed, 25 insertions, 14 deletions
diff --git a/app-i18n/fcitx/ChangeLog b/app-i18n/fcitx/ChangeLog
index f7ba8e3bcc5c..8c0e392ffa12 100644
--- a/app-i18n/fcitx/ChangeLog
+++ b/app-i18n/fcitx/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-i18n/fcitx
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.42 2012/04/04 17:46:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.43 2012/04/04 20:12:20 dilfridge Exp $
+
+ 04 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org> fcitx-4.2.1.ebuild:
+ Fix multilib-strict, bug 410797; add missing intltool depend. Acked by naota.
04 Apr 2012; Agostino Sarubbo <ago@gentoo.org> fcitx-4.2.1.ebuild:
Stable for amd64, wrt bug #409403
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index 830fa0ded698..8947bd82116b 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -15,17 +15,23 @@ EBUILD fcitx-3.6.4.ebuild 1573 RMD160 946658fe1ba68379152c07eafa47bceada90712b S
EBUILD fcitx-4.0.0.ebuild 1428 RMD160 cb653df44dba78cfafc0980ca80a4c7c85f2c982 SHA1 66e943bc446537c1326b4288106aaf3a555e1397 SHA256 a98ca28dbe284e4b1dae2c54ef9cb39c56e5e268ae0eb823d50bd7dd98b72e57
EBUILD fcitx-4.0.1.ebuild 1548 RMD160 5bf70b3f0e7a2a0332ed4d5c8eef5e09e55c4ffc SHA1 74e3c46ec6f88252df59705fcf9ac3471bc250ef SHA256 00993c64fe2af869264fb18131487b306f2e66f0bcc287c7c1e72e4d711fc030
EBUILD fcitx-4.2.0-r2.ebuild 2470 RMD160 8a299a53a3868f3f7d6176a7156d7ce40ef6fc78 SHA1 ae1b06dd2d80064fc0f562a0a01c5d436dbb3085 SHA256 410c183722750b7a49ee807c80b47ec39007f4e8b2d1444ac3661796e2acb45d
-EBUILD fcitx-4.2.1.ebuild 2376 RMD160 8db22d66d8ab5552136d1aa4ae4ee658e64d0f2c SHA1 fe86d80ef9d1cfe5a46a739791418c62ece46968 SHA256 8c486c8677d98924fe1d2951db52d19a44a03e5ee45a102b2b10c9f3c0d0055a
-MISC ChangeLog 6696 RMD160 7acab766d3c9cb1fd3bbcbb15e19ded40207f3fe SHA1 767b79ca7586b779acc931dd018bab1996d066e9 SHA256 27935e9c6ef2c90526a4f6885af3aff1928403c36d4f39ac5e7e5a0baf262577
+EBUILD fcitx-4.2.1.ebuild 2449 RMD160 4cf485eb9c6f14fa5daf077b3781297271b30d15 SHA1 6742f1e05350aebf0a32ef6dfc315272a024153f SHA256 7fc1fc15493884072aa4f49e0ff53b041c54fdc3fb5b6d5c0dff73f4065ca351
+MISC ChangeLog 6860 RMD160 d6c04138c51a7f97740c08257cdc930fe2a48713 SHA1 a366871051aa8cfee59a24660dcc7e44d99cc2f2 SHA256 dee46ac91d7e0705ff32b1cbf96f893651fcdbbb741ab3b0f9f6ee8f8daef684
MISC metadata.xml 537 RMD160 bf063ed6cd5e7000cc67cca62adde0f675e81511 SHA1 c23592b3a69f98d7511cca94ed40763f53489e17 SHA256 cdd460db735648aea2a935febad9160fcca6ae379c4704d04ec357444ae56f86
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQEcBAEBCgAGBQJPfIjhAAoJEOTDgjZ80txdUuwH/AvAYDmbhzxZQkFCoNrBN0Zv
-6Zk3CBl5+2muUxv0tQ/4kc6XuZxwqdMxu/swxDrWC8ZyzK6RtqdtA/UxLA44pMIr
-VzPjMc/UUFHvPMEYX+d/8EPSWAWi7ARMgCdCyNMuOYr0P62a80BxavH+MljLJTrB
-DXPTas9w8zI5QiNz+mClPIrk8kdTyopjBya6+2GzGLWpl3b4Jd3RfZZozVVvpE0N
-fPJTmcfKVkObrylmi3PKfwWBNw+8TAEp2BPQZuwUYJ8ICEGkxtmA5nWbodJ3R/BX
-lhRFNPKMa3sH3ksqOazeiFzsUY4hgvW23+XQ/1dU67OeTjxFKxBzfi95leE4E00=
-=wbCW
+iQIcBAEBCgAGBQJPfKsxAAoJENwGBM22xffemZUP/3nnl3rGJYqdzlag791NjOva
+TS3BrqbytxatvpZVSR/zB6yaSzcRlATurBO5KY/xecaay3QcF44Xk0bHjTihZkff
+L9wukPKjXD2vqik/yds6ztW0MbWglW05B2/UQ6yqsik3sls22u3cgVxj4q54BTZc
+yvI5C4SyA0HI8f9QB5orhDB98d/xFWsxcBRYjoQyOwkj/ggaTEgaKvHGblsyrUDw
+8SjKXYhoVL5pCpf/nKiwYKbIWWHVjnhmMqLH9ixnO5ygN4c/4mrSSEPGLpryFBjh
+1y3D73YZX0xpNPlWucqc0d2ubZ6aOrFeruXFGMk9Gj+/UpBSoLN6IWM0C/wYx2W1
+3iqjlRkScpBF320GGm7AS9Ekg1aIp2PywfUEikhZ+vLzvoJ3VzMXNK3CpjTsh13D
+rJfWEQlXrTWasElSp5IRfMIOMzTGU0rcTaKSrD60Yv67aNlJoKN7SPIASVDqgPFR
+S4+8jO/nLZbw0xPvIhyWdU55pBIFwDd6qhMTtYYLroaw/oJSd24Er8wXCrzlmZTh
+pORmvKXUSnz8GLZ0uqSbjkZS4XFR7RHONfJ9qdJcKIQEv3mC2fz30V9Sc4WU4fh/
+fRXgVtBpLPJ+3NCqAx+S/SbwMIctUgYk03niAVxCEk/RwTkvSwHRUL0CPUu9RJTq
+8NB9DwLHWnpR+PK3n5zy
+=5moT
-----END PGP SIGNATURE-----
diff --git a/app-i18n/fcitx/fcitx-4.2.1.ebuild b/app-i18n/fcitx/fcitx-4.2.1.ebuild
index 8d0c23e06773..1b03ed1a25b9 100644
--- a/app-i18n/fcitx/fcitx-4.2.1.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.1.ebuild,v 1.3 2012/04/04 17:46:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.1.ebuild,v 1.4 2012/04/04 20:12:20 dilfridge Exp $
EAPI="3"
-inherit cmake-utils eutils
+inherit multilib cmake-utils eutils
DESCRIPTION="Free Chinese Input Toy for X. Another Chinese XIM Input Method"
HOMEPAGE="http://www.fcitx.org/"
@@ -26,8 +26,9 @@ RDEPEND="x11-libs/libX11
dbus? ( sys-apps/dbus )"
DEPEND="${RDEPEND}
app-arch/xz-utils
- x11-proto/xproto
- dev-util/pkgconfig"
+ dev-util/intltool
+ dev-util/pkgconfig
+ x11-proto/xproto"
update_gtk_immodules() {
local GTK2_CONFDIR="/etc/gtk-2.0"
@@ -50,6 +51,7 @@ update_gtk3_immodules() {
src_configure() {
local mycmakeargs="
+ -DLIB_INSTALL_DIR=/usr/$(get_libdir)
$(cmake-utils_use_enable cairo)
$(cmake-utils_use_enable dbus)
$(cmake-utils_use_enable debug)