Version bump. Add SYSCONFDIR (bug #499418) and REQUIRED_USE (reported in bug #498688).

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x0F9C590B7FF324F6!

3 files changed, 154 insertions, 6 deletions

diff --git a/app-i18n/fcitx/ChangeLog b/app-i18n/fcitx/ChangeLog
index 144444fe54d8..b18c2e92e4ce 100644
--- a/app-i18n/fcitx/ChangeLog
+++ b/app-i18n/fcitx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/fcitx
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.71 2014/09/09 09:33:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.72 2014/11/02 07:36:01 yngwin Exp $
+
+*fcitx-4.2.8.5 (02 Nov 2014)
+
+  02 Nov 2014; Ben de Groot <yngwin@gentoo.org> +fcitx-4.2.8.5.ebuild:
+  Version bump. Add SYSCONFDIR (bug #499418) and REQUIRED_USE (reported in bug
+  #498688).
 
   09 Sep 2014; Jeroen Roovers <jer@gentoo.org> fcitx-4.2.8.3.ebuild:
   Marked ~hppa (bug #522284).
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index d1a26894bb9e..4fe109fbef6e 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -6,16 +6,30 @@ DIST fcitx-4.2.7-fixed-pngs.tgz 3291 SHA256 016c9916796804724014d56cb30f1c8486b9
 DIST fcitx-4.2.7_dict.tar.xz 8546416 SHA256 0c902617581f04eb0d337634b0bf2b39956abbcc949512cc79d4ee24cfc9dbb5 SHA512 e5d8eb55f644250197e69315ad02b9f6bc84e697b23c20c01a731f98ce8b1a16d764a58b1e1047d45b8decb6be33144707c2a52fc427e6338d8b8186cd4da074 WHIRLPOOL e344bc92a84940d3c885d1ae87a2fc83c95d6cb0f0e95eed76078e996c4a00df82a0c09c4540771f628928db1716f90d50d04469f2c0f2d5c17b5048fbf2d482
 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
 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
-MISC ChangeLog 11363 SHA256 6e9f22c9a1e1d96557d7446a0f2a770a00f1837ab46f1e4a8d5e8bcf9f838ba5 SHA512 e7d4ec5d45792c92322b752b5390aa93982ccf0d197ea3754596db1f56227d857150844227bc6cd14b6a2e7f90f5ec0565fc90053c4176c558386b0b06f857e4 WHIRLPOOL 39c0bc9e0364d0c802fbe119ec178c1fdcf7d5b388cc89131c279d8fe948f33a8239d057565b907bf175311786bc37989c32503e8b84bd5f23dbe7cf5f569d92
+EBUILD fcitx-4.2.8.5.ebuild 3611 SHA256 58d777d05d4e498fa84565e39c01500e5ec57edb6586255a3cf73e3228a964a6 SHA512 e82feedd917ad6e9f8cdb49983567d64075df30aee5641c96fdb900418ba31e3799b8b5201bf69e43eef61e5f502a0d2b6ec5f0631f502064953b7df579aea9a WHIRLPOOL 0ad1aa3b97b62a83797bad2607217ffabce4c2d4194341f1b7bd53cb4411498cec820e4cc219504d18ab7d76fb37c008e4dbae8155fafc384b7962b0ff0fad0b
+MISC ChangeLog 11559 SHA256 9e5ede42e94493effe5a7dd2301a54397436bb95bb5aef029aac889129fbfacd SHA512 a1384f267c95f49822140d39f0e17572a0d8c46e31ded48a6588f4808bde7615aa1f3ab43fe0ff6c9fc9c980f9f6d3ba62d8b722a8bdfbc9ef6f4c6ac157e276 WHIRLPOOL c83015874c4d7fecef08b9b2a62fa0a96beb64cc74f4e87776bda501973188446b998496f22169d53aef76d09bf750f82d72e3e2f895045e24b097e5ee848e36
 MISC metadata.xml 805 SHA256 4e63031f014465f6ecd50ec0fb73ba4c197b7a6a5ba002aa93eb01ab23243bbf SHA512 b13ca817c9900a3ae5a8fd45fd19ada00989f98d2a86213f278ae1e91042aa896e1cadf89643cfe71f6346ae01faf08c844dcbf9937746ac5a61dab5a30c9f07 WHIRLPOOL 7aaa7c0b48161233861672b0c4ed79a442246bf0e9f94eff1223ccad4779cafbef665a21db8119d12031d7b152ae0c45a5c4f80d030efd2bc6303f6261bd0f51
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlQOyYMACgkQVWmRsqeSphO88gCfZVV5KimRmk1fjLarYtjCXfSQ
-4nYAniQhVVe58HnekTulrh0jbm10ZrAG
-=XALv
+iQJ8BAEBCABmBQJUVd7nXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOTZFRkUxOEEyRDM1Qzc2QTY0M0Y2QjQw
+RjlDNTkwQjdGRjMyNEY2AAoJEA+cWQt/8yT2Ju8P/3Xn3DOqJEuPOW1q3ofNgwi4
+mM4ofQnlhZPbbGoVPvZQsXyebKIDxM9QxGfV8/elbyxXhIjzr2aswiHGtkUTF5Jx
+IFkblqw8zCHe1nWWEU/XCoqHbvi6MwFpYCTeO/MeTWWwERWiT7F1yf3cICWI1LC0
+ylu5FHWvC0PodVenDyDVdjEaAVQ75PxXMmsyZHWEtcNUV+ixTTIF+qzjPqfCuVuS
+s3FaKYDR85pSpOW2vO8AlBKb+T+LvhRLbBnNIG/BrNbqIhNXpPRfWRcG1JSVoz3E
+iP8F71VI+418YYEKiWBVpva2WYtgnprOzgsao3BBWeIK5RjOMMMf2ItshtSiGZQX
+ZlD+zTbgZlWUDZS+CU9PYyPBL/pFhliybvGYeHB8C3++SDCnusncO9+m8IgJFOU4
+olgnkscx9Dg4v2wUmaUDK/yD2yJjAFjXA43RH7R58sQSXv6HtGop5GoJThBFQdnP
+ZgGu8PdDTsXVZKu3/ToUPFAEwFe4/4R2IVO75w81/CPacVa3vJnTc7rwWf/MxOSi
+o68uEnc2VXXM2LaIdKZOf2YsswW43mmnI7O1+H6gQT1p5P6UvyIetSfAp9skKjRP
+y5ltvcaYqgh/+jRGX6PU4gEGrm6WzsoDCwmYUJaPyrXPUg9MABnIwqYx2CwyXCTX
+rH7XAlJqwvn5j4w7wNj4
+=z+UK
 -----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
new file mode 100644
index 000000000000..30d1d9d2daaa
--- /dev/null
+++ b/app-i18n/fcitx/fcitx-4.2.8.5.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2014 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.1 2014/11/02 07:36:01 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, Razor-qt 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
+}