uim: update SRC_URI, fix SECTION, misc clean up

diff --git a/packages/uim/uim.inc b/packages/uim/uim.inc
index a4b0215..94eb11d 100644 (file)
--- a/packages/uim/uim.inc
+++ b/packages/uim/uim.inc
@@ -1,12 +1,11 @@
 DESCRIPTION = "A multilingual user input method library"
 HOMEPAGE = "http://uim.freedesktop.org/"
 LICENSE = "GPL"
-SECTION = "libs/inputmethod"
-PR = "r0"
+SECTION = "inputmethods"
 
 EXTRA_OECONF += "--disable-applet \
                  --disable-emacs \
-                 --without-qt \
+#                 --without-qt \
                  --without-scim \
                  --without-m17nlib \
                  --without-prime \
@@ -14,6 +13,4 @@ EXTRA_OECONF += "--disable-applet \
                  --without-mana \
                  --without-eb"
 
-SRC_URI = "http://uim.freedesktop.org/releases/uim-${PV}.tar.bz2"
-
-S = "${WORKDIR}/uim-${PV}"
+SRC_URI = "http://uim.freedesktop.org/releases/uim/stable/uim-${PV}.tar.bz2"

diff --git a/packages/uim/uim_1.3.1.bb b/packages/uim/uim_1.3.1.bb
index 5d82945..37433a4 100644 (file)
--- a/packages/uim/uim_1.3.1.bb
+++ b/packages/uim/uim_1.3.1.bb
@@ -1,29 +1,20 @@
 require uim.inc
 DEPENDS = "gtk+ uim-native anthy fontconfig libxft xt glib-2.0 ncurses"
+SECTION_uim-gtk2.0 = "x11/inputmethods"
+PR = "r1"
 
 SRC_URI += "file://uim-module-manager.patch;patch=1"
 
-S = "${WORKDIR}/uim-${PV}"
-
-do_stage() {
-       autotools_stage_all
-}
-
 inherit autotools pkgconfig
 
 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"
+RDEPENDS_uim-anthy = "virtual/japanese-font"
 
 DESCRIPTION_libuim0 = "Simple and flexible input method collection and library"
+SECTION_libuim0 = "lib/inputmethods"
 FILES_libuim0 = "${libdir}/uim/plugin/libuim-custom-enabler.* \
                  ${libdir}/libuim-custom.so.* \
                  ${datadir}/locale/ja/LC_MESSAGES/uim.mo \
@@ -31,6 +22,14 @@ FILES_libuim0 = "${libdir}/uim/plugin/libuim-custom-enabler.* \
                  ${datadir}/locale/ko/LC_MESSAGES/uim.mo \
                  ${libdir}/libuim.so.*"
 
+DESCRIPTION_libuim-dev = "Development files for uim"
+SECTION_libuim-dev = "devel/libs"
+FILES_libuim-dev = "${libdir}/libuim*.a \
+                    ${libdir}/libuim*.la \
+                    ${libdir}/libuim*.so \
+                    ${includedir}/uim \
+                    ${libdir}/pkgconfig/uim.pc"
+
 DESCRIPTION_uim-anthy = "Anthy plugin for uim"
 FILES_uim-anthy = "${libdir}/uim/plugin/libuim-anthy.* \
                    ${datadir}/uim/anthy*.scm"
@@ -140,3 +139,7 @@ if [ -f /usr/bin/uim-module-manager ]; then
                tutcode tcode hangul viqr ipa-x-sampa latin byeoru
 fi
 }
+
+do_stage() {
+       autotools_stage_all
+}