override mantainer due to bug inactivity after 1 year, standardize to gnome2_query_immodules_gtk{2,3}, fix bug #413501

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xADC916E5

4 files changed, 24 insertions, 67 deletions

diff --git a/app-i18n/fcitx/ChangeLog b/app-i18n/fcitx/ChangeLog
index 1a291d03d99e..c30b7a78b01c 100644
--- a/app-i18n/fcitx/ChangeLog
+++ b/app-i18n/fcitx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/fcitx
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.63 2013/04/15 02:21:22 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/ChangeLog,v 1.64 2013/04/21 10:04:51 lxnay Exp $
+
+  21 Apr 2013; Fabio Erculiani <lxnay@gentoo.org> fcitx-4.2.5.ebuild,
+  fcitx-4.2.6.1.ebuild:
+  override mantainer due to bug inactivity after 1 year, standardize to
+  gnome2_query_immodules_gtk{2,3}, fix bug #413501
 
   15 Apr 2013; Naohiro Aota <naota@gentoo.org> -fcitx-4.2.1.ebuild:
   Drop old version wrt #450696
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index 3fb51cbcecb9..fda16e5cfac9 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -18,26 +18,16 @@ DIST pinyin.tar.gz 1608886 SHA256 583829b24a758c087c08de4a69480d0bf5946354fe77db
 DIST table.tar.gz 4144686 SHA256 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7 SHA512 99e1d69c679355fcf3e117a1ef39b131cbd3af841387d2335757247d840b90ff6b7323e16fca98cf7a043033faf250d2e9c6d47b96845d18c278a0cf6f30fec9 WHIRLPOOL 465997dc17e88fb3130abb60e0c73564fbdb50a10de1587f5efaac4859a001b7b4aea1f0f4f6efe01ada5e8751351b7b6106a130f46d550e5dd0081dfaa780e5
 EBUILD fcitx-3.6.4.ebuild 1572 SHA256 282ba8df44f5301be696e66afcb5caffdd1e6607b9bbba76b18ac62402795f2f SHA512 daabb7d583afe08995376333b2e0bb51bf6b5eb10054a7713645cd25f2ad13ca1d201733fb409e9e7f4d233a5eca0685b7f4ff35f735d7bc1c4fbb448eceb393 WHIRLPOOL 47a6b583e4c512871a5acd05c429736dbbd3fc24378c4c433cf1204ade18b3c0d2db13930e5b231e22ae6283dba91885da7dda92e88cba97a53e171022878ded
 EBUILD fcitx-4.0.1.ebuild 1553 SHA256 cf44fa0ee37e43597ccc1ab5244bdcccd0d242defa003287a3e2701ac5cbcfe2 SHA512 99360f9806237b2c700bbbe94503a157e639381d7285533274b67fe1c61163acf6e5f2ed18446622b8ec86d81fe9eee1c33e23a46a68113940981da5b5511b42 WHIRLPOOL 7c5a711f0902f31134c695f7965af74b8ebb9def633e08ce463eb48aacc90821ead5e5c2d34a260017f342bd81c4a29335d733cc7b7ebf8b3bc474da9e25a411
-EBUILD fcitx-4.2.5.ebuild 3255 SHA256 ea302ee928e55b3fd7931b7ccc77fafec48cceac388a830bf280858d5a10b8cd SHA512 eb8d775087109a0c6ee3097e0d27d850445ef2e1943b0b91b241e12a842ccc256e7734e8c0f8edb2639bd59358ae3bd509bf549eb94a7188176c0d4597d899b4 WHIRLPOOL d20c0c9c6c7485327c454528e94853f16e99fd6eb4cf808761b56934ea5e961bc7ab01181fb3a93d2fe330782d58ce13f74ae5dc2c252fa9299236a0eb66e3e4
-EBUILD fcitx-4.2.6.1.ebuild 3811 SHA256 63a643c6ce72c13d659a768efce6ea168d8872dcdc59b73e95b1078b48136c12 SHA512 5efb3f220a8772a747dd0dbb35e9b64650e1685e1da4e5e462fa61255b68007878e19dfb18ad9e45b49f983b307be7510dade109c5ace69365ae0a6dba934719 WHIRLPOOL f20e9125902b6c79fd1d7fa8844cfe1c47f03ec9146a3514d7645f157d20e680d2f1080da7c0fca6d92da6bad6180dcda6a5cc0b907e7b7214c2a6f5d9823a8f
+EBUILD fcitx-4.2.5.ebuild 2727 SHA256 7d8e7c8b0a3441d1f0929869d53f9e46e7ae91e780cec6f9aea7ec33f007718e SHA512 41c9f11e122f9a0ff92fae1bdcc99b8559acc0e0f9b303b57c414e95cec73a5d27c3192c63891aece64b24d52b00c20b4b920b9c0180ce7a17a548b8f807014b WHIRLPOOL 154411570e59a81f5d0143d48bf3eb70a51333c5c4fa2b4d6603988359f6ec268c9803cd1a26effd0fc583c97efc904fe023a31c3f59f0c9f578336acf8be34b
+EBUILD fcitx-4.2.6.1.ebuild 3283 SHA256 56dd8acac2ef1f9a174c29b71fb0d2e298b663e7aefe464735696faa3a11f432 SHA512 c319715ca31aa284da2ca5a17ce373ad4cf3d8e173ee4ac03930bed2cb1b51540671f9a94ca84168dc844e8fcb16bbc871f173629a5c8c72e5052ab4e0d7c3aa WHIRLPOOL b1ad59d0eb3f5e67e19e9474599fdcf854e6ed3d4088da77291b60aa0c1395de11504b3390a9eb5d208ddaef5ef1cfaec644177f494f7707e2804bc6597a3cb7
 EBUILD fcitx-4.2.7-r1.ebuild 3677 SHA256 d23cc8b628dde84a48952fcab971c932fb73ab0912a8f7274f7ec424ad05a1e8 SHA512 c731772c822ca5326652c36b1b1c15df33dabe217c457c6e4e5735edb68ceb01e1eede286a766ac42d5cb6e34cbadf53ce57bc1be1bd565af5bb619177baddde WHIRLPOOL c21aea7e9832bdc2232f54aafe9f1d1cb6d7acfb33ef0d2aac2fa812e0a3e0ebb07e8efc34df51b2314178a2bd4dc99038bb42fc06113005159a143bc40cfdc7
 EBUILD fcitx-4.2.7.ebuild 3537 SHA256 ba35f39664b59bd72d14b989efdd0029cded830df47a54ab5b4fe6af11add143 SHA512 189ac35a3511c92ffa1f3a5f4c6edb7c4e1dd82f471b16df99f3310c657dc83328d80bdc1f901bef2d1dfb7316d141697f64e619402a2c5c009e1c0ae281c6f8 WHIRLPOOL 134329cc6f6c1e5d88fa4d4634f9d3222472c43911c698501e636405bdaefb73a2fb6acff8c28f8453a34a96a2b73924d1d982e6de9af6930936a627bd8ad9fd
-MISC ChangeLog 9871 SHA256 f445209cf4dc98c00a2b4fb1adf9510514ee7cbe23c171e0a7f005906513a825 SHA512 4dbb1ce5889ceb56f6db6a80c9f3c44e631bdbdad21f238d1c8885e52d4eea32af48b37f1d36d5c9d38583b168a41b7455cb170c39efa4c7adc1cd0e80446f58 WHIRLPOOL 207fde92fc51e49f4a760318fc9c7e71507d9d042f4ebe6da1eb012202a79787f5caff09e5aff3438fa943ec4a56c4f898c2e26faac39005ee673f8ab984ca9f
+MISC ChangeLog 10089 SHA256 03550b50e04d3503a0243d62e71e50f760270b27b86ba625b86368902f68ac9f SHA512 88db675f58d5176783b77bd40dfd0bb293ccc7375d9f1fd450fc74934853d368ce59ca060361b432a4ce17b6b0fc0bbd0d490c4e49187bf46200b74f14baed1f WHIRLPOOL cd44bad0951f314916dafe96cabc1446e8b2ca6684cfb70cea436fa305229c3950e712de25d1452d690367f00e51331969899b51eef81b794a62addc64944afc
 MISC metadata.xml 802 SHA256 9a91e503378866f64e17945632402b1d276f130302f75ef397c5f28fd8fda571 SHA512 19bc2c34c961820862584e590c3da7a834e44a7382c004c41b391abf4f8e3ec9230c27bb0fca2f6c2a07cd2008c92ef07b5e24057b7e75ce260ac02d7eb43dd0 WHIRLPOOL 1fed082c89c141bdacd4788a68adc4404acfcc04a0eb6a0a90983538929f2cfde972b5ac70fa521acf2f80a90428f3edd414aa88cb2c2e3fa9a3363517f840b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRa2QpAAoJEDYO1FT4VRUUYMcP/jfErHKeHK6HAlVlSoaAOenn
-qR7gntA6IJKKP2LKAns/lSQ1+hyfEAsTOfBptn0P2dB7mMgnlZwOo8R8nCR6Sr+E
-XmcnYFVHBanYl22isSzgD5RyaMKHTYNIpaNpsUKTR8PGS6xyn7FNIxC3AYGeUni3
-A/+H/EGYwomWYuWg1Yd7a+Aqa31Q6RV3dgHLQ0W1u3P0L8rfn0a1SxQxdYitxxDA
-zbVjVb/VFArFNz3EGKJT77Xz5aKSFqERZ5mx6KE7DehLeIa5u+IqAOvQTDveHxuN
-SGRWZBo0EK9Y0oXZRq8IA5GinUcYalbsEPGNzTsD91t3hLee+SnL2LkO0sqvYnZk
-vAenNcyyEIR3vXW+D/BxLxtPpnVUUpyLpPtcLcKjalQnLWcIupvqXbwfYTP5yz+i
-FBc7w3xDk8ZoOAWULzHnT8XGCnF+KBTc8ldYL9qzyzWSLj37AwUYgWrzDoIHN9ps
-DEntbZWaaXQ7muwB/fKUV/0aTVnnRnExzk+s4bmvT1GF9dOT0yfSrIWboSMlEBCf
-zCsB2S7lMwpUx99IG//dvhW/k6TXo6r9GkjOtEIi2wjfd+4NMievodWdmtjya7U3
-T/mNUdhyRFnmdVrJYK+bhLaAHpd6DYWfEdtZrPPOA3k6vYSo3smOtWCbwoWUAWDB
-p2kUvM4jBQ0WU/uepmdW
-=XneQ
+iEYEAREIAAYFAlFzx5YACgkQfaj9zK3JFuVyogCeKFZ6XA8RKrgrIitz3/wIB00r
+1VAAn1H72Nt5zfTcHnRcRDltVhkmyhDC
+=XPZf
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/fcitx/fcitx-4.2.5.ebuild b/app-i18n/fcitx/fcitx-4.2.5.ebuild
index 5366fb8a806f..a415e218ee67 100644
--- a/app-i18n/fcitx/fcitx-4.2.5.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.5.ebuild,v 1.3 2013/03/02 19:26:41 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.5.ebuild,v 1.4 2013/04/21 10:04:51 lxnay Exp $
 
 EAPI=4
 
-inherit multilib cmake-utils eutils
+inherit multilib cmake-utils gnome2-utils eutils
 
 DESCRIPTION="An input method framework with extension support"
 HOMEPAGE="http://www.fcitx.org/"
@@ -52,25 +52,6 @@ DEPEND="${RDEPEND}
 	x11-libs/libxkbfile
 	x11-proto/xproto"
 
-update_gtk_immodules() {
-	local GTK2_CONFDIR="/etc/gtk-2.0"
-	# bug #366889
-	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
-		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
-	fi
-	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
-
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
-	fi
-}
-
-update_gtk3_immodules() {
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
-	fi
-}
-
 src_prepare() {
 	cp "${DISTDIR}/pinyin.tar.gz" "${S}/data" || die "pinyin.tar.gz is not found"
 	if use table ; then
@@ -106,8 +87,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 	elog
 	elog "You should export the following variables to use fcitx:"
 	elog "  export XMODIFIERS=\"@im=fcitx\""
@@ -117,6 +98,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 }
diff --git a/app-i18n/fcitx/fcitx-4.2.6.1.ebuild b/app-i18n/fcitx/fcitx-4.2.6.1.ebuild
index d1688f0327de..e20bf431777f 100644
--- a/app-i18n/fcitx/fcitx-4.2.6.1.ebuild
+++ b/app-i18n/fcitx/fcitx-4.2.6.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.6.1.ebuild,v 1.4 2013/03/02 19:26:41 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/fcitx/fcitx-4.2.6.1.ebuild,v 1.5 2013/04/21 10:04:51 lxnay Exp $
 
 EAPI=4
 
-inherit multilib cmake-utils eutils
+inherit multilib cmake-utils gnome2-utils eutils
 
 _en_dict_version=20121020  # see https://code.google.com/p/fcitx/downloads/list
 
@@ -57,25 +57,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-proto/xproto"
 
-update_gtk_immodules() {
-	local GTK2_CONFDIR="/etc/gtk-2.0"
-	# bug #366889
-	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
-		GTK2_CONFDIR="${GTK2_CONFDIR}/$(get_abi_CHOST)"
-	fi
-	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
-
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-2.0" > "${EPREFIX}${GTK2_CONFDIR}/gtk.immodules"
-	fi
-}
-
-update_gtk3_immodules() {
-	if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-3.0" ] ; then
-		"${EPREFIX}/usr/bin/gtk-query-immodules-3.0" --update-cache
-	fi
-}
-
 src_prepare() {
 	cp "${DISTDIR}/pinyin.tar.gz" "${S}/data" || die "pinyin data file is not found"
 	cp "${DISTDIR}/en_dict-${_en_dict_version}.tar.gz" "${S}/data" \
@@ -119,8 +100,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 	elog
 	elog "You should export the following variables to use fcitx:"
 	elog "  export XMODIFIERS=\"@im=fcitx\""
@@ -130,6 +111,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	use gtk && update_gtk_immodules
-	use gtk3 && update_gtk3_immodules
+	use gtk && gnome2_query_immodules_gtk2
+	use gtk3 && gnome2_query_immodules_gtk3
 }