merge of '4f0260db452e1d17accce2d4d5bdb2c928659a73'

     and '9ffd2a28e373f472fe60ae833c1effe73b2bed70'

12 files changed, 25 insertions, 42 deletions

diff --git a/packages/asterisk/asterisk-core-sounds-en-alaw_1.4.7.bb b/packages/asterisk/asterisk-core-sounds-en-alaw_1.4.8.bb
index f1b3d12cd7..f1b3d12cd7 100644
--- a/packages/asterisk/asterisk-core-sounds-en-alaw_1.4.7.bb
+++ b/packages/asterisk/asterisk-core-sounds-en-alaw_1.4.8.bb
diff --git a/packages/asterisk/asterisk-core-sounds-en-g729_1.4.7.bb b/packages/asterisk/asterisk-core-sounds-en-g729_1.4.8.bb
index 205c8ff067..205c8ff067 100644
--- a/packages/asterisk/asterisk-core-sounds-en-g729_1.4.7.bb
+++ b/packages/asterisk/asterisk-core-sounds-en-g729_1.4.8.bb
diff --git a/packages/asterisk/asterisk-core-sounds-en-gsm_1.4.7.bb b/packages/asterisk/asterisk-core-sounds-en-gsm_1.4.8.bb
index 2a46c74f84..2a46c74f84 100644
--- a/packages/asterisk/asterisk-core-sounds-en-gsm_1.4.7.bb
+++ b/packages/asterisk/asterisk-core-sounds-en-gsm_1.4.8.bb
diff --git a/packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.7.bb b/packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.8.bb
index c29ae60f99..c29ae60f99 100644
--- a/packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.7.bb
+++ b/packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.8.bb
diff --git a/packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.6.bb b/packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.7.bb
index f18d46258f..2bea38c99b 100644
--- a/packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.6.bb
+++ b/packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.7.bb
@@ -10,8 +10,6 @@ SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extr
 do_install() {
 	install -d ${D}${localstatedir}/lib/asterisk/sounds
 	# HACK: moving the files in chunkes (too many of them)
-	rm ${WORKDIR}/conf-thereare.alaw
-	rm ${WORKDIR}/invalid.alaw
 	mv ${WORKDIR}/[a-d]*.alaw ${D}${localstatedir}/lib/asterisk/sounds/
 	mv ${WORKDIR}/[e-l]*.alaw ${D}${localstatedir}/lib/asterisk/sounds/
 	mv ${WORKDIR}/*.alaw ${D}${localstatedir}/lib/asterisk/sounds/
@@ -21,10 +19,6 @@ do_install() {
 	#install -m 644 ${WORKDIR}/ha/* ${D}${localstatedir}/lib/asterisk/sounds/ha/
 	mv ${WORKDIR}/ha ${D}${localstatedir}/lib/asterisk/sounds
 
-	#install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
-	#install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
-	mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds
-
 	#install -d ${D}${localstatedir}/lib/asterisk/sounds/wx
 	#install -m 644 ${WORKDIR}/wx/* ${D}${localstatedir}/lib/asterisk/sounds/wx/
 	mv ${WORKDIR}/wx ${D}${localstatedir}/lib/asterisk/sounds
diff --git a/packages/asterisk/asterisk-extra-sounds-en-g729_1.4.6.bb b/packages/asterisk/asterisk-extra-sounds-en-g729_1.4.7.bb
index 48fabbbdc4..0656ff1a95 100644
--- a/packages/asterisk/asterisk-extra-sounds-en-g729_1.4.6.bb
+++ b/packages/asterisk/asterisk-extra-sounds-en-g729_1.4.7.bb
@@ -10,8 +10,6 @@ SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extr
 do_install() {
 	install -d ${D}${localstatedir}/lib/asterisk/sounds
 	# HACK: moving the files in chunks (too many files)
-	rm ${WORKDIR}/conf-thereare.g729
-	rm ${WORKDIR}/invalid.g729
 	mv ${WORKDIR}/[a-d]*.g729 ${D}${localstatedir}/lib/asterisk/sounds/
 	mv ${WORKDIR}/[e-l]*.g729 ${D}${localstatedir}/lib/asterisk/sounds/
 	mv ${WORKDIR}/*.g729 ${D}${localstatedir}/lib/asterisk/sounds/
@@ -21,10 +19,6 @@ do_install() {
 	#install -m 644 ${WORKDIR}/ha/* ${D}${localstatedir}/lib/asterisk/sounds/ha/
 	mv ${WORKDIR}/ha ${D}${localstatedir}/lib/asterisk/sounds
 
-	#install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
-	#install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
-	mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds
-
 	#install -d ${D}${localstatedir}/lib/asterisk/sounds/wx
 	#install -m 644 ${WORKDIR}/wx/* ${D}${localstatedir}/lib/asterisk/sounds/wx/
 	mv ${WORKDIR}/wx ${D}${localstatedir}/lib/asterisk/sounds
diff --git a/packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.6.bb b/packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.7.bb
index da463391b1..2d74d27996 100644
--- a/packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.6.bb
+++ b/packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.7.bb
@@ -10,8 +10,6 @@ SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extr
 do_install() {
 	install -d ${D}${localstatedir}/lib/asterisk/sounds
 	# HACK: moving the files in chunks (too many files)
-	rm ${WORKDIR}/conf-thereare.gsm
-	rm ${WORKDIR}/invalid.gsm
 	mv ${WORKDIR}/[a-d]*.gsm ${D}${localstatedir}/lib/asterisk/sounds/
 	mv ${WORKDIR}/[e-l]*.gsm ${D}${localstatedir}/lib/asterisk/sounds/
 	mv ${WORKDIR}/*.gsm ${D}${localstatedir}/lib/asterisk/sounds/
@@ -21,10 +19,6 @@ do_install() {
 	#install -m 644 ${WORKDIR}/ha/* ${D}${localstatedir}/lib/asterisk/sounds/ha/
 	mv ${WORKDIR}/ha ${D}${localstatedir}/lib/asterisk/sounds
 
-	#install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
-	#install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
-	mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds
-
 	#install -d ${D}${localstatedir}/lib/asterisk/sounds/wx
 	#install -m 644 ${WORKDIR}/wx/* ${D}${localstatedir}/lib/asterisk/sounds/wx/
 	mv ${WORKDIR}/wx ${D}${localstatedir}/lib/asterisk/sounds
diff --git a/packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.6.bb b/packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.7.bb
index 6a6f3f5fba..6d35c65177 100644
--- a/packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.6.bb
+++ b/packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.7.bb
@@ -10,8 +10,6 @@ SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extr
 do_install() {
 	install -d ${D}${localstatedir}/lib/asterisk/sounds
 	# HACK: moving the files in chunkes (too many of them)
-	rm ${WORKDIR}/conf-thereare.ulaw
-	rm ${WORKDIR}/invalid.ulaw
 	mv ${WORKDIR}/[a-d]*.ulaw ${D}${localstatedir}/lib/asterisk/sounds/
 	mv ${WORKDIR}/[e-l]*.ulaw ${D}${localstatedir}/lib/asterisk/sounds/
 	mv ${WORKDIR}/*.ulaw ${D}${localstatedir}/lib/asterisk/sounds/
@@ -21,10 +19,6 @@ do_install() {
 	#install -m 644 ${WORKDIR}/ha/* ${D}${localstatedir}/lib/asterisk/sounds/ha/
 	mv ${WORKDIR}/ha ${D}${localstatedir}/lib/asterisk/sounds
 
-	#install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
-	#install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
-	mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds
-
 	#install -d ${D}${localstatedir}/lib/asterisk/sounds/wx
 	#install -m 644 ${WORKDIR}/wx/* ${D}${localstatedir}/lib/asterisk/sounds/wx/
 	mv ${WORKDIR}/wx ${D}${localstatedir}/lib/asterisk/sounds
diff --git a/packages/inetutils/inetutils_1.5.bb b/packages/inetutils/inetutils_1.5.bb
new file mode 100644
index 0000000000..0971e58967
--- /dev/null
+++ b/packages/inetutils/inetutils_1.5.bb
@@ -0,0 +1,17 @@
+SECTION = "libs"
+DEPENDS = "ncurses"
+LICENSE = "GPL"
+DESCRIPTION = "The GNU inetutils are a collection of common \
+networking utilities and servers including ftp, ftpd, rcp, \
+rexec, rlogin, rlogind, rsh, rshd, syslog, syslogd, talk, \
+talkd, telnet, telnetd, tftp, tftpd, and uucpd."
+
+SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-ncurses-include-dir=${STAGING_INCDIR}"
+
+do_configure_prepend () {
+	rm -f ${S}/glob/configure*
+}
diff --git a/packages/python/python-edbus_cvs.bb b/packages/python/python-edbus_cvs.bb
index 06a5a45c06..544a6f347f 100644
--- a/packages/python/python-edbus_cvs.bb
+++ b/packages/python/python-edbus_cvs.bb
@@ -1,7 +1,7 @@
 require python-efl.inc
-DEPENDS += "edbus dbus"
+DEPENDS += "edbus python-dbus"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${E_CVS};module=e17/proto/python-efl/python-e_dbus"
 S = "${WORKDIR}/python-e_dbus"
diff --git a/packages/xorg-app/bdftopcf-native_1.0.0.bb b/packages/xorg-app/bdftopcf-native_1.0.0.bb
index 8ab592b2b2..41049946e5 100644
--- a/packages/xorg-app/bdftopcf-native_1.0.0.bb
+++ b/packages/xorg-app/bdftopcf-native_1.0.0.bb
@@ -1,13 +1,8 @@
-DESCRIPTION = "Native bdftopdf utility"
-SECTION = "x11/fonts"
-LICENSE = "MIT-X"
+inherit native
+require xorg-app-common.inc
 PE = "1"
 
-S="${WORKDIR}/bdftopcf-${PV}"
+XORG_PN = "bdftopcf"
 
 DEPENDS = "libxfont-native"
 
-SRC_URI = "${XORG_MIRROR}/X11R7.0/src/app/bdftopcf-X11R7.0-1.0.0.tar.gz"
-
-inherit native autotools pkgconfig
-
diff --git a/packages/xorg-font/font-util-native_1.0.1.bb b/packages/xorg-font/font-util-native_1.0.1.bb
index 8db0b71898..32ea62c3d5 100644
--- a/packages/xorg-font/font-util-native_1.0.1.bb
+++ b/packages/xorg-font/font-util-native_1.0.1.bb
@@ -1,13 +1,8 @@
-DESCRIPTION = "X font utils."
-SECTION = "x11/fonts"
-LICENSE = "MIT-X"
+inherit native
+require xorg-font-common.inc
 
-S="${WORKDIR}/font-util-${PV}"
+XORG_PN = "font-util"
 
 DEPENDS = "bdftopcf-native"
 
 PE = "1"
-
-SRC_URI = "${XORG_MIRROR}/X11R7.1/src/font/font-util-${PV}.tar.gz"
-
-inherit native autotools pkgconfig