Add patch to make it work with Firefox and Thunderbird. Bug #390053

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

4 files changed, 136 insertions, 6 deletions

diff --git a/app-i18n/scim/ChangeLog b/app-i18n/scim/ChangeLog
index 5dbd51eea73b..e1c71482b115 100644
--- a/app-i18n/scim/ChangeLog
+++ b/app-i18n/scim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/scim
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.146 2011/10/28 07:56:51 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.147 2011/11/17 09:06:46 naota Exp $
+
+*scim-1.4.11-r1 (17 Nov 2011)
+
+  17 Nov 2011; Naohiro Aota <naota@gentoo.org> +scim-1.4.11-r1.ebuild,
+  +files/scim-1.4.11-type-module-use.patch:
+  Add patch to make it work with Firefox and Thunderbird. Bug #390053
 
 *scim-1.4.11 (28 Oct 2011)
 
diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index 7b796a49820c..e94026dd5a44 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -1,20 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX scim-1.4.11-type-module-use.patch 413 RMD160 3ffe2dea0115a49447a2d4c4c3901ddfba791597 SHA1 6941158c0f16f93f15acc7a6c8cb607b7c6e3c17 SHA256 997623d2a467ad87d49eab3dec1cd766718e2431da52d71e474c9ff74cb938c1
 AUX scim-1.4.7-syslibltdl.patch 1676 RMD160 a6ad514f5beb1bbcbaa7a07083eecba44866ee70 SHA1 f1c485ab9c47251322fa8686d63aaeb931a5f364 SHA256 ee807b34d95df48af40abc1a4d285d7929548481be44aba1bab407e22f406d88
 AUX scim-fix-disappeared-status-icon.patch 1458 RMD160 97e989cea36b07c1d4f44d2c4585615b467891ad SHA1 7697b1058660ba777941f2cd59dc4f76386f82c1 SHA256 f6ce00bfe8046c21b1509146d9d90ae919ed577c25fbaa9d9bff68cd776a064e
 AUX xinput-scim 240 RMD160 e4cab8abb18806de99429fc409eb583c3e329a0d SHA1 6691ef3ea04a14040a24f7ceedc6a30d4111c47f SHA256 f2dd0ba47112298f4da79692f89d1447c0d707fffcd280ff782839d8457ac5f8
 DIST scim-1.4.11.tar.gz 2741428 RMD160 24e9632781eccefef287a62021a761c85fa4a47b SHA1 e202e42df52f5c9a88f6ae4d4ce04f94bc22e27c SHA256 061a345e885d19d3a67e6d6529f4fa55d4bcc93c52b62b26e7c53dbdcdcf8dba
 DIST scim-1.4.9.tar.gz 2928091 RMD160 f84d51aad96fe8c2b32ef1b922ebfe9499f70c90 SHA1 7717339575fdbf909309a78882e30c60cce9f8eb SHA256 f72e9779e220565f6002923bf7d6aa9891be2bbddcd91a4e2a2d5e20aefba8d0
+EBUILD scim-1.4.11-r1.ebuild 2831 RMD160 b2b60d291b34ef4b49ce99da045d7af590d4f9ef SHA1 5674e6885b1e4214c3e53d1a9092fdd4848633ea SHA256 b962674d86012b5a5d8d599167821a3cf71b2747cadd54210a3099e6ab5668ae
 EBUILD scim-1.4.11.ebuild 2760 RMD160 394d2ba4a8dc6f337e25bc619e4c319aaad43bad SHA1 d712f29f0ec3a9a33783d26e523d9994e5061a08 SHA256 d20a430ae6fedec9feb41114f98dc355305434fed3776e6e9bba99e2daa4ee05
 EBUILD scim-1.4.9-r1.ebuild 2948 RMD160 afa6505aab2bd3a302a7c24a50efb5d0ea4f2e30 SHA1 4a03a3531553139dc8b0c5ef5f342406a17ec061 SHA256 88520f7fa18068fb58ab97cc043ccfdb60926853c997ccb1c21d376d06ad4134
 EBUILD scim-1.4.9-r2.ebuild 2958 RMD160 2edd54bd4ee0877f1cd1507e56d82530751541db SHA1 e08579b6e70ae6b4a899b62858e4be7ea69808cb SHA256 e374266f7811d557116af18a0ba69affe7d0828d87b9d5c97f5f0fb1b09aac58
-MISC ChangeLog 19802 RMD160 320ace1cea91c8992654ada0a7400cbd693e780d SHA1 55bc8048500bfaffd9285fc1527945d6c7353a8b SHA256 f41a3ced171515b4d53bf6f6a68e9d320ef792fedb05032c0831f84cefc906f9
+MISC ChangeLog 20019 RMD160 8c41addee00848dc7b27c46fc29dd8f4fd72de24 SHA1 cde9c5fe2a4519c43f21cea61c0fb6e4f364c5b1 SHA256 8f17726da0b14b77f0315e565d468ab892f8c0f6ee99d27220930d627b44b26b
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6qYFAACgkQGpDnPLSHuMDRdACg566FzO32B7OG8gDjFBdLAN8A
-IeMAoOUtos8/XSZeIWlkk0gHG1bg56qu
-=ybGo
+iQIcBAEBCAAGBQJOxM6rAAoJEDYO1FT4VRUU3JIP/i+heBVxRSzNdpN8GdkaZ/E/
+M2J1ZTyTcLVS88nApf6rOM+a6vU0JInuIEeRwEanwiu7sB1dgDdfzSj1vdn1I4yf
+WC4h6OAgs5/mEq1ex1qBF4Z1UNhjQFiz1jneWZfaG6T4NJIE8uid97C5TDgRcEGv
+ebTyDd7XDqy/9F0hrmawabB4ilQJZer2w+I+68Riy084Z00HMD43gXTKeGmbfcgy
+Os+7V7FOTKn55TaDEgWtw5EseFoMBPPmMHUqOPhqE/7zFO2r8QP6IBd6rEJUc/0D
+WUdCuw0reivmFuP4O4j34f1QFDTKdL4vCeKPo8X/3kP/A05uHmNYKENnEiCdagCH
+cN2sLCTsQfKXOoXP0CfiYUD2UWdhHCVHJbIxsfT2IQVmxQXRPHVkFPt0pyX1U7JP
+KIlxLsFTEU/ShLegAfvNSTV8Bop+PDIiToPNg1UiYtmFKf3n0LPBuDryjLEXYY8Z
+1Pj370JlMOCO2eN6YHtphcNLvTae0rqogdNzdAIcIunzJOLa798SHfwWiCSso8bY
+iMgJn9C5yNqbYWkSHHVEbW57c2x9M8Xt4SgzUhEdbjkSL8hu2uWvMC9ntlIndyoN
+MbaeTkHogExLxwUm1Duw4RKORSvHeT5rnQSukqcKcvzphFU5eOhxq2M8CwDiAY2O
+MYDiEqiTyrEkJVUiKdVx
+=JQPr
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/scim/files/scim-1.4.11-type-module-use.patch b/app-i18n/scim/files/scim-1.4.11-type-module-use.patch
new file mode 100644
index 000000000000..ff19065281e0
--- /dev/null
+++ b/app-i18n/scim/files/scim-1.4.11-type-module-use.patch
@@ -0,0 +1,10 @@
+--- a/extras/gtk2_immodule/gtkimcontextscim.cpp	2011-11-09 17:08:21.000000000 -0800
++++ b/extras/gtk2_immodule/gtkimcontextscim.cpp	2011-11-09 17:07:51.000000000 -0800
+@@ -447,6 +447,7 @@
+                                      "GtkIMContextSCIM",
+                                      &im_context_scim_info,
+                                      (GTypeFlags) 0);
++	    g_type_module_use (type_module);
+     }
+ }
+ 
diff --git a/app-i18n/scim/scim-1.4.11-r1.ebuild b/app-i18n/scim/scim-1.4.11-r1.ebuild
new file mode 100644
index 000000000000..da836d943d03
--- /dev/null
+++ b/app-i18n/scim/scim-1.4.11-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.11-r1.ebuild,v 1.1 2011/11/17 09:06:46 naota Exp $
+
+EAPI="3"
+inherit autotools eutils flag-o-matic multilib
+
+DESCRIPTION="Smart Common Input Method (SCIM) is an Input Method (IM) development platform"
+HOMEPAGE="http://www.scim-im.org/"
+SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND="x11-libs/libX11
+	dev-libs/glib:2
+	x11-libs/gtk+:2
+	>=dev-libs/atk-1
+	>=x11-libs/pango-1
+	!app-i18n/scim-cvs"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen
+		>=app-text/docbook-xsl-stylesheets-1.73.1 )
+	dev-lang/perl
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.33
+	sys-devel/libtool"
+
+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
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-type-module-use.patch
+}
+
+src_configure() {
+	local myconf
+	# bug #83625
+	filter-flags -fvisibility-inlines-hidden
+	filter-flags -fvisibility=hidden
+
+	econf \
+		$(use_with doc doxygen) \
+		--enable-ld-version-script \
+		${myconf} || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	sed -e "s:@EPREFIX@:${EPREFIX}:" "${FILESDIR}/xinput-${PN}" > "${T}/${PN}.conf" || die
+	insinto /etc/X11/xinit/xinput.d
+	doins "${T}/${PN}.conf" || die
+
+	dodoc README AUTHORS ChangeLog docs/developers docs/scim.cfg || die
+	use doc && dohtml -r docs/html/*
+}
+
+pkg_postinst() {
+	elog
+	elog "To use SCIM with both GTK2 and XIM, you should use the following"
+	elog "in your user startup scripts such as .gnomerc or .xinitrc:"
+	elog
+	elog "LANG='your_language' scim -d"
+	elog "export XMODIFIERS=@im=SCIM"
+	elog "export GTK_IM_MODULE=\"scim\""
+	elog "export QT_IM_MODULE=\"scim\""
+	elog
+	elog "where 'your_language' can be zh_CN, zh_TW, ja_JP.eucJP or any other"
+	elog "UTF-8 locale such as en_US.UTF-8 or ja_JP.UTF-8"
+	elog
+	elog "To use Chinese input methods:"
+	elog "	# emerge app-i18n/scim-tables app-i18n/scim-pinyin"
+	elog "To use Korean input methods:"
+	elog "	# emerge app-i18n/scim-hangul"
+	elog "To use Japanese input methods:"
+	elog "	# emerge app-i18n/scim-anthy"
+	elog "To use various input methods (more than 30 languages):"
+	elog "	# emerge app-i18n/scim-m17n"
+	elog
+	ewarn
+	ewarn "If you upgraded from scim-1.2.x or scim-1.0.x, you should remerge all SCIM modules."
+	ewarn
+
+	update_gtk_immodules
+}
+
+pkg_postrm() {
+	update_gtk_immodules
+}