Fixed GTK2_CONFDIR handling, bug #366889. Removed unused files, bug #342543. Support app-i18n/imsettings.

Package-Manager: portage-2.1.9.49/cvs/Linux x86_64

8 files changed, 70 insertions, 117 deletions

diff --git a/app-i18n/scim/ChangeLog b/app-i18n/scim/ChangeLog
index ad07b5368c17..b50a476c3228 100644
--- a/app-i18n/scim/ChangeLog
+++ b/app-i18n/scim/ChangeLog
@@ -1,6 +1,15 @@
 # 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.144 2011/03/27 10:56:27 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/ChangeLog,v 1.145 2011/05/25 16:57:29 matsuu Exp $
+
+*scim-1.4.9-r2 (25 May 2011)
+
+  25 May 2011; MATSUU Takuto <matsuu@gentoo.org> -files/scim-1.4.5-fbsd.patch,
+  -files/scim-1.4.5-imengine.patch, -scim-1.4.7-r2.ebuild,
+  scim-1.4.9-r1.ebuild, +scim-1.4.9-r2.ebuild,
+  -files/bug-248159_remove_unload.patch, +files/xinput-scim:
+  Fixed GTK2_CONFDIR handling, bug #366889. Removed unused files, bug #342543.
+  Support app-i18n/imsettings. Removed old versions.
 
   27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> scim-1.4.7-r2.ebuild,
   scim-1.4.9-r1.ebuild:
diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest
index 826af3861482..72043822f845 100644
--- a/app-i18n/scim/Manifest
+++ b/app-i18n/scim/Manifest
@@ -1,31 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX bug-248159_remove_unload.patch 595 RMD160 68c90879b422d9dffb5fd360f3f55dee76007915 SHA1 f2f2fd73ddd8a1172640352f52ef0ec6a724c597 SHA256 a096aab3c40183da071e6884d43b5fb635c5ec77877f7513504a01d48eb84fa8
-AUX scim-1.4.5-fbsd.patch 395 RMD160 1ce0f0cc90a8981bcc89ed0d59056e1ae17a528c SHA1 bcb1871085a2788d69ae32dff01cc1f38b51136d SHA256 a02290b079a131c393366400fdc9adf3b65c6b3a9523bd419e16e8e21ea4d7a6
-AUX scim-1.4.5-imengine.patch 869 RMD160 609baff78ef99ab6895e17a18a20dfc9a4c21a08 SHA1 ecedf7b09467829d63d905a950cebeddd3cab40c SHA256 bb4eb7e0e0a06dc2ed9d99703b5d7f63b1356a2ffd59a4736caa3c6a75bf11b6
 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
-DIST scim-1.4.7.tar.gz 3075769 RMD160 0b24e24f547ce39469811076420bfcd41d1e906c SHA1 54ab2ab0ef28a84c24fbc32d37e996ecae416d50 SHA256 a0883bc5938476b33247194fe61ab5ce224eb4fb68bd7f8befc4baa8aaa8160b
+AUX xinput-scim 240 RMD160 e4cab8abb18806de99429fc409eb583c3e329a0d SHA1 6691ef3ea04a14040a24f7ceedc6a30d4111c47f SHA256 f2dd0ba47112298f4da79692f89d1447c0d707fffcd280ff782839d8457ac5f8
 DIST scim-1.4.9.tar.gz 2928091 RMD160 f84d51aad96fe8c2b32ef1b922ebfe9499f70c90 SHA1 7717339575fdbf909309a78882e30c60cce9f8eb SHA256 f72e9779e220565f6002923bf7d6aa9891be2bbddcd91a4e2a2d5e20aefba8d0
-EBUILD scim-1.4.7-r2.ebuild 3006 RMD160 06ad1897ef53bce5863c5d4fbc004b6d84285bbe SHA1 5e03b3f997bec29d63e544e51b5a9723109511c1 SHA256 148e486557d861376d8abf89e8c00d2be6f93ab02afaba83120e418a63ec6574
-EBUILD scim-1.4.9-r1.ebuild 2942 RMD160 94c6594d429e5cc74c4a72f623490e05f4120207 SHA1 28a1b6fe96129df7571239b477ebd67ea30b50f3 SHA256 6c5301c9b6d8ec2647a6e0a890a11a512e90e73cdc07a37f3c0de9fc27c94376
-MISC ChangeLog 19281 RMD160 43260e506ba0af444f4589c7d8754975369b4d68 SHA1 dbfadbe71a1bb9ed07e0d7369d78980e2417caf9 SHA256 8fb648cdd41510576911e323592f97157abb518be3dcdea6e7ea3d9a0b27c732
+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 19688 RMD160 8a81c9dfbb2e53843bbf44c6d65cfe55eb9635f6 SHA1 b53d730b72f078ab99bb5684f0939ba159d6647c SHA256 1d11fd5ef8d3bd8c5a282365cf833d1bfef43ef04aa093ea0ddf606e203cd204
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNjxfiAAoJEO/kOhxWD91kmHoP/RYzYOQ6pU/joC9UotkHyVkw
-A6oculatc1duQT7khJXgXYRS3Ybl+Pf0cDL/6hCSkZVq3ksZSUQPFyLJR1vkPYiu
-5z7SWF4FHj3ld5RC73v3PAfQpqSApdyTJHQsJiIlMJVzimBoQYZntrF+Ii4D+4CP
-Roky5t1Jq4x6Q7nw2xjab3j/qfg0+xZtvlrg+q7A7s2XXjLIlOh7q4nbUxwgwnqa
-DgR8MVjsuGeUul6smxUnXnXzw8ly+dAp/6vXjUA5WQcJiJhkiqmcJ0r1s8WSOOAu
-yYuQjDhXq1WoBoeTLbbMPf89346z3zZ8CPzbdAca1jYnQ5zbKKL8sV/L3uidsBDy
-mnktT1GGGMPMyy3LQIUMN5pm7+eg2w3ovQbyT8ycWPjR6nhBoj4gJvYNncii+FVv
-W3TFdjAyu45eGFMD7WbFcu2T8GBAhIOr9t79X3iao57vkeRil1q7Y2JA5/VjE7sC
-pnxGgPS4WOUXTt26nKD9D5+bv145o6uSajKkAdt9dhDhimSlyfOASAxCR091QAsf
-9An6uN5CwfVK+/P+m4IS/2EY+W6i0hJmm8DlKWxut3m9XEhRXqAu8wfGsYA6J25l
-o2Vy0cWePL4IS+6SVbUpFfCoXf1uE03ty5C8RouB/1wA0kajhhWhS2j/Fc5fLZOZ
-guRoRzkNsvkazcSP+3YV
-=RM4v
+iQIcBAEBAgAGBQJN3TUOAAoJECaGw+YFKA1p3bMQAJv4D6Ej6sbhZStsVd7nv6Ku
+oZBKuTc0ILceGg4gdbSvOXjGhkGRCiNK3BqZVttMX6/dcN8KIJZ8igW6r3VfIajQ
+n6ium+9nx265N6/H+uiK9oaU+fUvfJRlJtZqymJuP4klncaqYSrrhQy199qELMzu
+5OnGH1EVyuNJy9iXOPhEW28LjKM4nOrrSQ9SNWueJz48dkmlSo9FkwUgzjvPoCdD
+QSp2kpUrFPrtUZitmaUqV+IZjuIIDPGzVqiujkoM68vbffiQmfjVdwKSJw5Y1R3j
+lAYViyyUtRUdK6XCrC5NfUUACMdcaa7ypkpWWKFzTcFhx6jbgmUG2UiVOOMqHI7W
+loKs7daoecYVd76oE8qesXvHmiwuceHl+fvEKPYcxvC0Ot6psY/QbZ8LQ9bMQbsa
+Ep1y1cGsds7Fat4N8P42FgTvdLNZyROQD11IIxfIG4j+PeMmpgDHA1AigzvIiLzb
+352dtULOLQ8qJKt0vJ7D/NojN5cNGsvIWN9EBpvN4x7zuUxJODd4swaibfk0y0tu
+kEL0lUulLbhcsIMlfNhM7nLbVJH4U1Sgl480vTO6/bxiKynzmyeCHDHDSmq6HKw0
+WXLaw3Q6UGqgzXUIwuEi2e9FHSCeJuJUHo2xrBbZWOlNQJAIVnx9bPShr8fKuYJg
+Lk6jxUjaniJ1uNBrD7e4
+=dHN6
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/scim/files/bug-248159_remove_unload.patch b/app-i18n/scim/files/bug-248159_remove_unload.patch
deleted file mode 100644
index 35aa13bdf650..000000000000
--- a/app-i18n/scim/files/bug-248159_remove_unload.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: scim-1.4.5/src/scim_frontend_module.cpp
-===================================================================
---- scim-1.4.5.orig/src/scim_frontend_module.cpp
-+++ scim-1.4.5/src/scim_frontend_module.cpp
-@@ -69,7 +69,11 @@ FrontEndModule::load (const String &name
- 
-         m_frontend_init (backend, config, argc, argv);
-     } catch (...) {
--        m_module.unload ();
-+        /*
-+	The thrown exception is in x11.so. Unload it, will cause the 
-+	destructor of exception failed.
-+	m_module.unload ();
-+	*/
-         m_frontend_init = 0;
-         m_frontend_run = 0;
-         return false;
diff --git a/app-i18n/scim/files/scim-1.4.5-fbsd.patch b/app-i18n/scim/files/scim-1.4.5-fbsd.patch
deleted file mode 100644
index 9dd1273855d7..000000000000
--- a/app-i18n/scim/files/scim-1.4.5-fbsd.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: scim-1.4.5/src/scim_types.h.in
-===================================================================
---- scim-1.4.5.orig/src/scim_types.h.in
-+++ scim-1.4.5/src/scim_types.h.in
-@@ -32,6 +32,13 @@
- 
- @INCLUDE_STDINT@
- 
-+#ifdef __FreeBSD__
-+# include <osreldate.h>
-+# if __FreeBSD_version > 500035
-+#  define __STDC_ISO_10646__
-+# endif
-+#endif
-+
- namespace scim {
- 
- typedef @UINT16@ uint16;
diff --git a/app-i18n/scim/files/scim-1.4.5-imengine.patch b/app-i18n/scim/files/scim-1.4.5-imengine.patch
deleted file mode 100644
index e850f0aac741..000000000000
--- a/app-i18n/scim/files/scim-1.4.5-imengine.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN scim-1.4.4/modules/IMEngine/scim_rawcode_imengine.cpp scim-1.4.3/modules/IMEngine/scim_rawcode_imengine.cpp
---- scim-1.4.4/modules/IMEngine/scim_rawcode_imengine.cpp	2006-01-12 08:00:36.000000000 +0100
-+++ scim-1.4.3/modules/IMEngine/scim_rawcode_imengine.cpp	2005-08-15 16:27:56.000000000 +0200
-@@ -53,6 +53,8 @@
- static String __rawcode_locales ("zh_CN.GB18030,zh_CN.GBK,zh_CN.GB2312,zh_TW,zh_TW.EUC-TW,zh_HK,ja_JP,ja_JP.sjis,ko_KR,en_US.UTF-8");
- 
- static std::vector<String> __rawcode_encodings;
-+static const char * _DEFAULT_LANGUAGES = N_(
-+    "zh_CN,zh_TW,zh_HK,zh_SG,ja_JP,ko_KR");
- 
- extern "C" {
-     void scim_module_init (void)
-@@ -99,7 +82,7 @@
- // implementation of RawCode
- RawCodeFactory::RawCodeFactory ()
- {
--    set_locales (__rawcode_locales);
-+    set_languages (String (_(_DEFAULT_LANGUAGES)));
- }
- 
- RawCodeFactory::~RawCodeFactory ()
diff --git a/app-i18n/scim/files/xinput-scim b/app-i18n/scim/files/xinput-scim
new file mode 100644
index 000000000000..1d2ef452cbc6
--- /dev/null
+++ b/app-i18n/scim/files/xinput-scim
@@ -0,0 +1,9 @@
+XIM=SCIM
+XIM_PROGRAM="@EPREFIX@/usr/bin/scim"
+XIM_ARGS="-d --no-socket"
+GTK_IM_MODULE=scim
+QT_IM_MODULE=scim
+PREFERENCE_PROGRAM="@EPREFIX@/usr/bin/scim-setup"
+SHORT_DESC="SCIM"
+LONG_DESC="Smart Common Input Method platform"
+ICON=scim-setup
diff --git a/app-i18n/scim/scim-1.4.9-r1.ebuild b/app-i18n/scim/scim-1.4.9-r1.ebuild
index 522b1790e1d3..72d4dac3995f 100644
--- a/app-i18n/scim/scim-1.4.9-r1.ebuild
+++ b/app-i18n/scim/scim-1.4.9-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.9-r1.ebuild,v 1.12 2011/03/27 10:56:27 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.9-r1.ebuild,v 1.13 2011/05/25 16:57:29 matsuu Exp $
 
 EAPI="2"
 inherit autotools eutils flag-o-matic multilib
@@ -29,8 +29,10 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool"
 
 pkg_setup() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	# bug #366889
+	if has_version '>=x11-libs/gtk+-2.22.1-r1:2' || has_multilib_profile ; then
+		GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+	fi
 	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
 }
 
diff --git a/app-i18n/scim/scim-1.4.7-r2.ebuild b/app-i18n/scim/scim-1.4.9-r2.ebuild
index c779cf6012cd..27d2a746b6b2 100644
--- a/app-i18n/scim/scim-1.4.7-r2.ebuild
+++ b/app-i18n/scim/scim-1.4.9-r2.ebuild
@@ -1,10 +1,9 @@
 # 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.7-r2.ebuild,v 1.11 2011/03/27 10:56:27 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim/scim-1.4.9-r2.ebuild,v 1.1 2011/05/25 16:57:29 matsuu Exp $
 
-EAPI="1"
-
-inherit eutils flag-o-matic autotools
+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/"
@@ -12,14 +11,14 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86 ~x86-fbsd"
+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
-	>=dev-libs/glib-2
 	!app-i18n/scim-cvs"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen
@@ -29,50 +28,47 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.33
 	sys-devel/libtool"
 
-get_gtk_confdir() {
-	if use amd64 || ( [ "${CONF_LIBDIR}" == "lib32" ] && use x86 ) ; then
-		echo "/etc/gtk-2.0/${CHOST}"
-	else
-		echo "/etc/gtk-2.0"
+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
-}
-
-src_unpack() {
-	unpack ${A}
+	mkdir -p "${EPREFIX}${GTK2_CONFDIR}"
 
-	cd "${S}"
+	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
+}
 
-	epatch "${FILESDIR}/${P}-syslibltdl.patch"
-	# bug #216127
-	epatch "${FILESDIR}/bug-248159_remove_unload.patch"
-	rm "${S}"/src/ltdl.{cpp,h}
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.4.7-syslibltdl.patch"
+	# bug #283317
+	epatch "${FILESDIR}/${PN}-fix-disappeared-status-icon.patch"
+	rm "${S}"/src/ltdl.{cpp,h} || die
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	local myconf
 	# bug #83625
 	filter-flags -fvisibility-inlines-hidden
 	filter-flags -fvisibility=hidden
 
-	# bug #191696
-	## We cannot use "use_enable"
-	#if ! use gtk ; then
-	#	myconf="${myconf} --disable-panel-gtk"
-	#	myconf="${myconf} --disable-setup-ui"
-	#	myconf="${myconf} --disable-gtk2-immodule"
-	#fi
-
 	econf \
 		$(use_with doc doxygen) \
 		--enable-ld-version-script \
 		${myconf} || die
-	emake || die
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	dodoc README AUTHORS ChangeLog docs/developers docs/scim.cfg
+
+	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/*
 }
 
@@ -89,8 +85,6 @@ pkg_postinst() {
 	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 "If you prefer KDE/Qt interface, try emerge app-i18n/skim."
-	elog
 	elog "To use Chinese input methods:"
 	elog "	# emerge app-i18n/scim-tables app-i18n/scim-pinyin"
 	elog "To use Korean input methods:"
@@ -103,12 +97,10 @@ pkg_postinst() {
 	ewarn
 	ewarn "If you upgraded from scim-1.2.x or scim-1.0.x, you should remerge all SCIM modules."
 	ewarn
-	epause 10
 
-	[ -x /usr/bin/gtk-query-immodules-2.0 ] && gtk-query-immodules-2.0 > "${ROOT}$(get_gtk_confdir)/gtk.immodules"
+	update_gtk_immodules
 }
 
 pkg_postrm() {
-
-	[ -x /usr/bin/gtk-query-immodules-2.0 ] && gtk-query-immodules-2.0 > "${ROOT}$(get_gtk_confdir)/gtk.immodules"
+	update_gtk_immodules
 }