merge of 24e85069eaef121ddb29e2dc3539a98c5ab3b6aa

     and 978b81b24a21690b8a090d704ca40512790ad868

7 files changed, 19 insertions, 34 deletions

diff --git a/packages/meta/e-image.bb b/packages/meta/e-image.bb
index f16f61c795..d58215d3a7 100644
--- a/packages/meta/e-image.bb
+++ b/packages/meta/e-image.bb
@@ -1,4 +1,9 @@
+DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager and Tools"
+LICENSE = "MIT"
+PR = "r1"
+
 export IMAGE_BASENAME = "e-image"
+export IMAGE_LINGUAS = ""
 
 DEPENDS = "task-bootstrap meta-e-x11 xserver-kdrive"
 
@@ -6,8 +11,8 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/evas = "evas-x11"
 PREFERRED_PROVIDER_virtual/ecore = "ecore-x11"
 PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11"
+PREFERRED_PROVIDER_virtual/libxine = "libxine-x11"
 
 export IPKG_INSTALL = "task-bootstrap task-enlightenment-x11 xserver-kdrive-fbdev"
 
 inherit image_ipk
-LICENSE = MIT
diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb
index f539dac95a..b4f3558e93 100644
--- a/packages/meta/meta-e-x11.bb
+++ b/packages/meta/meta-e-x11.bb
@@ -12,12 +12,13 @@ ALLOW_EMPTY = 1
 # X
 #
 DEPENDS  += "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig \
-	     ttf-bitstream-vera bash"
-RDEPENDS += "         rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo            ttf-bitstream-vera"
+             ttf-bitstream-vera bash"
+RDEPENDS += "         rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo            \
+             ttf-bitstream-vera"
 
 #
 # E
 #
-DEPENDS  += "entrance e-wm entice"
-RDEPENDS += "entrance e-wm entice"
+DEPENDS  += "entrance e-wm entice eclair examine "
+RDEPENDS += "entrance e-wm entice eclair examine "
 
diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc
index 60cc77356a..052ddac474 100644
--- a/packages/meta/opie-collections.inc
+++ b/packages/meta/opie-collections.inc
@@ -77,10 +77,10 @@ OPIE_EXTRA_SETTINGS = "opie-language opie-launcher-settings opie-doctab opie-sec
 
 OPIE_DEPENDS_24  = "konqueror-embedded opie-calculator opie-checkbook opie-mail opie-eye opie-rdesktop \
                     qpdf2 opie-wellenreiter opie-parashoot opie-mindbreaker opie-fifteen opie-tictac opie-tetrix   \
-                    opie-irc "
+                    opie-irc opie-mediaplayer2"
 OPIE_RDEPENDS_24 = "konqueror-embedded opie-calculator opie-checkbook opie-mail opie-eye opie-rdesktop \
                     qpdf2 opie-wellenreiter opie-parashoot opie-mindbreaker opie-fifteen opie-tictac opie-tetrix   \
-                    opie-irc "
+                    opie-irc opie-mediaplayer2 libxine-plugin-decode-ff libxine-plugin-dmx-avi"
 
 #
 #
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2-divx_0.1.0.bb b/packages/opie-mediaplayer2/opie-mediaplayer2-divx_0.1.0.bb
deleted file mode 100644
index 405d384cf8..0000000000
--- a/packages/opie-mediaplayer2/opie-mediaplayer2-divx_0.1.0.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "OPIE Mediaplayer DIVX pseudo package."
-MAINTAINER = "Werner Schulte <w1@schulte-ac.de>"
-LICENSE = "GPL"
-ALLOW_EMPTY = "1"
-PACKAGES = "${PN}"
-PACKAGE_ARCH = "all"
-PR = "r1"
-
-DEPENDS = "opie-mediaplayer2 \
-	   opie-mediaplayer2-skin-default \
-	   libxine-fb "
-
-RDEPENDS = "opie-mediaplayer2 \
-	   opie-mediaplayer2-skin-default \
-	   libxine-plugin-ao-out-oss \
-	   libxine-plugin-decode-ff \
-	   libxine-plugin-decode-mad \
-	   libxine-plugin-dmx-audio \
-	   libxine-plugin-dmx-avi \
-	   libxine-plugin-dmx-mpeg \
-	   libxine-plugin-inp-file \
-	   libxine1"
-
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2.inc b/packages/opie-mediaplayer2/opie-mediaplayer2.inc
index 3372edddfd..00247fe6ad 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2.inc
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2.inc
@@ -6,8 +6,10 @@ LICENSE = "GPL"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 DEPENDS = "libxine-fb libqtaux2 opie-mediaplayer2-skin-default"
 RDEPENDS = "opie-mediaplayer2-skin"
-RRECOMMENDS = "opie-mediaplayer2-skin-default libxine-plugin-ao-out-oss libxine-plugin-decode-mad \
-libxine-plugin-dmx-audio libxine-plugin-dmx-mpeg libxine-plugin-inp-file "
+RRECOMMENDS = "opie-mediaplayer2-skin-default \
+libxine-plugin-ao-out-oss libxine-plugin-inp-file \
+libxine-plugin-decode-ff libxine-plugin-decode-mad \
+libxine-plugin-dmx-audio libxine-plugin-dmx-avi libxine-plugin-dmx-mpeg"
 APPNAME = "opieplayer2"
 
 S = "${WORKDIR}/${APPNAME}"
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.0.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.0.bb
index b0fe5563e9..c94efb35ec 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.0.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2_1.2.0.bb
@@ -1,6 +1,6 @@
 include ${PN}.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/multimedia/opieplayer2 \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
diff --git a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
index 631f545873..cc6d9b43c1 100644
--- a/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
+++ b/packages/opie-mediaplayer2/opie-mediaplayer2_cvs.bb
@@ -1,7 +1,7 @@
 include ${PN}.inc
     
 PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/multimedia/opieplayer2 \
            ${HANDHELDS_CVS};module=opie/pics \