--- uim-svn-1.5.ebuild	2007-10-05 16:24:55.000000000 +0200
+++ uim-svn-1.5-r1.ebuild	2007-10-05 16:22:51.000000000 +0200
@@ -43,6 +43,8 @@
 	qt3? ( $(qt_min_version 3.3.4) )
 	m17n-lib? ( dev-libs/m17n-lib )"
 
+SITEFILE=50${PN}-gentoo.el
+
 src_unpack() {
 
 	local repo_uri="http://uim.googlecode.com/svn"
@@ -93,6 +95,7 @@
 
 	econf \
 		$(use_enable emacs) \
+		$(use_with emacs lispdir ${SITELISP}) \
 		$(use_enable fep) \
 		$(use_enable nls) \
 		$(use_with X x) \
@@ -131,22 +134,12 @@
 		fi
 	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
+	if use emacs; then
+	   # do compilation here as all other steps are handled by Makefile
+	   cd "${D}"/${SITELISP}/uim-el/
+	   elisp-comp *.el || die
+	   elisp-site-file-install "${FILESDIR}/${SITEFILE}" uim-el
 	fi
 
 	# remove sigscheme headers
@@ -160,8 +153,15 @@
 
 	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
 }
 
 pkg_postrm() {
@@ -171,5 +171,4 @@
 	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
-
 }