merge of 4844115704ef8669d1a44359d8e2f4aea0f4e0a3

     and c24a3542dea96cfac7343e6b921684d6459008da

8 files changed, 26 insertions, 32 deletions

diff --git a/classes/module.bbclass b/classes/module.bbclass
index 4da3f5f30b..8a13f1f858 100644
--- a/classes/module.bbclass
+++ b/classes/module.bbclass
@@ -34,6 +34,18 @@ module_do_install() {
 	oe_runmake DEPMOD=echo INSTALL_MOD_PATH="${D}" CC="${KERNEL_CC}" LD="${KERNEL_LD}" modules_install
 }
 
+pkg_postinst_append () {
+	if [ -n "$D" ]; then
+		exit 1
+	fi
+	depmod -A
+	update-modules || true
+}
+
+pkg_postrm_append () {
+	update-modules || true
+}
+
 EXPORT_FUNCTIONS do_compile do_install
 
 FILES_${PN} = "/etc /lib/modules"
diff --git a/packages/at76c503a/at76c503a-modules_cvs.bb b/packages/at76c503a/at76c503a-modules_cvs.bb
index 7e737e9447..1c8f1faa9c 100644
--- a/packages/at76c503a/at76c503a-modules_cvs.bb
+++ b/packages/at76c503a/at76c503a-modules_cvs.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 SRC_URI = "cvs://anonymous@cvs.berlios.de/cvsroot/at76c503a;module=at76c503a \
 	   file://makefile.cc.patch;patch=1"
 S = "${WORKDIR}/at76c503a"
-PR = "r3"
+PR = "r4"
 PV = "0.0cvs${CVSDATE}"
 
 inherit module
@@ -11,19 +11,6 @@ inherit module
 MODULES = "at76c503 at76_usbdfu at76c503-i3861 at76c503-rfmd at76c503-rfmd-acc \
 	at76c505-rfmd at76c503-i3863 at76c505-rfmd2958"
 
-pkg_postinst() {
-#!/bin/sh
-if [ "x$D" != "x" ]; then
-  exit 1
-fi
-update-modules || true
-}
-
-pkg_postrm() {
-#!/bin/sh
-update-modules || true
-}
-
 do_install() {
 	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/
 	for i in ${MODULES}; do
diff --git a/packages/bt950-cs/bt950-cs_0.1.bb b/packages/bt950-cs/bt950-cs_0.1.bb
index e32db47b6d..dfd288e50a 100644
--- a/packages/bt950-cs/bt950-cs_0.1.bb
+++ b/packages/bt950-cs/bt950-cs_0.1.bb
@@ -4,6 +4,7 @@ LICENSE = "GPLv2"
 HOMEPAGE = "http://www.holtmann.org/linux/bluetooth/bt950.html"
 DEPENDS = "pcmcia-cs"
 RDEPENDS = "pcmcia-cs"
+PR = "r1"
 
 SRC_URI = "http://www.holtmann.org/linux/bluetooth/bt950-${PV}.tar.gz \
 file://makefile.patch;patch=1"
@@ -22,16 +23,3 @@ do_install() {
 	install -m 0644 bt950.conf ${D}${sysconfdir}/pcmcia/
 }
 
-pkg_postinst() {
-#!/bin/sh
-if [ "x$D" != "x" ]; then
-  exit 1
-fi
-update-modules || true
-}
-
-pkg_postrm() {
-#!/bin/sh
-update-modules || true
-}
-
diff --git a/packages/efl++/efl++-fb_0.0.2.bb b/packages/efl++/efl++-fb_0.0.2.bb
new file mode 100644
index 0000000000..b6a23d832d
--- /dev/null
+++ b/packages/efl++/efl++-fb_0.0.2.bb
@@ -0,0 +1,3 @@
+include efl++.inc
+
+EFL_CONFIGURATION = "DEFINES-=EFL_HAVE_X11"
diff --git a/packages/efl++/efl++-x11_0.0.2.bb b/packages/efl++/efl++-x11_0.0.2.bb
new file mode 100644
index 0000000000..d3f37911ee
--- /dev/null
+++ b/packages/efl++/efl++-x11_0.0.2.bb
@@ -0,0 +1,3 @@
+include efl++.inc
+
+EFL_CONFIGURATION = "DEFINES+=EFL_HAVE_X11"
diff --git a/packages/efl++/efl++_0.0.2.bb b/packages/efl++/efl++.inc
index 5803f5db7a..3a0aa9f691 100644
--- a/packages/efl++/efl++_0.0.2.bb
+++ b/packages/efl++/efl++.inc
@@ -5,6 +5,7 @@ AUTHOR = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 MAINTAINER = "${AUTHOR}"
 HOMEPAGE = "http://www.Vanille.de/projects/efl++.html"
 DEPENDS = "virtual/evas virtual/ecore edje"
+PROVIDES = "virtual/efl++"
 
 SRC_URI = "http://www.Vanille.de/temp/efl++_${PV}.tar.bz2"
 S = "${WORKDIR}/efl++-${PV}"
@@ -14,7 +15,7 @@ inherit qmake
 PARALLEL_MAKE = ""
 QMAKE_PROFILES = "efl++.pro"
 EXTRA_QMAKEVARS_POST = "INCLUDEPATH+=${S}/src/evas INCLUDEPATH+=${S}/src/ecore INCLUDEPATH+=${S}/src/edje \
-			LIBS+=-L${S} DESTDIR=${S}"
+			LIBS+=-L${S} DESTDIR=${S} ${EFL_CONFIGURATION}"
 export OE_QMAKE_LINK="${CXX}"
 export EDIR="${S}"
 
@@ -23,7 +24,6 @@ do_configure_prepend() {
 	cat <<EOF >include.pro
 include ( common.pro )
 DEFINES += DATADIR=\"${datadir}/efl++/\"
-DEFINES += EFL_HAVE_X11
 EOF
 }
 
diff --git a/packages/evince/evince_0.3.2.bb b/packages/evince/evince_0.3.2.bb
index 86ca664655..18ad005092 100644
--- a/packages/evince/evince_0.3.2.bb
+++ b/packages/evince/evince_0.3.2.bb
@@ -1,8 +1,9 @@
 DESCRIPTION = "Evince is simply a document viewer"
 LICENSE = "GPL"
 DEPENDS = "tiff espgs poppler gtk+ libgnomeui libgnomeprint libgnomeprintui"
-RDEPENDS = "espgs"
+RDEPENDS = "espgs gconf"
 RRECOMMENDS = "gnome-vfs-plugin-file"
+PR = "r1"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/evince/0.3/${PN}-${PV}.tar.bz2 \
 		file://no-doc.patch;patch=1"
diff --git a/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb b/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb
index bf4fae08bc..eb461a860c 100644
--- a/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb
+++ b/packages/maemo/osso-gnome-vfs2_2.8.4.4-1.bb
@@ -1,7 +1,7 @@
+DESCRIPTION = "The Gnome Virtual File System - OSSO Version"
 LICENSE = "GPL"
 SECTION = "x11/gnome"
-PR = "r1"
-PROVIDES = "gnome-vfs"
+PR = "r2"
 RPROVIDES = "gnome-vfs"
 
 inherit gnome pkgconfig