merge of 1a161e3d9f46581507d1542d1112d40c07481893

     and 80954f6b3dd012af79d0b0eecc7015cd1b46aa27

7 files changed, 75 insertions, 8 deletions

diff --git a/conf/distro/openslug-native-packages.conf b/conf/distro/openslug-native-packages.conf
index 2599b71d94..158d7757b6 100644
--- a/conf/distro/openslug-native-packages.conf
+++ b/conf/distro/openslug-native-packages.conf
@@ -6,4 +6,6 @@ ${PKGDIR}/packages/ipkg-utils/*.bb \
 ${PKGDIR}/packages/meta/package-index.bb \
 ${PKGDIR}/packages/meta/openslug-native-packages.bb \
 ${PKGDIR}/packages/freeze/*.bb \
+${PKGDIR}/packages/pcre/*.bb \
+${PKGDIR}/packages/expat/*.bb \
 ${OPENSLUG_EXTRA_BBFILES}"
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index 6c76c86780..aba754b368 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -1,6 +1,8 @@
 BBFILES := "\
+${PKGDIR}/packages/alsa/*.bb \
 ${PKGDIR}/packages/atftp/*.bb \
 ${PKGDIR}/packages/audiofile/*.bb \
+${PKGDIR}/packages/aumix/*.bb \
 ${PKGDIR}/packages/autoconf/*.bb \
 ${PKGDIR}/packages/automake/*.bb \
 ${PKGDIR}/packages/base-files/*.bb \
diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc
index 0c028c5345..1d512fa292 100644
--- a/conf/distro/preferred-gpe-versions-2.7.inc
+++ b/conf/distro/preferred-gpe-versions-2.7.inc
@@ -9,16 +9,19 @@ CVSDATE_minimo=20050401
 PREFERRED_PROVIDER_gconf=gconf-dbus
 
 #specify versions, as the header says :)
-PREFERRED_VERSION_libmatchbox ?= "1.6"
+PREFERRED_VERSION_libmatchbox ?= "1.7"
 PREFERRED_VERSION_matchbox ?= "0.9.1"
 PREFERRED_VERSION_matchbox-common ?= "0.9.1"
 PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
-PREFERRED_VERSION_matchbox-wm ?= "0.9.4"
+PREFERRED_VERSION_matchbox-wm ?= "0.9.5"
 PREFERRED_VERSION_matchbox-panel ?= "0.9.2"
 PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
+PREFERRED_VERSION_atk ?= "1.9.0"
 PREFERRED_VERSION_cairo ?= "0.5.2"
 PREFERRED_VERSION_glib-2.0 ?= "2.6.4"
 PREFERRED_VERSION_gtk+ ?= "2.6.7"
+PREFERRED_VERSION_pango ?= "1.8.1"
+PREFERRED_VERSION_librsvg ?= "2.6.5"
 PREFERRED_VERSION_libgpewidget ?= "0.103"
 PREFERRED_VERSION_libgpepimc ?= "0.5"
 PREFERRED_VERSION_libgpevtype ?= "0.12"
diff --git a/packages/apache/apache_2.0.54.bb b/packages/apache/apache_2.0.54.bb
index 53b27e9f7b..882b7f2c71 100644
--- a/packages/apache/apache_2.0.54.bb
+++ b/packages/apache/apache_2.0.54.bb
@@ -1,15 +1,16 @@
 MAINTAINER="David Karlstrom <daka@nslu2-linux.org>"
 SECTION = "net"
-DEPENDS = "openssl"
+DEPENDS = "openssl expat pcre"
 
-PR = "r1"
+PR = "r2"
 
 # ------------------------------------------
 # NOTE: This package is currently only meant
 # to be built nativly on the target device
 # ------------------------------------------
 
-SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.gz"
+SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.gz \
+	   "
 
 S = "${WORKDIR}/httpd-${PV}"
 
@@ -39,9 +40,20 @@ FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
 
 CFLAGS_append = " -DPATH_MAX=4096"
 CFLAGS_prepend = "-I${STAGING_INCDIR}/openssl "
-EXTRA_OECONF = "--enable-ssl --with-ssl=${STAGING_LIBDIR}/.. --enable-dav \
-		--enable-dav-fs --with-dbm=sdbm --with-berkeley-db=no --localstatedir=${localstatedir}/log/apache \
-		--with-gdbm=no --with-ndbm=no --datadir=${datadir}/apache --sysconfdir=${sysconfdir}/apache"
+EXTRA_OECONF = "--enable-ssl \
+		--with-ssl=${STAGING_LIBDIR}/.. \
+		--enable-dav \
+		--enable-dav-fs \
+		--with-dbm=sdbm \
+		--with-berkeley-db=no \
+		--localstatedir=${localstatedir}/log/apache \
+		--with-gdbm=no \
+		--with-ndbm=no \
+		--datadir=${datadir}/apache \
+		--sysconfdir=${sysconfdir}/apache \
+		"
+
+export LD_LIBRARY_PATH=${STAGING_LIBDIR}
 
 do_configure () {
 	# Looks like rebuilding configure doesn't work, so we are skipping
diff --git a/packages/apache/files/init b/packages/apache/files/init
index 46dae0395f..46dae0395f 100644..100755
--- a/packages/apache/files/init
+++ b/packages/apache/files/init
diff --git a/packages/efl++/efl++_0.0.2.bb b/packages/efl++/efl++_0.0.2.bb
new file mode 100644
index 0000000000..5803f5db7a
--- /dev/null
+++ b/packages/efl++/efl++_0.0.2.bb
@@ -0,0 +1,48 @@
+DESCRIPTION = "C++ Bindings for the Enlightenment Foundation Libraries"
+SECTION = "e/libs"
+LICENSE = "LGPL"
+AUTHOR = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+MAINTAINER = "${AUTHOR}"
+HOMEPAGE = "http://www.Vanille.de/projects/efl++.html"
+DEPENDS = "virtual/evas virtual/ecore edje"
+
+SRC_URI = "http://www.Vanille.de/temp/efl++_${PV}.tar.bz2"
+S = "${WORKDIR}/efl++-${PV}"
+
+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}"
+export OE_QMAKE_LINK="${CXX}"
+export EDIR="${S}"
+
+do_configure_prepend() {
+	rm include.pro
+	cat <<EOF >include.pro
+include ( common.pro )
+DEFINES += DATADIR=\"${datadir}/efl++/\"
+DEFINES += EFL_HAVE_X11
+EOF
+}
+
+do_stage() {
+	for i in src/evas/*.h src/ecore/*.h src/edje/*.h
+	do
+		install -m 0644 $i ${STAGING_INCDIR}
+	done
+	oe_libinstall -so -C ${S} libefl++ ${STAGING_LIBDIR}
+}
+
+do_install() {
+	oe_libinstall -so -C ${S} libefl++ ${D}${libdir}
+	install -d ${D}${bindir}
+	install edje-simple ${D}${bindir}
+	install -d ${D}${datadir}/efl++
+	cp -a data/* ${D}${datadir}/efl++
+}
+
+PACKAGES =+ "efl++-examples"
+FILES_${PN} = "${libdir}"
+FILES_efl++-examples = "${bindir} ${datadir}"
diff --git a/packages/initscripts/initscripts-1.0/banner b/packages/initscripts/initscripts-1.0/banner
index 21a01d2846..21a01d2846 100755..100644
--- a/packages/initscripts/initscripts-1.0/banner
+++ b/packages/initscripts/initscripts-1.0/banner