merge of '7515f43924dd61866be5833ca02d8cc7252e7ebc'

     and 'f88bbdd4b314a31b08b342dd74417b7202cb5c26'

16 files changed, 44 insertions, 72 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 53c4380116..dc59ea204c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -146,6 +146,7 @@ Recipes:    ttf-fonts/*
 
 Person:     Matthias 'CoreDump' Hentges
 Website:    http://www.hentges.net
+Distros:    Sonkei
 Machines:   collie, spitz
 Recipes:    altboot, webcam-server
 
@@ -197,7 +198,7 @@ Person:	    Rolf 'Laibsch' Leggewie
 Mail:       OE-recipes@rolf.leggewie.biz
 Website:    http://oz.leggewie.org
 Interests:  Japanese on the Zaurus
-Distros:    Ångström
+Distros:    Sonkei
 Machines:   collie, spitz
 Recipes:    anthy, nunome, uim*, granule, qpobox*, qte-font-unifont*
 Recipes:    qpf-unismall, qpobox, poboxserver, imkit*, scim, zten
diff --git a/packages/glibmm/glibmm.inc b/packages/glibmm/glibmm.inc
new file mode 100644
index 0000000000..c33d3151ae
--- /dev/null
+++ b/packages/glibmm/glibmm.inc
@@ -0,0 +1,24 @@
+DESCRIPTION = "C++ bindings for the glib library."
+HOMEPAGE = "http://www.gtkmm.org/"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+DEPENDS = "glib-2.0 libsigc++-2.0"
+PR = "r0"
+SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.bz2"
+
+inherit autotools pkgconfig flow-lossage
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${libdir}/glibmm-2.4/include/"
+
+LIBV = "2.4.0"
+
+do_stage () {
+	autotools_stage_all
+
+	install -m 0644 glib/glibmmconfig.h ${STAGING_INCDIR}/glibmm-2.4
+	install -m 0644 scripts/glibmm_check_perl.m4 ${STAGING_DATADIR}/aclocal/
+}
diff --git a/packages/glibmm/glibmm_2.12.10.bb b/packages/glibmm/glibmm_2.12.10.bb
index a62d4eb145..90a053fb36 100644
--- a/packages/glibmm/glibmm_2.12.10.bb
+++ b/packages/glibmm/glibmm_2.12.10.bb
@@ -1,23 +1 @@
-DESCRIPTION = "C++ bindings for the glib library."
-HOMEPAGE = "http://www.gtkmm.org/"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-DEPENDS = "glib-2.0 libsigc++-2.0"
-PR = "r0"
-
-SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.12/glibmm-${PV}.tar.bz2"
-
-inherit autotools pkgconfig flow-lossage
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${libdir}/glibmm-2.4/include/"
-
-LIBV = "2.4.0"
-
-do_stage () {
-	autotools_stage_all
-
-	install -m 0644 glib/glibmmconfig.h ${STAGING_INCDIR}/glibmm-2.4
-	install -m 0644 scripts/glibmm_check_perl.m4 ${STAGING_DATADIR}/aclocal/
-}
+require glibmm.inc
diff --git a/packages/glibmm/glibmm_2.14.2.bb b/packages/glibmm/glibmm_2.14.2.bb
new file mode 100644
index 0000000000..aeadede939
--- /dev/null
+++ b/packages/glibmm/glibmm_2.14.2.bb
@@ -0,0 +1,3 @@
+require glibmm.inc
+
+DEFAULT_PREFERENCE = "-1"
diff --git a/packages/guile/guile-native_1.6.4.bb b/packages/guile/guile-native_1.6.4.bb
index 96763730ec..4a3bc5e74e 100644
--- a/packages/guile/guile-native_1.6.4.bb
+++ b/packages/guile/guile-native_1.6.4.bb
@@ -1,5 +1,6 @@
 SECTION = "unknown"
 LICENSE = "GPL"
+DEPENDS = "gmp-native"
 SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
 	   file://guile-amd64.patch;patch=1"
 
diff --git a/packages/guile/guile-native_1.8.2.bb b/packages/guile/guile-native_1.8.2.bb
index 99d77b0da0..ac2b189d37 100644
--- a/packages/guile/guile-native_1.8.2.bb
+++ b/packages/guile/guile-native_1.8.2.bb
@@ -1,5 +1,6 @@
 SECTION = "unknown"
 LICENSE = "GPL"
+DEPENDS = "gmp-native"
 SRC_URI = "http://ftp.gnu.org/pub/gnu/guile/guile-${PV}.tar.gz \
            "
 
diff --git a/packages/images/nylon-image-base.bb b/packages/images/nylon-image-base.bb
index b4913097be..27dc165800 100644
--- a/packages/images/nylon-image-base.bb
+++ b/packages/images/nylon-image-base.bb
@@ -8,7 +8,7 @@ NYLON_BASE = "base-files base-passwd bash busybox \
 	mtd-utils \
 	nano ncurses netbase \
 	openssh sysvinit \
-	timezones tinylogin udev"
+	tzdata tinylogin udev"
 
 DEPENDS += "virtual/kernel less nano"
 IMAGE_INSTALL = "kernel less nano elvis-tiny \
diff --git a/packages/meta/nylon-feed.inc b/packages/meta/nylon-feed.inc
index de1a7ff484..d7b83e8edb 100644
--- a/packages/meta/nylon-feed.inc
+++ b/packages/meta/nylon-feed.inc
@@ -54,7 +54,7 @@ sysvinit \
 tcl \
 tcpdump \
 tinc \
-timezones \
+tzdata \
 usbutils \
 vtun \
 wireless-tools \
diff --git a/packages/meta/openprotium-packages.bb b/packages/meta/openprotium-packages.bb
index afff86639a..3df2f5e3b2 100644
--- a/packages/meta/openprotium-packages.bb
+++ b/packages/meta/openprotium-packages.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Packages that are compatible with the Openprotium on the iomega Storcenter"
 HOMEPAGE = "http://www.openprotium.org"
 LICENSE = "MIT"
-PR = "r3"
+PR = "r4"
 CONFLICTS = "db3"
 PROVIDES += "${OPENPROTIUM_IMAGENAME}-packages"
 
@@ -234,7 +234,7 @@ SLUGOS_PACKAGES_append_linux = "\
 	man man-pages \
 	psmisc \
 	screen \
-	timezones \
+	tzdata \
         wview-sim wview-vpro wview-wxt510 \
         wview-sim-mysql wview-vpro-mysql \
         wview-wxt510-mysql \
diff --git a/packages/meta/oplinux-packages.bb b/packages/meta/oplinux-packages.bb
index 62513c11cd..190f323838 100644
--- a/packages/meta/oplinux-packages.bb
+++ b/packages/meta/oplinux-packages.bb
@@ -4,7 +4,7 @@
 DESCRIPTION = "Packages that are compatible with the OPLinux distro"
 HOMEPAGE = "http://www.digital-opsis/oplinux"
 LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
 PROVIDES += "${OPLINUX_IMAGENAME}-packages"
 
 EXCLUDE_FROM_WORLD = "1"
@@ -359,7 +359,7 @@ PACKAGES_LIST = "\
 	man man-pages \
 	psmisc \
 	screen \
-	timezones \
+	tzdata \
         wview-sim wview-vpro wview-wxt510 \
         wview-sim-mysql wview-vpro-mysql \
         wview-wxt510-mysql \
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index e914865e9b..c007899afd 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r42"
+PR = "r43"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2"
@@ -196,7 +196,6 @@ SLUGOS_PACKAGES = "\
 	tar \
 	thttpd \
 	tiff \
-	timezones \
 	tzdata \
 	unzip \
 	upslug2 \
diff --git a/packages/openntpd/openntpd_3.7p1.bb b/packages/openntpd/openntpd_3.7p1.bb
index 9358508cb0..b8dca0c278 100644
--- a/packages/openntpd/openntpd_3.7p1.bb
+++ b/packages/openntpd/openntpd_3.7p1.bb
@@ -3,9 +3,8 @@ Network Time Protocol."
 HOMEPAGE = "http://www.openntpd.org/"
 SECTION = "console/network"
 LICENSE = "BSD"
-DEPENDS += "openssl"
-DEPENDS = "timezones"
-PR = "r13"
+DEPENDS += "openssl tzdata"
+PR = "r14"
 
 SRC_URI = "http://www.zip.com.au/~dtucker/openntpd/release/openntpd-${PV}.tar.gz \
            file://autofoo.patch;patch=1 \
diff --git a/packages/openntpd/openntpd_3.9p1.bb b/packages/openntpd/openntpd_3.9p1.bb
index 03369fd525..3798c13194 100644
--- a/packages/openntpd/openntpd_3.9p1.bb
+++ b/packages/openntpd/openntpd_3.9p1.bb
@@ -3,9 +3,8 @@ Network Time Protocol."
 HOMEPAGE = "http://www.openntpd.org/"
 SECTION = "console/network"
 LICENSE = "BSD"
-DEPENDS += "openssl"
-DEPENDS = "timezones"
-PR = "r0"
+DEPENDS += "openssl tzdata"
+PR = "r1"
 
 SRC_URI = "http://www.zip.com.au/~dtucker/openntpd/release/${P}.tar.gz \
            file://adjtimex-${PV}.patch;patch=1 \
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index 1c97a355f1..e1fbbabfde 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "OpenMoko: Misc. Feed Items"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r15"
+PR = "r17"
 
 inherit task
 
@@ -29,7 +29,6 @@ RDEPENDS_task-openmoko-feed = "\
   libsdl-x11 libsdl-mixer libsdl-net libsdl-ttf \
   synergy \
   tzdata \
-  timezones \
   tor \
   vnc \
   wxwidgets \
diff --git a/packages/timezones/.mtn2git_empty b/packages/timezones/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/timezones/.mtn2git_empty
+++ /dev/null
diff --git a/packages/timezones/timezones_1.2.0.bb b/packages/timezones/timezones_1.2.0.bb
deleted file mode 100644
index 8efe72d45c..0000000000
--- a/packages/timezones/timezones_1.2.0.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-DESCRIPTION = "Timezone data"
-SECTION = "base"
-PRIORITY = "optional"
-LICENSE = "GPL"
-PR = "r1"
-
-SRC_URI = "${HANDHELDS_CVS};tag=v1_2_0;module=opie/root"
-S = "${WORKDIR}/root"
-
-do_install() {
-	install -d ${D}${datadir}/
-	cp -fa usr/share/zoneinfo ${D}${datadir}/
-	find ${D}${datadir} -name "CVS"|xargs rm -rf
-}
-
-PACKAGES_DYNAMIC = "timezone-*"
-
-python populate_packages_prepend() {
-        pkgregex = "^(.*)"
-        pkgpattern = "timezone-%s"
-        pkgdescription = "Timezone for %s"
-
-        do_split_packages(d, root=bb.data.expand('${datadir}/zoneinfo/', d), file_regex=pkgregex, output_pattern=pkgpattern,
-                          description=pkgdescription,allow_dirs=True )
-}
-
-FILES_${PN} =  "${datadir}/zoneinfo/America/Denver      \
-                ${datadir}/zoneinfo/America/New_York    \
-                ${datadir}/zoneinfo/America/Los_Angeles \
-                ${datadir}/zoneinfo/Australia/Brisbane  \
-                ${datadir}/zoneinfo/Europe/Berlin       \
-                ${datadir}/zoneinfo/Asia/Tokyo          "