merge of '9fa037171b6c9f0d06ed8aa7dc11716dfbacebbf'

     and 'db7aa3c67ff99859a56b540059d1f21cc95da4b5'

13 files changed, 195 insertions, 46 deletions

diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index 0f6597454a..a42db65484 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -71,8 +71,9 @@ do
 		       task-opie \
 		       task-openmoko-base task-openmoko-debug task-openmoko-examples task-openmoko-feed task-openmoko-games task-openmoko-linux task-openmoko-native-sdk task-openmoko-net task-openmoko-phone task-openmoko-pim task-openmoko-ui \
 		       gsm0710muxd frameworkd zhone \
-               gnome-games \ 
-               "
+               gnome-games \
+               mythtv \
+	       "
 	do_build
 done
 
diff --git a/packages/angstrom/angstrom-x11-base-depends.bb b/packages/angstrom/angstrom-x11-base-depends.bb
index 582025e450..e542e4232a 100644
--- a/packages/angstrom/angstrom-x11-base-depends.bb
+++ b/packages/angstrom/angstrom-x11-base-depends.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r37"
+PR = "r38"
 
 inherit task
 
@@ -11,6 +11,7 @@ DEPENDS = "virtual/xserver"
 
 RDEPENDS = "\
     ${XSERVER} \
+    dbus-x11 \
     ttf-dejavu-sans \
     ttf-dejavu-sans-mono \
     "
diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc
index 26a0e04585..5605353886 100644
--- a/packages/dbus/dbus.inc
+++ b/packages/dbus/dbus.inc
@@ -2,7 +2,12 @@ DESCRIPTION = "A message bus system for inter-process communication"
 HOMEPAGE = "http://dbus.freedesktop.org"
 SECTION = "base"
 LICENSE = "GPL"
-DEPENDS = "expat glib-2.0 virtual/libintl"
+DEPENDS = "expat glib-2.0 virtual/libintl libsm libice libx11"
+RDEPENDS_${PN}-x11 = "${PN}"
+RRECOMMENDS_${PN}-lib = "${PN}"
+RRECOMMENDS_${PN} = "${PN}-x11"
+RCONFLICTS_${PN} = "dbus-1"
+RREPLACES_${PN} = "dbus-1"
 
 SRC_URI = "\
   http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
@@ -11,23 +16,43 @@ SRC_URI = "\
   file://fix-install-daemon.patch;patch=1 \
   file://dbus-1.init \
 "
+
 S = "${WORKDIR}/dbus-${PV}"
 
 inherit autotools pkgconfig update-rc.d gettext
 
-INITSCRIPT_NAME = "dbus-1"
-INITSCRIPT_PARAMS = "defaults"
-
-CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
+EXTRA_OECONF = "\
+  --disable-qt \
+  --disable-qt3 \
+  --disable-gtk \
+  --disable-tests \
+  --disable-checks \
+  --disable-xml-docs \
+  --disable-doxygen-docs \
+  --with-xml=expat \
+  --with-x \
+"
 
-DEBIANNAME_${PN} = "dbus-1"
+do_install_append() {
+        install -d ${D}${sysconfdir}/init.d
+        install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
+        # the stock install seems to install the libtool wrapper script, so we have to copy this manually :M:
+        if [ -e bus/.libs/dbus-daemon-launch-helper ]; then
+                install -m 0755 bus/.libs/dbus-daemon-launch-helper ${D}${libexecdir}/
+        fi
+}
+do_stage() {
+        oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
+        autotools_stage_includes
+        mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
+        install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
+}
 
-PACKAGES =+ "${PN}-lib"
+PACKAGES =+ "${PN}-lib ${PN}-x11"
 
 FILES_${PN} = "\
 ${bindir}/dbus-daemon* \
 ${bindir}/dbus-uuidgen \
-${bindir}/dbus-launch \
 ${bindir}/dbus-cleanup-sockets \
 ${bindir}/dbus-send \
 ${bindir}/dbus-monitor \
@@ -37,54 +62,27 @@ ${datadir}/dbus-1/services \
 ${datadir}/dbus-1/system-services \
 "
 FILES_${PN}-lib = "${libdir}/lib*.so.*"
-RRECOMMENDS_${PN}-lib = "${PN}"
+FILES_${PN}-x11 = "\
+${bindir}/dbus-launch \
+"
 FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool ${libdir}/"
 
-pkg_postinst_dbus() {
+pkg_postinst_${PN}() {
 #!/bin/sh
-
 # can't do adduser stuff offline
 if [ "x$D" != "x" ]; then
   exit 1
 fi
-
 MESSAGEUSER=messagebus
 MESSAGEHOME=/var/run/dbus
-
 mkdir -p $MESSAGEHOME || true
 chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup "$MESSAGEUSER"
 chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER"
-
 grep -q netdev: /etc/group || addgroup netdev
 chmod u+s /usr/libexec/dbus-daemon-launch-helper
 }
 
-EXTRA_OECONF = "\
-  --disable-qt \
-  --disable-qt3 \
-  --disable-gtk \
-  --disable-tests \
-  --disable-checks \
-  --disable-xml-docs \
-  --disable-doxygen-docs \
-  --with-xml=expat \
-  --without-x \
-"
-
-do_stage() {
-	oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
-
-	autotools_stage_includes
-
-	mkdir -p ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
-	install -m 0644 dbus/dbus-arch-deps.h ${STAGING_LIBDIR}/dbus-1.0/include/dbus/
-}
+CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session.conf"
 
-do_install_append() {
-	install -d ${D}${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
-	# the stock install seems to install the libtool wrapper script, so we have to copy this manually :M:
-	if [ -e bus/.libs/dbus-daemon-launch-helper ]; then
-		install -m 0755 bus/.libs/dbus-daemon-launch-helper ${D}${libexecdir}/
-	fi
-}
+INITSCRIPT_NAME = "dbus-1"
+INITSCRIPT_PARAMS = "defaults"
diff --git a/packages/dbus/dbus_1.2.1.bb b/packages/dbus/dbus_1.2.1.bb
index da7cd43d7f..8a4aa6d61c 100644
--- a/packages/dbus/dbus_1.2.1.bb
+++ b/packages/dbus/dbus_1.2.1.bb
@@ -1,3 +1,3 @@
 include dbus.inc
 
-PR = "r3"
+PR = "r4"
diff --git a/packages/eel/eel/eel-no-strftime.patch b/packages/eel/eel/eel-no-strftime.patch
new file mode 100644
index 0000000000..a5795e573e
--- /dev/null
+++ b/packages/eel/eel/eel-no-strftime.patch
@@ -0,0 +1,29 @@
+--- /tmp/configure.in	2008-09-05 14:01:25.000000000 +0200
++++ eel-2.22.2/configure.in	2008-09-05 14:01:58.693198000 +0200
+@@ -98,26 +98,6 @@
+ 
+ 
+ 
+-dnl ===========================================================================
+-
+-dnl strftime checks
+-
+-AC_TRY_RUN([#include <time.h>
+-                int main ()
+-                {
+-                  char buf[100];
+-                  struct tm tm = {0};
+-                  tm.tm_year = 99;
+-                  if (strftime(buf, 100, "%EY", &tm) == 4 &&
+-		      strcmp (buf, "1999")==0)
+-                    return 0;
+-                  return 1;
+-                }
+-            ],
+-	    AC_DEFINE(HAVE_STRFTIME_EXTENSION, 1, [Define if strftime supports %E and %O modifiers.])
+-            )
+-
+-dnl ===========================================================================
+ 
+ dnl X development libraries check
+ 
diff --git a/packages/eel/eel_2.22.2.bb b/packages/eel/eel_2.22.2.bb
new file mode 100644
index 0000000000..04353795c3
--- /dev/null
+++ b/packages/eel/eel_2.22.2.bb
@@ -0,0 +1,16 @@
+# eel OE build file
+# Copyright (C) 2005, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+inherit gnome
+
+LICENSE="GPL"
+
+SRC_URI += "file://eel-no-strftime.patch;patch=1"
+
+DEPENDS = "gnome-vfs gnome-desktop gnome-menus libgnomeui gail"
+EXTRA_OECONF = "--disable-gtk-doc"
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/gnome-themes/.mtn2git_empty b/packages/gnome-themes/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/gnome-themes/.mtn2git_empty
+++ /dev/null
diff --git a/packages/gnome/gnome-desktop_2.22.2.bb b/packages/gnome/gnome-desktop_2.22.2.bb
new file mode 100644
index 0000000000..4460c5ad92
--- /dev/null
+++ b/packages/gnome/gnome-desktop_2.22.2.bb
@@ -0,0 +1,8 @@
+require gnome-desktop.inc
+
+inherit gnome pkgconfig
+
+DEPENDS += "gnome-doc-utils gnome-vfs"
+
+SRC_URI += "file://scrollkeeper.patch;patch=1 \
+            file://no-desktop-docs.patch;patch=1;pnum=0"
diff --git a/packages/gnome/gnome-menus_2.22.2.bb b/packages/gnome/gnome-menus_2.22.2.bb
new file mode 100644
index 0000000000..5837e7fed2
--- /dev/null
+++ b/packages/gnome/gnome-menus_2.22.2.bb
@@ -0,0 +1,15 @@
+DEPENDS = "python gnome-vfs libxml2 gconf popt gtk+"
+LICENSE = "GPL"
+
+inherit gnome pkgconfig
+
+do_stage() {
+autotools_stage_all
+}
+
+PACKAGES += "${PN}-python"
+FILES_${PN} += "${datadir}/desktop-directories/"
+FILES_${PN}-python = "${libdir}/python*"
+FILES_${PN}-dbg += "${libdir}/python*/site-packages/*/.debug \
+                    ${libdir}/python*/site-packages/.debug"
+
diff --git a/packages/gnome/gnome-themes_2.22.2.bb b/packages/gnome/gnome-themes_2.22.2.bb
new file mode 100644
index 0000000000..1b45ab4d05
--- /dev/null
+++ b/packages/gnome/gnome-themes_2.22.2.bb
@@ -0,0 +1,31 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome"
+DEPENDS = "gtk-engines icon-naming-utils-native glib-2.0 intltool-native"
+RDEPENDS = "gnome-icon-theme"
+
+EXTRA_OECONF = "--enable-all-themes --disable-hicolor-check"
+
+inherit gnome
+
+PACKAGE_ARCH = "all"
+
+PACKAGES =+ " gtk-engine-crux gtk-engine-hc gtk-engine-lighthouseblue gtk-engine-mist gtk-engine-thinice"
+FILES_gtk-engine-crux = "${libdir}/gtk-2.0/*/engines/libcrux-engine.so"
+FILES_gtk-engine-hc = "${libdir}/gtk-2.0/*/engines/libhcengine.so"
+FILES_gtk-engine-lighthouseblue = "${libdir}/gtk-2.0/*/engines/liblighthouseblue.so"
+FILES_gtk-engine-mist = "${libdir}/gtk-2.0/*/engines/libmist.so"
+FILES_gtk-engine-thinice = "${libdir}/gtk-2.0/*/engines/libthinice.so"
+
+PACKAGES =+ " gnome-theme-crux gnome-theme-grand-canyon gnome-theme-highcontrast gnome-theme-highcontrastinverse gnome-theme-highcontrastlargeprint gnome-theme-highcontrastlargeprintinverse gnome-theme-largeprint gnome-theme-lighthouseblue gnome-theme-mist gnome-theme-traditional"
+FILES_gnome-theme-crux = "${datadir}/themes/Crux ${datadir}/icons/Crux"
+FILES_gnome-theme-grand-canyon = "${datadir}/themes/Grand-Canyon ${datadir}/icons/Grand-Canyon"
+FILES_gnome-theme-highcontrast = "${datadir}/themes/HighContrast ${datadir}/icons/HighContrast"
+FILES_gnome-theme-highcontrastinverse = "${datadir}/themes/HighContrastInverse ${datadir}/icons/HighContrastInverse"
+FILES_gnome-theme-highcontrastlargeprint = "${datadir}/themes/HighContrastLargePrint ${datadir}/icons/HighContrastLargePrint"
+FILES_gnome-theme-highcontrastlargeprintinverse = "${datadir}/themes/HighContrastLargePrintInverse ${datadir}/icons/HighContrastLargePrintInverse"
+FILES_gnome-theme-largeprint = "${datadir}/themes/LargePrint ${datadir}/icons/LargePrint"
+FILES_gnome-theme-lighthouseblue = "${datadir}/themes/LighthouseBlue ${datadir}/icons/LighthouseBlue"
+FILES_gnome-theme-mist = "${datadir}/themes/Mist ${datadir}/icons/Mist"
+FILES_gnome-theme-traditional = "${datadir}/themes/Traditional ${datadir}/icons/Traditional"
+
+FILES_${PN} += "${datadir}/themes ${datadir}/icons"
diff --git a/packages/gnome-themes/gnome-themes_2.6.2.bb b/packages/gnome/gnome-themes_2.6.2.bb
index 2c18b59654..2c18b59654 100644
--- a/packages/gnome-themes/gnome-themes_2.6.2.bb
+++ b/packages/gnome/gnome-themes_2.6.2.bb
diff --git a/packages/gtk-engines/gtk-engines_2.15.4.bb b/packages/gtk-engines/gtk-engines_2.15.4.bb
new file mode 100644
index 0000000000..177c5b8baf
--- /dev/null
+++ b/packages/gtk-engines/gtk-engines_2.15.4.bb
@@ -0,0 +1,30 @@
+LICENSE = "GPL"
+SECTION = "x11/base"
+DESCRIPTION = "GTK theme engines"
+DEPENDS = "gtk+ cairo"
+
+RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95"
+RDEPENDS_gtk-theme-metal = "gtk-engine-metal"
+RDEPENDS_gtk-theme-mist = "gtk-engine-mist"
+RDEPENDS_gtk-theme-crux = "gtk-engine-crux-engine"
+RDEPENDS_gtk-theme-lighthouseblue = "gtk-engine-lighthouseblue"
+RDEPENDS_gtk-theme-thinice = "gtk-engine-thinice"
+RDEPENDS_gtk-theme-industrial = "gtk-engine-industrial"
+RDEPENDS_gtk-theme-clearlooks = "gtk-engine-clearlooks"
+
+inherit gnome  gtk-binver
+
+PACKAGES_DYNAMIC = "gtk-engine-* gtk-theme-*"
+
+python populate_packages_prepend() {
+	import os.path
+
+	engines_ver = ['gtk-2.0/', gtkbinver_find(d), '/engines']
+
+	engines_root = os.path.join(bb.data.getVar('libdir', d, 1), ''.join(engines_ver))
+	themes_root = os.path.join(bb.data.getVar('datadir', d, 1), "themes")
+
+	do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='')
+	do_split_packages(d, themes_root, '(.*)', 'gtk-theme-%s', 'GTK theme %s', allow_dirs=True, extra_depends='')
+}
+
diff --git a/packages/nautilus/nautilus_2.22.5.bb b/packages/nautilus/nautilus_2.22.5.bb
new file mode 100644
index 0000000000..0e94b93698
--- /dev/null
+++ b/packages/nautilus/nautilus_2.22.5.bb
@@ -0,0 +1,20 @@
+# nautilus OE build file
+# Copyright (C) 2005, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+inherit gnome
+LICENSE="GPL"
+
+DEPENDS = "librsvg libexif eel esound gnome-desktop"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+PACKAGES += "libnautilus"
+
+FILES_${PN} += "${datadir}/icons ${datadir}/mime /usr/libexec/ "
+FILES_libnautilus = "/usr/lib/*.so*"
+FILES_${PN}-dbg += "/usr/libexec/.debug"
+
+do_stage() {
+	autotools_stage_all
+}