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

(Portage version: 2.1.9.49/cvs/Linux x86_64)

7 files changed, 53 insertions, 97 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/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
 }