Convert gtk-query-immodules-gtk2 into safe usage. #413527

Package-Manager: portage-2.2.0_alpha134/cvs/Linux x86_64

4 files changed, 37 insertions, 18 deletions

diff --git a/app-i18n/x-unikey/ChangeLog b/app-i18n/x-unikey/ChangeLog
index 332f6f9390f4..bc62a780dc85 100644
--- a/app-i18n/x-unikey/ChangeLog
+++ b/app-i18n/x-unikey/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/x-unikey
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/ChangeLog,v 1.24 2012/05/03 19:24:33 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/ChangeLog,v 1.25 2012/10/09 13:31:13 naota Exp $
+
+  09 Oct 2012;  <naota@gentoo.org> x-unikey-0.9.2.ebuild,
+  x-unikey-1.0.4-r1.ebuild:
+  Convert gtk-query-immodules-gtk2 into safe usage. #413527
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> x-unikey-1.0.4-r1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
@@ -92,4 +96,3 @@
   files/01x-unikey:
   new package, committed by Lang Thang <langthang@vn21.homelinux.org> in bug
   #49301
-
diff --git a/app-i18n/x-unikey/Manifest b/app-i18n/x-unikey/Manifest
index 61de82baf2f2..2ed23b0a9de2 100644
--- a/app-i18n/x-unikey/Manifest
+++ b/app-i18n/x-unikey/Manifest
@@ -1,10 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 01x-unikey 214 SHA256 503f1e6e0157ed0764192421a92aea7e4f356f8e733000dd06322ee8e84f0db4 SHA512 32f2911d78940a3064b05e211af6d297b1adfafae69817e91f209490c6d43025cbe40276b5e637becaf412c50450905639c5c9293a5bdef45d47d5ca23b88aca WHIRLPOOL 195bd7987c41413506292b2f98f2ea29eaaa31994286529fe58b2c931a373745785921f73ba88a2dcc690b04623e9593a95f72f0cd3df522150ce8a11c27a1c5
 AUX x-unikey-1.0.4-gcc43.patch 397 SHA256 e1c98c5eeab86b365174eae9cd2f754f0b0ca7247e7279d0ebe05f6cd8f0e119 SHA512 80daceadf9b7519d1684853814ecae66ee3464aade581ddbd40cfb1b71f6ebcbc3f9efb01510fd76678f27c8805a8215062f82a403be77ab171ff86a2baf9473 WHIRLPOOL c8a1eeaa4838a326ba80b9df655dbdf93e34637b8afd2308d734bf29e3c6ab16a2c8ad94608c052e76eb696324e34a2085f81b0ee6def20f3490f48f2224d3f3
 AUX x-unikey-1.0.4-gcc44.patch 995 SHA256 ada679a52b6bdf2c4b6be6012db1f9914d824cc6ccffe01debc6fb98d89cc06f SHA512 718fc23452485b9515e3a39b5578b42fdf9bfcbfa1f1c47e2cf16dc0e65f7e2620b4ea3783670d275546ad902024cb3f599af2a9a987eb1591d190e27d2d67ee WHIRLPOOL 53a7403ba84485deb3a58e768041b5e4f9f95c37d624bc9e9c8c738868281d4094d86d2deaee82d4e151a15f36a2e0c6a5747e305f3138c75dff17ffe02551cc
 AUX x-unikey-1.0.4-gentoo.patch 614 SHA256 648e3e7df95a51ba7c0e1b9fee30ba104ca0c3705138a30a66b12ca92be0bbd9 SHA512 928f934aa0cc3a5bb41a3df1352ec0c93c7ff49524e696a6f0361f2b916431a6f8bc4d013805c0c92a2ec0cc8b053fdabd8393fbb36d39ace1c52860bed21b14 WHIRLPOOL c3c26efc30d42a5ac515e07e76851ba282637ca1b6f44fe1e41a5e3234304c8fea16c999bd782893c847f5c9e7ddd443104e18f4534d37ce48584098cc04a71b
 DIST x-unikey-0.9.2.tar.bz2 347785 SHA256 54c810c23ed51c31e8ed44702eca38358c5864caba95d84049c782f4c241c250 SHA512 2ebbd59f894f9900c8737d7509c3463554efc7e12513cac1ef5a44785f745957f908504fadbd7f8b85cad3add99d695c87f1b6d5e704627687f43993fd13a337 WHIRLPOOL 1e7f580c852b20dbcd3119ccb7ac63464cb3847b3b79b025781a84519604a5e3c9760ae7c1290fe328b727042b5bf93505105505d1499e915cb5ddb1c7044191
 DIST x-unikey-1.0.4.tar.bz2 561391 SHA256 aa7dd444853538bcba0f24c4c19692c34d4553a1df213a260c2628a7116b2dd9 SHA512 47abe4087957c4926550a0121d5cdc7b760f39691fae91c8e0562fc0f4577c22a04192667d362c9838b87fd97d2111afef1260fc88d8234bc5656bab248b5b06 WHIRLPOOL 144788e4a43e55c5a30fbb11eba6953d147823d3229550cbec370d583fd1a74e97f68c3e14b1988074788561f4e0adb836829f06ab88b1f725051dd3840256d9
-EBUILD x-unikey-0.9.2.ebuild 1511 SHA256 4fbff02c24c62aaead4f0c63808215f818a1bcb89635b468329b1aca5d76e003 SHA512 0acbeec7ba5741af949a0cde00f2d51eda61bed764a2624c8c68f94e890ba5ddb5faf12ee8fe5644b0a8eec7d3ad5f34e14a47d0af6bb9e8c5151507fb53d1e5 WHIRLPOOL 9c6a6e57bf8b171bdea0826c7693edcbc0db9d434479adf2cbbb4bb3404aa7a398cda5d63405f70314614e1388a02912b8ed0b10658b6120b57c057dd48ffb5c
-EBUILD x-unikey-1.0.4-r1.ebuild 2099 SHA256 2ecd76374f4fa630ed11e616edf06c7e0c4b89ab53e9adf20c7456bc6cb113ce SHA512 9cac675e9458944ec7390bfd151a06b5503c34be33c9d810832bd0ecde6e25d43b3621f5c5d114555a19819e5734b7593c958dc1851f2dd4505b7ec4dc60f3b9 WHIRLPOOL 42033889b467e4527d0bcb137c381fa55af6c217e32036232f20685e688f9f6b49c39d2b5b5b41215704c5ae13a66dfa794123a00dc17ab17dbfceec69b1926d
-MISC ChangeLog 3122 SHA256 d67abd92feeb749e841f9b63dade65feca5ef326bc61cde818b492e95bac249b SHA512 eb0fd875c0d1a0a69a04f2ca566eca88e07a95d7004d48316969fd0fa02b26effef01545e160bbb85230bc6821f0778018b4b6aa4a3e3b02e87243410611df52 WHIRLPOOL c514eaef0629dbb465d428e63fcacb6da7d38282a59fda4b833c8a9b2f54f28ae7b6da26b262d694104a4b2b1b8de989fa2a7afe0975c6b3f570f9fffc16b577
+EBUILD x-unikey-0.9.2.ebuild 1441 SHA256 8e5ddbf9968daa0cb2db01146ec5ad1b3517c71ef9e47d122d51e4c96d8b884d SHA512 355dc6571d6f3cbbc27d68e0dae3b40541585d2cf32a3f8b997adae5bc22de56f32e93f885f2300607ad02d5f3b8fac6936601d1ec9e46f3d0a00d173efd6bd5 WHIRLPOOL d525782491eef59c3fcc40a1cd5f28b4b2dca763f907414acb546653e8e94f4cf681d1f109ece7b239b1f907ccf331b4727ae02894e8788f152a52513d7460f6
+EBUILD x-unikey-1.0.4-r1.ebuild 2023 SHA256 5c49393612c5e9c05f34eb8fcfaa3da16cf62bd6cddaee62bf59eedfe0e90099 SHA512 ea691fe9967face766e6d093a3bfa8a2719cf7e0a23de2ee69bd5fd6b18966be944499abb6d43f9e3de6b77a9844b919e948742463596e39fc9bfac68ba6cf10 WHIRLPOOL c5f9c94789bc457c63b85057830947895fefa4b86d96ed6882386154b1d3b3b26b9998b744067f43bd78c28c0d9fe4b84a84463f60eb571a4220e936aeecb267
+MISC ChangeLog 3267 SHA256 795b5029b9ad8a53cc6bf6f63eba4e30a634b2233bf7d75647b0543b22788824 SHA512 523ab6761bcb25514241038be1c60ee149cfea87635dc7e9f42ed5ad1b08a22fb25936f5b14216f6e0c9fe51a2a055c6caaedbf9e95119e9f54fc1ed8a4643a6 WHIRLPOOL 6c1d5aeb60bf79339b20d9d6d86d2ed67ed9b9a6f7b3b03d95185ef42f87b092c55e076d9b9759211cb8b4b71440483ee22f906e572c02f1fb9354db7b66e33b
 MISC metadata.xml 158 SHA256 18d71c580f82a389887f4970802b5f40e0a2e4c6019117e64268e008dfb81fc8 SHA512 6198c41a4d69a5ca0029aa9a593cc0ea553dc957fc0bdcd7bcd3bd1af7f84c5feaaf785160b60b8ed75282987818a6367f6092523cacd45f0c35494036043550 WHIRLPOOL 478bed9e1c3fbbcb13f17ffeebc2b9da5f3c48368e8a95c2802a88dbef4773f992fa254e4dc460248d5669021fe4e37b37be522d186da9d97321a58437679662
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQdCcsAAoJEDYO1FT4VRUUMHEP/3UkF5xj736lBHDnQKQZRJaK
+yM//Ah5xIsivH6/zhvYNo1zGEH3Ah+wn/ruP3RusHDQymbb1XAlyrDf0DMiHibgi
+rfdfoZ6GsCqn3jZcQhO1sRXw+Udz3CHBDmgXOCSvNDzeeXPuL/idPO+fkrJwtjwW
+2vKryooWKptfQQGROjrgMtZo2lpdNxKDOMwINBqrZyzsIKoi6wD2b6DL4xCQAPPq
+a1kRBTWrrEUlPWpkMgSefqb8ZwuuitORVUL/V4jveMGy7XSy4Gi5qH2WivL4/xH/
+vh6wDh88C9JO/wDTuIBjZw9iCjTf22Dc+A1ppJQFCCDfVOZac/d+OTovq9KKkyLt
+rpRN6Q//4KJh6Su4iLshRgR0ZVUV7TjXdTzknBpv3umig/JTSX52OaADttrpOTSU
+kMmQoq8eM+BOZShNZQS9IWlbiSsgYwLCHI0wlsLjBkR88Wswlydn+EQPM3vHYQLv
+G7bD/F/QpTOafSJ1VU8/EPpMiBDYIsVq3ac/JufK1YrRmERN4lKvYDEkAk9gCtBY
+/BrXRU2mCFTGRtdyzzRFkP1DGXVCeShAkR/I8HY4anYTWv0ZoMqw4NlEaMUkJudY
+s0x3SVKvA53QbykgyXvRqqUimTkDNtncnOr2aj0U7j/peqq6suJABYRrCVqmkGeV
+7qmiT97o6FXhp3nH0U8J
+=DUOb
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/x-unikey/x-unikey-0.9.2.ebuild b/app-i18n/x-unikey/x-unikey-0.9.2.ebuild
index e105f2b45e90..547753ea7439 100644
--- a/app-i18n/x-unikey/x-unikey-0.9.2.ebuild
+++ b/app-i18n/x-unikey/x-unikey-0.9.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/x-unikey-0.9.2.ebuild,v 1.10 2011/03/27 11:39:42 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/x-unikey-0.9.2.ebuild,v 1.11 2012/10/09 13:31:13 naota Exp $
 
 EAPI="1"
 
-inherit eutils
+inherit eutils gnome2-utils
 
 DESCRIPTION="Vietnamese X Input Method"
 HOMEPAGE="http://unikey.sourceforge.net/linux.php"
@@ -46,7 +46,7 @@ pkg_postinst() {
 	elog "to enable x-unikey"
 	elog ""
 	if use gtk; then
-		gtk-query-immodules-2.0 > "${ROOT}"/etc/gtk-2.0/gtk.immodules
+		gnome2_query_immodules_gtk2
 		elog "If you want to use x-unikey as the default gtk+ input method,"
 		elog "change GTK_IM_MODULE in /etc/env.d/01x-unikey to \"unikey\""
 		elog ""
@@ -54,7 +54,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	if use gtk; then
-		gtk-query-immodules-2.0 > "${ROOT}"/etc/gtk-2.0/gtk.immodules
-	fi
+	use gkt && gnome2_query_immodules_gtk2
 }
diff --git a/app-i18n/x-unikey/x-unikey-1.0.4-r1.ebuild b/app-i18n/x-unikey/x-unikey-1.0.4-r1.ebuild
index b4ecb64e560a..084a2eab6dba 100644
--- a/app-i18n/x-unikey/x-unikey-1.0.4-r1.ebuild
+++ b/app-i18n/x-unikey/x-unikey-1.0.4-r1.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/x-unikey/x-unikey-1.0.4-r1.ebuild,v 1.5 2012/05/03 19:24:33 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/x-unikey-1.0.4-r1.ebuild,v 1.6 2012/10/09 13:31:13 naota Exp $
 
 EAPI="1"
 
-inherit autotools eutils multilib
+inherit autotools eutils multilib gnome2-utils
 
 DESCRIPTION="Vietnamese X Input Method"
 HOMEPAGE="http://www.unikey.org/"
@@ -68,7 +68,7 @@ pkg_postinst() {
 	elog "to enable x-unikey"
 	elog
 	if use gtk; then
-		gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
+		gnome2_query_immodules_gtk2
 		elog "If you want to use x-unikey as the default gtk+ input method,"
 		elog "change GTK_IM_MODULE in /etc/env.d/01x-unikey to \"unikey\""
 		elog
@@ -76,7 +76,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	if use gtk; then
-		gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
-	fi
+	use gkt && gnome2_query_immodules_gtk2
 }