task-mamona* & meta-mamona*: Reorganising task & meta packages.

* Unused/Unnecessary tasks/meta have been removed.
* evas-engine-software-x11 has been added as evas depends for Mamona since Mamona support X11 only. Now on Mamona users can install e-wm instead of task-mamona-e that have been removed.

* TODO: task-mamona-noemu has been removed from meta-mamona.bb because some of noemu packages are not compiling. It must be solved before put task-mamona-noemu back to meta-mamona.

7 files changed, 105 insertions, 243 deletions

diff --git a/packages/meta/meta-mamona.bb b/packages/meta/meta-mamona.bb
index e4fb4bdfb7..b2ed6cfe33 100644
--- a/packages/meta/meta-mamona.bb
+++ b/packages/meta/meta-mamona.bb
@@ -7,11 +7,93 @@ EXCLUDE_FROM_WORLD = "1"
 
 RDEPENDS = " \
 task-mamona-base \
+task-mamona \
 task-mamona-devel \
-task-mamona-extras \
-task-mamona-nokia-it \
-task-mamona-noemu \
-task-mamona-e \
+task-mamona-sdk \
+coreutils \
+cpio \
+dbus \
+diffstat \
+dnsmasq \
+dosfstools \
+e2fsprogs \
+expat \
+e-wm \
+findutils \
+fontconfig \
+gconf \
+glib-2.0 \
+gnome-common \
+gnome-vfs \
+groff \
+gstreamer \
+gtk+ \
+gtk+-doc \
+gtk-engines-dev \
+ifupdown \
+initscripts \
+intltool \
+libart-lgpl \
+libdbi \
+libelf \
+libfontenc \
+libmatchbox \
+liboil \
+libpng \
+libtelepathy \
+libtool \
+libusb \
+libxau \
+libxcursor \
+libxdmcp \
+libxext \
+libxfixes \
+libxfont \
+libxi \
+libxkbfile \
+libxml2 \
+libxpm \
+libxrandr \
+libxrender \
+libxslt \
+libxt \
+libxtst \
+libxv \
+lsof \
+makedev \
+matchbox-wm \
+mime-support \
+module-init-tools \
+mplayer \
+ncurses \
+net-tools \
+netbase \
+portmap \
+ppp \
+procps \
+renderproto-dev \
+samba \
+sgml-common \
+shared-mime-info \
+slang \
+sqlite \
+sqlite3 \
+sudo \
+sysvinit \
+telepathy-gabble \
+telepathy-glib \
+telepathy-mission-control \
+tslib \
+ttf-bitstream-vera \
+udev \
+util-linux \
+wget \
+xkbd \
+xtrans-dev \
 "
 
+# TODO: some of noemu packages are broken. Fix them before
+# put task-mamona-noemu back to meta-mamona.
+#task-mamona-noemu \
+
 include mamona-buildall.inc
diff --git a/packages/tasks/task-mamona-devel.bb b/packages/tasks/task-mamona-devel.bb
index 5c023018fd..2f6ac32779 100644
--- a/packages/tasks/task-mamona-devel.bb
+++ b/packages/tasks/task-mamona-devel.bb
@@ -6,7 +6,20 @@ ALLOW_EMPTY = "1"
 PACKAGES = "${PN}"
 
 RDEPENDS = "\
+  task-mamona \  
   gdb \
   strace \
-  udev-usbserial \
-"
\ No newline at end of file
+  usbnet \
+  openssh-sshd \
+  openssh-scp \
+"
+
+pkg_postinst () {
+	echo; echo
+	echo " ########################################################## "
+	echo " # WARNING: Please set your root password before use your # "
+	echo " #          usbnet package. It's required for ssh login.  # "
+	echo " ########################################################## "
+	echo; echo
+}
+
diff --git a/packages/tasks/task-mamona-e.bb b/packages/tasks/task-mamona-e.bb
deleted file mode 100644
index cc8af8b3f9..0000000000
--- a/packages/tasks/task-mamona-e.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-DESCRIPTION = "Necessary packages for Enlightenment on Mamona"
-LICENSE = "MIT"
-PR = "r2"
-ALLOW_EMPTY = "1"
-
-PACKAGES = "${PN}"
-
-RDEPENDS = "\
-eet \
-embryo \
-imlib2 \
-edb \
-evas \
-libevas-engine-software-x11 \
-libevas-engine-software-16 \
-libevas-engine-software-16-x11 \
-libevas-saver-eet \
-libevas-saver-edb \
-libevas-saver-jpeg \
-libevas-saver-tiff \
-libevas-loader-eet \
-libevas-loader-edb \
-libevas-loader-jpeg \
-libevas-loader-tiff \
-ecore \
-efreet \
-edje \
-etk \
-ewl \
-epeg \
-esmart \
-epsilon \
-emotion \
-enhance \
-edbus \
-e-wm \
-"
diff --git a/packages/tasks/task-mamona-extras.bb b/packages/tasks/task-mamona-extras.bb
deleted file mode 100644
index 7a5e7a6a29..0000000000
--- a/packages/tasks/task-mamona-extras.bb
+++ /dev/null
@@ -1,174 +0,0 @@
-DESCRIPTION = "Task mamona extras: Dummy package to build extra packages to mamona repository"
-LICENSE = "MIT"
-PR = "r1"
-ALLOW_EMPTY = "1"
-
-PACKAGES = "${PN}"
-
-RDEPENDS = "\
-  tinylogin \
-  bluez-utils \
-  bluez-utils-compat \
-  bluez-utils-alsa \
-  bluez-libs \
-  coreutils \
-  cpio \
-  dbus \
-  diffstat \
-  dnsmasq \
-  dosfstools \
-  e2fsprogs \
-  expat \
-  findutils \
-  fontconfig \
-  gconf \
-  gnome-common \
-  gtk+-doc \
-  glib-2.0 \
-  ifupdown \
-  initscripts \
-  intltool \
-  iptables \
-  libelf \
-  libfontenc \
-  libmatchbox \
-  liboil \
-  libpng \
-  libtool \
-  libusb \
-  libxau \
-  libxcursor \
-  libxdmcp \
-  libxext \
-  libxfixes \
-  libxfont \
-  libxi \
-  libxkbfile \
-  libxml2 \
-  libxpm \
-  libxrandr \
-  libxrender \
-  libxslt \
-  libxt \
-  libxtst \
-  libxv \
-  lsof \
-  makedev \
-  mime-support \
-  module-init-tools \
-  ncurses \
-  net-tools \
-  netbase \
-  osso-af-utils \
-  osso-core-config \
-  osso-esd \
-  osso-sounds \
-  portmap \
-  ppp \
-  procps \
-  samba \
-  sbrsh \
-  sdk-default-icons \
-  sdk-default-theme \
-  sdk-default-theme-config \
-  sgml-common \
-  shared-mime-info \
-  slang \
-  sqlite \
-  sqlite3 \
-  sudo \
-  sysvinit \
-  telepathy-gabble \
-  libtelepathy \
-  telepathy-glib \
-  telepathy-mission-control \
-  tslib \
-  ttf-bitstream-vera \
-  udev \
-  util-linux \
-  wireless-tools \
-  xkbd \
-  xtrans-dev \
-  gnome-vfs \
-  groff \
-  gstreamer \
-  gtk-engines-dev \
-  gtk+ \
-  libart-lgpl \
-  libdbi \
-  libosso \
-  libosso-gsf \
-  matchbox-wm \
-  nfs-utils \
-  osso-af-settings-dev \
-  osso-af-startup \
-  osso-af-utils \
-  osso-core-config \
-  osso-dsp-headers-dev \
-  osso-esd \
-  python \
-  python-ao \
-  python-cheetah \
-  python-constraint \
-  python-pycrypto \
-  python-dbus \
-  python-dialog \
-  python-fnorb \
-  python-fpconst \
-  python-gmpy \
-  python-gnosis \
-  python-hmm \
-  python-imaging \
-  python-imdbpy \
-  python-inotify \
-  python-irclib \
-  python-itools \
-  python-libgmail \
-  python-libgmail \
-  python-logilab-common \
-  python-lxml \
-  python-mad \
-  python-numarray \
-  python-numeric \
-  python-ogg \
-  python-pexpect \
-  python-pybluez \
-  python-pycairo \
-  python-pychecker \
-  python-pycodes \
-  python-pyephem \
-  python-pyfits \
-  python-pyflakes \
-  python-pygobject \
-  python-pygoogle \
-  python-pygtk \
-  python-pyiw \
-  python-pylinda \
-  python-pylint \
-  python-pymetar \
-  python-pymp3 \
-  python-pyraf \
-  python-pyreverse \
-  python-pyrex \
-  python-pyro \
-  python-pyserial \
-  python-pythondaap \
-  python-pyvisa \
-  python-pyweather \
-  python-pywpa \
-  python-pyzeroconf \
-  python-scons \
-  python-sgmlop \
-  python-snmplib \
-  python-soappy \
-  python-tlslite \
-  python-urwid \
-  python-vmaps \
-  python-vorbis \
-  python-webpy \
-  renderproto-dev \
-  wget \
-  zlib \
-"
-
-#  strace \
diff --git a/packages/tasks/task-mamona-nokia-it.bb b/packages/tasks/task-mamona-nokia-it.bb
deleted file mode 100644
index 7fa1728190..0000000000
--- a/packages/tasks/task-mamona-nokia-it.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Necessary packages for Mamona run on Nokia Internet Tablets"
-LICENSE = "MIT"
-PR = "r0"
-ALLOW_EMPTY = "1"
-
-RDEPENDS = "\
-  task-mamona \
-  xmodmap \
-  xdpyinfo \
-  xtscal \
-  wireless-tools \
-  wpa-supplicant \
-  bluez-utils \
-  bluez-utils-compat \
-  dspgw-utils \
-  libasound-module-ctl-dsp-ctl \
-  libasound-module-pcm-alsa-dsp \
-  alsa-conf-base \
-  alsa-utils-alsamixer \
-  alsa-lib \
-  alsa-utils-alsactl \
-  alsa-state \
-  usbnet \
-  openssh-sshd \
-  openssh-scp \
-"
diff --git a/packages/tasks/task-mamona-sdk.bb b/packages/tasks/task-mamona-sdk.bb
index 553597d8cf..a86268d8bd 100644
--- a/packages/tasks/task-mamona-sdk.bb
+++ b/packages/tasks/task-mamona-sdk.bb
@@ -6,6 +6,7 @@ ALLOW_EMPTY = "1"
 PACKAGES = "${PN}"
 
 RDEPENDS = "\
+  task-mamona \
   automake \
   bison \
   fakeroot \
diff --git a/packages/tasks/task-mamona.bb b/packages/tasks/task-mamona.bb
index 74b3de29f6..0e5d5cca91 100644
--- a/packages/tasks/task-mamona.bb
+++ b/packages/tasks/task-mamona.bb
@@ -35,10 +35,13 @@ RDEPENDS = "\
     libxrandr \
     libxrender \
     pointercal \
+    python-core \
     tslib \
     tslib-calibrate \
     udev \
     update-modules \
+    wireless-tools \
+    wpa-supplicant \
     xserver-kdrive-xomap \
     xserver-kdrive-common \
     xserver-nodm-init \