override mantainer due to bug inactivity after 1 year, standardize to gnome2_query_immodules_gtk2, fix bug #413497

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

5 files changed, 34 insertions, 53 deletions

diff --git a/app-i18n/atokx3/ChangeLog b/app-i18n/atokx3/ChangeLog
index feddc2d25c11..bfff1f5bd8fd 100644
--- a/app-i18n/atokx3/ChangeLog
+++ b/app-i18n/atokx3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/atokx3
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/ChangeLog,v 1.15 2013/02/13 10:19:11 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/ChangeLog,v 1.16 2013/04/21 09:54:17 lxnay Exp $
+
+  21 Apr 2013; Fabio Erculiani <lxnay@gentoo.org> atokx3-3.0.0-r6.ebuild,
+  atokx3-3.0.0-r7.ebuild, atokx3-3.0.0-r8.ebuild:
+  override mantainer due to bug inactivity after 1 year, standardize to
+  gnome2_query_immodules_gtk2, fix bug #413497
 
 *atokx3-3.0.0-r8 (12 Feb 2013)
 
diff --git a/app-i18n/atokx3/Manifest b/app-i18n/atokx3/Manifest
index 3b009ede5d2b..c7454c8bd217 100644
--- a/app-i18n/atokx3/Manifest
+++ b/app-i18n/atokx3/Manifest
@@ -1,11 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX xinput-iiimf 257 SHA256 0b0f3cc4afed265d420d8ad430950f66db051231447467e607ed57aebaa7b4a1 SHA512 f586e0c09a77565efc15040ba6756e719c2c40af7752d351d193bebce7fcb8460cf8af7b4b3125a8a88aab33ba83d631779a8c6a5d2bab113bac6c41e5fb496b WHIRLPOOL 878af57e19bd0863a771ab1a21be394f78d5e4425f2166d83f01d1cd6bbecd91a0dcf09245a34c65f4bb9fca82b9ec98587cfc49c8cc7657be0c356c9561ddf7
 DIST a20y1006lx.tgz 8365634 SHA256 3768a40facbe327a4342c3696d3d793f087086c01402a66ed5130600f96035c6
 DIST a20y1011lx.tgz 8369537 SHA256 d4ee3643c78bf98bcac6778beccd82a4f6f92860d0d903aae96292637bf9d097 SHA512 6ea62f7c183898f58b2bcf1183914f13f7bffe407494b8bd1ba1ceda645b73c9991ed62b4179dd101cc509bf44c4a1dca353cdf14ab932d38e6af29ba00acb7a WHIRLPOOL b6dcd6b150878f612f37a1e67f0f24a160d881c9391393786540dd3ed6375b9b95efca7c2adf6119513e90c9a205ea1c01c756f1238d52f5e0128404690ba47e
 DIST a20y1211lx.tgz 8471799 SHA256 a6ba278102c3d00363285f0be5d64c6bb35f5a5c10a845cb67bcd70cbc58e57d SHA512 339cecc25089c6c2fe6a31ce34e6c77d38cab3b55596cf9f485189adec7365051d3f236475d72f01b14d0176e6410a2ca6eb6d854498421e3fff006a54d51595 WHIRLPOOL 1e213c4632a2964f9c3622c25f1fa7e680064cf64c118c0bf50ad89278066ea8d9b1be5b15deda2b853e05bdcdabbb8b367e7e02a45a5e7d6a39eaa8083ef192
 DIST atokx3gtk216.tar.gz 69246 SHA256 cd81d0e85872274135d94511ee71eda3f29f00ed299c1dacbdf024b9d96c62e2 SHA512 39c0ff01807626f417f34ef02e4be2fe07c52edc931775299e90fd8725d9c870c3473005fc87be5023d089e94fb4700f9ad36a10ad3373be22ec35e2a418eddd WHIRLPOOL 9bdad5de28564d0c7e3e1b3d67bc0fea09e2b1e9af5fb301ebbb90bc41e58fee405468020a06c84b0d97e3bbab28d7e421a0d9d293d9b957230fa476f823302d
 DIST atokx3up2.tar.gz 8427265 SHA256 d9aae2b3917c3370bd40a3f0f767ad15a09a586986e906835952264cd5c1d28e SHA512 b4ce05882418a18e6a0ab58d805a1edeca69187bfa16a98b8f79d749ec0cfdc1b838de30f3049d3b8b0929214164c4c2054dbe283dce0f18a1ab2daa181e306d WHIRLPOOL 43b5e32e62cba0122e918f497a5c5d1da1b303721af8eb00b70a840431cc2aa0ffa7a7009cb4253caab690445a9921741aa6a6394044c4907e1acd1376c6c76e
-EBUILD atokx3-3.0.0-r6.ebuild 5078 SHA256 85c2f0d2c6b278a8e3b31a921afe9349d945830fa0d3723bf9d0c04d8c7f4ddd SHA512 6c893cb8726b0e31da9f1eb01b544046d9b53915122812d4f6fbb095eec9c47c8c1b71a73685278011e0d4b89d39c42ed6e1f95744187d5c1f685307fbc284c2 WHIRLPOOL 21e6df05017048fd037eac23f85fc2164e5cfbddc919cfecf4933e7c6b4a55ceba8495d8f4dff947b013ff145ddecb4e27546c89daf8bbb80f6887d3820a9b4a
-EBUILD atokx3-3.0.0-r7.ebuild 6074 SHA256 0b1e9ad76bdd5eb69b332e5d7277284ce3bad11f397c898ede85f4edac2ca0e0 SHA512 229389c8b48f4b38c841037647c80f823824a2a222a2004beff6e5268efb7f650e2419ceda0c95bb149442dc7a56f2fa8130bb8b02cdcd9ca2909747c08f8302 WHIRLPOOL dcfee27d49eb04ca81788377d50db8607eff8b1e090dffec8386550c046f4182f1061673462ab425721f2def00b97bf1266a2a372e0cbb2d8982cb0e3821c182
-EBUILD atokx3-3.0.0-r8.ebuild 6157 SHA256 51eb24bd24e4c771c4686abbe6ea77a77ff80b2072439072b5384e6865742609 SHA512 4aa325584d8bcf3e755119599fd0c1dcee0920168f3fb2b82f781937badc71e08aef41e9d3571ec762975dc8c495e45f38db2892d408eeff138c4f6a4f610bf6 WHIRLPOOL 46848c16d377ccc83a6a833c33c619a61c55d41b5473cb238162cc85cd2848cb74aeef7186baf025e84b25e7e745ed9abf7b940d85268918e9f2e1e6617ae67f
-MISC ChangeLog 2752 SHA256 a82315359889f6bf2a548b84b6b3932c5f7db93a5277106db9fed263be4f1219 SHA512 d60fa13c8e43f5d57753c104ab48c8b3e5a0127d30de68b40164c142d1402d395c7a5b0cc11396e1eed00943be0169dcfe1ccda1fdb70896d33e1def2130b5e3 WHIRLPOOL 273fa71031c893941fd315e78b3a850e809a3957bb6b0a48647334a04836621a5c68e14d4cdff813081d15dc68ad7bcdc8d9611883607329d04e79581eebde6c
+EBUILD atokx3-3.0.0-r6.ebuild 4969 SHA256 ed211e7cb4a6aafdfe5763e046732c8b0ca77beb464285958149245be8c55a6a SHA512 f5a6988cfb3a40f4f9109f22cc3fb4abe18fc0fecaba9e4f1557ad47856247e82a0f9909d460b40e0698051e601f6a1d498261296c22fb2e136b61a29d5b5e09 WHIRLPOOL d79b53a4c4a8696cb8604aa632b7020f36a0ad3ef89c062a5fa61773efd015db9fc18751e5ccef09cbd3c3b826501eb521b90b9de5d2ab639667253cc68f0b89
+EBUILD atokx3-3.0.0-r7.ebuild 5502 SHA256 c5949fca6215970e63ed16e31958216a0601d77977c7872bccd580c651805566 SHA512 c1e60617cbea0d56ce3d5b4730e47839ad5ba5f46ffed6e03917ac90c7eccc854bf0a5682213aa6193180a694c0cd2b800f7982ebbdd43c30c6a4a5509b51d77 WHIRLPOOL 25b0038cb279dc5892a2ae7eec13b65f44f815c8fc18105879388943a7599a8ad39a723c67591994542613c223309de0873e9d140395f5a38cea33ae38e3d911
+EBUILD atokx3-3.0.0-r8.ebuild 5542 SHA256 795ed8e73d7193b9a9fbf577de96e2578cd64431e73d2b548ccf62f351142a95 SHA512 1542c8bb4ae32a296ca2c46207194ea5f69a6a7f4db3595230815e9e02f3065d1189cb18b2838b18935a8a1ac434e859943f56d6ee8bd65912b700d2a1706084 WHIRLPOOL 57c8dccb1bd80900889fced0ef159c1b2145cb0050b442394ff502adf2972077ffb278c6d51d6c18401ab4cee683291ececfa065f458cf4e68d6397dcf211929
+MISC ChangeLog 2995 SHA256 e142014a38544c6bb321c1773769e97c315a69bd344b4c20b6cfaa932ce398bf SHA512 97b87f7d756c7639380a97e0547a9a89cfccf48f7cdbfcfff28009b0cba3c9a163286d0de18b11c11560d5bbb843eb4e1fae19b824f2a4771bd793f91ddc72af WHIRLPOOL 3e7c2c654d33e5a19f0b327c719634829ff783c6056a22d1f5c2c428aaa7c12eb3dc901d1d7a4df5d95b17f9c393329c5d0efc17173412b134126d9362700bf7
 MISC metadata.xml 156 SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 SHA512 e46682afa9f674a8685beb29de6485f750484180d86f8980a3c5c220861f38495ac6f4ceda7cf21c317c640d0d218af3ea9bc1a406b207124c1ffb4bcc99628b WHIRLPOOL 347b826ae650374a01eb144ef127dea2fb96c8646b9a1e4b142bce523822988c4597bc2980cc29dcbfeabc1e44ba70136ddea73f1837d4c6ef7d5e3e9d1d1268
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlFzxRsACgkQfaj9zK3JFuVSPwCfZ6VrV28c1biBwZtA35r67tVf
+OREAnjMRWMVeE8vIaZNaDRfUxRC6VEDg
+=HAr+
+-----END PGP SIGNATURE-----
diff --git a/app-i18n/atokx3/atokx3-3.0.0-r6.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r6.ebuild
index 059ed6324ac6..ad5c8b4de95c 100644
--- a/app-i18n/atokx3/atokx3-3.0.0-r6.ebuild
+++ b/app-i18n/atokx3/atokx3-3.0.0-r6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/atokx3-3.0.0-r6.ebuild,v 1.3 2012/01/26 21:47:04 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/atokx3-3.0.0-r6.ebuild,v 1.4 2013/04/21 09:54:17 lxnay Exp $
 
 EAPI="1"
 
-inherit cdrom eutils multilib
+inherit cdrom eutils gnome2-utils multilib
 
 MY_UPDATE_P="${PN}up2"
 MY_UPDATE_GTK="${PN}gtk216"
@@ -166,9 +166,9 @@ pkg_postinst() {
 	elog
 	elog ". /opt/atokx3/bin/atokx3start.sh"
 	elog
-	[ "${ROOT}" == "/" ] && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
+	gnome2_query_immodules_gtk2
 }
 
 pkg_postrm() {
-	[ "${ROOT}" == "/" ] && gtk-query-immodules-2.0 > "${ROOT}/${GTK2_CONFDIR}/gtk.immodules"
+	gnome2_query_immodules_gtk2
 }
diff --git a/app-i18n/atokx3/atokx3-3.0.0-r7.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r7.ebuild
index e524160d45e3..d00a426d48b0 100644
--- a/app-i18n/atokx3/atokx3-3.0.0-r7.ebuild
+++ b/app-i18n/atokx3/atokx3-3.0.0-r7.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/atokx3-3.0.0-r7.ebuild,v 1.3 2012/01/26 21:47:04 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/atokx3-3.0.0-r7.ebuild,v 1.4 2013/04/21 09:54:17 lxnay Exp $
 
 EAPI="3"
 
-inherit cdrom eutils multilib
+inherit cdrom eutils gnome2-utils multilib
 
 MY_UPDATE_P="${PN}up2"
 MY_UPDATE_GTK="${PN}gtk216"
@@ -61,21 +61,6 @@ RDEPEND="!app-i18n/atokx2
 
 S="${WORKDIR}"
 
-update_gtk_immodules() {
-	if use amd64 && has_multilib_profile ; then
-		if [ -x "${EPREFIX}"/usr/bin/gtk-query-immodules-2.0 ] ; then
-			"${EPREFIX}"/usr/bin/gtk-query-immodules-2.0 > "${EPREFIX}/etc/gtk-2.0/$(get_abi_CHOST)/gtk.immodules"
-		fi
-		if [ -x "${EPREFIX}"/usr/bin/gtk-query-immodules-2.0-32 ] ; then
-			"${EPREFIX}"/usr/bin/gtk-query-immodules-2.0-32 > "${EPREFIX}/etc/gtk-2.0/$(get_abi_CHOST x86)/gtk.immodules"
-		fi
-	else
-		if [ -x "${EPREFIX}"/usr/bin/gtk-query-immodules-2.0 ] ; then
-			"${EPREFIX}"/usr/bin/gtk-query-immodules-2.0 > "${EPREFIX}/etc/gtk-2.0/gtk.immodules"
-		fi
-	fi
-}
-
 pkg_setup() {
 	if ! cdrom_get_cds atokx3index ; then
 		die "Please mount ATOK for Linux CD-ROM or set CD_ROOT variable to the directory containing ATOK X3 for Linux."
@@ -192,9 +177,9 @@ pkg_postinst() {
 	elog
 	elog ". /opt/atokx3/bin/atokx3start.sh"
 	elog
-	update_gtk_immodules
+	gnome2_query_immodules_gtk2
 }
 
 pkg_postrm() {
-	update_gtk_immodules
+	gnome2_query_immodules_gtk2
 }
diff --git a/app-i18n/atokx3/atokx3-3.0.0-r8.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r8.ebuild
index f55c79c30f63..26f42be677cd 100644
--- a/app-i18n/atokx3/atokx3-3.0.0-r8.ebuild
+++ b/app-i18n/atokx3/atokx3-3.0.0-r8.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/atokx3/atokx3-3.0.0-r8.ebuild,v 1.1 2013/02/13 10:19:11 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/atokx3/atokx3-3.0.0-r8.ebuild,v 1.2 2013/04/21 09:54:17 lxnay Exp $
 
 EAPI="3"
 
-inherit cdrom eutils multilib
+inherit cdrom eutils gnome2-utils multilib
 
 MY_UPDATE_P="${PN}up2"
 MY_UPDATE_GTK="${PN}gtk216"
@@ -63,25 +63,6 @@ EMULTILIB_PKG="true"
 
 S="${WORKDIR}"
 
-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
-
-	if use amd64 && has_multilib_profile ; then
-		if [ -x "${EPREFIX}/usr/bin/gtk-query-immodules-2.0-32" ] ; then
-			"${EPREFIX}/usr/bin/gtk-query-immodules-2.0-32" > "${EPREFIX}/etc/gtk-2.0/$(get_abi_CHOST x86)/gtk.immodules"
-		fi
-	fi
-}
-
 pkg_setup() {
 	if ! cdrom_get_cds atokx3index ; then
 		die "Please mount ATOK for Linux CD-ROM or set CD_ROOT variable to the directory containing ATOK X3 for Linux."
@@ -198,9 +179,9 @@ pkg_postinst() {
 	elog
 	elog ". /opt/atokx3/bin/atokx3start.sh"
 	elog
-	update_gtk_immodules
+	gnome2_query_immodules_gtk2
 }
 
 pkg_postrm() {
-	update_gtk_immodules
+	gnome2_query_immodules_gtk2
 }