merge of 1ab8e3772bfbaecdabe093d92f28f8c2148e4f61

     and 231e6c9de778cfd05359c4ae1ef7485ffbacb78b

11 files changed, 81 insertions, 4 deletions

diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index b83060a200..2a31d3a678 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -73,6 +73,7 @@ ${PKGDIR}/packages/lcdproc/*.bb \
 ${PKGDIR}/packages/less/*.bb \
 ${PKGDIR}/packages/libaal/*.bb \
 ${PKGDIR}/packages/libao/*.bb \
+${PKGDIR}/packages/libdvb/*.bb \
 ${PKGDIR}/packages/libexif/*.bb \
 ${PKGDIR}/packages/libgphoto2/*.bb \
 ${PKGDIR}/packages/libid3tag/*.bb \
diff --git a/packages/alsa/alsa-utils_1.0.8.bb b/packages/alsa/alsa-utils_1.0.8.bb
index 5a6d04f0e3..ca9a52e58a 100644
--- a/packages/alsa/alsa-utils_1.0.8.bb
+++ b/packages/alsa/alsa-utils_1.0.8.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "ALSA Utilities"
 MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
 SECTION = "console/utils"
 LICENSE = "GPL"
-DEPENDS = "alsa-lib"
-PR = "r1"
+DEPENDS = "alsa-lib ncurses"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2"
 
diff --git a/packages/nonworking/meta/.mtn2git_empty b/packages/elitaire/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/nonworking/meta/.mtn2git_empty
+++ b/packages/elitaire/.mtn2git_empty
diff --git a/packages/elitaire/elitaire_0.0.4.bb b/packages/elitaire/elitaire_0.0.4.bb
new file mode 100644
index 0000000000..220b6ace16
--- /dev/null
+++ b/packages/elitaire/elitaire_0.0.4.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "EFL-based solitaire"
+DEPENDS = "evas-x11 ecore-x11 edje esmart ewl"
+LICENSE = "MIT"
+SECTION = "e/apps"
+MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
+PR = "r0"
+
+SRC_URI = "http://www.mowem.de/elitaire/elitaire-0.0.4.tar.bz2 \
+           file://fix-ewl-and-gettext.patch;patch=1"
+
+inherit autotools pkgconfig binconfig
+
diff --git a/packages/elitaire/files/.mtn2git_empty b/packages/elitaire/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/elitaire/files/.mtn2git_empty
diff --git a/packages/elitaire/files/fix-ewl-and-gettext.patch b/packages/elitaire/files/fix-ewl-and-gettext.patch
new file mode 100644
index 0000000000..f84ec06d34
--- /dev/null
+++ b/packages/elitaire/files/fix-ewl-and-gettext.patch
@@ -0,0 +1,37 @@
+diff -Nur elitaire-0.0.4~/src/Eli_App.h elitaire-0.0.4/src/Eli_App.h
+--- elitaire-0.0.4~/src/Eli_App.h	2005-08-18 19:02:30.000000000 -0700
++++ elitaire-0.0.4/src/Eli_App.h	2005-08-18 19:02:40.000000000 -0700
+@@ -3,7 +3,7 @@
+ #include<Ecore_Config.h>
+ #include<Ecore_File.h>
+ #include<Esmart/Esmart_Container.h>
+-#include<ewl/Ewl.h>
++#include<Ewl.h>
+ #include"ewl_context_menu.h"
+ #include"Elitaire.h"
+ 
+diff -Nur elitaire-0.0.4~/src/ewl_context_menu.c elitaire-0.0.4/src/ewl_context_menu.c
+--- elitaire-0.0.4~/src/ewl_context_menu.c	2005-08-18 19:02:30.000000000 -0700
++++ elitaire-0.0.4/src/ewl_context_menu.c	2005-08-18 19:02:40.000000000 -0700
+@@ -1,4 +1,4 @@
+-#include<ewl/Ewl.h>
++#include<Ewl.h>
+ #include"ewl_context_menu.h"
+ 
+ void ewl_context_menu_expand_cb(Ewl_Widget *w, void *ev_data ,
+diff -Nur elitaire-0.0.4~/src/intl.h elitaire-0.0.4/src/intl.h
+--- elitaire-0.0.4~/src/intl.h	2005-08-18 19:02:30.000000000 -0700
++++ elitaire-0.0.4/src/intl.h	2005-08-18 19:06:05.000000000 -0700
+@@ -13,8 +13,12 @@
+ 
+ inline char * sgettext(const char *msgid)
+ {
++#ifdef ENABLE_NLS
+ 	char *msgval = gettext (msgid);
+ 	if (msgval == msgid)
++#else
++	  char *msgval;
++#endif
+ 		msgval = strrchr (msgid, '|') + 1;
+ 	return msgval;
+ }
diff --git a/packages/libdvb/.mtn2git_empty b/packages/libdvb/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libdvb/.mtn2git_empty
diff --git a/packages/libdvb/libdvb_0.5.5.1.bb b/packages/libdvb/libdvb_0.5.5.1.bb
new file mode 100644
index 0000000000..62ce3c61e5
--- /dev/null
+++ b/packages/libdvb/libdvb_0.5.5.1.bb
@@ -0,0 +1,26 @@
+LICENSE = "GPL"
+DESCRIPTION = "Linux Digital Video Broadcast library"
+HOMEPAGE = "http://www.metzlerbros.org/dvb/index.html"
+MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
+SECTION = "libs"
+PRIORITY = "optional"
+PR = "r0"
+
+SRC_URI = "http://www.metzlerbros.org/dvb/${PN}-${PV}.tar.gz"
+S = "${WORKDIR}/${PN}-${PV}"
+
+inherit autotools pkgconfig
+
+do_configure() {
+	grep -v ^PREFIX ${S}/config.mk > ${S}/config.mk.new
+	echo "PREFIX=${prefix}" >> ${S}/config.mk.new
+	mv ${S}/config.mk.new ${S}/config.mk
+}
+
+
+do_stage() {
+	install -d ${STAGING_INCDIR}/dvb
+	install -m 0644 ${S}/include/*.h ${STAGING_INCDIR}/dvb
+	oe_libinstall -a -C libdvb libdvb ${STAGING_LIBDIR}
+}
+
diff --git a/packages/nonworking/meta/e-image.bb b/packages/meta/e-image.bb
index d58215d3a7..d58215d3a7 100644
--- a/packages/nonworking/meta/e-image.bb
+++ b/packages/meta/e-image.bb
diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb
index 45e3d67384..4ff955e06b 100644
--- a/packages/meta/meta-e-x11.bb
+++ b/packages/meta/meta-e-x11.bb
@@ -19,6 +19,6 @@ RDEPENDS += "         rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo
 #
 # E
 #
-DEPENDS  += "entrance e-wm entice eclair examine evidence e-modules e-utils"
-RDEPENDS += "entrance e-wm entice eclair examine evidence e-modules e-utils"
+DEPENDS  += "entrance e-wm entice eclair examine evidence e-modules e-utils elitaire"
+RDEPENDS += "entrance e-wm entice eclair examine evidence e-modules e-utils elitaire"
 
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index 15de0f1fcb..4f0afffdd2 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -53,6 +53,7 @@ OPENSLUG_PACKAGES = "\
 	jpeg \
 	lcdproc \
 	less \
+	libdvb \
 	libpam \
 	libpng \
 	libtool \