merge of '9f20206493b0337a84d74f61b27b34138e7ea9f3'

     and 'a0dce4b014a5345488a3702f0af98e5eb36ae053'

8 files changed, 23 insertions, 45 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 9b6e0b8059..1d56493342 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -188,7 +188,7 @@ Distros:    Ångström
 Machines:   collie, spitz
 Recipes:    anthy, nunome, uim*, granule, qpobox*, qte-font-unifont*
 Recipes:    qpf-unismall, qpobox, poboxserver, imkit*, scim, zten
-Recipes:    eb, eblook
+Recipes:    eb, eblook, tomoe
 
 Person:     Shane Volpe
 Mail:       shanevolpe@gmail.com
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 1de88de9c5..175a4ec09d 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -6790,17 +6790,17 @@ sha256=c8f2c4f125b1b4ac1b9c76172e3215c80e123e35ae4c2d473e310bc44c1baa9e
 md5=848f6c3cafeb6074ffeb293c3af79b7c
 sha256=1e0fddb5f53613dd14ab10b25435e88092fed1eff09b4ac4448d5be01f3b0b11
 
-[http://prdownloads.sourceforge.jp/tomoe/16048/tomoe-0.2.1.tar.gz]
-md5=e5f6d1d31d03004812d3eebb6a6d2460
-sha256=ade3070cf0d7864ec986df4d80b30045d86428c9cb0dd1259f7a438751543fad
+[http://keihanna.dl.sourceforge.jp/tomoe/16048/tomoe-0.2.1.tar.gz]
+md5=95eca127a1d519ff4e836b3d00d7fa84
+sha256=3942e0ff0a3b945d0464b69fcc01092a582f2c4e173bd8877572706e584e0e9e
 
-[http://prdownloads.sourceforge.jp/tomoe/17171/libtomoe-gtk-0.1.0.tar.gz]
-md5=a3ccb174bbc9b72204971bdd9953079d
-sha256=fa0c007bf3ee13dd79986878e6e1c9c0b71c08a5cc77dbbcbf5e054a89d268e6
+[http://keihanna.dl.sourceforge.jp/tomoe/17171/libtomoe-gtk-0.1.0.tar.gz]
+md5=e9b887189ee408902a0f85d9b1cde06f
+sha256=de00404262d5601edd953d2c83adc8e4897c2a34dfa2d8248f521136c266cc52
 
-[http://prdownloads.sourceforge.jp/tomoe/17172/uim-tomoe-gtk-0.2.0.tar.gz]
-md5=f6402107eb961599c6d4f3560ef7fe75
-sha256=0d107205486760cada4043cde1ae51da3ca2f44851a9d4eaa26646a5f34d56e7
+[http://keihanna.dl.sourceforge.jp/tomoe/17172/uim-tomoe-gtk-0.2.0.tar.gz]
+md5=e52817378766286d69b78fe58b37e45e
+sha256=e35fcb9b14e7621dc32975872a5147137ff12cc71e16993702a49268d59c079c
 
 [http://prdownloads.sourceforge.net/aa-project/bb-1.2.tar.gz]
 md5=1fdf51aeb20d908c29e39ddca2b3459c
diff --git a/packages/gtkmm/gtkmm_2.4.8.bb b/packages/gtkmm/gtkmm_2.4.8.bb
deleted file mode 100644
index 1c5a2a2b10..0000000000
--- a/packages/gtkmm/gtkmm_2.4.8.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require gtkmm.inc
-
-SRC_URI = "${GNOME_MIRROR}/gtkmm/2.4/gtkmm-${PV}.tar.bz2"
-
-do_stage () {
-	oe_libinstall -so -C atk/atkmm libatkmm-1.6 ${STAGING_LIBDIR}
-	oe_libinstall -so -C pango/pangomm libpangomm-1.4 ${STAGING_LIBDIR}
-	oe_libinstall -so -C gdk/gdkmm libgdkmm-2.4 ${STAGING_LIBDIR}
-	oe_libinstall -so -C gtk/gtkmm libgtkmm-2.4 ${STAGING_LIBDIR}
-
-	autotools_stage_includes
-
-	install -m 0644 gdk/gdkmmconfig.h ${STAGING_INCDIR}/gtkmm-2.4
-	install -m 0644 gtk/gtkmmconfig.h ${STAGING_INCDIR}/gtkmm-2.4
-}
diff --git a/packages/tomoe/libtomoe-gtk_0.1.0.bb b/packages/tomoe/libtomoe-gtk_0.1.0.bb
index edbbc3a2e9..31cccf6fe9 100644
--- a/packages/tomoe/libtomoe-gtk_0.1.0.bb
+++ b/packages/tomoe/libtomoe-gtk_0.1.0.bb
@@ -6,7 +6,7 @@ LICENSE = "LGPL"
 
 inherit autotools pkgconfig
 
-SRC_URI = "http://prdownloads.sourceforge.jp/tomoe/17171/libtomoe-gtk-0.1.0.tar.gz"
+SRC_URI = "http://keihanna.dl.sourceforge.jp/tomoe/17171/libtomoe-gtk-0.1.0.tar.gz"
 
 do_stage() {
 	autotools_stage_all
diff --git a/packages/tomoe/tomoe_0.2.1.bb b/packages/tomoe/tomoe_0.2.1.bb
index 7affece4a4..e77ef2a50e 100644
--- a/packages/tomoe/tomoe_0.2.1.bb
+++ b/packages/tomoe/tomoe_0.2.1.bb
@@ -9,4 +9,4 @@ do_stage () {
 	autotools_stage_all
 }
 
-SRC_URI = "http://prdownloads.sourceforge.jp/tomoe/16048/tomoe-0.2.1.tar.gz"
+SRC_URI = "http://keihanna.dl.sourceforge.jp/tomoe/16048/tomoe-0.2.1.tar.gz"
diff --git a/packages/tomoe/uim-tomoe-gtk_0.2.0.bb b/packages/tomoe/uim-tomoe-gtk_0.2.0.bb
index 34503c0197..f0ed9c84a4 100644
--- a/packages/tomoe/uim-tomoe-gtk_0.2.0.bb
+++ b/packages/tomoe/uim-tomoe-gtk_0.2.0.bb
@@ -6,4 +6,4 @@ LICENSE = "LGPL"
 
 inherit autotools pkgconfig
 
-SRC_URI = "http://prdownloads.sourceforge.jp/tomoe/17172/uim-tomoe-gtk-0.2.0.tar.gz"
+SRC_URI = "http://keihanna.dl.sourceforge.jp/tomoe/17172/uim-tomoe-gtk-0.2.0.tar.gz"
diff --git a/packages/udev/udev.inc b/packages/udev/udev.inc
index 32b9b28784..e9c83d4e5a 100644
--- a/packages/udev/udev.inc
+++ b/packages/udev/udev.inc
@@ -12,17 +12,12 @@ SRC_URI += " \
 	   file://local.rules \
            file://init"
 
-UDEV_DEVFS_RULES ?= "0"
+inherit update-rc.d autotools pkgconfig
 
-PACKAGES =+ "udev-utils libvolume-id libvolume-id-dev"
+PARALLEL_MAKE = ""
+UDEV_DEVFS_RULES ?= "0"
 PKG_libvolume-id-dev = "libvolume-id-dev"
 
-FILES_libvolume-id-dev = "${includedir}/libvolume_id.h ${libdir}/libvolume_id.a ${libdir}/libvolume_id.so ${libdir}/pkgconfig/libvolume_id.pc"
-FILES_udev-utils = "${usrbindir}/udevinfo ${usrbindir}/udevtest"
-FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*"
-
-inherit update-rc.d autotools pkgconfig
-
 INITSCRIPT_NAME = "udev"
 INITSCRIPT_PARAMS = "start 04 S ."
 
@@ -37,8 +32,6 @@ bindir = "/bin"
 sbindir = "/sbin"
 
 UDEV_EXTRAS = "<override me>"
-FILES_${PN} += "${usrbindir}/* ${usrsbindir}/*"
-FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
 EXTRA_OEMAKE = "-e \
 		'EXTRAS=${UDEV_EXTRAS}' \
 		'STRIP=echo'"
@@ -68,3 +61,10 @@ do_install () {
 do_stage () {
 	autotools_stage_all
 }
+
+PACKAGES =+ "udev-utils libvolume-id libvolume-id-dev"
+FILES_libvolume-id-dev = "${includedir}/libvolume_id.h ${libdir}/libvolume_id.a ${libdir}/libvolume_id.so ${libdir}/pkgconfig/libvolume_id.pc"
+FILES_udev-utils = "${usrbindir}/udevinfo ${usrbindir}/udevtest"
+FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*"
+FILES_${PN} += "${usrbindir}/* ${usrsbindir}/*"
+FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
diff --git a/removal.txt b/removal.txt
index 60101a68e4..7c9dc251aa 100644
--- a/removal.txt
+++ b/removal.txt
@@ -25,10 +25,3 @@ Maintainer:     None
 Reason:         Obsoleted by task-base
 Proposed by:    Koen Kooi
 Note:		Moved to packages/obsolete/tasks on 2006-12-22
-
-Package Name:   gtkmm-2.4.8
-Removal Date:   2007-06-10
-Maintainer:     Joaquim Duran (joaquinduran@adtelecom.es)
-Reason:         fails compilation for at least half a year
-                newer version available
-Note:           Will contact Joaquim before dropping.