merge of '60886f11068b84382ae4769a9fb5f1b85f9a6aa5'

     and 'ddf650a0cb7bb395770eac25e38c0ba82c1ec204'

71 files changed, 396 insertions, 160 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 7c445a7604..c77342d641 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -217,3 +217,10 @@ Person:     Henning Heinold 'woglinde'
 Mail:       heinold@inf.fu-berlin.de
 Machines:   simpad
 Recipes:    classpath-minimal, midpath, cacao-clcd
+
+Person:     Philipp Zabel
+Mail:       philipp.zabel@gmail.com
+Interests:  Kernels, PXA, GTK+, gsmd
+Distros:    Ångström
+Machines:   hx4700, magician
+Recipes:    avahi, libgsmd
diff --git a/packages/angstrom/angstrom-gpe-task-apps.bb b/packages/angstrom/angstrom-gpe-task-apps.bb
index 37a6ed98c3..0a4b1309da 100644
--- a/packages/angstrom/angstrom-gpe-task-apps.bb
+++ b/packages/angstrom/angstrom-gpe-task-apps.bb
@@ -1,10 +1,11 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
-ALLOW_EMPTY = "1"
+PR = "r32"
+
+inherit task
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
     gpe-edit \
     gpe-gallery \
     gpe-calculator \
diff --git a/packages/angstrom/angstrom-gpe-task-base.bb b/packages/angstrom/angstrom-gpe-task-base.bb
index c931d9d1e4..265f51863d 100644
--- a/packages/angstrom/angstrom-gpe-task-base.bb
+++ b/packages/angstrom/angstrom-gpe-task-base.bb
@@ -1,10 +1,11 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
-ALLOW_EMPTY = "1"
+PR = "r32"
+
+inherit task
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
     matchbox \
     matchbox-panel-hacks \
     xcursor-transparent-theme \
diff --git a/packages/angstrom/angstrom-gpe-task-game.bb b/packages/angstrom/angstrom-gpe-task-game.bb
index 09a47f6a26..beca89cdbc 100644
--- a/packages/angstrom/angstrom-gpe-task-game.bb
+++ b/packages/angstrom/angstrom-gpe-task-game.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
-ALLOW_EMPTY = "1"
+PR = "r32"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     gpe-go \
     gpe-lights \
     gpe-othello \
diff --git a/packages/angstrom/angstrom-gpe-task-pim.bb b/packages/angstrom/angstrom-gpe-task-pim.bb
index 8e9d0d4f31..fc0b4109f4 100644
--- a/packages/angstrom/angstrom-gpe-task-pim.bb
+++ b/packages/angstrom/angstrom-gpe-task-pim.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
-ALLOW_EMPTY = "1"
+PR = "r32"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     gpe-timesheet \
     gpe-todo \
     gpe-calendar \
diff --git a/packages/angstrom/angstrom-gpe-task-settings.bb b/packages/angstrom/angstrom-gpe-task-settings.bb
index c79c068cbd..a9463fdbe5 100644
--- a/packages/angstrom/angstrom-gpe-task-settings.bb
+++ b/packages/angstrom/angstrom-gpe-task-settings.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
-ALLOW_EMPTY = "1"
+PR = "r32"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     matchbox-panel-manager \
     gpe-su \
     gpe-conf \
diff --git a/packages/angstrom/angstrom-ohand-task-pim.bb b/packages/angstrom/angstrom-ohand-task-pim.bb
index 70d52c922f..71d0512687 100644
--- a/packages/angstrom/angstrom-ohand-task-pim.bb
+++ b/packages/angstrom/angstrom-ohand-task-pim.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
-ALLOW_EMPTY = "1"
+PR = "r32"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     dates \
     contacts \
     tasks \
diff --git a/packages/angstrom/angstrom-task-office.bb b/packages/angstrom/angstrom-task-office.bb
index 364924995a..90b700b8c9 100644
--- a/packages/angstrom/angstrom-task-office.bb
+++ b/packages/angstrom/angstrom-task-office.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
-ALLOW_EMPTY = "1"
+PR = "r32"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     gnumeric \
     abiword \
     imposter \
diff --git a/packages/angstrom/angstrom-task-printing.bb b/packages/angstrom/angstrom-task-printing.bb
index 2954667192..f4a833645a 100644
--- a/packages/angstrom/angstrom-task-printing.bb
+++ b/packages/angstrom/angstrom-task-printing.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
-ALLOW_EMPTY = "1"
+PR = "r32"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     cups \
 #    gnome-cups-manager \
     "
diff --git a/packages/angstrom/angstrom-task-sectest.bb b/packages/angstrom/angstrom-task-sectest.bb
index 3142f280f3..c3ebcab31d 100644
--- a/packages/angstrom/angstrom-task-sectest.bb
+++ b/packages/angstrom/angstrom-task-sectest.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r31"
-ALLOW_EMPTY = "1"
+PR = "r32"
 
-RDEPENDS = "\
+inherit task
+
+RDEPENDS_${PN} = "\
     nmap \
     ettercap \
     stunnel \
diff --git a/packages/avahi/avahi-0.6.15/.mtn2git_empty b/packages/avahi/avahi-0.6.15/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/avahi/avahi-0.6.15/.mtn2git_empty
+++ /dev/null
diff --git a/packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch b/packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch
deleted file mode 100644
index 0971a9eea8..0000000000
--- a/packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-marcus      2006-11-11 02:56:18 UTC
-
-  FreeBSD ports repository
-
-  Modified files:
-    net/avahi            Makefile distinfo 
-  Added files:
-    net/avahi/files      patch-avahi-daemon_dbus-protocol.c 
-  Log:
-  Update to 0.6.15, and fix the build with D-BUS 1.0.
-  
-  Revision  Changes    Path
-  1.43      +3 -3      ports/net/avahi/Makefile
-  1.12      +3 -3      ports/net/avahi/distinfo
-  1.3       +11 -0     ports/net/avahi/files/patch-avahi-daemon_dbus-protocol.c (new)
-
---- avahi-daemon/dbus-protocol.c.orig	Fri Nov 10 21:50:07 2006
-+++ avahi-daemon/dbus-protocol.c	Fri Nov 10 21:50:55 2006
-@@ -1067,7 +1067,7 @@ static int dbus_connect(void) {
-     if (dbus_bus_request_name(
-             server->bus,
-             AVAHI_DBUS_NAME,
--#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)
-+#if ((DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)) || DBUS_VERSION_MAJOR > 0
-             DBUS_NAME_FLAG_DO_NOT_QUEUE,
- #else
-             DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
-
diff --git a/packages/avahi/avahi-python_0.6.21.bb b/packages/avahi/avahi-python_0.6.21.bb
new file mode 100644
index 0000000000..8eaac073ac
--- /dev/null
+++ b/packages/avahi/avahi-python_0.6.21.bb
@@ -0,0 +1,14 @@
+require avahi.inc
+PR = "r0"
+
+# FIXME: without --enable-gtk, avahi-discover (pygtk) won't be built
+FILES_avahi-discover = ""
+
+PROVIDES = "avahi"
+DEPENDS += "python-native"
+
+SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1 \
+            file://configure-check-pymod.patch;patch=1"
+S = "${WORKDIR}/avahi-${PV}"
+
+AVAHI_PYTHON = "--enable-python"
diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc
index 2cb986012f..991d282a3e 100644
--- a/packages/avahi/avahi.inc
+++ b/packages/avahi/avahi.inc
@@ -4,24 +4,31 @@ HOMEPAGE = "http://avahi.org"
 SECTION = "network"
 PRIORITY = "optional"
 LICENSE = "GPL"
-PR = "r4"
+PR = "r5"
 
 DEPENDS = "expat libdaemon dbus glib-2.0"
 
 # uclibc has no nss
-RRECOMMENDS_append_linux = "libnss-mdns"
 RRECOMMENDS_avahi-daemon_append_linux = "libnss-mdns"
-RDEPENDS_avahi-daemon = "sysvinit-pidof"
+RDEPENDS_avahi-daemon = "sysvinit-pidof update-rc.d"
+RDEPENDS_avahi-autoipd = "update-rc.d"
+RDEPENDS_avahi-discover = "python-avahi python-pygtk"
+RDEPENDS_python-avahi = "python-dbus"
 
 SRC_URI = "http://avahi.org/download/avahi-${PV}.tar.gz \
 	   file://00avahi-autoipd file://99avahi-autoipd"
 
 inherit autotools pkgconfig update-rc.d
+# handle update-rc.d RDEPENDS manually, we don't need it on
+# anything but avahi-daemon and avahi-autoipd
+RDEPENDS_append = ""
 
 # TODO: build and enable all the extra stuff avahi offers
-EXTRA_OECONF = "--with-distro=debian --disable-gdbm --disable-gtk --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 --disable-python"
+EXTRA_OECONF = "--with-distro=debian --disable-gdbm ${AVAHI_GTK} --disable-mono --disable-monodoc --disable-qt3 --disable-qt4 ${AVAHI_PYTHON}"
+AVAHI_PYTHON = "--disable-python"
+AVAHI_GTK = "--disable-gtk"
 
-PACKAGES =+ "avahi-daemon libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib avahi-autoipd avahi-utils"
+PACKAGES =+ "avahi-daemon avahi-discover libavahi-common libavahi-core libavahi-client avahi-dnsconfd libavahi-glib libavahi-ui avahi-discover-standalone avahi-autoipd avahi-utils python-avahi"
 
 FILES_libavahi-common = "${libdir}/libavahi-common.so.*"
 FILES_libavahi-core = "${libdir}/libavahi-core.so.*"
@@ -35,6 +42,7 @@ FILES_avahi-daemon = "${sbindir}/avahi-daemon \
                       ${datadir}/avahi/avahi-service.dtd \
                       ${datadir}/avahi/service-types"
 FILES_libavahi-client = "${libdir}/libavahi-client.so.*"
+FILES_libavahi-ui = "${libdir}/libavahi-ui.so.*"
 FILES_avahi-dnsconfd = "${sbindir}/avahi-dnsconfd \
                         ${sysconfdir}/avahi/avahi-dnsconfd.action \
                         ${sysconfdir}/init.d/avahi-dnsconfd"
@@ -43,7 +51,12 @@ FILES_avahi-utils = "${bindir}/avahi-*"
 FILES_avahi-autoipd = "${sbindir}/avahi-autoipd \
                        ${sysconfdir}/avahi/avahi-autoipd.action \
 		       ${sysconfdir}/udhcpc.d/*avahi-autoipd"
-
+FILES_python-avahi = "${libdir}/python*/site-packages/avahi/*"
+FILES_avahi-discover = "${bindir}/avahi-discover \
+                        ${datadir}/applications/avahi-discover.desktop \
+                        ${datadir}/avahi/interfaces/avahi-discover.glade"
+FILES_avahi-discover-standalone = "${bindir}/avahi-discover-standalone \
+                                   ${datadir}/avahi/interfaces/avahi-discover.glade"
 CONFFILES_avahi-daemon = "${sysconfdir}/avahi/avahi-daemon.conf"
 
 INITSCRIPT_PACKAGES = "avahi-daemon avahi-dnsconfd"
diff --git a/packages/avahi/avahi_0.6.15.bb b/packages/avahi/avahi_0.6.15.bb
deleted file mode 100644
index b7645bc50f..0000000000
--- a/packages/avahi/avahi_0.6.15.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require avahi.inc
-
-SRC_URI += "file://patch-avahi-daemon_dbus-protocol.c.patch;patch=1;pnum=0"
diff --git a/packages/avahi/avahi_0.6.16.bb b/packages/avahi/avahi_0.6.16.bb
deleted file mode 100644
index 9189734dfa..0000000000
--- a/packages/avahi/avahi_0.6.16.bb
+++ /dev/null
@@ -1 +0,0 @@
-require avahi.inc
diff --git a/packages/avahi/avahi_0.6.17.bb b/packages/avahi/avahi_0.6.17.bb
deleted file mode 100644
index 9189734dfa..0000000000
--- a/packages/avahi/avahi_0.6.17.bb
+++ /dev/null
@@ -1 +0,0 @@
-require avahi.inc
diff --git a/packages/avahi/avahi_0.6.18.bb b/packages/avahi/avahi_0.6.18.bb
deleted file mode 100644
index 9189734dfa..0000000000
--- a/packages/avahi/avahi_0.6.18.bb
+++ /dev/null
@@ -1 +0,0 @@
-require avahi.inc
diff --git a/packages/avahi/avahi_0.6.19.bb b/packages/avahi/avahi_0.6.19.bb
index 27dcdcffcb..69763e3932 100644
--- a/packages/avahi/avahi_0.6.19.bb
+++ b/packages/avahi/avahi_0.6.19.bb
@@ -1,3 +1,2 @@
 require avahi.inc
-
-PR = "r1"
+PR = "r2"
diff --git a/packages/avahi/avahi_0.6.20.bb b/packages/avahi/avahi_0.6.20.bb
index 59de20446c..0b7fe70be5 100644
--- a/packages/avahi/avahi_0.6.20.bb
+++ b/packages/avahi/avahi_0.6.20.bb
@@ -1,3 +1,2 @@
 require avahi.inc
-
-PR = "r0"
+PR = "r1"
diff --git a/packages/avahi/avahi_0.6.21.bb b/packages/avahi/avahi_0.6.21.bb
index fb6191e53a..fa3fef039e 100644
--- a/packages/avahi/avahi_0.6.21.bb
+++ b/packages/avahi/avahi_0.6.21.bb
@@ -1,5 +1,4 @@
 require avahi.inc
-
-PR = "r0"
+PR = "r1"
 
 SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1"
diff --git a/packages/avahi/files/configure-check-pymod.patch b/packages/avahi/files/configure-check-pymod.patch
new file mode 100644
index 0000000000..e2df5d6fc0
--- /dev/null
+++ b/packages/avahi/files/configure-check-pymod.patch
@@ -0,0 +1,27 @@
+Index: avahi-0.6.21/configure.ac
+===================================================================
+--- avahi-0.6.21.orig/configure.ac	2007-08-16 21:36:12.000000000 +0200
++++ avahi-0.6.21/configure.ac	2007-08-16 21:45:14.000000000 +0200
+@@ -700,10 +700,6 @@
+         esac],
+         [HAVE_PYGTK=yes])
+     
+-    if test "x$HAVE_PYGTK" = "xyes" ; then
+-        AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR(Could not find Python module gtk)])
+-    fi
+-
+ 
+     if test "x$HAVE_DBUS" = "xyes" ; then
+         AC_ARG_ENABLE(python-dbus,
+@@ -715,11 +711,6 @@
+             esac],
+             [HAVE_PYTHON_DBUS=yes])
+     
+-        if test "x$HAVE_PYTHON_DBUS" = "xyes"; then
+-            AM_CHECK_PYMOD(dbus,,,[AC_MSG_ERROR(Could not find Python module dbus)])
+-        fi
+-
+-        AM_CHECK_PYMOD(socket,,,[AC_MSG_ERROR(Could not find Python module socket)])
+         if test "x$HAVE_GDBM" = "xyes"; then
+             AM_CHECK_PYMOD(gdbm,,,[AC_MSG_ERROR(Could not find Python module gdbm)])
+         fi
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 84c3610b8f..14d06e8926 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,7 @@
 DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r41"
+PR = "r42"
+
+inherit task
 
 DEPENDS = "task-boot"
 PROVIDES = "${PACKAGES}"
@@ -36,10 +38,6 @@ PACKAGES = ' \
             ${@base_contains("MACHINE_FEATURES","kernel26","task-base-kernel26","task-base-kernel24",d)} \
 	    '
 
-ALLOW_EMPTY = "1"
-
-PACKAGE_ARCH = "all"
-
 #
 # packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
 #
diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb
index f1a90abf8e..fe4d43b767 100644
--- a/