merge of '5031449809d92a9131e43cf42ee07eaecb4fbeff'

     and '61389ef93b16ad371a1a7c82bc60a4f061055b35'

5 files changed, 115 insertions, 2 deletions

diff --git a/packages/sugar/etoys/.mtn2git_empty b/packages/sugar/etoys/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/sugar/etoys/.mtn2git_empty
diff --git a/packages/sugar/etoys/etoys.diff b/packages/sugar/etoys/etoys.diff
new file mode 100644
index 0000000000..79b9acf51d
--- /dev/null
+++ b/packages/sugar/etoys/etoys.diff
@@ -0,0 +1,65 @@
+--- /tmp/Makefile.in	2008-09-01 13:20:20.000000000 +0200
++++ etoys-3.0.2076/Makefile.in	2008-09-01 13:29:37.453198000 +0200
+@@ -79,23 +79,23 @@
+ dirs = $(bindir) $(etoysdir) $(mimedir) $(exmpldir) $(guidedir) $(docsdir)
+ 
+ install-etoys: Content 
+-	for d in $(dirs) ; do mkdir -p $$d ; done
+-	install -v etoys $(bindir)
+-	for f in $(etoys) ; do install -v -m 644 $$f $(etoysdir); done
+-	for f in $(examples); do install -v -m 644 $$f $(exmpldir); done
++	for d in $(dirs) ; do mkdir -p $(DESTDIR)$$d ; done
++	install -v etoys $(DESTDIR)$(bindir)
++	for f in $(etoys) ; do install -v -m 644 $$f $(DESTDIR)$(etoysdir); done
++	for f in $(examples); do install -v -m 644 $$f $(DESTDIR)$(exmpldir); done
+ 	for f in $(guides); do \
+ 		dest=$(guidedir)/`basename $$f`; \
+ 		echo -n $$dest; \
+-		( gunzip -c $$f | gzip -v --rsyncable > $$dest ); \
+-		chmod 644 $$dest; \
++		( gunzip -c $$f | gzip -v --rsyncable > $(DESTDIR)$$dest ); \
++		chmod 644 $(DESTDIR)$$dest; \
+ 	done
+-	for f in $(docs) ; do install -v -m 644 $$f $(docsdir); done
++	for f in $(docs) ; do install -v -m 644 $$f $(DESTDIR)$(docsdir); done
+ 	for f in $(mos) ; do \
+ 		dir=`dirname $$f|sed 's/^Content.//'` ; \
+-		mkdir -p $(etoysdir)/$$dir ; \
+-		install -v -m 644 $$f $(etoysdir)/$$dir ; \
++		mkdir -p $(DESTDIR)$(etoysdir)/$$dir ; \
++		install -v -m 644 $$f $(DESTDIR)$(etoysdir)/$$dir ; \
+ 	done
+-	install -v -m 644 etoys.xml $(mimedir)
++	install -v -m 644 etoys.xml $(DESTDIR)$(mimedir)
+ 
+ 
+ # install activity - only used from sugar-jhbuild
+@@ -109,20 +109,20 @@
+ 	./mkNews > $@
+ 
+ install-activity: $(activityall)
+-	mkdir -p $(activitydir)/activity
+-	mkdir -p $(activitydir)/bin
+-	install -v etoys-activity $(activitydir)/bin
+-	rm -f $(activitydir)/etoys-activity
+-	install -v -m 644 NEWS $(activitydir)
+-	install -v -m 644 activity.info $(activitydir)/activity
+-	install -v -m 644 activity-etoys.svg $(activitydir)/activity
++	mkdir -p $(DESTDIR)$(activitydir)/activity
++	mkdir -p $(DESTDIR)$(activitydir)/bin
++	install -v etoys-activity $(DESTDIR)$(activitydir)/bin
++	rm -f $(DESTDIR)$(activitydir)/etoys-activity
++	install -v -m 644 NEWS $(DESTDIR)$(activitydir)
++	install -v -m 644 activity.info $(DESTDIR)$(activitydir)/activity
++	install -v -m 644 activity-etoys.svg $(DESTDIR)$(activitydir)/activity
+ 
+ 
+ # install both, etoys and activity.
+ # RPM uses install-etoys only, and runs update-mime as post script
+ 
+ install: install-etoys install-activity
+-	update-mime-database $(datadir)/mime
++	update-mime-database $(DESTDIR)$(datadir)/mime
+ 
+ # build .xo bundle - invoke "make xo" manually 
+ 
diff --git a/packages/sugar/etoys_3.0.2076.bb b/packages/sugar/etoys_3.0.2076.bb
new file mode 100644
index 0000000000..60e52227f8
--- /dev/null
+++ b/packages/sugar/etoys_3.0.2076.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Sugar etoys"
+LICENSE = "GPLv2"
+
+DEPENDS = "sugar"
+RDEPENDS = "sugar"
+
+SRC_URI = "http://dev.laptop.org/pub/sugar/sources/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}/mime \
+		${datadir}/xsessions \
+		${datadir}/dbus-1 \
+		${datadir}/sugar/activities \
+		${sysconfdir} "
+
+
diff --git a/packages/sugar/sugar-base_0.82.0.bb b/packages/sugar/sugar-base_0.82.0.bb
index 69c3cab21d..0e616e72cc 100644
--- a/packages/sugar/sugar-base_0.82.0.bb
+++ b/packages/sugar/sugar-base_0.82.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Sugar base system"
 LICENSE = "LGPLv2"
 
-PR = "r8"
+PR = "r10"
 
 DEPENDS = "python-pygtk sugar-toolkit"
 RDEPENDS = "librsvg-gtk \
@@ -23,7 +23,11 @@ RDEPENDS = "librsvg-gtk \
 	    python-simplejson \
 	    python-misc \
 	    python-xmlrpc \
-	    "
+	    python-compiler \
+	    python-pydoc \
+	    python-mmap \
+	    python-doctest \
+	    ssh-keygen"
 
 SRC_URI = "http://dev.laptop.org/pub/sugar/sources/sugar-base/${PN}-${PV}.tar.bz2"
 
diff --git a/packages/sugar/sugar-datastore_0.82.0.bb b/packages/sugar/sugar-datastore_0.82.0.bb
new file mode 100644
index 0000000000..918a8d01e8
--- /dev/null
+++ b/packages/sugar/sugar-datastore_0.82.0.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Sugar datastore"
+LICENSE = "GPLv2"
+
+PR = "r0"
+
+DEPENDS = "sugar-toolkit python-xappy "
+RDEPENDS = "sugar-toolkit sugar-base python-xappy"
+
+SRC_URI = "http://dev.laptop.org/pub/sugar/sources/sugar-datastore/${PN}-${PV}.tar.bz2"
+
+inherit autotools distutils-base
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+        autotools_stage_all
+}
+
+
+FILES_${PN} += "${datadir}/dbus-1"