switch to http://anonsvn.freedesktop.org/svn/uim/trunk and enable emacs binding.

Package-Manager: portage-2.0.54

6 files changed, 69 insertions, 76 deletions

diff --git a/app-i18n/uim-svn/ChangeLog b/app-i18n/uim-svn/ChangeLog
index cdf658e90b2e..c3d59203985c 100644
--- a/app-i18n/uim-svn/ChangeLog
+++ b/app-i18n/uim-svn/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-i18n/uim-svn
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/ChangeLog,v 1.19 2006/02/10 20:33:54 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/ChangeLog,v 1.20 2006/03/20 14:52:50 hattya Exp $
+
+*uim-svn-20060320 (20 Mar 2006)
+
+  20 Mar 2006; Akinori Hattori <hattya@gentoo.org> +files/50uim-gentoo.el,
+  -uim-svn-20050505.ebuild, +uim-svn-20060320.ebuild:
+  switch to http://anonsvn.freedesktop.org/svn/uim/trunk and enable emacs
+  binding.
 
   10 Feb 2006; Alastair Tse <liquidx@gentoo.org> uim-svn-20050505.ebuild:
   modular-x-ified.
diff --git a/app-i18n/uim-svn/Manifest b/app-i18n/uim-svn/Manifest
index 88f94a1ce463..55b8620eda5d 100644
--- a/app-i18n/uim-svn/Manifest
+++ b/app-i18n/uim-svn/Manifest
@@ -1,22 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 df9f3641c72d0837841d6e0f3b16a0bb ChangeLog 2743
-RMD160 c1fb80483aa84b96913eef7658862df4292bd0f8 ChangeLog 2743
-SHA256 cff8c967061d57cf76b7447a612a4a83a9ebb5ff98e10fd40177e54305f1ef0c ChangeLog 2743
-MD5 224fb1ad2d4fafabab78a7aee65c0c9f files/digest-uim-svn-20050505 65
-RMD160 03e876224ff903bbe8d5d4193f094e0c75373cd8 files/digest-uim-svn-20050505 65
-SHA256 181addebbcac584903d148c2bcc13edd3c2984c9340136347a89e563862c9ba6 files/digest-uim-svn-20050505 65
+MD5 4dd874e9eca3f5c2ab801881fe55a52f ChangeLog 2990
+MD5 bb1358d0c54a9f19ec23bd58b8b52ef3 files/50uim-gentoo.el 120
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-uim-svn-20060320 0
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
-SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 metadata.xml 156
-MD5 66866737969792a762ccadf9af825274 uim-svn-20050505.ebuild 3149
-RMD160 630097394f9811e1545c4b0b359b48244e946e21 uim-svn-20050505.ebuild 3149
-SHA256 559e37fc74f967b719fcaff5e6d8bdd0a482a217e6e3c322a93e8391b5f24cca uim-svn-20050505.ebuild 3149
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD7Pjw9ZFPrqoILX8RAp/QAJ4jFOXTEetkPZAOmGXcUbrYoBmCUQCgzLrp
-vzAOHQlKI+pCHbXRRvlsFiM=
-=u8Tu
------END PGP SIGNATURE-----
+MD5 43444019eee3e71127de41a74f2b7cc9 uim-svn-20060320.ebuild 2915
diff --git a/app-i18n/uim-svn/files/50uim-gentoo.el b/app-i18n/uim-svn/files/50uim-gentoo.el
new file mode 100644
index 000000000000..a9c648411cd8
--- /dev/null
+++ b/app-i18n/uim-svn/files/50uim-gentoo.el
@@ -0,0 +1,6 @@
+
+;;; uim site-lisp configuration
+
+(require 'uim-leim)
+(set-language-info "Japanese" 'input-method "japanese-@IM@-uim")
+
diff --git a/app-i18n/uim-svn/files/digest-uim-svn-20050505 b/app-i18n/uim-svn/files/digest-uim-svn-20050505
deleted file mode 100644
index 58faa152ef88..000000000000
--- a/app-i18n/uim-svn/files/digest-uim-svn-20050505
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c3bb6df8590986104e41c23330d90aef prime-1.0.0.1.tar.gz 300251
diff --git a/app-i18n/uim-svn/files/digest-uim-svn-20060320 b/app-i18n/uim-svn/files/digest-uim-svn-20060320
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/app-i18n/uim-svn/files/digest-uim-svn-20060320
diff --git a/app-i18n/uim-svn/uim-svn-20050505.ebuild b/app-i18n/uim-svn/uim-svn-20060320.ebuild
index 487dc161ea68..3005d441e6e9 100644
--- a/app-i18n/uim-svn/uim-svn-20050505.ebuild
+++ b/app-i18n/uim-svn/uim-svn-20060320.ebuild
@@ -1,27 +1,32 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/uim-svn-20050505.ebuild,v 1.4 2006/02/10 20:33:54 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/uim-svn/uim-svn-20060320.ebuild,v 1.1 2006/03/20 14:52:50 hattya Exp $
 
-inherit flag-o-matic kde-functions multilib subversion
+inherit elisp-common flag-o-matic kde-functions multilib subversion
 
-IUSE="X canna dict eb fep gtk immqt qt m17n-lib nls"
+IUSE="X canna dict eb emacs fep gtk immqt libedit m17n-lib nls qt"
 
-ESVN_REPO_URI="svn://svn.utyuuzin.net/uim/trunk"
-ESVN_BOOTSTRAP="./autogen.sh -V"
+ESVN_REPO_URI="http://anonsvn.freedesktop.org/svn/uim/trunk"
+ESVN_BOOTSTRAP="./autogen.sh"
 #ESVN_PATCHES="*.diff"
 
-DESCRIPTION="a simple, secure and flexible input method library"
+DESCRIPTION="a multilingual input method library"
 HOMEPAGE="http://uim.freedesktop.org/"
-SRC_URI="http://prime.sourceforge.jp/src/prime-1.0.0.1.tar.gz"
+SRC_URI=""
 
 LICENSE="|| ( GPL-2 BSD )"
 KEYWORDS="~x86"
 SLOT="0"
 
+DEPEND="${RDEPEND}
+	dev-perl/XML-Parser
+	X? ( || ( ( x11-proto/xextproto x11-proto/xproto )
+	   	 	  virtual/x11 ) )
+	nls? ( sys-devel/gettext )"
 RDEPEND="!app-i18n/uim
 	!app-i18n/uim-fep
 	!app-i18n/uim-kdehelper
-	!app-i18n/uim-qt
+	!app-emacs/uim-el
 	X? ( || ( (
 	   	 	    x11-libs/libX11
 				x11-libs/libXft
@@ -34,41 +39,23 @@ RDEPEND="!app-i18n/uim
 		   	  virtual/x11 ) )
 	canna? ( app-i18n/canna )
 	eb? ( dev-libs/eb )
+	emacs? ( virtual/emacs )
 	gtk? ( >=x11-libs/gtk+-2 )
 	immqt? ( $(qt_min_version 3.3.4) )
+	libedit? ( dev-libs/libedit )
 	qt? ( $(qt_min_version 3.3.4) )
 	m17n-lib? ( dev-libs/m17n-lib )"
 
-DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/xextproto x11-proto/xproto )
-	   	 	  virtual/x11 ) )
-	dev-perl/XML-Parser
-	nls? ( sys-devel/gettext )"
-
-
 pkg_setup() {
 
 	local co_dir="${ESVN_STORE_DIR}/uim/trunk"
 
-	[[ ! -e ${co_dir} ]] || [[ -e ${co_dir}.freedesktop.org ]] && return
-
-	local repo_uri repo loc
-
-	cd ${co_dir}
-
-	repo_uri=$(LANG=C svn info | grep "^URL" | cut -d" " -f2)
+	[ ! -e ${co_dir} ] && return
 
-	if [[ "$repo_uri" = "http://freedesktop.org:8080/svn/uim/trunk" ]]; then
-		einfo "freedesktop.org had stopped the anonymous svn access."
-		einfo "switch to the mirror svn repository."
+	local repo_uri=$(LANG=C svn info ${co_dir} | grep "^URL" | cut -d" " -f2)
 
-		cd ..
-
-		repo=$(basename ${co_dir})
-		loc=$(echo ${repo_uri} | sed -e "s:^.*//\([^:/]*\).*:\1:")
-
-		mv ${repo} ${repo}.${loc}
-		einfo "    move ${repo} -> ${repo}.${loc}"
+	if [[ "${repo_uri}" != "${ESVN_REPO_URI}" ]]; then
+		die "Please remove ${co_dir}."
 
 	fi
 
@@ -81,58 +68,70 @@ src_compile() {
 	fi
 
 	econf \
-		`use_enable fep` \
 		`use_enable dict` \
+		`use_enable emacs` \
+		`use_enable fep` \
 		`use_enable nls` \
 		`use_with X x` \
 		`use_with canna` \
 		`use_with eb` \
 		`use_with immqt qt-immodule` \
+		`use_with libedit "" /usr` \
 		`use_with qt` \
 		`use_with gtk gtk2` \
 		`use_with m17n-lib m17nlib` \
 		|| die
 	emake || die
 
-	cd ${WORKDIR}/prime-1.0.0.1
-	econf || die
-
 }
 
 src_install() {
 
 	make DESTDIR=${D} install || die
 
-	cd ${WORKDIR}/prime-1.0.0.1
-	make DESTDIR="${D}" install-uim || die
-	cd -
-
 	rm doc/Makefile*
 
 	dodoc AUTHORS COPYING ChangeLog* INSTALL* NEWS README*
 	dodoc doc/*
 
-	if use fep; then
-		cd fep
-		docinto fep
-		dodoc COPYING INSTALL README*
-		cd -
+	local u
+
+	for u in emacs fep; do
+		if use ${u}; then
+			cd ${u}
+			docinto ${u}
+			dodoc COPYING INSTALL README*
+			cd -
+		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
 	fi
 
 }
 
 pkg_postinst() {
 
-	einfo
-	einfo "To use uim-anthy you should emerge app-i18n/anthy or app-i18n/anthy-ss."
-	einfo "To use uim-skk you should emerge app-i18n/skk-jisyo."
-	einfo "To use uim-prime you should emerge app-i18n/prime."
-	einfo
-
 	local chost
 
 	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
 
 }
 
@@ -142,7 +141,6 @@ 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
 
 }
-
-# $Id: uim-svn-20050505.ebuild,v 1.4 2006/02/10 20:33:54 liquidx Exp $