fixes bug #194804.

Package-Manager: portage-2.1.3.9

5 files changed, 44 insertions, 38 deletions

diff --git a/app-i18n/uim-svn/ChangeLog b/app-i18n/uim-svn/ChangeLog
index d5024278c24c..4be8ced660aa 100644
--- a/app-i18n/uim-svn/ChangeLog
+++ b/app-i18n/uim-svn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/uim-svn
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/ChangeLog,v 1.30 2007/09/03 14:31:52 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/ChangeLog,v 1.31 2007/10/12 10:57:45 hattya Exp $
+
+  12 Oct 2007; Akinori Hattori <hattya@gentoo.org> -files/50uim-gentoo.el,
+  +files/50uim-svn-gentoo.el, uim-svn-1.5.ebuild:
+  fixes bug #194804.
 
   03 Sep 2007; Akinori Hattori <hattya@gentoo.org> uim-svn-1.5.ebuild:
   change the repository location and update HOMEPAGE.
diff --git a/app-i18n/uim-svn/Manifest b/app-i18n/uim-svn/Manifest
index 30237a0f2033..a773e087b7ab 100644
--- a/app-i18n/uim-svn/Manifest
+++ b/app-i18n/uim-svn/Manifest
@@ -1,15 +1,15 @@
-AUX 50uim-gentoo.el 120 RMD160 de7359e37bde67449be61e99e1a271088c99a785 SHA1 c22d5cacc74a6b4c0b0733cff693b03e90c9e2b8 SHA256 151b731d5940fc029fd5428275fe670f85d9af501adb8e2b0e5ee5277b301ee3
-MD5 bb1358d0c54a9f19ec23bd58b8b52ef3 files/50uim-gentoo.el 120
-RMD160 de7359e37bde67449be61e99e1a271088c99a785 files/50uim-gentoo.el 120
-SHA256 151b731d5940fc029fd5428275fe670f85d9af501adb8e2b0e5ee5277b301ee3 files/50uim-gentoo.el 120
-EBUILD uim-svn-1.5.ebuild 3538 RMD160 bb08f6eca95ed2a5049177b0118b29ee7906de8a SHA1 1081728c89a335d07bcacd051295217beee57b58 SHA256 4f7780f9d1434303ce655cf6b7e9436e4e792a302544df43bc9f53c6a356f1f5
-MD5 9b1dc0111244e7f956e604337f42f34a uim-svn-1.5.ebuild 3538
-RMD160 bb08f6eca95ed2a5049177b0118b29ee7906de8a uim-svn-1.5.ebuild 3538
-SHA256 4f7780f9d1434303ce655cf6b7e9436e4e792a302544df43bc9f53c6a356f1f5 uim-svn-1.5.ebuild 3538
-MISC ChangeLog 4438 RMD160 c975c98fe786c9e9cc271a67e0693d79bf02d2af SHA1 38a83a906416088b07d263695521976695def263 SHA256 89294e090d9b3c0e35eb183832517a3d79b654c0ab6084bac1c7a479434767d0
-MD5 affd13ed600635441a4b94a8078206d1 ChangeLog 4438
-RMD160 c975c98fe786c9e9cc271a67e0693d79bf02d2af ChangeLog 4438
-SHA256 89294e090d9b3c0e35eb183832517a3d79b654c0ab6084bac1c7a479434767d0 ChangeLog 4438
+AUX 50uim-svn-gentoo.el 117 RMD160 d95faf447aadc3d33e2f027f6b2dfce065559a4a SHA1 b79fe3b6fa3245fa2a9d92c4276401a45c4d3fe9 SHA256 6c466272b467ca1a6aba3d3c7993a504dc9e484fd1e47dd7be7ad807bcf3e0da
+MD5 0301d005d0c6e13fa90f352dfdbd493c files/50uim-svn-gentoo.el 117
+RMD160 d95faf447aadc3d33e2f027f6b2dfce065559a4a files/50uim-svn-gentoo.el 117
+SHA256 6c466272b467ca1a6aba3d3c7993a504dc9e484fd1e47dd7be7ad807bcf3e0da files/50uim-svn-gentoo.el 117
+EBUILD uim-svn-1.5.ebuild 3879 RMD160 b579356cdc0f491f0fd3f281c7ab08be1ce41b3e SHA1 ed8461e5064c1c6312ccedee3a88851c0bcaab8d SHA256 ab7cd4f7caf65569c0ab2b48bc0c1457c9c1dbf71f373efb2ca64c19c4797f16
+MD5 6d9ab4aff37684e5a40ab0230e4273cc uim-svn-1.5.ebuild 3879
+RMD160 b579356cdc0f491f0fd3f281c7ab08be1ce41b3e uim-svn-1.5.ebuild 3879
+SHA256 ab7cd4f7caf65569c0ab2b48bc0c1457c9c1dbf71f373efb2ca64c19c4797f16 uim-svn-1.5.ebuild 3879
+MISC ChangeLog 4585 RMD160 aee4904286cbbe23e6338bfb5d26c8e4e0011c4b SHA1 636fb8980465e0d5588a1e0354fa45c62c912f8f SHA256 545a543482b00fee0b6ba2d97e54ca734c892724820e57d9743558b04e814ac6
+MD5 ba94c6a52c95513eb12712bf0fab22b8 ChangeLog 4585
+RMD160 aee4904286cbbe23e6338bfb5d26c8e4e0011c4b ChangeLog 4585
+SHA256 545a543482b00fee0b6ba2d97e54ca734c892724820e57d9743558b04e814ac6 ChangeLog 4585
 MISC metadata.xml 228 RMD160 d00ebe7b3e1735ca3ca559d39b754b06cf4a8d4b SHA1 2d51ec59cf9b5fdec09b26e402f14d6a8caf4aec SHA256 15500f2c0c8e55fe82f937103a2741db6182f259dec5a9d334016781ba928c5f
 MD5 144bface8ba60a1da8734f201abd268f metadata.xml 228
 RMD160 d00ebe7b3e1735ca3ca559d39b754b06cf4a8d4b metadata.xml 228
diff --git a/app-i18n/uim-svn/files/50uim-gentoo.el b/app-i18n/uim-svn/files/50uim-gentoo.el
deleted file mode 100644
index a9c648411cd8..000000000000
--- a/app-i18n/uim-svn/files/50uim-gentoo.el
+++ /dev/null
@@ -1,6 +0,0 @@
-
-;;; uim site-lisp configuration
-
-(require 'uim-leim)
-(set-language-info "Japanese" 'input-method "japanese-@IM@-uim")
-
diff --git a/app-i18n/uim-svn/files/50uim-svn-gentoo.el b/app-i18n/uim-svn/files/50uim-svn-gentoo.el
new file mode 100644
index 000000000000..854b665b366f
--- /dev/null
+++ b/app-i18n/uim-svn/files/50uim-svn-gentoo.el
@@ -0,0 +1,4 @@
+;;; app-i18n/uim-svn site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'uim-mode "uim" nil t)
diff --git a/app-i18n/uim-svn/uim-svn-1.5.ebuild b/app-i18n/uim-svn/uim-svn-1.5.ebuild
index 57e712ad7824..b5e65540d9ae 100644
--- a/app-i18n/uim-svn/uim-svn-1.5.ebuild
+++ b/app-i18n/uim-svn/uim-svn-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/uim-svn-1.5.ebuild,v 1.4 2007/09/03 14:31:52 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/uim-svn-1.5.ebuild,v 1.5 2007/10/12 10:57:45 hattya Exp $
 
 inherit elisp-common flag-o-matic kde-functions multilib subversion
 
@@ -93,6 +93,7 @@ src_compile() {
 
 	econf \
 		$(use_enable emacs) \
+		$(use_with emacs lispdir "${SITELISP}") \
 		$(use_enable fep) \
 		$(use_enable nls) \
 		$(use_with X x) \
@@ -132,25 +133,18 @@ src_install() {
 	done
 
 	if use emacs; then
-		local im
-
-		if has_version app-i18n/anthy || has_version app-i18n/anthy-ss; then
-			im="anthy"
-
-		elif has_version app-i18n/prime; then
-			im="prime"
-
-		else
-			im="skk"
-
-		fi
-
-		elisp-site-file-install "${FILESDIR}"/50uim-gentoo.el
-		dosed "s:@IM@:${im}:" ${SITELISP}/50uim-gentoo.el
+		cd "${D}/${SITELISP}"/uim-el
+		elisp-comp *.el || die
+		cd -
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el uim-el
 	fi
 
-	# remove sigscheme headers
-	rm -rf ${D}/usr/include/sigscheme
+	# remove empty directories
+	rm -rf "${D}"/usr/include/sigscheme
+	rm -rf "${D}"/usr/include/libgcroots
+
+	# remove unnecessary header
+	rm -f "${D}"/usr/include/gcroots.h
 
 }
 
@@ -160,7 +154,17 @@ pkg_postinst() {
 
 	has_multilib_profile && chost=${CHOST}
 	use gtk && gtk-query-immodules-2.0 > "${ROOT}"/etc/gtk-2.0/${chost}/gtk.immodules
-	use emacs && elisp-site-regen
+
+	if use emacs; then
+		elisp-site-regen
+
+		echo
+		elog "uim is autoloaded with Emacs with a minimal set of"
+		elog "features: There is no keybinding defined to call it directly,"
+		elog "so please create one yourself and choose an input method."
+		elog "Integration with LEIM is not done with this ebuild, please have a look"
+		elog "at the documentation how to achieve this."
+	fi
 
 }