merge of 78497884a0df59f27e3276d6961e46c6f09f7eb9

     and bf485b02c3a40cf5e773106c4aff28ebea2e1a2e

8 files changed, 102 insertions, 49 deletions

diff --git a/packages/ruby/ruby-native_1.8.2.bb b/packages/ruby/ruby-native_1.8.4.bb
index d5ccae8262..d5ccae8262 100644
--- a/packages/ruby/ruby-native_1.8.2.bb
+++ b/packages/ruby/ruby-native_1.8.4.bb
diff --git a/packages/ruby/ruby_1.8.2.bb b/packages/ruby/ruby_1.8.4.bb
index 235c3892de..235c3892de 100644
--- a/packages/ruby/ruby_1.8.2.bb
+++ b/packages/ruby/ruby_1.8.4.bb
diff --git a/packages/uim/uim-native/.mtn2git_empty b/packages/uim/uim-native/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uim/uim-native/.mtn2git_empty
diff --git a/packages/uim/uim-native/uim-module-manager.patch b/packages/uim/uim-native/uim-module-manager.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uim/uim-native/uim-module-manager.patch
diff --git a/packages/uim/uim-native_1.1.0.bb b/packages/uim/uim-native_1.1.0.bb
index 04c6868bed..7856a67b15 100644
--- a/packages/uim/uim-native_1.1.0.bb
+++ b/packages/uim/uim-native_1.1.0.bb
@@ -1,5 +1,3 @@
-require uim_${PV}.bb
-DEPENDS = "anthy-native"
-inherit native
-
-SRC_URI = "http://uim.freedesktop.org/releases/uim-${PV}.tar.gz"
+require uim.inc
+DEPENDS = "gtk+ anthy intltool-native"
+inherit native autotools pkconfig
diff --git a/packages/uim/uim/.mtn2git_empty b/packages/uim/uim/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uim/uim/.mtn2git_empty
diff --git a/packages/uim/uim/uim-module-manager.patch b/packages/uim/uim/uim-module-manager.patch
new file mode 100644
index 0000000000..8569bf39ef
--- /dev/null
+++ b/packages/uim/uim/uim-module-manager.patch
@@ -0,0 +1,11 @@
+--- uim-1.1.0/scm/Makefile.am~	2006-06-09 10:46:12.000000000 +0900
++++ uim-1.1.0/scm/Makefile.am	2006-06-19 23:00:15.620000000 +0900
+@@ -58,7 +58,7 @@
+   module_names += "scim"
+ endif
+ 
+-UIM_MODULE_MANAGER = $(top_builddir)/uim/uim-module-manager
++UIM_MODULE_MANAGER = uim-module-manager
+ UIM_MODULE_MANAGER_ENV = \
+         LIBUIM_SCM_FILES=$(abs_srcdir) \
+         LIBUIM_PLUGIN_LIB_DIR=$(abs_top_builddir)/uim/.libs
diff --git a/packages/uim/uim_1.1.0.bb b/packages/uim/uim_1.1.0.bb
index 4877e2d86d..ea549c5451 100644
--- a/packages/uim/uim_1.1.0.bb
+++ b/packages/uim/uim_1.1.0.bb
@@ -1,98 +1,142 @@
-DESCRIPTION = "A multilingual user input method library"
-HOMEPAGE = "http://uim.freedesktop.org/"
-LICENSE = "GPL"
-DEPENDS = "uim-native"
-SECTION = "libs/inputmethod"
-PR = "r0"
+require uim.inc
+DEPENDS = "gtk+ uim-native anthy fontconfig x11 libxft xt glib-2.0 ncurses"
 
-SRC_URI = "http://uim.freedesktop.org/releases/uim-${PV}.tar.gz \
-	   file://uim-module-manager.patch;patch=1"
+SRC_URI += "file://uim-module-manager.patch;patch=1"
 
 S = "${WORKDIR}/uim-${PV}"
 
-inherit autotools pkgconfig
-
 do_stage() {
 	autotools_stage_all
 }
 
-#pkg_postinst_${PN} () {
-#	ldconfig
-#	gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-#}
-
-PACKAGES = "uim-xim uim-utils uim-skk uim-qt uim-prime uim-m17nlib uim-gtk2.0 uim-fep uim-el uim-common \
-            uim-canna uim-applet-gnome uim-anthy libuim0 libuim-dbg libuim-dev"
+inherit autotools pkconfig
 
-DESCRIPTION_uim = "A Japanese input method (backend, dictionary and utility)"
-DESCRIPTION_libuim0 = "uim runtime library"
-DESCRIPTION_libuim-dev = "uim static library, headers and documents for developers"
+PACKAGES = "uim-xim uim-utils uim-skk uim-gtk2.0 uim-fep uim-common uim-anthy libuim0 libuim-dev"
 
 LEAD_SONAME = "libuim.so.1"
 RDEPENDS_uim = "libuim0"
 
+DESCRIPTION_libuim-dev = "Development files for uim"
 FILES_libuim-dev = "${libdir}/libuim*.a \
                     ${libdir}/libuim*.la \
                     ${libdir}/libuim*.so \
                     ${includedir}/uim \
                     ${libdir}/pkgconfig/uim.pc"
 
-FILES_libuim0-dbg = "${libdir}/debug"
-
-
+DESCRIPTION_libuim0 = "Simple and flexible input method collection and library"
 FILES_libuim0 = "${libdir}/uim/plugin/libuim-custom-enabler.* \
                  ${libdir}/libuim-custom.so.* \
-#                 ${datadir}/locale/ja/LC_MESSAGES/uim.mo \
-#                 ${datadir}/locale/fr/LC_MESSAGES/uim.mo \
-#                 ${datadir}/locale/ko/LC_MESSAGES/uim.mo \
+                 ${datadir}/locale/ja/LC_MESSAGES/uim.mo \
+                 ${datadir}/locale/fr/LC_MESSAGES/uim.mo \
+                 ${datadir}/locale/ko/LC_MESSAGES/uim.mo \
                  ${libdir}/libuim.so.*"
 
-
+DESCRIPTION_uim-anthy = "Anthy plugin for uim"
 FILES_uim-anthy = "${libdir}/uim/plugin/libuim-anthy.* \
                    ${datadir}/uim/anthy*.scm"
 
-FILES_uim-applet-gnome = "${libdir}/bonobo \
-                          ${libdir}/uim/uim-toolbar-applet \
-                          ${datadir}/applications/uim.desktop"
+pkg_postinst_uim-anthy() {
+#! /bin/sh
+set -e
+if [ -f /usr/bin/uim-module-manager ]; then
+	/usr/bin/uim-module-manager --register anthy --path /etc/uim
+fi
+}
 
-FILES_uim-canna = "${libdir}/uim/plugin/libuim-canna.* \
-                   ${datadir}/uim/canna*.scm"
+pkg_postrm_uim-anthy() {
+#! /bin/sh
+set -e
+if [ -f /usr/bin/uim-module-manager ]; then
+	/usr/bin/uim-module-manager --path /etc/uim --unregister anthy
+fi
+}
 
-FILES_uim-el = "${datadir}/emacs \
-                ${bindir}/uim-el-*"
+pkg_prerm_uim-anthy() {
+#! /bin/sh
+set -e
+if [ -f /usr/bin/uim-module-manager ]; then
+	/usr/bin/uim-module-manager --register anthy --path /etc/uim
+fi
+}
 
+DESCRIPTION_uim-fep = "uim Front End Processor"
 FILES_uim-fep = "${bindir}/uim-fep*"
 
+DESCRIPTION_uim-gtk2.0  = "GTK+2.x immodule for uim"
 FILES_uim-gtk2.0 = "${libdir}/gtk-2.0 \
                     ${bindir}/uim-toolbar-gtk* \
                     ${bindir}/uim-*-gtk \
                     ${bindir}/uim-input-pad-ja \
                     ${datadir}/uim/helperdata/uim-dict-ui.xml"
 
-FILES_uim-m17nlib = "${libdir}/uim/plugin/libuim-m17nlib.* \
-                     ${datadir}/uim/m17nlib.scm"
-
-FILES_uim-prime = "${libdir}/uim/plugin/libuim-prime.* \
-                   ${datadir}/uim/prime*.scm"
-
+pkg_postinst_uim-gtk2.0() {
+#! /bin/sh
+set -e
+gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
 
-FILES_uim-qt = "${bindir}/uim-*-qt \
-                ${libdir}/uim/uim-candwin-qt \
-                ${libdir}/qt3/plugins/inputmethods \
-                ${datadir}/locale/ja/LC_MESSAGES/uim-chardict-qt.mo"
+#pkg_postrm_uim-gtk2.0() {
+##! /bin/sh
+#set -e
+#/usr/sbin/update-gtk-immodules
+#}
 
+DESCRIPTION_uim-skk = "SKK plugin for uim"
 FILES_uim-skk = "${libdir}/uim/plugin/libuim-skk.* \
                  ${datadir}/uim/skk*.scm"
 
+pkg_postinst_uim-skk() {
+#! /bin/sh
+set -e
+if [ -f /usr/bin/uim-module-manager ]; then
+	/usr/bin/uim-module-manager --register skk --path /etc/uim
+fi
+}
+
+pkg_postrm_uim-skk() {
+#! /bin/sh
+set -e
+if [ -f /usr/bin/uim-module-manager ]; then
+	/usr/bin/uim-module-manager --path /etc/uim --unregister skk
+fi
+}
 
+DESCRIPTION_uim-utils = "Utilities for uim"
 FILES_uim-utils = "${bindir}/uim-sh \
                    ${bindir}/uim-module-manager \
 		   ${libexecdir}/uim-helper-server"
 
+DESCRIPTION_uim-xim = "A bridge between uim and XIM"
 FILES_uim-xim = "${bindir}/uim-xim \
                  ${libexecdir}/uim-candwin-gtk \
                  ${datadir}/man/man1/uim-xim.1 \
                  ${sysconfdir}/X11/xinit/xinput.d/uim*"
 
+# to .xinitrc, or .xsession
+#pkg_postinst_uim-xim() {
+#GTK_IM_MODULE=uim ; export GTK_IM_MODULE
+#QT_IM_MODULE=uim ; export QT_IM_MODULE
+#uim-xim &
+#XMODIFIERS=@im=uim ; export XMODIFIERS
+#}
+
+DESCRIPTION_uim-common = "Common files for uim"
 FILES_uim-common = "${datadir}/uim/pixmaps/*.png \
                     ${datadir}/uim"
+pkg_postinst_uim-common() {
+#! /bin/sh
+set -e
+if [ -f /usr/bin/uim-module-manager ]; then
+	/usr/bin/uim-module-manager --path /etc/uim --register \
+		tutcode tcode hangul viqr ipa-x-sampa latin byeoru
+fi
+}
+
+pkg_prerm_uim-common() {
+#! /bin/sh
+set -e
+if [ -f /usr/bin/uim-module-manager ]; then
+	/usr/bin/uim-module-manager --path /etc/uim --register \
+		tutcode tcode hangul viqr ipa-x-sampa latin byeoru
+fi
+}