Fixed gconf directory path on amd64 platform; bug #70727.

5 files changed, 22 insertions, 18 deletions

diff --git a/app-i18n/scim/ChangeLog b/app-i18n/scim/ChangeLog
index cd6d7df55b44..e44979eaabba 100644
--- a/app-i18n/scim/ChangeLog
+++ b/app-i18n/scim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/scim
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.40 2004/10/23 10:06:02 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.41 2004/11/14 05:44:22 usata Exp $
+
+*scim-1.0.1-r1 (14 Nov 2004)
+
+  14 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> -scim-1.0.0-r2.ebuild,
+  +scim-1.0.1-r1.ebuild:
+  Fixed gconf directory path on amd64 platform; bug #70727.
 
   23 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> scim-1.0.1.ebuild:
   Stable on x86, alpha and ppc.
diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index 2e4f0be365a3..a515c5274fae 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -1,21 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 6acd7f9af5ab8c5e144da71a0f81cc30 ChangeLog 6590
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 c21fdcca07deaaf6cae39d96902f9469 scim-0.9.7.ebuild 2153
 MD5 799f384f4aad7f369481b95ebc23ef01 scim-1.0.1.ebuild 3130
-MD5 b794a9e49a7db678e13f7e617334cf4f scim-1.0.0-r2.ebuild 3133
+MD5 105cbde2938ccbb2fe282bba0d5666a8 scim-1.0.1-r1.ebuild 3313
 MD5 d86c4d5f55ed787493e72180ae6e69cc scim-0.99.8.ebuild 2819
 MD5 4b50ec45c69e938123b22d03e8049859 files/digest-scim-0.9.7 63
 MD5 2a235919f3066c4ffddb3f693ab8c0ce files/digest-scim-1.0.1 63
-MD5 ce0f75383c966331dfcad6088ec9daba files/digest-scim-1.0.0-r2 63
+MD5 2a235919f3066c4ffddb3f693ab8c0ce files/digest-scim-1.0.1-r1 63
 MD5 95e4d06699356649f034690e3c3e870e files/scim-0.6.1-gtk2immodule.patch 545
 MD5 da242924a42bdb73b70898a598f6ad07 files/digest-scim-0.99.8 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBeiulVWNWqTUmv+0RAgNMAKCMN51blrk8cfGr7BmjmHK32Vrp4ACgikl7
-r/IjNzv2LZV8yomwcYwyjs4=
-=lQis
------END PGP SIGNATURE-----
diff --git a/app-i18n/scim/files/digest-scim-1.0.0-r2 b/app-i18n/scim/files/digest-scim-1.0.0-r2
deleted file mode 100644
index e518067ee194..000000000000
--- a/app-i18n/scim/files/digest-scim-1.0.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 810741700b2ea73467eb3de6b61f3330 scim-1.0.0.tar.gz 2309045
diff --git a/app-i18n/scim/files/digest-scim-1.0.1-r1 b/app-i18n/scim/files/digest-scim-1.0.1-r1
new file mode 100644
index 000000000000..d4731defe574
--- /dev/null
+++ b/app-i18n/scim/files/digest-scim-1.0.1-r1
@@ -0,0 +1 @@
+MD5 f30d235cd5942014a9f12a05118705a1 scim-1.0.1.tar.gz 2311537
diff --git a/app-i18n/scim/scim-1.0.0-r2.ebuild b/app-i18n/scim/scim-1.0.1-r1.ebuild
index a4d31fd7744e..53c03422e2b6 100644
--- a/app-i18n/scim/scim-1.0.0-r2.ebuild
+++ b/app-i18n/scim/scim-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.0.0-r2.ebuild,v 1.3 2004/10/06 07:35:28 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.0.1-r1.ebuild,v 1.1 2004/11/14 05:44:22 usata Exp $
 
 inherit gnome2 eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://freedesktop.org/~suzhe/sources/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 alpha ppc ~amd64"
+KEYWORDS="~x86 ~alpha ~ppc ~amd64"
 IUSE="gnome gtk immqt immqt-bc"
 
 GTK_DEPEND=">=x11-libs/gtk+-2
@@ -46,6 +46,14 @@ has_gtk() {
 	fi
 }
 
+get_gtk_confdir() {
+	if useq amd64 || ( [ "${CONF_LIBDIR}" == "lib32" ] && useq x86 ) ; then
+		echo "/etc/gtk-2.0/${CHOST}"
+	else
+		echo "/etc/gtk-2.0"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	# use scim gtk2 IM module only for chinese/japanese/korean
@@ -99,10 +107,10 @@ pkg_postinst() {
 	einfo "	# emerge app-i18n/scim-m17n"
 	einfo
 
-	has_gtk && gtk-query-immodules-2.0 > ${ROOT}etc/gtk-2.0/gtk.immodules
+	has_gtk && gtk-query-immodules-2.0 > ${ROOT}$(get_gtk_confdir)/gtk.immodules
 }
 
 pkg_postrm() {
 
-	has_gtk && gtk-query-immodules-2.0 > ${ROOT}etc/gtk-2.0/gtk.immodules
+	has_gtk && gtk-query-immodules-2.0 > ${ROOT}$(get_gtk_confdir)/gtk.immodules
 }