merge of 9e6536f9c1c4b3b6b530f3531c01c96f931a7ca2

     and a20806f8e80ed173473e201902c1d108f60b538a

11 files changed, 62 insertions, 12 deletions

diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf
index 1616299ae9..7f56b32282 100644
--- a/conf/machine/nslu2.conf
+++ b/conf/machine/nslu2.conf
@@ -129,6 +129,7 @@ USE_VT = "0"
 #-------------------------------------------------------------------------------
 CVSDATE_gnu-config ?= "20050713"
 CVSDATE_gnu-config-native ?= "20050713"
+CVSDATE_ipkg-utils ?= "20050713"
 CVSDATE_ipkg-utils-native ?= "20050713"
 CVSDATE_ipkg-link ?= "20050713"
 
diff --git a/packages/e17/evidence_20050810.bb b/packages/e17/evidence_20050810.bb
new file mode 100644
index 0000000000..0950b590c6
--- /dev/null
+++ b/packages/e17/evidence_20050810.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = "evidence, an enlightenemt file manager"
+LICENSE = "GPL"
+SECTION = "e"
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+# can support dbus, avifile, libmpeg3
+DEPENDS = "pkgconfig gtk+ glib-2.0 ecore-x11 evas-x11 edb eet edje imlib2-x11 libpng epeg jpeg pcre curl taglib libvorbis libogg libxine-x11 emotion freetype"
+RDEPENDS += "examine"
+PR = "r0"
+CVSDATE = "${PV}"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/evidence;module=evidence"
+S = "${WORKDIR}/evidence"
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc \
+	--enable-ecore \
+	--enable-ecore-ipc \
+	--enable-canvas-evas2 \
+	--enable-edje \
+	--enable-x \
+	--enable-tree-view \
+	--enable-icon-view \
+	--enable-browser-view \
+	--with-libxine=${STAGING_LIBDIR}"
+
+do_prepsources () {
+  make clean distclean || true
+}
+addtask prepsources after do_fetch before do_unpack
+
+do_compile_prepend() {
+	sed -i 's:LDFLAGS = :LDFLAGS = -L${STAGING_LIBDIR} :' ${S}/src/providers/vorbis/Makefile
+}
+
+export EET_CONFIG = "${STAGING_BINDIR}/eet-config"
+export EVAS_CONFIG = "${STAGING_BINDIR}/evas-config"
+export ECORE_CONFIG = "${STAGING_BINDIR}/ecore-config"
+export EMBRYO_CONFIG = "${STAGING_BINDIR}/embryo-config"
+export EDJE_CONFIG = "${STAGING_BINDIR}/edje-config"
+
+FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} /etc/* /usr/sbin/*"
+
+inherit autotools pkgconfig binconfig
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/libol/libol_0.3.16.bb b/packages/libol/libol_0.3.16.bb
index 6c1e87308b..be308f1153 100644
--- a/packages/libol/libol_0.3.16.bb
+++ b/packages/libol/libol_0.3.16.bb
@@ -1,6 +1,5 @@
-PR = "r3"
+PR = "r5"
 MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
-DEPENDS = "libol-native"
 
 SRC_URI = "http://www.balabit.com/downloads/libol/0.3/${PN}-${PV}.tar.gz"
 
@@ -9,8 +8,8 @@ inherit autotools
 
 do_stage() {
 	install -d ${STAGING_INCDIR}/libol
-	install -m 0644 ${S}/libol-config ${STAGING_BINDIR}
-	install -m 0644 ${S}/src/.libs/libol.so.0.0.0 ${STAGING_LIBDIR}
+	install -m 0755 ${S}/libol-config ${STAGING_BINDIR}
+	install -m 0755 ${S}/src/.libs/libol.so.0.0.0 ${STAGING_LIBDIR}
 	ln -fs ${STAGING_LIBDIR}/libol.so.0.0.0 ${STAGING_LIBDIR}/libol.so.0
 	install ${S}/src/*.h ${STAGING_INCDIR}/libol/
 }
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
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index a90ad4cf8f..56124ab2e2 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -104,8 +104,8 @@ OPENSLUG_PACKAGES = "\
 	strace \
 	streamripper \
 	sudo \
-	syslog-ng \
 	sysfsutils \
+	syslog-ng \
 	tar \
 	thttpd \
 	tiff \
diff --git a/packages/syslog-ng/syslog-ng_1.6.8.bb b/packages/syslog-ng/syslog-ng_1.6.8.bb
index 25a58ad6ef..a4c2fde2d2 100644
--- a/packages/syslog-ng/syslog-ng_1.6.8.bb
+++ b/packages/syslog-ng/syslog-ng_1.6.8.bb
@@ -1,5 +1,6 @@
-PR = "r3"
+PR = "r4"
 MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
+DEPENDS = "libol"
 
 SRC_URI = "http://www.balabit.com/downloads/syslog-ng/1.6/src/${PN}-${PV}.tar.gz"
 
diff --git a/packages/sysvinit/sysvinit/openslug/inittab b/packages/sysvinit/sysvinit/openslug/inittab
index 567855b9f0..a82c1f5449 100644
--- a/packages/sysvinit/sysvinit/openslug/inittab
+++ b/packages/sysvinit/sysvinit/openslug/inittab
@@ -27,6 +27,6 @@ l4:4:wait:/etc/init.d/rc 4
 l5:5:wait:/etc/init.d/rc 5
 l6:6:wait:/etc/init.d/rc 6
 # Normally not reached, but fallthrough in case of emergency.
-z6:6:respawn:/sbin/sulogini
+z6:6:respawn:/sbin/sulogin
 
 ca:123456:ctrlaltdel:/sbin/poweroff