Merge branch 'sugar' into org.openembedded.dev

10 files changed, 245 insertions, 1 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 3f68a7440b..33aad14695 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -5678,6 +5678,10 @@ sha256=5046f573e7dd77f689c33c5f0aa0f2b7f96c79e0b37d6ecc78bae74c094fb4c6
 md5=9cd0026f5bc89c96cafbd6d1d3500a3b
 sha256=4a2a9f54f3fc68250a92eab43a030b6b96c4b6e251b698b3378bfee751f1cbd8
 
+[http://download.sugarlabs.org/sources/sucrose/glucose/etoys/etoys-4.0.2212.tar.gz]
+md5=3eeb43af8c6bc0a30b46739707e27259
+sha256=8b5499c26860c8a11750e9e03b9a7d70dd8e7ffce16457e9ee9d7850d554e7ab
+
 [http://downloads.sourceforge.net/ettercap/ettercap-0.6.b.tar.gz]
 md5=f665cf82347a91f216184537f8f2c4bd
 sha256=2b6b0d1af5b8af63eb5edf7052fdc9f46c55b6f7b607c8772b18927cb481ecf9
@@ -22602,10 +22606,18 @@ sha256=2172bfed8fdeab4279dad7712390fd98ae0a993c42c2c4eec98cf3d30d1a11aa
 md5=6b981c63bb5d8b23b43831ece79884e6
 sha256=254ac13ceeba17749ff6416b33fd038f8db7aaf6fab2e0a9d2303dd07314b186
 
+[http://download.sugarlabs.org/sources/sucrose/glucose/sugar/sugar-0.84.6.tar.bz2]
+md5=1747f7f35519b273e6c27bbcd8513d4b
+sha256=f5db9c1caf5cd57abfccb12ab1f5ba508cbf0f90ec9bad03de3fb38063775b83
+
 [http://dev.laptop.org/pub/sugar/sources/sugar-artwork/sugar-artwork-0.82.0.tar.bz2]
 md5=3d271bf9f0d412afb9a5618ba5496fb8
 sha256=dbe36fa758a49dd8526885e2025b51d6e1e6e32458168e420c955b633ee3b100
 
+[http://download.sugarlabs.org/sources/sucrose/glucose/sugar-artwork/sugar-artwork-0.84.1.tar.bz2]
+md5=d28b847a24aa23a1b6949aa6a7873560
+sha256=2dc71acc88da545e6a217fd4749dc39a9d59e9f2f768bd67ea201999e55f302a
+
 [http://dev.laptop.org/pub/sugar/sources/sugar-base/sugar-base-0.82.0.tar.bz2]
 md5=5c568166761af4839cbc78db5dcd0061
 sha256=124db55b59cdf5731096276e30d07b3537bc217ae63607f1394c2bb118cfe694
@@ -22618,10 +22630,18 @@ sha256=430b27a0510a50fb66ee211e35565be7e1e522bcde7d1adde5c63a1d18ad7f1d
 md5=0f05d95eaf0f8e3174a3b3e3b0afe995
 sha256=64ece8bb8e6eddb4c7b8b4ce0aa30f07f00a86ed7b113a7957661e73616a8dc3
 
+[http://download.sugarlabs.org/sources/sucrose/glucose/sugar-base/sugar-base-0.84.1.tar.bz2]
+md5=0ef47ff5a8931e0e7c732d22a514d297
+sha256=e67eab2d058a3410d8fe82a2161d0c268b6445648c5901a8bd2c26690c45addd
+
 [http://dev.laptop.org/pub/sugar/sources/sugar-datastore/sugar-datastore-0.82.0.tar.bz2]
 md5=7a6bbb387c1f7cd3ddd6663869df3b88
 sha256=3fc7ed937865773089d146f0fce72ee556f0655c612ae840a08dbd1a13d92d39
 
+[http://download.sugarlabs.org/sources/sucrose/glucose/sugar-datastore/sugar-datastore-0.84.0.tar.bz2]
+md5=e57580e9fd44ecc2cb7a947dd8854817
+sha256=6049dddd3863110b95ec7c7b53c15f6ef8c7b627e3a04f0e9053978685a699db
+
 [http://dev.laptop.org/pub/sugar/sources/sugar-presence-service/sugar-presence-service-0.82.1.tar.bz2]
 md5=361bf10937908a638442b562ebb26d0b
 sha256=6aceb2140c44ada61c9deba9215a12b9a1025fabecc07907edfdcf0ba8ca341b
@@ -22630,6 +22650,10 @@ sha256=6aceb2140c44ada61c9deba9215a12b9a1025fabecc07907edfdcf0ba8ca341b
 md5=0b50a2467e4e9eedd22f51bf2fe6e6f3
 sha256=3b33c9689fb9faaeaf4308cd66794b02951249253ac96df99bd308c4b6d38850
 
+[http://download.sugarlabs.org/sources/sucrose/glucose/sugar-presence-service/sugar-presence-service-0.84.0.tar.bz2]
+md5=bf292605b6c2d0ef3761a957acc8a95e
+sha256=15afba51ef2c34b86ae2c4b8ecfe612e37a7024ae9ccf42a3b612d70e3034d48
+
 [http://dev.laptop.org/pub/sugar/sources/sugar-toolkit/sugar-toolkit-0.82.1.tar.bz2]
 md5=885bd339331209d2771ca614723518a3
 sha256=68f1a10298f34ea133a679085b3b54bdb990c49324779f79e40aff0f274b6a9a
@@ -22642,6 +22666,10 @@ sha256=a0fae53f396c6223365c28c8cda0538f2cb20c660bffd9cfcc37ee00b57c2a7b
 md5=f6882ee56ed327c6680738133e911bf3
 sha256=243a9d699af072b4cb79334b62638463d9f39437e7a886a14a95b7a8250983bd
 
+[http://download.sugarlabs.org/sources/sucrose/glucose/sugar-toolkit/sugar-toolkit-0.84.4.tar.bz2]
+md5=5ad76015d382ec4125c2ef01022dc898
+sha256=bc489eb0feacfd68cd29f1556e2d1c4b4eb8f01c9add7ceb878b605521eb9f92
+
 [http://ssel.vub.ac.be/Members/DennisWagelaar/download/zaurus/supertux-0.1.2-fp.patch.gz]
 md5=05787c6553316940873e8bce192a4fe0
 sha256=ab958a3cc04858ab72f3fe2844362f249897c3bb2149208be22da2ce5d46c9c0
diff --git a/recipes/images/sugar-image.bb b/recipes/images/sugar-image.bb
index 247927543b..e4513f6fe5 100644
--- a/recipes/images/sugar-image.bb
+++ b/recipes/images/sugar-image.bb
@@ -1,5 +1,6 @@
 XSERVER ?= "xserver-kdrive-fbdev"
 SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-angstrom", "",d)}'
+ANGSTROM_EXTRA_INSTALL += ""
 
 export IMAGE_BASENAME = "sugar-image"
 
@@ -10,7 +11,7 @@ IMAGE_INSTALL = "\
     angstrom-x11-base-depends \
     angstrom-gpe-task-base \
     angstrom-gpe-task-settings \
-    sugar-sucrose \
+    task-sugar-sucrose \
     ${SPLASH} \
     ${ANGSTROM_EXTRA_INSTALL}"
 
diff --git a/recipes/sugar/etoys_4.0.2212.bb b/recipes/sugar/etoys_4.0.2212.bb
new file mode 100644
index 0000000000..b66dd22f9d
--- /dev/null
+++ b/recipes/sugar/etoys_4.0.2212.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Sugar etoys"
+LICENSE = "GPLv2"
+
+PR = "r0"
+
+DEPENDS = "sugar"
+RDEPENDS = "sugar shared-mime-info"
+
+SRC_URI = "http://download.sugarlabs.org/sources/sucrose/glucose/etoys/etoys-${PV}.tar.gz \
+           file://etoys.diff;patch=1"
+
+inherit autotools distutils-base
+
+do_configure_prepend() {
+        mkdir -p ${S}/m4
+}
+
+PACKAGES_ARCH = "all"
+FILES_${PN} += "${datadir}/${PN} \
+                ${datadir}/xsessions \
+                ${datadir}/dbus-1 \
+                ${datadir}/sugar/activities \
+                ${sysconfdir} "
+
diff --git a/recipes/sugar/sugar-artwork_0.84.1.bb b/recipes/sugar/sugar-artwork_0.84.1.bb
new file mode 100644
index 0000000000..c96cf7a38e
--- /dev/null
+++ b/recipes/sugar/sugar-artwork_0.84.1.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "Sugar artwork"
+LICENSE = "GPLv2"
+
+PR = "r0"
+
+DEPENDS = "sugar icon-slicer-native"
+
+SRC_URI = "http://download.sugarlabs.org/sources/sucrose/glucose/sugar-artwork/${PN}-${PV}.tar.bz2 "
+
+inherit autotools distutils-base
+
+do_configure_prepend() {
+        mkdir -p ${S}/m4
+}
+
+FILES_${PN} += "${datadir}/${PN} \
+                ${datadir}/icons \
+                ${datadir}/themes \
+                ${sysconfdir} "
+
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/2.*/engines/.debug"
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+        autotools_stage_all
+}
+
diff --git a/recipes/sugar/sugar-base_0.84.1.bb b/recipes/sugar/sugar-base_0.84.1.bb
new file mode 100644
index 0000000000..e95a43e3a9
--- /dev/null
+++ b/recipes/sugar/sugar-base_0.84.1.bb
@@ -0,0 +1,53 @@
+DESCRIPTION = "Sugar base system"
+LICENSE = "LGPLv2"
+
+DEPENDS = "python-pygtk sugar-toolkit"
+RDEPENDS = "librsvg-gtk \
+            ohm-plugin-x11 ohm \
+            hippo-canvas \
+            python-datetime \
+            python-netclient \
+            python-pygtk \
+            sugar-toolkit \
+            python-logging \
+            python-dbus \
+            python-subprocess \
+            telepathy-gabble telepathy-salut telepathy-python \
+            sugar-presence-service \
+            python-crypt \
+            python-numpy \
+            python-compression \
+            python-gst \
+            python-simplejson \
+            python-misc \
+            python-xmlrpc \
+            python-compiler \
+            python-pydoc \
+            python-mmap \
+            python-doctest \
+            ssh-keygen"
+
+SRC_URI = "http://download.sugarlabs.org/sources/sucrose/glucose/sugar-base/${PN}-${PV}.tar.bz2"
+
+inherit autotools distutils-base
+
+SRC_URI += "file://acinclude.m4"
+
+EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
+
+do_configure_prepend() {
+        install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+}
+
+FILES_${PN} += "${datadir}/${PN} \
+                ${datadir}/dbus-1 \
+                ${sysconfdir} "
+
+FILES_${PN}-dbg += "${libdir}/python*/site-packages/sugar/.debug"
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+        autotools_stage_all
+}
+
diff --git a/recipes/sugar/sugar-datastore_0.84.0.bb b/recipes/sugar/sugar-datastore_0.84.0.bb
new file mode 100644
index 0000000000..dde2748974
--- /dev/null
+++ b/recipes/sugar/sugar-datastore_0.84.0.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Sugar datastore"
+LICENSE = "GPLv2"
+
+PR = "r0"
+
+DEPENDS = "sugar-toolkit python-xappy "
+RDEPENDS = "sugar-toolkit sugar-base python-xappy python-cjson"
+
+SRC_URI = "http://download.sugarlabs.org/sources/sucrose/glucose/sugar-datastore/${PN}-${PV}.tar.bz2"
+
+inherit autotools
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+        autotools_stage_all
+}
+
+
+FILES_${PN} += "${datadir}/dbus-1"
+
diff --git a/recipes/sugar/sugar-presence-service_0.84.0.bb b/recipes/sugar/sugar-presence-service_0.84.0.bb
new file mode 100644
index 0000000000..78676d477a
--- /dev/null
+++ b/recipes/sugar/sugar-presence-service_0.84.0.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "Sugar presence service"
+LICENSE = "GPLv2"
+
+PR = "r0"
+
+DEPENDS = "sugar-toolkit"
+
+SRC_URI = "http://download.sugarlabs.org/sources/sucrose/glucose/sugar-presence-service/${PN}-${PV}.tar.bz2"
+
+inherit autotools distutils-base mime
+
+do_configure_prepend() {
+        mkdir -p ${S}/m4
+}
+
+FILES_${PN} += "${datadir}/${PN} \
+                ${datadir}/mime/packages \
+                ${datadir}/xsessions \
+                ${datadir}/dbus-1 \
+                ${sysconfdir} \
+                ${libdir}/python*/site-packages/"
+
+FILES_${PN}-dbg += "${libdir}/python*/site-packages/*/.debug"
+
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+        autotools_stage_all
+}
+
diff --git a/recipes/sugar/sugar-toolkit_0.84.4.bb b/recipes/sugar/sugar-toolkit_0.84.4.bb
new file mode 100644
index 0000000000..864582d7e5
--- /dev/null
+++ b/recipes/sugar/sugar-toolkit_0.84.4.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Sugar toolkit"
+LICENSE = "LGPLv2"
+DEPENDS = "python-pygtk libxml-parser-perl-native libxml2 gtk+ alsa-lib"
+
+SRC_URI = "http://download.sugarlabs.org/sources/sucrose/glucose/sugar-toolkit/sugar-toolkit-${PV}.tar.bz2"
+
+inherit autotools distutils-base
+
+SRC_URI += "file://acinclude.m4"
+
+EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
+
+do_configure_prepend() {
+        install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+}
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+        autotools_stage_all
+}
+
diff --git a/recipes/sugar/sugar_0.84.6.bb b/recipes/sugar/sugar_0.84.6.bb
new file mode 100644
index 0000000000..2ed38cde3d
--- /dev/null
+++ b/recipes/sugar/sugar_0.84.6.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Sugar base system"
+LICENSE = "GPLv2"
+
+DEPENDS = "sugar-toolkit libxml2 gtk+"
+RDEPENDS = "sugar-toolkit sugar-base sugar-datastore sugar-artwork gnome-python gnome-python-desktop python-cjson python-pygtksourceview"
+
+SRC_URI = "http://download.sugarlabs.org/sources/sucrose/glucose/sugar/${PN}-${PV}.tar.bz2"
+
+inherit autotools distutils-base mime
+
+do_configure_prepend() {
+        mkdir -p ${S}/m4
+}
+
+FILES_${PN} += "${datadir}/${PN} \
+                ${datadir}/mime/packages \
+                ${datadir}/xsessions \
+                ${datadir}/dbus-1 \
+                ${sysconfdir} "
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+        autotools_stage_all
+}
+
diff --git a/recipes/tasks/task-sugar-sucrose.bb b/recipes/tasks/task-sugar-sucrose.bb
new file mode 100644
index 0000000000..d4812d9295
--- /dev/null
+++ b/recipes/tasks/task-sugar-sucrose.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Task for complete sugar environment with core activities"
+
+PR = "r0"
+
+inherit task
+
+RDEPENDS_${PN} = "\
+        sugar \
+#        sugar-fructose \
+"