sync with CVS.

svn path=/; revision=12

4 files changed, 55 insertions, 54 deletions

diff --git a/app-i18n/uim-svn/Manifest b/app-i18n/uim-svn/Manifest
index dbe46e5..1af3492 100644
--- a/app-i18n/uim-svn/Manifest
+++ b/app-i18n/uim-svn/Manifest
@@ -1,11 +1,11 @@
-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 3534 RMD160 8d99de5d802e599ae01de09b62297ef8af4f0d5d SHA1 1937cbc7f5faf442442a874ff598ec4a7707dc6a SHA256 ee4c570132892f0d6e40b1c4d215c3cdb795869797681f1f757efc8ee68bfe8b
-MD5 33fa7b520ebe90ed30b872af012f3d15 uim-svn-1.5.ebuild 3534
-RMD160 8d99de5d802e599ae01de09b62297ef8af4f0d5d uim-svn-1.5.ebuild 3534
-SHA256 ee4c570132892f0d6e40b1c4d215c3cdb795869797681f1f757efc8ee68bfe8b uim-svn-1.5.ebuild 3534
+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 3844 RMD160 3e855a491f0598a6ec74c9d650966ae3b4b75301 SHA1 db7dd01f2bf3acde2e396c416c2dd5e67823fc5f SHA256 88544d860c9ad3d4ed7c26fbf72ef45887a46a23805b8b23676b8c7e68726e0f
+MD5 3b80d8174d24f816471538ed94f48ecd uim-svn-1.5.ebuild 3844
+RMD160 3e855a491f0598a6ec74c9d650966ae3b4b75301 uim-svn-1.5.ebuild 3844
+SHA256 88544d860c9ad3d4ed7c26fbf72ef45887a46a23805b8b23676b8c7e68726e0f uim-svn-1.5.ebuild 3844
 MISC metadata.xml 226 RMD160 19d90fb44483e26b860cda1cc3ad46e3e89b6909 SHA1 e4f7e5ee158178c28a23573fa822f83df9308375 SHA256 c16f962dbb1340e378c4775fd9fa31af8cac92ab8c524988a697af52dc803fdf
 MD5 382a25f7a6abf0020285f37f74158690 metadata.xml 226
 RMD160 19d90fb44483e26b860cda1cc3ad46e3e89b6909 metadata.xml 226
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 a9c6484..0000000
--- 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 0000000..854b665
--- /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 dc6f068..0092407 100644
--- a/app-i18n/uim-svn/uim-svn-1.5.ebuild
+++ b/app-i18n/uim-svn/uim-svn-1.5.ebuild
@@ -7,10 +7,10 @@ inherit elisp-common flag-o-matic kde-functions multilib subversion
 IUSE="X anthy canna dict eb emacs fep gtk immqt libedit m17n-lib nls qt3"
 
 DESCRIPTION="a multilingual input method library"
-HOMEPAGE="http://uim.freedesktop.org/"
+HOMEPAGE="http://code.google.com/p/uim/"
 SRC_URI=""
 
-LICENSE="|| (BSD GPL-2 LGPL-2.1)"
+LICENSE="|| ( BSD GPL-2 LGPL-2.1 )"
 KEYWORDS="~x86"
 SLOT="0"
 
@@ -22,23 +22,17 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	dev-lang/ruby
 	app-text/asciidoc
-	X? ( || ( (
-				x11-proto/xextproto
-				x11-proto/xproto
-			  )
-	   	 	  virtual/x11 ) )
+	X? ( x11-proto/xextproto
+		x11-proto/xproto )
 	nls? ( virtual/libintl )"
 RDEPEND="!app-i18n/uim
-	X? ( || ( (
-	   	 	    x11-libs/libX11
-				x11-libs/libXft
-				x11-libs/libXt
-				x11-libs/libICE
-				x11-libs/libSM
-				x11-libs/libXext
-				x11-libs/libXrender
-			  )
-		   	  virtual/x11 ) )
+	X? ( x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXrender )
 	anthy? ( || ( app-i18n/anthy app-i18n/anthy-ss ) )
 	canna? ( app-i18n/canna )
 	eb? ( dev-libs/eb )
@@ -51,7 +45,16 @@ RDEPEND="!app-i18n/uim
 
 src_unpack() {
 
-	local repo_uri="http://anonsvn.freedesktop.org/svn/uim"
+	local repo_uri="http://uim.googlecode.com/svn"
+
+	subversion_wc_info ${repo_uri}/trunk
+
+	if [[ $? -eq 0 ]] && [ "${ESVN_WC_URL}" != "${repo_uri}/trunk" ]; then
+		eerror "uim's repository is moved to Google Code."
+		eerror "please remove ${ESVN_STORE_DIR}/${ESVN_PROJECT}."
+
+		die
+	fi
 
 	subversion_fetch ${repo_uri}/trunk
 	subversion_fetch ${repo_uri}/sigscheme-trunk sigscheme
@@ -90,6 +93,7 @@ src_compile() {
 
 	econf \
 		$(use_enable emacs) \
+		$(use_with emacs lispdir "${SITELISP}") \
 		$(use_enable fep) \
 		$(use_enable nls) \
 		$(use_with X x) \
@@ -129,29 +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
 
-	# move sigscheme documents into ${P}
-	mv ${D}/usr/share/doc/{sigscheme,${P}/}
+	# remove empty directories
+	rm -rf "${D}"/usr/include/sigscheme
+	rm -rf "${D}"/usr/include/libgcroots
 
-	# remove sigscheme headers and a pkgconfig file
-	rm -rf ${D}/usr/include/sigscheme
-	rm -f ${D}/usr/lib/pkgconfig/sigscheme.pc
+	# remove unnecessary header
+	rm -f "${D}"/usr/include/gcroots.h
 
 }
 
@@ -161,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
 
 }
 
@@ -171,7 +174,7 @@ pkg_postrm() {
 
 	has_multilib_profile && chost=${CHOST}
 	use gtk && gtk-query-immodules-2.0 > "${ROOT}"/etc/gtk-2.0/${chost}/gtk.immodules
-	has_version virtual/emacs && elisp-site-regen
+	use emacs && elisp-site-regen
 
 }