Fixed bug #91121, use the correct GTK2_CONF_DIR on multilib systems.

Package-Manager: portage-2.0.51.19

3 files changed, 19 insertions, 22 deletions

diff --git a/app-i18n/uim/ChangeLog b/app-i18n/uim/ChangeLog
index c4f417a409f8..85032e3d0695 100644
--- a/app-i18n/uim/ChangeLog
+++ b/app-i18n/uim/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-i18n/uim
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.90 2005/03/30 05:16:55 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/ChangeLog,v 1.91 2005/05/02 13:25:03 matsuu Exp $
+
+  02 May 2005; MATSUU Takuto <matsuu@gentoo.org> uim-0.4.6-r1.ebuild:
+  Fixed bug #91121, use the correct GTK2_CONF_DIR on multilib systems.
 
 *uim-0.4.6-r1 (30 Mar 2005)
 
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index fb54d97454bc..bf73a5953ea8 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -1,22 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c08e9bb448d9860508b3f91d85f1fddb ChangeLog 13574
-MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
-MD5 9ae8c34bd7e46587513962d2fbc49e5b uim-0.4.6.ebuild 2859
-MD5 213b2d58200cf110447792600d84114c uim-0.3.4.2.ebuild 1634
 MD5 e2da686b5a01b4b56aad82fc0ef343c4 uim-0.4.5.1.ebuild 2225
-MD5 3497019f2fddde49dfd29fa317fe803a uim-0.4.6-r1.ebuild 3137
-MD5 2e727a4087d5b9811a6d153a375faa2f files/digest-uim-0.4.6 139
-MD5 b9c8399a56165f6cfe164b17a273ea2a files/digest-uim-0.3.4.2 63
-MD5 a7a77bd306695255ca9d2a378b599816 files/digest-uim-0.4.5.1 64
+MD5 97ae1c6e8d041db34d850ba79592d6cf uim-0.4.6-r1.ebuild 3316
+MD5 213b2d58200cf110447792600d84114c uim-0.3.4.2.ebuild 1634
+MD5 9ae8c34bd7e46587513962d2fbc49e5b uim-0.4.6.ebuild 2859
+MD5 949010274af27e4d40600aa48c4e0c0b ChangeLog 13717
+MD5 f5659d73ef347dcb529d867d6d5b4272 metadata.xml 642
 MD5 43709db248e2be1d40952ce99d3cae00 files/uim-gtk-query-immodules-gentoo.diff 552
 MD5 7f949b6287f391906786f248a64ec0b3 files/digest-uim-0.4.6-r1 192
+MD5 2e727a4087d5b9811a6d153a375faa2f files/digest-uim-0.4.6 139
 MD5 8441b16a6e27ce2428f377da2a8eb07e files/uim-pinyin-big5-gentoo.diff 275
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCSjQ9VWNWqTUmv+0RAmfsAJ9jCqZDjRoZzEVgkHJXE/5q3nuSEwCgtE88
-1IcAcPjOzHTPBDNjCBUOjuo=
-=tnNw
------END PGP SIGNATURE-----
+MD5 b9c8399a56165f6cfe164b17a273ea2a files/digest-uim-0.3.4.2 63
+MD5 a7a77bd306695255ca9d2a378b599816 files/digest-uim-0.4.5.1 64
diff --git a/app-i18n/uim/uim-0.4.6-r1.ebuild b/app-i18n/uim/uim-0.4.6-r1.ebuild
index 02b5b05e3ec8..3519db15e42d 100644
--- a/app-i18n/uim/uim-0.4.6-r1.ebuild
+++ b/app-i18n/uim/uim-0.4.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.4.6-r1.ebuild,v 1.1 2005/03/30 05:16:55 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim/uim-0.4.6-r1.ebuild,v 1.2 2005/05/02 13:25:03 matsuu Exp $
 
 inherit eutils kde-functions
 
@@ -35,6 +35,10 @@ DEPEND="${RDEPEND}
 	>=sys-apps/sed-4
 	nls? ( sys-devel/gettext )"
 
+# An arch specific config directory is used on multilib systems
+has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
+
 src_unpack() {
 	unpack ${A}
 	cp "${DISTDIR}"/skk-dic-serv.diff2.bin "${WORKDIR}"/skk-dic-serv.diff2.gz
@@ -103,9 +107,9 @@ pkg_postinst() {
 	ewarn "or uim-im-switcher-qt."
 	ewarn
 
-	use gtk && gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
+	use gtk && gtk-query-immodules-2.0 > ${ROOT}/${GTK2_CONFDIR}/gtk.immodules
 }
 
 pkg_postrm() {
-	use gtk && gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
+	use gtk && gtk-query-immodules-2.0 > ${ROOT}/${GTK2_CONFDIR}/gtk.immodules
 }