Version bump. Mark 4.2.8.5 stable on amd64 (bug #540844)

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x4FDF9CFD2FAC514E!

4 files changed, 157 insertions, 11 deletions

diff --git a/app-i18n/fcitx/ChangeLog b/app-i18n/fcitx/ChangeLog
index 5d379f9a404c..e262d1678779 100644
--- a/app-i18n/fcitx/ChangeLog
+++ b/app-i18n/fcitx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/fcitx
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.73 2015/05/01 05:25:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.74 2015/05/09 11:36:02 yngwin Exp $
+
+*fcitx-4.2.8.6 (09 May 2015)
+
+  09 May 2015; Ben de Groot <yngwin@gentoo.org> +fcitx-4.2.8.6.ebuild,
+  fcitx-4.2.8.5.ebuild:
+  Version bump. Mark 4.2.8.5 stable on amd64 (bug #540844)
 
   01 May 2015; Jeroen Roovers <jer@gentoo.org> fcitx-4.2.8.5.ebuild:
   Stable for PPC64 (bug #540844).
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index b611accd3ddd..0c6f32756015 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -7,17 +7,31 @@ DIST fcitx-4.2.7_dict.tar.xz 8546416 SHA256 0c902617581f04eb0d337634b0bf2b39956a
 DIST fcitx-4.2.8.1_dict.tar.xz 8604792 SHA256 77f5811dd8c095ad71b423837df1405510a021b036352754aab8a146639e7817 SHA512 981e07830693b9525f8f8c7f18579477c066a19ae9358d8aa96ae5439cc3d40f7af2ad24b8cbd24410a5472d002a02eccb8c9d042019cd8459fd094e302d5a72 WHIRLPOOL 27a69f0c65b42141a0dfab54f8000affef25de4c058b482e4d0b9b6ad5fb5d9349ae3e1c1109df8df3ec79a3792254df6822e19beaabb9ee2603bb49c94f4199
 DIST fcitx-4.2.8.3_dict.tar.xz 8642480 SHA256 cb620ee17d4b1c55a664ceb8a980ce107a6b305ba2639267965e0a281733bc15 SHA512 93c7aa5209f344e1e89addb1dca7a76cde884e4467c0db5f79e758ea8ffb0fe1207ba1c507fb6574fe8223fa873ed5d1dd44835b70cf9254f5149df8e242e92d WHIRLPOOL 90e7d278bbb21a036152e2a1c0089c03358239310f37b9adcdcbc5c7ec57ed77eb5df8c852d4b4d1cc3431c6d249cf11538b02cbfc319057eef196f8f4fff513
 DIST fcitx-4.2.8.5_dict.tar.xz 8696468 SHA256 fe3d6f57805fc61130f8254f19a86fe3baa0f405406414ca2e94bcf86d3d1b72 SHA512 ee6612a34087135065537fa14f09078bad9f029f69b636fb2221193f23d86c5431a9d8a848b264bdcb259680f6bda41d08d58dcf67d19e5a200cb11fa4a26ffe WHIRLPOOL 0a394d5aaa53819bbab66b32e7ae5896187bc45fad146c7eef4ab75640e5c6670cf811bec87e482bb3516b30e1ce28f2cefa91c10838092f9329b1101b5c70db
+DIST fcitx-4.2.8.6_dict.tar.xz 8694328 SHA256 91034e9ef976bbe2649a96b67adf0c133d64e2c0d53be440cc40a4370569d597 SHA512 822e448932e735fe3087384eaf91c6b029b06d3461aa3798501bfbf8f79b8ebc5ea3ac57f01ec32674cc3cb74fcb34b6e285ef265bb49be54543f34dcaf624e4 WHIRLPOOL df24b3b6bbe18a8498732b27817caef6c28278bddd6acfbe49edd9a63d8f33b09ba93ff0bd144e1c1d3b9b9c8079a35a8a047ebf9b361b4f173ec9b23138042e
 EBUILD fcitx-4.2.7-r1.ebuild 3699 SHA256 9ac1904a3d51ae51170102a197bbecedd4e143d3db1276cd41bf9e00fa8719c2 SHA512 8efbb5ba01ef90ea7dc25f6f6376c931f8bf501ddf07a24b99cff1973a2fd290250a3854fc2e519b11f9f466914fab9e61eb2a5384681b4f84d8af930d249d00 WHIRLPOOL c006bed17471f26d8603b00e0d78dfcbef4b697c82dac413ae935760192303d65f947e017aa05d68e5ab0ae854764fae10be742b1363f1715879a40aad42f6ca
 EBUILD fcitx-4.2.7.ebuild 3534 SHA256 f5e6a97646a54e33cd1582e093cfa2bbe9cdab6bb2959cfcb302f291322de9b1 SHA512 b93a705f2c2d1b304d4f92edc66851413001f4b1cb2c5b864f35b8683abd203e27eb2585e69ac6c37a274586baf60ee987d43ac1674bb1a8ab7b540fe76ccf61 WHIRLPOOL 162a342ffdd30bdf8a8d7c254c3c694014c8f0f41c30f30ee463aa46ef4ac36c9b1d9ec900fbd9a5d345204104002b77ab2c2f94e1ed11fdc4c6580cd789cceb
 EBUILD fcitx-4.2.8.1.ebuild 3519 SHA256 35b146c498bb84cfac88066f8068eab4128d2ac3381c40b4f97e8928de3ec860 SHA512 ab068c66da7b654051fa68789f23519ca05b9ebf99618836e5f12f0e6cacde9317f311f0dad18567a6333b59b398c7cfc07a5e47e066b88fba5bc77902303f4a WHIRLPOOL 14200bb67e4bb1afd5c12618cebe69779459d8f39413632ae3da3ffd350cebb3108e15db869d405ea7bc6937562a9c8bd0f33bc09486a22fb7ac3c5cc053202e
 EBUILD fcitx-4.2.8.3.ebuild 3524 SHA256 7a68a5f8ab89ee8d326f07e380062fa6e833b8602f0bb5d1352077dbaa62edd9 SHA512 1c4720995227ba745104b62fc5f04e863a2cbbf0267209d0420bcc5b358d06a924c0da13586afc70d8b83c30091f17ccf3531fa9bc65741581cdaead0c03cf9c WHIRLPOOL c47f267f8738efaec6e8eae44c3349446929844a57a9d9f33e2049b0a38515003d70ee3d62c2ffaa40c38653283d97898102d56eea87a93e0cc34a657ade327c
-EBUILD fcitx-4.2.8.5.ebuild 3607 SHA256 5ea16d35ec3efae2eebc0648200b98aacff548fdc3e4e08ab1472c793e1da49e SHA512 3437f18ce9ded3fb604e59a687902c9cb3368cbb03b786ba836d1f60d948148d060cc0369a8eef3c4d919bd9fbd55627b6b2c2293e0534179888bef85b0557b9 WHIRLPOOL 07378e508416521ea4147e74d712da1b8a4c5e1e1552f0dfd21769340a47a870c03ff0d2be596d8ba6a4b9f5984574876ab367442186f5fec0f346448bc16748
-MISC ChangeLog 11660 SHA256 c028facbe5ae755e1c91c142ef6f490e746aa8b6ebea4c0a5b4407d02208ee25 SHA512 709120eb506e659b242fe15146666c3bb59d8451e1fdf608c526b18d860acb6579917c16978de62d2bfb31f174f8ca5d1329d324deedc3c0b5b90e96c0e9a1b5 WHIRLPOOL 0efa6dad26f3800a3253d8a1c13ffebeb4d0bb089812984ec5d168add282a7110e4717cb393dab44d0e9b0ba68075a820b52a0e5e4dd31f836113cccd9dd3afe
+EBUILD fcitx-4.2.8.5.ebuild 3610 SHA256 3bad537943d7d8a38ee1fc5f8f8631cd85237f75bb3ea340ee32ca80118a5104 SHA512 a9259eb9b414c2e03bc7771080881a8255ba56f1439f02eb28e99db57fd6298d8fc97ec1da1eb80e236dbf212968d569c2ff2b3f31e582debf34fbd79ac8058f WHIRLPOOL 0a48168a4e58902527b5839cdea29fae93c37727cd87febb1f4a9897120ce97de71e2daf312496f5ed37de66b1f52dd6b43c37e2db979c50484de1b53b942e96
+EBUILD fcitx-4.2.8.6.ebuild 3608 SHA256 44862366ca9ec27a7d691a3e78e200c15dddb9dfa9d4e1b7f3f71c11f0c8a7c7 SHA512 43bc044ee745a51bc93a5d87a38429cb238bc20449fa739091cd36c86a09252e975452ffa1e24dcad383228648dc128b9bcf4524bee943aa480f405ceffe9a77 WHIRLPOOL 340994fa784a03dcdcabc5de69de3f280e286713ca120c13d27115816e76cc3a08eb1892a38e555198747f07361dc398dc1150f82921aef66628322aaab56d62
+MISC ChangeLog 11848 SHA256 91e65c75e7e4b2b76af23f4fbd2567d702d5586757881826a30ed3d59297ce31 SHA512 489900fdf2b8ac98e9de5cbdc0fbea7cf0c432623ed6535838c3c0e2f55da17128f636d6498c381dc1598b1e0b08233ce828d646a9bce5b7b6cb9b0ef104aab0 WHIRLPOOL 284f5341254ae79e29555434c099a994f280c7d7373f91321ca0b1d8ea45cb1379b9c933674ae37ed7eb70f01d99ae3cb950923ab1d2da86136f9dfcefb3781c
 MISC metadata.xml 805 SHA256 4e63031f014465f6ecd50ec0fb73ba4c197b7a6a5ba002aa93eb01ab23243bbf SHA512 b13ca817c9900a3ae5a8fd45fd19ada00989f98d2a86213f278ae1e91042aa896e1cadf89643cfe71f6346ae01faf08c844dcbf9937746ac5a61dab5a30c9f07 WHIRLPOOL 7aaa7c0b48161233861672b0c4ed79a442246bf0e9f94eff1223ccad4779cafbef665a21db8119d12031d7b152ae0c45a5c4f80d030efd2bc6303f6261bd0f51
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVDDl0ACgkQVWmRsqeSphNiQwCdG94vnVG14ou5b0axylgiNcht
-0fIAn2pGJnYpwU6wJST4rMa64+HcCI8m
-=UGxg
+iQJ8BAEBCABmBQJVTfEnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0
+RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOAfwP/030g80XXaKObttuoKv4jhUQ
+Vo+OkmnTEQVASdT/gcxQir+mwapIJlAvwsbQ3Q4cR+8/mHG60FcfkTpre76Gp/CB
+KnexLROb5fBQJ5ZNMTKrNKSdQ4gw5THwhRyUAD67Yt3TmjfbbxRHmW46ACCbYXIf
+5q1dnm6ZAvAiNspRUPFJzTqt8xWkKN5GmKa4Sazl8cXcnm9wZ/RQipBPL4EDRGRw
+ZiZD+LqM+/ckEwn3F6nzhz7/R5Xppj0qPCQuZWGjwSmsoJjxODXRw9Vo+wqSzqky
+6gtK8kyH2aHsTmakcHyqGHUrRCSs0d7dxzOWdM10Ro6EeMAYYUqVRLwhcVRiXSAU
+9uP5AwN0WdNSLpCHVQLN5coabQd6HcDDVwBWSUmBSUzTskmcyrXUpMtpGZgnq0Wl
+U6sJh1fnIal9N8VO3eN8Nb0X+5I15Rc/78M1BTP9TgBtfYoq0/u5WhSp1mxKBBW5
+LEymfHWrc9u0ln9+WCc52A85xDIL50o8SuMKTDg9TXxzAHs9tPih3vaSOZKAzTRJ
+J2CF2S9t2k9e6VQtU0qzF6fM92r9vppaWsH+uMv8bh6nRISyMl1rZMzjGF9l7jut
+7OreUvRd+lz6DIey4R9kX0VMVelt5MvDO93JhgDEF4mpqc0u+84qvkWM0dPEBDDL
+pR2SG4KC+784+iWFfMpK
+=++fX
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/fcitx/fcitx-4.2.8.5.ebuild b/app-i18n/fcitx/fcitx-4.2.8.5.ebuild
index f968561c1bdc..61bf041baf6f 100644
--- a/app-i18n/fcitx/fcitx-4.2.8.5.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.8.5.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.8.5.ebuild,v 1.2 2015/05/01 05:25:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.8.5.ebuild,v 1.3 2015/05/09 11:36:02 yngwin Exp $
 
 EAPI=5
-
 inherit cmake-utils eutils gnome2-utils fdo-mime multilib readme.gentoo
 
 DESCRIPTION="Flexible Contect-aware Input Tool with eXtension support"
@@ -12,7 +11,7 @@ SRC_URI="http://download.fcitx-im.org/fcitx/${P}_dict.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ppc64 ~x86"
 IUSE="+X +autostart +cairo +dbus debug +enchant gtk gtk3 icu introspection lua
 nls opencc +pango qt4 static-libs +table test +xml"
 
@@ -42,7 +41,7 @@ RDEPEND="
 	)
 	icu? ( dev-libs/icu:= )
 	introspection? ( dev-libs/gobject-introspection )
-	lua? ( dev-lang/lua )
+	lua? ( dev-lang/lua:= )
 	opencc? ( app-i18n/opencc )
 	qt4? (
 		dev-qt/qtdbus:4
diff --git a/app-i18n/fcitx/fcitx-4.2.8.6.ebuild b/app-i18n/fcitx/fcitx-4.2.8.6.ebuild
new file mode 100644
index 000000000000..8f0fe2ce5e24
--- /dev/null
+++ b/app-i18n/fcitx/fcitx-4.2.8.6.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.8.6.ebuild,v 1.1 2015/05/09 11:36:02 yngwin Exp $
+
+EAPI=5
+inherit cmake-utils eutils gnome2-utils fdo-mime multilib readme.gentoo
+
+DESCRIPTION="Flexible Contect-aware Input Tool with eXtension support"
+HOMEPAGE="http://fcitx-im.org/"
+SRC_URI="http://download.fcitx-im.org/fcitx/${P}_dict.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="+X +autostart +cairo +dbus debug +enchant gtk gtk3 icu introspection lua
+nls opencc +pango qt4 static-libs +table test +xml"
+
+REQUIRED_USE="cairo? ( X ) gtk? ( X ) gtk3? ( X ) qt4? ( X )"
+
+RDEPEND="
+	X? (
+		x11-libs/libX11
+		x11-libs/libXinerama
+	)
+	cairo? (
+		x11-libs/cairo[X]
+		pango? ( x11-libs/pango[X] )
+		!pango? ( media-libs/fontconfig )
+	)
+	dbus? ( sys-apps/dbus )
+	enchant? ( app-text/enchant )
+	gtk? (
+		x11-libs/gtk+:2
+		dev-libs/glib:2
+		dev-libs/dbus-glib
+	)
+	gtk3? (
+		x11-libs/gtk+:3
+		dev-libs/glib:2
+		dev-libs/dbus-glib
+	)
+	icu? ( dev-libs/icu:= )
+	introspection? ( dev-libs/gobject-introspection )
+	lua? ( dev-lang/lua:= )
+	opencc? ( app-i18n/opencc )
+	qt4? (
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4[glib]
+	)
+	xml? (
+		app-text/iso-codes
+		dev-libs/libxml2
+		x11-libs/libxkbfile
+	)"
+DEPEND="${RDEPEND}
+	virtual/libintl
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS ChangeLog README THANKS TODO
+	doc/pinyin.txt doc/cjkvinput.txt doc/API.txt doc/Develop_Readme )
+HTML_DOCS=( doc/wb_fh.htm )
+
+src_prepare() {
+	use autostart && DOC_CONTENTS="You have enabled the autostart USE flag,
+	which will let fcitx start automatically on XDG compatible desktop
+	environments, such as Gnome, KDE, LXDE, LXQt and Xfce. If you use
+	~/.xinitrc to configure your desktop, make sure to include the fcitx
+	command to start it."
+	epatch_user
+}
+
+src_configure() {
+	local mycmakeargs="
+		-DLIB_INSTALL_DIR=/usr/$(get_libdir)
+		-DSYSCONFDIR=/etc/
+		$(cmake-utils_use_enable X X11)
+		$(cmake-utils_use_enable autostart XDGAUTOSTART)
+		$(cmake-utils_use_enable cairo CAIRO)
+		$(cmake-utils_use_enable dbus DBUS)
+		$(cmake-utils_use_enable debug DEBUG)
+		$(cmake-utils_use_enable enchant ENCHANT)
+		$(cmake-utils_use_enable gtk GTK2_IM_MODULE)
+		$(cmake-utils_use_enable gtk SNOOPER)
+		$(cmake-utils_use_enable gtk3 GTK3_IM_MODULE)
+		$(cmake-utils_use_enable gtk3 SNOOPER)
+		$(cmake-utils_use_enable icu ICU)
+		$(cmake-utils_use_enable introspection GIR)
+		$(cmake-utils_use_enable lua LUA)
+		$(cmake-utils_use_enable nls GETTEXT)
+		$(cmake-utils_use_enable opencc OPENCC)
+		$(cmake-utils_use_enable pango PANGO)
+		$(cmake-utils_use_enable qt4 QT)
+		$(cmake-utils_use_enable qt4 QT_IM_MODULE)
+		$(cmake-utils_use_enable qt4 QT_GUI)
+		$(cmake-utils_use_enable static-libs STATIC)
+		$(cmake-utils_use_enable table TABLE)
+		$(cmake-utils_use_enable test TEST)
+		$(cmake-utils_use_enable xml LIBXML2)"
+	if use gtk || use gtk3 || use qt4 ; then
+		mycmakeargs+=" -DENABLE_GLIB2=ON "
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	rm -rf "${ED}"/usr/share/doc/${PN} || die
+	use autostart && readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+	use autostart && readme.gentoo_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
+}