summaryrefslogtreecommitdiff
path: root/packages/meta
diff options
context:
space:
mode:
Diffstat (limited to 'packages/meta')
-rw-r--r--packages/meta/e-image-core.bb6
-rw-r--r--packages/meta/e-image.bb5
-rw-r--r--packages/meta/meta-e-x11.bb17
3 files changed, 15 insertions, 13 deletions
diff --git a/packages/meta/e-image-core.bb b/packages/meta/e-image-core.bb
index c7a7630da4..46957d1c53 100644
--- a/packages/meta/e-image-core.bb
+++ b/packages/meta/e-image-core.bb
@@ -1,11 +1,11 @@
DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager"
LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
export IMAGE_BASENAME = "e-image-core"
export IMAGE_LINGUAS = ""
-DEPENDS = "task-bootstrap meta-e-x11 xserver-kdrive"
+DEPENDS = "task-bootstrap xserver-kdrive task-e-x11-core"
PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/evas = "evas-x11"
@@ -13,6 +13,6 @@ 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-core xserver-kdrive-fbdev"
+export IPKG_INSTALL = "task-bootstrap task-e-x11-core xserver-kdrive-fbdev"
inherit image_ipk
diff --git a/packages/meta/e-image.bb b/packages/meta/e-image.bb
index 2183674b6f..a523ff0243 100644
--- a/packages/meta/e-image.bb
+++ b/packages/meta/e-image.bb
@@ -1,7 +1,8 @@
DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager and Tools"
-PR = "r2"
+PR = "r3"
include e-image-core.bb
export IMAGE_BASENAME = "e-image"
-export IPKG_INSTALL += "task-enlightenment-x11" \ No newline at end of file
+export IPKG_INSTALL += "task-e-x11"
+DEPENDS += "task-e-x11" \ No newline at end of file
diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb
index 47bec68cac..c12afc3d31 100644
--- a/packages/meta/meta-e-x11.bb
+++ b/packages/meta/meta-e-x11.bb
@@ -1,7 +1,8 @@
DESCRIPTION = "Meta-package for Enlightenment/X11"
LICENSE = "MIT"
-PACKAGES = "task-enlightenment-x11 task-enlightenment-x11-core"
-PR = "r5"
+PACKAGES = "task-e-x11-core task-e-x11"
+PROVIDES = "task-e-x11-core task-e-x11"
+PR = "r6"
FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \
e##http://openzaurus.org/official/unstable/3.5.2/feed/e"
@@ -11,20 +12,20 @@ ALLOW_EMPTY = 1
#
# X
#
-DEPENDS_task-enlightenment-x11-core += "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig \
+DEPENDS = "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig \
ttf-bitstream-vera chkhinge"
-RDEPENDS_task-enlightenment-x11-core += " rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \
+RDEPENDS_task-e-x11-core = " rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \
ttf-bitstream-vera chkhinge"
#
# E-core
#
-DEPENDS_task-enlightenment-x11-core += "entrance e-wm"
-RDEPENDS_task-enlightenment-x11-core += "entrance e-wm"
+DEPENDS += "entrance e-wm"
+RDEPENDS_task-e-x11-core += "entrance e-wm"
#
# E
#
-DEPENDS_task-enlightenment-x11 += "task-enlightenment-x11-core entice eclair examine evidence e-modules e-utils elitaire"
-RDEPENDS_task-enlightenment-x11 += "task-enlightenment-x11-core entice eclair examine evidence e-modules e-utils elitaire"
+DEPENDS += "task-e-x11-core entice eclair examine evidence e-modules e-utils elitaire"
+RDEPENDS_task-e-x11 += "task-e-x11-core entice eclair examine evidence e-modules e-utils elitaire"