merge of '879c2e35f17da4b01ea93a7d8a286583b9eec1f6'

     and 'bae5b516fbb7c4ed7939b4dbb39c62866ef76d98'

23 files changed, 79 insertions, 17 deletions

diff --git a/packages/blueprobe/blueprobe-0.18/.mtn2git_empty b/packages/blueprobe/blueprobe-0.18/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/blueprobe/blueprobe-0.18/.mtn2git_empty
diff --git a/packages/blueprobe/blueprobe-0.18/h4000.patch b/packages/blueprobe/blueprobe-0.18/h4000.patch
new file mode 100644
index 0000000000..35a30c4943
--- /dev/null
+++ b/packages/blueprobe/blueprobe-0.18/h4000.patch
@@ -0,0 +1,16 @@
+--- blueprobe-0.18/blueprobe.init.org	2007-01-11 11:54:09.000000000 +0000
++++ blueprobe-0.18/blueprobe.init	2007-02-11 17:05:51.000000000 +0000
+@@ -65,6 +65,13 @@
+         PROTO=bcsp
+ 	PROBE=yes
+ 	;;
++    "HP iPAQ H4000")
++	BLUETOOTH=yes
++	PORT=/dev/ttyS1
++	SPEED=115200
++	PROTO=texas
++	PROBE=no
++	;;
+     "HP iPAQ HX4700")
+ 	BLUETOOTH=yes
+ 	PORT=/dev/ttyS1
diff --git a/packages/blueprobe/blueprobe_0.18.bb b/packages/blueprobe/blueprobe_0.18.bb
index 2c0650511a..ca455401e0 100644
--- a/packages/blueprobe/blueprobe_0.18.bb
+++ b/packages/blueprobe/blueprobe_0.18.bb
@@ -1,3 +1,5 @@
 require blueprobe.inc
 
-PR = "r0"
+PR = "r1"
+
+SRC_URI += "file://h4000.patch;patch=1"
diff --git a/packages/bluesnarfer/bluesnarfer.bb b/packages/bluesnarfer/bluesnarfer.bb
index 43d807f828..8ba346e526 100644
--- a/packages/bluesnarfer/bluesnarfer.bb
+++ b/packages/bluesnarfer/bluesnarfer.bb
@@ -1,4 +1,4 @@
-SECTION = "net/misc"
+SECTION = "network/misc"
 DESCRIPTION = "Bluetooth cellphone information gatherer"
 PV = "0.1"
 SRC_URI = "http://www.remote-exploit.org/images/a/a0/Bluesnarfer.tar.gz"
diff --git a/packages/ghettotooth/ghettotooth.bb b/packages/ghettotooth/ghettotooth.bb
index 413d81a819..426a657848 100644
--- a/packages/ghettotooth/ghettotooth.bb
+++ b/packages/ghettotooth/ghettotooth.bb
@@ -1,4 +1,4 @@
-SECTION = "net/misc"
+SECTION = "network/misc"
 DESCRIPTION = "Bluetooth scanner"
 LICENSE = "GPL"
 RDEPENDS = "perl"
diff --git a/packages/gperiodic/gperiodic_1.3.3.bb b/packages/gperiodic/gperiodic_1.3.3.bb
index 3202fc2a48..427f31565b 100644
--- a/packages/gperiodic/gperiodic_1.3.3.bb
+++ b/packages/gperiodic/gperiodic_1.3.3.bb
@@ -4,7 +4,7 @@ and view detailed information on each of the elements. \
 118 elements are currently listed."
 LICENSE = "GPL"
 HOMEPAGE = "http://gperiodic.seul.org"
-SECTION = "x11/apps"
+SECTION = "x11/applications"
 DEPENDS = "gtk+-1.2"
 
 SRC_URI = "http://gperiodic.seul.org/downloads/gperiodic-${PV}.tar.gz"
diff --git a/packages/granule/granule.inc b/packages/granule/granule.inc
index 7f211b3de1..4fa2db9b04 100644
--- a/packages/granule/granule.inc
+++ b/packages/granule/granule.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "Generic memory training with flash cards.  Automatic scheduling algorithm."
 AUTHOR = "Vladislav Grinchenko <vlg@users.sourceforge.net>"
 HOMEPAGE = "http://granule.sf.net"
-SECTION = "x11/apps"
+SECTION = "x11/applications"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
 DEPENDS = "glib-2.0-native intltool-native gtkmm libxml2 libassa"
diff --git a/packages/gtk2-ssh-askpass/gtk2-ssh-askpass_0.3.bb b/packages/gtk2-ssh-askpass/gtk2-ssh-askpass_0.3.bb
index 8c5efa8622..3c4eb9a530 100644
--- a/packages/gtk2-ssh-askpass/gtk2-ssh-askpass_0.3.bb
+++ b/packages/gtk2-ssh-askpass/gtk2-ssh-askpass_0.3.bb
@@ -5,7 +5,7 @@
 DESCRIPTION="GTK2 ssh askpass utility"
 HOMEPAGE="http://www.cgabriel.org/sw/gtk2-ssh-askpass/"
 LICENSE = "GPL"
-SECTION = "net-misc"
+SECTION = "network/misc"
 
 SRC_URI="http://src.gentoo.pl/distfiles/gtk2-ssh-askpass-${PV}.tar.gz \
 	file://makefile.patch;patch=1"
diff --git a/packages/kakasi/.mtn2git_empty b/packages/kakasi/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kakasi/.mtn2git_empty
diff --git a/packages/kakasi/files/.mtn2git_empty b/packages/kakasi/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/kakasi/files/.mtn2git_empty
diff --git a/packages/kakasi/files/makefile.patch b/packages/kakasi/files/makefile.patch
new file mode 100644
index 0000000000..4373a498c1
--- /dev/null
+++ b/packages/kakasi/files/makefile.patch
@@ -0,0 +1,11 @@
+--- kakasi-2.3.4/Makefile.am.old	2006-04-23 18:11:57.000000000 +0200
++++ kakasi-2.3.4/Makefile.am	2006-04-23 18:12:07.000000000 +0200
+@@ -17,7 +17,7 @@
+ 
+ kanwadict:
+ 	if test -f kakasidict; then \
+-	    ITAIJIDICT="itaijidict" src/mkkanwa$(EXEEXT) $@ kakasidict; \
++	    ITAIJIDICT="itaijidict" mkkanwa$(EXEEXT) $@ kakasidict; \
+ 	fi
+ 
+ dist-hook:
diff --git a/packages/kakasi/kakasi-native_2.3.4.bb b/packages/kakasi/kakasi-native_2.3.4.bb
new file mode 100644
index 0000000000..86a4c81b44
--- /dev/null
+++ b/packages/kakasi/kakasi-native_2.3.4.bb
@@ -0,0 +1,11 @@
+require kakasi.inc
+
+inherit native
+
+S = "${WORKDIR}/kakasi-${PV}"
+
+do_stage() {
+        install src/mkkanwa ${STAGING_BINDIR}
+}
+
+
diff --git a/packages/kakasi/kakasi.inc b/packages/kakasi/kakasi.inc
new file mode 100644
index 0000000000..b931a84958
--- /dev/null
+++ b/packages/kakasi/kakasi.inc
@@ -0,0 +1,9 @@
+DESCRIPTION = "Kanji Kana Simple Inverter"
+HOMEPAGE = "http://kakasi.namazu.org/"
+LICENSE = "GPL"
+
+SRC_URI = "http://kakasi.namazu.org/stable/kakasi-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = " --enable-shared"
diff --git a/packages/kakasi/kakasi_2.3.4.bb b/packages/kakasi/kakasi_2.3.4.bb
new file mode 100644
index 0000000000..aabfd20368
--- /dev/null
+++ b/packages/kakasi/kakasi_2.3.4.bb
@@ -0,0 +1,14 @@
+require kakasi.inc
+
+SECTION = "utils"
+DEPENDS = "kakasi-native"
+
+SRC_URI += "file://makefile.patch;patch=1"
+
+do_stage () {
+        install -m 0644 lib/*.h ${STAGING_INCDIR}
+	install lib/.libs/libkakasi.so* ${STAGING_LIBDIR}
+}
+
+
+
diff --git a/packages/mrxvt/mrxvt_0.4.1.bb b/packages/mrxvt/mrxvt_0.4.1.bb
index 153d226f97..8991295902 100644
--- a/packages/mrxvt/mrxvt_0.4.1.bb
+++ b/packages/mrxvt/mrxvt_0.4.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "MRXVT is a lightweight and powerful X terminal emulator based on
 HOMEPAGE = "http://materm.sourceforge.net"
 AUTHOR = "Jimmy Zhou <jimmyzhou@users.sf.net>"
 LICENSE = "GPL"
-SECTION = "x11/apps"
+SECTION = "x11/applications"
 DEPENDS = "virtual/libx11 libxext libxpm jpeg libpng"
 PR = "r0"
 
diff --git a/packages/nasm/nasm_0.98.38.bb b/packages/nasm/nasm_0.98.38.bb
index 3b9bf36e17..86e7f2b935 100644
--- a/packages/nasm/nasm_0.98.38.bb
+++ b/packages/nasm/nasm_0.98.38.bb
@@ -1,8 +1,7 @@
-SECTION = "devel"
 DESCRIPTION = "General-purpose x86 assembler"
-COMPATIBLE_HOST = '(x86_64|i.86.*)-(linux|freebsd.*)'
+SECTION = "devel"
 LICENSE = "GPL"
-SECTION = "dev-lang"
+COMPATIBLE_HOST = '(x86_64|i.86.*)-(linux|freebsd.*)'
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/nasm/nasm-${PV}.tar.bz2"
 
diff --git a/packages/networkmanager/networkmanager_0.6.4.bb b/packages/networkmanager/networkmanager_0.6.4.bb
index e14230aadc..737d9544d0 100644
--- a/packages/networkmanager/networkmanager_0.6.4.bb
+++ b/packages/networkmanager/networkmanager_0.6.4.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "GNOME NetworkManager port"
-SECTION = "net/misc"
+SECTION = "network/misc"
 LICENSE = "GPL"
 HOMEPAGE = "http://www.gnome.org"
 PRIORITY = "optional"
diff --git a/packages/texmaker/texmaker_1.3.bb b/packages/texmaker/texmaker_1.3.bb
index 7f14e90b34..5682338f31 100644
--- a/packages/texmaker/texmaker_1.3.bb
+++ b/packages/texmaker/texmaker_1.3.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "TeXmaker is a free cross-platform LaTeX editor"
 HOMEPAGE = "http://www.xm1math.net/texmaker"
-SECTION = "x11/apps"
+SECTION = "x11/applications"
 LICENSE = "GPL"
 
 SRC_URI = "http://www.xm1math.net/texmaker/texmaker-${PV}.tar.bz2"
diff --git a/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb
index b322350e03..0787a7ced7 100644
--- a/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/mkfontdir-native_X11R7.0-1.0.1.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "X mkfontdir app"
-SECTION = "x11/apps"
+SECTION = "x11/applications"
 LICENSE = "MIT-X"
 
 S="${WORKDIR}/mkfontdir-${PV}"
diff --git a/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb b/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb
index 3ec30fde48..0eb85010b9 100644
--- a/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb
+++ b/packages/xorg-app/mkfontdir-native_X11R7.1-1.0.2.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "X mkfontdir app"
-SECTION = "x11/apps"
+SECTION = "x11/applications"
 LICENSE = "MIT-X"
 
 S="${WORKDIR}/mkfontdir-${PV}"
diff --git a/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb b/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb
index 051a9e5f63..5bbab6a5fd 100644
--- a/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb
+++ b/packages/xorg-app/mkfontscale-native_X11R7.0-1.0.1.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "X mkfontscale app"
-SECTION = "x11/apps"
+SECTION = "x11/applications"
 LICENSE = "MIT-X"
 S="${WORKDIR}/mkfontscale-${PV}"
 
diff --git a/packages/xorg-app/xorg-app-common.inc b/packages/xorg-app/xorg-app-common.inc
index 27a1dd2bfa..b2a73f9ca8 100644
--- a/packages/xorg-app/xorg-app-common.inc
+++ b/packages/xorg-app/xorg-app-common.inc
@@ -1,6 +1,6 @@
 DESCRIPTION = "X application"
 HOMEPAGE = "http://www.x.org"
-SECTION = "x11/apps"
+SECTION = "x11/applications"
 LICENSE = "MIT-X"
 
 #DEPENDS = ""
diff --git a/packages/xorg-app/xterm_207.bb b/packages/xorg-app/xterm_207.bb
index b1291037b4..5d02234b35 100644
--- a/packages/xorg-app/xterm_207.bb
+++ b/packages/xorg-app/xterm_207.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "xterm app"
-SECTION = "x11/apps"
+SECTION = "x11/applications"
 LICENSE = "MIT-X"
 
 DEPENDS = "libxaw xproto virtual/libx11 xextproto xext xau libxpm ncurses"