merge of 'd1370b15e175b1b3cf370e0d9464e6db9893326a'

     and 'd49c7a5854a653df449e557102e3fbec0192fa4e'

6 files changed, 31 insertions, 30 deletions

diff --git a/packages/anthy/anthy_7811.bb b/packages/anthy/anthy_7811.bb
index a6c8eff200..5ac651223b 100644
--- a/packages/anthy/anthy_7811.bb
+++ b/packages/anthy/anthy_7811.bb
@@ -3,8 +3,8 @@ AUTHOR = "Anthy Developers <anthy-dev@lists.sourceforge.jp>"
 HOMEPAGE = "http://anthy.sourceforge.jp"
 LICENSE = "GPL"
 DEPENDS = "anthy-native"
-SECTION = "libs/inputmethod"
-PR = "r0"
+SECTION = "inputmethods"
+PR = "r1"
 
 SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/20510/anthy-7811.tar.gz \
 	   file://not_build_elc.patch;patch=1 \
@@ -12,8 +12,6 @@ SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/20510/anthy-7811.tar.gz \
 	   file://change_anthy_dic_path.patch;patch=1 \
 	   file://native-mkanthydic-mkdepgraph.patch;patch=1"
 
-S = "${WORKDIR}/anthy-${PV}"
-
 inherit autotools pkgconfig
 
 PACKAGES = "${PN} ${PN}-el libanthy0 libanthy-dev"
@@ -21,6 +19,8 @@ PACKAGES = "${PN} ${PN}-el libanthy0 libanthy-dev"
 DESCRIPTION_anthy = "A Japanese input method (backend, dictionary and utility)"
 DESCRIPTION_libanthy0 = "Anthy runtime library"
 DESCRIPTION_libanthy-dev = "Anthy static library, headers and documets for developers"
+SECTION_libanthy0 = "libs/inputmethods"
+SECTION_libanthy-dev = "devel/libs"
 
 # gettext
 
diff --git a/packages/kanjipad/kanjipad.inc b/packages/kanjipad/kanjipad.inc
index aecd130b82..ce9613b3ab 100644
--- a/packages/kanjipad/kanjipad.inc
+++ b/packages/kanjipad/kanjipad.inc
@@ -6,4 +6,6 @@ LICENSE = "GPL"
 
 SRC_URI="http://fishsoup.net/software/kanjipad/kanjipad-2.0.0.tar.gz"
 
+S = ${WORKDIR}/kanjipad-2.0.0/
+
 inherit autotools pkgconfig
diff --git a/packages/kanjipad/kpengine_0.1.bb b/packages/kanjipad/kpengine_0.1.bb
index 0fa32faf13..d9a6fee7d6 100644
--- a/packages/kanjipad/kpengine_0.1.bb
+++ b/packages/kanjipad/kpengine_0.1.bb
@@ -1,10 +1,9 @@
 require kanjipad.inc
 
-SECTION = "libs"
+DESCRIPTION = "Japanese HWR engine used by a number of programs. Original algorithms by Todd Ruddick."
+SECTION = "inputmethods"
+PR = "r1"
 
 SRC_URI += "file://Makefile-kpengine-only.patch;patch=1"
 
-FILES = "${bindir}/kpengine ${datadir}"
-
-# would it be better to make this a part of kanjipad bb?
-S = ${WORKDIR}/kanjipad-2.0.0/
+FILES_${PN} = "${bindir}/kpengine ${datadir}"
diff --git a/packages/poboxserver/poboxserver_1.2.5.bb b/packages/poboxserver/poboxserver_1.2.5.bb
index 6278c920be..e582ce0ccf 100644
--- a/packages/poboxserver/poboxserver_1.2.5.bb
+++ b/packages/poboxserver/poboxserver_1.2.5.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "OpenPOBox is an open source implementation of a 'Predictive Operation Based On eXample'"
-SECTION = "libs/inputmethods"
+SECTION = "inputmethods"
 LICENSE = "GPL"
 DEPENDS = "perl-native ruby-native nkf-native"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gakusei/pobox-${PV}.tar.bz2 \
            http://www.vanille.de/mirror/pbserver-${PV}.tar.gz \
diff --git a/packages/uim/uim.inc b/packages/uim/uim.inc
index a4b0215896..94eb11d332 100644
--- 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 5d82945df7..e5ddcd0737 100644
--- 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 = "libs/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
+}